feedback

Author: brendan-kellam

…d_service_ping_event_table/migration.sql …d_service_ping_event_table/migration.sqlpackages/db/prisma/migrations/20260618182127_add_service_ping_event_table/migration.sql renamed to packages/db/prisma/migrations/20260618210032_add_service_ping_event_table/migration.sql packages/db/prisma/migrations/20260618182127_add_service_ping_event_table/migration.sql renamed to packages/db/prisma/migrations/20260618210032_add_service_ping_event_table/migration.sql

@@ -3,6 +3,10 @@ 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")
 );
+
+-- AddForeignKey
+ALTER TABLE "ServicePingEvent" ADD CONSTRAINT "ServicePingEvent_orgId_fkey" FOREIGN KEY ("orgId") REFERENCES "Org"("id") ON DELETE CASCADE ON UPDATE CASCADE;

packages/db/prisma/schema.prisma

@@ -318,6 +318,7 @@ model Org {
   mcpServers McpServer[]
 
   license License?
+  servicePingEvents ServicePingEvent[]
 }
 
 model License {
@@ -362,6 +363,9 @@ model ServicePingEvent {
   id String @id @default(cuid())
   payload Json
   createdAt DateTime @default(now())
+
+  org   Org @relation(fields: [orgId], references: [id], onDelete: Cascade)
+  orgId Int
 }
 
 enum OrgRole {

packages/shared/src/entitlements.ts

@@ -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)
     );
 }
 

packages/shared/src/index.server.ts

@@ -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,

packages/web/src/app/(app)/settings/license/actions.ts

@@ -14,9 +14,10 @@ export interface ServicePingHistoryEntry {
 // 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 ({ role, prisma }) =>
+    withAuth(async ({ org, role, prisma }) =>
         withMinimumOrgRole(role, OrgRole.OWNER, async () => {
             const events = await prisma.servicePingEvent.findMany({
+                where: { orgId: org.id },
                 orderBy: { createdAt: 'asc' },
             });
 

packages/web/src/features/billing/servicePing.ts

@@ -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";
@@ -83,7 +89,12 @@ export const syncWithLighthouse = async (orgId: number) => {
         ...(activationCode && { activationCode }),
     };
 
-    await recordServicePingInDB(payload);
+    await recordServicePingInDB(orgId, payload);
+
+    if (isValidOfflineLicenseActive()) {
+        logger.debug('Skipping service ping: active offline license detected.');
+        return;
+    }
 
     const response = await client.ping(payload);
     if (isServiceError(response)) {
@@ -175,13 +186,14 @@ const inferDeploymentType = (): string => {
     return 'other';
 };
 
-const recordServicePingInDB = async (payload: ServicePingRequest) => {
+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,
             },
         });