@mutmutco/installer-launcher 0.1.15 → 0.1.18

package/dist/launcher.js

@@ -799,15 +799,24 @@ function createFace({ product, color = false, columns, env = process.env, operat
     const record = { v: PROGRESS_PROTOCOL, step: stripColor(title), state: kind };
     if (typeof measure === "number") record.ms = Math.max(0, Math.round(measure * 1e3));
     if (kind === "running" && typeof measure === "string") record.measure = measure;
-    try {
-      if (progressFile) appendFileSync(progressFile, `${JSON.stringify(record)}
-`);
-      else writeSync(progressFd, `${JSON.stringify(record)}
-`);
-      return true;
-    } catch {
-      return false;
+    const line = `${JSON.stringify(record)}
+`;
+    if (progressFd !== null) {
+      try {
+        writeSync(progressFd, line);
+        return true;
+      } catch {
+      }
     }
+    if (progressFile) {
+      try {
+        appendFileSync(progressFile, line);
+        return true;
+      } catch {
+        return false;
+      }
+    }
+    return false;
   };
   const welcome = () => continuesFace || nested ? [] : [
     `${paint(identity.accent, GLYPH.diamond)}  ${paint(identity.accent, identity.name)} \u2014 Mutatis Mutandis`,
@@ -821,7 +830,7 @@ function createFace({ product, color = false, columns, env = process.env, operat
   };
   const step = (title, measure = null, kind = "ok") => {
     if (emitMilestone(title, measure, kind)) return "";
-    const glyph = title === "Armed hourly updates" && kind === "ok" ? GLYPH.clock : kind === "fail" ? paint(identity.accent, GLYPH.cross) : kind === "note" ? paint(PALETTE.muted, GLYPH.dot) : paint(PALETTE.green, GLYPH.check);
+    const glyph = title === "Armed hourly updates" && kind === "ok" ? GLYPH.clock : kind === "fail" ? paint(identity.accent, GLYPH.cross) : kind === "note" ? paint(PALETTE.muted, GLYPH.dot) : paint(identity.accent, GLYPH.check);
     const measured = measure === null || measure === void 0 ? "" : paint(PALETTE.muted, typeof measure === "number" ? `${Math.max(0, Math.round(measure))}s` : String(measure).trim());
     const time = measured;
     const column = Math.min(44, Math.max(0, width - 8));
@@ -842,7 +851,7 @@ function createFace({ product, color = false, columns, env = process.env, operat
     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;
+    const bodyRow = (line) => line.startsWith(GLYPH.check) ? `${paint(identity.accent, GLYPH.check)}${line.slice(1)}` : line;
     return [
       frame(GLYPH.boxTop, GLYPH.boxTopEnd),
       ...body.map((line) => `${paint(identity.accent, GLYPH.bar)}  ${bodyRow(line)}${" ".repeat(Math.max(0, content - visibleWidth(line)))}  ${paint(identity.accent, GLYPH.bar)}`),
@@ -873,16 +882,31 @@ import { appendFileSync as appendFileSync2, writeSync as writeSync2 } from "node
 import { Worker } from "node:worker_threads";
 
 // ../face/src/encoding.ts
+import { execFileSync } from "node:child_process";
 var UNICODE_SPINNER_FRAMES = Object.freeze(["\u25D2", "\u25D0", "\u25D3", "\u25D1"]);
 var ASCII_SPINNER_FRAMES = Object.freeze(["-", "\\", "|", "/"]);
-function consoleRendersUnicode(env = process.env, platform = process.platform) {
+var cachedCodePage;
+function consoleOutputCodePage() {
+  if (cachedCodePage !== void 0) return cachedCodePage;
+  cachedCodePage = null;
+  try {
+    const out = execFileSync("chcp.com", { windowsHide: true, encoding: "utf8", timeout: 5e3 });
+    const pages = [...String(out).matchAll(/(\d{3,5})/gu)].map((m) => Number(m[1]));
+    cachedCodePage = pages.length ? pages[pages.length - 1] : null;
+  } catch {
+    cachedCodePage = null;
+  }
+  return cachedCodePage;
+}
+function consoleRendersUnicode(env = process.env, platform = process.platform, codePage = platform === "win32" ? consoleOutputCodePage() : null) {
   if (env.MM_FACE_ASCII === "1" || env.NO_UNICODE === "1") return false;
   const locale = env.LC_ALL || env.LC_CTYPE || env.LANG || "";
   if (locale === "C" || locale === "POSIX" || /^C\./u.test(locale) || /^POSIX\./u.test(locale)) return false;
   if (/cp437|ibm437|\b437\b/iu.test(locale)) return false;
   if (/utf-?8/iu.test(locale)) return true;
   if (platform === "win32") {
-    return Boolean(env.WT_SESSION) || env.TERM_PROGRAM === "vscode" || env.CHCP === "65001" || env.ConEmuANSI === "ON";
+    if (env.WT_SESSION || env.ConEmuANSI === "ON") return true;
+    return codePage === 65001;
   }
   return true;
 }
@@ -1172,6 +1196,7 @@ function createInstallerRun(value, options = {}) {
   let chunkColumn = 0;
   const trailingCR = /* @__PURE__ */ new Set();
   let deferredActivity;
+  const drawnPhaseCompletions = /* @__PURE__ */ new Set();
   const closeChunk = () => {
     if (chunkOpen) emit("\n", chunkChannel);
     chunkOpen = false;
@@ -1218,11 +1243,15 @@ function createInstallerRun(value, options = {}) {
       const fold = operation === "update" && UPDATE_CHECK_PHASES.has(id) && state !== "fail";
       const title = PHASES[fold ? "check" : id][state === "ok" ? 1 : 0];
       if (state === "running") {
-        if (face.progress(title, facts.measure ?? null)) return;
-        if (activeTitle === title) spinner.say(title, facts.measure ?? null);
+        if (facts.runningTitle !== void 0 && (typeof facts.runningTitle !== "string" || !facts.runningTitle.trim() || /[\r\n\x00-\x1f]/u.test(facts.runningTitle))) {
+          throw new Error("installer run: invalid runningTitle");
+        }
+        const runningTitle = facts.runningTitle?.trim() ?? title;
+        if (face.progress(runningTitle, facts.measure ?? null)) return;
+        if (activeTitle === runningTitle) spinner.say(runningTitle, facts.measure ?? null);
         else {
-          activeTitle = title;
-          spinner.start(title, facts.measure ?? null);
+          activeTitle = runningTitle;
+          spinner.start(runningTitle, facts.measure ?? null);
         }
         return;
       }
@@ -1230,7 +1259,10 @@ function createInstallerRun(value, options = {}) {
         if (facts.detail) run2.relay(facts.detail);
         return;
       }
-      if (!face.continues(id, state)) durable(title, facts.seconds ?? facts.measure ?? null, state);
+      if (!face.continues(id, state)) {
+        durable(title, facts.seconds ?? facts.measure ?? null, state);
+        if (state === "ok") drawnPhaseCompletions.add(title);
+      }
       if (facts.detail) run2.relay(facts.detail);
     },
     surface(facts) {
@@ -1261,7 +1293,9 @@ function createInstallerRun(value, options = {}) {
         }
         return;
       }
+      if (state !== "fail" && drawnPhaseCompletions.has(step)) return;
       durable(step, ms === void 0 ? null : ms / 1e3, state);
+      if (state === "ok") drawnPhaseCompletions.add(step);
     },
     signIn({ url, code }) {
       start();
@@ -1776,7 +1810,7 @@ function page(title, body) {
 }
 
 // src/index.ts
-var LAUNCHER_VERSION = true ? "0.1.15" : readVersionFromPackage();
+var LAUNCHER_VERSION = true ? "0.1.18" : readVersionFromPackage();
 function defaultPrint(message) {
   process.stdout.write(`${message}
 `);
@@ -2060,6 +2094,9 @@ function faceProduct(config) {
   const known = { mmi: "mmi-hub", jerv: "jerv-hub" };
   return known[config.product] ?? config.product;
 }
+function formatMb(bytes) {
+  return (bytes / 1048576).toFixed(1).replace(/\.0$/, "");
+}
 async function installOrUpdate(config, dir, options, print, update) {
   const product = faceProduct(config);
   const installer = createInstallerRun({
@@ -2118,7 +2155,8 @@ async function installOrUpdate(config, dir, options, print, update) {
       const candidateDir = join6(dir, "candidates", candidate);
       const onProgress = ({ done, total }) => installer.phase("download", {
         state: "running",
-        measure: total ? `${Math.floor(done / total * 100)}% \xB7 ${done}/${total} B` : `${done} B`
+        measure: total ? `${Math.floor(done / total * 100)}% \xB7 ${formatMb(done)} of ${formatMb(total)} MB` : `${formatMb(done)} MB`,
+        ...total ? { runningTitle: `Downloading ${config.product} ${version} (${formatMb(total)} MB)` } : {}
       });
       if (!cached) await downloadAndUnpack(config, candidateDir, manifest, accessToken, { fetchImpl, onProgress, cacheDir: dir });
       const acquisition = existsSync7(join6(candidateDir, "payload", "payload.json")) ? readAcquisition(join6(candidateDir, "payload")) : null;
@@ -2472,6 +2510,7 @@ export {
   LAUNCHER_VERSION,
   defaultRunEntry,
   ensureFreshToken,
+  formatMb,
   readPayloadEntry,
   readPayloadRun,
   readPayloadVerbs,

package/dist/launcher.sea.cjs

@@ -23,6 +23,7 @@ __export(index_exports, {
   LAUNCHER_VERSION: () => LAUNCHER_VERSION,
   defaultRunEntry: () => defaultRunEntry,
   ensureFreshToken: () => ensureFreshToken,
+  formatMb: () => formatMb,
   readPayloadEntry: () => readPayloadEntry,
   readPayloadRun: () => readPayloadRun,
   readPayloadVerbs: () => readPayloadVerbs,
@@ -703,7 +704,7 @@ async function installAcquisition(dir, candidate, version, acquisition, options)
 }
 
 // src/index.ts
-var import_node_child_process4 = require("node:child_process");
+var import_node_child_process5 = require("node:child_process");
 var import_node_fs11 = require("node:fs");
 var import_node_os4 = require("node:os");
 var import_node_path6 = require("node:path");
@@ -831,15 +832,24 @@ function createFace({ product, color = false, columns, env = process.env, operat
     const record = { v: PROGRESS_PROTOCOL, step: stripColor(title), state: kind };
     if (typeof measure === "number") record.ms = Math.max(0, Math.round(measure * 1e3));
     if (kind === "running" && typeof measure === "string") record.measure = measure;
-    try {
-      if (progressFile) (0, import_node_fs6.appendFileSync)(progressFile, `${JSON.stringify(record)}
-`);
-      else (0, import_node_fs6.writeSync)(progressFd, `${JSON.stringify(record)}
-`);
-      return true;
-    } catch {
-      return false;
+    const line = `${JSON.stringify(record)}
+`;
+    if (progressFd !== null) {
+      try {
+        (0, import_node_fs6.writeSync)(progressFd, line);
+        return true;
+      } catch {
+      }
+    }
+    if (progressFile) {
+      try {
+        (0, import_node_fs6.appendFileSync)(progressFile, line);
+        return true;
+      } catch {
+        return false;
+      }
     }
+    return false;
   };
   const welcome = () => continuesFace || nested ? [] : [
     `${paint(identity.accent, GLYPH.diamond)}  ${paint(identity.accent, identity.name)} \u2014 Mutatis Mutandis`,
@@ -853,7 +863,7 @@ function createFace({ product, color = false, columns, env = process.env, operat
   };
   const step = (title, measure = null, kind = "ok") => {
     if (emitMilestone(title, measure, kind)) return "";
-    const glyph = title === "Armed hourly updates" && kind === "ok" ? GLYPH.clock : kind === "fail" ? paint(identity.accent, GLYPH.cross) : kind === "note" ? paint(PALETTE.muted, GLYPH.dot) : paint(PALETTE.green, GLYPH.check);
+    const glyph = title === "Armed hourly updates" && kind === "ok" ? GLYPH.clock : kind === "fail" ? paint(identity.accent, GLYPH.cross) : kind === "note" ? paint(PALETTE.muted, GLYPH.dot) : paint(identity.accent, GLYPH.check);
     const measured = measure === null || measure === void 0 ? "" : paint(PALETTE.muted, typeof measure === "number" ? `${Math.max(0, Math.round(measure))}s` : String(measure).trim());
     const time = measured;
     const column = Math.min(44, Math.max(0, width - 8));
@@ -874,7 +884,7 @@ function createFace({ product, color = false, columns, env = process.env, operat
     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;
+    const bodyRow = (line) => line.startsWith(GLYPH.check) ? `${paint(identity.accent, GLYPH.check)}${line.slice(1)}` : line;
     return [
       frame(GLYPH.boxTop, GLYPH.boxTopEnd),
       ...body.map((line) => `${paint(identity.accent, GLYPH.bar)}  ${bodyRow(line)}${" ".repeat(Math.max(0, content - visibleWidth(line)))}  ${paint(identity.accent, GLYPH.bar)}`),
@@ -905,16 +915,31 @@ var import_node_fs7 = require("node:fs");
 var import_node_worker_threads = require("node:worker_threads");
 
 // ../face/src/encoding.ts
+var import_node_child_process2 = require("node:child_process");
 var UNICODE_SPINNER_FRAMES = Object.freeze(["\u25D2", "\u25D0", "\u25D3", "\u25D1"]);
 var ASCII_SPINNER_FRAMES = Object.freeze(["-", "\\", "|", "/"]);
-function consoleRendersUnicode(env = process.env, platform = process.platform) {
+var cachedCodePage;
+function consoleOutputCodePage() {
+  if (cachedCodePage !== void 0) return cachedCodePage;
+  cachedCodePage = null;
+  try {
+    const out = (0, import_node_child_process2.execFileSync)("chcp.com", { windowsHide: true, encoding: "utf8", timeout: 5e3 });
+    const pages = [...String(out).matchAll(/(\d{3,5})/gu)].map((m) => Number(m[1]));
+    cachedCodePage = pages.length ? pages[pages.length - 1] : null;
+  } catch {
+    cachedCodePage = null;
+  }
+  return cachedCodePage;
+}
+function consoleRendersUnicode(env = process.env, platform = process.platform, codePage = platform === "win32" ? consoleOutputCodePage() : null) {
   if (env.MM_FACE_ASCII === "1" || env.NO_UNICODE === "1") return false;
   const locale = env.LC_ALL || env.LC_CTYPE || env.LANG || "";
   if (locale === "C" || locale === "POSIX" || /^C\./u.test(locale) || /^POSIX\./u.test(locale)) return false;
   if (/cp437|ibm437|\b437\b/iu.test(locale)) return false;
   if (/utf-?8/iu.test(locale)) return true;
   if (platform === "win32") {
-    return Boolean(env.WT_SESSION) || env.TERM_PROGRAM === "vscode" || env.CHCP === "65001" || env.ConEmuANSI === "ON";
+    if (env.WT_SESSION || env.ConEmuANSI === "ON") return true;
+    return codePage === 65001;
   }
   return true;
 }
@@ -1204,6 +1229,7 @@ function createInstallerRun(value, options = {}) {
   let chunkColumn = 0;
   const trailingCR = /* @__PURE__ */ new Set();
   let deferredActivity;
+  const drawnPhaseCompletions = /* @__PURE__ */ new Set();
   const closeChunk = () => {
     if (chunkOpen) emit("\n", chunkChannel);
     chunkOpen = false;
@@ -1250,11 +1276,15 @@ function createInstallerRun(value, options = {}) {
       const fold = operation === "update" && UPDATE_CHECK_PHASES.has(id) && state !== "fail";
       const title = PHASES[fold ? "check" : id][state === "ok" ? 1 : 0];
       if (state === "running") {
-        if (face.progress(title, facts.measure ?? null)) return;
-        if (activeTitle === title) spinner.say(title, facts.measure ?? null);
+        if (facts.runningTitle !== void 0 && (typeof facts.runningTitle !== "string" || !facts.runningTitle.trim() || /[\r\n\x00-\x1f]/u.test(facts.runningTitle))) {
+          throw new Error("installer run: invalid runningTitle");
+        }
+        const runningTitle = facts.runningTitle?.trim() ?? title;
+        if (face.progress(runningTitle, facts.measure ?? null)) return;
+        if (activeTitle === runningTitle) spinner.say(runningTitle, facts.measure ?? null);
         else {
-          activeTitle = title;
-          spinner.start(title, facts.measure ?? null);
+          activeTitle = runningTitle;
+          spinner.start(runningTitle, facts.measure ?? null);
         }
         return;
       }
@@ -1262,7 +1292,10 @@ function createInstallerRun(value, options = {}) {
         if (facts.detail) run2.relay(facts.detail);
         return;
       }
-      if (!face.continues(id, state)) durable(title, facts.seconds ?? facts.measure ?? null, state);
+      if (!face.continues(id, state)) {
+        durable(title, facts.seconds ?? facts.measure ?? null, state);
+        if (state === "ok") drawnPhaseCompletions.add(title);
+      }
       if (facts.detail) run2.relay(facts.detail);
     },
     surface(facts) {
@@ -1293,7 +1326,9 @@ function createInstallerRun(value, options = {}) {
         }
         return;
       }
+      if (state !== "fail" && drawnPhaseCompletions.has(step)) return;
       durable(step, ms === void 0 ? null : ms / 1e3, state);
+      if (state === "ok") drawnPhaseCompletions.add(step);
     },
     signIn({ url, code }) {
       start();
@@ -1399,7 +1434,7 @@ function createInstallerRun(value, options = {}) {
 }
 
 // src/autoupdate.ts
-var import_node_child_process2 = require("node:child_process");
+var import_node_child_process3 = require("node:child_process");
 var import_node_fs10 = require("node:fs");
 var import_node_os3 = require("node:os");
 var import_node_path5 = require("node:path");
@@ -1409,7 +1444,7 @@ function schedulePlatform(override) {
   return null;
 }
 function defaultExec(command2, args) {
-  const result = (0, import_node_child_process2.spawnSync)(command2, args, { encoding: "utf8", windowsHide: true });
+  const result = (0, import_node_child_process3.spawnSync)(command2, args, { encoding: "utf8", windowsHide: true });
   if (result.error) return { code: 1, stdout: "", stderr: result.error.message };
   return {
     code: typeof result.status === "number" ? result.status : 1,
@@ -1574,14 +1609,14 @@ function firstLine(text) {
 }
 
 // src/login-github.ts
-var import_node_child_process3 = require("node:child_process");
+var import_node_child_process4 = require("node:child_process");
 var realSleep = (ms) => new Promise((resolve3) => setTimeout(resolve3, ms));
 function openBrowser(url) {
   if (process.env.LAUNCHER_NO_OPEN === "1") return;
   const opener = process.platform === "darwin" ? "open" : process.platform === "win32" ? "rundll32" : "xdg-open";
   const args = process.platform === "win32" ? ["url.dll,FileProtocolHandler", url] : [url];
   try {
-    const child = (0, import_node_child_process3.spawn)(opener, args, { detached: true, stdio: "ignore", windowsHide: true });
+    const child = (0, import_node_child_process4.spawn)(opener, args, { detached: true, stdio: "ignore", windowsHide: true });
     child.on("error", () => {
     });
     child.unref();
@@ -1808,7 +1843,7 @@ function page(title, body) {
 }
 
 // src/index.ts
-var LAUNCHER_VERSION = true ? "0.1.15" : readVersionFromPackage();
+var LAUNCHER_VERSION = true ? "0.1.18" : readVersionFromPackage();
 function defaultPrint(message) {
   process.stdout.write(`${message}
 `);
@@ -2061,7 +2096,7 @@ function defaultRunEntry(entry2, cwd, env) {
   const [command2, ...args] = entry2;
   const shell = needsShell(command2);
   const commandLine = shell ? [command2, ...args].map(quoteForShell).join(" ") : command2;
-  const spawnEntry = (progress2) => (0, import_node_child_process4.spawnSync)(commandLine, shell ? [] : args, {
+  const spawnEntry = (progress2) => (0, import_node_child_process5.spawnSync)(commandLine, shell ? [] : args, {
     cwd,
     stdio: progress2 ? ["inherit", "inherit", "inherit", "pipe"] : "inherit",
     shell,
@@ -2092,6 +2127,9 @@ function faceProduct(config) {
   const known = { mmi: "mmi-hub", jerv: "jerv-hub" };
   return known[config.product] ?? config.product;
 }
+function formatMb(bytes) {
+  return (bytes / 1048576).toFixed(1).replace(/\.0$/, "");
+}
 async function installOrUpdate(config, dir, options, print, update) {
   const product = faceProduct(config);
   const installer = createInstallerRun({
@@ -2150,7 +2188,8 @@ async function installOrUpdate(config, dir, options, print, update) {
       const candidateDir = (0, import_node_path6.join)(dir, "candidates", candidate);
       const onProgress = ({ done, total }) => installer.phase("download", {
         state: "running",
-        measure: total ? `${Math.floor(done / total * 100)}% \xB7 ${done}/${total} B` : `${done} B`
+        measure: total ? `${Math.floor(done / total * 100)}% \xB7 ${formatMb(done)} of ${formatMb(total)} MB` : `${formatMb(done)} MB`,
+        ...total ? { runningTitle: `Downloading ${config.product} ${version} (${formatMb(total)} MB)` } : {}
       });
       if (!cached) await downloadAndUnpack(config, candidateDir, manifest, accessToken, { fetchImpl, onProgress, cacheDir: dir });
       const acquisition = (0, import_node_fs11.existsSync)((0, import_node_path6.join)(candidateDir, "payload", "payload.json")) ? readAcquisition((0, import_node_path6.join)(candidateDir, "payload")) : null;
@@ -2302,7 +2341,7 @@ async function runInstallEntry(entry2, cwd, env, installer, tokens = null) {
   const redact = (text) => secrets.reduce((safe, value) => safe.replaceAll(value, "[redacted]"), text);
   try {
     const result = await new Promise((resolve3) => {
-      const child = (0, import_node_child_process4.spawn)(shell ? [command2, ...args].map(quoteForShell).join(" ") : command2, shell ? [] : args, {
+      const child = (0, import_node_child_process5.spawn)(shell ? [command2, ...args].map(quoteForShell).join(" ") : command2, shell ? [] : args, {
         cwd,
         shell,
         windowsHide: true,
@@ -2505,6 +2544,7 @@ if (invokedAsMain) {
   LAUNCHER_VERSION,
   defaultRunEntry,
   ensureFreshToken,
+  formatMb,
   readPayloadEntry,
   readPayloadRun,
   readPayloadVerbs,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/installer-launcher",
-  "version": "0.1.15",
+  "version": "0.1.18",
   "description": "Single-executable (SEA) launcher: sign-in, gated payload fetch, self-update. One copy ships per product.",
   "type": "module",
   "license": "UNLICENSED",