From 9fc0dfd70f4623fc0049423216bfd705e582363b Mon Sep 17 00:00:00 2001 From: simatec Date: Wed, 22 Jan 2025 19:26:56 +0100 Subject: [PATCH] (simatec) Beta 0.9.15 --- README.md | 5 ++ main.js | 43 +++++----- package-lock.json | 198 +++++++--------------------------------------- package.json | 4 +- 4 files changed, 60 insertions(+), 190 deletions(-) diff --git a/README.md b/README.md index 480584f..e1e5e6d 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,11 @@ When the adapter crashes or an other Code error happens, this error message that ## Changelog +### __WORK IN PROGRESS__ +* (simatec) Fix Request +* (simatec) Code Fix +* (simatec) Dependencies updated + ### 0.9.14 (2025-01-08) * (simatec) eslint-config fix * (simatec) Code fix diff --git a/main.js b/main.js index d762a8a..90a2fc7 100644 --- a/main.js +++ b/main.js @@ -247,6 +247,7 @@ async function validateURL() { available = await axios({ method: 'get', url: cloudURL[url], + timeout: 10000, validateStatus: () => true }); } catch (err) { @@ -636,27 +637,29 @@ async function requestLocalAPI(root_dataPoints, information_dataPoints, data_dat } async function setDataPoint(dataPoint, data) { - const dataPointPath = dataPoint.name; - - // @ts-ignore - if (!stateCache.includes(dataPoint.name)) { - await adapter.setObjectNotExistsAsync(dataPointPath, { - type: 'state', - common: { - role: dataPoint.role, - name: dataPoint.description, - type: dataPoint.type, - unit: dataPoint.unit, - read: true, - write: false - }, - native: {} - }); - - stateCache.push(dataPoint.name); - } + if (dataPoint?.name) { + const dataPointPath = dataPoint.name; + + // @ts-ignore + if (!stateCache.includes(dataPoint.name)) { + await adapter.setObjectNotExistsAsync(dataPointPath, { + type: 'state', + common: { + role: dataPoint.role, + name: dataPoint.description, + type: dataPoint.type, + unit: dataPoint.unit, + read: true, + write: false + }, + native: {} + }); + + stateCache.push(dataPoint.name); + } - await adapter.setStateAsync(dataPointPath, data, true); + await adapter.setStateAsync(dataPointPath, data, true); + } } async function resetValues(data_dataPoints) { diff --git a/package-lock.json b/package-lock.json index 951f36b..2119c50 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,10 +21,10 @@ "@alcalzone/release-script-plugin-manual-review": "^3.7.0", "@iobroker/adapter-dev": "^1.3.0", "@iobroker/eslint-config": "^1.0.0", - "@iobroker/testing": "^5.0.0", + "@iobroker/testing": "^5.0.2", "chai": "^4.5.0", "chai-as-promised": "^7.1.2", - "mocha": "^11.0.1", + "mocha": "^11.1.0", "sinon": "^18.0.0", "sinon-chai": "^3.7.0" }, @@ -1150,17 +1150,17 @@ } }, "node_modules/@iobroker/testing": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@iobroker/testing/-/testing-5.0.0.tgz", - "integrity": "sha512-JrtWaGrgTU5MGRZowwyrDHVz8nzh/1QUqiOo1g9SXrRwT3PH0f6wRQKfe/RKiULFD2O4N3isc7pqyZg/uv4wdA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@iobroker/testing/-/testing-5.0.2.tgz", + "integrity": "sha512-iaUdV/vXLh0yd2WNEcpzMM6B3aFiN+dziYrf2jQi5EbIS2YwOT87AhF45tA8qzIipwLJ/ZZ/SNIgIsyB8UlPVw==", "dev": true, "dependencies": { - "alcalzone-shared": "~4.0.8", + "alcalzone-shared": "~5.0.0", "chai": "^4.5.0", "chai-as-promised": "^7.1.2", - "debug": "^4.3.7", - "fs-extra": "^11.2.0", - "mocha": "^10.7.3", + "debug": "^4.4.0", + "fs-extra": "^11.3.0", + "mocha": "^11.0.1", "sinon": "^19.0.2", "sinon-chai": "^3.7.0" } @@ -1174,24 +1174,13 @@ "@sinonjs/commons": "^3.0.1" } }, - "node_modules/@iobroker/testing/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, - "node_modules/@iobroker/testing/node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "node_modules/@iobroker/testing/node_modules/alcalzone-shared": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/alcalzone-shared/-/alcalzone-shared-5.0.0.tgz", + "integrity": "sha512-X73hgVWcrIKUUB6jZgHj5flRbTft8AAoJ2MqRKEcAX1whW3OeGkxsQ6ol4nd4/rKxd1eoCRXUGW3cIhXrXU4Sg==", "dev": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" + "engines": { + "node": ">=18" } }, "node_modules/@iobroker/testing/node_modules/diff": { @@ -1204,9 +1193,9 @@ } }, "node_modules/@iobroker/testing/node_modules/fs-extra": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", - "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz", + "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==", "dev": true, "dependencies": { "graceful-fs": "^4.2.0", @@ -1217,77 +1206,6 @@ "node": ">=14.14" } }, - "node_modules/@iobroker/testing/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@iobroker/testing/node_modules/mocha": { - "version": "10.8.2", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.8.2.tgz", - "integrity": "sha512-VZlYo/WE8t1tstuRmqgeyBgCbJc/lEdopaa+axcKzTBJ+UIdlAB9XnmvTCAH4pwR4ElNInaedhEBmZD8iCSVEg==", - "dev": true, - "dependencies": { - "ansi-colors": "^4.1.3", - "browser-stdout": "^1.3.1", - "chokidar": "^3.5.3", - "debug": "^4.3.5", - "diff": "^5.2.0", - "escape-string-regexp": "^4.0.0", - "find-up": "^5.0.0", - "glob": "^8.1.0", - "he": "^1.2.0", - "js-yaml": "^4.1.0", - "log-symbols": "^4.1.0", - "minimatch": "^5.1.6", - "ms": "^2.1.3", - "serialize-javascript": "^6.0.2", - "strip-json-comments": "^3.1.1", - "supports-color": "^8.1.1", - "workerpool": "^6.5.1", - "yargs": "^16.2.0", - "yargs-parser": "^20.2.9", - "yargs-unparser": "^2.0.0" - }, - "bin": { - "_mocha": "bin/_mocha", - "mocha": "bin/mocha.js" - }, - "engines": { - "node": ">= 14.0.0" - } - }, - "node_modules/@iobroker/testing/node_modules/mocha/node_modules/diff": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", - "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, - "node_modules/@iobroker/testing/node_modules/mocha/node_modules/supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" - } - }, "node_modules/@iobroker/testing/node_modules/sinon": { "version": "19.0.2", "resolved": "https://registry.npmjs.org/sinon/-/sinon-19.0.2.tgz", @@ -1306,24 +1224,6 @@ "url": "https://opencollective.com/sinon" } }, - "node_modules/@iobroker/testing/node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@iobroker/types": { "version": "6.0.11", "resolved": "https://registry.npmjs.org/@iobroker/types/-/types-6.0.11.tgz", @@ -2764,9 +2664,9 @@ } }, "node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", "dev": true, "dependencies": { "ms": "^2.1.3" @@ -5491,9 +5391,9 @@ } }, "node_modules/mocha": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.0.1.tgz", - "integrity": "sha512-+3GkODfsDG71KSCQhc4IekSW+ItCK/kiez1Z28ksWvYhKXV/syxMlerR/sC7whDp7IyreZ4YxceMLdTs5hQE8A==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.1.0.tgz", + "integrity": "sha512-8uJR5RTC2NgpY3GrYcgpZrsEd9zKbPDpob1RezyR2upGHRQtHWofmzTMzTMSV6dru3tj5Ukt0+Vnq1qhFEEwAg==", "dev": true, "dependencies": { "ansi-colors": "^4.1.3", @@ -5513,8 +5413,8 @@ "strip-json-comments": "^3.1.1", "supports-color": "^8.1.1", "workerpool": "^6.5.1", - "yargs": "^16.2.0", - "yargs-parser": "^20.2.9", + "yargs": "^17.7.2", + "yargs-parser": "^21.1.1", "yargs-unparser": "^2.0.0" }, "bin": { @@ -5534,17 +5434,6 @@ "balanced-match": "^1.0.0" } }, - "node_modules/mocha/node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, "node_modules/mocha/node_modules/glob": { "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", @@ -5607,24 +5496,6 @@ "url": "https://github.com/chalk/supports-color?sponsor=1" } }, - "node_modules/mocha/node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -7712,12 +7583,12 @@ } }, "node_modules/yargs-parser": { - "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "dev": true, "engines": { - "node": ">=10" + "node": ">=12" } }, "node_modules/yargs-unparser": { @@ -7735,15 +7606,6 @@ "node": ">=10" } }, - "node_modules/yargs/node_modules/yargs-parser": { - "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "dev": true, - "engines": { - "node": ">=12" - } - }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/package.json b/package.json index 09395ef..e180be2 100644 --- a/package.json +++ b/package.json @@ -35,10 +35,10 @@ "@alcalzone/release-script-plugin-manual-review": "^3.7.0", "@iobroker/adapter-dev": "^1.3.0", "@iobroker/eslint-config": "^1.0.0", - "@iobroker/testing": "^5.0.0", + "@iobroker/testing": "^5.0.2", "chai": "^4.5.0", "chai-as-promised": "^7.1.2", - "mocha": "^11.0.1", + "mocha": "^11.1.0", "sinon": "^18.0.0", "sinon-chai": "^3.7.0" },