@backtomyfuture/exchange-cli 0.2.4 → 0.2.6

package/bin/exchange-cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const { execFileSync } = require('child_process');
+const { spawn } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 
@@ -16,32 +16,65 @@ const PLATFORM_PACKAGES = {
 const platformKey = `${process.platform}-${process.arch}`;
 const ext = process.platform === 'win32' ? '.exe' : '';
 
+function renderError(message, code = 'BINARY_NOT_FOUND', exitCode = 1) {
+  const isText =
+    process.argv.includes('--format=text') ||
+    (process.argv.indexOf('--format') !== -1 &&
+      process.argv[process.argv.indexOf('--format') + 1] === 'text');
+  if (isText) {
+    console.error(`Error [${code}]: ${message}`);
+  } else {
+    console.log(
+      JSON.stringify({
+        ok: false,
+        error: message,
+        code: code,
+        retryable: false,
+      })
+    );
+  }
+  process.exit(exitCode);
+}
+
 function getBinaryPath() {
   if (process.env.EXCHANGE_CLI_BINARY) {
-    return process.env.EXCHANGE_CLI_BINARY;
+    const customBin = process.env.EXCHANGE_CLI_BINARY;
+    if (!fs.existsSync(customBin)) {
+      renderError(
+        `exchange-cli: binary not found at EXCHANGE_CLI_BINARY: ${customBin}`,
+        'BINARY_NOT_FOUND',
+        1
+      );
+    }
+    return customBin;
   }
 
   const pkg = PLATFORM_PACKAGES[platformKey];
   if (!pkg) {
-    console.error(`exchange-cli: unsupported platform ${platformKey}`);
-    process.exit(1);
+    renderError(`exchange-cli: unsupported platform ${platformKey}`, 'PLATFORM_NOT_SUPPORTED', 1);
   }
 
   try {
     return require.resolve(`${pkg}/bin/exchange-cli${ext}`);
   } catch {
-    const modPath = path.join(
-      path.dirname(require.resolve(`${pkg}/package.json`)),
-      `bin/exchange-cli${ext}`
-    );
-    if (fs.existsSync(modPath)) {
-      return modPath;
+    try {
+      const modPath = path.join(
+        path.dirname(require.resolve(`${pkg}/package.json`)),
+        `bin/exchange-cli${ext}`
+      );
+      if (fs.existsSync(modPath)) {
+        return modPath;
+      }
+    } catch {
+      // Ignore require failure
     }
   }
 
-  console.error(`exchange-cli: binary not found for ${platformKey}`);
-  console.error('Try: npm install --force @backtomyfuture/exchange-cli');
-  process.exit(1);
+  renderError(
+    `exchange-cli: binary not found for ${platformKey}. Try: npm install --force @backtomyfuture/exchange-cli`,
+    'BINARY_NOT_FOUND',
+    1
+  );
 }
 
 try {
@@ -50,13 +83,48 @@ try {
     const { ensureDarwinArm64RuntimeLayout } = require('./runtime-layout');
     ensureDarwinArm64RuntimeLayout(binaryPath);
   }
-  execFileSync(binaryPath, process.argv.slice(2), {
+
+  const child = spawn(binaryPath, process.argv.slice(2), {
     stdio: 'inherit',
     env: { ...process.env },
   });
+
+  child.on('error', (err) => {
+    renderError(
+      `exchange-cli: failed to spawn binary: ${err.message}`,
+      'BINARY_NOT_FOUND',
+      1
+    );
+  });
+
+  const forwardSignal = (signal) => {
+    if (child && !child.killed && child.pid) {
+      try {
+        child.kill(signal);
+      } catch {
+        // Child already exited
+      }
+    }
+  };
+
+  process.on('SIGINT', () => forwardSignal('SIGINT'));
+  process.on('SIGTERM', () => forwardSignal('SIGTERM'));
+  process.on('SIGHUP', () => forwardSignal('SIGHUP'));
+
+  child.on('exit', (code, signal) => {
+    if (signal) {
+      process.removeAllListeners('SIGINT');
+      process.removeAllListeners('SIGTERM');
+      process.removeAllListeners('SIGHUP');
+      try {
+        process.kill(process.pid, signal);
+      } catch {
+        process.exit(128 + 15);
+      }
+    } else {
+      process.exit(code ?? 0);
+    }
+  });
 } catch (e) {
-  if (e && e.status != null) {
-    process.exit(e.status);
-  }
-  throw e;
+  renderError(`exchange-cli wrapper error: ${e.message || e}`, 'WRAPPER_ERROR', 1);
 }

package/bin/runtime-layout.js

@@ -30,15 +30,54 @@ function copyDirRecursive(srcDir, dstDir) {
   }
 }
 
-function copyIfMissing(src, dst, logger) {
+let inMemoryLayoutChecked = false;
+
+function linkOrCopyFile(src, dst) {
+  fs.mkdirSync(path.dirname(dst), { recursive: true });
+  // Try hardlink first (fast, zero extra disk space, works on same filesystem)
+  try {
+    fs.linkSync(src, dst);
+    return;
+  } catch {
+    // Fall back to relative symlink
+    try {
+      const rel = path.relative(path.dirname(dst), src);
+      fs.symlinkSync(rel, dst);
+      return;
+    } catch {
+      // Fall back to file copy
+      fs.copyFileSync(src, dst);
+    }
+  }
+  try {
+    const stat = fs.statSync(src);
+    fs.chmodSync(dst, stat.mode & 0o777);
+  } catch {
+    // Best effort only.
+  }
+}
+
+function linkOrCopyDir(srcDir, dstDir) {
+  fs.mkdirSync(path.dirname(dstDir), { recursive: true });
+  // Try symlink first for directories (like Versions/Current -> 3.12)
+  try {
+    const rel = path.relative(path.dirname(dstDir), srcDir);
+    fs.symlinkSync(rel, dstDir, 'junction');
+    return;
+  } catch {
+    copyDirRecursive(srcDir, dstDir);
+  }
+}
+
+function linkOrCopyIfMissing(src, dst, logger) {
   if (fs.existsSync(dst) || !fs.existsSync(src)) {
     return false;
   }
   const stat = fs.statSync(src);
   if (stat.isDirectory()) {
-    copyDirRecursive(src, dst);
+    linkOrCopyDir(src, dst);
   } else {
-    copyFileWithMode(src, dst);
+    linkOrCopyFile(src, dst);
   }
   if (logger) {
     logger(`exchange-cli: repaired missing runtime path ${path.basename(dst)}`);
@@ -70,17 +109,29 @@ function resolveFrameworkVersionDir(internalDir) {
 }
 
 function ensureDarwinArm64RuntimeLayout(binaryPath, logger = null) {
+  if (inMemoryLayoutChecked) {
+    return { changed: false };
+  }
   if (!(process.platform === 'darwin' && process.arch === 'arm64')) {
+    inMemoryLayoutChecked = true;
     return { changed: false };
   }
   const binDir = path.dirname(binaryPath);
   const internalDir = path.join(binDir, '_internal');
   if (!fs.existsSync(internalDir)) {
+    inMemoryLayoutChecked = true;
+    return { changed: false };
+  }
+
+  const markerPath = path.join(internalDir, '.runtime_layout_ok');
+  if (fs.existsSync(markerPath)) {
+    inMemoryLayoutChecked = true;
     return { changed: false };
   }
 
   const frameworkVersionDir = resolveFrameworkVersionDir(internalDir);
   if (!frameworkVersionDir) {
+    inMemoryLayoutChecked = true;
     return { changed: false };
   }
   const sourcePython = path.join(frameworkVersionDir, 'Python');
@@ -98,7 +149,7 @@ function ensureDarwinArm64RuntimeLayout(binaryPath, logger = null) {
 
   let changed = false;
   for (const target of targets) {
-    changed = copyIfMissing(target.src, target.dst, logger) || changed;
+    changed = linkOrCopyIfMissing(target.src, target.dst, logger) || changed;
   }
 
   try {
@@ -106,6 +157,14 @@ function ensureDarwinArm64RuntimeLayout(binaryPath, logger = null) {
   } catch {
     // Best effort only.
   }
+
+  try {
+    fs.writeFileSync(markerPath, '');
+  } catch {
+    // Best effort only.
+  }
+
+  inMemoryLayoutChecked = true;
   return { changed };
 }
 

package/package.json

@@ -1,24 +1,24 @@
 {
   "name": "@backtomyfuture/exchange-cli",
-  "version": "0.2.4",
-  "description": "On-premises Exchange Server CLI for email, calendar, tasks, and contacts.",
+  "version": "0.2.6",
+  "description": "Cross-platform CLI for on-premises Microsoft Exchange Server",
   "bin": {
-    "exchange-cli": "bin/exchange-cli.js"
+    "exchange-cli": "./bin/exchange-cli.js"
   },
   "scripts": {
-    "postinstall": "node install.js"
+    "postinstall": "node ./install.js"
   },
   "files": [
     "bin/",
     "install.js"
   ],
   "optionalDependencies": {
-    "@backtomyfuture/exchange-cli-darwin-arm64": "0.2.4",
-    "@backtomyfuture/exchange-cli-darwin-x64": "0.2.4",
-    "@backtomyfuture/exchange-cli-linux-x64": "0.2.4",
-    "@backtomyfuture/exchange-cli-linux-arm64": "0.2.4",
-    "@backtomyfuture/exchange-cli-win32-x64": "0.2.4",
-    "@backtomyfuture/exchange-cli-win32-ia32": "0.2.4"
+    "@backtomyfuture/exchange-cli-darwin-arm64": "0.2.6",
+    "@backtomyfuture/exchange-cli-darwin-x64": "0.2.6",
+    "@backtomyfuture/exchange-cli-linux-x64": "0.2.6",
+    "@backtomyfuture/exchange-cli-linux-arm64": "0.2.6",
+    "@backtomyfuture/exchange-cli-win32-x64": "0.2.6",
+    "@backtomyfuture/exchange-cli-win32-ia32": "0.2.6"
   },
   "engines": {
     "node": ">=14"