@wopr-network/platform-core 1.72.3 → 1.73.0

package/dist/server/lifecycle.js

@@ -5,6 +5,7 @@
  * This module provides a standard interface for starting and stopping
  * those tasks so bootPlatformServer can manage them uniformly.
  */
+import { logger } from "../config/logger.js";
 // ---------------------------------------------------------------------------
 // startBackgroundServices
 // ---------------------------------------------------------------------------
@@ -36,6 +37,45 @@ export async function startBackgroundServices(container) {
             // Non-fatal — pool will be empty but claiming falls back to cold create
         }
     }
+    // Runtime billing cron — daily $0.17/bot deduction (requires fleet + creditLedger)
+    if (container.fleet && container.creditLedger) {
+        try {
+            const { DrizzleBotInstanceRepository } = await import("../fleet/drizzle-bot-instance-repository.js");
+            const { DrizzleTenantAddonRepository } = await import("../monetization/addons/addon-repository.js");
+            const { startRuntimeScheduler } = await import("../monetization/credits/runtime-scheduler.js");
+            const botInstanceRepo = new DrizzleBotInstanceRepository(container.db);
+            const tenantAddonRepo = new DrizzleTenantAddonRepository(container.db);
+            const scheduler = startRuntimeScheduler({
+                ledger: container.creditLedger,
+                botInstanceRepo,
+                tenantAddonRepo,
+            });
+            handles.unsubscribes.push(scheduler.stop);
+            // Run immediately on startup (idempotent — skips if already billed today)
+            const { runRuntimeDeductions, buildResourceTierCosts } = await import("../monetization/credits/runtime-cron.js");
+            const { buildAddonCosts } = await import("../monetization/addons/addon-cron.js");
+            const today = new Date().toISOString().slice(0, 10);
+            void runRuntimeDeductions({
+                ledger: container.creditLedger,
+                date: today,
+                getActiveBotCount: async (tenantId) => {
+                    const bots = await botInstanceRepo.listByTenant(tenantId);
+                    return bots.filter((b) => b.billingState === "active").length;
+                },
+                getResourceTierCosts: buildResourceTierCosts(botInstanceRepo, async (tenantId) => {
+                    const bots = await botInstanceRepo.listByTenant(tenantId);
+                    return bots.filter((b) => b.billingState === "active").map((b) => b.id);
+                }),
+                getAddonCosts: buildAddonCosts(tenantAddonRepo),
+            })
+                .then((result) => logger.info("Initial runtime deductions complete", result))
+                .catch((err) => logger.error("Initial runtime deductions failed", { error: String(err) }));
+            logger.info("Runtime billing scheduler started (daily $0.17/bot deduction)");
+        }
+        catch (err) {
+            logger.warn("Failed to start runtime billing scheduler (non-fatal)", { error: String(err) });
+        }
+    }
     return handles;
 }
 // ---------------------------------------------------------------------------

package/dist/server/middleware/tenant-proxy.js

@@ -82,17 +82,26 @@ export function buildUpstreamHeaders(incoming, user, tenantSubdomain) {
     return headers;
 }
 /**
- * Resolve the upstream container URL for a tenant subdomain from the
- * proxy route table. Returns null if no route exists or is unhealthy.
+ * Resolve the upstream container URL for a tenant subdomain.
+ *
+ * First checks the in-memory proxy route table (populated during
+ * provisioning). Falls back to deriving from the persistent profile
+ * data so that routing survives server restarts without needing
+ * Caddy or in-memory state.
  */
-function resolveContainerUrl(container, subdomain) {
+function resolveContainerUrl(container, subdomain, profile) {
     if (!container.fleet)
         return null;
+    // Fast path: in-memory route table (populated during provisioning)
     const routes = container.fleet.proxy.getRoutes();
     const route = routes.find((r) => r.subdomain === subdomain);
-    if (!route || !route.healthy)
-        return null;
-    return `http://${route.upstreamHost}:${route.upstreamPort}`;
+    if (route?.healthy) {
+        return `http://${route.upstreamHost}:${route.upstreamPort}`;
+    }
+    // Fallback: derive from persistent profile data (survives restarts)
+    const containerName = `wopr-${profile.name.replace(/_/g, "-")}`;
+    const port = profile.env?.PORT || "3100";
+    return `http://${containerName}:${port}`;
 }
 /**
  * Create a tenant subdomain proxy middleware.
@@ -134,10 +143,10 @@ export function createTenantProxyMiddleware(container, config) {
         if (!hasAccess) {
             return c.json({ error: "Forbidden: not a member of this tenant" }, 403);
         }
-        // Resolve fleet container URL via proxy route table
-        const upstream = resolveContainerUrl(container, subdomain);
+        // Resolve fleet container URL (route table or profile fallback)
+        const upstream = resolveContainerUrl(container, subdomain, profile);
         if (!upstream) {
-            return c.json({ error: "Tenant not found" }, 404);
+            return c.json({ error: "Container unavailable" }, 503);
         }
         const url = new URL(c.req.url);
         const targetUrl = `${upstream}${url.pathname}${url.search}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wopr-network/platform-core",
-  "version": "1.72.3",
+  "version": "1.73.0",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/server/lifecycle.ts

@@ -6,6 +6,7 @@
  * those tasks so bootPlatformServer can manage them uniformly.
  */
 
+import { logger } from "../config/logger.js";
 import type { PlatformContainer } from "./container.js";
 
 // ---------------------------------------------------------------------------
@@ -50,6 +51,49 @@ export async function startBackgroundServices(container: PlatformContainer): Pro
     }
   }
 
+  // Runtime billing cron — daily $0.17/bot deduction (requires fleet + creditLedger)
+  if (container.fleet && container.creditLedger) {
+    try {
+      const { DrizzleBotInstanceRepository } = await import("../fleet/drizzle-bot-instance-repository.js");
+      const { DrizzleTenantAddonRepository } = await import("../monetization/addons/addon-repository.js");
+      const { startRuntimeScheduler } = await import("../monetization/credits/runtime-scheduler.js");
+
+      const botInstanceRepo = new DrizzleBotInstanceRepository(container.db);
+      const tenantAddonRepo = new DrizzleTenantAddonRepository(container.db);
+
+      const scheduler = startRuntimeScheduler({
+        ledger: container.creditLedger,
+        botInstanceRepo,
+        tenantAddonRepo,
+      });
+      handles.unsubscribes.push(scheduler.stop);
+
+      // Run immediately on startup (idempotent — skips if already billed today)
+      const { runRuntimeDeductions, buildResourceTierCosts } = await import("../monetization/credits/runtime-cron.js");
+      const { buildAddonCosts } = await import("../monetization/addons/addon-cron.js");
+      const today = new Date().toISOString().slice(0, 10);
+      void runRuntimeDeductions({
+        ledger: container.creditLedger,
+        date: today,
+        getActiveBotCount: async (tenantId) => {
+          const bots = await botInstanceRepo.listByTenant(tenantId);
+          return bots.filter((b) => b.billingState === "active").length;
+        },
+        getResourceTierCosts: buildResourceTierCosts(botInstanceRepo, async (tenantId) => {
+          const bots = await botInstanceRepo.listByTenant(tenantId);
+          return bots.filter((b) => b.billingState === "active").map((b) => b.id);
+        }),
+        getAddonCosts: buildAddonCosts(tenantAddonRepo),
+      })
+        .then((result) => logger.info("Initial runtime deductions complete", result))
+        .catch((err) => logger.error("Initial runtime deductions failed", { error: String(err) }));
+
+      logger.info("Runtime billing scheduler started (daily $0.17/bot deduction)");
+    } catch (err) {
+      logger.warn("Failed to start runtime billing scheduler (non-fatal)", { error: String(err) });
+    }
+  }
+
   return handles;
 }
 

package/src/server/middleware/tenant-proxy.ts

@@ -103,15 +103,31 @@ export function buildUpstreamHeaders(incoming: Headers, user: ProxyUserInfo, ten
 }
 
 /**
- * Resolve the upstream container URL for a tenant subdomain from the
- * proxy route table. Returns null if no route exists or is unhealthy.
+ * Resolve the upstream container URL for a tenant subdomain.
+ *
+ * First checks the in-memory proxy route table (populated during
+ * provisioning). Falls back to deriving from the persistent profile
+ * data so that routing survives server restarts without needing
+ * Caddy or in-memory state.
  */
-function resolveContainerUrl(container: PlatformContainer, subdomain: string): string | null {
+function resolveContainerUrl(
+  container: PlatformContainer,
+  subdomain: string,
+  profile: { name: string; env?: Record<string, string> },
+): string | null {
   if (!container.fleet) return null;
+
+  // Fast path: in-memory route table (populated during provisioning)
   const routes = container.fleet.proxy.getRoutes();
   const route = routes.find((r) => r.subdomain === subdomain);
-  if (!route || !route.healthy) return null;
-  return `http://${route.upstreamHost}:${route.upstreamPort}`;
+  if (route?.healthy) {
+    return `http://${route.upstreamHost}:${route.upstreamPort}`;
+  }
+
+  // Fallback: derive from persistent profile data (survives restarts)
+  const containerName = `wopr-${profile.name.replace(/_/g, "-")}`;
+  const port = profile.env?.PORT || "3100";
+  return `http://${containerName}:${port}`;
 }
 
 /**
@@ -162,10 +178,10 @@ export function createTenantProxyMiddleware(
       return c.json({ error: "Forbidden: not a member of this tenant" }, 403);
     }
 
-    // Resolve fleet container URL via proxy route table
-    const upstream = resolveContainerUrl(container, subdomain);
+    // Resolve fleet container URL (route table or profile fallback)
+    const upstream = resolveContainerUrl(container, subdomain, profile);
     if (!upstream) {
-      return c.json({ error: "Tenant not found" }, 404);
+      return c.json({ error: "Container unavailable" }, 503);
     }
 
     const url = new URL(c.req.url);