@node-red/registry 3.1.0-beta.4 → 3.1.1

package/lib/externalModules.js

@@ -98,7 +98,7 @@ function requireModule(module) {
     const parsedModule = parseModuleName(module);
 
     if (BUILTIN_MODULES.indexOf(parsedModule.module) !== -1) {
-        return require(parsedModule.module);
+        return require(parsedModule.module + parsedModule.subpath);
     }
     if (!knownExternalModules[parsedModule.module]) {
         const e = new Error("Module not allowed");
@@ -131,7 +131,7 @@ function importModule(module) {
     const parsedModule = parseModuleName(module);
 
     if (BUILTIN_MODULES.indexOf(parsedModule.module) !== -1) {
-        return import(parsedModule.module);
+        return import(parsedModule.module + parsedModule.subpath);
     }
     if (!knownExternalModules[parsedModule.module]) {
         const e = new Error("Module not allowed");
@@ -152,12 +152,13 @@ function importModule(module) {
 }
 
 function parseModuleName(module) {
-    var match = /((?:@[^/]+\/)?[^/@]+)(?:@([\s\S]+))?/.exec(module);
+    var match = /((?:@[^/]+\/)?[^/@]+)(\/[^/@]+)?(?:@([\s\S]+))?/.exec(module);
     if (match) {
         return {
             spec: module,
             module: match[1],
-            version: match[2],
+            subpath: match[2] || '',
+            version: match[3],
             builtin: BUILTIN_MODULES.indexOf(match[1]) !== -1,
             known: !!knownExternalModules[match[1]]
         }
@@ -283,6 +284,7 @@ async function installModule(moduleDetails) {
             const runtimeInstalledModules = settings.get("modules") || {};
             runtimeInstalledModules[moduleDetails.module] = moduleDetails;
             settings.set("modules",runtimeInstalledModules)
+            log.audit({event: "modules.install",module:moduleDetails.module, version:moduleDetails.version});
         }).catch(result => {
             var output = result.stderr || result.toString();
             var e;

package/lib/loader.js

@@ -143,6 +143,12 @@ function loadModuleFiles(modules) {
         return loadNodeSetList(pluginList);
     }).then(function() {
         return loadNodeSetList(nodeList);
+    }).then(function () {
+        if (settings.available()) {
+            return registry.saveNodeList();
+        } else {
+            return
+        }
     })
 }
 
@@ -436,7 +442,7 @@ async function loadPlugin(plugin) {
         return plugin;
     }
 }
-
+let invocation = 0
 function loadNodeSetList(nodes) {
     var promises = [];
     nodes.forEach(function(node) {
@@ -451,13 +457,7 @@ function loadNodeSetList(nodes) {
         }
     });
 
-    return Promise.all(promises).then(function() {
-        if (settings.available()) {
-            return registry.saveNodeList();
-        } else {
-            return;
-        }
-    });
+    return Promise.all(promises)
 }
 
 function addModule(module) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "3.1.0-beta.4",
+    "version": "3.1.1",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,10 +16,10 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "3.1.0-beta.4",
+        "@node-red/util": "3.1.1",
         "clone": "2.1.2",
         "fs-extra": "11.1.1",
-        "semver": "7.5.0",
+        "semver": "7.5.4",
         "tar": "6.1.13",
         "uglify-js": "3.17.4"
     }