From 057480554142f47bbfee03fa804c0ba89d89a019 Mon Sep 17 00:00:00 2001 From: Marc Stirner Date: Sat, 13 Jan 2024 11:49:35 +0100 Subject: [PATCH 1/3] fix #406 --- components/store/index.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/components/store/index.js b/components/store/index.js index d49fb60..393ca9b 100644 --- a/components/store/index.js +++ b/components/store/index.js @@ -3,6 +3,7 @@ const COMPONENT = require("../../system/component/class.component.js"); //const Value = require("./class.value.js"); //const Namespace = require("./class.namespace.js"); const Store = require("./class.store.js"); +const Value = require("./class.value.js"); /** * @description @@ -39,6 +40,19 @@ class C_STORE extends COMPONENT { next(null, new Store(data, this)); }); + // fix #406 + this.hooks.post("update", (data, next) => { + + data.config.forEach((value, i, arr) => { + if (!(value instanceof Value)) { + arr[i] = new Value(value); + } + }); + + next(); + + }); + this.collection.createIndex("uuid", { unique: true }); From 6489b7c8212da2dfd8d31c85adc68eaca9b033f7 Mon Sep 17 00:00:00 2001 From: Marc Stirner Date: Tue, 16 Jan 2024 14:28:37 +0100 Subject: [PATCH 2/3] fix #411 --- components/devices/class.interface.js | 39 ++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/components/devices/class.interface.js b/components/devices/class.interface.js index dbf24bc..701d102 100644 --- a/components/devices/class.interface.js +++ b/components/devices/class.interface.js @@ -219,8 +219,23 @@ module.exports = class Interface { //let settings = this.settings; + /* + // added for testing a solution for #411 + // does nothing/not work, but feels like can be useful in the future + // see: + // - https://nodejs.org/docs/latest/api/http.html#agentkeepsocketalivesocket + // - https://nodejs.org/docs/latest/api/http.html#agentkeepsocketalivesocket + agent.keepSocketAlive = (socket) => { + console.log("agent.keepSocketAlive called"); + return true; + }; + + agent.reuseSocket = (socket, request) => { + console.log("agent.reuseSocket called"); + }; + */ - agent.createConnection = () => { + agent.createConnection = ({ headers = {} }) => { //console.log(`############## Create connection to tcp://${host}:${port}`); @@ -243,17 +258,33 @@ module.exports = class Interface { //let readable = new PassThrough(); //let writable = new PassThrough(); + // convert headers key/values to lowercase + // the string conversion prevents a error thrown for numbers + // this happens for websocket requests, where e.g. "sec-websocket-version=13" + // see snipp below "detect websocket connection with set headers" + headers = Object.keys(headers).reduce((obj, key) => { + obj[key.toLowerCase()] = `${headers[key]}`.toLowerCase(); + return obj; + }, {}); + + let readable = new Transform({ transform(chunk, enc, cb) { - //console.log("[incoming]", chunk.toString()); + //console.log("[incoming]", chunk); // temp fix for #343 // this is not the prefered fix for this issue // it should be handled on "stream/socket" level instead // the issue above occoured with a "shelly 1pm" and parallel requests to /status /ota /settings // NOTE: what if the body contains json that has a `connection: close` property/key/value? - chunk = chunk.toString().replace(/connection:\s?close\r\n/i, "connection: keep-alive\r\n"); + + // detect websocket connection with set headers, fix #411 + // agent.protocol is never "ws" regardless of the url used in requests + // temp solution, more like a hotfix than a final solution + if (agent.protocol === "http:" && !(headers?.upgrade === "websocket" && headers?.connection === "upgrade")) { + chunk = chunk.toString().replace(/connection:\s?close\r\n/i, "connection: keep-alive\r\n"); + } this.push(chunk); cb(); @@ -264,7 +295,7 @@ module.exports = class Interface { let writable = new Transform({ transform(chunk, enc, cb) { - //console.log("[outgoing]", chunk.toString()); + //console.log("[outgoing]", chunk); this.push(chunk); cb(); From a9c417fc8fece92687b1ffe10a67d6d74d15db0f Mon Sep 17 00:00:00 2001 From: Marc Stirner Date: Tue, 16 Jan 2024 14:29:17 +0100 Subject: [PATCH 3/3] fix #412 --- components/endpoints/class.state.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/components/endpoints/class.state.js b/components/endpoints/class.state.js index b1403a4..8fe1970 100644 --- a/components/endpoints/class.state.js +++ b/components/endpoints/class.state.js @@ -43,6 +43,10 @@ module.exports = class State { }, set: (value) => { + if (this.type === "number" && this.invert && value < 0) { + value = value * -1; + } + // check for value type, but allow null value if (((typeof value) !== this.type) && (value !== null)) { // TODO: uncomment & make active @@ -106,7 +110,8 @@ module.exports = class State { then: Joi.object({ value: Joi.number().default(null).allow(null), min: Joi.number().default(0), - max: Joi.number().default(100) + max: Joi.number().default(100), + invert: Joi.boolean().default(false) }) }, { is: "string",