pgserve 1.0.5 → 1.0.6

package/bin/pglite-server.js

@@ -179,10 +179,13 @@ async function main() {
   const options = parseArgs();
   const memoryMode = !options.dataDir;
 
-  console.log(`
+  // Only print header if not a cluster worker (workers get PGSERVE_WORKER env)
+  if (!process.env.PGSERVE_WORKER) {
+    console.log(`
 pgserve - Embedded PostgreSQL Server
 =====================================
 `);
+  }
 
   try {
     let server;
@@ -254,16 +257,18 @@ Press Ctrl+C to stop
 `);
     }
 
-    // Graceful shutdown
-    const shutdown = async () => {
-      console.log('\nShutting down...');
-      await server.stop();
-      console.log('Server stopped.');
-      process.exit(0);
-    };
+    // Graceful shutdown (only for primary/single-process, workers handle via IPC)
+    if (!process.env.PGSERVE_WORKER) {
+      const shutdown = async () => {
+        console.log('\nShutting down...');
+        await server.stop();
+        console.log('Server stopped.');
+        process.exit(0);
+      };
 
-    process.on('SIGINT', shutdown);
-    process.on('SIGTERM', shutdown);
+      process.on('SIGINT', shutdown);
+      process.on('SIGTERM', shutdown);
+    }
 
     // Keep process alive
     await new Promise(() => {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgserve",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Embedded PostgreSQL server with true concurrent connections - zero config, auto-provision databases",
   "main": "src/index.js",
   "type": "module",

package/src/cluster.js

@@ -74,6 +74,8 @@ class ClusterRouter extends EventEmitter {
       }
 
       this.adminClient = new pg.Client(connectionConfig);
+      // Suppress errors during shutdown (PostgreSQL terminating connections)
+      this.adminClient.on('error', () => {});
       await this.adminClient.connect();
     }
 
@@ -178,7 +180,11 @@ class ClusterRouter extends EventEmitter {
     this.connections.clear();
 
     if (this.adminClient) {
-      await this.adminClient.end();
+      try {
+        await this.adminClient.end();
+      } catch {
+        // Ignore - connection may already be terminated
+      }
     }
 
     if (this.server) {
@@ -231,11 +237,18 @@ export async function startClusterServer(options = {}) {
       workers.set(worker.id, worker);
     }
 
-    // Restart dead workers
+    // Track shutdown state to prevent worker restart during shutdown
+    let shuttingDown = false;
+
+    // Restart dead workers (unless shutting down)
     cluster.on('exit', (worker, code, signal) => {
-      console.log(`[pgserve] Worker ${worker.id} died (${signal || code}), restarting...`);
       workers.delete(worker.id);
 
+      if (shuttingDown) {
+        return; // Don't restart during shutdown
+      }
+
+      console.log(`[pgserve] Worker ${worker.id} died (${signal || code}), restarting...`);
       const newWorker = cluster.fork({
         PGSERVE_WORKER: 'true',
         PGSERVE_PORT: String(port),
@@ -270,6 +283,7 @@ export async function startClusterServer(options = {}) {
       pgSocketPath,
       stop: async () => {
         console.log('[pgserve] Stopping cluster...');
+        shuttingDown = true; // Prevent worker restart during shutdown
         for (const worker of workers.values()) {
           worker.send({ type: 'shutdown' });
         }