@odla-ai/chapter 0.26.0 → 0.26.1

package/dist/worker/index.d.cts

@@ -64,6 +64,10 @@ interface ChapterNetworkTarget {
     name?: string;
     /** Absolute follower origin, e.g. `https://chapter.example.com`. */
     url: string;
+    /** Optional Cloudflare service-binding name for Worker-to-Worker delivery.
+     * The URL still defines the signed request origin; the binding only supplies
+     * the transport when a `workers.dev` subrequest cannot enter another Worker. */
+    binding?: string;
     /** Leader-vault key holding this follower's share secret. Defaults to
      * `network_share_<id-with-underscores>`. */
     secretName?: string;
@@ -106,6 +110,7 @@ interface ResolvedNetworkTarget {
     id: string;
     name: string;
     url: string;
+    binding?: string;
     secretName: string;
     fields?: Record<string, readonly string[]>;
 }

package/dist/worker/index.d.ts

@@ -64,6 +64,10 @@ interface ChapterNetworkTarget {
     name?: string;
     /** Absolute follower origin, e.g. `https://chapter.example.com`. */
     url: string;
+    /** Optional Cloudflare service-binding name for Worker-to-Worker delivery.
+     * The URL still defines the signed request origin; the binding only supplies
+     * the transport when a `workers.dev` subrequest cannot enter another Worker. */
+    binding?: string;
     /** Leader-vault key holding this follower's share secret. Defaults to
      * `network_share_<id-with-underscores>`. */
     secretName?: string;
@@ -106,6 +110,7 @@ interface ResolvedNetworkTarget {
     id: string;
     name: string;
     url: string;
+    binding?: string;
     secretName: string;
     fields?: Record<string, readonly string[]>;
 }

package/dist/worker/index.js

@@ -2615,8 +2615,118 @@ var handleAdminComms = async (req, url, env, ctx) => {
 };
 
 // src/worker-routes-network.ts
-import { getRecord, recordDeliveryAttempt, typeSummary } from "@odla-ai/crm";
-import { signFederatedRequest, verifyFederatedRequest as verifyFederatedRequest2 } from "@odla-ai/db";
+import { getRecord, typeSummary } from "@odla-ai/crm";
+import { signFederatedRequest as signFederatedRequest2, verifyFederatedRequest as verifyFederatedRequest2 } from "@odla-ai/db";
+
+// src/worker-network-fetch.ts
+function targetFetcher(env, target) {
+  if (!target.binding) return null;
+  const candidate = env[target.binding];
+  if (typeof candidate !== "object" || candidate === null || !("fetch" in candidate) || typeof candidate.fetch !== "function") {
+    throw new Error(`service binding "${target.binding}" is unavailable`);
+  }
+  return candidate;
+}
+function fetchNetworkTarget(env, target, destination, init) {
+  const binding = targetFetcher(env, target);
+  return binding ? binding.fetch(new Request(destination, init)) : globalThis.fetch(destination, init);
+}
+
+// src/worker-network-push.ts
+import { recordDeliveryAttempt } from "@odla-ai/crm";
+import { signFederatedRequest } from "@odla-ai/db";
+async function pushNetworkRecord(db, env, ctx, target, record) {
+  const secret = await getVaultSecret(db, target.secretName);
+  const crmDeps3 = {
+    crm: ctx.chapter.crm,
+    db,
+    now: () => Date.now(),
+    newId: () => crypto.randomUUID()
+  };
+  if (!secret) {
+    const error = `vault secret "${target.secretName}" is missing`;
+    await recordDeliveryAttempt(crmDeps3, {
+      recordId: record.id,
+      targetId: target.id,
+      status: "failed",
+      payloadVersion: 2,
+      error
+    });
+    return { id: target.id, name: target.name, ok: false, error };
+  }
+  let payload;
+  try {
+    payload = sharedRecordFromCrm(ctx.chapter.crm, record, target, ctx.chapter.id);
+  } catch (err) {
+    return {
+      id: target.id,
+      name: target.name,
+      ok: false,
+      error: err instanceof Error ? err.message : "record is not shareable"
+    };
+  }
+  const payloadBody = JSON.stringify(payload);
+  const destination = new URL("/api/network/shared", target.url);
+  try {
+    const signed = await signFederatedRequest({
+      secret,
+      sender: ctx.chapter.id,
+      method: "POST",
+      url: destination,
+      body: payloadBody
+    });
+    const res = await fetchNetworkTarget(env, target, destination, {
+      method: "POST",
+      headers: { ...signed, "content-type": "application/json" },
+      body: payloadBody,
+      signal: AbortSignal.timeout(1e4)
+    });
+    const responseBody = await res.json().catch(() => ({}));
+    if (!res.ok) {
+      const error = responseBody.error ?? "follower rejected the record";
+      await recordDeliveryAttempt(crmDeps3, {
+        recordId: record.id,
+        targetId: target.id,
+        status: "failed",
+        payloadVersion: 2,
+        error
+      });
+      return {
+        id: target.id,
+        name: target.name,
+        ok: false,
+        status: res.status,
+        error
+      };
+    }
+    await recordDeliveryAttempt(crmDeps3, {
+      recordId: record.id,
+      targetId: target.id,
+      status: "delivered",
+      payloadVersion: 2,
+      ...responseBody.recordId ? { remoteRecordId: responseBody.recordId } : {}
+    });
+    return {
+      id: target.id,
+      name: target.name,
+      ok: true,
+      status: res.status,
+      recordId: responseBody.recordId
+    };
+  } catch (err) {
+    const error = err instanceof Error ? err.message : "delivery failed";
+    await recordDeliveryAttempt(crmDeps3, {
+      recordId: record.id,
+      targetId: target.id,
+      status: "failed",
+      payloadVersion: 2,
+      error
+    });
+    return { id: target.id, name: target.name, ok: false, error };
+  }
+}
+
+// src/worker-routes-network.ts
 async function gate4(req, env, ctx) {
   const db = ctx.makeDb(env);
   const user = await ctx.verifyUser(req, env);
@@ -2655,18 +2765,21 @@ var handleNetworkSnapshot = async (req, url, env, ctx) => {
   };
   return json(snapshot);
 };
-async function snapshotOne(db, ctx, target) {
+async function snapshotOne(db, env, ctx, target) {
   const secret = await getVaultSecret(db, target.secretName);
   if (!secret) return { id: target.id, name: target.name, url: target.url, available: false, error: "edge secret is missing" };
   const destination = new URL("/api/network/snapshot", target.url);
   try {
-    const headers = await signFederatedRequest({
+    const headers = await signFederatedRequest2({
       secret,
       sender: ctx.chapter.id,
       method: "GET",
       url: destination
     });
-    const response = await fetch(destination, { headers, signal: AbortSignal.timeout(1e4) });
+    const response = await fetchNetworkTarget(env, target, destination, {
+      headers,
+      signal: AbortSignal.timeout(1e4)
+    });
     const body = await response.json().catch(() => null);
     if (!response.ok || !body || !("version" in body) || body.version !== 1 || !("site" in body) || body.site.id !== target.id || !Array.isArray(body.types)) {
       const upstream = body && "error" in body && typeof body.error === "string" ? body.error : void 0;
@@ -2701,7 +2814,7 @@ var handleAdminNetworkRollup = async (req, url, env, ctx) => {
   const got = await gate4(req, env, ctx);
   if ("response" in got) return got.response;
   const targets = await Promise.all(
-    ctx.chapter.network.targets.map((target) => snapshotOne(got.db, ctx, target))
+    ctx.chapter.network.targets.map((target) => snapshotOne(got.db, env, ctx, target))
   );
   const byType = /* @__PURE__ */ new Map();
   for (const target of targets) {
@@ -2723,74 +2836,6 @@ var handleAdminNetworkRollup = async (req, url, env, ctx) => {
   };
   return json(rollup);
 };
-async function pushOne(db, ctx, target, record) {
-  const secret = await getVaultSecret(db, target.secretName);
-  const crmDeps3 = { crm: ctx.chapter.crm, db, now: () => Date.now(), newId: () => crypto.randomUUID() };
-  if (!secret) {
-    const error = `vault secret "${target.secretName}" is missing`;
-    await recordDeliveryAttempt(crmDeps3, {
-      recordId: record.id,
-      targetId: target.id,
-      status: "failed",
-      payloadVersion: 2,
-      error
-    });
-    return { id: target.id, name: target.name, ok: false, error };
-  }
-  let payload;
-  try {
-    payload = sharedRecordFromCrm(ctx.chapter.crm, record, target, ctx.chapter.id);
-  } catch (err) {
-    return { id: target.id, name: target.name, ok: false, error: err instanceof Error ? err.message : "record is not shareable" };
-  }
-  const payloadBody = JSON.stringify(payload);
-  const destination = new URL("/api/network/shared", target.url);
-  try {
-    const signed = await signFederatedRequest({
-      secret,
-      sender: ctx.chapter.id,
-      method: "POST",
-      url: destination,
-      body: payloadBody
-    });
-    const res = await fetch(destination, {
-      method: "POST",
-      headers: { ...signed, "content-type": "application/json" },
-      body: payloadBody,
-      signal: AbortSignal.timeout(1e4)
-    });
-    const responseBody = await res.json().catch(() => ({}));
-    if (!res.ok) {
-      const error = responseBody.error ?? "follower rejected the record";
-      await recordDeliveryAttempt(crmDeps3, {
-        recordId: record.id,
-        targetId: target.id,
-        status: "failed",
-        payloadVersion: 2,
-        error
-      });
-      return { id: target.id, name: target.name, ok: false, status: res.status, error };
-    }
-    await recordDeliveryAttempt(crmDeps3, {
-      recordId: record.id,
-      targetId: target.id,
-      status: "delivered",
-      payloadVersion: 2,
-      ...responseBody.recordId ? { remoteRecordId: responseBody.recordId } : {}
-    });
-    return { id: target.id, name: target.name, ok: true, status: res.status, recordId: responseBody.recordId };
-  } catch (err) {
-    const error = err instanceof Error ? err.message : "delivery failed";
-    await recordDeliveryAttempt(crmDeps3, {
-      recordId: record.id,
-      targetId: target.id,
-      status: "failed",
-      payloadVersion: 2,
-      error
-    });
-    return { id: target.id, name: target.name, ok: false, error };
-  }
-}
 var handleAdminNetworkPush = async (req, url, env, ctx) => {
   if (req.method !== "POST" || url.pathname !== "/api/admin/network/push") return null;
   const got = await gate4(req, env, ctx);
@@ -2811,7 +2856,7 @@ var handleAdminNetworkPush = async (req, url, env, ctx) => {
   const record = await getRecord({ crm: ctx.chapter.crm, db: got.db }, body.recordId);
   if (!record) return json({ error: "record not found" }, 404);
   const results = await Promise.all(
-    targets.map((target) => pushOne(got.db, ctx, target, record))
+    targets.map((target) => pushNetworkRecord(got.db, env, ctx, target, record))
   );
   return json({ ok: results.every((result) => result.ok), results });
 };