joinweave 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "joinweave",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "type": "module",
   "description": "One command to join the Weave agent-native web.",
   "license": "MIT OR Apache-2.0",
@@ -13,7 +13,9 @@
   "files": [
     "bin",
     "src",
-    "README.md"
+    "README.md",
+    "LICENSE-APACHE",
+    "LICENSE-MIT"
   ],
   "dependencies": {
     "@useweave/cli": "0.1.0"

package/src/installer.js

@@ -4,7 +4,10 @@ import { resolve, join, dirname, isAbsolute, parse } from 'node:path';
 import { createHash, randomUUID } from 'node:crypto';
 import { execFile } from 'node:child_process';
 
-export const VERSION = '0.1.0';
+export const VERSION = '0.1.1';
+const NATIVE_PACKAGE_VERSION = '0.1.0';
+// Published native0.1.0 treats this as its service-ownership protocol version.
+const RECEIPT_VERSION = '0.1.0';
 const PATH_BEGIN = '# >>> joinweave managed PATH >>>';
 const PATH_END = '# <<< joinweave managed PATH <<<' ;
 const MCP_BEGIN = '# >>> joinweave managed MCP >>>';
@@ -124,7 +127,7 @@ const systemdPath = (value) => value.replaceAll('%', '%%');
 const shellQuote = (value) => `'${value.replaceAll("'", "'\\''")}'`;
 
 export class Installer {
-  constructor({ home = homedir(), weaveHome = process.env.WEAVE_HOME || join(home, '.weave'), platform = process.platform, uid = process.getuid?.(), env = process.env, run = runCommand, resolveNative, confirm = async () => false, progress = () => {}, sleep = (ms) => new Promise((done) => setTimeout(done, ms)) } = {}) {
+  constructor({ home = homedir(), weaveHome = process.env.WEAVE_HOME || join(home, '.weave'), platform = process.platform, uid = process.getuid?.(), env = process.env, run = runCommand, resolveNative, confirm = async () => false, progress = () => {}, sleep = (ms) => new Promise((done) => setTimeout(done, ms)), now = Date.now } = {}) {
     this.home = resolve(home);
     this.weaveHome = resolve(weaveHome);
     if ([this.home, this.weaveHome].some((path) => /[\x00-\x1f\x7f]/.test(path))) fail('UNSAFE_PATH', 'Workspace and home paths cannot contain control characters.');
@@ -139,16 +142,17 @@ export class Installer {
     this.confirm = confirm;
     this.progress = progress;
     this.sleep = sleep;
+    this.now = now;
     this.binary = join(this.weaveHome, 'bin', 'weave');
     this.manifestPath = join(this.weaveHome, '.joinweave-install.json');
     this.lockPath = join(this.weaveHome, '.joinweave-install.lock');
-    this.manifest = { schema: 1, installer: 'joinweave', version: VERSION, binary: null, service: null, path: null, mcp: {} };
+    this.manifest = { schema: 1, installer: 'joinweave', version: RECEIPT_VERSION, installerVersion: VERSION, binary: null, service: null, path: null, mcp: {} };
     this.warnings = [];
     this.manualMcp = [];
   }
 
   validatePlatform() {
-    if (!['darwin', 'linux'].includes(this.platform)) fail('UNSUPPORTED_PLATFORM', 'joinweave 0.1.0 supports macOS and Linux. Windows service installation is not supported yet.');
+    if (!['darwin', 'linux'].includes(this.platform)) fail('UNSUPPORTED_PLATFORM', `joinweave ${VERSION} supports macOS and Linux. Windows service installation is not supported yet.`);
   }
 
   loadManifest() {
@@ -161,7 +165,8 @@ export class Installer {
   }
 
   saveManifest() {
-    this.manifest.version = VERSION;
+    this.manifest.version = RECEIPT_VERSION;
+    this.manifest.installerVersion = VERSION;
     atomicWrite(this.manifestPath, Buffer.from(`${JSON.stringify(this.manifest, null, 2)}\n`), { previous: readFile(this.manifestPath) });
   }
 
@@ -213,7 +218,7 @@ export class Installer {
     if (old && (!this.manifest.binary || digest(old) !== this.manifest.binary.sha256)) fail('UNMANAGED_BINARY', `An unrelated or modified executable exists at ${this.binary}. It will not be replaced.`);
     if (!old || digest(old) !== sha256) atomicWrite(this.binary, bytes, { previous: old, mode: 0o755 });
     fs.chmodSync(this.binary, 0o755);
-    this.manifest.binary = { sha256, version: VERSION };
+    this.manifest.binary = { sha256, version: NATIVE_PACKAGE_VERSION };
     this.saveManifest();
     this.progress('Installed Weave');
   }
@@ -236,20 +241,31 @@ export class Installer {
     return { path: join(this.home, '.config', 'systemd', 'user', 'weave-node.service'), bytes: Buffer.from(`[Unit]\nDescription=Weave peer node\nAfter=network.target\n\n[Service]\nType=simple\nExecStart=${systemdQuote(this.binary, true)} node run\n${entries}WorkingDirectory=${systemdPath(this.weaveHome)}\nRestart=on-failure\nRestartSec=5\nStandardOutput=append:${systemdPath(logPath)}\nStandardError=append:${systemdPath(logPath)}\n\n[Install]\nWantedBy=default.target\n`) };
   }
 
-  async serviceCommand(args, required = true) {
+  async serviceCommand(args, required = true, timeout = 30_000) {
     const command = this.platform === 'darwin' ? 'launchctl' : 'systemctl';
-    const result = await this.run(command, args, { env: this.env, timeout: 30_000 });
+    const result = await this.run(command, args, { env: this.env, timeout });
     if (required && result.code !== 0) fail('SERVICE_COMMAND_FAILED', `${command} ${args.join(' ')} failed. Confirm a logged-in user service session is available; use --no-service for a detached node.`);
     return result;
   }
 
   async stopService() {
     if (this.platform === 'darwin') {
-      await this.serviceCommand(['bootout', `gui/${this.uid}/${serviceName}`], false);
-      const status = await this.serviceCommand(['print', `gui/${this.uid}/${serviceName}`], false);
-      if (status.code === 0) fail('SERVICE_STOP_FAILED', 'The launchd node remains registered. Its binary and configuration were preserved.');
-      const missing = `Could not find service "${serviceName}" in domain for user gui: ${this.uid}`;
-      if (status.code !== 113 || !status.stderr.includes(missing)) fail('SERVICE_STOP_UNKNOWN', 'Could not verify launchd shutdown. Its binary and configuration were preserved.');
+      const deadline = this.now() + 10_000;
+      const timeoutMessage = 'Timed out waiting for launchd deregistration. Its binary and configuration were preserved.';
+      await this.serviceCommand(['bootout', `gui/${this.uid}/${serviceName}`], false, 10_000);
+      for (;;) {
+        const remaining = deadline - this.now();
+        if (remaining <= 0) fail('SERVICE_STOP_FAILED', timeoutMessage);
+        const status = await this.serviceCommand(['print', `gui/${this.uid}/${serviceName}`], false, remaining);
+        const checkedAt = this.now();
+        if (checkedAt >= deadline) fail('SERVICE_STOP_FAILED', timeoutMessage);
+        if (status.code !== 0) {
+          const missing = `Could not find service "${serviceName}" in domain for user gui: ${this.uid}`;
+          if (status.code !== 113 || !status.stderr.includes(missing)) fail('SERVICE_STOP_UNKNOWN', 'Could not verify launchd shutdown. Its binary and configuration were preserved.');
+          break;
+        }
+        await this.sleep(Math.min(100, deadline - checkedAt));
+      }
     } else {
       await this.serviceCommand(['--user', 'disable', '--now', 'weave-node.service'], false);
       const status = await this.serviceCommand(['--user', 'is-active', '--quiet', 'weave-node.service'], false);