pgserve 1.1.3-rc.2 → 1.1.3-rc.6

package/.github/workflows/build-all-platforms.yml

@@ -38,26 +38,26 @@ concurrency:
 jobs:
   build:
     name: Build ${{ matrix.platform }}
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         include:
-          - target: bun-linux-x64
-            platform: linux-x64
+          # Linux x64
+          - platform: linux-x64
+            pg_pkg: linux-x64
             output: pgserve-linux-x64
-          - target: bun-linux-arm64
-            platform: linux-arm64
-            output: pgserve-linux-arm64
-          - target: bun-darwin-x64
-            platform: darwin-x64
-            output: pgserve-darwin-x64
-          - target: bun-darwin-arm64
-            platform: darwin-arm64
+            os: ubuntu-latest
+          # macOS ARM64 (Apple Silicon) - must build on macOS for native binaries
+          - platform: darwin-arm64
+            pg_pkg: darwin-arm64
             output: pgserve-darwin-arm64
-          - target: bun-windows-x64
-            platform: windows-x64
+            os: macos-latest
+          # Windows x64 - must build on Windows for --windows-icon
+          - platform: windows-x64
+            pg_pkg: windows-x64
             output: pgserve-windows-x64.exe
+            os: windows-latest
 
     steps:
       - name: Checkout
@@ -73,10 +73,33 @@ jobs:
       - name: Install dependencies
         run: bun install
 
+      # Bundle PostgreSQL binaries for standalone exe
+      - name: Bundle PostgreSQL binaries
+        run: |
+          echo "Installing @embedded-postgres/${{ matrix.pg_pkg }}..."
+          npm install @embedded-postgres/${{ matrix.pg_pkg }}
+          mkdir -p embedded-postgres
+          cp -r node_modules/@embedded-postgres/${{ matrix.pg_pkg }}/native/* embedded-postgres/
+          echo "Bundled PostgreSQL binaries:"
+          ls -la embedded-postgres/
+          ls -la embedded-postgres/bin/ || true
+        shell: bash
+
+      # Windows: native build with custom icon
+      - name: Build for Windows (with icon)
+        if: matrix.platform == 'windows-x64'
+        run: |
+          mkdir -p dist
+          bun build --compile --windows-icon=assets/icon.ico bin/pglite-server.js --outfile dist/${{ matrix.output }}
+          ls -lh dist/
+        shell: bash
+
+      # Linux/macOS: native build
       - name: Build for ${{ matrix.platform }}
+        if: matrix.platform != 'windows-x64'
         run: |
           mkdir -p dist
-          bun build --compile --target=${{ matrix.target }} bin/pglite-server.js --outfile dist/${{ matrix.output }}
+          bun build --compile bin/pglite-server.js --outfile dist/${{ matrix.output }}
           ls -lh dist/
 
       - name: Upload artifact
@@ -129,7 +152,8 @@ jobs:
           ls -la dist/
 
           MISSING=""
-          for platform in linux-x64 linux-arm64 darwin-x64 darwin-arm64; do
+          # Supported platforms: linux-x64, darwin-arm64, windows-x64
+          for platform in linux-x64 darwin-arm64; do
             if [ ! -f "dist/pgserve-$platform" ]; then
               MISSING="$MISSING pgserve-$platform"
             fi

package/README.md

@@ -99,6 +99,17 @@ npm install pgserve
 
 > PostgreSQL binaries are automatically downloaded on first run (~100MB).
 
+### Windows
+
+Download `pgserve-windows-x64.exe` from [GitHub Releases](https://github.com/namastexlabs/pgserve/releases).
+
+Double-click to run, or use CLI:
+
+```cmd
+pgserve-windows-x64.exe --port 5432
+pgserve-windows-x64.exe --data C:\pgserve-data
+```
+
 <br>
 
 ## CLI Reference

package/bin/pgserve-wrapper.cjs

@@ -55,63 +55,61 @@ if (!bunPath) {
 
 const scriptPath = path.join(__dirname, 'pglite-server.js');
 
-// Spawn bun with the actual script, inherit all stdio
-// IMPORTANT: Do NOT use detached mode - wrapper must wait for child to fully terminate
-// Using detached with stdio:'inherit' causes file handle inheritance issues on Windows
-const child = spawn(bunPath, [scriptPath, ...process.argv.slice(2)], {
-  stdio: 'inherit',
-  windowsHide: true
-});
-
-child.on('error', (err) => {
-  console.error('Failed to start pgserve:', err.message);
-  process.exit(1);
-});
+// Platform-specific spawning strategy:
+// - Windows: Use pipes for explicit handle control (prevents EBUSY errors)
+// - Unix: Use inherit for simplicity (works fine)
 
-// Safety timeout: force exit if 'close' event never fires after 'exit'
-let forceExitTimeout = null;
+if (isWindows) {
+  // WINDOWS PATH: Explicit pipe control to prevent EBUSY errors
+  // Using stdio: 'inherit' causes file handle inheritance that we cannot release,
+  // leading to npm cleanup failures. With pipes, we control when handles are destroyed.
 
-child.on('exit', () => {
-  // Give 5 seconds for 'close' event after 'exit'
-  forceExitTimeout = setTimeout(() => {
-    console.error('Warning: Child process did not close cleanly, forcing exit');
-    process.exit(1);
-  }, 5000);
-});
-
-// Use 'close' event instead of 'exit' - fires AFTER all stdio streams are closed
-// This is critical for Windows where file handles may remain locked after 'exit' fires
-child.on('close', (code, signal) => {
-  // Clear the safety timeout
-  if (forceExitTimeout) {
-    clearTimeout(forceExitTimeout);
-  }
+  const child = spawn(bunPath, [scriptPath, ...process.argv.slice(2)], {
+    stdio: ['pipe', 'pipe', 'pipe'],
+    windowsHide: true
+  });
 
-  // On Windows, use SYNCHRONOUS delay to ensure all file handles are released
-  // This prevents EBUSY errors when npx tries to clean up the cache
-  // NOTE: async/await does NOT work in EventEmitter callbacks - Node ignores the Promise
-  if (isWindows) {
-    const delay = 200; // ms - enough for Windows kernel to release handles
-    const start = Date.now();
-    while (Date.now() - start < delay) {
-      // Synchronous busy-wait - actually blocks unlike async setTimeout
-    }
+  // Manually pipe stdio - we now control the handles
+  // Handle stdin errors gracefully (may not be connected in some environments)
+  process.stdin.on('error', () => {});
+  child.stdin.on('error', () => {});
+
+  // Only pipe stdin if it's readable
+  if (process.stdin.readable) {
+    process.stdin.pipe(child.stdin);
   }
+  child.stdout.pipe(process.stdout);
+  child.stderr.pipe(process.stderr);
 
-  if (signal) {
-    // On Windows, can't reliably re-raise Unix signals
-    if (isWindows) {
-      process.exit(1);
-    } else {
-      process.kill(process.pid, signal);
+  child.on('error', (err) => {
+    console.error('Failed to start pgserve:', err.message);
+    process.exit(1);
+  });
+
+  child.on('close', (code, signal) => {
+    // CRITICAL: Explicitly destroy ALL streams to release file handles
+    // This must happen BEFORE process.exit() to prevent EBUSY
+    try {
+      if (process.stdin.readable) {
+        process.stdin.unpipe(child.stdin);
+      }
+      child.stdin.destroy();
+      child.stdout.destroy();
+      child.stderr.destroy();
+    } catch {
+      // Ignore stream destruction errors
     }
-  } else {
-    process.exit(code ?? 0);
-  }
-});
 
-// Platform-specific signal handling
-if (isWindows) {
+    // Remove all listeners to prevent memory leaks
+    child.removeAllListeners();
+
+    // Use setImmediate to ensure stream destruction completes before exit
+    // This gives the event loop one tick to process pending I/O cleanup
+    setImmediate(() => {
+      process.exit(signal ? 1 : (code ?? 0));
+    });
+  });
+
   // Windows: use taskkill for reliable process termination
   // process.kill(pid, 'SIGINT') does NOT work properly on Windows
   process.on('SIGINT', () => {
@@ -139,13 +137,37 @@ if (isWindows) {
     rl.on('SIGINT', () => {
       process.emit('SIGINT');
     });
+    // Clean up readline on close
+    child.on('close', () => {
+      rl.close();
+    });
   }
+
 } else {
+  // UNIX PATH: Simple stdio inheritance (works fine, no EBUSY issues)
+  const child = spawn(bunPath, [scriptPath, ...process.argv.slice(2)], {
+    stdio: 'inherit',
+    windowsHide: true
+  });
+
+  child.on('error', (err) => {
+    console.error('Failed to start pgserve:', err.message);
+    process.exit(1);
+  });
+
+  child.on('close', (code, signal) => {
+    if (signal) {
+      process.kill(process.pid, signal);
+    } else {
+      process.exit(code ?? 0);
+    }
+  });
+
   // Unix: forward signals to child process normally
-  ['SIGINT', 'SIGTERM', 'SIGHUP'].forEach(signal => {
-    process.on(signal, () => {
+  ['SIGINT', 'SIGTERM', 'SIGHUP'].forEach(sig => {
+    process.on(sig, () => {
       if (child.pid) {
-        process.kill(child.pid, signal);
+        process.kill(child.pid, sig);
       }
     });
   });

package/bun.lock

@@ -20,7 +20,7 @@
         "@embedded-postgres/darwin-arm64": "17.7.0-beta.15",
         "@embedded-postgres/darwin-x64": "17.7.0-beta.15",
         "@embedded-postgres/linux-x64": "17.7.0-beta.15",
-        "@embedded-postgres/win32-x64": "17.7.0-beta.15",
+        "@embedded-postgres/windows-x64": "17.7.0-beta.15",
       },
     },
   },
@@ -33,6 +33,8 @@
 
     "@embedded-postgres/linux-x64": ["@embedded-postgres/linux-x64@17.7.0-beta.15", "", { "os": "linux", "cpu": "x64" }, "sha512-HeaxSHsw6ccVh8l5iC4OgXqvaaCGWnnZR9CpgNgrAfnKPPGiEhUPBmO2XhEsFQIhc+ad/+36h0NTvKo4bdi40w=="],
 
+    "@embedded-postgres/windows-x64": ["@embedded-postgres/windows-x64@17.7.0-beta.15", "", { "os": "win32", "cpu": "x64" }, "sha512-Oq11yyKxISjefuYdKljcp3Q+uxx237zn9YpP9hO43+6Feorq7USuMIDqk5ofLSQ30FAnVyTqaIQK8ZIjW+tQXQ=="],
+
     "@emnapi/core": ["@emnapi/core@1.7.1", "", { "dependencies": { "@emnapi/wasi-threads": "1.1.0", "tslib": "^2.4.0" } }, "sha512-o1uhUASyo921r2XtHYOHy7gdkGLge8ghBEQHMWmyJFoXlpU58kIrhhN3w26lpQb6dspetweapMn2CSNwQ8I4wg=="],
 
     "@emnapi/runtime": ["@emnapi/runtime@1.7.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA=="],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgserve",
-  "version": "1.1.3-rc.2",
+  "version": "1.1.3-rc.6",
   "description": "Embedded PostgreSQL server with true concurrent connections - zero config, auto-provision databases",
   "main": "src/index.js",
   "type": "module",
@@ -44,7 +44,7 @@
     "@embedded-postgres/darwin-arm64": "17.7.0-beta.15",
     "@embedded-postgres/darwin-x64": "17.7.0-beta.15",
     "@embedded-postgres/linux-x64": "17.7.0-beta.15",
-    "@embedded-postgres/win32-x64": "17.7.0-beta.15"
+    "@embedded-postgres/windows-x64": "17.7.0-beta.15"
   },
   "devDependencies": {
     "@electric-sql/pglite": "^0.2.17",

package/src/postgres.js

@@ -18,6 +18,124 @@ import path from 'path';
 import fs from 'fs';
 import crypto from 'crypto';
 
+/**
+ * Get platform key for binary lookup (e.g., 'windows-x64', 'linux-x64', 'darwin-arm64')
+ * @returns {string} Platform key
+ */
+function getPlatformKey() {
+  const platform = os.platform();
+  const arch = os.arch();
+
+  if (platform === 'win32') return 'windows-x64';
+  if (platform === 'linux' && arch === 'x64') return 'linux-x64';
+  if (platform === 'darwin' && arch === 'arm64') return 'darwin-arm64';
+  if (platform === 'darwin' && arch === 'x64') return 'darwin-x64';
+  if (platform === 'linux' && arch === 'arm64') return 'linux-arm64';
+
+  throw new Error(`Unsupported platform: ${platform}-${arch}`);
+}
+
+/**
+ * Get the directory where extracted binaries are cached
+ * @returns {string} Cache directory path
+ */
+function getBinaryCacheDir() {
+  const platformKey = getPlatformKey();
+  return path.join(os.homedir(), '.pgserve', 'bin', platformKey);
+}
+
+/**
+ * Check if bundled PostgreSQL binaries exist (standalone exe mode)
+ * When compiled with `bun build --compile`, the embedded-postgres folder
+ * should be bundled alongside the executable.
+ * @returns {string|null} Path to bundled binaries or null if not found
+ */
+function getBundledBinaryDir() {
+  // Check for embedded-postgres folder relative to the module
+  // This works when binaries are bundled during build
+  const bundledDir = path.join(import.meta.dirname, '..', 'embedded-postgres');
+  if (fs.existsSync(path.join(bundledDir, 'bin'))) {
+    return bundledDir;
+  }
+  return null;
+}
+
+/**
+ * Extract bundled PostgreSQL binaries to cache directory.
+ * Bun-compiled binaries can read embedded files but cannot execute them directly.
+ * We extract to ~/.pgserve/bin/{platform}/ for execution.
+ *
+ * @returns {Promise<string>} Path to extracted bin directory
+ */
+async function extractBundledBinaries() {
+  const platform = os.platform();
+  const cacheDir = getBinaryCacheDir();
+  const cacheBinDir = path.join(cacheDir, 'bin');
+  const initdbName = platform === 'win32' ? 'initdb.exe' : 'initdb';
+  const postgresName = platform === 'win32' ? 'postgres.exe' : 'postgres';
+
+  // Check if already extracted
+  if (fs.existsSync(path.join(cacheBinDir, initdbName)) &&
+      fs.existsSync(path.join(cacheBinDir, postgresName))) {
+    return cacheDir;
+  }
+
+  // Get bundled directory
+  const bundledDir = getBundledBinaryDir();
+  if (!bundledDir) {
+    return null;
+  }
+
+  console.log('[pgserve] Extracting PostgreSQL binaries...');
+
+  // Create cache directory
+  fs.mkdirSync(cacheDir, { recursive: true });
+
+  // Copy bundled binaries to cache
+  // Use recursive copy to get bin/, lib/, share/ directories
+  await copyRecursive(bundledDir, cacheDir);
+
+  // Make executables executable (Unix only)
+  if (platform !== 'win32') {
+    const binDir = path.join(cacheDir, 'bin');
+    const files = fs.readdirSync(binDir);
+    for (const file of files) {
+      const filePath = path.join(binDir, file);
+      try {
+        fs.chmodSync(filePath, 0o755);
+      } catch {
+        // Ignore permission errors for non-executables
+      }
+    }
+  }
+
+  console.log(`[pgserve] Binaries extracted to ${cacheDir}`);
+  return cacheDir;
+}
+
+/**
+ * Recursively copy a directory
+ * @param {string} src - Source directory
+ * @param {string} dest - Destination directory
+ */
+async function copyRecursive(src, dest) {
+  const entries = fs.readdirSync(src, { withFileTypes: true });
+
+  for (const entry of entries) {
+    const srcPath = path.join(src, entry.name);
+    const destPath = path.join(dest, entry.name);
+
+    if (entry.isDirectory()) {
+      fs.mkdirSync(destPath, { recursive: true });
+      await copyRecursive(srcPath, destPath);
+    } else {
+      // Read and write file (works with Bun's virtual filesystem)
+      const content = fs.readFileSync(srcPath);
+      fs.writeFileSync(destPath, content);
+    }
+  }
+}
+
 /**
  * Ensure library symlinks exist in the lib directory.
  * The @embedded-postgres package ships versioned libraries but binaries look for soname versions.
@@ -94,10 +212,47 @@ function ensureLibrarySymlinks(libDir, platform) {
 }
 
 // Resolve binary paths from embedded-postgres platform packages
-function getBinaryPaths() {
+// Now async to support bundled binary extraction
+async function getBinaryPaths() {
   const platform = os.platform();
   const arch = os.arch();
+  const exeSuffix = platform === 'win32' ? '.exe' : '';
+
+  // Priority 1: Check extracted cache directory (standalone exe mode)
+  // This is where bundled binaries are extracted on first run
+  const cacheDir = getBinaryCacheDir();
+  const cacheBinDir = path.join(cacheDir, 'bin');
+  const cachedInitdb = path.join(cacheBinDir, 'initdb' + exeSuffix);
+  const cachedPostgres = path.join(cacheBinDir, 'postgres' + exeSuffix);
+
+  if (fs.existsSync(cachedInitdb) && fs.existsSync(cachedPostgres)) {
+    const libDir = path.join(cacheDir, 'lib');
+    if ((platform === 'linux' || platform === 'darwin') && fs.existsSync(libDir)) {
+      ensureLibrarySymlinks(libDir, platform);
+    }
+    return { initdb: cachedInitdb, postgres: cachedPostgres, binDir: cacheBinDir, libDir };
+  }
+
+  // Priority 2: Check for bundled binaries and extract if found (standalone exe mode)
+  const bundledDir = getBundledBinaryDir();
+  if (bundledDir) {
+    const extractedDir = await extractBundledBinaries();
+    if (extractedDir) {
+      const extractedBinDir = path.join(extractedDir, 'bin');
+      const extractedInitdb = path.join(extractedBinDir, 'initdb' + exeSuffix);
+      const extractedPostgres = path.join(extractedBinDir, 'postgres' + exeSuffix);
+
+      if (fs.existsSync(extractedInitdb) && fs.existsSync(extractedPostgres)) {
+        const libDir = path.join(extractedDir, 'lib');
+        if ((platform === 'linux' || platform === 'darwin') && fs.existsSync(libDir)) {
+          ensureLibrarySymlinks(libDir, platform);
+        }
+        return { initdb: extractedInitdb, postgres: extractedPostgres, binDir: extractedBinDir, libDir };
+      }
+    }
+  }
 
+  // Priority 3: Find the package in node_modules (npm install case)
   let pkgName;
   if (platform === 'linux' && arch === 'x64') {
     pkgName = '@embedded-postgres/linux-x64';
@@ -106,12 +261,11 @@ function getBinaryPaths() {
   } else if (platform === 'darwin' && arch === 'x64') {
     pkgName = '@embedded-postgres/darwin-x64';
   } else if (platform === 'win32' && arch === 'x64') {
-    pkgName = '@embedded-postgres/win32-x64';
+    pkgName = '@embedded-postgres/windows-x64';
   } else {
     throw new Error(`Unsupported platform: ${platform}-${arch}`);
   }
 
-  // Find the package in node_modules (check multiple locations for npx/pnpm/npm compatibility)
   const possiblePaths = [
     path.join(process.cwd(), 'node_modules', pkgName, 'native', 'bin'),
     path.join(import.meta.dirname, '..', 'node_modules', pkgName, 'native', 'bin'),
@@ -120,8 +274,8 @@ function getBinaryPaths() {
   ];
 
   for (const binDir of possiblePaths) {
-    const initdb = path.join(binDir, platform === 'win32' ? 'initdb.exe' : 'initdb');
-    const postgres = path.join(binDir, platform === 'win32' ? 'postgres.exe' : 'postgres');
+    const initdb = path.join(binDir, 'initdb' + exeSuffix);
+    const postgres = path.join(binDir, 'postgres' + exeSuffix);
     if (fs.existsSync(initdb) && fs.existsSync(postgres)) {
       // Resolve the actual binary paths (handles symlinks from package managers)
       const realInitdb = fs.realpathSync(initdb);
@@ -237,8 +391,8 @@ export class PostgresManager {
    * Start the embedded PostgreSQL instance
    */
   async start() {
-    // Get binary paths
-    this.binaries = getBinaryPaths();
+    // Get binary paths (may extract bundled binaries on first run)
+    this.binaries = await getBinaryPaths();
 
     // Make binaries executable
     await fs.promises.chmod(this.binaries.initdb, '755');