@bonsae/nrg 0.18.2 → 0.18.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bonsae/nrg",
-  "version": "0.18.2",
+  "version": "0.18.4",
   "description": "NRG framework — build Node-RED nodes with Vue 3, TypeScript, and JSON Schema",
   "author": "Allan Oricil <allanoricil@duck.com>",
   "license": "MIT",

package/test/client/e2e/index.js

@@ -1995,14 +1995,15 @@ async function build2(clientBuildOptions, buildContext) {
 }
 
 // src/vite/node-red-launcher.ts
-import { spawn } from "child_process";
+import { spawn, execSync } from "child_process";
 import getPort from "get-port";
 import detect from "detect-port";
-import { builtinModules as builtinModules2 } from "module";
+import { builtinModules as builtinModules2, createRequire as createRequire3 } from "module";
 import treeKill from "tree-kill";
 import fs10 from "fs";
 import os from "os";
 import path10 from "path";
+import { pathToFileURL as pathToFileURL3 } from "url";
 import { build as esbuild } from "esbuild";
 
 // src/vite/async-utils.ts
@@ -2114,7 +2115,7 @@ var NodeRedLauncher = class {
       define: {
         "import.meta.dirname": JSON.stringify(settingsDir),
         "import.meta.filename": JSON.stringify(settingsFile),
-        "import.meta.url": JSON.stringify(`file://${settingsFile}`)
+        "import.meta.url": JSON.stringify(pathToFileURL3(settingsFile).href)
       },
       external: [...nodeBuiltins2, "node-red", "@node-red/*"]
     });
@@ -2131,7 +2132,7 @@ var NodeRedLauncher = class {
     }
     const outDir = path10.resolve(this.outDir).split(path10.sep).join("/");
     const cwd = process.cwd().split(path10.sep).join("/");
-    const userDir = path10.resolve(cwd, ".node-red");
+    const userDir = path10.resolve(cwd, ".node-red").split(path10.sep).join("/");
     const finalRuntimeSettingsFile = compiledRuntimeSettingsFilepath ? `
 const compiledRuntimeSettings = require("${compiledRuntimeSettingsFilepath.split(path10.sep).join("/")}");
 const settings = compiledRuntimeSettings.default || compiledRuntimeSettings;
@@ -2164,6 +2165,77 @@ module.exports = settings;
     this.compiledRuntimeSettingsFilepath = finalRuntimeSettingsFilepath;
     return finalRuntimeSettingsFilepath;
   }
+  resolveFromLocalNodeModules() {
+    try {
+      const require_ = createRequire3(path10.join(process.cwd(), "package.json"));
+      const pkgJsonPath = require_.resolve("node-red/package.json");
+      const pkgDir = path10.dirname(pkgJsonPath);
+      const pkg = JSON.parse(fs10.readFileSync(pkgJsonPath, "utf-8"));
+      const bin = typeof pkg.bin === "string" ? pkg.bin : pkg.bin?.["node-red"];
+      if (!bin) return null;
+      const entry = path10.resolve(pkgDir, bin);
+      return fs10.existsSync(entry) ? entry : null;
+    } catch {
+      return null;
+    }
+  }
+  resolveNodeRedEntryPoint() {
+    this.logger.info(`Resolving ${this.nodeRedCommand} entry point...`);
+    const localEntry = this.resolveFromLocalNodeModules();
+    if (localEntry) {
+      this.logger.info(`Resolved from local node_modules: ${localEntry}`);
+      return localEntry;
+    }
+    this.logger.info(
+      `Not found locally, downloading via npx (this may take a while)...`
+    );
+    const resolverScript = path10.join(
+      os.tmpdir(),
+      `nrg-resolve-node-red-${process.pid}.cjs`
+    );
+    fs10.writeFileSync(
+      resolverScript,
+      `const fs = require("fs");
+const path = require("path");
+const isWin = process.platform === "win32";
+const binName = isWin ? "node-red.cmd" : "node-red";
+const dirs = process.env.PATH.split(path.delimiter);
+for (const d of dirs) {
+  const f = path.join(d, binName);
+  if (fs.existsSync(f)) {
+    if (isWin) {
+      const nodeRedDir = path.resolve(d, "..", "node-red");
+      const pkg = JSON.parse(fs.readFileSync(path.join(nodeRedDir, "package.json"), "utf-8"));
+      const bin = typeof pkg.bin === "string" ? pkg.bin : pkg.bin["node-red"];
+      process.stdout.write(path.resolve(nodeRedDir, bin));
+    } else {
+      process.stdout.write(fs.realpathSync(f));
+    }
+    break;
+  }
+}`
+    );
+    try {
+      const entryPoint = execSync(
+        `npx --yes -p ${this.nodeRedCommand} -c "node ${resolverScript}"`,
+        { encoding: "utf-8", timeout: 3e5 }
+      ).trim();
+      if (!entryPoint || !fs10.existsSync(entryPoint)) {
+        throw new NodeRedStartError(
+          new Error(
+            `Could not resolve node-red entry point: ${entryPoint || "(empty)"}`
+          )
+        );
+      }
+      this.logger.info(`Resolved via npx: ${entryPoint}`);
+      return entryPoint;
+    } finally {
+      try {
+        fs10.unlinkSync(resolverScript);
+      } catch {
+      }
+    }
+  }
   log(line) {
     if (line.includes("Server now running at")) {
       return;
@@ -2189,6 +2261,7 @@ module.exports = settings;
         this.port = await getPort({ port: this.preferredPort });
       }
     }
+    const nodeRedEntryPoint = this.resolveNodeRedEntryPoint();
     const startProcess = () => {
       return new Promise(async (resolve, reject) => {
         try {
@@ -2197,11 +2270,10 @@ module.exports = settings;
           this.bufferedLogs = [];
           this.isReady = false;
           this.process = spawn(
-            "npx",
-            [this.nodeRedCommand, "-s", settingsPath, ...args],
+            process.execPath,
+            [nodeRedEntryPoint, "-s", settingsPath, ...args],
             {
-              stdio: ["ignore", "pipe", "pipe"],
-              shell: true
+              stdio: ["ignore", "pipe", "pipe"]
             }
           );
           this.process.stdout?.on("data", (data) => {

package/vite/index.js

@@ -107,14 +107,15 @@ function mergeOptions(defaults, overrides) {
 }
 
 // src/vite/node-red-launcher.ts
-import { spawn } from "child_process";
+import { spawn, execSync } from "child_process";
 import getPort from "get-port";
 import detect from "detect-port";
-import { builtinModules } from "module";
+import { builtinModules, createRequire } from "module";
 import treeKill from "tree-kill";
 import fs2 from "fs";
 import os from "os";
 import path2 from "path";
+import { pathToFileURL } from "url";
 import { build as esbuild } from "esbuild";
 
 // src/vite/async-utils.ts
@@ -332,7 +333,7 @@ var NodeRedLauncher = class {
       define: {
         "import.meta.dirname": JSON.stringify(settingsDir),
         "import.meta.filename": JSON.stringify(settingsFile),
-        "import.meta.url": JSON.stringify(`file://${settingsFile}`)
+        "import.meta.url": JSON.stringify(pathToFileURL(settingsFile).href)
       },
       external: [...nodeBuiltins2, "node-red", "@node-red/*"]
     });
@@ -349,7 +350,7 @@ var NodeRedLauncher = class {
     }
     const outDir = path2.resolve(this.outDir).split(path2.sep).join("/");
     const cwd = process.cwd().split(path2.sep).join("/");
-    const userDir = path2.resolve(cwd, ".node-red");
+    const userDir = path2.resolve(cwd, ".node-red").split(path2.sep).join("/");
     const finalRuntimeSettingsFile = compiledRuntimeSettingsFilepath ? `
 const compiledRuntimeSettings = require("${compiledRuntimeSettingsFilepath.split(path2.sep).join("/")}");
 const settings = compiledRuntimeSettings.default || compiledRuntimeSettings;
@@ -382,6 +383,77 @@ module.exports = settings;
     this.compiledRuntimeSettingsFilepath = finalRuntimeSettingsFilepath;
     return finalRuntimeSettingsFilepath;
   }
+  resolveFromLocalNodeModules() {
+    try {
+      const require_ = createRequire(path2.join(process.cwd(), "package.json"));
+      const pkgJsonPath = require_.resolve("node-red/package.json");
+      const pkgDir = path2.dirname(pkgJsonPath);
+      const pkg = JSON.parse(fs2.readFileSync(pkgJsonPath, "utf-8"));
+      const bin = typeof pkg.bin === "string" ? pkg.bin : pkg.bin?.["node-red"];
+      if (!bin) return null;
+      const entry = path2.resolve(pkgDir, bin);
+      return fs2.existsSync(entry) ? entry : null;
+    } catch {
+      return null;
+    }
+  }
+  resolveNodeRedEntryPoint() {
+    this.logger.info(`Resolving ${this.nodeRedCommand} entry point...`);
+    const localEntry = this.resolveFromLocalNodeModules();
+    if (localEntry) {
+      this.logger.info(`Resolved from local node_modules: ${localEntry}`);
+      return localEntry;
+    }
+    this.logger.info(
+      `Not found locally, downloading via npx (this may take a while)...`
+    );
+    const resolverScript = path2.join(
+      os.tmpdir(),
+      `nrg-resolve-node-red-${process.pid}.cjs`
+    );
+    fs2.writeFileSync(
+      resolverScript,
+      `const fs = require("fs");
+const path = require("path");
+const isWin = process.platform === "win32";
+const binName = isWin ? "node-red.cmd" : "node-red";
+const dirs = process.env.PATH.split(path.delimiter);
+for (const d of dirs) {
+  const f = path.join(d, binName);
+  if (fs.existsSync(f)) {
+    if (isWin) {
+      const nodeRedDir = path.resolve(d, "..", "node-red");
+      const pkg = JSON.parse(fs.readFileSync(path.join(nodeRedDir, "package.json"), "utf-8"));
+      const bin = typeof pkg.bin === "string" ? pkg.bin : pkg.bin["node-red"];
+      process.stdout.write(path.resolve(nodeRedDir, bin));
+    } else {
+      process.stdout.write(fs.realpathSync(f));
+    }
+    break;
+  }
+}`
+    );
+    try {
+      const entryPoint = execSync(
+        `npx --yes -p ${this.nodeRedCommand} -c "node ${resolverScript}"`,
+        { encoding: "utf-8", timeout: 3e5 }
+      ).trim();
+      if (!entryPoint || !fs2.existsSync(entryPoint)) {
+        throw new NodeRedStartError(
+          new Error(
+            `Could not resolve node-red entry point: ${entryPoint || "(empty)"}`
+          )
+        );
+      }
+      this.logger.info(`Resolved via npx: ${entryPoint}`);
+      return entryPoint;
+    } finally {
+      try {
+        fs2.unlinkSync(resolverScript);
+      } catch {
+      }
+    }
+  }
   log(line) {
     if (line.includes("Server now running at")) {
       return;
@@ -407,6 +479,7 @@ module.exports = settings;
         this.port = await getPort({ port: this.preferredPort });
       }
     }
+    const nodeRedEntryPoint = this.resolveNodeRedEntryPoint();
     const startProcess = () => {
       return new Promise(async (resolve, reject) => {
         try {
@@ -415,11 +488,10 @@ module.exports = settings;
           this.bufferedLogs = [];
           this.isReady = false;
           this.process = spawn(
-            "npx",
-            [this.nodeRedCommand, "-s", settingsPath, ...args],
+            process.execPath,
+            [nodeRedEntryPoint, "-s", settingsPath, ...args],
             {
-              stdio: ["ignore", "pipe", "pipe"],
-              shell: true
+              stdio: ["ignore", "pipe", "pipe"]
             }
           );
           this.process.stdout?.on("data", (data) => {
@@ -1262,8 +1334,8 @@ import path11 from "path";
 // src/vite/client/plugins/help-generator.ts
 import fs6 from "fs";
 import path6 from "path";
-import { pathToFileURL } from "url";
-import { createRequire } from "module";
+import { pathToFileURL as pathToFileURL2 } from "url";
+import { createRequire as createRequire2 } from "module";
 
 // src/vite/client/plugins/help-i18n.ts
 var translations = {
@@ -1700,11 +1772,11 @@ function helpGenerator(options) {
       let packageFn;
       try {
         if (fs6.existsSync(esmPath)) {
-          const fileUrl = pathToFileURL(esmPath).href + `?t=${Date.now()}`;
+          const fileUrl = pathToFileURL2(esmPath).href + `?t=${Date.now()}`;
           const mod = await import(fileUrl);
           packageFn = mod?.default ?? mod;
         } else if (fs6.existsSync(cjsPath)) {
-          const require2 = createRequire(import.meta.url);
+          const require2 = createRequire2(import.meta.url);
           delete require2.cache[cjsPath];
           const rawMod = require2(cjsPath);
           packageFn = rawMod?.default ?? rawMod;
@@ -2048,8 +2120,8 @@ function minifier() {
 }
 
 // src/vite/client/plugins/node-definitions-inliner.ts
-import { createRequire as createRequire2 } from "module";
-import { pathToFileURL as pathToFileURL2 } from "url";
+import { createRequire as createRequire3 } from "module";
+import { pathToFileURL as pathToFileURL3 } from "url";
 import path9 from "path";
 import fs9 from "fs";
 import mime2 from "mime-types";
@@ -2105,11 +2177,11 @@ function nodeDefinitionsInliner(serverOutDir, entryPath, iconsDir, componentsDir
       const cjsEntryPath = path9.resolve(serverOutDir, "index.js");
       let packageFn;
       if (fs9.existsSync(esmEntryPath)) {
-        const fileUrl = pathToFileURL2(esmEntryPath).href + `?t=${Date.now()}`;
+        const fileUrl = pathToFileURL3(esmEntryPath).href + `?t=${Date.now()}`;
         const mod = await import(fileUrl);
         packageFn = mod?.default ?? mod;
       } else if (fs9.existsSync(cjsEntryPath)) {
-        const require2 = createRequire2(import.meta.url);
+        const require2 = createRequire3(import.meta.url);
         delete require2.cache[cjsEntryPath];
         const rawMod = require2(cjsEntryPath);
         packageFn = rawMod?.default ?? rawMod;