@odla-ai/chapter 0.42.2 → 0.42.4

package/dist/worker/index.d.cts

@@ -23,7 +23,7 @@ type TextFields$1<Key extends string> = {
     [Field in Key]: string;
 };
 /** User-visible language for sharing, delivery state, and leader rollups. */
-type AdminNetworkCopy = TextFields$1<"title" | "allowlistDescription" | "sharing" | "shareWith" | "shared" | "shareFailed" | "deliveryFailed" | "loadingRollup" | "loadRollupFailed" | "overview" | "configuredFollowers" | "reachableFollowers" | "recordsAcrossFollowers" | "noFollowers" | "followers" | "available" | "unavailable" | "recordTotals" | "noRecordTotals">;
+type AdminNetworkCopy = TextFields$1<"title" | "allowlistDescription" | "sharing" | "shareWith" | "shared" | "shareFailed" | "deliveryFailed" | "loadingRollup" | "loadRollupFailed" | "overview" | "configuredFollowers" | "reachableFollowers" | "recordsAcrossFollowers" | "noFollowers" | "followers" | "available" | "unavailable" | "transportReachable" | "transportUnavailable" | "transportNotChecked" | "bindingTransport" | "urlTransport" | "activeConfiguration" | "noActiveConfiguration" | "publicSiteAvailable" | "publicSiteUnavailable" | "publicSiteNotChecked" | "recordTotals" | "noRecordTotals">;
 
 type TextFields<Key extends string> = {
     [Field in Key]: string;

package/dist/worker/index.d.ts

@@ -23,7 +23,7 @@ type TextFields$1<Key extends string> = {
     [Field in Key]: string;
 };
 /** User-visible language for sharing, delivery state, and leader rollups. */
-type AdminNetworkCopy = TextFields$1<"title" | "allowlistDescription" | "sharing" | "shareWith" | "shared" | "shareFailed" | "deliveryFailed" | "loadingRollup" | "loadRollupFailed" | "overview" | "configuredFollowers" | "reachableFollowers" | "recordsAcrossFollowers" | "noFollowers" | "followers" | "available" | "unavailable" | "recordTotals" | "noRecordTotals">;
+type AdminNetworkCopy = TextFields$1<"title" | "allowlistDescription" | "sharing" | "shareWith" | "shared" | "shareFailed" | "deliveryFailed" | "loadingRollup" | "loadRollupFailed" | "overview" | "configuredFollowers" | "reachableFollowers" | "recordsAcrossFollowers" | "noFollowers" | "followers" | "available" | "unavailable" | "transportReachable" | "transportUnavailable" | "transportNotChecked" | "bindingTransport" | "urlTransport" | "activeConfiguration" | "noActiveConfiguration" | "publicSiteAvailable" | "publicSiteUnavailable" | "publicSiteNotChecked" | "recordTotals" | "noRecordTotals">;
 
 type TextFields<Key extends string> = {
     [Field in Key]: string;

package/dist/worker/index.js

@@ -3308,17 +3308,36 @@ async function deliverAdmissionGrants(options) {
 }
 
 // src/worker-network-fetch.ts
-function targetFetcher(env, target) {
-  if (!target.binding) return null;
+var NetworkTargetTransportError = class extends Error {
+  code = "binding_unavailable";
+  binding;
+  constructor(binding) {
+    super(`service binding "${binding}" is unavailable`);
+    this.name = "NetworkTargetTransportError";
+    this.binding = binding;
+  }
+};
+function resolveNetworkTargetTransport(env, target) {
+  if (!target.binding) {
+    return {
+      kind: "url",
+      fetch: (destination, init) => globalThis.fetch(destination, init)
+    };
+  }
   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`);
+    throw new NetworkTargetTransportError(target.binding);
   }
-  return candidate;
+  const binding = candidate;
+  return {
+    kind: "binding",
+    binding: target.binding,
+    // Keep the receiver attached: Cloudflare service bindings require it.
+    fetch: (destination, init) => binding.fetch(new Request(destination, init))
+  };
 }
 function fetchNetworkTarget(env, target, destination, init) {
-  const binding = targetFetcher(env, target);
-  return binding ? binding.fetch(new Request(destination, init)) : globalThis.fetch(destination, init);
+  return resolveNetworkTargetTransport(env, target).fetch(destination, init);
 }
 
 // src/worker-network-admission-state.ts
@@ -5732,26 +5751,50 @@ var handleNetworkSnapshot = async (req, url, env, ctx) => {
   const types = await Promise.all(
     Object.keys(ctx.chapter.crm.config.types).map((type) => typeSummary({ crm: ctx.chapter.crm, db }, type))
   );
+  const activeConfiguration = ctx.chapter.signupControl ? await loadActiveSignupControl(db, ctx.chapter.id, env.ODLA_ENV) : null;
   const snapshot = {
     version: 1,
     site: { id: ctx.chapter.id, name: ctx.chapter.name, mode: ctx.chapter.mode },
     generatedAt: Date.now(),
+    configuration: {
+      activeRevision: activeConfiguration?.revision ?? null,
+      ...activeConfiguration ? { digest: activeConfiguration.digest } : {}
+    },
     types
   };
   return json(snapshot);
 };
 async function snapshotOne(db, env, ctx, target) {
+  const transportKind = target.binding ? "binding" : "url";
+  const base = {
+    id: target.id,
+    name: target.name,
+    url: target.url,
+    configuration: { activeRevision: null },
+    publicSite: { available: null }
+  };
   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" };
+  if (!secret) return {
+    ...base,
+    available: false,
+    transport: {
+      kind: transportKind,
+      ...target.binding ? { binding: target.binding } : {},
+      reachable: null,
+      error: { code: "edge_secret_missing", message: "edge secret is missing" }
+    },
+    error: "edge secret is missing"
+  };
   const destination = new URL("/api/network/snapshot", target.url);
   try {
+    const transport = resolveNetworkTargetTransport(env, target);
     const headers = await signFederatedRequest3({
       secret,
       sender: ctx.chapter.id,
       method: "GET",
       url: destination
     });
-    const response = await fetchNetworkTarget(env, target, destination, {
+    const response = await transport.fetch(destination, {
       headers,
       signal: AbortSignal.timeout(1e4)
     });
@@ -5759,28 +5802,47 @@ async function snapshotOne(db, env, ctx, target) {
     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;
       return {
-        id: target.id,
-        name: target.name,
-        url: target.url,
+        ...base,
         available: false,
+        transport: {
+          kind: transport.kind,
+          ...transport.binding ? { binding: transport.binding } : {},
+          reachable: true
+        },
+        publicSite: { available: transport.kind === "url" ? true : null },
         error: upstream ?? (response.ok ? "invalid follower snapshot" : `follower returned ${response.status}`)
       };
     }
     return {
-      id: target.id,
-      name: target.name,
-      url: target.url,
+      ...base,
       available: true,
+      transport: {
+        kind: transport.kind,
+        ...transport.binding ? { binding: transport.binding } : {},
+        reachable: true
+      },
+      configuration: body.configuration ?? { activeRevision: null },
+      publicSite: { available: transport.kind === "url" ? true : null },
       generatedAt: body.generatedAt,
       types: body.types
     };
   } catch (error) {
+    const bindingError = error instanceof NetworkTargetTransportError;
+    const message = error instanceof Error ? error.message : "snapshot failed";
     return {
-      id: target.id,
-      name: target.name,
-      url: target.url,
+      ...base,
       available: false,
-      error: error instanceof Error ? error.message : "snapshot failed"
+      transport: {
+        kind: transportKind,
+        ...target.binding ? { binding: target.binding } : {},
+        reachable: false,
+        error: {
+          code: bindingError ? "binding_unavailable" : target.binding ? "binding_request_failed" : "url_request_failed",
+          message
+        }
+      },
+      publicSite: { available: target.binding ? null : false },
+      error: message
     };
   }
 }