@wopr-network/platform-core 1.35.0 → 1.35.2

package/dist/fleet/init-fleet-updater.test.js

@@ -0,0 +1,186 @@
+/**
+ * Tests the profile-filtering + onManualTenantsSkipped logic used inside initFleetUpdater.
+ *
+ * We can't import initFleetUpdater directly because it constructs ImagePoller,
+ * ContainerUpdater, etc. which pull in heavy dependencies that cause hangs.
+ * Instead, we replicate the getUpdatableProfiles closure from initFleetUpdater
+ * and test it in isolation via a RolloutOrchestrator with mock deps.
+ */
+import { describe, expect, it, vi } from "vitest";
+import { RolloutOrchestrator } from "./rollout-orchestrator.js";
+vi.mock("../config/logger.js", () => ({
+    logger: {
+        info: vi.fn(),
+        error: vi.fn(),
+        warn: vi.fn(),
+        debug: vi.fn(),
+    },
+}));
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+function makeProfileWithFields(fields) {
+    return {
+        ...fields,
+        image: "ghcr.io/org/img:latest",
+    };
+}
+function makeProfileRepo(profiles) {
+    return {
+        list: vi.fn().mockResolvedValue(profiles),
+        get: vi
+            .fn()
+            .mockImplementation((id) => Promise.resolve(profiles.find((p) => p.id === id) ?? null)),
+        save: vi.fn().mockResolvedValue(undefined),
+        delete: vi.fn().mockResolvedValue(false),
+    };
+}
+function makeConfigRepo(configs = {}) {
+    return {
+        get: vi.fn().mockImplementation((tenantId) => {
+            const cfg = configs[tenantId];
+            return Promise.resolve(cfg ? { tenantId, ...cfg, updatedAt: Date.now() } : null);
+        }),
+        upsert: vi.fn().mockResolvedValue(undefined),
+        listAutoEnabled: vi.fn().mockResolvedValue([]),
+    };
+}
+function makeMockUpdater() {
+    return {
+        updateBot: vi.fn().mockResolvedValue({
+            botId: "",
+            success: true,
+            previousImage: "",
+            newImage: "",
+            previousDigest: null,
+            newDigest: null,
+            rolledBack: false,
+        }),
+    };
+}
+function makeMockSnapshotManager() {
+    return {
+        snapshot: vi.fn(),
+        restore: vi.fn(),
+        delete: vi.fn(),
+    };
+}
+function makeMockStrategy() {
+    return {
+        nextBatch: vi.fn().mockImplementation((remaining) => remaining),
+        pauseDuration: vi.fn().mockReturnValue(0),
+        onBotFailure: vi.fn().mockReturnValue("skip"),
+        maxRetries: vi.fn().mockReturnValue(0),
+        healthCheckTimeout: vi.fn().mockReturnValue(0),
+    };
+}
+/**
+ * Builds the same getUpdatableProfiles closure that initFleetUpdater creates,
+ * so we can test the filtering + callback logic without importing the heavy module.
+ */
+function buildGetUpdatableProfiles(profileRepo, configRepo, onManualTenantsSkipped, imageTag = "v1.2.3") {
+    return async () => {
+        const profiles = await profileRepo.list();
+        const manualPolicyIds = [];
+        const nonManualPolicy = profiles.filter((p) => {
+            if (p.updatePolicy === "manual") {
+                manualPolicyIds.push(p.tenantId);
+                return false;
+            }
+            return true;
+        });
+        if (!configRepo) {
+            if (manualPolicyIds.length > 0 && onManualTenantsSkipped) {
+                onManualTenantsSkipped([...new Set(manualPolicyIds)], imageTag);
+            }
+            return nonManualPolicy;
+        }
+        const configManualIds = [];
+        const results = await Promise.all(nonManualPolicy.map(async (p) => {
+            const tenantCfg = await configRepo.get(p.tenantId);
+            if (tenantCfg && tenantCfg.mode === "manual") {
+                configManualIds.push(p.tenantId);
+                return null;
+            }
+            return p;
+        }));
+        const allManualIds = [...manualPolicyIds, ...configManualIds];
+        if (allManualIds.length > 0 && onManualTenantsSkipped) {
+            onManualTenantsSkipped([...new Set(allManualIds)], imageTag);
+        }
+        return results.filter((p) => p !== null);
+    };
+}
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+describe("initFleetUpdater — onManualTenantsSkipped", () => {
+    it("callback fires with tenant IDs of manual-mode tenants (policy-based)", async () => {
+        const profiles = [
+            makeProfileWithFields({ id: "b1", tenantId: "t-manual", updatePolicy: "manual" }),
+            makeProfileWithFields({ id: "b2", tenantId: "t-auto", updatePolicy: "auto" }),
+        ];
+        const profileRepo = makeProfileRepo(profiles);
+        const onManualTenantsSkipped = vi.fn();
+        const orchestrator = new RolloutOrchestrator({
+            updater: makeMockUpdater(),
+            snapshotManager: makeMockSnapshotManager(),
+            strategy: makeMockStrategy(),
+            getUpdatableProfiles: buildGetUpdatableProfiles(profileRepo, undefined, onManualTenantsSkipped),
+        });
+        await orchestrator.rollout();
+        expect(onManualTenantsSkipped).toHaveBeenCalledWith(["t-manual"], "v1.2.3");
+    });
+    it("callback deduplicates tenant IDs", async () => {
+        const profiles = [
+            makeProfileWithFields({ id: "b1", tenantId: "t-dup", updatePolicy: "manual" }),
+            makeProfileWithFields({ id: "b2", tenantId: "t-dup", updatePolicy: "manual" }),
+            makeProfileWithFields({ id: "b3", tenantId: "t-auto", updatePolicy: "auto" }),
+        ];
+        const profileRepo = makeProfileRepo(profiles);
+        const onManualTenantsSkipped = vi.fn();
+        const orchestrator = new RolloutOrchestrator({
+            updater: makeMockUpdater(),
+            snapshotManager: makeMockSnapshotManager(),
+            strategy: makeMockStrategy(),
+            getUpdatableProfiles: buildGetUpdatableProfiles(profileRepo, undefined, onManualTenantsSkipped),
+        });
+        await orchestrator.rollout();
+        expect(onManualTenantsSkipped).toHaveBeenCalledWith(["t-dup"], "v1.2.3");
+    });
+    it("callback not called when no manual tenants exist", async () => {
+        const profiles = [
+            makeProfileWithFields({ id: "b1", tenantId: "t1", updatePolicy: "auto" }),
+            makeProfileWithFields({ id: "b2", tenantId: "t2", updatePolicy: "auto" }),
+        ];
+        const profileRepo = makeProfileRepo(profiles);
+        const onManualTenantsSkipped = vi.fn();
+        const orchestrator = new RolloutOrchestrator({
+            updater: makeMockUpdater(),
+            snapshotManager: makeMockSnapshotManager(),
+            strategy: makeMockStrategy(),
+            getUpdatableProfiles: buildGetUpdatableProfiles(profileRepo, undefined, onManualTenantsSkipped),
+        });
+        await orchestrator.rollout();
+        expect(onManualTenantsSkipped).not.toHaveBeenCalled();
+    });
+    it("callback fires with config-repo manual tenants when configRepo is provided", async () => {
+        const profiles = [
+            makeProfileWithFields({ id: "b1", tenantId: "t-cfg-manual", updatePolicy: "auto" }),
+            makeProfileWithFields({ id: "b2", tenantId: "t-cfg-auto", updatePolicy: "auto" }),
+        ];
+        const profileRepo = makeProfileRepo(profiles);
+        const configRepo = makeConfigRepo({
+            "t-cfg-manual": { mode: "manual", preferredHourUtc: 3 },
+        });
+        const onManualTenantsSkipped = vi.fn();
+        const orchestrator = new RolloutOrchestrator({
+            updater: makeMockUpdater(),
+            snapshotManager: makeMockSnapshotManager(),
+            strategy: makeMockStrategy(),
+            getUpdatableProfiles: buildGetUpdatableProfiles(profileRepo, configRepo, onManualTenantsSkipped),
+        });
+        await orchestrator.rollout();
+        expect(onManualTenantsSkipped).toHaveBeenCalledWith(["t-cfg-manual"], "v1.2.3");
+    });
+});

package/dist/trpc/admin-fleet-update-router.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/trpc/admin-fleet-update-router.test.js

@@ -0,0 +1,164 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { createAdminFleetUpdateRouter } from "./admin-fleet-update-router.js";
+import { createCallerFactory, router, setTrpcOrgMemberRepo } from "./init.js";
+vi.mock("../config/logger.js", () => ({
+    logger: {
+        info: vi.fn(),
+        error: vi.fn(),
+        warn: vi.fn(),
+        debug: vi.fn(),
+    },
+}));
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+function makeMockOrgRepo() {
+    return {
+        listMembers: vi.fn().mockResolvedValue([]),
+        addMember: vi.fn().mockResolvedValue(undefined),
+        updateMemberRole: vi.fn().mockResolvedValue(undefined),
+        removeMember: vi.fn().mockResolvedValue(undefined),
+        findMember: vi.fn().mockResolvedValue(null),
+        countAdminsAndOwners: vi.fn().mockResolvedValue(0),
+        listInvites: vi.fn().mockResolvedValue([]),
+        createInvite: vi.fn().mockResolvedValue(undefined),
+        findInviteById: vi.fn().mockResolvedValue(null),
+        findInviteByToken: vi.fn().mockResolvedValue(null),
+        deleteInvite: vi.fn().mockResolvedValue(undefined),
+        deleteAllMembers: vi.fn().mockResolvedValue(undefined),
+        deleteAllInvites: vi.fn().mockResolvedValue(undefined),
+        listOrgsByUser: vi.fn().mockResolvedValue([]),
+        markInviteAccepted: vi.fn().mockResolvedValue(undefined),
+    };
+}
+function makeOrchestrator(overrides = {}) {
+    return {
+        isRolling: false,
+        rollout: vi.fn().mockResolvedValue({
+            totalBots: 0,
+            succeeded: 0,
+            failed: 0,
+            skipped: 0,
+            aborted: false,
+            alreadyRunning: false,
+            results: [],
+        }),
+        ...overrides,
+    };
+}
+function makeConfigRepo(configs = {}) {
+    return {
+        get: vi.fn().mockImplementation((tenantId) => Promise.resolve(configs[tenantId] ?? null)),
+        upsert: vi.fn().mockResolvedValue(undefined),
+        listAutoEnabled: vi.fn().mockResolvedValue(Object.values(configs)),
+    };
+}
+const adminCtx = {
+    user: { id: "admin-1", roles: ["platform_admin"] },
+    tenantId: undefined,
+};
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+describe("createAdminFleetUpdateRouter", () => {
+    let orchestrator;
+    let configRepo;
+    beforeEach(() => {
+        setTrpcOrgMemberRepo(makeMockOrgRepo());
+        orchestrator = makeOrchestrator();
+        configRepo = makeConfigRepo();
+    });
+    function makeCaller() {
+        const fleetRouter = createAdminFleetUpdateRouter(() => orchestrator, () => configRepo);
+        const appRouter = router({ fleet: fleetRouter });
+        const createCaller = createCallerFactory(appRouter);
+        return createCaller(adminCtx);
+    }
+    describe("rolloutStatus", () => {
+        it("returns isRolling from orchestrator (false)", async () => {
+            const caller = makeCaller();
+            const status = await caller.fleet.rolloutStatus();
+            expect(status).toEqual({ isRolling: false });
+        });
+        it("returns isRolling from orchestrator (true)", async () => {
+            orchestrator = makeOrchestrator({ isRolling: true });
+            const caller = makeCaller();
+            const status = await caller.fleet.rolloutStatus();
+            expect(status).toEqual({ isRolling: true });
+        });
+    });
+    describe("forceRollout", () => {
+        it("calls orchestrator.rollout()", async () => {
+            const caller = makeCaller();
+            const result = await caller.fleet.forceRollout();
+            expect(result).toEqual({ triggered: true });
+            expect(orchestrator.rollout).toHaveBeenCalledOnce();
+        });
+    });
+    describe("listTenantConfigs", () => {
+        it("delegates to repo.listAutoEnabled()", async () => {
+            const configs = [
+                { tenantId: "t1", mode: "auto", preferredHourUtc: 3, updatedAt: Date.now() },
+                { tenantId: "t2", mode: "auto", preferredHourUtc: 12, updatedAt: Date.now() },
+            ];
+            vi.mocked(configRepo.listAutoEnabled).mockResolvedValue(configs);
+            const caller = makeCaller();
+            const result = await caller.fleet.listTenantConfigs();
+            expect(configRepo.listAutoEnabled).toHaveBeenCalledOnce();
+            expect(result).toEqual(configs);
+        });
+    });
+    describe("setTenantConfig", () => {
+        it("preserves existing preferredHourUtc when not provided", async () => {
+            const existing = {
+                tenantId: "t1",
+                mode: "auto",
+                preferredHourUtc: 17,
+                updatedAt: Date.now(),
+            };
+            vi.mocked(configRepo.get).mockResolvedValue(existing);
+            const caller = makeCaller();
+            await caller.fleet.setTenantConfig({ tenantId: "t1", mode: "manual" });
+            expect(configRepo.get).toHaveBeenCalledWith("t1");
+            expect(configRepo.upsert).toHaveBeenCalledWith("t1", {
+                mode: "manual",
+                preferredHourUtc: 17, // preserved from existing
+            });
+        });
+        it("uses provided preferredHourUtc when given", async () => {
+            const existing = {
+                tenantId: "t1",
+                mode: "auto",
+                preferredHourUtc: 17,
+                updatedAt: Date.now(),
+            };
+            vi.mocked(configRepo.get).mockResolvedValue(existing);
+            const caller = makeCaller();
+            await caller.fleet.setTenantConfig({
+                tenantId: "t1",
+                mode: "auto",
+                preferredHourUtc: 9,
+            });
+            expect(configRepo.upsert).toHaveBeenCalledWith("t1", {
+                mode: "auto",
+                preferredHourUtc: 9,
+            });
+        });
+        it("defaults to 3 when no existing config and preferredHourUtc not provided", async () => {
+            vi.mocked(configRepo.get).mockResolvedValue(null);
+            const caller = makeCaller();
+            await caller.fleet.setTenantConfig({ tenantId: "t-new", mode: "auto" });
+            expect(configRepo.upsert).toHaveBeenCalledWith("t-new", {
+                mode: "auto",
+                preferredHourUtc: 3, // default
+            });
+        });
+    });
+    it("rejects non-admin users", async () => {
+        const fleetRouter = createAdminFleetUpdateRouter(() => orchestrator, () => configRepo);
+        const appRouter = router({ fleet: fleetRouter });
+        const createCaller = createCallerFactory(appRouter);
+        const caller = createCaller({ user: { id: "u1", roles: ["user"] }, tenantId: undefined });
+        await expect(caller.fleet.rolloutStatus()).rejects.toThrow("Platform admin role required");
+    });
+});

package/package.json

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

package/src/billing/crypto/btc/settler.ts

@@ -44,8 +44,9 @@ export async function settleBtcPayment(deps: BtcSettlerDeps, event: BtcPaymentEv
     return { handled: true, status: "Settled", tenant: charge.tenantId, creditedCents: 0 };
   }
 
-  // Underpayment check
-  if (event.amountUsdCents < charge.amountUsdCents) {
+  // 2% underpayment tolerance for oracle price drift between checkout and settlement.
+  const UNDERPAYMENT_TOLERANCE = 0.98;
+  if (event.amountUsdCents < charge.amountUsdCents * UNDERPAYMENT_TOLERANCE) {
     return { handled: true, status: "Settled", tenant: charge.tenantId, creditedCents: 0 };
   }
 

package/src/billing/crypto/evm/eth-settler.ts

@@ -42,7 +42,9 @@ export async function settleEthPayment(deps: EthSettlerDeps, event: EthPaymentEv
     return { handled: true, status: "Settled", tenant: charge.tenantId, creditedCents: 0 };
   }
 
-  if (event.amountUsdCents < charge.amountUsdCents) {
+  // 2% underpayment tolerance for oracle price drift between checkout and settlement.
+  const UNDERPAYMENT_TOLERANCE = 0.98;
+  if (event.amountUsdCents < charge.amountUsdCents * UNDERPAYMENT_TOLERANCE) {
     return { handled: true, status: "Settled", tenant: charge.tenantId, creditedCents: 0 };
   }
 

package/src/billing/crypto/unified-checkout.ts

@@ -101,7 +101,7 @@ async function handleNativeEvm(
     amountUsd,
     token: "ETH",
     chain: method.chain,
-    referenceId: `eth:${method.chain}:${depositAddress}`,
+    referenceId: `${method.type}:${method.chain}:${depositAddress}`,
     priceCents,
   };
 }

package/src/email/handlebars-renderer.test.ts

@@ -0,0 +1,209 @@
+import { describe, expect, it, vi } from "vitest";
+import { HandlebarsRenderer } from "./handlebars-renderer.js";
+import type { INotificationTemplateRepository, NotificationTemplateRow } from "./notification-repository-types.js";
+
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
+function makeTemplate(overrides: Partial<NotificationTemplateRow> = {}): NotificationTemplateRow {
+  return {
+    id: "tpl-1",
+    name: "test-template",
+    description: "A test template",
+    subject: "Hello {{name}}",
+    htmlBody: "<h1>Hello {{name}}</h1>",
+    textBody: "Hello {{name}}",
+    active: true,
+    createdAt: Date.now(),
+    updatedAt: Date.now(),
+    ...overrides,
+  };
+}
+
+function makeRepo(templates: Record<string, NotificationTemplateRow | null> = {}): INotificationTemplateRepository {
+  return {
+    getByName: vi.fn().mockImplementation((name: string) => Promise.resolve(templates[name] ?? null)),
+    list: vi.fn().mockResolvedValue(Object.values(templates).filter(Boolean)),
+    upsert: vi.fn().mockResolvedValue(undefined),
+  } as unknown as INotificationTemplateRepository;
+}
+
+// ---------------------------------------------------------------------------
+// Tests
+// ---------------------------------------------------------------------------
+
+describe("HandlebarsRenderer", () => {
+  it("returns null for unknown template", async () => {
+    const repo = makeRepo({});
+    const renderer = new HandlebarsRenderer(repo);
+
+    const result = await renderer.render("nonexistent", { name: "World" });
+
+    expect(result).toBeNull();
+    expect(repo.getByName).toHaveBeenCalledWith("nonexistent");
+  });
+
+  it("returns null for inactive template", async () => {
+    const repo = makeRepo({
+      "inactive-tpl": makeTemplate({ name: "inactive-tpl", active: false }),
+    });
+    const renderer = new HandlebarsRenderer(repo);
+
+    const result = await renderer.render("inactive-tpl", { name: "World" });
+
+    expect(result).toBeNull();
+  });
+
+  it("compiles Handlebars and returns subject/html/text", async () => {
+    const repo = makeRepo({
+      greeting: makeTemplate({
+        name: "greeting",
+        subject: "Hi {{name}}!",
+        htmlBody: "<p>Welcome, {{name}}!</p>",
+        textBody: "Welcome, {{name}}!",
+      }),
+    });
+    const renderer = new HandlebarsRenderer(repo);
+
+    const result = await renderer.render("greeting", { name: "Alice" });
+
+    expect(result).not.toBeNull();
+    expect(result?.subject).toBe("Hi Alice!");
+    expect(result?.html).toBe("<p>Welcome, Alice!</p>");
+    expect(result?.text).toBe("Welcome, Alice!");
+  });
+
+  it("injects currentYear automatically", async () => {
+    const repo = makeRepo({
+      footer: makeTemplate({
+        name: "footer",
+        subject: "Year: {{currentYear}}",
+        htmlBody: "<p>&copy; {{currentYear}}</p>",
+        textBody: "(c) {{currentYear}}",
+      }),
+    });
+    const renderer = new HandlebarsRenderer(repo);
+
+    const result = await renderer.render("footer", {});
+
+    const year = new Date().getFullYear();
+    expect(result?.subject).toBe(`Year: ${year}`);
+    expect(result?.html).toBe(`<p>&copy; ${year}</p>`);
+    expect(result?.text).toBe(`(c) ${year}`);
+  });
+
+  it("does not override explicit currentYear from data", async () => {
+    const repo = makeRepo({
+      footer: makeTemplate({
+        name: "footer",
+        subject: "Year: {{currentYear}}",
+        htmlBody: "<p>{{currentYear}}</p>",
+        textBody: "{{currentYear}}",
+      }),
+    });
+    const renderer = new HandlebarsRenderer(repo);
+
+    const result = await renderer.render("footer", { currentYear: 2099 });
+
+    expect(result?.subject).toBe("Year: 2099");
+  });
+
+  describe("helpers", () => {
+    it("eq helper returns true for equal values", async () => {
+      const repo = makeRepo({
+        cond: makeTemplate({
+          name: "cond",
+          subject: '{{#if (eq status "active")}}Active{{else}}Inactive{{/if}}',
+          htmlBody: "ok",
+          textBody: "ok",
+        }),
+      });
+      const renderer = new HandlebarsRenderer(repo);
+
+      const active = await renderer.render("cond", { status: "active" });
+      expect(active?.subject).toBe("Active");
+
+      const inactive = await renderer.render("cond", { status: "disabled" });
+      expect(inactive?.subject).toBe("Inactive");
+    });
+
+    it("gt helper compares numbers", async () => {
+      const repo = makeRepo({
+        gt: makeTemplate({
+          name: "gt",
+          subject: "{{#if (gt count 5)}}Many{{else}}Few{{/if}}",
+          htmlBody: "ok",
+          textBody: "ok",
+        }),
+      });
+      const renderer = new HandlebarsRenderer(repo);
+
+      const many = await renderer.render("gt", { count: 10 });
+      expect(many?.subject).toBe("Many");
+
+      const few = await renderer.render("gt", { count: 3 });
+      expect(few?.subject).toBe("Few");
+    });
+
+    it("formatDate helper formats timestamps", async () => {
+      const repo = makeRepo({
+        dated: makeTemplate({
+          name: "dated",
+          subject: "Date: {{formatDate ts}}",
+          htmlBody: "ok",
+          textBody: "ok",
+        }),
+      });
+      const renderer = new HandlebarsRenderer(repo);
+
+      // Use noon UTC to avoid timezone date-boundary shifts
+      const ts = new Date("2025-01-15T12:00:00Z").getTime();
+      const result = await renderer.render("dated", { ts });
+
+      // The formatted string uses en-US locale with year/month/day
+      const expected = new Date(ts).toLocaleDateString("en-US", {
+        year: "numeric",
+        month: "long",
+        day: "numeric",
+      });
+      expect(result?.subject).toBe(`Date: ${expected}`);
+    });
+
+    it("formatDate helper passes through non-numeric values", async () => {
+      const repo = makeRepo({
+        dated: makeTemplate({
+          name: "dated",
+          subject: "Date: {{formatDate ts}}",
+          htmlBody: "ok",
+          textBody: "ok",
+        }),
+      });
+      const renderer = new HandlebarsRenderer(repo);
+
+      const result = await renderer.render("dated", { ts: "not-a-number" });
+
+      expect(result?.subject).toBe("Date: not-a-number");
+    });
+
+    it("escapeHtml helper escapes special characters", async () => {
+      const repo = makeRepo({
+        esc: makeTemplate({
+          name: "esc",
+          subject: "Safe: {{escapeHtml input}}",
+          htmlBody: "ok",
+          textBody: "ok",
+        }),
+      });
+      const renderer = new HandlebarsRenderer(repo);
+
+      const result = await renderer.render("esc", {
+        input: '<script>alert("xss")</script>',
+      });
+
+      expect(result?.subject).toContain("&lt;script&gt;");
+      expect(result?.subject).toContain("&quot;xss&quot;");
+      expect(result?.subject).not.toContain("<script>");
+    });
+  });
+});