orez-sync-cf-host 0.4.64 → 0.4.66

package/package.json

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

package/src/host.ts

@@ -73,6 +73,13 @@ type MutationResult = {
   result: Record<string, unknown>
 }
 
+type DelegatedMutationResult = { id?: { clientID?: unknown; id?: unknown } }
+type DelegatedPushBody = {
+  mutations?: DelegatedMutationResult[]
+  pushResponse?: unknown
+  [key: string]: unknown
+}
+
 type EngineState = { watermark: string; floor: string; upstreamWatermark: string }
 type UpstreamBatch = {
   watermark: number
@@ -135,6 +142,18 @@ function json(value: unknown, status = 200): Response {
   })
 }
 
+function isStructuredPushFailed(value: unknown): value is Record<string, unknown> {
+  if (typeof value !== 'object' || value === null) return false
+  const body = value as Record<string, unknown>
+  return (
+    body.kind === 'PushFailed' &&
+    typeof body.origin === 'string' &&
+    typeof body.reason === 'string' &&
+    typeof body.message === 'string' &&
+    Array.isArray(body.mutationIDs)
+  )
+}
+
 function statusOf(error: unknown): number {
   if (typeof error === 'object' && error !== null && 'status' in error) {
     const status = Number(error.status)
@@ -1057,14 +1076,21 @@ export function createSyncDurableObject<Env extends SyncHostEnv>(
           if (!upstreamResponse.ok) {
             return new Response(upstreamResponse.body, upstreamResponse)
           }
-          const upstreamBody = (await upstreamResponse.json()) as {
-            mutations?: Array<{ id?: { clientID?: unknown; id?: unknown } }>
-            pushResponse?: {
-              mutations?: Array<{ id?: { clientID?: unknown; id?: unknown } }>
-            }
+          const upstreamBody = (await upstreamResponse.json()) as DelegatedPushBody
+          const delegatedResponse = upstreamBody.pushResponse ?? upstreamBody
+          if (isStructuredPushFailed(delegatedResponse)) {
+            // PushFailed is a successful protocol response describing an
+            // application-level failure. There are intentionally no mutation
+            // acknowledgements to finalize in the host; preserve the body so
+            // the Zero client can apply its retry/error policy.
+            return json({ pushResponse: delegatedResponse })
           }
           const acknowledged =
-            upstreamBody.pushResponse?.mutations ?? upstreamBody.mutations
+            typeof upstreamBody.pushResponse === 'object' &&
+            upstreamBody.pushResponse !== null &&
+            'mutations' in upstreamBody.pushResponse
+              ? upstreamBody.pushResponse.mutations
+              : upstreamBody.mutations
           if (!Array.isArray(acknowledged)) {
             throw new Error('delegated push returned no mutation results')
           }
@@ -1104,7 +1130,7 @@ export function createSyncDurableObject<Env extends SyncHostEnv>(
             )
           }
           await this.#ingest(upstreamPath)
-          return json({ pushResponse: upstreamBody.pushResponse ?? upstreamBody })
+          return json({ pushResponse: delegatedResponse })
         } catch (error) {
           const status = statusOf(error)
           return json(errorBody(error), status)

package/src/ingest-harness-worker.ts

@@ -32,6 +32,7 @@ const numericTextNamespaces = new Set<string>()
 const hydratedNamespaces = new Set<string>()
 let delegatedFailuresRemaining = 0
 let delegatedAttempts = 0
+let delegatedPushFailedRemaining = 0
 
 const config: SyncHostConfig<Env> = {
   hostVersion: 'upstream-ingest-harness',
@@ -191,6 +192,18 @@ export class AppService extends WorkerEntrypoint<Env> {
       )
     }
     delegatedAttempts++
+    if (delegatedPushFailedRemaining > 0) {
+      delegatedPushFailedRemaining--
+      return Promise.resolve(
+        Response.json({
+          kind: 'PushFailed',
+          origin: 'server',
+          reason: 'database',
+          mutationIDs: [{ clientID: 'writer', id: 2 }],
+          message: 'synthetic mutation result persistence failure',
+        })
+      )
+    }
     if (delegatedFailuresRemaining > 0) {
       delegatedFailuresRemaining--
       return Promise.resolve(
@@ -236,7 +249,11 @@ export default {
     if (url.pathname === '/delegation-control') {
       if (request.method === 'GET') {
         return Promise.resolve(
-          Response.json({ delegatedFailuresRemaining, delegatedAttempts })
+          Response.json({
+            delegatedFailuresRemaining,
+            delegatedPushFailedRemaining,
+            delegatedAttempts,
+          })
         )
       }
       return request
@@ -247,8 +264,16 @@ export default {
             0,
             Number((body as { failures?: unknown }).failures) || 0
           )
+          delegatedPushFailedRemaining = Math.max(
+            0,
+            Number((body as { pushFailed?: unknown }).pushFailed) || 0
+          )
           delegatedAttempts = 0
-          return Response.json({ delegatedFailuresRemaining, delegatedAttempts })
+          return Response.json({
+            delegatedFailuresRemaining,
+            delegatedPushFailedRemaining,
+            delegatedAttempts,
+          })
         })
     }
     if (url.pathname.startsWith('/upstream/')) {