orez 0.0.52 → 0.0.53

package/src/index.ts

@@ -101,6 +101,10 @@ export async function startZeroLite(overrides: Partial<ZeroLiteConfig> = {}) {
 
   mkdirSync(config.dataDir, { recursive: true })
 
+  // write pid file for IPC (pg_restore uses this to signal restart)
+  const pidFile = resolve(config.dataDir, 'orez.pid')
+  writeFileSync(pidFile, String(process.pid))
+
   // start pglite (separate instances for postgres, zero_cvr, zero_cdb)
   const instances = await createPGliteInstances(config)
   const db = instances.postgres
@@ -166,6 +170,15 @@ export async function startZeroLite(overrides: Partial<ZeroLiteConfig> = {}) {
     })
   }
 
+  // handle SIGUSR1 to restart zero-cache (sent by pg_restore after clearing replica)
+  if (!config.skipZeroCache) {
+    process.on('SIGUSR1', async () => {
+      log.orez('received SIGUSR1, restarting zero-cache...')
+      await restartZeroCache(false) // replica already cleared by pg_restore
+      log.zero(`ready ${port(config.zeroPort, 'magenta')}`)
+    })
+  }
+
   const killZeroCache = async () => {
     if (zeroCacheProcess && !zeroCacheProcess.killed) {
       zeroCacheProcess.kill('SIGTERM')
@@ -202,6 +215,9 @@ export async function startZeroLite(overrides: Partial<ZeroLiteConfig> = {}) {
       instances.cvr.close(),
       instances.cdb.close(),
     ])
+    try {
+      unlinkSync(pidFile)
+    } catch {}
     log.debug.orez('stopped')
   }
 
@@ -353,9 +369,13 @@ async function startZeroCache(
   const cdbUrl = getConnectionString(config, 'zero_cdb')
 
   // defaults that can be overridden by user env
+  // when admin is enabled and user hasn't set ZERO_LOG_LEVEL, capture debug
+  // logs for the admin UI while still respecting --log-level for console output
+  const zeroLogLevel =
+    config.adminPort > 0 && !process.env.ZERO_LOG_LEVEL ? 'debug' : config.logLevel
   const defaults: Record<string, string> = {
     NODE_ENV: 'development',
-    ZERO_LOG_LEVEL: config.logLevel,
+    ZERO_LOG_LEVEL: zeroLogLevel,
     ZERO_NUM_SYNC_WORKERS: '1',
     // disable query planner — it relies on scanStatus which causes infinite
     // loops with wasm sqlite and has caused freezes with native too.
@@ -402,11 +422,30 @@ async function startZeroCache(
     stdio: ['ignore', 'pipe', 'pipe'],
   })
 
+  // detect log level from zero-cache output
+  const detectLevel = (line: string, fallback: string): string => {
+    const lower = line.toLowerCase()
+    if (
+      lower.includes('"level":"error"') ||
+      lower.includes(' error ') ||
+      lower.includes('error:')
+    )
+      return 'error'
+    if (
+      lower.includes('"level":"warn"') ||
+      lower.includes(' warn ') ||
+      lower.includes('warning:')
+    )
+      return 'warn'
+    if (lower.includes('"level":"debug"') || lower.includes(' debug ')) return 'debug'
+    return fallback
+  }
+
   child.stdout?.on('data', (data: Buffer) => {
     const lines = data.toString().trim().split('\n')
     for (const line of lines) {
       log.debug.zero(line)
-      logStore?.push('zero', 'info', line)
+      logStore?.push('zero', detectLevel(line, 'info'), line)
     }
   })
 
@@ -414,7 +453,7 @@ async function startZeroCache(
     const lines = data.toString().trim().split('\n')
     for (const line of lines) {
       log.debug.zero(line)
-      logStore?.push('zero', 'error', line)
+      logStore?.push('zero', detectLevel(line, 'error'), line)
     }
   })
 

package/src/replication/tcp-replication.test.ts

@@ -692,8 +692,8 @@ describe('tcp replication', () => {
   }, 15_000)
 
   it('handles multiple tables in same stream', async () => {
-    await db.exec(`CREATE TABLE public.other (id SERIAL PRIMARY KEY, label TEXT)`)
-    await db.exec(`CREATE PUBLICATION zero_multi FOR ALL TABLES`)
+    // create a second table and re-install tracking for both
+    await db.exec(`CREATE TABLE public.products (id SERIAL PRIMARY KEY, label TEXT)`)
     await installChangeTracking(db)
 
     const replClient = new TestPgClient(port)
@@ -707,28 +707,37 @@ describe('tcp replication', () => {
       'CREATE_REPLICATION_SLOT "multi_test" TEMPORARY LOGICAL pgoutput NOEXPORT_SNAPSHOT'
     )
     await replClient.startReplication(
-      "START_REPLICATION SLOT \"multi_test\" LOGICAL 0/0 (proto_version '1', publication_names 'zero_multi')"
+      "START_REPLICATION SLOT \"multi_test\" LOGICAL 0/0 (proto_version '1', publication_names 'zero_takeout')"
     )
 
     await replClient.collectStream(200)
 
-    await db.exec(`INSERT INTO public.items (name, value) VALUES ('t1', 1)`)
-    await db.exec(`INSERT INTO public.other (label) VALUES ('t2')`)
+    // insert into both tables
+    await db.exec(`INSERT INTO public.items (name, value) VALUES ('multi1', 1)`)
+    await db.exec(`INSERT INTO public.products (label) VALUES ('multi2')`)
 
-    const stream = await replClient.collectStream(2500)
-
-    const decoded: PgOutputMessage[] = []
-    for (const msg of stream) {
-      if (msg.type === 0x64) {
-        const result = decodeCopyData(new Uint8Array(msg.data))
-        if (result) decoded.push(result)
+    // collect until we see both relations (with timeout)
+    const allDecoded: PgOutputMessage[] = []
+    const deadline = Date.now() + 8000
+    while (Date.now() < deadline) {
+      const stream = await replClient.collectStream(500)
+      for (const msg of stream) {
+        if (msg.type === 0x64) {
+          const result = decodeCopyData(new Uint8Array(msg.data))
+          if (result) allDecoded.push(result)
+        }
       }
+      const relations = allDecoded.filter(
+        (m) => m.type === 'Relation'
+      ) as RelationMessage[]
+      const tableNames = relations.map((r) => r.tableName)
+      if (tableNames.includes('items') && tableNames.includes('products')) break
     }
 
-    const relations = decoded.filter((m) => m.type === 'Relation') as RelationMessage[]
+    const relations = allDecoded.filter((m) => m.type === 'Relation') as RelationMessage[]
     const tableNames = relations.map((r) => r.tableName)
     expect(tableNames).toContain('items')
-    expect(tableNames).toContain('other')
+    expect(tableNames).toContain('products')
 
     replClient.close()
   }, 15_000)