From 628de8ebe0206ce6b8c9961366d5e534042078ea Mon Sep 17 00:00:00 2001 From: Zoltan Toth Date: Sun, 3 Sep 2023 10:41:37 +0200 Subject: [PATCH 1/9] Log what is written --- main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/main.js b/main.js index 6e4cdb1..02af885 100644 --- a/main.js +++ b/main.js @@ -190,6 +190,7 @@ class Sainlogic extends utils.Adapter { setStates(date, obj_values) { this.setStateAsync('info.last_update', { val: date.toString(), ack: true }); + this.log.debug(`Setting value of info.last_listener_update to ${obj_values['last_listener_update']}`); this.setStateAsync('info.last_listener_update', {val: obj_values['last_listener_update'], ack:true }); for (const attr in obj_values) { From 84dcea7f6bd61059aa0f20aec780d34e82f5a855 Mon Sep 17 00:00:00 2001 From: Zoltan Toth Date: Sun, 3 Sep 2023 10:47:11 +0200 Subject: [PATCH 2/9] last_listenerupdate: not a member of json_response --- lib/listener.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/listener.js b/lib/listener.js index 447f9b3..6378a74 100644 --- a/lib/listener.js +++ b/lib/listener.js @@ -66,7 +66,7 @@ class Listener { if (my_path == this.path) { this.adapter.log.debug('Listener received WU update: ' + JSON.stringify(json_response)); // add full string property - json_response.last_listener_update = JSON.stringify(json_response); + json_response['last_listener_update'] = JSON.stringify(json_response); // this.adapter.setStateAsync('info.last_listener_update', { val: JSON.stringify(json_response), ack: true }); response.writeHead(200, { 'Content-Type': 'text/html' }); From 1b58bb09b213ef4984cdf8564a02075ceae9cba1 Mon Sep 17 00:00:00 2001 From: Zoltan Toth Date: Sun, 3 Sep 2023 10:51:47 +0200 Subject: [PATCH 3/9] x --- main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/main.js b/main.js index 02af885..760e1fb 100644 --- a/main.js +++ b/main.js @@ -192,6 +192,7 @@ class Sainlogic extends utils.Adapter { this.setStateAsync('info.last_update', { val: date.toString(), ack: true }); this.log.debug(`Setting value of info.last_listener_update to ${obj_values['last_listener_update']}`); this.setStateAsync('info.last_listener_update', {val: obj_values['last_listener_update'], ack:true }); + this.log.debug(`obj_values.last_listener_update = "${obj_values.last_listener_update}"`); for (const attr in obj_values) { // extract attribute id w/o channel From 7912fbad093cd82d32ef3ea8f4b7d4d1afe9a9ab Mon Sep 17 00:00:00 2001 From: Zoltan Toth Date: Sun, 3 Sep 2023 10:59:23 +0200 Subject: [PATCH 4/9] More log --- lib/listener.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/listener.js b/lib/listener.js index 6378a74..5b51c61 100644 --- a/lib/listener.js +++ b/lib/listener.js @@ -68,6 +68,7 @@ class Listener { // add full string property json_response['last_listener_update'] = JSON.stringify(json_response); // this.adapter.setStateAsync('info.last_listener_update', { val: JSON.stringify(json_response), ack: true }); + this.adapter.log.debug(`last_listener_update set in json_response to "${json_response['last_listener_update']}"`); response.writeHead(200, { 'Content-Type': 'text/html' }); response.end(); From 6f6a557ecd5ad0650d22ed48a68cda7ae3ac4bdf Mon Sep 17 00:00:00 2001 From: Zoltan Toth Date: Sun, 3 Sep 2023 11:22:50 +0200 Subject: [PATCH 5/9] Restore last_listener_update in constants --- lib/constants.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/lib/constants.js b/lib/constants.js index 33619a6..4810498 100644 --- a/lib/constants.js +++ b/lib/constants.js @@ -65,6 +65,19 @@ const DATAFIELDS = [ listener_conversion: null, scheduler_conversion: null }, + { + id: 'last_listener_update', + channels: [{ + channel: 'info', + name: 'Last data received from Listener (raw)' + }], + type: 'string', + wunderground: 'last_listener_update', + ecowitt: 'last_listener_update', + scheduler: null, + listener_conversion: null, + scheduler_conversion: null + }, { id: 'UVraw', channels: [{ From 0942f0ffa11d8adcd894fb60142903673a075e94 Mon Sep 17 00:00:00 2001 From: Zoltan Toth Date: Sun, 3 Sep 2023 11:30:52 +0200 Subject: [PATCH 6/9] Refine fix, remove logs --- lib/listener.js | 3 +-- main.js | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/listener.js b/lib/listener.js index 5b51c61..0eb2ebf 100644 --- a/lib/listener.js +++ b/lib/listener.js @@ -68,7 +68,6 @@ class Listener { // add full string property json_response['last_listener_update'] = JSON.stringify(json_response); // this.adapter.setStateAsync('info.last_listener_update', { val: JSON.stringify(json_response), ack: true }); - this.adapter.log.debug(`last_listener_update set in json_response to "${json_response['last_listener_update']}"`); response.writeHead(200, { 'Content-Type': 'text/html' }); response.end(); @@ -102,7 +101,7 @@ class Listener { this.adapter.log.debug('Listener body is ' + my_body); json_response = parse(my_body); this.adapter.log.debug('Listener received EW update: ' + JSON.stringify(json_response)); - json_response.last_listener_update = JSON.stringify(json_response); + json_response['last_listener_update'] = JSON.stringify(json_response); //this.adapter.setStateAsync('info.last_listener_update', { val: JSON.stringify(json_response), ack: true }); response.end('ok'); this.adapter.setStates(new Date(), this.extract_values(json_response)); diff --git a/main.js b/main.js index 760e1fb..4d74dc6 100644 --- a/main.js +++ b/main.js @@ -190,9 +190,6 @@ class Sainlogic extends utils.Adapter { setStates(date, obj_values) { this.setStateAsync('info.last_update', { val: date.toString(), ack: true }); - this.log.debug(`Setting value of info.last_listener_update to ${obj_values['last_listener_update']}`); - this.setStateAsync('info.last_listener_update', {val: obj_values['last_listener_update'], ack:true }); - this.log.debug(`obj_values.last_listener_update = "${obj_values.last_listener_update}"`); for (const attr in obj_values) { // extract attribute id w/o channel From 2ca582a108f27a92e2259e32672f84d4cd5e373f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Nov 2023 05:46:40 +0000 Subject: [PATCH 7/9] Bump axios from 0.27.2 to 1.6.0 Bumps [axios](https://github.com/axios/axios) from 0.27.2 to 1.6.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v0.27.2...v1.6.0) --- updated-dependencies: - dependency-name: axios dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- package-lock.json | 40 +++++++++++++++++++++++++++------------- package.json | 2 +- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5251d2b..50ec311 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "iobroker.sainlogic", - "version": "0.10.4", + "version": "0.11.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "iobroker.sainlogic", - "version": "0.10.4", + "version": "0.11.1", "license": "MIT", "dependencies": { "@esm2cjs/got": "^12.5.0", @@ -27,7 +27,7 @@ "@types/proxyquire": "^1.3.28", "@types/sinon": "^10.0.13", "@types/sinon-chai": "^3.2.8", - "axios": "^0.27.2", + "axios": "^1.6.0", "chai": "^4.3.6", "chai-as-promised": "^7.1.1", "eslint": "^8.23.1", @@ -844,13 +844,14 @@ } }, "node_modules/axios": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz", + "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==", "dev": true, "dependencies": { - "follow-redirects": "^1.14.9", - "form-data": "^4.0.0" + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" } }, "node_modules/bach": { @@ -5266,6 +5267,12 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "dev": true + }, "node_modules/proxyquire": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.3.tgz", @@ -7585,13 +7592,14 @@ "dev": true }, "axios": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz", + "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==", "dev": true, "requires": { - "follow-redirects": "^1.14.9", - "form-data": "^4.0.0" + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" } }, "bach": { @@ -11086,6 +11094,12 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true }, + "proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "dev": true + }, "proxyquire": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.3.tgz", diff --git a/package.json b/package.json index 1b455df..751c9a2 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@types/proxyquire": "^1.3.28", "@types/sinon": "^10.0.13", "@types/sinon-chai": "^3.2.8", - "axios": "^0.27.2", + "axios": "^1.6.0", "chai": "^4.3.6", "chai-as-promised": "^7.1.1", "eslint": "^8.23.1", From fad59f3e2f859c4195e0c9ef5cf7c77bd67727a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 06:23:11 +0000 Subject: [PATCH 8/9] Bump follow-redirects from 1.15.2 to 1.15.4 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.4. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.4) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5251d2b..f514240 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "iobroker.sainlogic", - "version": "0.10.4", + "version": "0.11.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "iobroker.sainlogic", - "version": "0.10.4", + "version": "0.11.1", "license": "MIT", "dependencies": { "@esm2cjs/got": "^12.5.0", @@ -2578,9 +2578,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "dev": true, "funding": [ { @@ -8986,9 +8986,9 @@ } }, "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "dev": true }, "for-in": { From 1e8d2f1e20945ac96b183983ea6875ce85b5d005 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 16 Mar 2024 23:24:32 +0000 Subject: [PATCH 9/9] Bump follow-redirects from 1.15.4 to 1.15.6 Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 13b32bd..aa71072 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2579,9 +2579,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", - "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "dev": true, "funding": [ { @@ -8994,9 +8994,9 @@ } }, "follow-redirects": { - "version": "1.15.4", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", - "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", + "version": "1.15.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", + "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==", "dev": true }, "for-in": {