iobroker.javascript 8.9.2 → 9.0.0

package/docs/de/README.md

@@ -1,4 +1,4 @@
-![Logo](../../admin/javascript.png)
+<img src="../../admin/javascript.svg" alt="ioBroker.javascript" width="100" />
 
 # ioBroker.javascript
 

package/docs/en/README.md

@@ -1,4 +1,4 @@
-![Logo](../../admin/javascript.png)
+<img src="../../admin/javascript.svg" alt="ioBroker.javascript" width="100" />
 
 # ioBroker.javascript
 

package/docs/en/javascript.md

@@ -1299,6 +1299,8 @@ formatTimeDiff(milliseconds, format);
 * ss, сс(cyrillic) - full seconds, e.g. "05"
 * s, с(cyrillic) - short seconds, e.g., "5"
 
+You can use escape charachter `\` to avoid the replacement. e.g. `DD \Day\s, h \hour\s, m \minute, ss \second\s`
+
 #### Example
 
 ```js
@@ -1727,7 +1729,7 @@ Same as [wait](#wait)
 
 ### messageTo
 ```js
-messageTo({ instance: 'instance', script: 'script.js.common.scriptName', message: 'messageName' }, data, {timeout: 1000}, result =>
+messageTo({ instance: 'instance', script: 'script.js.common.scriptName', message: 'messageName' }, data, { timeout: 1000 }, result =>
     log(JSON.stringify(result)));
 ```
 
@@ -1738,7 +1740,7 @@ Timeout for callback is 5 seconds by default.
 The target could be shorted to:
 
 ```js
-messageTo('messageName', data, result => {
+messageTo('messageName', data, (result) => {
     log(JSON.stringify(result));
 });
 ```
@@ -1777,7 +1779,9 @@ onMessage('myTopic', async (data, callback) => {
 ### onMessage
 ```js
 onMessage('messageName', (data, callback) => {
-    log(`Received data: ${data}`); callback({ result: Date.now() });
+    log(`Received data: ${data}`);
+
+    callback({ result: Date.now() });
 });
 ```
 
@@ -1808,7 +1812,7 @@ iob message javascript.0 toScript '{"script": "script.js.messagetest", "message"
 ```js
 const id = onMessage('messageName', (data, callback) => {
     log(data);
-    callback(Date.now());
+    callback({ result: Date.now() });
 });
 
 // unsubscribe specific handler
@@ -1980,11 +1984,11 @@ httpPost(
 *Requires version >= 8.3.0*
 
 ```js
-httpGet('https://raw.githubusercontent.com/ioBroker/ioBroker.javascript/master/admin/javascript.png', { responseType: 'arraybuffer' }, async (err, response) => {
+httpGet('https://raw.githubusercontent.com/ioBroker/ioBroker.javascript/master/admin/javascript.svg', { responseType: 'arraybuffer' }, async (err, response) => {
     if (err) {
         console.error(err);
     } else {
-        const tempFilePath = createTempFile('javascript.png', response.data);
+        const tempFilePath = createTempFile('javascript.svg', response.data);
         console.log(`Saved to ${tempFilePath}`);
 
         // Use the new path in other scripts (e.g. sendTo)

package/docs/ru/README.md

@@ -1,4 +1,4 @@
-![Logo](../../admin/javascript.png)
+<img src="../../admin/javascript.svg" alt="ioBroker.javascript" width="100" />
 
 # ioBroker.javascript
 

package/install/installTypings.js

@@ -1,6 +1,6 @@
 'use strict';
 
-// The adapter includes typings for the lowest supported NodeJS version.
+// The adapter includes typings for the lowest supported Node.js version.
 // This script updates them to the installed version
 
 const { spawn } = require('node:child_process');
@@ -16,29 +16,6 @@ function fail(reason) {
 
 // Find the latest version on npm
 console.log('Installing NodeJS typings...');
-npmCommand('view', ['@types/node', 'version'], {stdout: 'pipe', stderr: 'pipe'})
-    .then(cmdResult => {
-        if (cmdResult.exitCode !== 0) {
-            return fail(cmdResult.stderr);
-        }
-        const latestVersion = semver.coerce(cmdResult.stdout).major;
-        console.log(`latest @types: ${latestVersion}, installed node: ${installedNodeVersion}`);
-        return semver.gt(`${installedNodeVersion}.0.0`, `${latestVersion}.0.0`)
-            ? 'latest' // The installed version is too new, install latest
-            : installedNodeVersion.toString()
-        ;
-    })
-    .then(targetVersion => {
-        // Install the desired version
-        return npmCommand('i', [`@types/node@${targetVersion}`], {stdout: 'ignore', stderr: 'pipe'});
-    })
-    .then(cmdResult => {
-        if (cmdResult.exitCode !== 0) {
-            return fail(cmdResult.stderr);
-        } else {
-            process.exit(0);
-        }
-    });
 
 // TODO: the following code is copied from a js-controller fork
 // It should be moved to the core and referenced from there in a future version
@@ -60,7 +37,7 @@ npmCommand('view', ['@types/node', 'version'], {stdout: 'pipe', stderr: 'pipe'})
  */
 
 /**
- * Executes an npm command (e.g. install) and returns the exit code and (if requested) the stdout
+ * Executes a npm command (e.g., install) and returns the exit code and (if requested) the stdout
  * @param {string} command The npm command to execute
  * @param {string[]} [npmArgs] The command line arguments for the npm command
  * @param {Partial<NpmCommandOptions>} [options] (optional) Some options for the command execution
@@ -78,50 +55,39 @@ function npmCommand(command, npmArgs, options) {
     const npmBinary = /^win/.test(process.platform) ? 'npm.cmd' : 'npm';
     /** @type {import("child_process").SpawnOptions} */
     const spawnOptions = {
-        stdio: [
-            options.stdin || process.stdin,
-            options.stdout || process.stdout,
-            options.stderr || process.stderr,
-        ],
+        stdio: [options.stdin || process.stdin, options.stdout || process.stdout, options.stderr || process.stderr],
         // @ts-ignore This option exists starting with NodeJS 8
         windowsHide: true,
     };
     if (options.cwd != null) spawnOptions.cwd = options.cwd;
 
     // Now execute the npm process and avoid throwing errors
-    return new Promise((resolve) => {
+    return new Promise(resolve => {
         try {
             /** @type {string} */
             let bufferedStdout;
             /** @type {string} */
             let bufferedStderr;
-            const cmd = spawn(npmBinary, [command].concat(npmArgs), spawnOptions)
-                .on('close', (code, signal) => {
-                    resolve({
-                        exitCode: code,
-                        signal,
-                        stdout: bufferedStdout,
-                        stderr: bufferedStderr
-                    });
+            const cmd = spawn(npmBinary, [command].concat(npmArgs), spawnOptions).on('close', (code, signal) => {
+                resolve({
+                    exitCode: code,
+                    signal,
+                    stdout: bufferedStdout,
+                    stderr: bufferedStderr,
                 });
+            });
             // Capture stdout/stderr if requested
             if (options.stdout === 'pipe') {
                 bufferedStdout = '';
                 cmd.stdout.on('data', chunk => {
-                    const buffer = Buffer.isBuffer(chunk)
-                        ? chunk
-                        : new Buffer(chunk, 'utf8')
-                        ;
+                    const buffer = Buffer.isBuffer(chunk) ? chunk : new Buffer(chunk, 'utf8');
                     bufferedStdout += buffer;
                 });
             }
             if (options.stderr === 'pipe') {
                 bufferedStderr = '';
                 cmd.stderr.on('data', chunk => {
-                    const buffer = Buffer.isBuffer(chunk)
-                        ? chunk
-                        : new Buffer(chunk, 'utf8')
-                        ;
+                    const buffer = Buffer.isBuffer(chunk) ? chunk : new Buffer(chunk, 'utf8');
                     bufferedStderr += buffer;
                 });
             }
@@ -130,3 +96,24 @@ function npmCommand(command, npmArgs, options) {
         }
     });
 }
+
+npmCommand('view', ['@types/node', 'version'], { stdout: 'pipe', stderr: 'pipe' })
+    .then(cmdResult => {
+        if (cmdResult.exitCode !== 0) {
+            return fail(cmdResult.stderr);
+        }
+        const latestVersion = semver.coerce(cmdResult.stdout).major;
+        console.log(`latest @types: ${latestVersion}, installed node: ${installedNodeVersion}`);
+        return semver.gt(`${installedNodeVersion}.0.0`, `${latestVersion}.0.0`)
+            ? 'latest' // The installed version is too new, install latest
+            : installedNodeVersion.toString();
+    })
+    // Install the desired version
+    .then(targetVersion => npmCommand('i', [`@types/node@${targetVersion}`], { stdout: 'ignore', stderr: 'pipe' }))
+    .then(cmdResult => {
+        if (cmdResult.exitCode !== 0) {
+            fail(cmdResult.stderr);
+        } else {
+            process.exit(0);
+        }
+    });

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "javascript",
-    "version": "8.9.2",
+    "version": "9.0.0",
     "blockedVersions": [
       "8.0.0",
       "8.0.1"
@@ -40,6 +40,19 @@
       "Matthias Kleine <info@haus-automatisierung.com>"
     ],
     "news": {
+      "9.0.0": {
+        "en": "Added possibility to escape chars in formatTimeDiff\nBack-end was migrated to TypeScript\nBreaking change: removed \"require\" module\nAdded prettier for scripts",
+        "de": "Zusätzliche Möglichkeit, Zeichen im Format zu entkommen TimeDiff\nBackend wurde zu TypeScript migriert\nBruchänderung: entferntes \"erforderliches\" Modul\nHinzugefügt schöner für Scripts",
+        "ru": "Добавлена возможность побега чаров в формате тайм-дифф\nBack-end был перенесен на TypeScript\nПереломное изменение: удален модуль «Требовать»\nДобавлено красивее для сценариев",
+        "pt": "Adicionado possibilidade de escapar de chars em formato Ponto de vista\nO back-end foi migrado para TypeScript\nAlteração de ruptura: módulo \"require\" removido\nAdicionado mais bonito para scripts",
+        "nl": "Toegevoegd mogelijkheid om te ontsnappen tekens in formaat TimeDiff\nBack-end is gemigreerd naar TypeScript\nBreaking change: \"Require\" module verwijderd\nMooier toegevoegd voor scripts",
+        "fr": "Ajout de la possibilité d'échapper aux caractères dans le format TimeDiff\nBack-end a été migré vers TypeScript\nChangement de rupture : a supprimé le module \"requérir\"\nAjout de joli pour les scripts",
+        "it": "Aggiunta possibilità di sfuggire a chars in formato Orario\nBack-end è stato migrato a TypeScript\nCambiamento di rottura: rimosso modulo \"require\"\nAggiunto più bello per gli script",
+        "es": "Añadido posibilidad de escapar de los charcos en formato TimeDiff\nBack-end fue migrado a TipoScript\nCambio de ruptura: módulo \"requiere\" eliminado\nAñadido más alto para scripts",
+        "pl": "Dodano możliwość ucieczki znaków w formacie TimeDiff\nBack- end został przeniesiony do TypeScript\nZmiana łamania: usunięty moduł \"require\"\nDodano ładniejsze dla skryptów",
+        "uk": "Додано можливість втекти chars у форматі Час\nBack-end був мігрований до TypeScript\nЗміна несправностей: видалений модуль \"потрібно\"\nДодано претtier для скриптів",
+        "zh-cn": "添加格式跳过字符的可能性 时间\n后端已迁移到类型脚本\n中断更改: 删除“ 要求” 模块\n为脚本添加更美的"
+      },
       "8.9.2": {
         "en": "Updated packages for GUI\nUsed TypeScript for an admin component",
         "de": "Aktualisierte Pakete für GUI\nGebrauchte TypeScript für eine Admin-Komponente",
@@ -117,19 +130,6 @@
         "pl": "zaktualizowane zależności",
         "uk": "оновлені залежності",
         "zh-cn": "更新的依赖关系"
-      },
-      "8.8.0": {
-        "en": "Added option to register notifications via scripts\nFixed sendTo block with empty name list",
-        "de": "Option hinzugefügt, um Benachrichtigungen über Skripte zu registrieren\nFester Versand Blockieren mit leerer Namensliste",
-        "ru": "Добавлена возможность регистрации уведомлений через скрипты\nFixed send Заблокировать с пустым списком имен",
-        "pt": "Opção adicionada para registrar notificações via scripts\nEnviar fixo Para bloquear com lista de nomes vazia",
-        "nl": "Toegevoegd optie om meldingen te registreren via scripts\nVaste verzending Te blokkeren met lege naamlijst",
-        "fr": "Ajout d'une option pour enregistrer les notifications via des scripts\nEnvoi fixe Pour bloquer avec la liste des noms vides",
-        "it": "Aggiunta opzione per registrare le notifiche tramite script\nInviato fisso Per bloccare con l'elenco dei nomi vuoti",
-        "es": "Opción agregada para registrar notificaciones a través de scripts\nEnvío fijo Para bloquear con lista de nombres vacía",
-        "pl": "Dodano opcję rejestracji powiadomień za pomocą skryptów\nPoprawiono wysyłanie Blokowanie z pustą listą nazw",
-        "uk": "Додано опцію для реєстрації повідомлень через скрипти\nВиправлена відправка Заблокувати список порожніх імен",
-        "zh-cn": "添加通过脚本注册通知的选项\n固定发送 以空名称列表屏蔽"
       }
     },
     "platform": "Javascript/Node.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.javascript",
-  "version": "8.9.2",
+  "version": "9.0.0",
   "description": "Rules Engine for ioBroker",
   "author": "bluefox <dogafox@gmail.com>",
   "contributors": [
@@ -43,18 +43,17 @@
   "dependencies": {
     "@iobroker/adapter-core": "^3.2.3",
     "@iobroker/types": "^7.0.7",
-    "@types/node": "^22.10.10",
-    "@types/request": "^2.48.12",
+    "@types/node": "^22.15.29",
     "axios": "^1.9.0",
     "jsonata": "^2.0.6",
     "jszip": "^3.10.1",
     "node-inspect": "^2.0.0",
     "node-schedule": "2.1.1",
+    "prettier": "^3.5.3",
     "promisify-child-process": "^4.1.2",
-    "request": "^2.88.2",
-    "semver": "^7.7.1",
+    "semver": "^7.7.2",
     "suncalc2": "^1.8.1",
-    "typescript": "~5.7.3",
+    "typescript": "~5.8.3",
     "virtual-tsc": "^0.6.2",
     "wake_on_lan": "^1.0.0"
   },
@@ -64,8 +63,9 @@
     "@alcalzone/release-script-plugin-license": "^3.7.0",
     "@iobroker/adapter-dev": "^1.4.0",
     "@iobroker/build-tools": "^2.0.15",
-    "@iobroker/eslint-config": "^2.0.1",
+    "@iobroker/eslint-config": "^2.0.2",
     "@iobroker/testing": "^5.0.4",
+    "@iobroker/plugin-sentry": "^2.0.4",
     "@iobroker/vis-2-widgets-react-dev": "^4.0.4",
     "@types/node-schedule": "^2.1.7",
     "@types/nodemailer": "^6.4.17",
@@ -77,15 +77,14 @@
   "bugs": {
     "url": "https://github.com/ioBroker/ioBroker.javascript/issues"
   },
-  "main": "main.js",
+  "main": "build-backend/main.js",
   "files": [
     "admin/",
-    "lib/",
+    "build-backend/",
     "docs/",
     "install/",
     "io-package.json",
     "LICENSE",
-    "main.js",
     "admin/vsFont/codicon.json"
   ],
   "scripts": {
@@ -94,12 +93,13 @@
     "test": "npm run test:declarations && npm run test:javascript",
     "translate": "translate-adapter",
     "//postinstall": "node ./install/installTypings.js",
-    "build": "node tasks",
+    "build": "npm run build-backend && node tasks",
+    "build-backend": "tsc -p tsconfig.build.json",
     "release": "release-script --noPush -y --all",
-    "update-packages": "ncu --upgrade && cd src && ncu --upgrade && cd ../src-admin && ncu --upgrade",
-    "npm": "npm i && cd src-editor && npm i -f && cd ../src-admin && npm i -f",
+    "update-packages": "npx -y npm-check-updates --upgrade && cd src-editor && npx -y npm-check-updates --upgrade && cd ../src-admin && npx -y npm-check-updates --upgrade",
+    "npm": "npm i && cd src-editor && npm i -f && cd ../src-admin && npm i",
     "lint": "eslint -c eslint.config.mjs",
-    "lint-all": "eslint -c eslint.config.mjs && cd src && eslint -c eslint.config.mjs && cd ../src-admin && eslint -c eslint.config.mjs",
+    "lint-all": "eslint -c eslint.config.mjs && cd src-editor && eslint -c eslint.config.mjs && cd ../src-admin && eslint -c eslint.config.mjs",
     "admin-0-clean": "node tasks.js --admin-0-clean",
     "admin-1-npm": "node tasks.js --admin-1-npm",
     "admin-2-compile": "node tasks.js --admin-2-compile",