orez 0.2.25 → 0.2.27

package/src/cf-do/wrangler.toml

@@ -0,0 +1,11 @@
+name = "zero-do"
+main = "worker.ts"
+compatibility_date = "2025-04-01"
+
+[[durable_objects.bindings]]
+name = "ZERO_DO"
+class_name = "ZeroDO"
+
+[[migrations]]
+tag = "v1"
+new_sqlite_classes = ["ZeroDO"]

package/src/cli.test.ts

@@ -7,7 +7,9 @@ function runCli(
   args: string[]
 ): Promise<{ stdout: string; stderr: string; code: number }> {
   return new Promise((res) => {
-    const child = spawn('bun', [resolve('dist/cli.js'), ...args], {
+    // cli-entry.js is the actual entry (cli.js only exports `main`; runMain
+    // is invoked from cli-entry).
+    const child = spawn('bun', [resolve('dist/cli-entry.js'), ...args], {
       timeout: 10_000,
       env: { ...process.env, NODE_ENV: 'test' },
     })

package/src/config.ts

@@ -139,7 +139,7 @@ export function getConfig(overrides: Partial<ZeroLiteConfig> = {}): ZeroLiteConf
     checkpointIntervalMs: overrides.checkpointIntervalMs ?? 5 * 60 * 1000,
     maxLogFileSize: overrides.maxLogFileSize ?? 2 * 1024 * 1024,
     disableDiskLogs: overrides.disableDiskLogs ?? false,
-    doBackendUrl: overrides.doBackendUrl,
+    doBackendUrl: overrides.doBackendUrl ?? process.env.DO_BACKEND_URL,
     onDbReady: overrides.onDbReady,
     onHealthy: overrides.onHealthy,
   }

package/src/do-sql-tracking.test.ts

@@ -0,0 +1,19 @@
+import { describe, expect, it } from 'vitest'
+
+import { trackedChangeRow } from './do-sql-tracking.js'
+
+describe('trackedChangeRow', () => {
+  it('keeps only table columns and strips internal returning expressions', () => {
+    expect(
+      trackedChangeRow(
+        {
+          id: 't1',
+          body: 'hello',
+          __orez_returning_1: 'HELLO',
+          extra: 'client-visible only',
+        },
+        { rowColumns: ['id', 'body'] }
+      )
+    ).toEqual({ id: 't1', body: 'hello' })
+  })
+})

package/src/do-sql-tracking.ts

@@ -0,0 +1,19 @@
+export const RETURNING_INTERNAL_PREFIX = '__orez_returning_'
+
+export interface TrackedRowFilter {
+  rowColumns?: string[]
+}
+
+export function trackedChangeRow(
+  row: Record<string, unknown>,
+  track: TrackedRowFilter
+): Record<string, unknown> {
+  const allowed = track.rowColumns ? new Set(track.rowColumns) : null
+  const out: Record<string, unknown> = {}
+  for (const [key, value] of Object.entries(row)) {
+    if (key.startsWith(RETURNING_INTERNAL_PREFIX)) continue
+    if (allowed && !allowed.has(key)) continue
+    out[key] = value
+  }
+  return out
+}

package/src/index.ts

@@ -7,6 +7,7 @@
  */
 
 import { spawn, spawnSync, type ChildProcess } from 'node:child_process'
+import { randomUUID } from 'node:crypto'
 import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs'
 import { resolve } from 'node:path'
 
@@ -61,6 +62,17 @@ import type { PGlite } from '@electric-sql/pglite'
 
 type ZeroChildProcess = ChildProcess & { __orezTail?: string[] }
 
+function ensureDoBackendNamespace(dataDir: string): string {
+  const marker = resolve(dataDir, 'do-backend-namespace')
+  if (existsSync(marker)) {
+    const existing = readFileSync(marker, 'utf8').trim()
+    if (existing) return existing
+  }
+  const next = randomUUID()
+  writeFileSync(marker, `${next}\n`)
+  return next
+}
+
 function resolveNodeBinary(): string {
   const explicitNode = process.env.NODE
   if (explicitNode && existsSync(explicitNode)) {
@@ -330,10 +342,11 @@ export async function startZeroLite(overrides: Partial<ZeroLiteConfig> = {}) {
     isDoBackend = true
     log.orez(`using DO backend: ${config.doBackendUrl}`)
     const backendUrl = config.doBackendUrl.replace(/\/+$/, '')
+    const doNamespace = ensureDoBackendNamespace(config.dataDir)
     const doInstances = {
-      postgres: new DoBackend(backendUrl, 'postgres'),
-      cvr: new DoBackend(backendUrl, 'zero_cvr'),
-      cdb: new DoBackend(backendUrl, 'zero_cdb'),
+      postgres: new DoBackend(backendUrl, 'postgres', doNamespace),
+      cvr: new DoBackend(backendUrl, 'zero_cvr', doNamespace),
+      cdb: new DoBackend(backendUrl, 'zero_cdb', doNamespace),
       postgresReplicas: [],
     }
     await Promise.all([
@@ -381,10 +394,10 @@ export async function startZeroLite(overrides: Partial<ZeroLiteConfig> = {}) {
     log.debug.orez(`using managed publication: ${managedPub.names.join(', ')}`)
   }
 
-  // PGlite-only: sync publications
-  if (!isDoBackend) {
-    await syncManagedPublications(db, managedPub.names, managedPub.managedByOrez)
-  }
+  // sync publications. for DO backend this goes through the TCP proxy, which
+  // rewrites the catalog queries and forwards CREATE PUBLICATION / ALTER PUBLICATION
+  // as no-ops or DO-native equivalents (PGlite still owns the real path).
+  await syncManagedPublications(db, managedPub.names, managedPub.managedByOrez)
 
   // start tcp proxy (routes connections to correct instance by database name)
   const pgServer = await startPgProxy(instances, config)
@@ -410,13 +423,15 @@ export async function startZeroLite(overrides: Partial<ZeroLiteConfig> = {}) {
       OREZ_PG_PORT: String(config.pgPort),
     })
 
-    // re-sync publication membership (PGlite-only)
-    if (!isDoBackend) {
-      await syncManagedPublications(db, managedPub.names, managedPub.managedByOrez)
-      await ensurePublicationHasTables(db, managedPub.names)
-      log.debug.orez('re-installing change tracking after on-db-ready')
-      await installChangeTracking(db)
-    }
+    // re-sync publication membership
+    await syncManagedPublications(db, managedPub.names, managedPub.managedByOrez)
+    await ensurePublicationHasTables(db, managedPub.names)
+    log.debug.orez('re-installing change tracking after on-db-ready')
+    await installChangeTracking(db)
+  }
+
+  if (isDoBackend) {
+    await installChangeTracking(db)
   }
 
   // write the ready marker so external orchestrators (e.g. CI scripts that

package/src/pg-proxy-browser.ts

@@ -656,7 +656,7 @@ function messagePortToDuplexWithInject(port: MessagePort): {
         chunk.byteOffset,
         chunk.byteOffset + chunk.byteLength
       ) as ArrayBuffer
-      port.postMessage(buf, [buf])
+      port.postMessage(buf)
     },
     close() {
       port.close()
@@ -668,7 +668,7 @@ function messagePortToDuplexWithInject(port: MessagePort): {
       data.byteOffset,
       data.byteOffset + data.byteLength
     ) as ArrayBuffer
-    port.postMessage(buf, [buf])
+    port.postMessage(buf)
   }
 
   const injectMessage = (data: Uint8Array) => {
@@ -714,12 +714,12 @@ function messagePortToDuplex(port: MessagePort): {
       if (isDebugWire() && _globalWriteCount <= 200) {
         console.debug(`[pg-proxy-ws-write] #${_globalWriteCount} len=${chunk.byteLength}`)
       }
-      // transfer the ArrayBuffer for zero-copy
+      // CF workerd MessagePort does not support transfer lists.
       const buf = chunk.buffer.slice(
         chunk.byteOffset,
         chunk.byteOffset + chunk.byteLength
       ) as ArrayBuffer
-      port.postMessage(buf, [buf])
+      port.postMessage(buf)
     },
     close() {
       port.close()
@@ -733,7 +733,7 @@ function messagePortToDuplex(port: MessagePort): {
       data.byteOffset,
       data.byteOffset + data.byteLength
     ) as ArrayBuffer
-    port.postMessage(buf, [buf])
+    port.postMessage(buf)
   }
 
   return { duplex: { readable, writable }, rawWrite }
@@ -1020,7 +1020,7 @@ export async function createBrowserProxy(
       // cause issues if the caller still references the original data
       const copy = new Uint8Array(data.length)
       copy.set(data)
-      port.postMessage(copy.buffer, [copy.buffer])
+      port.postMessage(copy.buffer)
     }
 
     // step 1: send AuthenticationClearTextPassword (R, type=3) — ask for password