iobroker.javascript 7.10.2 → 7.11.0

package/lib/sandbox.js

@@ -4,7 +4,7 @@
 
 'use strict';
 
-const { isObject, isArray, promisify } = require('./tools');
+const { isObject, isArray, promisify, getHttpRequestConfig } = require('./tools');
 const utils = require('@iobroker/adapter-core');
 const pattern2RegEx = utils.commonTools.pattern2RegEx;
 // let context = {
@@ -1198,44 +1198,8 @@ function sandBox(script, name, verbose, debug, context) {
             }
 
             const config = {
+                ...getHttpRequestConfig(url, options),
                 method: 'get',
-                url,
-                validateStatus: (status) => status >= 200,
-                responseType: 'text',
-                responseEncoding: 'utf8',
-            };
-
-            config.timeout = (options && options.timeout) ? options.timeout : 2000;
-
-            if (!options.headers) {
-                options.headers = {};
-            }
-
-            if (options && options.basicAuth) {
-                config.auth = {
-                    username: options.basicAuth.user,
-                    password: options.basicAuth.password,
-                };
-            } else if (options.bearerAuth) {
-                options.headers['Authorization'] = `Bearer ${options.bearerAuth}`;
-            } else {
-                const uri = new URL(url);
-                if (uri.username && uri.password) {
-                    const username = decodeURIComponent(uri.username);
-                    const password = decodeURIComponent(uri.password);
-
-                    config.url = config.url.replace(`${uri.protocol}//${username}:${password}@`, `${uri.protocol}//`);
-                    config.auth = {
-                        username,
-                        password,
-                    };
-                }
-            }
-
-            // Set default headers
-            config.headers = {
-                'User-Agent': 'Mozilla/5.0 (X11; Linux i686; rv:109.0) Gecko/20100101 Firefox/121.0',
-                ...options.headers,
             };
 
             sandbox.verbose && sandbox.log(`httpGet(config=${JSON.stringify(config)})`, 'info');
@@ -1250,34 +1214,30 @@ function sandBox(script, name, verbose, debug, context) {
                                 headers: response.headers,
                             });
                         } catch (e) {
-                            errorInCallback(e); //adapter.log.error('Error in callback: ' + e)
+                            errorInCallback(e);
                         }
                     }
                 })
                 .catch(error => {
-                    if (error.response) {
-                        if (typeof callback === 'function') {
-                            try {
-                                callback.call(sandbox, error.message, {
-                                    statusCode: error.response.status,
-                                    data: error.response.data,
-                                    headers: error.response.headers,
-                                });
-                            } catch (e) {
-                                errorInCallback(e); //adapter.log.error('Error in callback: ' + e)
-                            }
+                    if (typeof callback === 'function') {
+                        let result = {
+                            statusCode: null,
+                            data: null,
+                            headers: {},
+                        };
+
+                        if (error.response) {
+                            result = {
+                                statusCode: error.response.status,
+                                data: error.response.data,
+                                headers: error.response.headers,
+                            };
                         }
-                    } else {
-                        if (typeof callback === 'function') {
-                            try {
-                                callback.call(sandbox, error.message, {
-                                    statusCode: null,
-                                    data: null,
-                                    headers: {},
-                                });
-                            } catch (e) {
-                                errorInCallback(e); //adapter.log.error('Error in callback: ' + e)
-                            }
+
+                        try {
+                            callback.call(sandbox, error.message, result);
+                        } catch (e) {
+                            errorInCallback(e);
                         }
                     }
                 });
@@ -1289,45 +1249,8 @@ function sandBox(script, name, verbose, debug, context) {
             }
 
             const config = {
+                ...getHttpRequestConfig(url, options),
                 method: 'post',
-                url,
-                data,
-                validateStatus: (status) => status >= 200,
-                responseType: 'text',
-                responseEncoding: 'utf8',
-            };
-
-            config.timeout = (options && options.timeout) ? options.timeout : 2000;
-
-            if (!options.headers) {
-                options.headers = {};
-            }
-
-            if (options && options.basicAuth) {
-                config.auth = {
-                    username: options.basicAuth.user,
-                    password: options.basicAuth.password,
-                };
-            } else if (options.bearerAuth) {
-                options.headers['Authorization'] = `Bearer ${options.bearerAuth}`;
-            } else {
-                const uri = new URL(url);
-                if (uri.username && uri.password) {
-                    const username = decodeURIComponent(uri.username);
-                    const password = decodeURIComponent(uri.password);
-
-                    config.url = config.url.replace(`${uri.protocol}//${username}:${password}@`, `${uri.protocol}//`);
-                    config.auth = {
-                        username,
-                        password,
-                    };
-                }
-            }
-
-            // Set default headers
-            config.headers = {
-                'User-Agent': 'Mozilla/5.0 (X11; Linux i686; rv:109.0) Gecko/20100101 Firefox/121.0',
-                ...options.headers,
             };
 
             sandbox.verbose && sandbox.log(`httpPost(config=${JSON.stringify(config)}, data=${data})`, 'info');
@@ -1342,34 +1265,30 @@ function sandBox(script, name, verbose, debug, context) {
                                 headers: response.headers,
                             });
                         } catch (e) {
-                            errorInCallback(e); //adapter.log.error('Error in callback: ' + e)
+                            errorInCallback(e);
                         }
                     }
                 })
                 .catch(error => {
-                    if (error.response) {
-                        if (typeof callback === 'function') {
-                            try {
-                                callback.call(sandbox, error.message, {
-                                    statusCode: error.response.status,
-                                    data: error.response.data,
-                                    headers: error.response.headers,
-                                });
-                            } catch (e) {
-                                errorInCallback(e); //adapter.log.error('Error in callback: ' + e)
-                            }
+                    if (typeof callback === 'function') {
+                        let result = {
+                            statusCode: null,
+                            data: null,
+                            headers: {},
+                        };
+
+                        if (error.response) {
+                            result = {
+                                statusCode: error.response.status,
+                                data: error.response.data,
+                                headers: error.response.headers,
+                            };
                         }
-                    } else {
-                        if (typeof callback === 'function') {
-                            try {
-                                callback.call(sandbox, error.message, {
-                                    statusCode: null,
-                                    data: null,
-                                    headers: {},
-                                });
-                            } catch (e) {
-                                errorInCallback(e); //adapter.log.error('Error in callback: ' + e)
-                            }
+
+                        try {
+                            callback.call(sandbox, error.message, result);
+                        } catch (e) {
+                            errorInCallback(e);
                         }
                     }
                 });
@@ -3417,9 +3336,9 @@ function sandBox(script, name, verbose, debug, context) {
             if (format.match(/[WНOО]+/)) {
                 let text = adapter.formatDate(date, format);
                 if (!language || !consts.dayOfWeeksFull[language]) {
-                    language = adapter.language || (objects['system.config'] && objects['system.config'].common && objects['system.config'].common.language) || 'de';
+                    language = adapter.language || (objects['system.config'] && objects['system.config'].common && objects['system.config'].common.language) || 'en';
                     if (!consts.dayOfWeeksFull[language]) {
-                        language = 'de';
+                        language = 'en';
                     }
                 }
                 if (typeof date === 'number' || typeof date === 'string') {
@@ -3569,7 +3488,15 @@ function sandBox(script, name, verbose, debug, context) {
             _adapter = _adapter || '0_userdata.0';
             sandbox.verbose && sandbox.log(`readFile(adapter=${_adapter}, fileName=${fileName})`, 'info');
 
-            adapter.readFile(_adapter, fileName, callback);
+            adapter.fileExists(_adapter, fileName, (error, result) => {
+                if (error) {
+                    callback(error);
+                } else if (!result) {
+                    callback('Not exists');
+                } else {
+                    adapter.readFile(_adapter, fileName, callback);
+                }
+            });
         },
         unlink: function (_adapter, fileName, callback) {
             if (typeof fileName === 'function') {

package/lib/tools.js

@@ -1,8 +1,8 @@
 'use strict';
 
-const fs     = require('fs');
-const path   = require('path');
-const crypto = require('crypto');
+const fs     = require('node:fs');
+const path   = require('node:path');
+const crypto = require('node:crypto');
 
 /**
  * Tests whether the given variable is a real object and not an Array
@@ -125,6 +125,50 @@ function hashSource(source) {
     return crypto.createHash('md5').update(source).digest('hex');
 }
 
+function getHttpRequestConfig(url, options) {
+    const config = {
+        method: 'get',
+        url,
+        validateStatus: (status) => status >= 200,
+        responseType: (options && options.responseType) ? options.responseType : 'text',
+        responseEncoding: 'utf8',
+        timeout: (options && !isNaN(options.timeout)) ? options.timeout : 2000
+    };
+
+    if (!options.headers) {
+        options.headers = {};
+    }
+
+    if (options && options.basicAuth) {
+        config.auth = {
+            username: options.basicAuth.user,
+            password: options.basicAuth.password,
+        };
+    } else if (options.bearerAuth) {
+        options.headers['Authorization'] = `Bearer ${options.bearerAuth}`;
+    } else {
+        const uri = new URL(url);
+        if (uri.username && uri.password) {
+            const username = decodeURIComponent(uri.username);
+            const password = decodeURIComponent(uri.password);
+
+            config.url = config.url.replace(`${uri.protocol}//${username}:${password}@`, `${uri.protocol}//`);
+            config.auth = {
+                username,
+                password,
+            };
+        }
+    }
+
+    // Set default headers
+    config.headers = {
+        'User-Agent': 'Mozilla/5.0 (X11; Linux i686; rv:109.0) Gecko/20100101 Firefox/121.0',
+        ...options.headers,
+    };
+
+    return config;
+}
+
 module.exports = {
     isArray,
     isObject,
@@ -133,4 +177,5 @@ module.exports = {
     promisify,
     promisifyNoError,
     hashSource,
+    getHttpRequestConfig,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.javascript",
-  "version": "7.10.2",
+  "version": "7.11.0",
   "description": "Rules Engine for ioBroker",
   "author": "bluefox <dogafox@gmail.com>",
   "contributors": [
@@ -41,7 +41,7 @@
     "@types/node": "should match the lowest MAJOR version of Node.js we support."
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.0.4",
+    "@iobroker/adapter-core": "^3.0.6",
     "@types/node": "^20.11.30",
     "@types/request": "^2.48.12",
     "axios": "^1.6.8",