@dylanpiercey/work 0.2.42 → 0.2.44

package/bin/work.mjs

@@ -957,37 +957,85 @@ function allowScriptsArgs() {
   return /^allow-scripts\s*=/m.test(conf) ? [`--allow-scripts=${pkgs}`] : [];
 }
 
+/** The release the registry npm uses names `latest`, or null when it
+ * cannot say (offline, or a registry that does not carry it). */
+function latestRelease() {
+  try {
+    const out = execFileSync(
+      "npm",
+      ["view", "@dylanpiercey/work@latest", "version", "--prefer-online"],
+      {
+        encoding: "utf8",
+        stdio: ["ignore", "pipe", "ignore"],
+        timeout: 30_000,
+      },
+    );
+    return /^\d+\.\d+\.\d+\S*$/.exec(out.trim())?.[0] ?? null;
+  } catch {
+    return null;
+  }
+}
+
 async function update() {
-  log("updating @dylanpiercey/work");
   const before = serviceCli();
-  // `--prefer-online`: npm serves `latest` from a cached packument for a
-  // few minutes after a publish, so an update right behind a release
-  // reinstalled the version already running.
-  // Under --json, npm's own output goes to stderr: stdout is setup's JSON.
-  const stdio = jsonOut ? ["inherit", 2, 2] : "inherit";
-  sh(
-    "npm",
-    [
-      "install",
-      "-g",
-      "--prefer-online",
-      ...allowScriptsArgs(),
-      "@dylanpiercey/work@latest",
-    ],
-    { stdio },
+  const root = execFileSync("npm", ["root", "-g"], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", 2],
+  }).trim();
+  const cli = path.join(root, "@dylanpiercey", "work", "bin", "work.mjs");
+  const had = installAt(cli)?.version ?? null;
+  // The release by its number: for a minute or two after a publish the
+  // metadata `npm install` reads can still name the one before, even
+  // `--prefer-online`, and `@latest` then reinstalled the release already
+  // running and called it an update. A number npm cannot find yet fails
+  // instead, and is asked for again until the registry has caught up.
+  const want = latestRelease();
+  log(`updating @dylanpiercey/work${want ? ` to ${want}` : ""}`);
+  const allow = allowScriptsArgs();
+  for (let attempt = 1; ; attempt++) {
+    // Under --json, npm's own output goes to stderr: stdout is setup's
+    // JSON. Its stderr is read for the not-found, then passed on.
+    const r = spawnSync(
+      "npm",
+      [
+        "install",
+        "-g",
+        "--prefer-online",
+        ...allow,
+        `@dylanpiercey/work@${want ?? "latest"}`,
+      ],
+      { stdio: ["inherit", jsonOut ? 2 : "inherit", "pipe"], encoding: "utf8" },
+    );
+    process.stderr.write(r.stderr || "");
+    if (r.status === 0) break;
+    const notYet = want && /\bETARGET\b|No matching version/.test(r.stderr);
+    if (!notYet)
+      die(`npm install -g failed${r.error ? `: ${r.error.message}` : ""}`);
+    if (attempt === 8)
+      die(
+        `npm still cannot find ${want}, the release the registry names latest: run \`work update\` again in a few minutes`,
+      );
+    log(
+      `npm does not have ${want} yet (it was just published); asking again in 15s`,
+    );
+    await new Promise((r) => setTimeout(r, 15_000));
+  }
+  const got = installAt(cli)?.version ?? null;
+  if (!got) die(`npm installed into ${root}, but there is no ${cli}`);
+  if (want && got !== want)
+    warn(
+      `npm installed ${got}, not ${want}, the release the registry names latest`,
+    );
+  log(
+    got === had
+      ? `${got} was already installed; setting it up again`
+      : `installed ${got}${had ? ` (was ${had})` : ""}`,
   );
   // Finish with the CLI that npm just installed, found where that npm
   // installs, never `work` by name: the npm and the `work` first on PATH
   // can be two nodes' (a Homebrew npm ahead of mise's shims), and the
   // other install's setup points the service back at itself, so every
   // update left the service on the old release.
-  const root = execFileSync("npm", ["root", "-g"], {
-    encoding: "utf8",
-    stdio: ["ignore", "pipe", 2],
-  }).trim();
-  const cli = path.join(root, "@dylanpiercey", "work", "bin", "work.mjs");
-  if (!fs.existsSync(cli))
-    die(`npm installed into ${root}, but there is no ${cli}`);
   sh(cli, [
     "setup",
     ...(yes ? ["--yes"] : []),

package/dist/{_BwqJGTg-.js → _DIwr1RBh.js}

@@ -83,34 +83,34 @@ var toastTitle = {
 	warn: "_w",
 	info: "_x"
 };
-var tocDot = "_cS _ba";
+var tocDot = "_de _ba";
 //#endregion
 //#region src/tags/settings-agents.css.ts
-var agentRow = "_fF _em";
-var list$3 = "_eq _dj _el _eo";
-var metaChip = "_eE _bz _by";
-var sectionCount = "_dg _bp _bq";
-var usageNote = "_kb _by";
-var pop$2 = "_gh _bN";
-var spinner = "_gk _bD _bi";
-var toolLead = "_f3 _ez";
-var name$4 = "_fX _ez";
-var desc$1 = "_fY _eA";
+var agentRow = "_eU _dK";
+var list$3 = "_dO _dw _dJ _dM";
+var metaChip = "_d2 _bz _by";
+var sectionCount = "_dt _bp _bq";
+var usageNote = "_ke _by";
+var pop$2 = "_hw _bN";
+var spinner = "_hz _bD _bi";
+var toolLead = "_gZ _dX";
+var name$4 = "_gT _dX";
+var desc$1 = "_gU _dY";
 //#endregion
 //#region src/tags/lsp-add-dialog.css.ts
-var addDlg = "_kR _b4";
-var key$1 = "_mi _mg";
-var addTile = "_mk _mg";
-var field$2 = "_mv _bA";
-var keyField = "_mw _mv _bA";
-var labelField = "_mx _mv _bA";
-var detailsToggle = "_hi _6";
-var themeSeg = "_fj _bR";
-var checkList = "_gK _dh";
+var addDlg = "_mh _bV";
+var key$1 = "_lQ _lO";
+var addTile = "_lS _lO";
+var field$2 = "_l3 _bA";
+var keyField = "_l4 _l3 _bA";
+var labelField = "_l5 _l3 _bA";
+var detailsToggle = "_gd _6";
+var themeSeg = "_fw _bR";
+var checkList = "_hh _du";
 //#endregion
 //#region src/tags/prompt-dialog.css.ts
-var promptDlg = "_b8 _b4";
-var item$1 = "_b0 _D";
+var promptDlg = "_bZ _bV";
+var item$1 = "_b6 _D";
 var glance = "_dG _D";
 //#endregion
 //#region src/tags/side-nav.css.ts
@@ -119,62 +119,62 @@ var settingsDot = "_b_ _bQ";
 var notifyBtn = "_ce _D";
 //#endregion
 //#region src/styles/session-pop.css.ts
-var sessionPop = "_cr _bN";
-var sessionPopBtn = "_cs _bk";
-var wsBtn = "_eY _bk";
-var rowIcon = "_e0 _bF _D";
-var prChip = "_mI _M _mC";
+var sessionPop = "_cg _bN";
+var sessionPopBtn = "_ch _bk";
+var wsBtn = "_e6 _bk";
+var rowIcon = "_e8 _bF _D";
+var prChip = "_lx _M _lr";
 //#endregion
 //#region src/tags/port-chip.css.ts
-var port = "_oJ _M _mC";
+var port = "_oL _M _lr";
 var depth = {
-	"1": "_ky",
-	"2": "_kz",
-	"3": "_kA"
+	"1": "_kO",
+	"2": "_kP",
+	"3": "_kQ"
 };
-var open = "_kG _bk";
-var action = "_kL _bI _D";
-var toggle = "_eJ _6";
-var fold = "_eK _en";
+var open = "_kW _bk";
+var action = "_k1 _bI _D";
+var toggle = "_d7 _6";
+var fold = "_d8 _dL";
 var statusOf = {
-	queued: "_lY",
-	starting: "_lZ",
-	working: "_l0",
-	waiting: "_l1",
-	idle: "_l2",
-	done: "_l3",
-	closed: "_l4"
+	queued: "_mK",
+	starting: "_mL",
+	working: "_mM",
+	waiting: "_mN",
+	idle: "_mO",
+	done: "_mP",
+	closed: "_mQ"
 };
-var item = "_j2 _bk";
-var menu = "_nH _cr _bN";
-var menuItem = "_nJ _bk";
-var findBtn$1 = "_ir _ic _bG _D";
-var tool = "_ic _bG _D";
-var heldRefresh = "_ik _M";
-var pop$1 = "_m8 _cr _bN";
-var fileFilter = "_oN _F";
-var findInput = "_d6 _F";
-var keybarIconBtn = "_ee _bI _D";
-var input = "_du _F";
-var group = "_dx _6";
-var hint$1 = "_nq _bp _3";
+var item = "_kr _bk";
+var menu = "_nc _cg _bN";
+var menuItem = "_ne _bk";
+var findBtn$1 = "_jh _ih _bG _D";
+var tool = "_ih _bG _D";
+var heldRefresh = "_ip _M";
+var pop$1 = "_no _cg _bN";
+var fileFilter = "_oP _F";
+var findInput = "_ex _F";
+var keybarIconBtn = "_eG _bI _D";
+var input = "_cN _F";
+var group = "_cQ _6";
+var hint$1 = "_nz _bp _3";
 var sheetDir = "_n6 _bP";
-var upBtn = "_jh _bG _D";
-var findBtn = "_jl _ic _bG _D";
-var goBtn = "_jm _ic _bG _D";
-var note = "_nl _by";
+var upBtn = "_iC _bG _D";
+var findBtn = "_iG _ih _bG _D";
+var goBtn = "_iH _ih _bG _D";
+var note = "_mo _by";
 //#endregion
 //#region src/tags/manage-workspace.css.ts
-var procCmd = "_ht _ez";
-var factCopy = "_hA _bI _D";
-var resultRow = "_k6 _bk";
-var resultBranch = "_k7 _eE _bz _by _bF _D";
-var urlAction = "_k8 _eE _bz _by _eF";
-var curRow = "_fR _et";
+var procCmd = "_gE _dX";
+var factCopy = "_gL _bI _D";
+var resultRow = "_lc _bk";
+var resultBranch = "_ld _d2 _bz _by _bF _D";
+var urlAction = "_le _d2 _bz _by _d3";
+var curRow = "_gs _dR";
 //#endregion
 //#region src/tags/join-dialog.css.ts
-var dlg = "_mX _b4";
-var hint = "_mY _by";
+var dlg = "_l_ _bV";
+var hint = "_ma _by";
 var kbtn = "_cD _bH _D";
 var repeat = "_cG _cF";
 var dpadUser = "_cJ _cF";