bopodev-api 0.1.7 → 0.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bopodev-api",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "license": "MIT",
   "type": "module",
   "files": [
@@ -15,9 +15,9 @@
     "nanoid": "^5.1.5",
     "ws": "^8.19.0",
     "zod": "^4.1.5",
-    "bopodev-agent-sdk": "0.1.7",
-    "bopodev-db": "0.1.7",
-    "bopodev-contracts": "0.1.7"
+    "bopodev-agent-sdk": "0.1.8",
+    "bopodev-contracts": "0.1.8",
+    "bopodev-db": "0.1.8"
   },
   "devDependencies": {
     "@types/cors": "^2.8.19",

package/src/server.ts

@@ -59,10 +59,12 @@ async function main() {
     console.log(`BopoHQ API running on http://localhost:${port}`);
   });
 
-  const defaultCompanyId = process.env.BOPO_DEFAULT_COMPANY_ID;
-  if (defaultCompanyId) {
-    createHeartbeatScheduler(db, defaultCompanyId, realtimeHub);
+  const configuredSchedulerCompanyIds = parseSchedulerCompanyIds(process.env.BOPO_SCHEDULER_COMPANY_IDS);
+  if (process.env.BOPO_DEFAULT_COMPANY_ID && !process.env.BOPO_SCHEDULER_COMPANY_IDS) {
+    // eslint-disable-next-line no-console
+    console.warn("[startup] BOPO_DEFAULT_COMPANY_ID no longer scopes heartbeat sweeps; scheduler now sweeps all companies.");
   }
+  createHeartbeatScheduler(db, realtimeHub, { companyIds: configuredSchedulerCompanyIds });
 }
 
 void main();
@@ -90,3 +92,14 @@ function emitCodexPreflightWarning(health: RuntimeCommandHealth) {
     process.stderr.write(`  Details: ${JSON.stringify(health)}\n`);
   }
 }
+
+function parseSchedulerCompanyIds(rawValue?: string) {
+  if (!rawValue || rawValue.trim().length === 0) {
+    return undefined;
+  }
+  const ids = rawValue
+    .split(",")
+    .map((value) => value.trim())
+    .filter((value) => value.length > 0);
+  return ids.length > 0 ? ids : undefined;
+}

package/src/worker/scheduler.ts

@@ -1,23 +1,80 @@
+import { sql } from "drizzle-orm";
 import type { BopoDb } from "bopodev-db";
 import type { RealtimeHub } from "../realtime/hub";
 import { runHeartbeatSweep } from "../services/heartbeat-service";
 
-export function createHeartbeatScheduler(db: BopoDb, companyId: string, realtimeHub?: RealtimeHub) {
+interface HeartbeatSchedulerOptions {
+  companyIds?: string[];
+}
+
+export function createHeartbeatScheduler(db: BopoDb, realtimeHub?: RealtimeHub, options?: HeartbeatSchedulerOptions) {
   const intervalMs = Number(process.env.BOPO_HEARTBEAT_SWEEP_MS ?? 60_000);
+  const warnedMissingConfiguredCompanyIds = new Set<string>();
   let running = false;
   const timer = setInterval(() => {
     if (running) {
       return;
     }
     running = true;
-    void runHeartbeatSweep(db, companyId, { realtimeHub })
-      .catch((error) => {
-        // eslint-disable-next-line no-console
-        console.error("[scheduler] heartbeat sweep failed", error);
-      })
+    void sweepScheduledCompanies(db, realtimeHub, options, warnedMissingConfiguredCompanyIds)
       .finally(() => {
         running = false;
       });
   }, intervalMs);
   return () => clearInterval(timer);
 }
+
+async function sweepScheduledCompanies(
+  db: BopoDb,
+  realtimeHub?: RealtimeHub,
+  options?: HeartbeatSchedulerOptions,
+  warnedMissingConfiguredCompanyIds?: Set<string>
+) {
+  const companyIds = options?.companyIds?.length
+    ? await resolveConfiguredCompanyIds(db, options.companyIds, warnedMissingConfiguredCompanyIds ?? new Set<string>())
+    : await listCompanyIds(db);
+  for (const companyId of companyIds) {
+    try {
+      await runHeartbeatSweep(db, companyId, { realtimeHub });
+    } catch (error) {
+      // eslint-disable-next-line no-console
+      console.error(`[scheduler] heartbeat sweep failed for company '${companyId}': ${toErrorMessage(error)}`);
+    }
+  }
+}
+
+async function listCompanyIds(db: BopoDb) {
+  const result = await db.execute(sql`
+    SELECT id
+    FROM companies
+    ORDER BY created_at ASC
+  `);
+  return (result.rows ?? [])
+    .map((row) => row.id)
+    .filter((id): id is string => typeof id === "string" && id.length > 0);
+}
+
+async function resolveConfiguredCompanyIds(
+  db: BopoDb,
+  configuredCompanyIds: string[],
+  warnedMissingConfiguredCompanyIds: Set<string>
+) {
+  const existingCompanyIds = new Set(await listCompanyIds(db));
+  const activeCompanyIds: string[] = [];
+  for (const companyId of configuredCompanyIds) {
+    if (existingCompanyIds.has(companyId)) {
+      activeCompanyIds.push(companyId);
+      continue;
+    }
+    if (!warnedMissingConfiguredCompanyIds.has(companyId)) {
+      warnedMissingConfiguredCompanyIds.add(companyId);
+      // eslint-disable-next-line no-console
+      console.warn(`[scheduler] skipping unknown company id '${companyId}' from BOPO_SCHEDULER_COMPANY_IDS`);
+    }
+  }
+  return activeCompanyIds;
+}
+
+function toErrorMessage(error: unknown) {
+  return error instanceof Error ? error.message : String(error);
+}