iobroker.loxone 2.2.3 → 3.0.1

package/package.json

@@ -1,11 +1,17 @@
 {
   "name": "iobroker.loxone",
-  "version": "2.2.3",
+  "version": "3.0.1",
   "description": "Communicates with a Loxone Miniserver.",
   "author": {
     "name": "UncleSamSwiss",
     "email": "samuel.weibel@gmail.com"
   },
+  "contributors": [
+    {
+      "name": "Robin Rainton",
+      "email": "robin@rainton.com"
+    }
+  ],
   "homepage": "https://github.com/UncleSamSwiss/ioBroker.loxone",
   "license": "Apache-2.0",
   "keywords": [
@@ -18,46 +24,49 @@
     "url": "https://github.com/UncleSamSwiss/ioBroker.loxone"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.5.0",
-    "@sentry/node": "^6.8.0",
-    "axios": "^0.21.1",
+    "@iobroker/adapter-core": "^2.6.7",
+    "@sentry/node": "^7.45.0",
+    "axios": "^1.3.4",
     "color-convert": "^2.0.1",
     "form-data": "^4.0.0",
-    "node-lox-ws-api": "^0.4.5",
+    "lxcommunicator": "^1.1.1",
     "queue-fifo": "*",
-    "sprintf-js": "^1.1.2"
+    "sprintf-js": "^1.1.2",
+    "uuid": "^9.0.0"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^2.2.0",
-    "@iobroker/adapter-dev": "^0.0.4",
-    "@iobroker/testing": "^2.4.4",
-    "@types/chai": "^4.2.19",
-    "@types/chai-as-promised": "^7.1.4",
+    "@alcalzone/release-script": "^3.5.9",
+    "@alcalzone/release-script-plugin-iobroker": "^3.5.9",
+    "@alcalzone/release-script-plugin-license": "^3.5.9",
+    "@alcalzone/release-script-plugin-manual-review": "^3.5.9",
+    "@iobroker/adapter-dev": "^1.2.0",
+    "@iobroker/testing": "^4.1.0",
+    "@types/chai": "^4.3.4",
+    "@types/chai-as-promised": "^7.1.5",
     "@types/color-convert": "^2.0.0",
-    "@types/gulp": "^4.0.8",
-    "@types/mocha": "^8.2.2",
-    "@types/node": "^15.14.1",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^18.14.2",
     "@types/proxyquire": "^1.3.28",
-    "@types/sinon": "^10.0.2",
-    "@types/sinon-chai": "^3.2.5",
+    "@types/sinon": "^10.0.11",
+    "@types/sinon-chai": "^3.2.9",
     "@types/sprintf-js": "^1.1.2",
-    "@typescript-eslint/eslint-plugin": "^4.28.2",
-    "@typescript-eslint/parser": "^4.28.2",
-    "chai": "^4.3.4",
+    "@types/uuid": "^9.0.1",
+    "@typescript-eslint/eslint-plugin": "^5.54.0",
+    "@typescript-eslint/parser": "^5.54.0",
+    "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^7.30.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "gulp": "^4.0.2",
-    "mocha": "^9.0.2",
-    "prettier": "^2.3.2",
+    "eslint": "^8.35.0",
+    "eslint-config-prettier": "^8.6.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "mocha": "^10.2.0",
+    "prettier": "^2.8.4",
     "proxyquire": "^2.1.3",
-    "rimraf": "^3.0.2",
-    "sinon": "^11.1.1",
+    "rimraf": "^4.1.2",
+    "sinon": "^15.0.3",
     "sinon-chai": "^3.7.0",
-    "source-map-support": "^0.5.19",
-    "ts-node": "^10.0.0",
-    "typescript": "^4.3.5"
+    "source-map-support": "^0.5.21",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.9.5"
   },
   "main": "build/main.js",
   "scripts": {
@@ -73,6 +82,7 @@
     "test": "npm run test:ts && npm run test:package",
     "check": "tsc --noEmit",
     "lint": "eslint --ext .ts src/",
+    "translate": "translate-adapter",
     "release": "release-script"
   },
   "bugs": {

package/build/lib/tools.js

@@ -1,96 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.translateText = exports.isArray = exports.isObject = void 0;
-const axios_1 = require("axios");
-/**
- * Tests whether the given variable is a real object and not an Array
- * @param it The variable to test
- */
-function isObject(it) {
-    // This is necessary because:
-    // typeof null === 'object'
-    // typeof [] === 'object'
-    // [] instanceof Object === true
-    return Object.prototype.toString.call(it) === '[object Object]';
-}
-exports.isObject = isObject;
-/**
- * Tests whether the given variable is really an Array
- * @param it The variable to test
- */
-function isArray(it) {
-    if (Array.isArray != null)
-        return Array.isArray(it);
-    return Object.prototype.toString.call(it) === '[object Array]';
-}
-exports.isArray = isArray;
-/**
- * Translates text using the Google Translate API
- * @param text The text to translate
- * @param targetLang The target languate
- * @param yandexApiKey The yandex API key. You can create one for free at https://translate.yandex.com/developers
- */
-async function translateText(text, targetLang, yandexApiKey) {
-    if (targetLang === 'en') {
-        return text;
-    }
-    else if (!text) {
-        return '';
-    }
-    if (yandexApiKey) {
-        return translateYandex(text, targetLang, yandexApiKey);
-    }
-    else {
-        return translateGoogle(text, targetLang);
-    }
-}
-exports.translateText = translateText;
-/**
- * Translates text with Yandex API
- * @param text The text to translate
- * @param targetLang The target languate
- * @param apiKey The yandex API key. You can create one for free at https://translate.yandex.com/developers
- */
-async function translateYandex(text, targetLang, apiKey) {
-    var _a;
-    if (targetLang === 'zh-cn') {
-        targetLang = 'zh';
-    }
-    try {
-        const url = `https://translate.yandex.net/api/v1.5/tr.json/translate?key=${apiKey}&text=${encodeURIComponent(text)}&lang=en-${targetLang}`;
-        const response = await axios_1.default({ url, timeout: 15000 });
-        if (isArray((_a = response.data) === null || _a === void 0 ? void 0 : _a.text)) {
-            return response.data.text[0];
-        }
-        throw new Error('Invalid response for translate request');
-    }
-    catch (e) {
-        throw new Error(`Could not translate to "${targetLang}": ${e}`);
-    }
-}
-/**
- * Translates text with Google API
- * @param text The text to translate
- * @param targetLang The target languate
- */
-async function translateGoogle(text, targetLang) {
-    var _a;
-    try {
-        const url = `http://translate.googleapis.com/translate_a/single?client=gtx&sl=en&tl=${targetLang}&dt=t&q=${encodeURIComponent(text)}&ie=UTF-8&oe=UTF-8`;
-        const response = await axios_1.default({ url, timeout: 15000 });
-        if (isArray(response.data)) {
-            // we got a valid response
-            return response.data[0][0][0];
-        }
-        throw new Error('Invalid response for translate request');
-    }
-    catch (e) {
-        if (((_a = e.response) === null || _a === void 0 ? void 0 : _a.status) === 429) {
-            throw new Error(`Could not translate to "${targetLang}": Rate-limited by Google Translate`);
-        }
-        else {
-            throw new Error(`Could not translate to "${targetLang}": ${e}`);
-        }
-    }
-}
-//# sourceMappingURL=tools.js.map

package/build/lib/tools.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/lib/tools.ts"],"names":[],"mappings":";;;AAAA,iCAA0B;AAE1B;;;GAGG;AACH,SAAgB,QAAQ,CAAC,EAAW;IAChC,6BAA6B;IAC7B,2BAA2B;IAC3B,yBAAyB;IACzB,gCAAgC;IAChC,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,iBAAiB,CAAC;AACpE,CAAC;AAND,4BAMC;AAED;;;GAGG;AACH,SAAgB,OAAO,CAAC,EAAW;IAC/B,IAAI,KAAK,CAAC,OAAO,IAAI,IAAI;QAAE,OAAO,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACpD,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,gBAAgB,CAAC;AACnE,CAAC;AAHD,0BAGC;AAED;;;;;GAKG;AACI,KAAK,UAAU,aAAa,CAAC,IAAY,EAAE,UAAkB,EAAE,YAAqB;IACvF,IAAI,UAAU,KAAK,IAAI,EAAE;QACrB,OAAO,IAAI,CAAC;KACf;SAAM,IAAI,CAAC,IAAI,EAAE;QACd,OAAO,EAAE,CAAC;KACb;IACD,IAAI,YAAY,EAAE;QACd,OAAO,eAAe,CAAC,IAAI,EAAE,UAAU,EAAE,YAAY,CAAC,CAAC;KAC1D;SAAM;QACH,OAAO,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;KAC5C;AACL,CAAC;AAXD,sCAWC;AAED;;;;;GAKG;AACH,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,UAAkB,EAAE,MAAc;;IAC3E,IAAI,UAAU,KAAK,OAAO,EAAE;QACxB,UAAU,GAAG,IAAI,CAAC;KACrB;IACD,IAAI;QACA,MAAM,GAAG,GAAG,+DAA+D,MAAM,SAAS,kBAAkB,CACxG,IAAI,CACP,YAAY,UAAU,EAAE,CAAC;QAC1B,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QACtD,IAAI,OAAO,CAAC,MAAA,QAAQ,CAAC,IAAI,0CAAE,IAAI,CAAC,EAAE;YAC9B,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SAChC;QACD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;KAC7D;IAAC,OAAO,CAAC,EAAE;QACR,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,MAAM,CAAC,EAAE,CAAC,CAAC;KACnE;AACL,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,eAAe,CAAC,IAAY,EAAE,UAAkB;;IAC3D,IAAI;QACA,MAAM,GAAG,GAAG,0EAA0E,UAAU,WAAW,kBAAkB,CACzH,IAAI,CACP,oBAAoB,CAAC;QACtB,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QACtD,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YACxB,0BAA0B;YAC1B,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACjC;QACD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;KAC7D;IAAC,OAAO,CAAC,EAAE;QACR,IAAI,CAAA,MAAA,CAAC,CAAC,QAAQ,0CAAE,MAAM,MAAK,GAAG,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,qCAAqC,CAAC,CAAC;SAC/F;aAAM;YACH,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,MAAM,CAAC,EAAE,CAAC,CAAC;SACnE;KACJ;AACL,CAAC"}