orez-sync-cf-host 0.4.63 → 0.4.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orez-sync-cf-host",
-  "version": "0.4.63",
+  "version": "0.4.64",
   "type": "module",
   "exports": {
     ".": "./src/index.ts"

package/src/host.ts

@@ -690,7 +690,8 @@ export function createSyncDurableObject<Env extends SyncHostEnv>(
     async #fetchDelegatedPush(
       endpoint: URL,
       headers: Headers,
-      body: ArrayBuffer
+      body: ArrayBuffer,
+      provisioning = false
     ): Promise<Response> {
       const binding = this.#serviceBinding(
         config.mutateBinding ?? config.upstream?.binding
@@ -703,7 +704,9 @@ export function createSyncDurableObject<Env extends SyncHostEnv>(
             method: 'POST',
             headers,
             body,
-            signal: AbortSignal.timeout(delegateTimeoutMs),
+            signal: AbortSignal.timeout(
+              provisioning ? Math.max(delegateTimeoutMs, 25_000) : delegateTimeoutMs
+            ),
           })
         } catch (error) {
           lastError = error
@@ -1048,7 +1051,8 @@ export function createSyncDurableObject<Env extends SyncHostEnv>(
           const upstreamResponse = await this.#fetchDelegatedPush(
             endpoint,
             headers,
-            bytes
+            bytes,
+            this.#engineState()?.upstreamWatermark === '0'
           )
           if (!upstreamResponse.ok) {
             return new Response(upstreamResponse.body, upstreamResponse)
@@ -1477,6 +1481,17 @@ export function createSyncDurableObject<Env extends SyncHostEnv>(
         return this.#pull(request, claims, namespace)
       }
       if (route === '/push' && request.method === 'POST') {
+        // A push may be the first request for a fresh namespace. DATA's
+        // /changes call is also its schema-provisioning barrier, so complete it
+        // before delegating the mutation to APP. Pull already enforces this
+        // ordering above; skipping it here let APP race half-created tables and
+        // surface a terminal, bodyless 500 to Zero.
+        try {
+          await this.#ingest(upstreamPath)
+        } catch (error) {
+          await request.arrayBuffer()
+          return json(errorBody(error), statusOf(error))
+        }
         return this.#push(request, claims, namespace, upstreamPath)
       }
       return json({ error: 'not found' }, 404)

package/src/ingest-harness-worker.ts

@@ -29,6 +29,7 @@ interface Env extends SyncHostEnv {
 
 const runawayNamespaces = new Set<string>()
 const numericTextNamespaces = new Set<string>()
+const hydratedNamespaces = new Set<string>()
 let delegatedFailuresRemaining = 0
 let delegatedAttempts = 0
 
@@ -96,7 +97,7 @@ async function upstreamFetch(request: Request, env: Env): Promise<Response> {
 
 /** Self service-binding target backed by the real ZeroSqlDO. */
 export class DataService extends WorkerEntrypoint<Env> {
-  fetch(request: Request): Promise<Response> {
+  async fetch(request: Request): Promise<Response> {
     const url = new URL(request.url)
     const pathname = url.pathname
     if (
@@ -170,7 +171,9 @@ export class DataService extends WorkerEntrypoint<Env> {
         })
       )
     }
-    return upstreamFetch(request, this.env)
+    const response = await upstreamFetch(request, this.env)
+    if (pathname.endsWith('/changes') && response.ok) hydratedNamespaces.add(namespace)
+    return response
   }
 }
 
@@ -181,6 +184,12 @@ export class AppService extends WorkerEntrypoint<Env> {
         new Response('APP route rejected non-push request', { status: 418 })
       )
     }
+    const namespace = new URL(request.url).pathname.split('/')[1] ?? ''
+    if (!hydratedNamespaces.has(namespace)) {
+      return Promise.resolve(
+        Response.json({ error: 'schema provisioning has not completed' }, { status: 500 })
+      )
+    }
     delegatedAttempts++
     if (delegatedFailuresRemaining > 0) {
       delegatedFailuresRemaining--