refactor: add default Utils.getURL getModule processor

Author: opichals

core/modules.js

@@ -66,6 +66,19 @@
       }
       loadModules(code, callback);
     });
+
+    // Append the 'getModule' processor as the last (plugins get initialized after Espruino.Core modules)
+    Espruino.Plugins.CoreModules = {
+      init: function() {
+        Espruino.addProcessor("getModule", function(data, callback) {
+          if (data.moduleCode!==undefined) { // already provided be previous getModule processor
+            return callback(data);
+          }
+
+          fetchGetModule(data, callback);
+        });
+      }
+    };
   }
 
   function isBuiltIn(module) {
@@ -108,6 +121,50 @@
     return modules;
   };
 
+  /** Download modules from MODULE_URL/.. */
+  function fetchGetModule(data, callback) {
+    var fullModuleName = data.moduleName;
+
+    // try and load the module the old way...
+    console.log("loadModule("+fullModuleName+")");
+
+    var urls = []; // Array of where to look for this module
+    var modName; // Simple name of the module
+    if(Espruino.Core.Utils.isURL(fullModuleName)) {
+      modName = fullModuleName.substr(fullModuleName.lastIndexOf("/") + 1).split(".")[0];
+      urls = [ fullModuleName ];
+    } else {
+      modName = fullModuleName;
+      Espruino.Config.MODULE_URL.split("|").forEach(function (url) {
+        url = url.trim();
+        if (url.length!=0)
+        Espruino.Config.MODULE_EXTENSIONS.split("|").forEach(function (extension) {
+          urls.push(url + "/" + fullModuleName + extension);
+        })
+      });
+    };
+
+    // Recursively go through all the urls
+    (function download(urls) {
+      if (urls.length==0) {
+        return callback(data);
+      }
+      var dlUrl = urls[0];
+      Espruino.Core.Utils.getURL(dlUrl, function (code) {
+        if (code!==undefined) {
+          // we got it!
+          data.moduleCode = code;
+          data.isMinified = dlUrl.substr(-7)==".min.js";
+          return callback(data);
+        } else {
+          // else try next
+          download(urls.slice(1));
+        }
+      });
+    })(urls);
+  }
+
+
   /** Called from loadModule when a module is loaded. Parse it for other modules it might use
    *  and resolve dfd after all submodules have been loaded */
   function moduleLoaded(resolve, requires, modName, data, loadedModuleData, alreadyMinified){
@@ -147,51 +204,16 @@
     return new Promise(function(resolve, reject) {
       // First off, try and find this module using callProcessor
       Espruino.callProcessor("getModule",
-        { moduleName:fullModuleName, moduleCode:undefined },
+        { moduleName:fullModuleName, moduleCode:undefined, isMinified:false },
         function(data) {
-          if (data.moduleCode!==undefined) {
-            // great! it found something. Use it.
-            moduleLoaded(resolve, requires, fullModuleName, data.moduleCode, loadedModuleData, false);
-          } else {
-            // otherwise try and load the module the old way...
-            console.log("loadModule("+fullModuleName+")");
-
-            var urls = []; // Array of where to look for this module
-            var modName; // Simple name of the module
-            if(Espruino.Core.Utils.isURL(fullModuleName)) {
-              modName = fullModuleName.substr(fullModuleName.lastIndexOf("/") + 1).split(".")[0];
-              urls = [ fullModuleName ];
-            } else {
-              modName = fullModuleName;
-              Espruino.Config.MODULE_URL.split("|").forEach(function (url) {
-                url = url.trim();
-                if (url.length!=0)
-                  Espruino.Config.MODULE_EXTENSIONS.split("|").forEach(function (extension) {
-                    urls.push(url + "/" + fullModuleName + extension);
-                  })
-              });
-            };
-
-            // Recursively go through all the urls
-            (function download(urls) {
-              if (urls.length==0) {
-                Espruino.Core.Notifications.warning("Module "+fullModuleName+" not found");
-                return resolve();
-              }
-              var dlUrl = urls[0];
-              Espruino.Core.Utils.getURL(dlUrl, function (data) {
-                if (data!==undefined) {
-                  // we got it!
-                  moduleLoaded(resolve, requires, fullModuleName, data, loadedModuleData, dlUrl.substr(-7)==".min.js");
-                } else {
-                  // else try next
-                  download(urls.slice(1));
-                }
-              });
-            })(urls);
+          if (data.moduleCode===undefined) {
+            Espruino.Core.Notifications.warning("Module "+fullModuleName+" not found");
+            return resolve();
           }
-        });
 
+          // great! it found something. Use it.
+          moduleLoaded(resolve, requires, fullModuleName, data.moduleCode, loadedModuleData, data.isMinified);
+        });
     });
   }