@node-red/registry 5.0.0-beta.6 → 5.0.0

package/lib/externalModules.js

@@ -274,7 +274,6 @@ async function installModule(moduleDetails) {
                 let extraArgs = triggerPayload.args || [];
                 let args = [npmCli, 'install', ...extraArgs, '--', installSpec]
                 log.trace(`${process.execPath} ${npmCli} ${JSON.stringify(args)}`);
-                console.log('HIT EM ONE')
                 return exec.run(process.execPath, args, { cwd: installDir },true)
             } else {
                 log.trace("skipping npm install");

package/lib/installer.js

@@ -147,8 +147,7 @@ async function installModule(module,version,url) {
         var isExisting = false;
         if (url) {
             if (pkgurlRe.test(url) || localtgzRe.test(url)) {
-                // Git remote url or Tarball url - check the valid package url
-                installName = localtgzRe.test(url) && slashRe.test(url) ? `"${url}"` : url;
+                installName = url;
                 isRegistryPackage = false;
             } else {
                 log.warn(log._("server.install.install-failed-url",{name:module,url:url}));
@@ -504,12 +503,13 @@ async function getTarballModuleInfo(tarball) {
 
 function uninstallModule(module) {
     // This function is called when the admin api is called to remove a module.
-    // A check in node.js#removeModule verifies the module being removed is already in the registry
+    // A check in nodes.js#removeModule verifies the module being removed is already in the registry
     // as a user module. As such, we can have confidence that the `module` passed here is 
-    // a valid and recognised module name.
+    // a valid and recognised module name. But lets not rely 100% on that.
     activePromise = activePromise.then(() => {
         return new Promise((resolve,reject) => {
-            if (/[.\s;]/.test(module)) {
+            // Ensure its a valid package name and nothing has slipped through other checks
+            if (!validateNpmPackageName(module).validForOldPackages) {
                 reject(new Error(log._("server.install.invalid")));
                 return;
             }

package/lib/loader.js

@@ -17,6 +17,7 @@
 var fs = require("fs-extra");
 var path = require("path");
 var semver = require("semver");
+const { pathToFileURL } = require('node:url');
 
 var localfilesystem = require("./localfilesystem");
 var registry = require("./registry");
@@ -66,7 +67,7 @@ function loadModuleTypeFiles(module, type) {
                     moduleFn = parts.slice(0,nmi+2).join(path.sep);
                 }
                 if (!moduleFn) {
-                    // shortcut - skip calling statSync on empty string 
+                    // shortcut - skip calling statSync on empty string
                     break; // Module not found, don't attempt to load its nodes
                 }
                 try {
@@ -356,34 +357,23 @@ function loadNodeSet(node) {
     } else {
     }
     try {
-        var loadPromise = null;
-        var r = require(node.file);
-        r = r.__esModule ? r.default : r
-        if (typeof r === "function") {
-
-            var red = registryUtil.createNodeApi(node);
-            var promise = r(red);
-            if (promise != null && typeof promise.then === "function") {
-                loadPromise = promise.then(function() {
-                    node.enabled = true;
-                    node.loaded = true;
-                    return node;
-                }).catch(function(err) {
-                    node.err = err;
-                    return node;
-                });
-            }
-        }
-        if (loadPromise == null) {
-            node.enabled = true;
-            node.loaded = true;
-            loadPromise = Promise.resolve(node);
-        }
-        return loadPromise;
+        const modulePath = pathToFileURL(node.file).href;
+        const importPromise = import(modulePath);
+        return importPromise
+            .then(function(moduleNamespaceObject) {
+                // CJS will always have default, ESM might have default. (details in note below)
+                let r = moduleNamespaceObject.default ? moduleNamespaceObject.default : moduleNamespaceObject;
+                // Babel related workaround, references in comment below.
+                r = r.__esModule ? r.default : r;
+                return createLoadPromise(node, r);
+            })
+            .catch(function(err) {
+                node.err = err;
+                return Promise.resolve(node);
+            });
     } catch(err) {
         node.err = err;
         var stack = err.stack;
-        var message;
         if (stack) {
             var filePath = node.file;
             try {
@@ -403,6 +393,45 @@ function loadNodeSet(node) {
         }
         return Promise.resolve(node);
     }
+
+    // Notes on default:
+    // https://nodejs.org/api/esm.html#import-expressions
+    // "When importing CommonJS modules, the module.exports object is provided as the default export."
+    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/import
+    // "The module namespace object is a sealed object ... with the default export available as a key called `default`."
+
+    // Notes on __esModule:
+    // Workaround originally added in commit 326f3469, merged in pull request #3669.
+    // Related links:
+    // https://github.com/nodejs/node/issues/40891
+    // https://github.com/evanw/esbuild/issues/1591
+    // https://babeljs.io/docs/babel-plugin-transform-modules-commonjs
+    // https://stackoverflow.com/questions/50943704/whats-the-purpose-of-object-definepropertyexports-esmodule-value-0
+
+    function createLoadPromise(node, r) {
+        var loadPromise = null;
+        if (typeof r === "function") {
+
+            var red = registryUtil.createNodeApi(node);
+            var promise = r(red);
+            if (promise != null && typeof promise.then === "function") {
+                loadPromise = promise.then(function () {
+                    node.enabled = true;
+                    node.loaded = true;
+                    return node;
+                }).catch(function (err) {
+                    node.err = err;
+                    return node;
+                });
+            }
+        }
+        if (loadPromise == null) {
+            node.enabled = true;
+            node.loaded = true;
+            loadPromise = Promise.resolve(node);
+        }
+        return loadPromise;
+    }
 }
 
 async function loadPlugin(plugin) {
@@ -435,7 +464,6 @@ async function loadPlugin(plugin) {
         console.log(err);
         plugin.err = err;
         var stack = err.stack;
-        var message;
         if (stack) {
             var i = stack.indexOf(plugin.file);
             if (i > -1) {
@@ -449,7 +477,7 @@ async function loadPlugin(plugin) {
         return plugin;
     }
 }
-let invocation = 0
+
 function loadNodeSetList(nodes) {
     var promises = [];
     nodes.forEach(function(node) {
@@ -471,7 +499,6 @@ function addModule(module) {
     if (!settings.available()) {
         throw new Error("Settings unavailable");
     }
-    var nodes = [];
     var existingInfo = registry.getModuleInfo(module);
     if (existingInfo) {
         // TODO: nls

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "5.0.0-beta.6",
+    "version": "5.0.0",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,10 +16,10 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "5.0.0-beta.6",
+        "@node-red/util": "5.0.0",
         "clone": "2.1.2",
         "fs-extra": "11.3.0",
-        "npm": "11.13.0",
+        "npm": "11.16.0",
         "semver": "7.7.4",
         "tar": "7.5.12",
         "uglify-js": "3.19.3",