npm - @tokenbuddy/tokenbuddy - Versions diffs - 1.0.33 → 1.0.35 - Mend

@tokenbuddy/tokenbuddy 1.0.33 → 1.0.35

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (31) hide show

package/dist/src/buyer-store.d.ts +16 -0
package/dist/src/buyer-store.d.ts.map +1 -1
package/dist/src/buyer-store.js +29 -1
package/dist/src/buyer-store.js.map +1 -1
package/dist/src/daemon.d.ts +13 -0
package/dist/src/daemon.d.ts.map +1 -1
package/dist/src/daemon.js +121 -9
package/dist/src/daemon.js.map +1 -1
package/dist/src/provider-routing-config.d.ts +1 -1
package/dist/src/provider-routing-config.d.ts.map +1 -1
package/dist/src/provider-routing-config.js +1 -1
package/dist/src/provider-routing-config.js.map +1 -1
package/dist/src/seller-catalog.d.ts +1 -1
package/dist/src/seller-catalog.d.ts.map +1 -1
package/dist/src/seller-routing-strategy.d.ts +15 -0
package/dist/src/seller-routing-strategy.d.ts.map +1 -1
package/dist/src/seller-routing-strategy.js +41 -0
package/dist/src/seller-routing-strategy.js.map +1 -1
package/package.json +1 -1
package/src/buyer-store.ts +61 -1
package/src/daemon.ts +136 -9
package/src/provider-routing-config.ts +2 -2
package/src/seller-catalog.ts +1 -1
package/src/seller-routing-strategy.ts +41 -0
package/static/ui/assets/index-BVbeDEwq.js +271 -0
package/static/ui/assets/index-BVbeDEwq.js.map +1 -0
package/static/ui/index.html +1 -1
package/tests/daemon-classify.test.ts +8 -0
package/tests/image-generation-e2e.test.ts +230 -0
package/static/ui/assets/index-Mt3BZFuP.js +0 -266
package/static/ui/assets/index-Mt3BZFuP.js.map +0 -1

package/static/ui/index.html CHANGED Viewed

@@ -13,7 +13,7 @@
     <link rel="icon" type="image/png" sizes="192x192" href="/icons/tokenbuddy-192.png" />
     <link rel="apple-touch-icon" href="/icons/apple-touch-icon.png" />
     <title>TokenBuddy · Local Control</title>
-    <script type="module" crossorigin src="/assets/index-Mt3BZFuP.js"></script>
+    <script type="module" crossorigin src="/assets/index-BVbeDEwq.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-0MVXD7bH.css">
   </head>
   <body>

package/tests/daemon-classify.test.ts CHANGED Viewed

@@ -55,6 +55,7 @@ describe("TokenbuddyDaemon classifyFailureStatus", () => {
     expect((daemon as any).endpointProtocol("/v1/responses")).toBe("responses");
     expect((daemon as any).endpointProtocol("/v1/messages")).toBe("messages");
     expect((daemon as any).endpointProtocol("/messages")).toBe("messages");
+    expect((daemon as any).endpointProtocol("/v1/images/generations")).toBe("images_generations");
     expect((daemon as any).endpointProtocol("/v1/unknown")).toBeUndefined();
   });
@@ -63,6 +64,7 @@ describe("TokenbuddyDaemon classifyFailureStatus", () => {
     expect((daemon as any).extractModelId("/v1/chat/completions", { model: " " })).toBeUndefined();
     expect((daemon as any).extractModelId("/v1/responses", { model_id: " resp-model " })).toBe("resp-model");
     expect((daemon as any).extractModelId("/v1/responses", { model_id: 42 })).toBeUndefined();
+    expect((daemon as any).extractModelId("/v1/images/generations", { model: " gpt-image-2 " })).toBe("gpt-image-2");
     expect((daemon as any).extractModelId("/v1/responses", null)).toBeUndefined();
   });
@@ -116,6 +118,12 @@ describe("TokenbuddyDaemon classifyFailureStatus", () => {
       cacheReadTokens: 4,
       billedMicros: 48,
     });
+    expect((daemon as any).readUsage(JSON.stringify({ usage: { input_tokens: 25, output_tokens: 75, total_tokens: 100 } }))).toEqual({
+      promptTokens: 25,
+      completionTokens: 75,
+      cacheReadTokens: 0,
+      billedMicros: 400,
+    });
   });
   test("parses seller settlement headers", () => {

package/tests/image-generation-e2e.test.ts ADDED Viewed

@@ -0,0 +1,230 @@
+import { buildApp as buildBootstrapApp } from "../../wallet-bootstrap/src/server.js";
+import { buildSellerApp } from "../../seller/src/server.js";
+import { TokenbuddyDaemon } from "../src/daemon.js";
+import { BuyerStore } from "../src/buyer-store.js";
+import { PROVIDER_MODE_CONFIG_KEY } from "../src/provider-routing-config.js";
+import * as fs from "fs";
+import * as http from "http";
+import * as os from "os";
+import * as path from "path";
+import type { AddressInfo } from "net";
+describe("TokenBuddy image generation full chain", () => {
+  let tempDir: string;
+  let upstreamServer: http.Server;
+  let sellerServer: http.Server;
+  let bootstrapServer: http.Server;
+  let daemon: TokenbuddyDaemon;
+  let sellerClose: () => void;
+  let buyerDbPath: string;
+  let sellerDbPath: string;
+  let registryPath: string;
+  afterEach(async () => {
+    daemon?.stop();
+    await closeServer(sellerServer);
+    sellerClose?.();
+    await closeServer(bootstrapServer);
+    await closeServer(upstreamServer);
+    if (tempDir) {
+      fs.rmSync(tempDir, { recursive: true, force: true });
+    }
+  });
+  test("proxies /v1/images/generations through seller and records authoritative billing", async () => {
+    tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "tb-image-e2e-"));
+    buyerDbPath = path.join(tempDir, "buyer.db");
+    sellerDbPath = path.join(tempDir, "seller.db");
+    registryPath = path.join(tempDir, "registry.json");
+    upstreamServer = http.createServer((req, res) => {
+      if (req.url !== "/v1/images/generations" || req.method !== "POST") {
+        res.writeHead(404, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: "unexpected endpoint" }));
+        return;
+      }
+      let body = "";
+      req.setEncoding("utf8");
+      req.on("data", (chunk) => {
+        body += chunk;
+      });
+      req.on("end", () => {
+        const parsed = JSON.parse(body) as {
+          model?: string;
+          prompt?: string;
+          requestId?: string;
+          request_id?: string;
+          size?: string;
+          quality?: string;
+          output_format?: string;
+        };
+        expect(parsed).toMatchObject({
+          model: "gpt-image-2",
+          prompt: "draw a tiny smoke test",
+          size: "1024x1024",
+          quality: "high",
+          output_format: "png"
+        });
+        expect(parsed.requestId).toBeUndefined();
+        expect(parsed.request_id).toBeUndefined();
+        res.writeHead(200, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({
+          created: 123,
+          data: [{ b64_json: "aW1hZ2U=" }],
+          usage: {
+            input_tokens: 25,
+            output_tokens: 75,
+            total_tokens: 100
+          }
+        }));
+      });
+    });
+    await listen(upstreamServer);
+    const upstreamPort = portOf(upstreamServer);
+    const sellerHandle = buildSellerApp(sellerDbPath, {
+      allowMock: true,
+      publicMockPayments: true,
+      upstreamUrl: `http://127.0.0.1:${upstreamPort}`,
+      upstreamApiKey: "upstream-test-key",
+      upstreamCapabilities: {
+        chatCompletions: "unsupported",
+        responses: "unsupported",
+        messages: "unsupported",
+        imagesGenerations: "supported"
+      },
+      models: [
+        {
+          id: "gpt-image-2",
+          inputPriceMicrosPer1m: 1000000,
+          outputPriceMicrosPer1m: 3000000,
+          streaming: false
+        }
+      ]
+    });
+    sellerClose = sellerHandle.close;
+    sellerServer = http.createServer(sellerHandle.app);
+    await listen(sellerServer);
+    const sellerPort = portOf(sellerServer);
+    fs.writeFileSync(registryPath, JSON.stringify({
+      version: 1,
+      defaultSeller: "seller-image-e2e",
+      sellers: [
+        {
+          id: "seller-image-e2e",
+          name: "Seller Image E2E",
+          url: `http://127.0.0.1:${sellerPort}`,
+          supportedProtocols: ["images_generations"],
+          paymentMethods: ["mock"],
+          models: ["gpt-image-2"]
+        }
+      ]
+    }), "utf8");
+    const bootstrapApp = buildBootstrapApp({
+      payTo: "test-activation-pay-to",
+      sm4KeyBase64: "MDEyMzQ1Njc4OUFCQ0RFRg==",
+      skillSlug: "test-activation-slug",
+      skillId: "test-activation-id",
+      description: "Activate registration",
+      resourceUrl: "http://127.0.0.1/verify",
+      activationFeeFen: 1,
+      microsPerFen: 1000000,
+      sellerRegistryPath: registryPath,
+      operatorSecret: "op-secret",
+      allowLocalSellerUrls: true
+    });
+    bootstrapServer = http.createServer(bootstrapApp);
+    await listen(bootstrapServer);
+    const bootstrapPort = portOf(bootstrapServer);
+    const buyerStore = new BuyerStore({ dbPath: buyerDbPath });
+    buyerStore.savePayment({
+      method: "mock",
+      enabled: true,
+      isDefault: true,
+      config: { channel: "image-e2e-test" }
+    });
+    buyerStore.saveDaemonRuntimeConfig(PROVIDER_MODE_CONFIG_KEY, {
+      mode: "auto",
+      updatedAt: new Date().toISOString()
+    });
+    buyerStore.close();
+    daemon = new TokenbuddyDaemon({
+      controlPort: 0,
+      proxyPort: 0,
+      dbPath: buyerDbPath,
+      sellerRegistryUrl: `http://127.0.0.1:${bootstrapPort}/registry/sellers`
+    });
+    daemon.start();
+    const daemonProxyPort = portOf((daemon as any).proxyServer);
+    const response = await fetch(`http://127.0.0.1:${daemonProxyPort}/v1/images/generations`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "X-Request-Id": "image_full_chain"
+      },
+      body: JSON.stringify({
+        model: "gpt-image-2",
+        prompt: "draw a tiny smoke test",
+        size: "1024x1024",
+        quality: "high",
+        output_format: "png"
+      })
+    });
+    expect(response.ok).toBe(true);
+    const body = await response.json() as any;
+    expect(body.data[0].b64_json).toBe("aW1hZ2U=");
+    const after = new BuyerStore({ dbPath: buyerDbPath });
+    try {
+      expect(after.listInferenceLedger()).toEqual(expect.arrayContaining([
+        expect.objectContaining({
+          requestId: "image_full_chain",
+          sellerKey: "seller-image-e2e",
+          modelId: "gpt-image-2",
+          endpoint: "/v1/images/generations",
+          billedMicros: 250,
+          estimatedMicros: 400,
+          settledMicros: 250,
+          settledUsdMicros: 250,
+          billingUnit: "images",
+          imageCount: 1,
+          imageSize: "1024x1024",
+          imageQuality: "high",
+          imageOutputFormat: "png",
+          imageOutputTokens: 75,
+          imageOutputCostMicros: 225,
+          imageCostMicrosPerImage: 250,
+          balanceSource: "seller_authoritative"
+        })
+      ]));
+      expect(after.getToken("seller-image-e2e")).toMatchObject({
+        balanceMicros: 1999750,
+        reservedMicros: 0,
+        spentMicros: 250,
+        balanceSource: "seller_settlement_summary"
+      });
+    } finally {
+      after.close();
+    }
+  });
+});
+function listen(server: http.Server): Promise<void> {
+  return new Promise((resolve) => server.listen(0, "127.0.0.1", () => resolve()));
+}
+function closeServer(server: http.Server | undefined): Promise<void> {
+  if (!server?.listening) {
+    return Promise.resolve();
+  }
+  return new Promise((resolve) => server.close(() => resolve()));
+}
+function portOf(server: http.Server): number {
+  return (server.address() as AddressInfo).port;
+}