Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added
- Recorded service ping history locally and added a "Download usage report" button to the offline license settings page, so offline deployments can export their usage and send it to us. [#1348](https://github.com/sourcebot-dev/sourcebot/pull/1348)

### Fixed
- Upgraded `@grpc/grpc-js` to `^1.14.4`. [#1315](https://github.com/sourcebot-dev/sourcebot/pull/1315)
- Upgraded `vite` to `^8.0.16`. [#1313](https://github.com/sourcebot-dev/sourcebot/pull/1313)
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
-- CreateTable
CREATE TABLE "ServicePingEvent" (
"id" TEXT NOT NULL,
"payload" JSONB NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"orgId" INTEGER NOT NULL,

CONSTRAINT "ServicePingEvent_pkey" PRIMARY KEY ("id")
);
Comment thread
brendan-kellam marked this conversation as resolved.

-- AddForeignKey
ALTER TABLE "ServicePingEvent" ADD CONSTRAINT "ServicePingEvent_orgId_fkey" FOREIGN KEY ("orgId") REFERENCES "Org"("id") ON DELETE CASCADE ON UPDATE CASCADE;
10 changes: 10 additions & 0 deletions packages/db/prisma/schema.prisma
Original file line numberDiff line numberDiff line change
Expand Up@@ -318,6 +318,7 @@ model Org {
mcpServers McpServer[]

license License?
servicePingEvents ServicePingEvent[]
}

model License {
Expand DownExpand Up@@ -358,6 +359,15 @@ model License {
updatedAt DateTime @updatedAt
}

model ServicePingEvent {
id String @id @default(cuid())
payload Json
createdAt DateTime @default(now())

org Org @relation(fields: [orgId], references: [id], onDelete: Cascade)
orgId Int
}
Comment thread
brendan-kellam marked this conversation as resolved.

enum OrgRole {
OWNER
MEMBER
Expand Down
12 changes: 10 additions & 2 deletions packages/shared/src/entitlements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,10 +120,18 @@ const getValidOnlineLicense = (_license: License | null): License | null => {
return null;
}

export const isValidOfflineLicenseActive = (): boolean => {
return getValidOfflineLicense() !== null;
}

export const isValidOnlineLicenseActive = (_license: License | null): boolean => {
return getValidOnlineLicense(_license) !== null;
}

export const isValidLicenseActive = (_license: License | null): boolean => {
return (
getValidOfflineLicense() !== null ||
getValidOnlineLicense(_license) !== null
isValidOfflineLicenseActive() ||
isValidOnlineLicenseActive(_license)
);
}

Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ export {
getEntitlements as _getEntitlements,
isAnonymousAccessAvailable as _isAnonymousAccessAvailable,
isValidLicenseActive as _isValidLicenseActive,
isValidOfflineLicenseActive,
isValidOnlineLicenseActive as _isValidOnlineLicenseActive,
getSeatCap,
getOfflineLicenseMetadata,
STALE_ONLINE_LICENSE_THRESHOLD_MS,
Expand Down
30 changes: 30 additions & 0 deletions packages/web/src/app/(app)/settings/license/actions.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
'use server';

import { sew } from "@/middleware/sew";
import { withAuth } from "@/middleware/withAuth";
import { withMinimumOrgRole } from "@/middleware/withMinimumOrgRole";
import { OrgRole } from "@sourcebot/db";
import { ServiceError } from "@/lib/serviceError";

export interface ServicePingHistoryEntry {
createdAt: string;
payload: unknown;
}

// Returns the recorded Service Ping history so offline deployments can export
// it and send it back to us out-of-band (they can't reach Lighthouse directly).
export const getServicePingHistory = async (): Promise<ServicePingHistoryEntry[] | ServiceError> => sew(() =>
withAuth(async ({ org, role, prisma }) =>
withMinimumOrgRole(role, OrgRole.OWNER, async () => {
const events = await prisma.servicePingEvent.findMany({
where: { orgId: org.id },
orderBy: { createdAt: 'asc' },
});
Comment thread
brendan-kellam marked this conversation as resolved.

return events.map((event) => ({
createdAt: event.createdAt.toISOString(),
payload: event.payload,
}));
})
)
);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
'use client';

import { useCallback, useState } from "react";
import { Download } from "lucide-react";
import { LoadingButton } from "@/components/ui/loading-button";
import { useToast } from "@/components/hooks/use-toast";
import { isServiceError } from "@/lib/utils";
import { getServicePingHistory } from "./actions";

export function DownloadServicePingHistoryButton() {
const [isLoading, setIsLoading] = useState(false);
const { toast } = useToast();

const handleDownload = useCallback(async () => {
setIsLoading(true);
try {
const result = await getServicePingHistory();

if (isServiceError(result)) {
toast({
description: "Failed to export service ping history. Please try again.",
variant: "destructive",
});
return;
}

if (result.length === 0) {
toast({
description: "No service ping history has been recorded yet.",
});
return;
}

const blob = new Blob([JSON.stringify(result, null, 2)], {
type: "application/json",
});
const url = URL.createObjectURL(blob);
const anchor = document.createElement("a");
anchor.href = url;
anchor.download = `${new Date().toISOString().slice(0, 10)}-usage-history.json`;
document.body.appendChild(anchor);
anchor.click();
document.body.removeChild(anchor);
URL.revokeObjectURL(url);
} finally {
setIsLoading(false);
}
}, [toast]);

return (
<LoadingButton
variant="outline"
size="sm"
onClick={handleDownload}
loading={isLoading}
>
{!isLoading && <Download className="h-3.5 w-3.5" />}
Download usage report
</LoadingButton>
);
}
60 changes: 37 additions & 23 deletions packages/web/src/app/(app)/settings/license/offlineLicenseCard.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { OfflineLicenseMetadata } from "@sourcebot/shared";
import { Badge } from "@/components/ui/badge";
import { SettingsCard } from "../components/settingsCard";
import { DownloadServicePingHistoryButton } from "./downloadServicePingHistoryButton";

interface OfflineLicenseCardProps {
license: OfflineLicenseMetadata;
Expand All@@ -15,34 +16,47 @@ export function OfflineLicenseCard({ license, isExpired }: OfflineLicenseCardPro

return (
<SettingsCard>
<div className="flex items-center justify-between gap-6">
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<p className="font-medium">Enterprise plan</p>
{isExpired && (
<Badge variant="outline" className="border-destructive/30 text-destructive">
Expired
</Badge>
)}
</div>
<div className="flex items-center gap-2 text-xs text-muted-foreground mt-0.5">
<code className="font-mono">{truncatedId}</code>
<div className="flex flex-col gap-4">
<div className="flex items-center justify-between gap-6">
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<p className="font-medium">Enterprise plan</p>
{isExpired && (
<Badge variant="outline" className="border-destructive/30 text-destructive">
Expired
</Badge>
)}
</div>
<div className="flex items-center gap-2 text-xs text-muted-foreground mt-0.5">
<code className="font-mono">{truncatedId}</code>
</div>
</div>
</div>
<div className="flex items-center gap-12">
{license.seats !== undefined && (
<div className="flex items-center gap-12">
{license.seats !== undefined && (
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">Billed seats</p>
<p className="text-sm">{license.seats}</p>
</div>
)}
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">Billed seats</p>
<p className="text-sm">{license.seats}</p>
<p className="text-xs text-muted-foreground">
{isExpired ? "Expired on" : "Expires on"}
</p>
<p className="text-sm">{formatDate(expiryDate)}</p>
</div>
)}
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">
{isExpired ? "Expired on" : "Expires on"}
</p>
<p className="text-sm">{formatDate(expiryDate)}</p>
</div>
</div>
<div className="flex items-center justify-between gap-6 border-t border-border pt-4">
<p className="text-xs text-muted-foreground">
Your instance doesn&apos;t report usage automatically. Usage data must be
manually sent to{" "}
<a href="mailto:ar@sourcebot.dev" className="text-primary hover:underline">
ar@sourcebot.dev
</a>
.
</p>
<DownloadServicePingHistoryButton />
</div>
</div>
</SettingsCard>
);
Expand Down
33 changes: 32 additions & 1 deletion packages/web/src/features/billing/servicePing.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,13 @@ import { existsSync } from "fs";
import { SINGLE_TENANT_ORG_ID } from "@/lib/constants";
import { isServiceError } from "@/lib/utils";
import { __unsafePrisma } from "@/prisma";
import { createLogger, decryptActivationCode, env, SOURCEBOT_VERSION } from "@sourcebot/shared";
import {
createLogger,
decryptActivationCode,
env,
SOURCEBOT_VERSION,
isValidOfflineLicenseActive
} from "@sourcebot/shared";
import { client } from "./client";
import { ServicePingRequest } from "./types";
import { ServiceErrorException } from "@/lib/serviceError";
Expand DownExpand Up@@ -83,6 +89,13 @@ export const syncWithLighthouse = async (orgId: number) => {
...(activationCode && { activationCode }),
};

await recordServicePingInDB(orgId, payload);

if (isValidOfflineLicenseActive()) {
logger.debug('Skipping service ping: active offline license detected.');
return;
}

const response = await client.ping(payload);
Comment thread
brendan-kellam marked this conversation as resolved.
if (isServiceError(response)) {
logger.error(`Service ping failed:\n ${JSON.stringify(response, null, 2)}`)
Expand DownExpand Up@@ -172,3 +185,21 @@ const inferDeploymentType = (): string => {
}
return 'other';
};

const recordServicePingInDB = async (orgId: number, payload: ServicePingRequest) => {
// Strip the activation code before persisting.
const { activationCode: _activationCode, ...sanitizedPayload } = payload;

try {
await __unsafePrisma.servicePingEvent.create({
data: {
orgId,
payload: sanitizedPayload,
},
});
} catch (error) {
// Recording the ping is best-effort: a failure here must not prevent
// the actual ping from being sent to Lighthouse.
logger.error(`Failed to record service ping in database:\n ${error}`);
}
};
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added
- Recorded service ping history locally and added a "Download usage report" button to the offline license settings page, so offline deployments can export their usage and send it to us. [#1348](https://github.com/sourcebot-dev/sourcebot/pull/1348)

### Fixed
- Upgraded `@grpc/grpc-js` to `^1.14.4`. [#1315](https://github.com/sourcebot-dev/sourcebot/pull/1315)
- Upgraded `vite` to `^8.0.16`. [#1313](https://github.com/sourcebot-dev/sourcebot/pull/1313)
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
-- CreateTable
CREATE TABLE "ServicePingEvent" (
"id" TEXT NOT NULL,
"payload" JSONB NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"orgId" INTEGER NOT NULL,

CONSTRAINT "ServicePingEvent_pkey" PRIMARY KEY ("id")
);
Comment thread
brendan-kellam marked this conversation as resolved.

-- AddForeignKey
ALTER TABLE "ServicePingEvent" ADD CONSTRAINT "ServicePingEvent_orgId_fkey" FOREIGN KEY ("orgId") REFERENCES "Org"("id") ON DELETE CASCADE ON UPDATE CASCADE;
10 changes: 10 additions & 0 deletions packages/db/prisma/schema.prisma
Original file line numberDiff line numberDiff line change
Expand Up@@ -318,6 +318,7 @@ model Org {
mcpServers McpServer[]

license License?
servicePingEvents ServicePingEvent[]
}

model License {
Expand DownExpand Up@@ -358,6 +359,15 @@ model License {
updatedAt DateTime @updatedAt
}

model ServicePingEvent {
id String @id @default(cuid())
payload Json
createdAt DateTime @default(now())

org Org @relation(fields: [orgId], references: [id], onDelete: Cascade)
orgId Int
}
Comment thread
brendan-kellam marked this conversation as resolved.

enum OrgRole {
OWNER
MEMBER
Expand Down
12 changes: 10 additions & 2 deletions packages/shared/src/entitlements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,10 +120,18 @@ const getValidOnlineLicense = (_license: License | null): License | null => {
return null;
}

export const isValidOfflineLicenseActive = (): boolean => {
return getValidOfflineLicense() !== null;
}

export const isValidOnlineLicenseActive = (_license: License | null): boolean => {
return getValidOnlineLicense(_license) !== null;
}

export const isValidLicenseActive = (_license: License | null): boolean => {
return (
getValidOfflineLicense() !== null ||
getValidOnlineLicense(_license) !== null
isValidOfflineLicenseActive() ||
isValidOnlineLicenseActive(_license)
);
}

Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ export {
getEntitlements as _getEntitlements,
isAnonymousAccessAvailable as _isAnonymousAccessAvailable,
isValidLicenseActive as _isValidLicenseActive,
isValidOfflineLicenseActive,
isValidOnlineLicenseActive as _isValidOnlineLicenseActive,
getSeatCap,
getOfflineLicenseMetadata,
STALE_ONLINE_LICENSE_THRESHOLD_MS,
Expand Down
30 changes: 30 additions & 0 deletions packages/web/src/app/(app)/settings/license/actions.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
'use server';

import { sew } from "@/middleware/sew";
import { withAuth } from "@/middleware/withAuth";
import { withMinimumOrgRole } from "@/middleware/withMinimumOrgRole";
import { OrgRole } from "@sourcebot/db";
import { ServiceError } from "@/lib/serviceError";

export interface ServicePingHistoryEntry {
createdAt: string;
payload: unknown;
}

// Returns the recorded Service Ping history so offline deployments can export
// it and send it back to us out-of-band (they can't reach Lighthouse directly).
export const getServicePingHistory = async (): Promise<ServicePingHistoryEntry[] | ServiceError> => sew(() =>
withAuth(async ({ org, role, prisma }) =>
withMinimumOrgRole(role, OrgRole.OWNER, async () => {
const events = await prisma.servicePingEvent.findMany({
where: { orgId: org.id },
orderBy: { createdAt: 'asc' },
});
Comment thread
brendan-kellam marked this conversation as resolved.

return events.map((event) => ({
createdAt: event.createdAt.toISOString(),
payload: event.payload,
}));
})
)
);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
'use client';

import { useCallback, useState } from "react";
import { Download } from "lucide-react";
import { LoadingButton } from "@/components/ui/loading-button";
import { useToast } from "@/components/hooks/use-toast";
import { isServiceError } from "@/lib/utils";
import { getServicePingHistory } from "./actions";

export function DownloadServicePingHistoryButton() {
const [isLoading, setIsLoading] = useState(false);
const { toast } = useToast();

const handleDownload = useCallback(async () => {
setIsLoading(true);
try {
const result = await getServicePingHistory();

if (isServiceError(result)) {
toast({
description: "Failed to export service ping history. Please try again.",
variant: "destructive",
});
return;
}

if (result.length === 0) {
toast({
description: "No service ping history has been recorded yet.",
});
return;
}

const blob = new Blob([JSON.stringify(result, null, 2)], {
type: "application/json",
});
const url = URL.createObjectURL(blob);
const anchor = document.createElement("a");
anchor.href = url;
anchor.download = `${new Date().toISOString().slice(0, 10)}-usage-history.json`;
document.body.appendChild(anchor);
anchor.click();
document.body.removeChild(anchor);
URL.revokeObjectURL(url);
} finally {
setIsLoading(false);
}
}, [toast]);

return (
<LoadingButton
variant="outline"
size="sm"
onClick={handleDownload}
loading={isLoading}
>
{!isLoading && <Download className="h-3.5 w-3.5" />}
Download usage report
</LoadingButton>
);
}
60 changes: 37 additions & 23 deletions packages/web/src/app/(app)/settings/license/offlineLicenseCard.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { OfflineLicenseMetadata } from "@sourcebot/shared";
import { Badge } from "@/components/ui/badge";
import { SettingsCard } from "../components/settingsCard";
import { DownloadServicePingHistoryButton } from "./downloadServicePingHistoryButton";

interface OfflineLicenseCardProps {
license: OfflineLicenseMetadata;
Expand All@@ -15,34 +16,47 @@ export function OfflineLicenseCard({ license, isExpired }: OfflineLicenseCardPro

return (
<SettingsCard>
<div className="flex items-center justify-between gap-6">
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<p className="font-medium">Enterprise plan</p>
{isExpired && (
<Badge variant="outline" className="border-destructive/30 text-destructive">
Expired
</Badge>
)}
</div>
<div className="flex items-center gap-2 text-xs text-muted-foreground mt-0.5">
<code className="font-mono">{truncatedId}</code>
<div className="flex flex-col gap-4">
<div className="flex items-center justify-between gap-6">
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<p className="font-medium">Enterprise plan</p>
{isExpired && (
<Badge variant="outline" className="border-destructive/30 text-destructive">
Expired
</Badge>
)}
</div>
<div className="flex items-center gap-2 text-xs text-muted-foreground mt-0.5">
<code className="font-mono">{truncatedId}</code>
</div>
</div>
</div>
<div className="flex items-center gap-12">
{license.seats !== undefined && (
<div className="flex items-center gap-12">
{license.seats !== undefined && (
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">Billed seats</p>
<p className="text-sm">{license.seats}</p>
</div>
)}
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">Billed seats</p>
<p className="text-sm">{license.seats}</p>
<p className="text-xs text-muted-foreground">
{isExpired ? "Expired on" : "Expires on"}
</p>
<p className="text-sm">{formatDate(expiryDate)}</p>
</div>
)}
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">
{isExpired ? "Expired on" : "Expires on"}
</p>
<p className="text-sm">{formatDate(expiryDate)}</p>
</div>
</div>
<div className="flex items-center justify-between gap-6 border-t border-border pt-4">
<p className="text-xs text-muted-foreground">
Your instance doesn&apos;t report usage automatically. Usage data must be
manually sent to{" "}
<a href="mailto:ar@sourcebot.dev" className="text-primary hover:underline">
ar@sourcebot.dev
</a>
.
</p>
<DownloadServicePingHistoryButton />
</div>
</div>
</SettingsCard>
);
Expand Down
33 changes: 32 additions & 1 deletion packages/web/src/features/billing/servicePing.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,13 @@ import { existsSync } from "fs";
import { SINGLE_TENANT_ORG_ID } from "@/lib/constants";
import { isServiceError } from "@/lib/utils";
import { __unsafePrisma } from "@/prisma";
import { createLogger, decryptActivationCode, env, SOURCEBOT_VERSION } from "@sourcebot/shared";
import {
createLogger,
decryptActivationCode,
env,
SOURCEBOT_VERSION,
isValidOfflineLicenseActive
} from "@sourcebot/shared";
import { client } from "./client";
import { ServicePingRequest } from "./types";
import { ServiceErrorException } from "@/lib/serviceError";
Expand DownExpand Up@@ -83,6 +89,13 @@ export const syncWithLighthouse = async (orgId: number) => {
...(activationCode && { activationCode }),
};

await recordServicePingInDB(orgId, payload);

if (isValidOfflineLicenseActive()) {
logger.debug('Skipping service ping: active offline license detected.');
return;
}

const response = await client.ping(payload);
Comment thread
brendan-kellam marked this conversation as resolved.
if (isServiceError(response)) {
logger.error(`Service ping failed:\n ${JSON.stringify(response, null, 2)}`)
Expand DownExpand Up@@ -172,3 +185,21 @@ const inferDeploymentType = (): string => {
}
return 'other';
};

const recordServicePingInDB = async (orgId: number, payload: ServicePingRequest) => {
// Strip the activation code before persisting.
const { activationCode: _activationCode, ...sanitizedPayload } = payload;

try {
await __unsafePrisma.servicePingEvent.create({
data: {
orgId,
payload: sanitizedPayload,
},
});
} catch (error) {
// Recording the ping is best-effort: a failure here must not prevent
// the actual ping from being sent to Lighthouse.
logger.error(`Failed to record service ping in database:\n ${error}`);
}
};
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added
- Recorded service ping history locally and added a "Download usage report" button to the offline license settings page, so offline deployments can export their usage and send it to us. [#1348](https://github.com/sourcebot-dev/sourcebot/pull/1348)

### Fixed
- Upgraded `@grpc/grpc-js` to `^1.14.4`. [#1315](https://github.com/sourcebot-dev/sourcebot/pull/1315)
- Upgraded `vite` to `^8.0.16`. [#1313](https://github.com/sourcebot-dev/sourcebot/pull/1313)
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
-- CreateTable
CREATE TABLE "ServicePingEvent" (
"id" TEXT NOT NULL,
"payload" JSONB NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"orgId" INTEGER NOT NULL,

CONSTRAINT "ServicePingEvent_pkey" PRIMARY KEY ("id")
);
Comment thread
brendan-kellam marked this conversation as resolved.

-- AddForeignKey
ALTER TABLE "ServicePingEvent" ADD CONSTRAINT "ServicePingEvent_orgId_fkey" FOREIGN KEY ("orgId") REFERENCES "Org"("id") ON DELETE CASCADE ON UPDATE CASCADE;
10 changes: 10 additions & 0 deletions packages/db/prisma/schema.prisma
Original file line numberDiff line numberDiff line change
Expand Up@@ -318,6 +318,7 @@ model Org {
mcpServers McpServer[]

license License?
servicePingEvents ServicePingEvent[]
}

model License {
Expand DownExpand Up@@ -358,6 +359,15 @@ model License {
updatedAt DateTime @updatedAt
}

model ServicePingEvent {
id String @id @default(cuid())
payload Json
createdAt DateTime @default(now())

org Org @relation(fields: [orgId], references: [id], onDelete: Cascade)
orgId Int
}
Comment thread
brendan-kellam marked this conversation as resolved.

enum OrgRole {
OWNER
MEMBER
Expand Down
12 changes: 10 additions & 2 deletions packages/shared/src/entitlements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,10 +120,18 @@ const getValidOnlineLicense = (_license: License | null): License | null => {
return null;
}

export const isValidOfflineLicenseActive = (): boolean => {
return getValidOfflineLicense() !== null;
}

export const isValidOnlineLicenseActive = (_license: License | null): boolean => {
return getValidOnlineLicense(_license) !== null;
}

export const isValidLicenseActive = (_license: License | null): boolean => {
return (
getValidOfflineLicense() !== null ||
getValidOnlineLicense(_license) !== null
isValidOfflineLicenseActive() ||
isValidOnlineLicenseActive(_license)
);
}

Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ export {
getEntitlements as _getEntitlements,
isAnonymousAccessAvailable as _isAnonymousAccessAvailable,
isValidLicenseActive as _isValidLicenseActive,
isValidOfflineLicenseActive,
isValidOnlineLicenseActive as _isValidOnlineLicenseActive,
getSeatCap,
getOfflineLicenseMetadata,
STALE_ONLINE_LICENSE_THRESHOLD_MS,
Expand Down
30 changes: 30 additions & 0 deletions packages/web/src/app/(app)/settings/license/actions.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
'use server';

import { sew } from "@/middleware/sew";
import { withAuth } from "@/middleware/withAuth";
import { withMinimumOrgRole } from "@/middleware/withMinimumOrgRole";
import { OrgRole } from "@sourcebot/db";
import { ServiceError } from "@/lib/serviceError";

export interface ServicePingHistoryEntry {
createdAt: string;
payload: unknown;
}

// Returns the recorded Service Ping history so offline deployments can export
// it and send it back to us out-of-band (they can't reach Lighthouse directly).
export const getServicePingHistory = async (): Promise<ServicePingHistoryEntry[] | ServiceError> => sew(() =>
withAuth(async ({ org, role, prisma }) =>
withMinimumOrgRole(role, OrgRole.OWNER, async () => {
const events = await prisma.servicePingEvent.findMany({
where: { orgId: org.id },
orderBy: { createdAt: 'asc' },
});
Comment thread
brendan-kellam marked this conversation as resolved.

return events.map((event) => ({
createdAt: event.createdAt.toISOString(),
payload: event.payload,
}));
})
)
);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
'use client';

import { useCallback, useState } from "react";
import { Download } from "lucide-react";
import { LoadingButton } from "@/components/ui/loading-button";
import { useToast } from "@/components/hooks/use-toast";
import { isServiceError } from "@/lib/utils";
import { getServicePingHistory } from "./actions";

export function DownloadServicePingHistoryButton() {
const [isLoading, setIsLoading] = useState(false);
const { toast } = useToast();

const handleDownload = useCallback(async () => {
setIsLoading(true);
try {
const result = await getServicePingHistory();

if (isServiceError(result)) {
toast({
description: "Failed to export service ping history. Please try again.",
variant: "destructive",
});
return;
}

if (result.length === 0) {
toast({
description: "No service ping history has been recorded yet.",
});
return;
}

const blob = new Blob([JSON.stringify(result, null, 2)], {
type: "application/json",
});
const url = URL.createObjectURL(blob);
const anchor = document.createElement("a");
anchor.href = url;
anchor.download = `${new Date().toISOString().slice(0, 10)}-usage-history.json`;
document.body.appendChild(anchor);
anchor.click();
document.body.removeChild(anchor);
URL.revokeObjectURL(url);
} finally {
setIsLoading(false);
}
}, [toast]);

return (
<LoadingButton
variant="outline"
size="sm"
onClick={handleDownload}
loading={isLoading}
>
{!isLoading && <Download className="h-3.5 w-3.5" />}
Download usage report
</LoadingButton>
);
}
60 changes: 37 additions & 23 deletions packages/web/src/app/(app)/settings/license/offlineLicenseCard.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { OfflineLicenseMetadata } from "@sourcebot/shared";
import { Badge } from "@/components/ui/badge";
import { SettingsCard } from "../components/settingsCard";
import { DownloadServicePingHistoryButton } from "./downloadServicePingHistoryButton";

interface OfflineLicenseCardProps {
license: OfflineLicenseMetadata;
Expand All@@ -15,34 +16,47 @@ export function OfflineLicenseCard({ license, isExpired }: OfflineLicenseCardPro

return (
<SettingsCard>
<div className="flex items-center justify-between gap-6">
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<p className="font-medium">Enterprise plan</p>
{isExpired && (
<Badge variant="outline" className="border-destructive/30 text-destructive">
Expired
</Badge>
)}
</div>
<div className="flex items-center gap-2 text-xs text-muted-foreground mt-0.5">
<code className="font-mono">{truncatedId}</code>
<div className="flex flex-col gap-4">
<div className="flex items-center justify-between gap-6">
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<p className="font-medium">Enterprise plan</p>
{isExpired && (
<Badge variant="outline" className="border-destructive/30 text-destructive">
Expired
</Badge>
)}
</div>
<div className="flex items-center gap-2 text-xs text-muted-foreground mt-0.5">
<code className="font-mono">{truncatedId}</code>
</div>
</div>
</div>
<div className="flex items-center gap-12">
{license.seats !== undefined && (
<div className="flex items-center gap-12">
{license.seats !== undefined && (
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">Billed seats</p>
<p className="text-sm">{license.seats}</p>
</div>
)}
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">Billed seats</p>
<p className="text-sm">{license.seats}</p>
<p className="text-xs text-muted-foreground">
{isExpired ? "Expired on" : "Expires on"}
</p>
<p className="text-sm">{formatDate(expiryDate)}</p>
</div>
)}
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">
{isExpired ? "Expired on" : "Expires on"}
</p>
<p className="text-sm">{formatDate(expiryDate)}</p>
</div>
</div>
<div className="flex items-center justify-between gap-6 border-t border-border pt-4">
<p className="text-xs text-muted-foreground">
Your instance doesn&apos;t report usage automatically. Usage data must be
manually sent to{" "}
<a href="mailto:ar@sourcebot.dev" className="text-primary hover:underline">
ar@sourcebot.dev
</a>
.
</p>
<DownloadServicePingHistoryButton />
</div>
</div>
</SettingsCard>
);
Expand Down
33 changes: 32 additions & 1 deletion packages/web/src/features/billing/servicePing.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,13 @@ import { existsSync } from "fs";
import { SINGLE_TENANT_ORG_ID } from "@/lib/constants";
import { isServiceError } from "@/lib/utils";
import { __unsafePrisma } from "@/prisma";
import { createLogger, decryptActivationCode, env, SOURCEBOT_VERSION } from "@sourcebot/shared";
import {
createLogger,
decryptActivationCode,
env,
SOURCEBOT_VERSION,
isValidOfflineLicenseActive
} from "@sourcebot/shared";
import { client } from "./client";
import { ServicePingRequest } from "./types";
import { ServiceErrorException } from "@/lib/serviceError";
Expand DownExpand Up@@ -83,6 +89,13 @@ export const syncWithLighthouse = async (orgId: number) => {
...(activationCode && { activationCode }),
};

await recordServicePingInDB(orgId, payload);

if (isValidOfflineLicenseActive()) {
logger.debug('Skipping service ping: active offline license detected.');
return;
}

const response = await client.ping(payload);
Comment thread
brendan-kellam marked this conversation as resolved.
if (isServiceError(response)) {
logger.error(`Service ping failed:\n ${JSON.stringify(response, null, 2)}`)
Expand DownExpand Up@@ -172,3 +185,21 @@ const inferDeploymentType = (): string => {
}
return 'other';
};

const recordServicePingInDB = async (orgId: number, payload: ServicePingRequest) => {
// Strip the activation code before persisting.
const { activationCode: _activationCode, ...sanitizedPayload } = payload;

try {
await __unsafePrisma.servicePingEvent.create({
data: {
orgId,
payload: sanitizedPayload,
},
});
} catch (error) {
// Recording the ping is best-effort: a failure here must not prevent
// the actual ping from being sent to Lighthouse.
logger.error(`Failed to record service ping in database:\n ${error}`);
}
};
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added
- Recorded service ping history locally and added a "Download usage report" button to the offline license settings page, so offline deployments can export their usage and send it to us. [#1348](https://github.com/sourcebot-dev/sourcebot/pull/1348)

### Fixed
- Upgraded `@grpc/grpc-js` to `^1.14.4`. [#1315](https://github.com/sourcebot-dev/sourcebot/pull/1315)
- Upgraded `vite` to `^8.0.16`. [#1313](https://github.com/sourcebot-dev/sourcebot/pull/1313)
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
-- CreateTable
CREATE TABLE "ServicePingEvent" (
"id" TEXT NOT NULL,
"payload" JSONB NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"orgId" INTEGER NOT NULL,

CONSTRAINT "ServicePingEvent_pkey" PRIMARY KEY ("id")
);
Comment thread
brendan-kellam marked this conversation as resolved.

-- AddForeignKey
ALTER TABLE "ServicePingEvent" ADD CONSTRAINT "ServicePingEvent_orgId_fkey" FOREIGN KEY ("orgId") REFERENCES "Org"("id") ON DELETE CASCADE ON UPDATE CASCADE;
10 changes: 10 additions & 0 deletions packages/db/prisma/schema.prisma
Original file line numberDiff line numberDiff line change
Expand Up@@ -318,6 +318,7 @@ model Org {
mcpServers McpServer[]

license License?
servicePingEvents ServicePingEvent[]
}

model License {
Expand DownExpand Up@@ -358,6 +359,15 @@ model License {
updatedAt DateTime @updatedAt
}

model ServicePingEvent {
id String @id @default(cuid())
payload Json
createdAt DateTime @default(now())

org Org @relation(fields: [orgId], references: [id], onDelete: Cascade)
orgId Int
}
Comment thread
brendan-kellam marked this conversation as resolved.

enum OrgRole {
OWNER
MEMBER
Expand Down
12 changes: 10 additions & 2 deletions packages/shared/src/entitlements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,10 +120,18 @@ const getValidOnlineLicense = (_license: License | null): License | null => {
return null;
}

export const isValidOfflineLicenseActive = (): boolean => {
return getValidOfflineLicense() !== null;
}

export const isValidOnlineLicenseActive = (_license: License | null): boolean => {
return getValidOnlineLicense(_license) !== null;
}

export const isValidLicenseActive = (_license: License | null): boolean => {
return (
getValidOfflineLicense() !== null ||
getValidOnlineLicense(_license) !== null
isValidOfflineLicenseActive() ||
isValidOnlineLicenseActive(_license)
);
}

Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ export {
getEntitlements as _getEntitlements,
isAnonymousAccessAvailable as _isAnonymousAccessAvailable,
isValidLicenseActive as _isValidLicenseActive,
isValidOfflineLicenseActive,
isValidOnlineLicenseActive as _isValidOnlineLicenseActive,
getSeatCap,
getOfflineLicenseMetadata,
STALE_ONLINE_LICENSE_THRESHOLD_MS,
Expand Down
30 changes: 30 additions & 0 deletions packages/web/src/app/(app)/settings/license/actions.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
'use server';

import { sew } from "@/middleware/sew";
import { withAuth } from "@/middleware/withAuth";
import { withMinimumOrgRole } from "@/middleware/withMinimumOrgRole";
import { OrgRole } from "@sourcebot/db";
import { ServiceError } from "@/lib/serviceError";

export interface ServicePingHistoryEntry {
createdAt: string;
payload: unknown;
}

// Returns the recorded Service Ping history so offline deployments can export
// it and send it back to us out-of-band (they can't reach Lighthouse directly).
export const getServicePingHistory = async (): Promise<ServicePingHistoryEntry[] | ServiceError> => sew(() =>
withAuth(async ({ org, role, prisma }) =>
withMinimumOrgRole(role, OrgRole.OWNER, async () => {
const events = await prisma.servicePingEvent.findMany({
where: { orgId: org.id },
orderBy: { createdAt: 'asc' },
});
Comment thread
brendan-kellam marked this conversation as resolved.

return events.map((event) => ({
createdAt: event.createdAt.toISOString(),
payload: event.payload,
}));
})
)
);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
'use client';

import { useCallback, useState } from "react";
import { Download } from "lucide-react";
import { LoadingButton } from "@/components/ui/loading-button";
import { useToast } from "@/components/hooks/use-toast";
import { isServiceError } from "@/lib/utils";
import { getServicePingHistory } from "./actions";

export function DownloadServicePingHistoryButton() {
const [isLoading, setIsLoading] = useState(false);
const { toast } = useToast();

const handleDownload = useCallback(async () => {
setIsLoading(true);
try {
const result = await getServicePingHistory();

if (isServiceError(result)) {
toast({
description: "Failed to export service ping history. Please try again.",
variant: "destructive",
});
return;
}

if (result.length === 0) {
toast({
description: "No service ping history has been recorded yet.",
});
return;
}

const blob = new Blob([JSON.stringify(result, null, 2)], {
type: "application/json",
});
const url = URL.createObjectURL(blob);
const anchor = document.createElement("a");
anchor.href = url;
anchor.download = `${new Date().toISOString().slice(0, 10)}-usage-history.json`;
document.body.appendChild(anchor);
anchor.click();
document.body.removeChild(anchor);
URL.revokeObjectURL(url);
} finally {
setIsLoading(false);
}
}, [toast]);

return (
<LoadingButton
variant="outline"
size="sm"
onClick={handleDownload}
loading={isLoading}
>
{!isLoading && <Download className="h-3.5 w-3.5" />}
Download usage report
</LoadingButton>
);
}
60 changes: 37 additions & 23 deletions packages/web/src/app/(app)/settings/license/offlineLicenseCard.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { OfflineLicenseMetadata } from "@sourcebot/shared";
import { Badge } from "@/components/ui/badge";
import { SettingsCard } from "../components/settingsCard";
import { DownloadServicePingHistoryButton } from "./downloadServicePingHistoryButton";

interface OfflineLicenseCardProps {
license: OfflineLicenseMetadata;
Expand All@@ -15,34 +16,47 @@ export function OfflineLicenseCard({ license, isExpired }: OfflineLicenseCardPro

return (
<SettingsCard>
<div className="flex items-center justify-between gap-6">
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<p className="font-medium">Enterprise plan</p>
{isExpired && (
<Badge variant="outline" className="border-destructive/30 text-destructive">
Expired
</Badge>
)}
</div>
<div className="flex items-center gap-2 text-xs text-muted-foreground mt-0.5">
<code className="font-mono">{truncatedId}</code>
<div className="flex flex-col gap-4">
<div className="flex items-center justify-between gap-6">
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<p className="font-medium">Enterprise plan</p>
{isExpired && (
<Badge variant="outline" className="border-destructive/30 text-destructive">
Expired
</Badge>
)}
</div>
<div className="flex items-center gap-2 text-xs text-muted-foreground mt-0.5">
<code className="font-mono">{truncatedId}</code>
</div>
</div>
</div>
<div className="flex items-center gap-12">
{license.seats !== undefined && (
<div className="flex items-center gap-12">
{license.seats !== undefined && (
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">Billed seats</p>
<p className="text-sm">{license.seats}</p>
</div>
)}
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">Billed seats</p>
<p className="text-sm">{license.seats}</p>
<p className="text-xs text-muted-foreground">
{isExpired ? "Expired on" : "Expires on"}
</p>
<p className="text-sm">{formatDate(expiryDate)}</p>
</div>
)}
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">
{isExpired ? "Expired on" : "Expires on"}
</p>
<p className="text-sm">{formatDate(expiryDate)}</p>
</div>
</div>
<div className="flex items-center justify-between gap-6 border-t border-border pt-4">
<p className="text-xs text-muted-foreground">
Your instance doesn&apos;t report usage automatically. Usage data must be
manually sent to{" "}
<a href="mailto:ar@sourcebot.dev" className="text-primary hover:underline">
ar@sourcebot.dev
</a>
.
</p>
<DownloadServicePingHistoryButton />
</div>
</div>
</SettingsCard>
);
Expand Down
33 changes: 32 additions & 1 deletion packages/web/src/features/billing/servicePing.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,13 @@ import { existsSync } from "fs";
import { SINGLE_TENANT_ORG_ID } from "@/lib/constants";
import { isServiceError } from "@/lib/utils";
import { __unsafePrisma } from "@/prisma";
import { createLogger, decryptActivationCode, env, SOURCEBOT_VERSION } from "@sourcebot/shared";
import {
createLogger,
decryptActivationCode,
env,
SOURCEBOT_VERSION,
isValidOfflineLicenseActive
} from "@sourcebot/shared";
import { client } from "./client";
import { ServicePingRequest } from "./types";
import { ServiceErrorException } from "@/lib/serviceError";
Expand DownExpand Up@@ -83,6 +89,13 @@ export const syncWithLighthouse = async (orgId: number) => {
...(activationCode && { activationCode }),
};

await recordServicePingInDB(orgId, payload);

if (isValidOfflineLicenseActive()) {
logger.debug('Skipping service ping: active offline license detected.');
return;
}

const response = await client.ping(payload);
Comment thread
brendan-kellam marked this conversation as resolved.
if (isServiceError(response)) {
logger.error(`Service ping failed:\n ${JSON.stringify(response, null, 2)}`)
Expand DownExpand Up@@ -172,3 +185,21 @@ const inferDeploymentType = (): string => {
}
return 'other';
};

const recordServicePingInDB = async (orgId: number, payload: ServicePingRequest) => {
// Strip the activation code before persisting.
const { activationCode: _activationCode, ...sanitizedPayload } = payload;

try {
await __unsafePrisma.servicePingEvent.create({
data: {
orgId,
payload: sanitizedPayload,
},
});
} catch (error) {
// Recording the ping is best-effort: a failure here must not prevent
// the actual ping from being sent to Lighthouse.
logger.error(`Failed to record service ping in database:\n ${error}`);
}
};
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added
- Recorded service ping history locally and added a "Download usage report" button to the offline license settings page, so offline deployments can export their usage and send it to us. [#1348](https://github.com/sourcebot-dev/sourcebot/pull/1348)

### Fixed
- Upgraded `@grpc/grpc-js` to `^1.14.4`. [#1315](https://github.com/sourcebot-dev/sourcebot/pull/1315)
- Upgraded `vite` to `^8.0.16`. [#1313](https://github.com/sourcebot-dev/sourcebot/pull/1313)
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
-- CreateTable
CREATE TABLE "ServicePingEvent" (
"id" TEXT NOT NULL,
"payload" JSONB NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"orgId" INTEGER NOT NULL,

CONSTRAINT "ServicePingEvent_pkey" PRIMARY KEY ("id")
);
Comment thread
brendan-kellam marked this conversation as resolved.

-- AddForeignKey
ALTER TABLE "ServicePingEvent" ADD CONSTRAINT "ServicePingEvent_orgId_fkey" FOREIGN KEY ("orgId") REFERENCES "Org"("id") ON DELETE CASCADE ON UPDATE CASCADE;
10 changes: 10 additions & 0 deletions packages/db/prisma/schema.prisma
Original file line numberDiff line numberDiff line change
Expand Up@@ -318,6 +318,7 @@ model Org {
mcpServers McpServer[]

license License?
servicePingEvents ServicePingEvent[]
}

model License {
Expand DownExpand Up@@ -358,6 +359,15 @@ model License {
updatedAt DateTime @updatedAt
}

model ServicePingEvent {
id String @id @default(cuid())
payload Json
createdAt DateTime @default(now())

org Org @relation(fields: [orgId], references: [id], onDelete: Cascade)
orgId Int
}
Comment thread
brendan-kellam marked this conversation as resolved.

enum OrgRole {
OWNER
MEMBER
Expand Down
12 changes: 10 additions & 2 deletions packages/shared/src/entitlements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,10 +120,18 @@ const getValidOnlineLicense = (_license: License | null): License | null => {
return null;
}

export const isValidOfflineLicenseActive = (): boolean => {
return getValidOfflineLicense() !== null;
}

export const isValidOnlineLicenseActive = (_license: License | null): boolean => {
return getValidOnlineLicense(_license) !== null;
}

export const isValidLicenseActive = (_license: License | null): boolean => {
return (
getValidOfflineLicense() !== null ||
getValidOnlineLicense(_license) !== null
isValidOfflineLicenseActive() ||
isValidOnlineLicenseActive(_license)
);
}

Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ export {
getEntitlements as _getEntitlements,
isAnonymousAccessAvailable as _isAnonymousAccessAvailable,
isValidLicenseActive as _isValidLicenseActive,
isValidOfflineLicenseActive,
isValidOnlineLicenseActive as _isValidOnlineLicenseActive,
getSeatCap,
getOfflineLicenseMetadata,
STALE_ONLINE_LICENSE_THRESHOLD_MS,
Expand Down
30 changes: 30 additions & 0 deletions packages/web/src/app/(app)/settings/license/actions.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
'use server';

import { sew } from "@/middleware/sew";
import { withAuth } from "@/middleware/withAuth";
import { withMinimumOrgRole } from "@/middleware/withMinimumOrgRole";
import { OrgRole } from "@sourcebot/db";
import { ServiceError } from "@/lib/serviceError";

export interface ServicePingHistoryEntry {
createdAt: string;
payload: unknown;
}

// Returns the recorded Service Ping history so offline deployments can export
// it and send it back to us out-of-band (they can't reach Lighthouse directly).
export const getServicePingHistory = async (): Promise<ServicePingHistoryEntry[] | ServiceError> => sew(() =>
withAuth(async ({ org, role, prisma }) =>
withMinimumOrgRole(role, OrgRole.OWNER, async () => {
const events = await prisma.servicePingEvent.findMany({
where: { orgId: org.id },
orderBy: { createdAt: 'asc' },
});
Comment thread
brendan-kellam marked this conversation as resolved.

return events.map((event) => ({
createdAt: event.createdAt.toISOString(),
payload: event.payload,
}));
})
)
);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
'use client';

import { useCallback, useState } from "react";
import { Download } from "lucide-react";
import { LoadingButton } from "@/components/ui/loading-button";
import { useToast } from "@/components/hooks/use-toast";
import { isServiceError } from "@/lib/utils";
import { getServicePingHistory } from "./actions";

export function DownloadServicePingHistoryButton() {
const [isLoading, setIsLoading] = useState(false);
const { toast } = useToast();

const handleDownload = useCallback(async () => {
setIsLoading(true);
try {
const result = await getServicePingHistory();

if (isServiceError(result)) {
toast({
description: "Failed to export service ping history. Please try again.",
variant: "destructive",
});
return;
}

if (result.length === 0) {
toast({
description: "No service ping history has been recorded yet.",
});
return;
}

const blob = new Blob([JSON.stringify(result, null, 2)], {
type: "application/json",
});
const url = URL.createObjectURL(blob);
const anchor = document.createElement("a");
anchor.href = url;
anchor.download = `${new Date().toISOString().slice(0, 10)}-usage-history.json`;
document.body.appendChild(anchor);
anchor.click();
document.body.removeChild(anchor);
URL.revokeObjectURL(url);
} finally {
setIsLoading(false);
}
}, [toast]);

return (
<LoadingButton
variant="outline"
size="sm"
onClick={handleDownload}
loading={isLoading}
>
{!isLoading && <Download className="h-3.5 w-3.5" />}
Download usage report
</LoadingButton>
);
}
60 changes: 37 additions & 23 deletions packages/web/src/app/(app)/settings/license/offlineLicenseCard.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { OfflineLicenseMetadata } from "@sourcebot/shared";
import { Badge } from "@/components/ui/badge";
import { SettingsCard } from "../components/settingsCard";
import { DownloadServicePingHistoryButton } from "./downloadServicePingHistoryButton";

interface OfflineLicenseCardProps {
license: OfflineLicenseMetadata;
Expand All@@ -15,34 +16,47 @@ export function OfflineLicenseCard({ license, isExpired }: OfflineLicenseCardPro

return (
<SettingsCard>
<div className="flex items-center justify-between gap-6">
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<p className="font-medium">Enterprise plan</p>
{isExpired && (
<Badge variant="outline" className="border-destructive/30 text-destructive">
Expired
</Badge>
)}
</div>
<div className="flex items-center gap-2 text-xs text-muted-foreground mt-0.5">
<code className="font-mono">{truncatedId}</code>
<div className="flex flex-col gap-4">
<div className="flex items-center justify-between gap-6">
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<p className="font-medium">Enterprise plan</p>
{isExpired && (
<Badge variant="outline" className="border-destructive/30 text-destructive">
Expired
</Badge>
)}
</div>
<div className="flex items-center gap-2 text-xs text-muted-foreground mt-0.5">
<code className="font-mono">{truncatedId}</code>
</div>
</div>
</div>
<div className="flex items-center gap-12">
{license.seats !== undefined && (
<div className="flex items-center gap-12">
{license.seats !== undefined && (
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">Billed seats</p>
<p className="text-sm">{license.seats}</p>
</div>
)}
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">Billed seats</p>
<p className="text-sm">{license.seats}</p>
<p className="text-xs text-muted-foreground">
{isExpired ? "Expired on" : "Expires on"}
</p>
<p className="text-sm">{formatDate(expiryDate)}</p>
</div>
)}
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">
{isExpired ? "Expired on" : "Expires on"}
</p>
<p className="text-sm">{formatDate(expiryDate)}</p>
</div>
</div>
<div className="flex items-center justify-between gap-6 border-t border-border pt-4">
<p className="text-xs text-muted-foreground">
Your instance doesn&apos;t report usage automatically. Usage data must be
manually sent to{" "}
<a href="mailto:ar@sourcebot.dev" className="text-primary hover:underline">
ar@sourcebot.dev
</a>
.
</p>
<DownloadServicePingHistoryButton />
</div>
</div>
</SettingsCard>
);
Expand Down
33 changes: 32 additions & 1 deletion packages/web/src/features/billing/servicePing.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,13 @@ import { existsSync } from "fs";
import { SINGLE_TENANT_ORG_ID } from "@/lib/constants";
import { isServiceError } from "@/lib/utils";
import { __unsafePrisma } from "@/prisma";
import { createLogger, decryptActivationCode, env, SOURCEBOT_VERSION } from "@sourcebot/shared";
import {
createLogger,
decryptActivationCode,
env,
SOURCEBOT_VERSION,
isValidOfflineLicenseActive
} from "@sourcebot/shared";
import { client } from "./client";
import { ServicePingRequest } from "./types";
import { ServiceErrorException } from "@/lib/serviceError";
Expand DownExpand Up@@ -83,6 +89,13 @@ export const syncWithLighthouse = async (orgId: number) => {
...(activationCode && { activationCode }),
};

await recordServicePingInDB(orgId, payload);

if (isValidOfflineLicenseActive()) {
logger.debug('Skipping service ping: active offline license detected.');
return;
}

const response = await client.ping(payload);
Comment thread
brendan-kellam marked this conversation as resolved.
if (isServiceError(response)) {
logger.error(`Service ping failed:\n ${JSON.stringify(response, null, 2)}`)
Expand DownExpand Up@@ -172,3 +185,21 @@ const inferDeploymentType = (): string => {
}
return 'other';
};

const recordServicePingInDB = async (orgId: number, payload: ServicePingRequest) => {
// Strip the activation code before persisting.
const { activationCode: _activationCode, ...sanitizedPayload } = payload;

try {
await __unsafePrisma.servicePingEvent.create({
data: {
orgId,
payload: sanitizedPayload,
},
});
} catch (error) {
// Recording the ping is best-effort: a failure here must not prevent
// the actual ping from being sent to Lighthouse.
logger.error(`Failed to record service ping in database:\n ${error}`);
}
};
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added
- Recorded service ping history locally and added a "Download usage report" button to the offline license settings page, so offline deployments can export their usage and send it to us. [#1348](https://github.com/sourcebot-dev/sourcebot/pull/1348)

### Fixed
- Upgraded `@grpc/grpc-js` to `^1.14.4`. [#1315](https://github.com/sourcebot-dev/sourcebot/pull/1315)
- Upgraded `vite` to `^8.0.16`. [#1313](https://github.com/sourcebot-dev/sourcebot/pull/1313)
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
-- CreateTable
CREATE TABLE "ServicePingEvent" (
"id" TEXT NOT NULL,
"payload" JSONB NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"orgId" INTEGER NOT NULL,

CONSTRAINT "ServicePingEvent_pkey" PRIMARY KEY ("id")
);
Comment thread
brendan-kellam marked this conversation as resolved.

-- AddForeignKey
ALTER TABLE "ServicePingEvent" ADD CONSTRAINT "ServicePingEvent_orgId_fkey" FOREIGN KEY ("orgId") REFERENCES "Org"("id") ON DELETE CASCADE ON UPDATE CASCADE;
10 changes: 10 additions & 0 deletions packages/db/prisma/schema.prisma
Original file line numberDiff line numberDiff line change
Expand Up@@ -318,6 +318,7 @@ model Org {
mcpServers McpServer[]

license License?
servicePingEvents ServicePingEvent[]
}

model License {
Expand DownExpand Up@@ -358,6 +359,15 @@ model License {
updatedAt DateTime @updatedAt
}

model ServicePingEvent {
id String @id @default(cuid())
payload Json
createdAt DateTime @default(now())

org Org @relation(fields: [orgId], references: [id], onDelete: Cascade)
orgId Int
}
Comment thread
brendan-kellam marked this conversation as resolved.

enum OrgRole {
OWNER
MEMBER
Expand Down
12 changes: 10 additions & 2 deletions packages/shared/src/entitlements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,10 +120,18 @@ const getValidOnlineLicense = (_license: License | null): License | null => {
return null;
}

export const isValidOfflineLicenseActive = (): boolean => {
return getValidOfflineLicense() !== null;
}

export const isValidOnlineLicenseActive = (_license: License | null): boolean => {
return getValidOnlineLicense(_license) !== null;
}

export const isValidLicenseActive = (_license: License | null): boolean => {
return (
getValidOfflineLicense() !== null ||
getValidOnlineLicense(_license) !== null
isValidOfflineLicenseActive() ||
isValidOnlineLicenseActive(_license)
);
}

Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ export {
getEntitlements as _getEntitlements,
isAnonymousAccessAvailable as _isAnonymousAccessAvailable,
isValidLicenseActive as _isValidLicenseActive,
isValidOfflineLicenseActive,
isValidOnlineLicenseActive as _isValidOnlineLicenseActive,
getSeatCap,
getOfflineLicenseMetadata,
STALE_ONLINE_LICENSE_THRESHOLD_MS,
Expand Down
30 changes: 30 additions & 0 deletions packages/web/src/app/(app)/settings/license/actions.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
'use server';

import { sew } from "@/middleware/sew";
import { withAuth } from "@/middleware/withAuth";
import { withMinimumOrgRole } from "@/middleware/withMinimumOrgRole";
import { OrgRole } from "@sourcebot/db";
import { ServiceError } from "@/lib/serviceError";

export interface ServicePingHistoryEntry {
createdAt: string;
payload: unknown;
}

// Returns the recorded Service Ping history so offline deployments can export
// it and send it back to us out-of-band (they can't reach Lighthouse directly).
export const getServicePingHistory = async (): Promise<ServicePingHistoryEntry[] | ServiceError> => sew(() =>
withAuth(async ({ org, role, prisma }) =>
withMinimumOrgRole(role, OrgRole.OWNER, async () => {
const events = await prisma.servicePingEvent.findMany({
where: { orgId: org.id },
orderBy: { createdAt: 'asc' },
});
Comment thread
brendan-kellam marked this conversation as resolved.

return events.map((event) => ({
createdAt: event.createdAt.toISOString(),
payload: event.payload,
}));
})
)
);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
'use client';

import { useCallback, useState } from "react";
import { Download } from "lucide-react";
import { LoadingButton } from "@/components/ui/loading-button";
import { useToast } from "@/components/hooks/use-toast";
import { isServiceError } from "@/lib/utils";
import { getServicePingHistory } from "./actions";

export function DownloadServicePingHistoryButton() {
const [isLoading, setIsLoading] = useState(false);
const { toast } = useToast();

const handleDownload = useCallback(async () => {
setIsLoading(true);
try {
const result = await getServicePingHistory();

if (isServiceError(result)) {
toast({
description: "Failed to export service ping history. Please try again.",
variant: "destructive",
});
return;
}

if (result.length === 0) {
toast({
description: "No service ping history has been recorded yet.",
});
return;
}

const blob = new Blob([JSON.stringify(result, null, 2)], {
type: "application/json",
});
const url = URL.createObjectURL(blob);
const anchor = document.createElement("a");
anchor.href = url;
anchor.download = `${new Date().toISOString().slice(0, 10)}-usage-history.json`;
document.body.appendChild(anchor);
anchor.click();
document.body.removeChild(anchor);
URL.revokeObjectURL(url);
} finally {
setIsLoading(false);
}
}, [toast]);

return (
<LoadingButton
variant="outline"
size="sm"
onClick={handleDownload}
loading={isLoading}
>
{!isLoading && <Download className="h-3.5 w-3.5" />}
Download usage report
</LoadingButton>
);
}
60 changes: 37 additions & 23 deletions packages/web/src/app/(app)/settings/license/offlineLicenseCard.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { OfflineLicenseMetadata } from "@sourcebot/shared";
import { Badge } from "@/components/ui/badge";
import { SettingsCard } from "../components/settingsCard";
import { DownloadServicePingHistoryButton } from "./downloadServicePingHistoryButton";

interface OfflineLicenseCardProps {
license: OfflineLicenseMetadata;
Expand All@@ -15,34 +16,47 @@ export function OfflineLicenseCard({ license, isExpired }: OfflineLicenseCardPro

return (
<SettingsCard>
<div className="flex items-center justify-between gap-6">
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<p className="font-medium">Enterprise plan</p>
{isExpired && (
<Badge variant="outline" className="border-destructive/30 text-destructive">
Expired
</Badge>
)}
</div>
<div className="flex items-center gap-2 text-xs text-muted-foreground mt-0.5">
<code className="font-mono">{truncatedId}</code>
<div className="flex flex-col gap-4">
<div className="flex items-center justify-between gap-6">
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<p className="font-medium">Enterprise plan</p>
{isExpired && (
<Badge variant="outline" className="border-destructive/30 text-destructive">
Expired
</Badge>
)}
</div>
<div className="flex items-center gap-2 text-xs text-muted-foreground mt-0.5">
<code className="font-mono">{truncatedId}</code>
</div>
</div>
</div>
<div className="flex items-center gap-12">
{license.seats !== undefined && (
<div className="flex items-center gap-12">
{license.seats !== undefined && (
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">Billed seats</p>
<p className="text-sm">{license.seats}</p>
</div>
)}
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">Billed seats</p>
<p className="text-sm">{license.seats}</p>
<p className="text-xs text-muted-foreground">
{isExpired ? "Expired on" : "Expires on"}
</p>
<p className="text-sm">{formatDate(expiryDate)}</p>
</div>
)}
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">
{isExpired ? "Expired on" : "Expires on"}
</p>
<p className="text-sm">{formatDate(expiryDate)}</p>
</div>
</div>
<div className="flex items-center justify-between gap-6 border-t border-border pt-4">
<p className="text-xs text-muted-foreground">
Your instance doesn&apos;t report usage automatically. Usage data must be
manually sent to{" "}
<a href="mailto:ar@sourcebot.dev" className="text-primary hover:underline">
ar@sourcebot.dev
</a>
.
</p>
<DownloadServicePingHistoryButton />
</div>
</div>
</SettingsCard>
);
Expand Down
33 changes: 32 additions & 1 deletion packages/web/src/features/billing/servicePing.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,13 @@ import { existsSync } from "fs";
import { SINGLE_TENANT_ORG_ID } from "@/lib/constants";
import { isServiceError } from "@/lib/utils";
import { __unsafePrisma } from "@/prisma";
import { createLogger, decryptActivationCode, env, SOURCEBOT_VERSION } from "@sourcebot/shared";
import {
createLogger,
decryptActivationCode,
env,
SOURCEBOT_VERSION,
isValidOfflineLicenseActive
} from "@sourcebot/shared";
import { client } from "./client";
import { ServicePingRequest } from "./types";
import { ServiceErrorException } from "@/lib/serviceError";
Expand DownExpand Up@@ -83,6 +89,13 @@ export const syncWithLighthouse = async (orgId: number) => {
...(activationCode && { activationCode }),
};

await recordServicePingInDB(orgId, payload);

if (isValidOfflineLicenseActive()) {
logger.debug('Skipping service ping: active offline license detected.');
return;
}

const response = await client.ping(payload);
Comment thread
brendan-kellam marked this conversation as resolved.
if (isServiceError(response)) {
logger.error(`Service ping failed:\n ${JSON.stringify(response, null, 2)}`)
Expand DownExpand Up@@ -172,3 +185,21 @@ const inferDeploymentType = (): string => {
}
return 'other';
};

const recordServicePingInDB = async (orgId: number, payload: ServicePingRequest) => {
// Strip the activation code before persisting.
const { activationCode: _activationCode, ...sanitizedPayload } = payload;

try {
await __unsafePrisma.servicePingEvent.create({
data: {
orgId,
payload: sanitizedPayload,
},
});
} catch (error) {
// Recording the ping is best-effort: a failure here must not prevent
// the actual ping from being sent to Lighthouse.
logger.error(`Failed to record service ping in database:\n ${error}`);
}
};
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added
- Recorded service ping history locally and added a "Download usage report" button to the offline license settings page, so offline deployments can export their usage and send it to us. [#1348](https://github.com/sourcebot-dev/sourcebot/pull/1348)

### Fixed
- Upgraded `@grpc/grpc-js` to `^1.14.4`. [#1315](https://github.com/sourcebot-dev/sourcebot/pull/1315)
- Upgraded `vite` to `^8.0.16`. [#1313](https://github.com/sourcebot-dev/sourcebot/pull/1313)
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
-- CreateTable
CREATE TABLE "ServicePingEvent" (
"id" TEXT NOT NULL,
"payload" JSONB NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"orgId" INTEGER NOT NULL,

CONSTRAINT "ServicePingEvent_pkey" PRIMARY KEY ("id")
);
Comment thread
brendan-kellam marked this conversation as resolved.

-- AddForeignKey
ALTER TABLE "ServicePingEvent" ADD CONSTRAINT "ServicePingEvent_orgId_fkey" FOREIGN KEY ("orgId") REFERENCES "Org"("id") ON DELETE CASCADE ON UPDATE CASCADE;
10 changes: 10 additions & 0 deletions packages/db/prisma/schema.prisma
Original file line numberDiff line numberDiff line change
Expand Up@@ -318,6 +318,7 @@ model Org {
mcpServers McpServer[]

license License?
servicePingEvents ServicePingEvent[]
}

model License {
Expand DownExpand Up@@ -358,6 +359,15 @@ model License {
updatedAt DateTime @updatedAt
}

model ServicePingEvent {
id String @id @default(cuid())
payload Json
createdAt DateTime @default(now())

org Org @relation(fields: [orgId], references: [id], onDelete: Cascade)
orgId Int
}
Comment thread
brendan-kellam marked this conversation as resolved.

enum OrgRole {
OWNER
MEMBER
Expand Down
12 changes: 10 additions & 2 deletions packages/shared/src/entitlements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,10 +120,18 @@ const getValidOnlineLicense = (_license: License | null): License | null => {
return null;
}

export const isValidOfflineLicenseActive = (): boolean => {
return getValidOfflineLicense() !== null;
}

export const isValidOnlineLicenseActive = (_license: License | null): boolean => {
return getValidOnlineLicense(_license) !== null;
}

export const isValidLicenseActive = (_license: License | null): boolean => {
return (
getValidOfflineLicense() !== null ||
getValidOnlineLicense(_license) !== null
isValidOfflineLicenseActive() ||
isValidOnlineLicenseActive(_license)
);
}

Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ export {
getEntitlements as _getEntitlements,
isAnonymousAccessAvailable as _isAnonymousAccessAvailable,
isValidLicenseActive as _isValidLicenseActive,
isValidOfflineLicenseActive,
isValidOnlineLicenseActive as _isValidOnlineLicenseActive,
getSeatCap,
getOfflineLicenseMetadata,
STALE_ONLINE_LICENSE_THRESHOLD_MS,
Expand Down
30 changes: 30 additions & 0 deletions packages/web/src/app/(app)/settings/license/actions.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
'use server';

import { sew } from "@/middleware/sew";
import { withAuth } from "@/middleware/withAuth";
import { withMinimumOrgRole } from "@/middleware/withMinimumOrgRole";
import { OrgRole } from "@sourcebot/db";
import { ServiceError } from "@/lib/serviceError";

export interface ServicePingHistoryEntry {
createdAt: string;
payload: unknown;
}

// Returns the recorded Service Ping history so offline deployments can export
// it and send it back to us out-of-band (they can't reach Lighthouse directly).
export const getServicePingHistory = async (): Promise<ServicePingHistoryEntry[] | ServiceError> => sew(() =>
withAuth(async ({ org, role, prisma }) =>
withMinimumOrgRole(role, OrgRole.OWNER, async () => {
const events = await prisma.servicePingEvent.findMany({
where: { orgId: org.id },
orderBy: { createdAt: 'asc' },
});
Comment thread
brendan-kellam marked this conversation as resolved.

return events.map((event) => ({
createdAt: event.createdAt.toISOString(),
payload: event.payload,
}));
})
)
);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
'use client';

import { useCallback, useState } from "react";
import { Download } from "lucide-react";
import { LoadingButton } from "@/components/ui/loading-button";
import { useToast } from "@/components/hooks/use-toast";
import { isServiceError } from "@/lib/utils";
import { getServicePingHistory } from "./actions";

export function DownloadServicePingHistoryButton() {
const [isLoading, setIsLoading] = useState(false);
const { toast } = useToast();

const handleDownload = useCallback(async () => {
setIsLoading(true);
try {
const result = await getServicePingHistory();

if (isServiceError(result)) {
toast({
description: "Failed to export service ping history. Please try again.",
variant: "destructive",
});
return;
}

if (result.length === 0) {
toast({
description: "No service ping history has been recorded yet.",
});
return;
}

const blob = new Blob([JSON.stringify(result, null, 2)], {
type: "application/json",
});
const url = URL.createObjectURL(blob);
const anchor = document.createElement("a");
anchor.href = url;
anchor.download = `${new Date().toISOString().slice(0, 10)}-usage-history.json`;
document.body.appendChild(anchor);
anchor.click();
document.body.removeChild(anchor);
URL.revokeObjectURL(url);
} finally {
setIsLoading(false);
}
}, [toast]);

return (
<LoadingButton
variant="outline"
size="sm"
onClick={handleDownload}
loading={isLoading}
>
{!isLoading && <Download className="h-3.5 w-3.5" />}
Download usage report
</LoadingButton>
);
}
60 changes: 37 additions & 23 deletions packages/web/src/app/(app)/settings/license/offlineLicenseCard.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { OfflineLicenseMetadata } from "@sourcebot/shared";
import { Badge } from "@/components/ui/badge";
import { SettingsCard } from "../components/settingsCard";
import { DownloadServicePingHistoryButton } from "./downloadServicePingHistoryButton";

interface OfflineLicenseCardProps {
license: OfflineLicenseMetadata;
Expand All@@ -15,34 +16,47 @@ export function OfflineLicenseCard({ license, isExpired }: OfflineLicenseCardPro

return (
<SettingsCard>
<div className="flex items-center justify-between gap-6">
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<p className="font-medium">Enterprise plan</p>
{isExpired && (
<Badge variant="outline" className="border-destructive/30 text-destructive">
Expired
</Badge>
)}
</div>
<div className="flex items-center gap-2 text-xs text-muted-foreground mt-0.5">
<code className="font-mono">{truncatedId}</code>
<div className="flex flex-col gap-4">
<div className="flex items-center justify-between gap-6">
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<p className="font-medium">Enterprise plan</p>
{isExpired && (
<Badge variant="outline" className="border-destructive/30 text-destructive">
Expired
</Badge>
)}
</div>
<div className="flex items-center gap-2 text-xs text-muted-foreground mt-0.5">
<code className="font-mono">{truncatedId}</code>
</div>
</div>
</div>
<div className="flex items-center gap-12">
{license.seats !== undefined && (
<div className="flex items-center gap-12">
{license.seats !== undefined && (
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">Billed seats</p>
<p className="text-sm">{license.seats}</p>
</div>
)}
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">Billed seats</p>
<p className="text-sm">{license.seats}</p>
<p className="text-xs text-muted-foreground">
{isExpired ? "Expired on" : "Expires on"}
</p>
<p className="text-sm">{formatDate(expiryDate)}</p>
</div>
)}
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">
{isExpired ? "Expired on" : "Expires on"}
</p>
<p className="text-sm">{formatDate(expiryDate)}</p>
</div>
</div>
<div className="flex items-center justify-between gap-6 border-t border-border pt-4">
<p className="text-xs text-muted-foreground">
Your instance doesn&apos;t report usage automatically. Usage data must be
manually sent to{" "}
<a href="mailto:ar@sourcebot.dev" className="text-primary hover:underline">
ar@sourcebot.dev
</a>
.
</p>
<DownloadServicePingHistoryButton />
</div>
</div>
</SettingsCard>
);
Expand Down
33 changes: 32 additions & 1 deletion packages/web/src/features/billing/servicePing.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,13 @@ import { existsSync } from "fs";
import { SINGLE_TENANT_ORG_ID } from "@/lib/constants";
import { isServiceError } from "@/lib/utils";
import { __unsafePrisma } from "@/prisma";
import { createLogger, decryptActivationCode, env, SOURCEBOT_VERSION } from "@sourcebot/shared";
import {
createLogger,
decryptActivationCode,
env,
SOURCEBOT_VERSION,
isValidOfflineLicenseActive
} from "@sourcebot/shared";
import { client } from "./client";
import { ServicePingRequest } from "./types";
import { ServiceErrorException } from "@/lib/serviceError";
Expand DownExpand Up@@ -83,6 +89,13 @@ export const syncWithLighthouse = async (orgId: number) => {
...(activationCode && { activationCode }),
};

await recordServicePingInDB(orgId, payload);

if (isValidOfflineLicenseActive()) {
logger.debug('Skipping service ping: active offline license detected.');
return;
}

const response = await client.ping(payload);
Comment thread
brendan-kellam marked this conversation as resolved.
if (isServiceError(response)) {
logger.error(`Service ping failed:\n ${JSON.stringify(response, null, 2)}`)
Expand DownExpand Up@@ -172,3 +185,21 @@ const inferDeploymentType = (): string => {
}
return 'other';
};

const recordServicePingInDB = async (orgId: number, payload: ServicePingRequest) => {
// Strip the activation code before persisting.
const { activationCode: _activationCode, ...sanitizedPayload } = payload;

try {
await __unsafePrisma.servicePingEvent.create({
data: {
orgId,
payload: sanitizedPayload,
},
});
} catch (error) {
// Recording the ping is best-effort: a failure here must not prevent
// the actual ping from being sent to Lighthouse.
logger.error(`Failed to record service ping in database:\n ${error}`);
}
};
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added
- Recorded service ping history locally and added a "Download usage report" button to the offline license settings page, so offline deployments can export their usage and send it to us. [#1348](https://github.com/sourcebot-dev/sourcebot/pull/1348)

### Fixed
- Upgraded `@grpc/grpc-js` to `^1.14.4`. [#1315](https://github.com/sourcebot-dev/sourcebot/pull/1315)
- Upgraded `vite` to `^8.0.16`. [#1313](https://github.com/sourcebot-dev/sourcebot/pull/1313)
Expand Down
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
-- CreateTable
CREATE TABLE "ServicePingEvent" (
"id" TEXT NOT NULL,
"payload" JSONB NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
"orgId" INTEGER NOT NULL,

CONSTRAINT "ServicePingEvent_pkey" PRIMARY KEY ("id")
);
Comment thread
brendan-kellam marked this conversation as resolved.

-- AddForeignKey
ALTER TABLE "ServicePingEvent" ADD CONSTRAINT "ServicePingEvent_orgId_fkey" FOREIGN KEY ("orgId") REFERENCES "Org"("id") ON DELETE CASCADE ON UPDATE CASCADE;
10 changes: 10 additions & 0 deletions packages/db/prisma/schema.prisma
Original file line numberDiff line numberDiff line change
Expand Up@@ -318,6 +318,7 @@ model Org {
mcpServers McpServer[]

license License?
servicePingEvents ServicePingEvent[]
}

model License {
Expand DownExpand Up@@ -358,6 +359,15 @@ model License {
updatedAt DateTime @updatedAt
}

model ServicePingEvent {
id String @id @default(cuid())
payload Json
createdAt DateTime @default(now())

org Org @relation(fields: [orgId], references: [id], onDelete: Cascade)
orgId Int
}
Comment thread
brendan-kellam marked this conversation as resolved.

enum OrgRole {
OWNER
MEMBER
Expand Down
12 changes: 10 additions & 2 deletions packages/shared/src/entitlements.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,10 +120,18 @@ const getValidOnlineLicense = (_license: License | null): License | null => {
return null;
}

export const isValidOfflineLicenseActive = (): boolean => {
return getValidOfflineLicense() !== null;
}

export const isValidOnlineLicenseActive = (_license: License | null): boolean => {
return getValidOnlineLicense(_license) !== null;
}

export const isValidLicenseActive = (_license: License | null): boolean => {
return (
getValidOfflineLicense() !== null ||
getValidOnlineLicense(_license) !== null
isValidOfflineLicenseActive() ||
isValidOnlineLicenseActive(_license)
);
}

Expand Down
2 changes: 2 additions & 0 deletions packages/shared/src/index.server.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,8 @@ export {
getEntitlements as _getEntitlements,
isAnonymousAccessAvailable as _isAnonymousAccessAvailable,
isValidLicenseActive as _isValidLicenseActive,
isValidOfflineLicenseActive,
isValidOnlineLicenseActive as _isValidOnlineLicenseActive,
getSeatCap,
getOfflineLicenseMetadata,
STALE_ONLINE_LICENSE_THRESHOLD_MS,
Expand Down
30 changes: 30 additions & 0 deletions packages/web/src/app/(app)/settings/license/actions.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
'use server';

import { sew } from "@/middleware/sew";
import { withAuth } from "@/middleware/withAuth";
import { withMinimumOrgRole } from "@/middleware/withMinimumOrgRole";
import { OrgRole } from "@sourcebot/db";
import { ServiceError } from "@/lib/serviceError";

export interface ServicePingHistoryEntry {
createdAt: string;
payload: unknown;
}

// Returns the recorded Service Ping history so offline deployments can export
// it and send it back to us out-of-band (they can't reach Lighthouse directly).
export const getServicePingHistory = async (): Promise<ServicePingHistoryEntry[] | ServiceError> => sew(() =>
withAuth(async ({ org, role, prisma }) =>
withMinimumOrgRole(role, OrgRole.OWNER, async () => {
const events = await prisma.servicePingEvent.findMany({
where: { orgId: org.id },
orderBy: { createdAt: 'asc' },
});
Comment thread
brendan-kellam marked this conversation as resolved.

return events.map((event) => ({
createdAt: event.createdAt.toISOString(),
payload: event.payload,
}));
})
)
);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
'use client';

import { useCallback, useState } from "react";
import { Download } from "lucide-react";
import { LoadingButton } from "@/components/ui/loading-button";
import { useToast } from "@/components/hooks/use-toast";
import { isServiceError } from "@/lib/utils";
import { getServicePingHistory } from "./actions";

export function DownloadServicePingHistoryButton() {
const [isLoading, setIsLoading] = useState(false);
const { toast } = useToast();

const handleDownload = useCallback(async () => {
setIsLoading(true);
try {
const result = await getServicePingHistory();

if (isServiceError(result)) {
toast({
description: "Failed to export service ping history. Please try again.",
variant: "destructive",
});
return;
}

if (result.length === 0) {
toast({
description: "No service ping history has been recorded yet.",
});
return;
}

const blob = new Blob([JSON.stringify(result, null, 2)], {
type: "application/json",
});
const url = URL.createObjectURL(blob);
const anchor = document.createElement("a");
anchor.href = url;
anchor.download = `${new Date().toISOString().slice(0, 10)}-usage-history.json`;
document.body.appendChild(anchor);
anchor.click();
document.body.removeChild(anchor);
URL.revokeObjectURL(url);
} finally {
setIsLoading(false);
}
}, [toast]);

return (
<LoadingButton
variant="outline"
size="sm"
onClick={handleDownload}
loading={isLoading}
>
{!isLoading && <Download className="h-3.5 w-3.5" />}
Download usage report
</LoadingButton>
);
}
60 changes: 37 additions & 23 deletions packages/web/src/app/(app)/settings/license/offlineLicenseCard.tsx
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import type { OfflineLicenseMetadata } from "@sourcebot/shared";
import { Badge } from "@/components/ui/badge";
import { SettingsCard } from "../components/settingsCard";
import { DownloadServicePingHistoryButton } from "./downloadServicePingHistoryButton";

interface OfflineLicenseCardProps {
license: OfflineLicenseMetadata;
Expand All@@ -15,34 +16,47 @@ export function OfflineLicenseCard({ license, isExpired }: OfflineLicenseCardPro

return (
<SettingsCard>
<div className="flex items-center justify-between gap-6">
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<p className="font-medium">Enterprise plan</p>
{isExpired && (
<Badge variant="outline" className="border-destructive/30 text-destructive">
Expired
</Badge>
)}
</div>
<div className="flex items-center gap-2 text-xs text-muted-foreground mt-0.5">
<code className="font-mono">{truncatedId}</code>
<div className="flex flex-col gap-4">
<div className="flex items-center justify-between gap-6">
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<p className="font-medium">Enterprise plan</p>
{isExpired && (
<Badge variant="outline" className="border-destructive/30 text-destructive">
Expired
</Badge>
)}
</div>
<div className="flex items-center gap-2 text-xs text-muted-foreground mt-0.5">
<code className="font-mono">{truncatedId}</code>
</div>
</div>
</div>
<div className="flex items-center gap-12">
{license.seats !== undefined && (
<div className="flex items-center gap-12">
{license.seats !== undefined && (
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">Billed seats</p>
<p className="text-sm">{license.seats}</p>
</div>
)}
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">Billed seats</p>
<p className="text-sm">{license.seats}</p>
<p className="text-xs text-muted-foreground">
{isExpired ? "Expired on" : "Expires on"}
</p>
<p className="text-sm">{formatDate(expiryDate)}</p>
</div>
)}
<div className="flex flex-col items-end">
<p className="text-xs text-muted-foreground">
{isExpired ? "Expired on" : "Expires on"}
</p>
<p className="text-sm">{formatDate(expiryDate)}</p>
</div>
</div>
<div className="flex items-center justify-between gap-6 border-t border-border pt-4">
<p className="text-xs text-muted-foreground">
Your instance doesn&apos;t report usage automatically. Usage data must be
manually sent to{" "}
<a href="mailto:ar@sourcebot.dev" className="text-primary hover:underline">
ar@sourcebot.dev
</a>
.
</p>
<DownloadServicePingHistoryButton />
</div>
</div>
</SettingsCard>
);
Expand Down
33 changes: 32 additions & 1 deletion packages/web/src/features/billing/servicePing.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,13 @@ import { existsSync } from "fs";
import { SINGLE_TENANT_ORG_ID } from "@/lib/constants";
import { isServiceError } from "@/lib/utils";
import { __unsafePrisma } from "@/prisma";
import { createLogger, decryptActivationCode, env, SOURCEBOT_VERSION } from "@sourcebot/shared";
import {
createLogger,
decryptActivationCode,
env,
SOURCEBOT_VERSION,
isValidOfflineLicenseActive
} from "@sourcebot/shared";
import { client } from "./client";
import { ServicePingRequest } from "./types";
import { ServiceErrorException } from "@/lib/serviceError";
Expand DownExpand Up@@ -83,6 +89,13 @@ export const syncWithLighthouse = async (orgId: number) => {
...(activationCode && { activationCode }),
};

await recordServicePingInDB(orgId, payload);

if (isValidOfflineLicenseActive()) {
logger.debug('Skipping service ping: active offline license detected.');
return;
}

const response = await client.ping(payload);
Comment thread
brendan-kellam marked this conversation as resolved.
if (isServiceError(response)) {
logger.error(`Service ping failed:\n ${JSON.stringify(response, null, 2)}`)
Expand DownExpand Up@@ -172,3 +185,21 @@ const inferDeploymentType = (): string => {
}
return 'other';
};

const recordServicePingInDB = async (orgId: number, payload: ServicePingRequest) => {
// Strip the activation code before persisting.
const { activationCode: _activationCode, ...sanitizedPayload } = payload;

try {
await __unsafePrisma.servicePingEvent.create({
data: {
orgId,
payload: sanitizedPayload,
},
});
} catch (error) {
// Recording the ping is best-effort: a failure here must not prevent
// the actual ping from being sent to Lighthouse.
logger.error(`Failed to record service ping in database:\n ${error}`);
}
};
Loading