@inaiii/pi-remote-helper 0.3.0 → 0.3.1

package/cli/lock.mjs

@@ -2,28 +2,55 @@ import { constants } from 'node:fs';
 import { open } from 'node:fs/promises';
 import { spawn } from 'node:child_process';
 
+const lockMessages = {
+  MAINTENANCE_LOCK_FILE: 'Maintenance lock file is unsafe or inaccessible. Check private installation permissions and storage.',
+  MAINTENANCE_LOCK_UNAVAILABLE: 'Maintenance lock utility is unavailable. macOS requires lockf; Linux requires flock.',
+  MAINTENANCE_LOCK_BUSY: 'Another maintenance operation is active. Retry after it finishes; do not delete the lock file.',
+  MAINTENANCE_LOCK_FAILED: 'Maintenance lock did not become ready. Check the local lock and Unix shell utilities.',
+};
+
+export class MaintenanceLockError extends Error {
+  constructor(code) { super(lockMessages[code]); this.code = code; }
+}
+
 // Keep the inode: unlinking a released lock can let two callers lock different
 // files. Kernel ownership ends when the temporary holder loses its stdin pipe,
 // including when the maintenance process crashes.
 export async function acquireMaintenanceLock(path) {
-  const file = await open(path, constants.O_CREAT | constants.O_WRONLY | constants.O_NOFOLLOW, 0o600);
   try {
-    const info = await file.stat();
-    if (!info.isFile() || info.nlink !== 1 || info.uid !== process.getuid() || info.mode & 0o077) throw new Error('Invalid maintenance lock.');
-  } finally { await file.close(); }
-  const script = 'printf "ready\\n"; /bin/cat >/dev/null';
+    const file = await open(path, constants.O_CREAT | constants.O_WRONLY | constants.O_NOFOLLOW, 0o600);
+    try {
+      const info = await file.stat();
+      if (!info.isFile() || info.nlink !== 1 || typeof process.getuid !== 'function' || info.uid !== process.getuid() || info.mode & 0o077) throw new MaintenanceLockError('MAINTENANCE_LOCK_FILE');
+    } finally { await file.close(); }
+  } catch { throw new MaintenanceLockError('MAINTENANCE_LOCK_FILE'); }
+  const script = '[ -x /bin/cat ] || exit 69; printf "ready\\n"; exec /bin/cat >/dev/null';
   const holder = process.platform === 'darwin'
     ? spawn('/usr/bin/lockf', ['-k', '-t', '0', path, '/bin/sh', '-c', script], { stdio: ['pipe', 'pipe', 'ignore'] })
-    : spawn('flock', ['-n', path, '/bin/sh', '-c', script], { stdio: ['pipe', 'pipe', 'ignore'] });
+    : spawn('flock', ['-n', '-E', '75', path, '/bin/sh', '-c', script], { stdio: ['pipe', 'pipe', 'ignore'] });
   holder.stdin.on('error', () => {});
   const exited = new Promise(resolve => { holder.once('close', resolve); holder.once('error', resolve); });
   try {
     await new Promise((resolve, reject) => {
-      const timer = setTimeout(() => reject(new Error('Maintenance lock did not become ready.')), 5000);
-      const finish = (error) => { clearTimeout(timer); error ? reject(error) : resolve(); };
-      holder.stdout.once('data', () => finish());
-      holder.once('error', () => finish(new Error('Maintenance lock utility is unavailable.')));
-      holder.once('close', () => finish(new Error('Another maintenance operation is active.')));
+      const timer = setTimeout(() => finish(new MaintenanceLockError('MAINTENANCE_LOCK_FAILED')), 5000);
+      const finish = (error) => {
+        clearTimeout(timer);
+        holder.stdout.off('data', ready); holder.off('error', failed); holder.off('close', closed);
+        error ? reject(error) : resolve();
+      };
+      let output = '';
+      const ready = chunk => {
+        output += chunk.toString();
+        if (output === 'ready\n') finish();
+        else if (!'ready\n'.startsWith(output)) finish(new MaintenanceLockError('MAINTENANCE_LOCK_FAILED'));
+      };
+      const failed = error => finish(new MaintenanceLockError(error.code === 'ENOENT' ? 'MAINTENANCE_LOCK_UNAVAILABLE' : 'MAINTENANCE_LOCK_FAILED'));
+      // lockf uses EX_TEMPFAIL for contention; flock's conflict exit is set to
+      // the same value. Other early exits do not prove another owner exists.
+      const closed = code => finish(new MaintenanceLockError(code === 75 ? 'MAINTENANCE_LOCK_BUSY' : 'MAINTENANCE_LOCK_FAILED'));
+      holder.stdout.on('data', ready);
+      holder.once('error', failed);
+      holder.once('close', closed);
     });
   } catch (error) {
     holder.stdin.end();

package/native/darwin-arm64/manifest.json

@@ -1,11 +1,11 @@
 {
-  "version": "0.3.0",
+  "version": "0.3.1",
   "platform": "darwin",
   "arch": "arm64",
-  "gitCommit": "3b297d59d2392fa4f87a446ca217bb2ef6ec6a4e",
-  "builtAt": "2026-10-04T13:35:02.000Z",
+  "gitCommit": "100e480b2e58ee1e68fed4c1d34bc6db5b9f471f",
+  "builtAt": "2026-10-06T06:10:23.000Z",
   "sha256": {
-    "pi-remote-helper": "70f7190e16d959b2608b4d4db00e5d386e43ce50a087190398dcadab18083fd2",
-    "pi-remote-launch-wrapper": "234b635ecc752a5020506fdc91c2bb10adb188e3318200848f7a19ec1adc9c83"
+    "pi-remote-helper": "6724620b1b6055770448171ea2db67a9e841bd3b86dc5c17fa4f9f0f4a967860",
+    "pi-remote-launch-wrapper": "372b62c9c7f9e70b3d8575b13dc5b959187761486ce81acae8cacd0df6f35f8b"
   }
 }

package/native/darwin-x64/manifest.json

@@ -1,11 +1,11 @@
 {
-  "version": "0.3.0",
+  "version": "0.3.1",
   "platform": "darwin",
   "arch": "x64",
-  "gitCommit": "3b297d59d2392fa4f87a446ca217bb2ef6ec6a4e",
-  "builtAt": "2026-10-04T13:35:02.000Z",
+  "gitCommit": "100e480b2e58ee1e68fed4c1d34bc6db5b9f471f",
+  "builtAt": "2026-10-06T06:10:23.000Z",
   "sha256": {
-    "pi-remote-helper": "2e828d75410c5dad3f1dba4aef15137d13ab40281cb730826065ee65f14046a5",
-    "pi-remote-launch-wrapper": "977e56b0ed52fecfb5a28e534bdbdc69dca692ce7781dd18b8808324d8f25202"
+    "pi-remote-helper": "236d7bf79b775879ec873f2f24b6e8ba4201da31d0e2699602c8302f257e336e",
+    "pi-remote-launch-wrapper": "b3203f811753ab32ea92cad68fb4fed1cf3265355099bbcacff215d964524729"
   }
 }

package/package.json

@@ -31,6 +31,6 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "0.3.0",
-  "gitHead": "3b297d59d2392fa4f87a446ca217bb2ef6ec6a4e"
+  "version": "0.3.1",
+  "gitHead": "100e480b2e58ee1e68fed4c1d34bc6db5b9f471f"
 }