cwbridge 1.8.0 → 2.0.0

package/bin/cwbridge.exe

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/bin/cwbridge.exe
-size: 50913558 bytes
-sha256: 104a2481145e3d88594ce40c46fe0bcbc343eaa0a435744715976c9c8ffc75b3
+size: 51337789 bytes
+sha256: 013119a9f4092606338f36c6a865845aa61ab08f906cd5831dd7578609be53db

package/bin/cwbridge.js

@@ -4,12 +4,91 @@
 const fs = require("node:fs");
 const https = require("node:https");
 const path = require("node:path");
-const { spawnSync } = require("node:child_process");
+const { spawnSync, execFileSync } = require("node:child_process");
 
 const packageInfo = require("../package.json");
 const UPDATE_CHECK_MS = 24 * 60 * 60 * 1000;
 const UPDATE_TIMEOUT_MS = 900;
 
+const PROGRAM_DIR =
+  (process.env.LOCALAPPDATA && path.join(process.env.LOCALAPPDATA, "Programs", "CWBridge")) ||
+  (process.env.APPDATA && path.join(process.env.APPDATA, "CWBridge", "program"));
+const BIN_DIR = process.env.APPDATA && path.join(process.env.APPDATA, "CWBridge", "bin");
+const ALIAS_MARKER = "Generated by CWBridge - safe to replace";
+const ALIAS_PATH = BIN_DIR && path.join(BIN_DIR, "cwbridge.cmd");
+const PROGRAM_PATH = PROGRAM_DIR && path.join(PROGRAM_DIR, "cwbridge.exe");
+
+function isOwnedAliasPresent(aliasPath = ALIAS_PATH) {
+  if (!aliasPath || !fs.existsSync(aliasPath)) {
+    return false;
+  }
+  try {
+    return fs.readFileSync(aliasPath, "utf8").includes(ALIAS_MARKER);
+  } catch {
+    return false;
+  }
+}
+
+function copyExecutable(executable, destination) {
+  // The destination can be locked while CWBridge is running (EBUSY/EPERM).
+  // Retry briefly, then continue with the existing installation.
+  const attempts = 5;
+  for (let attempt = 1; attempt <= attempts; attempt += 1) {
+    try {
+      if (path.resolve(executable) === path.resolve(destination)) {
+        return true;
+      }
+      fs.copyFileSync(executable, destination);
+      return true;
+    } catch (error) {
+      if (attempt === attempts || !["EBUSY", "EPERM", "EACCES"].includes(error.code)) {
+        if (fs.existsSync(destination)) {
+          return true; // Keep the existing executable; it may be up to date.
+        }
+        throw error;
+      }
+      const wait = attempt * 200;
+      Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, wait);
+    }
+  }
+  return false;
+}
+
+function installPermanently(executable, hooks = {}) {
+  // Copy into the per-user program folder and create a PATH-backed alias so
+  // the plain "cwbridge" command works without npx afterwards. All target
+  // paths are injectable so tests never touch a real installation.
+  const paths = hooks.paths || {
+    programDir: PROGRAM_DIR,
+    binDir: BIN_DIR,
+    aliasPath: ALIAS_PATH,
+    programPath: PROGRAM_PATH,
+  };
+  const addUser = hooks.addUserPath;
+  if (!paths.programDir || !paths.binDir || !paths.aliasPath || !paths.programPath) {
+    return false;
+  }
+  try {
+    fs.mkdirSync(paths.programDir, { recursive: true });
+    fs.mkdirSync(paths.binDir, { recursive: true });
+    copyExecutable(executable, paths.programPath);
+    const alias =
+      "@echo off\r\n" +
+      ":: " + ALIAS_MARKER + "\r\n" +
+      `\"${paths.programPath}\" %*\r\n`;
+    fs.writeFileSync(paths.aliasPath, alias, "utf8");
+    if (addUser) {
+      addUser(paths.binDir);
+    }
+    return true;
+  } catch (error) {
+    if (process.env.CWBRIDGE_DEBUG_INSTALL === "1") {
+      console.error(`CWBridge auto-install failed: ${error.message}`);
+    }
+    return false;
+  }
+}
+
 function parseVersion(value) {
   const match = /^v?(\d+)\.(\d+)\.(\d+)(?:[-+].*)?$/.exec(String(value));
   return match ? match.slice(1, 4).map(Number) : null;
@@ -101,6 +180,37 @@ function fetchLatestVersion() {
   });
 }
 
+function defaultRegRun(args) {
+  return execFileSync("reg.exe", args, { encoding: "utf8", timeout: 3000 });
+}
+
+function addUserPath(directory, run = defaultRegRun) {
+  // Best-effort HKCU\Environment\Path update; no admin rights required.
+  try {
+    const query = String(run(["query", "HKCU\\Environment", "/v", "Path"]));
+    const valueLine = query
+      .split(/\r?\n/)
+      .find((line) => /^\s*Path\s+REG_(?:EXPAND_)?SZ\s+(.+)$/i.test(line));
+    if (!valueLine) {
+      return false;
+    }
+    // reg.exe output: "    Path    REG_EXPAND_SZ    C:\a;C:\b"
+    const currentValue = valueLine.trim().match(/^\s*Path\s+REG_(?:EXPAND_)?SZ\s+(.+)$/i)[1].trim();
+    const alreadyPresent = currentValue
+      .split(";")
+      .some((entry) => entry.trim().replace(/\\+$/, "").toLowerCase() === String(directory).toLowerCase());
+    if (alreadyPresent) {
+      return false;
+    }
+    const updated = currentValue ? `${currentValue};${directory}` : directory;
+    run(["add", "HKCU\\Environment", "/v", "Path", "/t", "REG_EXPAND_SZ", "/d", updated, "/f"]);
+    return true;
+  } catch {
+    // PATH update is best effort; alias and program paths still print.
+    return false;
+  }
+}
+
 async function reportAvailableUpdate() {
   if (process.env.CWBRIDGE_NO_UPDATE_CHECK === "1") {
     return;
@@ -135,6 +245,14 @@ async function main() {
     return;
   }
 
+  if (!isOwnedAliasPresent()) {
+    if (installPermanently(executable)) {
+      console.log(`CWBridge installed for the current user: ${PROGRAM_PATH}`);
+      console.log(`Command: ${ALIAS_PATH}`);
+      console.log("Open a new terminal, then run: cwbridge (setup runs on first use)");
+    }
+  }
+
   await reportAvailableUpdate();
   const result = spawnSync(executable, process.argv.slice(2), {
     stdio: "inherit",
@@ -155,4 +273,13 @@ if (require.main === module) {
   });
 }
 
-module.exports = { isNewerVersion, parseVersion };
+module.exports = {
+  isNewerVersion,
+  parseVersion,
+  addUserPath,
+  installPermanently,
+  isOwnedAliasPresent,
+  ALIAS_PATH,
+  BIN_DIR,
+  PROGRAM_PATH,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cwbridge",
-  "version": "1.8.0",
+  "version": "2.0.0",
   "description": "Windows launcher for the compiled CWBridge executable",
   "license": "UNLICENSED",
   "private": false,