orez 0.0.48 → 0.0.50

package/src/cli.ts

@@ -90,7 +90,6 @@ const pgDumpCommand = defineCommand({
       } else {
         process.stdout.write(sql)
       }
-      process.exit(0)
     } catch (err: any) {
       if (err?.message?.includes('lock')) {
         console.error(
@@ -155,8 +154,8 @@ function shouldSkipStatement(stmt: string): boolean {
     }
 
     // skip CREATE/ALTER/DROP PUBLICATION — pglite doesn't support wal_level=logical
-    // internally, so CREATE PUBLICATION errors and can roll back the transaction
-    // (orez handles replication via its own change tracker, not publications)
+    // internally, so CREATE PUBLICATION errors and can roll back the transaction.
+    // orez handles replication via its own change tracker, not publications.
     if (nodeType === 'CreatePublicationStmt' || nodeType === 'AlterPublicationStmt')
       return true
     if (nodeType === 'DropStmt' && node.removeType === 'OBJECT_PUBLICATION') return true
@@ -481,8 +480,7 @@ export async function execDumpFile(
 
 // after restore, drop triggers whose backing functions no longer exist.
 // this happens when a filtered dump includes triggers on public-schema tables
-// that reference functions from excluded schemas (e.g. startchat.update_count()).
-// the triggers survive TOC filtering because they're associated with public tables.
+// that reference functions from excluded schemas.
 async function cleanupBrokenTriggers(db: { exec: (q: string) => Promise<unknown> }) {
   try {
     const result = (await db.exec(`
@@ -667,7 +665,7 @@ const pgRestoreCommand = defineCommand({
           clean: args.clean,
           sqlFile,
         })
-        if (restored) process.exit(0)
+        if (restored) return
         log.orez('wire protocol unavailable, falling back to direct PGlite')
       } catch (err: any) {
         // connected but restore failed — report error, don't fall back
@@ -681,7 +679,6 @@ const pgRestoreCommand = defineCommand({
       clean: args.clean,
       sqlFile,
     })
-    process.exit(0)
   },
 })
 
@@ -748,12 +745,7 @@ const main = defineCommand({
     'disable-wasm-sqlite': {
       type: 'boolean',
       description: 'use native @rocicorp/zero-sqlite3 instead of wasm bedrock-sqlite',
-      default: false,
-    },
-    'log-env': {
-      type: 'boolean',
-      description: 'log ZERO_* and related environment variables on startup',
-      default: false,
+      default: true,
     },
     'on-db-ready': {
       type: 'string',
@@ -765,21 +757,6 @@ const main = defineCommand({
       description: 'command to run once all services are healthy',
       default: '',
     },
-    admin: {
-      type: 'boolean',
-      description: 'start admin web ui',
-      default: false,
-    },
-    'admin-port': {
-      type: 'string',
-      description: 'admin ui port (default: auto)',
-      default: '0',
-    },
-    'admin-logs': {
-      type: 'boolean',
-      description: 'write logs to .orez/logs/ (default: true when --admin)',
-      default: true,
-    },
   },
   subCommands: {
     s3: s3Command,
@@ -787,25 +764,19 @@ const main = defineCommand({
     pg_restore: pgRestoreCommand,
   },
   async run({ args }) {
-    const startTime = Date.now()
-    const { config, stop, logStore, zeroEnv, actions, httpLogStore } =
-      await startZeroLite({
-        pgPort: Number(args['pg-port']),
-        zeroPort: Number(args['zero-port']),
-        dataDir: args['data-dir'],
-        migrationsDir: args.migrations,
-        seedFile: args.seed,
-        pgUser: args['pg-user'],
-        pgPassword: args['pg-password'],
-        skipZeroCache: args['skip-zero-cache'],
-        disableWasmSqlite: args['disable-wasm-sqlite'],
-        logLevel: (args['log-level'] as 'error' | 'warn' | 'info' | 'debug') || undefined,
-        logEnv: args['log-env'],
-        onDbReady: args['on-db-ready'],
-        admin: args.admin,
-        adminPort: Number(args['admin-port']),
-        adminLogs: args['admin-logs'],
-      })
+    const { config, stop } = await startZeroLite({
+      pgPort: Number(args['pg-port']),
+      zeroPort: Number(args['zero-port']),
+      dataDir: args['data-dir'],
+      migrationsDir: args.migrations,
+      seedFile: args.seed,
+      pgUser: args['pg-user'],
+      pgPassword: args['pg-password'],
+      skipZeroCache: args['skip-zero-cache'],
+      disableWasmSqlite: args['disable-wasm-sqlite'],
+      logLevel: (args['log-level'] as 'error' | 'warn' | 'info' | 'debug') || undefined,
+      onDbReady: args['on-db-ready'],
+    })
 
     let s3Server: import('node:http').Server | null = null
     if (args.s3) {
@@ -816,27 +787,6 @@ const main = defineCommand({
       })
     }
 
-    let adminServer: import('node:http').Server | null = null
-    if (args.admin && logStore) {
-      const { findPort } = await import('./port.js')
-      const adminPort = Number(args['admin-port']) || config.zeroPort + 2
-      const resolvedPort = await findPort(adminPort)
-      const { startAdminServer } = await import('./admin/server.js')
-      adminServer = await startAdminServer({
-        port: resolvedPort,
-        logStore,
-        config,
-        zeroEnv,
-        actions,
-        startTime,
-        httpLog: httpLogStore || undefined,
-      })
-      log.orez(`admin: http://127.0.0.1:${resolvedPort}`)
-      if (args['admin-logs']) {
-        log.orez(`logs: ${resolve(args['data-dir'], 'logs', 'orez.log')}`)
-      }
-    }
-
     log.orez('ready')
     log.orez(
       `pg: postgresql://${config.pgUser}:${config.pgPassword}@127.0.0.1:${config.pgPort}/postgres`
@@ -864,13 +814,11 @@ const main = defineCommand({
     }
 
     process.on('SIGINT', async () => {
-      adminServer?.close()
       s3Server?.close()
       await stop()
       process.exit(0)
     })
     process.on('SIGTERM', async () => {
-      adminServer?.close()
       s3Server?.close()
       await stop()
       process.exit(0)

package/src/config.ts

@@ -14,12 +14,7 @@ export interface ZeroLiteConfig {
   disableWasmSqlite: boolean
   logLevel: LogLevel
   pgliteOptions: Partial<PGliteOptions>
-  logEnv: boolean
   onDbReady: string
-  beforeZero: ((db: import('@electric-sql/pglite').PGlite) => Promise<void>) | null
-  admin: boolean
-  adminPort: number
-  adminLogs: boolean
 }
 
 export function getConfig(overrides: Partial<ZeroLiteConfig> = {}): ZeroLiteConfig {
@@ -35,12 +30,7 @@ export function getConfig(overrides: Partial<ZeroLiteConfig> = {}): ZeroLiteConf
     disableWasmSqlite: overrides.disableWasmSqlite ?? false,
     logLevel: overrides.logLevel || 'warn',
     pgliteOptions: overrides.pgliteOptions || {},
-    logEnv: overrides.logEnv ?? false,
     onDbReady: overrides.onDbReady || '',
-    beforeZero: overrides.beforeZero || null,
-    admin: overrides.admin ?? false,
-    adminPort: overrides.adminPort || 0,
-    adminLogs: overrides.adminLogs ?? true,
   }
 }