@fatdoge/wtree 0.1.2 → 0.1.3

package/api/ui/startUiDev.ts

@@ -76,10 +76,48 @@ export async function startUiDevServer(options: {
   // Close the temporary apiServer we created earlier since we are using combinedApp now
   apiServer.close()
 
-  const combinedServer = combinedApp.listen(uiPort, '127.0.0.1')
-  await new Promise<void>((resolve) => combinedServer.once('listening', () => resolve()))
+  // Use port 0 if uiPort is not specified or if user wants random port (handled by caller passing 0?)
+  // If uiPort is 5173 (default), we might want to try it, and failover?
+  // But standard express behavior for port 0 is random port.
+  // If user explicitly passed a port, we should use it and fail if taken.
+  // If default (5173), we should probably try it, but if taken, maybe random?
+  // Let's implement simple retry logic or just use random port if default fails?
+  // The current error EADDRINUSE suggests we are forcing 5173.
   
-  const url = `http://127.0.0.1:${uiPort}/`
+  // Let's modify the logic: 
+  // If user provided a specific port (not default 5173 logic), use it.
+  // If we are using default 5173, we can try it, but to be safe and avoid conflicts, 
+  // maybe we should just use port 0 (random) by default unless specified?
+  // Or keep 5173 as preference but fallback to 0 if busy.
+  
+  let finalPort = uiPort
+  let combinedServer: ReturnType<typeof combinedApp.listen>
+
+  try {
+    combinedServer = await startServer(combinedApp, uiPort)
+  } catch (e: unknown) {
+    const err = e as { code?: string }
+    if (err.code === 'EADDRINUSE' && uiPort === 5173 && !options.uiPort) {
+      // Retry with random port if default port 5173 is taken and user didn't force it
+      combinedServer = await startServer(combinedApp, 0)
+      const addr = combinedServer.address()
+      if (typeof addr === 'object' && addr) {
+        finalPort = addr.port
+      }
+    } else {
+      throw e
+    }
+  }
+  
+  // const combinedServer = combinedApp.listen(uiPort, '127.0.0.1')
+  // await new Promise<void>((resolve) => combinedServer.once('listening', () => resolve()))
+  
+  const address = combinedServer.address()
+  if (typeof address === 'object' && address) {
+    finalPort = address.port
+  }
+  
+  const url = `http://127.0.0.1:${finalPort}/`
 
   if (open) {
     openPath(url)
@@ -92,3 +130,11 @@ export async function startUiDevServer(options: {
     },
   }
 }
+
+function startServer(app: express.Express, port: number): Promise<ReturnType<typeof app.listen>> {
+  return new Promise((resolve, reject) => {
+    const server = app.listen(port, '127.0.0.1')
+    server.once('listening', () => resolve(server))
+    server.once('error', (err) => reject(err))
+  })
+}

package/dist-node/api/ui/startUiDev.js

@@ -52,9 +52,44 @@ export async function startUiDevServer(options) {
     });
     // Close the temporary apiServer we created earlier since we are using combinedApp now
     apiServer.close();
-    const combinedServer = combinedApp.listen(uiPort, '127.0.0.1');
-    await new Promise((resolve) => combinedServer.once('listening', () => resolve()));
-    const url = `http://127.0.0.1:${uiPort}/`;
+    // Use port 0 if uiPort is not specified or if user wants random port (handled by caller passing 0?)
+    // If uiPort is 5173 (default), we might want to try it, and failover?
+    // But standard express behavior for port 0 is random port.
+    // If user explicitly passed a port, we should use it and fail if taken.
+    // If default (5173), we should probably try it, but if taken, maybe random?
+    // Let's implement simple retry logic or just use random port if default fails?
+    // The current error EADDRINUSE suggests we are forcing 5173.
+    // Let's modify the logic: 
+    // If user provided a specific port (not default 5173 logic), use it.
+    // If we are using default 5173, we can try it, but to be safe and avoid conflicts, 
+    // maybe we should just use port 0 (random) by default unless specified?
+    // Or keep 5173 as preference but fallback to 0 if busy.
+    let finalPort = uiPort;
+    let combinedServer;
+    try {
+        combinedServer = await startServer(combinedApp, uiPort);
+    }
+    catch (e) {
+        const err = e;
+        if (err.code === 'EADDRINUSE' && uiPort === 5173 && !options.uiPort) {
+            // Retry with random port if default port 5173 is taken and user didn't force it
+            combinedServer = await startServer(combinedApp, 0);
+            const addr = combinedServer.address();
+            if (typeof addr === 'object' && addr) {
+                finalPort = addr.port;
+            }
+        }
+        else {
+            throw e;
+        }
+    }
+    // const combinedServer = combinedApp.listen(uiPort, '127.0.0.1')
+    // await new Promise<void>((resolve) => combinedServer.once('listening', () => resolve()))
+    const address = combinedServer.address();
+    if (typeof address === 'object' && address) {
+        finalPort = address.port;
+    }
+    const url = `http://127.0.0.1:${finalPort}/`;
     if (open) {
         openPath(url);
     }
@@ -65,3 +100,10 @@ export async function startUiDevServer(options) {
         },
     };
 }
+function startServer(app, port) {
+    return new Promise((resolve, reject) => {
+        const server = app.listen(port, '127.0.0.1');
+        server.once('listening', () => resolve(server));
+        server.once('error', (err) => reject(err));
+    });
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fatdoge/wtree",
   "private": false,
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "CLI + UI tool for managing git worktrees",
   "keywords": [
     "git",