@mutmutco/installer-launcher 0.1.3 → 0.1.4

package/dist/launcher.js

@@ -2,7 +2,7 @@
 
 // src/index.ts
 import { spawnSync as spawnSync2 } from "node:child_process";
-import { existsSync as existsSync4, readFileSync as readFileSync4 } from "node:fs";
+import { existsSync as existsSync4, readFileSync as readFileSync4, statSync } from "node:fs";
 import { dirname as dirname2, join as join4, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL as pathToFileURL2 } from "node:url";
 
@@ -121,9 +121,10 @@ function createFace({ product, color = false, columns }) {
     const content = Math.min(width - 6, Math.max(...body.map(visibleWidth)));
     const rule = paint(identity.accent, GLYPH.rule.repeat(content + 4));
     const frame = (left, right) => `${paint(identity.accent, left)}${rule}${paint(identity.accent, right)}`;
+    const bodyRow = (line) => line.startsWith(GLYPH.check) ? `${paint(PALETTE.green, GLYPH.check)}${line.slice(1)}` : line;
     return [
       frame(GLYPH.boxTop, GLYPH.boxTopEnd),
-      ...body.map((line) => `${paint(identity.accent, GLYPH.bar)}  ${line}${" ".repeat(Math.max(0, content - visibleWidth(line)))}  ${paint(identity.accent, GLYPH.bar)}`),
+      ...body.map((line) => `${paint(identity.accent, GLYPH.bar)}  ${bodyRow(line)}${" ".repeat(Math.max(0, content - visibleWidth(line)))}  ${paint(identity.accent, GLYPH.bar)}`),
       frame(GLYPH.boxBottom, GLYPH.boxBottomEnd)
     ];
   };
@@ -132,6 +133,8 @@ function createFace({ product, color = false, columns }) {
   return { identity, width, welcome, step, relay, receipt, signOff, refusal, paint };
 }
 var RELAY_INDENT = " ".repeat(TITLE_COLUMN - 1);
+var FRAMES = ["\u25D2", "\u25D0", "\u25D3", "\u25D1"];
+var SPINNER_FRAMES = Object.freeze([...FRAMES]);
 var ALLOWED = new Set(Object.values(GLYPH));
 
 // src/autoupdate.ts
@@ -860,7 +863,7 @@ function wipeProductDir(dir) {
 }
 
 // src/index.ts
-var LAUNCHER_VERSION = true ? "0.1.3" : readVersionFromPackage();
+var LAUNCHER_VERSION = true ? "0.1.4" : readVersionFromPackage();
 function defaultPrint(message) {
   process.stdout.write(`${message}
 `);
@@ -1072,7 +1075,7 @@ function needsShell(command) {
 function quoteForShell(arg) {
   return /[\s"&|<>^%]/.test(arg) ? `"${arg.replace(/"/g, '\\"')}"` : arg;
 }
-function defaultRunEntry(entry, cwd) {
+function defaultRunEntry(entry, cwd, env) {
   const [command, ...args] = entry;
   const shell = needsShell(command);
   const commandLine = shell ? [command, ...args].map(quoteForShell).join(" ") : command;
@@ -1080,6 +1083,7 @@ function defaultRunEntry(entry, cwd) {
     cwd,
     stdio: "inherit",
     shell,
+    env: env ?? process.env,
     windowsHide: true
   });
   if (result.error) return { ok: false, error: result.error.message };
@@ -1092,10 +1096,11 @@ function faceProduct(config) {
 }
 function faceFor(config, options) {
   const tty = options.tty ?? Boolean(process.stdout.isTTY);
+  if (!tty) return null;
   try {
     return createFace({
       product: faceProduct(config),
-      color: tty && !process.env.NO_COLOR && process.env.TERM !== "dumb",
+      color: !process.env.NO_COLOR && process.env.TERM !== "dumb",
       columns: process.stdout.columns
     });
   } catch {
@@ -1128,7 +1133,7 @@ async function doInstall(config, dir, options, print) {
   const manifest = await fetchVerifiedManifest(config, accessToken, fetchImpl);
   await downloadAndUnpack(config, dir, manifest, accessToken, { fetchImpl });
   writeState(dir, { version: manifest.version, updatedAt: (/* @__PURE__ */ new Date()).toISOString() });
-  printStep(face, print, `installed ${config.product} ${manifest.version} into ${dir}`, since(started));
+  printStep(face, print, `installed ${config.product} ${manifest.version}`, since(started));
   return finishLastMile(config, dir, options, print, face, manifest.version);
 }
 async function doUpdate(config, dir, options, print) {
@@ -1148,6 +1153,26 @@ async function doUpdate(config, dir, options, print) {
   printStep(face, print, `updated ${config.product} to ${manifest.version}`, since(started));
   return finishLastMile(config, dir, options, print, face, manifest.version);
 }
+function payloadEnv(dir) {
+  const stored = readTokens(dir);
+  if (!stored?.accessToken) return void 0;
+  return { ...process.env, MM_INSTALLER_TOKEN: stored.accessToken };
+}
+var NEVER_A_PROGRAM = /\.(tgz|tar|gz|bz2|xz|zip|json|txt|md|lock)$/i;
+function payloadFileAsCommand(entry, payload) {
+  const first = entry[0];
+  if (!first || first === "$self") return null;
+  if (first.includes("/") || first.includes("\\")) return null;
+  const candidate = join4(payload, first);
+  if (!existsSync4(candidate)) return null;
+  if (NEVER_A_PROGRAM.test(first)) return first;
+  if (process.platform === "win32") return null;
+  try {
+    return (statSync(candidate).mode & 73) === 0 ? first : null;
+  } catch {
+    return null;
+  }
+}
 function finishLastMile(config, dir, options, print, face, version) {
   const entry = readPayloadEntry(dir);
   const payload = payloadDir(dir);
@@ -1159,8 +1184,18 @@ function finishLastMile(config, dir, options, print, face, version) {
     return 0;
   }
   const command = resolveEntry(entry);
+  const dataFile = payloadFileAsCommand(entry, payload);
+  if (dataFile) {
+    printStep(face, print, `The payload names ${dataFile} as its command, but that is a file, not a program`, null, "fail");
+    printReceipt(face, config, print, false, [
+      `    Downloaded ${version} into ${dir}`,
+      `    This payload was built wrong: its entry must be a command, not one of its own files.`,
+      `    Nothing on this machine can finish it \u2014 report it to the ${config.product} maintainers.`
+    ]);
+    return 2;
+  }
   const started = Date.now();
-  const result = (options.runEntry ?? defaultRunEntry)(command, payload);
+  const result = (options.runEntry ?? defaultRunEntry)(command, payload, payloadEnv(dir));
   if (result.ok) {
     printStep(face, print, "Armed this machine", since(started));
     printReceipt(face, config, print, true, [
@@ -1170,7 +1205,13 @@ function finishLastMile(config, dir, options, print, face, version) {
     return 0;
   }
   const code = result.code ?? 1;
-  printStep(face, print, `Arming this machine did not finish (exit code ${code})`, null, "fail");
+  printStep(
+    face,
+    print,
+    result.code === void 0 ? `Arming this machine could not start: ${result.error ?? `could not run ${command[0]}`}` : `Arming this machine did not finish (exit code ${code})`,
+    null,
+    "fail"
+  );
   printReceipt(face, config, print, false, [
     `    Downloaded ${version} into ${dir}`,
     `    Finish it with:  (cd ${payload} && ${command.join(" ")})`
@@ -1191,7 +1232,7 @@ function doForward(config, dir, options, command, argv, print) {
     return 2;
   }
   const forwarded = [...resolveEntry(target), ...argv];
-  const result = (options.runEntry ?? defaultRunEntry)(forwarded, payloadDir(dir));
+  const result = (options.runEntry ?? defaultRunEntry)(forwarded, payloadDir(dir), payloadEnv(dir));
   if (!result.ok && result.code === void 0) {
     print(`failed: ${result.error ?? `could not run ${forwarded[0]}`}`);
     return 1;
@@ -1242,7 +1283,7 @@ function doDoctor(config, dir, options, print) {
   const verbs = readPayloadVerbs(dir);
   const chains = target !== null && (verbs === "*" || Array.isArray(verbs) && verbs.includes("doctor"));
   if (!chains) return 0;
-  const result = (options.runEntry ?? defaultRunEntry)([...resolveEntry(target), "doctor"], payloadDir(dir));
+  const result = (options.runEntry ?? defaultRunEntry)([...resolveEntry(target), "doctor"], payloadDir(dir), payloadEnv(dir));
   return result.code ?? (result.ok ? 0 : 1);
 }
 function doLauncherDoctor(config, dir, options, print) {

package/dist/launcher.sea.cjs

@@ -151,9 +151,10 @@ function createFace({ product, color = false, columns }) {
     const content = Math.min(width - 6, Math.max(...body.map(visibleWidth)));
     const rule = paint(identity.accent, GLYPH.rule.repeat(content + 4));
     const frame = (left, right) => `${paint(identity.accent, left)}${rule}${paint(identity.accent, right)}`;
+    const bodyRow = (line) => line.startsWith(GLYPH.check) ? `${paint(PALETTE.green, GLYPH.check)}${line.slice(1)}` : line;
     return [
       frame(GLYPH.boxTop, GLYPH.boxTopEnd),
-      ...body.map((line) => `${paint(identity.accent, GLYPH.bar)}  ${line}${" ".repeat(Math.max(0, content - visibleWidth(line)))}  ${paint(identity.accent, GLYPH.bar)}`),
+      ...body.map((line) => `${paint(identity.accent, GLYPH.bar)}  ${bodyRow(line)}${" ".repeat(Math.max(0, content - visibleWidth(line)))}  ${paint(identity.accent, GLYPH.bar)}`),
       frame(GLYPH.boxBottom, GLYPH.boxBottomEnd)
     ];
   };
@@ -162,6 +163,8 @@ function createFace({ product, color = false, columns }) {
   return { identity, width, welcome, step, relay, receipt, signOff, refusal, paint };
 }
 var RELAY_INDENT = " ".repeat(TITLE_COLUMN - 1);
+var FRAMES = ["\u25D2", "\u25D0", "\u25D3", "\u25D1"];
+var SPINNER_FRAMES = Object.freeze([...FRAMES]);
 var ALLOWED = new Set(Object.values(GLYPH));
 
 // src/autoupdate.ts
@@ -891,7 +894,7 @@ function wipeProductDir(dir) {
 }
 
 // src/index.ts
-var LAUNCHER_VERSION = true ? "0.1.3" : readVersionFromPackage();
+var LAUNCHER_VERSION = true ? "0.1.4" : readVersionFromPackage();
 function defaultPrint(message) {
   process.stdout.write(`${message}
 `);
@@ -1103,7 +1106,7 @@ function needsShell(command) {
 function quoteForShell(arg) {
   return /[\s"&|<>^%]/.test(arg) ? `"${arg.replace(/"/g, '\\"')}"` : arg;
 }
-function defaultRunEntry(entry, cwd) {
+function defaultRunEntry(entry, cwd, env) {
   const [command, ...args] = entry;
   const shell = needsShell(command);
   const commandLine = shell ? [command, ...args].map(quoteForShell).join(" ") : command;
@@ -1111,6 +1114,7 @@ function defaultRunEntry(entry, cwd) {
     cwd,
     stdio: "inherit",
     shell,
+    env: env ?? process.env,
     windowsHide: true
   });
   if (result.error) return { ok: false, error: result.error.message };
@@ -1123,10 +1127,11 @@ function faceProduct(config) {
 }
 function faceFor(config, options) {
   const tty = options.tty ?? Boolean(process.stdout.isTTY);
+  if (!tty) return null;
   try {
     return createFace({
       product: faceProduct(config),
-      color: tty && !process.env.NO_COLOR && process.env.TERM !== "dumb",
+      color: !process.env.NO_COLOR && process.env.TERM !== "dumb",
       columns: process.stdout.columns
     });
   } catch {
@@ -1159,7 +1164,7 @@ async function doInstall(config, dir, options, print) {
   const manifest = await fetchVerifiedManifest(config, accessToken, fetchImpl);
   await downloadAndUnpack(config, dir, manifest, accessToken, { fetchImpl });
   writeState(dir, { version: manifest.version, updatedAt: (/* @__PURE__ */ new Date()).toISOString() });
-  printStep(face, print, `installed ${config.product} ${manifest.version} into ${dir}`, since(started));
+  printStep(face, print, `installed ${config.product} ${manifest.version}`, since(started));
   return finishLastMile(config, dir, options, print, face, manifest.version);
 }
 async function doUpdate(config, dir, options, print) {
@@ -1179,6 +1184,26 @@ async function doUpdate(config, dir, options, print) {
   printStep(face, print, `updated ${config.product} to ${manifest.version}`, since(started));
   return finishLastMile(config, dir, options, print, face, manifest.version);
 }
+function payloadEnv(dir) {
+  const stored = readTokens(dir);
+  if (!stored?.accessToken) return void 0;
+  return { ...process.env, MM_INSTALLER_TOKEN: stored.accessToken };
+}
+var NEVER_A_PROGRAM = /\.(tgz|tar|gz|bz2|xz|zip|json|txt|md|lock)$/i;
+function payloadFileAsCommand(entry, payload) {
+  const first = entry[0];
+  if (!first || first === "$self") return null;
+  if (first.includes("/") || first.includes("\\")) return null;
+  const candidate = (0, import_node_path4.join)(payload, first);
+  if (!(0, import_node_fs5.existsSync)(candidate)) return null;
+  if (NEVER_A_PROGRAM.test(first)) return first;
+  if (process.platform === "win32") return null;
+  try {
+    return ((0, import_node_fs5.statSync)(candidate).mode & 73) === 0 ? first : null;
+  } catch {
+    return null;
+  }
+}
 function finishLastMile(config, dir, options, print, face, version) {
   const entry = readPayloadEntry(dir);
   const payload = payloadDir(dir);
@@ -1190,8 +1215,18 @@ function finishLastMile(config, dir, options, print, face, version) {
     return 0;
   }
   const command = resolveEntry(entry);
+  const dataFile = payloadFileAsCommand(entry, payload);
+  if (dataFile) {
+    printStep(face, print, `The payload names ${dataFile} as its command, but that is a file, not a program`, null, "fail");
+    printReceipt(face, config, print, false, [
+      `    Downloaded ${version} into ${dir}`,
+      `    This payload was built wrong: its entry must be a command, not one of its own files.`,
+      `    Nothing on this machine can finish it \u2014 report it to the ${config.product} maintainers.`
+    ]);
+    return 2;
+  }
   const started = Date.now();
-  const result = (options.runEntry ?? defaultRunEntry)(command, payload);
+  const result = (options.runEntry ?? defaultRunEntry)(command, payload, payloadEnv(dir));
   if (result.ok) {
     printStep(face, print, "Armed this machine", since(started));
     printReceipt(face, config, print, true, [
@@ -1201,7 +1236,13 @@ function finishLastMile(config, dir, options, print, face, version) {
     return 0;
   }
   const code = result.code ?? 1;
-  printStep(face, print, `Arming this machine did not finish (exit code ${code})`, null, "fail");
+  printStep(
+    face,
+    print,
+    result.code === void 0 ? `Arming this machine could not start: ${result.error ?? `could not run ${command[0]}`}` : `Arming this machine did not finish (exit code ${code})`,
+    null,
+    "fail"
+  );
   printReceipt(face, config, print, false, [
     `    Downloaded ${version} into ${dir}`,
     `    Finish it with:  (cd ${payload} && ${command.join(" ")})`
@@ -1222,7 +1263,7 @@ function doForward(config, dir, options, command, argv, print) {
     return 2;
   }
   const forwarded = [...resolveEntry(target), ...argv];
-  const result = (options.runEntry ?? defaultRunEntry)(forwarded, payloadDir(dir));
+  const result = (options.runEntry ?? defaultRunEntry)(forwarded, payloadDir(dir), payloadEnv(dir));
   if (!result.ok && result.code === void 0) {
     print(`failed: ${result.error ?? `could not run ${forwarded[0]}`}`);
     return 1;
@@ -1273,7 +1314,7 @@ function doDoctor(config, dir, options, print) {
   const verbs = readPayloadVerbs(dir);
   const chains = target !== null && (verbs === "*" || Array.isArray(verbs) && verbs.includes("doctor"));
   if (!chains) return 0;
-  const result = (options.runEntry ?? defaultRunEntry)([...resolveEntry(target), "doctor"], payloadDir(dir));
+  const result = (options.runEntry ?? defaultRunEntry)([...resolveEntry(target), "doctor"], payloadDir(dir), payloadEnv(dir));
   return result.code ?? (result.ok ? 0 : 1);
 }
 function doLauncherDoctor(config, dir, options, print) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/installer-launcher",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Single-executable (SEA) launcher: sign-in, gated payload fetch, self-update. One copy ships per product.",
   "type": "module",
   "license": "UNLICENSED",
@@ -34,6 +34,6 @@
     "vitest": "^4.1.0"
   },
   "dependencies": {
-    "@mutmutco/installer-face": "^0.1.0"
+    "@mutmutco/installer-face": "^0.2.1"
   }
 }