iobroker.javascript 8.7.5 → 8.7.6

package/lib/sandbox.js

@@ -541,24 +541,30 @@ function sandBox(script, name, verbose, debug, context) {
                 }
             }
 
-            if (!mods[md]) {
+            if (mods[md]) {
+                return mods[md];
+            }
+
+
+            let error;
+
+            try {
+                mods[md] = require(adapter.getAdapterScopedPackageIdentifier ? adapter.getAdapterScopedPackageIdentifier(md) : md);
+                return mods[md];
+            } catch (e) {
+                error = e;
+            }
+
+            try {
                 // the user requires a module which is not specified in the additional node modules
                 // for backward compatibility we check if the module can simply be required directly before we fail (e.g. direct dependencies of javascript adapter)
                 adapter.log.debug(`Try direct require of "${md}" as not specified in the additional dependencies`);
                 mods[md] = require(md);
-            }
 
-            if (mods[md]) {
                 return mods[md];
-            } else {
-                try {
-                    mods[md] = require(adapter.getAdapterScopedPackageIdentifier ? adapter.getAdapterScopedPackageIdentifier(md) : md);
-
-                    return mods[md];
-                } catch (e) {
-                    adapter.setState(`scriptProblem.${name.substring('script.js.'.length)}`, { val: true, ack: true, c: 'require' });
-                    context.logError(name, e, 6);
-                }
+            } catch (e) {
+                context.logError(name, error || e, 6);
+                adapter.setState(`scriptProblem.${name.substring('script.js.'.length)}`, { val: true, ack: true, c: 'require' });
             }
         },
         Buffer: Buffer,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.javascript",
-  "version": "8.7.5",
+  "version": "8.7.6",
   "description": "Rules Engine for ioBroker",
   "author": "bluefox <dogafox@gmail.com>",
   "contributors": [