pinme 2.0.9-beta.1 → 2.0.9-beta.2

package/dist/index.js

@@ -5978,7 +5978,7 @@ var import_chalk26 = __toESM(require("chalk"));
 var import_figlet5 = __toESM(require("figlet"));
 
 // package.json
-var version = "2.0.9-beta.1";
+var version = "2.0.9-beta.2";
 
 // bin/upload.ts
 var import_path7 = __toESM(require("path"));
@@ -9069,6 +9069,8 @@ var import_chalk19 = __toESM(require("chalk"));
 var import_child_process3 = require("child_process");
 var INSTALL_TIMEOUT_MS = 10 * 60 * 1e3;
 var SLOW_INSTALL_NOTICE_MS = 60 * 1e3;
+var INSTALL_LOG_FILE = ".pinme-install.log";
+var INSTALL_EXITCODE_FILE = ".pinme-install.exitcode";
 function makeTempCacheDir() {
   return import_fs_extra5.default.mkdtempSync(import_path11.default.join(import_os5.default.tmpdir(), "pinme-npm-cache-"));
 }
@@ -9101,22 +9103,40 @@ function getInstallArgs(script, cacheDir) {
     "--fetch-timeout=60000"
   ];
 }
+function quoteForShell(value) {
+  if (process.platform === "win32") {
+    return `"${value}"`;
+  }
+  return `'${value.replace(/'/g, `'\\''`)}'`;
+}
 function startBackgroundInstall(cwd) {
-  const npm = getNpmCommand();
   const script = getInstallScript(cwd, "auto");
   const cacheDir = makeTempCacheDir();
   const args = getInstallArgs(script, cacheDir);
-  const logPath = import_path11.default.join(cwd, ".pinme-install.log");
-  const header = `
-[pinme] ${(/* @__PURE__ */ new Date()).toISOString()} starting "npm ${script}"
-`;
-  import_fs_extra5.default.writeFileSync(logPath, header);
-  const logFd = import_fs_extra5.default.openSync(logPath, "a");
-  const child = (0, import_child_process3.spawn)(npm, args, {
+  const logPath = import_path11.default.join(cwd, INSTALL_LOG_FILE);
+  const exitCodePath = import_path11.default.join(cwd, INSTALL_EXITCODE_FILE);
+  import_fs_extra5.default.removeSync(exitCodePath);
+  import_fs_extra5.default.writeFileSync(logPath, `[pinme] ${(/* @__PURE__ */ new Date()).toISOString()} starting "npm ${script}"
+`);
+  const npmCmd = process.platform === "win32" ? "npm" : getNpmCommand();
+  const installCmd = `${npmCmd} ${args.map(quoteForShell).join(" ")}`;
+  const qLog = quoteForShell(logPath);
+  const qExit = quoteForShell(exitCodePath);
+  let shellBin;
+  let shellArgs;
+  if (process.platform === "win32") {
+    const command = `${installCmd} >> ${qLog} 2>&1 & echo %errorlevel% > ${qExit}`;
+    shellBin = process.env.ComSpec || "cmd.exe";
+    shellArgs = ["/d", "/s", "/c", command];
+  } else {
+    const command = `${installCmd} >> ${qLog} 2>&1; printf '%s' "$?" > ${qExit}`;
+    shellBin = "/bin/sh";
+    shellArgs = ["-c", command];
+  }
+  const child = (0, import_child_process3.spawn)(shellBin, shellArgs, {
     cwd,
     detached: true,
-    stdio: ["ignore", logFd, logFd],
-    shell: true,
+    stdio: "ignore",
     env: {
       ...process.env,
       npm_config_cache: cacheDir,
@@ -9129,10 +9149,33 @@ function startBackgroundInstall(cwd) {
       npm_config_fetch_timeout: "60000"
     }
   });
-  import_fs_extra5.default.closeSync(logFd);
   child.unref();
   return { logPath };
 }
+function readBackgroundInstallStatus(cwd) {
+  const logPath = import_path11.default.join(cwd, INSTALL_LOG_FILE);
+  const exitCodePath = import_path11.default.join(cwd, INSTALL_EXITCODE_FILE);
+  if (import_fs_extra5.default.existsSync(exitCodePath)) {
+    const raw = import_fs_extra5.default.readFileSync(exitCodePath, "utf-8").trim();
+    const code = Number.parseInt(raw, 10);
+    if (Number.isNaN(code)) {
+      return { status: "running", exitCode: null, logPath };
+    }
+    return { status: code === 0 ? "success" : "failed", exitCode: code, logPath };
+  }
+  if (import_fs_extra5.default.existsSync(logPath)) {
+    return { status: "running", exitCode: null, logPath };
+  }
+  return { status: "idle", exitCode: null, logPath };
+}
+function readBackgroundInstallLogTail(cwd, maxChars = 1500) {
+  const logPath = import_path11.default.join(cwd, INSTALL_LOG_FILE);
+  if (!import_fs_extra5.default.existsSync(logPath)) {
+    return "";
+  }
+  const content = import_fs_extra5.default.readFileSync(logPath, "utf-8");
+  return content.length > maxChars ? content.slice(content.length - maxChars) : content;
+}
 
 // bin/create.ts
 init_cliError();
@@ -9397,6 +9440,7 @@ Directory "${projectName}" already exists.`));
       const { logPath } = startBackgroundInstall(targetDir);
       console.log(import_chalk20.default.gray("   Dependencies are installing in the background; create will continue."));
       console.log(import_chalk20.default.gray(`   Install progress is logged to: ${logPath}`));
+      console.log(import_chalk20.default.gray("   `pinme save` will automatically wait for this install to finish."));
     } catch (error) {
       console.log(import_chalk20.default.yellow("   Warning: could not start background dependency install."));
       console.log(import_chalk20.default.yellow("   Run `npm install` inside the project before `pinme save`."));
@@ -9553,6 +9597,7 @@ Next steps:`));
 
 // bin/save.ts
 var import_chalk21 = __toESM(require("chalk"));
+var import_ora3 = __toESM(require("ora"));
 var import_fs_extra7 = __toESM(require("fs-extra"));
 var import_path13 = __toESM(require("path"));
 init_axios2();
@@ -9597,30 +9642,116 @@ function buildWorker() {
     });
     console.log(import_chalk21.default.green("Worker built"));
   } catch (error) {
+    if (isMissingDependencyError(error)) {
+      throw dependenciesMissingError(
+        "Worker build failed because a required CLI (e.g. `wrangler`) was not found. Project dependencies are missing or incomplete."
+      );
+    }
     throw createCommandError("worker build", "npm run build:worker", error, [
       "Fix the build error shown above, then rerun `pinme save`."
     ]);
   }
 }
-function ensureDependenciesInstalled() {
-  const nodeModulesPath = import_path13.default.join(PROJECT_DIR2, "node_modules");
+function dependenciesMissingError(summary, logTail) {
   const installLogPath = import_path13.default.join(PROJECT_DIR2, ".pinme-install.log");
-  if (import_fs_extra7.default.existsSync(nodeModulesPath)) {
-    console.log(import_chalk21.default.gray("Dependencies already installed; skipping install."));
-    return;
-  }
   const suggestions = [
-    "Dependencies are not installed. Run `npm install` in the project root, wait for it to finish, then rerun `pinme save`."
+    "Run `npm install` in the project root, wait for it to finish, then rerun `pinme save`."
   ];
   if (import_fs_extra7.default.existsSync(installLogPath)) {
     suggestions.push(
-      `A background install may still be running (started by \`pinme create\`). Check progress in \`${installLogPath}\` before retrying.`
+      `Background install log: ${installLogPath}`
     );
   }
-  throw createConfigError(
-    "Project dependencies are not installed: `node_modules` is missing.",
-    suggestions
-  );
+  const error = createConfigError(summary, suggestions);
+  const trimmedTail = logTail == null ? void 0 : logTail.trim();
+  if (trimmedTail) {
+    error.details = [
+      ...error.details,
+      "Install log (tail):",
+      ...trimmedTail.split("\n").slice(-20)
+    ];
+  }
+  return error;
+}
+function isMissingDependencyError(error) {
+  const exitCode = (error == null ? void 0 : error.status) ?? (error == null ? void 0 : error.code);
+  if (exitCode === 127) {
+    return true;
+  }
+  const haystack = [error == null ? void 0 : error.message, error == null ? void 0 : error.stderr, error == null ? void 0 : error.stdout].map((value) => String(value || "")).join(" ").toLowerCase();
+  return /command not found|not found|is not recognized|cannot find module|cannot find package/.test(haystack);
+}
+function dependenciesPresent() {
+  return hasLocalBinary("wrangler") && hasLocalBinary("vite");
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+var WAIT_FOR_INSTALL_TIMEOUT_MS = 12 * 60 * 1e3;
+var WAIT_POLL_INTERVAL_MS = 2e3;
+async function ensureDependenciesReady() {
+  if (dependenciesPresent()) {
+    console.log(import_chalk21.default.gray("Dependencies are installed."));
+    return;
+  }
+  const initial = readBackgroundInstallStatus(PROJECT_DIR2);
+  if (initial.status === "idle") {
+    throw dependenciesMissingError(
+      "Project dependencies are not installed and no install is running."
+    );
+  }
+  if (initial.status === "failed") {
+    throw dependenciesMissingError(
+      `The background dependency install (started by \`pinme create\`) failed with exit code ${initial.exitCode}.`,
+      readBackgroundInstallLogTail(PROJECT_DIR2)
+    );
+  }
+  const spinner = (0, import_ora3.default)("Waiting for background dependency install to finish...").start();
+  const startedAt = Date.now();
+  while (true) {
+    await sleep(WAIT_POLL_INTERVAL_MS);
+    if (dependenciesPresent()) {
+      spinner.succeed("Dependencies installed.");
+      return;
+    }
+    const state = readBackgroundInstallStatus(PROJECT_DIR2);
+    if (state.status === "failed") {
+      spinner.fail("Background dependency install failed.");
+      throw dependenciesMissingError(
+        `The background dependency install (started by \`pinme create\`) failed with exit code ${state.exitCode}.`,
+        readBackgroundInstallLogTail(PROJECT_DIR2)
+      );
+    }
+    if (state.status === "success") {
+      spinner.succeed("Dependencies installed.");
+      return;
+    }
+    const elapsedMs = Date.now() - startedAt;
+    if (elapsedMs > WAIT_FOR_INSTALL_TIMEOUT_MS) {
+      spinner.fail("Timed out waiting for the dependency install.");
+      throw dependenciesMissingError(
+        "Timed out waiting for the background dependency install to finish.",
+        readBackgroundInstallLogTail(PROJECT_DIR2)
+      );
+    }
+    spinner.text = `Waiting for background dependency install to finish... (${Math.round(elapsedMs / 1e3)}s)`;
+  }
+}
+function cleanupInstallMarkers() {
+  try {
+    import_fs_extra7.default.removeSync(import_path13.default.join(PROJECT_DIR2, INSTALL_LOG_FILE));
+    import_fs_extra7.default.removeSync(import_path13.default.join(PROJECT_DIR2, INSTALL_EXITCODE_FILE));
+  } catch {
+  }
+}
+function hasLocalBinary(name) {
+  const binDirs = [
+    import_path13.default.join(PROJECT_DIR2, "node_modules", ".bin"),
+    import_path13.default.join(PROJECT_DIR2, "backend", "node_modules", ".bin"),
+    import_path13.default.join(PROJECT_DIR2, "frontend", "node_modules", ".bin")
+  ];
+  const candidates = process.platform === "win32" ? [name, `${name}.cmd`, `${name}.exe`, `${name}.ps1`] : [name];
+  return binDirs.some((dir) => candidates.some((candidate) => import_fs_extra7.default.existsSync(import_path13.default.join(dir, candidate))));
 }
 function getBuiltWorker() {
   const distWorkerDir = import_path13.default.join(PROJECT_DIR2, "dist-worker");
@@ -9727,6 +9858,11 @@ function buildFrontend() {
     });
     console.log(import_chalk21.default.green("Frontend built"));
   } catch (error) {
+    if (isMissingDependencyError(error)) {
+      throw dependenciesMissingError(
+        "Frontend build failed because a required CLI (e.g. `vite`) was not found. Project dependencies are missing or incomplete."
+      );
+    }
     throw createCommandError("frontend build", "npm run build:frontend", error, [
       "Fix the frontend build error shown above, then rerun `pinme save`."
     ]);
@@ -9826,7 +9962,7 @@ async function saveCmd(options) {
     const apiUrl = `${getPinmeApiUrl("/save_worker")}?project_name=${encodeURIComponent(projectName)}`;
     console.log(import_chalk21.default.gray(`API URL: ${apiUrl}`));
     console.log(import_chalk21.default.blue("\n--- Backend ---"));
-    ensureDependenciesInstalled();
+    await ensureDependenciesReady();
     buildWorker();
     const metadata = getMetadata();
     const { workerJsPath, modulePaths } = getBuiltWorker();
@@ -9855,6 +9991,7 @@ async function saveCmd(options) {
       "management"
     );
     console.log(import_chalk21.default.green("\nDeployment complete."));
+    cleanupInstallMarkers();
     void tracker_default.trackEvent(TRACK_EVENTS.projectSaveSuccess, TRACK_PAGES.deploy, {
       a: resolveTrackAction2(TRACK_EVENTS.projectSaveSuccess),
       project_name: projectName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinme",
-  "version": "2.0.9-beta.1",
+  "version": "2.0.9-beta.2",
   "publishConfig": {
     "access": "public"
   },