@zap-js/client 0.1.5 → 0.1.6

package/dist/cli/commands/serve.js

@@ -76,6 +76,22 @@ export async function serveCommand(options) {
         process.exit(1);
     }
 }
+/**
+ * Wait for Rust server to create RPC socket file
+ */
+async function waitForRpcSocket(socketPath) {
+    const rpcSocketPath = socketPath + '.rpc';
+    const maxWait = 10000; // 10 seconds
+    const checkInterval = 100; // 100ms
+    const startTime = Date.now();
+    while (Date.now() - startTime < maxWait) {
+        if (existsSync(rpcSocketPath)) {
+            return;
+        }
+        await new Promise(resolve => setTimeout(resolve, checkInterval));
+    }
+    throw new Error(`RPC socket not ready within ${maxWait}ms`);
+}
 async function runProductionServer(binPath, options, workDir, prodConfig) {
     const port = parseInt(options.port || prodConfig?.server?.port?.toString() || '3000');
     const host = options.host || prodConfig?.server?.host || '0.0.0.0';
@@ -96,12 +112,6 @@ async function runProductionServer(binPath, options, workDir, prodConfig) {
     const ipcServer = new IpcServer(socketPath);
     await ipcServer.start();
     cliLogger.succeedSpinner('ipc', 'IPC server started');
-    // Initialize RPC client for bidirectional IPC communication
-    // This allows TypeScript route handlers to call Rust functions via rpc.call()
-    cliLogger.spinner('rpc', 'Initializing RPC client...');
-    const { initRpcClient } = await import('../../runtime/rpc-client.js');
-    await initRpcClient(socketPath + '.rpc');
-    cliLogger.succeedSpinner('rpc', 'RPC client initialized');
     // Load and register route handlers
     const routes = await loadRouteHandlers(ipcServer, workDir);
     // Build Rust server configuration
@@ -149,6 +159,26 @@ async function runProductionServer(binPath, options, workDir, prodConfig) {
             ZAP_ENV: 'production',
         },
     });
+    // Wait for Rust server to create RPC socket, then initialize RPC client
+    cliLogger.spinner('rpc', 'Waiting for RPC server...');
+    try {
+        await waitForRpcSocket(socketPath);
+        // Initialize RPC client for bidirectional IPC communication
+        // This allows TypeScript route handlers to call Rust functions via rpc.call()
+        const { initRpcClient } = await import('../../runtime/rpc-client.js');
+        await initRpcClient(socketPath + '.rpc');
+        cliLogger.succeedSpinner('rpc', 'RPC client connected');
+    }
+    catch (err) {
+        cliLogger.failSpinner('rpc', 'Failed to connect RPC client');
+        const message = err instanceof Error ? err.message : String(err);
+        cliLogger.error(message);
+        cleanup(ipcServer, tempConfigPath);
+        if (!rustProcess.killed) {
+            rustProcess.kill();
+        }
+        process.exit(1);
+    }
     let started = false;
     rustProcess.stdout?.on('data', (data) => {
         const output = data.toString();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zap-js/client",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "High-performance fullstack React framework - Client package",
   "homepage": "https://github.com/saint0x/zapjs",
   "repository": {
@@ -74,9 +74,9 @@
     "ws": "^8.16.0"
   },
   "optionalDependencies": {
-    "@zap-js/darwin-arm64": "0.1.5",
-    "@zap-js/darwin-x64": "0.1.5",
-    "@zap-js/linux-x64": "0.1.5"
+    "@zap-js/darwin-arm64": "0.1.6",
+    "@zap-js/darwin-x64": "0.1.6",
+    "@zap-js/linux-x64": "0.1.6"
   },
   "peerDependencies": {
     "react": "^18.0.0",