Version v3.3.0 release

.gitignore

@@ -127,4 +127,6 @@ demo-database*
 .vscode/archive-browser
 
 build
-dist
+dist
+
+*.txt

.vscode/settings.json

@@ -9,5 +9,5 @@
     "files.exclude": {
         "**/.git": false
     },
-    "files.eol": "\n",
+    "files.eol": "\n"
 }

Dockerfile

@@ -27,7 +27,11 @@ FROM node:22-alpine
 
 WORKDIR /opt/OpenHaus/backend
 COPY --from=builder node_modules node_modules
-RUN apk --no-cache add openssl tzdata
+RUN apk --no-cache add openssl tzdata tar
+
+# copy binaries to default bin_path location
+RUN cp /bin/tar /usr/bin/tar
+RUN cp /usr/local/bin/npm /usr/bin/npm
 
 ARG version=unknown
 LABEL version=$version

components/devices/class.interface.js

@@ -3,7 +3,7 @@ const { Agent } = require("http");
 const https = require("https");
 const tls = require("tls");
 const mongodb = require("mongodb");
-const { Duplex, PassThrough } = require("stream");
+const { PassThrough, pipeline, duplexPair } = require("stream");
 const { randomUUID } = require("crypto");
 //const path = require("path");
 
@@ -176,7 +176,7 @@ module.exports = class Interface {
 
     }
 
-
+    /*
     bridge() {
 
         let { logger } = Interface.scope;
@@ -222,11 +222,21 @@ module.exports = class Interface {
 
                 }
 
+                /*
                 ["close", "end", "error"].forEach((event) => {
                     stream.on(event, (...args) => {
+                        console.log("Event", event, "on websocket stream received");
                         socket.emit(event, ...args);
                     });
                 });
+                *
+
+                stream.once("end", () => {
+                    console.log("End on websocket stream received, call end on socket stream")
+                    writable.end();
+                    readable.end();
+                    socket.end();
+                });
 
                 stream.once("destroy", () => {
                     writable.destory();
@@ -277,6 +287,70 @@ module.exports = class Interface {
 
         return socket;
 
+    }
+    */
+
+    // new approach
+    bridge() {
+
+        let { logger } = Interface.scope;
+        let { host, port, socket: proto } = this.settings;
+
+        // from this.adapter array
+        // placeholder for adapter pipeline
+        const encode = new PassThrough(); // outbound
+        const decode = new PassThrough(); // inbound
+        const [clientSock, proxySock] = duplexPair();
+
+
+        ["ref", "unref", "setKeepAlive", "setTimeout", "setNoDelay"].forEach((fnc) => {
+            clientSock[fnc] = (...args) => {
+                logger.trace(`Interface ${this._id} method "${fnc}" called on socket stream, args:`, args);
+            };
+        });
+
+        Interface.socket(this._id, (err, ws, request) => {
+
+            if (err) {
+
+                if (process.env.NODE_ENV === "development") {
+                    logger.warn(err, "Could not create socket");
+                }
+
+                return clientSock.destroy(err);
+
+            }
+
+            if (process.env.NODE_ENV === "development") {
+
+                clientSock.once("open", () => {
+                    logger.debug(`Bridge open: iface ${this._id} <-> ${proto}://${host}:${port} (${request.uuid})`);
+                });
+
+                clientSock.once("close", () => {
+                    logger.debug(`Bridge closed: iface ${this._id} <-> ${proto}://${host}:${port} (${request.uuid})`);
+                });
+
+            }
+
+            // outbound: client -> encode -> websocket
+            pipeline(proxySock, encode, ws, (err) => {
+                clientSock.destroy(err);
+            });
+
+            // inbound: websocket -> decode -> client
+            pipeline(ws, decode, proxySock, (err) => {
+                clientSock.destroy(err);
+            });
+
+            process.nextTick(() => {
+                clientSock.emit("open");
+            });
+
+        });
+
+        return clientSock;
+
     }
 
     // bridge methods connects adapter with the underlaying network socket

components/endpoints/class.command.js

@@ -11,6 +11,16 @@ const { parentPort, isMainThread } = require("worker_threads");
 const { commands } = require("../../system/worker/shared.js");
 const { randomUUID } = require("crypto");
 
+const COMMAND_HANDLER = new Set();
+
+// fix/workaround #561
+if (process.env.WORKER_THREADS_ENABLED === "true" && !isMainThread) {
+    parentPort.on("message", (msg) => {
+        COMMAND_HANDLER.forEach((handler) => {
+            handler(msg);
+        });
+    });
+}
 
 // check if a passed callback uses old
 // command arugments, or the new signature
@@ -145,7 +155,8 @@ module.exports = class Command {
 
 
         if (process.env.WORKER_THREADS_ENABLED === "true" && !isMainThread) {
-            parentPort.on("message", (msg) => {
+            //parentPort.on("message", (msg) => {
+            COMMAND_HANDLER.add((msg) => {
                 if (msg.component === "endpoints" && msg.type === "request" && msg.method === "trigger" && msg.command === this._id) {
 
                     //console.log("Received command trigger request", msg);
@@ -335,7 +346,7 @@ module.exports = class Command {
             try {
                 params = params.map((obj) => {
 
-                    if (this.params.length === 0) {
+                    if (this.params?.length <= 0) {
                         return;
                     }
 

components/endpoints/class.endpoint.js

@@ -58,7 +58,7 @@ module.exports = class Endpoint extends Item {
 
             } catch (err) {
 
-                logger.warn(err, "Could not update item states after debouncing");
+                logger.warn(err, `Could not update item states after debouncing (${this.name})`, this.states);
 
             }
         }, 100); // TODO: remove time, or set to 1/0

components/endpoints/class.param.js

@@ -1,5 +1,21 @@
 const Joi = require("joi");
 
+const CSS_CLASSES_NAMES = [
+    "hue-fader",
+    "brightness-fader",
+    "saturation-fader",
+    "fader-color-r",
+    "fader-color-g",
+    "fader-color-b"
+];
+
+const JOI_STRING_ENUM = Joi.object({
+    name: Joi.string().required(),
+    value: Joi.string().default((parent) => {
+        return parent.name.toLowerCase();
+    })
+});
+
 module.exports = class Param {
 
     constructor(obj) {
@@ -39,7 +55,12 @@ module.exports = class Param {
         return Joi.object({
             // TODO: name: Joi.string().required();
             type: Joi.string().valid("number", "string", "boolean").required(),
-            key: Joi.string().required()
+            key: Joi.string().required(),
+            // bei command/param change "sync" event auslösen für browser übergreifende sync von parametern?
+            // > jetzt via "command" event
+            // warum nicht via "update" event?
+            // why not to number?
+            classes: Joi.array().items(Joi.string().valid(...CSS_CLASSES_NAMES)).default([])
         }).when(".type", {
             switch: [{
                 is: "number",
@@ -52,8 +73,9 @@ module.exports = class Param {
             }, {
                 is: "string",
                 then: Joi.object({
-                    value: Joi.string().default(null).allow(null),
+                    value: Joi.string().default(null).allow(null, ""),
                     //default: Joi.string().allow(null).default(null)
+                    enum: Joi.array().items(JOI_STRING_ENUM).default([])
                 })
             }, {
                 is: "boolean",

components/endpoints/class.state.js

@@ -117,6 +117,8 @@ module.exports = class State {
                 is: "string",
                 then: Joi.object({
                     value: Joi.string().default(null).allow(null)
+                    // enum: Joi.array().items(Joi.string()).validate(...)
+                    // if enum are not empty, state value can only be on of the enums
                 })
             }, {
                 is: "boolean",

components/mdns/class.mdns.js

@@ -45,8 +45,22 @@ module.exports = class MDNS extends Item {
         return MDNS.schema().validate(data);
     }
 
+    static query(item) {
+
+        let { events, logger } = MDNS.scope;
+
+        // TODO: change query from string to `Symbol("kQuery")`?
+        logger.debug(`Query "${item.name}", type=${item.type}`);
+        events.emit("query", item);
+
+    }
+
     match(cb) {
         this._matches.push(cb);
     }
 
+    query() {
+        return MDNS.query(this);
+    }
+
 };

components/mdns/index.js

@@ -27,7 +27,9 @@ class C_MDNS extends COMPONENT {
     constructor() {
 
         // inject logger, collection and schema object
-        super("mdns", MDNS.schema());
+        super("mdns", MDNS.schema(), [
+            MDNS
+        ]);
 
         this.hooks.post("add", (data, next) => {
             next(null, new MDNS(data));

components/mdns/message-handler.js

@@ -99,7 +99,7 @@ module.exports = (scope) => {
                             });
 
                             _matches.forEach((cb) => {
-                                cb(record);
+                                cb(record, packet);
                             });
 
                         } else {