Move core node icons into node package

packages/node_modules/@node-red/editor/lib/editor/ui.js

@@ -25,6 +25,7 @@ var theme = require("./theme");
 
 var runtimeAPI;
 
+var defaultNodeIcon = path.resolve(__dirname+"/../../src/images/icons/arrow-in.png")
 var templateDir = path.resolve(__dirname+"/../../src/templates");
 var editorTemplate;
 
@@ -55,10 +56,15 @@ module.exports = {
             icon: icon
         }
         runtimeAPI.nodes.getIcon(opts).then(function(data) {
-            var contentType = mime.lookup(icon);
+            if (data) {
-            res.set("Content-Type", contentType);
+                var contentType = mime.lookup(icon);
-            res.send(data);
+                res.set("Content-Type", contentType);
+                res.send(data);
+            } else {
+                res.sendFile(defaultNodeIcon);
+            }
         }).catch(function(err) {
+            console.log(err.stack);
             apiUtils.rejectHandler(req,res,err);
         })
     },

packages/node_modules/@node-red/editor/src/js/ui/view.js

@@ -2182,8 +2182,8 @@ RED.view = (function() {
                     //node.append("path").attr("class","node_error").attr("d","M 3,-3 l 10,0 l -5,-8 z");
 
                     //TODO: these ought to be SVG
-                    node.append("image").attr("class","node_error hidden").attr("xlink:href","icons/node-red/node-error.png").attr("x",0).attr("y",-6).attr("width",10).attr("height",9);
+                    node.append("image").attr("class","node_error hidden").attr("xlink:href","red/images/icons/node-error.png").attr("x",0).attr("y",-6).attr("width",10).attr("height",9);
-                    node.append("image").attr("class","node_changed hidden").attr("xlink:href","icons/node-red/node-changed.png").attr("x",12).attr("y",-6).attr("width",10).attr("height",10);
+                    node.append("image").attr("class","node_changed hidden").attr("xlink:href","red/images/icons/node-changed.png").attr("x",12).attr("y",-6).attr("width",10).attr("height",10);
             });
 
             node.each(function(d,i) {

packages/node_modules/@node-red/registry/localfilesystem.js

@@ -241,14 +241,12 @@ function getNodeFiles(disableNodePathScan) {
     var nodeFiles = [];
     var results;
 
-    var dir = path.resolve(__dirname + '/../../public/icons');
+    var dir;
-    var iconList = [{path:dir,icons:scanIconDir(dir)}];
+    var iconList = [];
-
     if (settings.coreNodesDir) {
         results = getLocalNodeFiles(path.resolve(settings.coreNodesDir));
         nodeFiles = nodeFiles.concat(results.files);
         iconList = iconList.concat(results.icons);
-
         var defaultLocalesPath = path.join(settings.coreNodesDir,"core","locales");
         i18n.registerMessageCatalog("node-red",defaultLocalesPath,"messages.json");
     }

packages/node_modules/@node-red/registry/registry.js

@@ -555,11 +555,8 @@ function setModulePendingUpdated(module,version) {
     });
 }
 
-var icon_paths = {
+var icon_paths = { };
-    "node-red":[path.resolve(__dirname + '/../editor/public/icons')]
-};
 var iconCache = {};
-var defaultIcon = path.join(icon_paths['node-red'][0],'arrow-in.png');
 
 function getNodeIconPath(module,icon) {
     if (/\.\./.test(icon)) {
@@ -585,8 +582,7 @@ function getNodeIconPath(module,icon) {
         if (module !== "node-red") {
             return getNodeIconPath("node-red", icon);
         }
-
+        return null;
-        return defaultIcon;
     }
 }
 

packages/node_modules/@node-red/runtime/api/nodes.js

@@ -420,19 +420,23 @@ var api = module.exports = {
     * @param {User} opts.user - the user calling the api
     * @param {String} opts.module - the id of the module requesting the icon
     * @param {String} opts.icon - the name of the icon
-    * @return {Promise<Buffer>} - the icon file as a Buffer
+    * @return {Promise<Buffer>} - the icon file as a Buffer or null if no icon available
     * @memberof RED.nodes
     */
     getIcon: function(opts) {
         return new Promise(function(resolve,reject) {
             var iconPath = runtime.nodes.getNodeIconPath(opts.module,opts.icon);
-            fs.readFile(iconPath,function(err,data) {
+            if (iconPath) {
-                if (err) {
+                fs.readFile(iconPath,function(err,data) {
-                    err.status = 400;
+                    if (err) {
-                    return reject(err);
+                        err.status = 400;
-                }
+                        return reject(err);
-                return resolve(data)
+                    }
-            });
+                    return resolve(data)
+                });
+            } else {
+                resolve(null);
+            }
         });
     }
 }

packages/node_modules/@node-red/runtime/nodes/context/localfilesystem.js

@@ -47,8 +47,8 @@
 
 var fs = require('fs-extra');
 var path = require("path");
-var util = require("../../util");
+var util = require("@node-red/util").util;
-var log = require("../../log");
+var log = require("@node-red/util").log;
 
 var safeJSONStringify = require("json-stringify-safe");
 var MemoryStore = require("./memory");

packages/node_modules/node-red/red/red.js

@@ -70,7 +70,7 @@ module.exports = {
         redUtil.init(userSettings);
         if (userSettings.httpAdminRoot !== false) {
             runtime.init(userSettings,redUtil,api);
-            api.init(httpServer,userSettings,runtime.storage,runtime);
+            api.init(httpServer,userSettings,runtime._.storage,runtime);
 
             apiEnabled = true;
             server = runtime._.adminApi.server;