npm - @mmmbuto/nexuscrew - Versions diffs - 0.8.34 → 0.8.36 - Mend

@mmmbuto/nexuscrew 0.8.34 → 0.8.36

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/CHANGELOG.md +40 -0
package/README.md +29 -1
package/frontend/dist/assets/{index-CrggFFKZ.css → index-5PMZjYKR.css} +1 -1
package/frontend/dist/assets/index-DTYcphMi.js +93 -0
package/frontend/dist/index.html +2 -2
package/frontend/dist/version.json +1 -1
package/lib/cli/fleet-service.js +22 -7
package/lib/cli/service.js +107 -7
package/lib/settings/routes.js +5 -7
package/package.json +1 -1
package/frontend/dist/assets/index-cNTOIj7e.js +0 -93

package/frontend/dist/index.html CHANGED Viewed

@@ -11,8 +11,8 @@
   <meta name="apple-mobile-web-app-title" content="NexusCrew" />
   <link rel="manifest" href="/manifest.json" />
   <title>NexusCrew</title>
-  <script type="module" crossorigin src="/assets/index-cNTOIj7e.js"></script>
-  <link rel="stylesheet" crossorigin href="/assets/index-CrggFFKZ.css">
+  <script type="module" crossorigin src="/assets/index-DTYcphMi.js"></script>
+  <link rel="stylesheet" crossorigin href="/assets/index-5PMZjYKR.css">
 </head>
 <body>
   <div id="root"></div>

package/frontend/dist/version.json CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":"0.8.34"}
1	+ {"version":"0.8.36"}

package/lib/cli/fleet-service.js CHANGED Viewed

@@ -24,6 +24,7 @@ const path = require('node:path');
 const { execFileSync } = require('node:child_process');
 const {
   escapeSystemdPath, escapeSystemdExec, escapeXml, shellQuote, assertSystemdSafe,
+  reinstallLaunchAgent,
 } = require('./service.js');
 const { uid } = require('./platform.js');
@@ -237,7 +238,13 @@ function fleetInstallCommands(platform, target, ctx) {
 // Install no-symlink + atomic rename (come service.js). execImpl iniettabile per test;
 // default execFileSync (argv diretto, MAI shell string). Su activation fallita il file
 // e' PRESERVATO e le failure raccolte per diagnosi (M1: non si ingoia, non si rollback).
-function installFleetService(platform, content, ctx, { dryRun = false, execImpl = execFileSync } = {}) {
+function installFleetService(platform, content, ctx, {
+  dryRun = false,
+  execImpl = execFileSync,
+  sleepImpl,
+  launchdWaitAttempts,
+  launchdWaitMs,
+} = {}) {
   const home = ctx.home || os.homedir();
   const target = ctx.installPath || fleetInstallPath(platform, home);
   const mode = fleetFileMode(platform);
@@ -268,13 +275,21 @@ function installFleetService(platform, content, ctx, { dryRun = false, execImpl
   }
   // exec service manager — raccogli failure per diagnosi (NON ingoiare, M1)
-  const cmds = fleetInstallCommands(platform, target, ctx);
   const failures = [];
-  for (const [bin, args] of cmds) {
-    try { execImpl(bin, args, { stdio: 'ignore' }); }
-    catch (e) {
-      if (platform === 'mac' && bin === 'launchctl' && args[0] === 'bootout') continue;
-      failures.push({ cmd: `${bin} ${args.join(' ')}`, error: e.message });
+  if (platform === 'mac') {
+    failures.push(...reinstallLaunchAgent(target, 'com.mmmbuto.nexuscrew-fleet', ctx, {
+      execImpl,
+      sleepImpl,
+      waitAttempts: launchdWaitAttempts,
+      waitMs: launchdWaitMs,
+    }));
+  } else {
+    const cmds = fleetInstallCommands(platform, target, ctx);
+    for (const [bin, args] of cmds) {
+      try { execImpl(bin, args, { stdio: 'ignore' }); }
+      catch (e) {
+        failures.push({ cmd: `${bin} ${args.join(' ')}`, error: e.message });
+      }
     }
   }

package/lib/cli/service.js CHANGED Viewed

@@ -8,6 +8,10 @@ const crypto = require('node:crypto');
 const { execFileSync } = require('node:child_process');
 const { detectPlatform, uid } = require('./platform.js');
+const LAUNCHD_SLEEP_BUFFER = new Int32Array(new SharedArrayBuffer(4));
+const DEFAULT_LAUNCHD_WAIT_ATTEMPTS = 100;
+const DEFAULT_LAUNCHD_WAIT_MS = 50;
 // --- Escaping helpers ---
 // systemd WorkingDirectory: escape % (percent specifier). Spazi ok.
@@ -220,12 +224,91 @@ function ensureLinuxTmuxSurvival(opts = {}) {
   return { target, written, killMode: effective };
 }
+function sleepSync(ms) {
+  if (ms > 0) Atomics.wait(LAUNCHD_SLEEP_BUFFER, 0, 0, ms);
+}
+function normalizedWaitAttempts(value) {
+  const parsed = Number(value);
+  return Number.isFinite(parsed) && parsed >= 1
+    ? Math.floor(parsed)
+    : DEFAULT_LAUNCHD_WAIT_ATTEMPTS;
+}
+function normalizedWaitMs(value) {
+  const parsed = Number(value);
+  return Number.isFinite(parsed) && parsed >= 0
+    ? parsed
+    : DEFAULT_LAUNCHD_WAIT_MS;
+}
+// `launchctl bootout` can return while a running KeepAlive job is still being
+// removed. An immediate bootstrap then fails and leaves the service unloaded.
+// Poll the launchd namespace with a bounded wait before loading the new plist.
+function waitForLaunchdUnload(label, opts = {}) {
+  const execImpl = opts.execImpl || execFileSync;
+  const sleepImpl = opts.sleepImpl || sleepSync;
+  const attempts = normalizedWaitAttempts(opts.attempts);
+  const delayMs = normalizedWaitMs(opts.delayMs);
+  for (let attempt = 0; attempt < attempts; attempt += 1) {
+    try {
+      execImpl('launchctl', ['print', label], { stdio: 'ignore' });
+    } catch (_) {
+      return true;
+    }
+    if (attempt + 1 < attempts) sleepImpl(delayMs);
+  }
+  return false;
+}
+function reinstallLaunchAgent(target, serviceName, ctx, opts = {}) {
+  const execImpl = opts.execImpl || execFileSync;
+  const domain = `gui/${ctx.uid || uid()}`;
+  const label = `${domain}/${serviceName}`;
+  const waitAttempts = normalizedWaitAttempts(opts.waitAttempts);
+  const waitMs = normalizedWaitMs(opts.waitMs);
+  let bootoutSucceeded = false;
+  try {
+    execImpl('launchctl', ['bootout', label], { stdio: 'ignore' });
+    bootoutSucceeded = true;
+  } catch (_) {
+    // Idempotent when the job is not loaded; bootstrap below remains authoritative.
+  }
+  if (bootoutSucceeded && !waitForLaunchdUnload(label, {
+    execImpl,
+    sleepImpl: opts.sleepImpl,
+    attempts: waitAttempts,
+    delayMs: waitMs,
+  })) {
+    return [{
+      cmd: `launchctl print ${label}`,
+      error: `launchd job still loaded after ${waitAttempts} checks following successful bootout`,
+    }];
+  }
+  try {
+    execImpl('launchctl', ['bootstrap', domain, target], { stdio: 'ignore' });
+    return [];
+  } catch (error) {
+    return [{
+      cmd: `launchctl bootstrap ${domain} ${target}`,
+      error: error.message,
+    }];
+  }
+}
 // Install no-symlink + atomic rename. [M3]
 // - lstat target: reject symlink (no follow)
 // - write temp file nella stessa dir -> chmod mode -> atomic rename
 // - exec service manager (systemctl/launchctl); skip in dryRun
 // execImpl per test (default execFileSync).
-function installService(platform, content, ctx, { dryRun = false, execImpl = execFileSync } = {}) {
+function installService(platform, content, ctx, {
+  dryRun = false,
+  execImpl = execFileSync,
+  sleepImpl,
+  launchdWaitAttempts,
+  launchdWaitMs,
+  activate = true,
+} = {}) {
   const home = ctx.home || os.homedir();
   const target = ctx.installPath || installPath(platform, home);
   const mode = fileMode(platform);
@@ -263,13 +346,29 @@ function installService(platform, content, ctx, { dryRun = false, execImpl = exe
   // exec service manager — NON ingoiare failure (M1): raccogli per diagnosi
   const cmds = installCommands(platform, target, ctx);
+  if (!activate) {
+    return {
+      target,
+      mode,
+      written: true,
+      failures: [],
+      skippedActivation: cmds.map(([bin, args]) => `${bin} ${args.join(' ')}`),
+    };
+  }
   const failures = [];
-  for (const [bin, args] of cmds) {
-    try { execImpl(bin, args, { stdio: 'ignore' }); }
-    catch (e) {
-      // bootout e' idempotente: un job non ancora caricato non e' un errore di installazione.
-      if (platform === 'mac' && bin === 'launchctl' && args[0] === 'bootout') continue;
-      failures.push({ cmd: `${bin} ${args.join(' ')}`, error: e.message });
+  if (platform === 'mac') {
+    failures.push(...reinstallLaunchAgent(target, 'com.mmmbuto.nexuscrew', ctx, {
+      execImpl,
+      sleepImpl,
+      waitAttempts: launchdWaitAttempts,
+      waitMs: launchdWaitMs,
+    }));
+  } else {
+    for (const [bin, args] of cmds) {
+      try { execImpl(bin, args, { stdio: 'ignore' }); }
+      catch (e) {
+        failures.push({ cmd: `${bin} ${args.join(' ')}`, error: e.message });
+      }
     }
   }
@@ -303,6 +402,7 @@ module.exports = {
   generateService, generateLinux, generateMac, generateTermux,
   installService, installPath, installCommands, fileMode,
   ensureLinuxTmuxSurvival, linuxTmuxSurvivalPath, LINUX_TMUX_SURVIVAL_DROPIN,
+  reinstallLaunchAgent, waitForLaunchdUnload,
   escapeSystemdPath, escapeSystemdExec, escapeXml, shellQuote,
   assertSystemdSafe, SYSTEMD_FORBIDDEN,
 };

package/lib/settings/routes.js CHANGED Viewed

@@ -749,9 +749,9 @@ function settingsRoutes(deps = {}) {
   // --- POST /service/regenerate — rigenera l'unit service --------------------
   // Riusa generateService/installService (lib/cli/service.js: escaping per-platform,
-  // no-symlink, tmp+rename atomico). L'execImpl e' un NO-OP che registra i comandi
-  // di attivazione SENZA eseguirli: il contratto B2 vieta il restart automatico
-  // dall'API (la UI avvisa di riavviare a mano).
+  // no-symlink, tmp+rename atomico). activate:false registra il piano di attivazione
+  // SENZA eseguirlo: il contratto B2 vieta il restart automatico dall'API
+  // (la UI avvisa di riavviare a mano).
   r.post('/service/regenerate', mutGate, (_req, res) => {
     try {
       if (!bootState({ platform, execImpl: seams.execImpl, uid: seams.uid, home }).enabled) {
@@ -767,14 +767,12 @@ function settingsRoutes(deps = {}) {
         installPath: seams.serviceInstallPath,
       };
       const content = generateService(platform, ctx);
-      const skipped = [];
-      const noExec = (bin, args) => { skipped.push(`${bin} ${(args || []).join(' ')}`); };
-      const out = installService(platform, content, ctx, { execImpl: noExec });
+      const out = installService(platform, content, ctx, { activate: false });
       send(res, 200, {
         regenerated: true,
         target: out.target,
         note: 'unit rigenerata; nessun restart automatico — riavvia il service per applicarla',
-        skippedActivation: skipped,
+        skippedActivation: out.skippedActivation,
       });
     } catch (e) { send(res, 500, { error: String(e.message || e) }); }
   });

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@mmmbuto/nexuscrew",
-  "version": "0.8.34",
+  "version": "0.8.36",
   "description": "Faithful browser tmux client — attach to live sessions over a real PTY, localhost-only, mobile-easy",
   "main": "lib/server.js",
   "bin": {