buildwithnexus 0.3.4 → 0.3.6

package/dist/bin.js

@@ -438,59 +438,59 @@ async function getPortBlocker(port) {
     return null;
   }
 }
-async function findFreePort(preferred, max = 20) {
-  for (let offset = 0; offset < max; offset++) {
-    if (await isPortFree(preferred + offset)) return preferred + offset;
-  }
-  throw new Error(`No free port found near ${preferred}`);
-}
 async function resolvePortConflicts(ports) {
   const labels = { ssh: "SSH", http: "HTTP", https: "HTTPS" };
   const resolved = { ...ports };
+  const claimed = /* @__PURE__ */ new Set();
   for (const [key, port] of Object.entries(ports)) {
-    if (await isPortFree(port)) continue;
-    const blocker = await getPortBlocker(port);
-    const desc = blocker ? `${blocker.process} (PID ${blocker.pid})` : "unknown process";
-    const altPort = await findFreePort(port + 1).catch(() => null);
-    const choices = [];
-    if (blocker) {
-      choices.push({
-        name: `Kill ${desc} and use port ${port}`,
-        value: "kill"
-      });
+    if (await isPortFree(port) && !claimed.has(port)) {
+      claimed.add(port);
+      continue;
+    }
+    let altPort = null;
+    for (let offset = 1; offset <= 50; offset++) {
+      const candidate = port + offset;
+      if (!claimed.has(candidate) && await isPortFree(candidate)) {
+        altPort = candidate;
+        break;
+      }
     }
     if (altPort) {
-      choices.push({
-        name: `Use alternate port ${altPort} instead`,
-        value: "alt"
+      resolved[key] = altPort;
+      claimed.add(altPort);
+      const blocker = await getPortBlocker(port);
+      const desc = blocker ? `${blocker.process} (PID ${blocker.pid})` : "another process";
+      console.log(chalk5.yellow(`  \u26A0 Port ${port} (${labels[key]}) in use by ${desc} \u2192 using ${altPort}`));
+    } else {
+      const blocker = await getPortBlocker(port);
+      const desc = blocker ? `${blocker.process} (PID ${blocker.pid})` : "unknown process";
+      console.log("");
+      console.log(chalk5.red(`  \u2717 Port ${port} (${labels[key]}) is in use by ${desc} and no free port found nearby`));
+      const action = await select({
+        message: `No free ${labels[key]} port found. Kill ${desc} to free port ${port}?`,
+        choices: [
+          ...blocker ? [{ name: `Kill ${desc} and use port ${port}`, value: "kill" }] : [],
+          { name: "Abort init", value: "abort" }
+        ]
       });
-    }
-    choices.push({ name: "Abort init", value: "abort" });
-    console.log("");
-    console.log(chalk5.yellow(`  \u26A0 Port ${port} (${labels[key]}) is in use by ${desc}`));
-    const action = await select({
-      message: `How would you like to resolve the ${labels[key]} port conflict?`,
-      choices
-    });
-    if (action === "kill" && blocker) {
-      try {
-        process.kill(blocker.pid, "SIGTERM");
-        await new Promise((r) => setTimeout(r, 1e3));
-        if (!await isPortFree(port)) {
-          process.kill(blocker.pid, "SIGKILL");
-          await new Promise((r) => setTimeout(r, 500));
+      if (action === "kill" && blocker) {
+        try {
+          process.kill(blocker.pid, "SIGTERM");
+          await new Promise((r) => setTimeout(r, 1e3));
+          if (!await isPortFree(port)) {
+            process.kill(blocker.pid, "SIGKILL");
+            await new Promise((r) => setTimeout(r, 500));
+          }
+          claimed.add(port);
+          console.log(chalk5.green(`  \u2713 Killed ${desc}, port ${port} is now free`));
+        } catch {
+          console.log(chalk5.red(`  \u2717 Failed to kill PID ${blocker.pid}. Try: sudo kill ${blocker.pid}`));
+          process.exit(1);
         }
-        console.log(chalk5.green(`  \u2713 Killed ${desc}, port ${port} is now free`));
-      } catch {
-        console.log(chalk5.red(`  \u2717 Failed to kill PID ${blocker.pid}. Try: sudo kill ${blocker.pid}`));
-        process.exit(1);
+      } else {
+        console.log(chalk5.dim("  Init aborted."));
+        process.exit(0);
       }
-    } else if (action === "alt" && altPort) {
-      resolved[key] = altPort;
-      console.log(chalk5.green(`  \u2713 Using port ${altPort} for ${labels[key]}`));
-    } else {
-      console.log(chalk5.dim("  Init aborted."));
-      process.exit(0);
     }
   }
   return resolved;
@@ -938,13 +938,13 @@ async function renderCloudInit(data, templateContent) {
   }
   const safeData = { ...data, sshPubKey: yamlEscape(trimmedPubKey), keys: safeKeys };
   const rendered = ejs.render(templateContent, safeData);
-  const outputPath = path5.join(CONFIGS_DIR, "user-data.yaml");
+  const outputPath = path5.join(CONFIGS_DIR, "user-data");
   fs5.writeFileSync(outputPath, rendered, { mode: 384 });
-  audit("cloudinit_rendered", "user-data.yaml written");
+  audit("cloudinit_rendered", "user-data written");
   return outputPath;
 }
 async function createCloudInitIso(userDataPath) {
-  const metaDataPath = path5.join(CONFIGS_DIR, "meta-data.yaml");
+  const metaDataPath = path5.join(CONFIGS_DIR, "meta-data");
   fs5.writeFileSync(metaDataPath, "instance-id: nexus-vm-1\nlocal-hostname: nexus-vm\n", { mode: 384 });
   const isoPath = path5.join(IMAGES_DIR2, "init.iso");
   const env = scrubEnv();
@@ -1005,7 +1005,7 @@ async function createCloudInitIso(userDataPath) {
       fs5.unlinkSync(metaDataPath);
     } catch {
     }
-    audit("cloudinit_plaintext_deleted", "user-data.yaml and meta-data.yaml removed");
+    audit("cloudinit_plaintext_deleted", "user-data and meta-data removed");
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "buildwithnexus",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "Launch an autonomous AI runtime with triple-nested VM isolation in one command",
   "type": "module",
   "bin": {