vercel-vm-factory 0.1.5 → 0.2.8

package/deploy-vm.mjs

@@ -6,7 +6,7 @@ import { stdin as input, stdout as output } from "node:process";
 import { homedir } from "node:os";
 import path from "node:path";
 
-const defaultWsShellImage = "ghcr.io/v1xingyue/ws-shell:v1.3.alpine";
+const defaultWsShellImage = "ghcr.io/v1xingyue/ws-shell:v1.8.alpine";
 
 const bases = {
   alpine: "alpine:3.23",
@@ -57,6 +57,8 @@ try {
 
 async function main() {
   printHeader();
+  await ensureVercelInstalled();
+  await ensureVercelLogin();
 
   if (args.doctor || command === "doctor") {
     await doctor();
@@ -119,7 +121,6 @@ async function main() {
     return;
   }
 
-  await ensureVercelReady();
   if (usesGitHubAuth(authMode)) printOAuthGuide(oauthRedirectUrl);
 
   const authUsername = usesBasicAuth(authMode)
@@ -233,29 +234,76 @@ async function setContainerFramework(appDir, commonArgs) {
   ]);
 }
 
-async function ensureVercelReady() {
+async function ensureVercelLogin() {
+  step("Checking Vercel login");
+  try {
+    const whoami = await runCapture("vercel", ["whoami"]);
+    ok(`logged in as ${whoami.trim()}`);
+  } catch {
+    warn("Vercel CLI is not logged in. Starting vercel login...");
+    await runNoUrl("vercel", ["login"]);
+  }
+}
+
+async function ensureVercelInstalled() {
   step("Checking Vercel CLI");
   try {
     const version = await runCapture("vercel", ["--version"]);
     ok(version.split("\n").filter(Boolean).at(-1) || "vercel installed");
   } catch {
+    await installVercelCli();
+    const version = await runCapture("vercel", ["--version"]);
+    ok(version.split("\n").filter(Boolean).at(-1) || "vercel installed");
+  }
+}
+
+async function installVercelCli() {
+  if (!input.isTTY)
     throw new Error(
-      "Vercel CLI is not installed. Install it with: pnpm add -g vercel",
+      "Vercel CLI is not installed. Run this in a terminal to install it.",
     );
-  }
 
-  step("Checking Vercel login");
-  try {
-    const whoami = await runCapture("vercel", ["whoami"]);
-    ok(`logged in as ${whoami.trim()}`);
-  } catch {
-    warn("Vercel CLI is not logged in. Starting vercel login...");
-    await runNoUrl("vercel", ["login"]);
+  const install = await choosePackageInstall();
+  const rl = createInterface({ input, output });
+  const answer = (
+    await rl.question(
+      `Vercel CLI is not installed. Install it with "${install.command} ${install.args.join(" ")}"? [y/N]: `,
+    )
+  )
+    .trim()
+    .toLowerCase();
+  rl.close();
+
+  if (answer !== "y" && answer !== "yes")
+    throw new Error("Vercel CLI is required. Exiting.");
+
+  step(`Installing Vercel CLI with ${install.command}`);
+  await runNoUrl(install.command, install.args);
+}
+
+async function choosePackageInstall() {
+  const installs = [
+    { command: "pnpm", args: ["add", "-g", "vercel"] },
+    { command: "npm", args: ["install", "-g", "vercel"] },
+    { command: "yarn", args: ["global", "add", "vercel"] },
+    { command: "bun", args: ["add", "-g", "vercel"] },
+  ];
+
+  for (const install of installs) {
+    try {
+      await runCapture(install.command, ["--version"]);
+      return install;
+    } catch {
+      // Try the next package manager.
+    }
   }
+
+  throw new Error(
+    "No package manager found. Install pnpm, npm, yarn, or bun first.",
+  );
 }
 
 async function doctor() {
-  await ensureVercelReady();
   console.log("");
   console.log(color.bold("Saved defaults"));
   printKeyValue("defaults file", defaultsPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel-vm-factory",
-  "version": "0.1.5",
+  "version": "0.2.8",
   "description": "Create Vercel Container deployments for ws-shell from selectable base images.",
   "license": "MIT",
   "type": "module",