homebridge-smartsystem 6.4.2 → 6.4.4

package/README.md

@@ -285,7 +285,7 @@ Homebridge UI version
 ### v6.4.x - 28-11-2022 - Binding to registers
 - 0: writing to registers
 - 1: ask/show protocol version -> publish
-- 2: test on firmware version, not protocol for using registers, due to bug in master firmware pre v101.x 
+- 2 & 3: test on protocol version, not firmware for using registers, due to bug in master firmware pre v101.x 
 
 ## Hardware 
 A Raspberry Pi that connects to a Duotecno IP Node 

package/config.json

@@ -167,10 +167,13 @@
       }
     ]
   },
+  "socapp": {
+    "debug": true,
+    "port": 9999
+  },
   "smartapp": {
     "apiPort": 8581,
     "apiHost": "192.168.0.99",
-    "socapp": false,
     "port": 5002,
     "switches": [
       {

package/duotecno/master.js

@@ -434,16 +434,14 @@ class Master extends base_1.Base {
             this.log("NodeMgtInfo - master " + this.getName() + " can be master: " + message[2]);
         }
         else if (message[1] === protocol_1.reqNodeAttributes.nodeVersion) {
-            console.log("*** -> " + message);
             this.log("NodeMgtInfo - version " + this.getName() + ", version: " + message[2] + "." + message[3]);
             this.version = message[2] * 100 + message[3];
-            //BUG - TODO: remove
-            this.protocol = message[2] * 100 + message[3];
+            console.log("*** version -> " + message + " -> " + this.version + " ***");
         }
         else if (message[1] === protocol_1.reqNodeAttributes.nodeProtocol) {
-            console.log("*** -> " + message);
             this.log("NodeMgtInfo - protocol " + this.getName() + ", protocol: " + message[2] + "." + message[3]);
             this.protocol = message[2] * 100 + message[3];
+            console.log("*** protocol -> " + message + " -> " + this.protocol + " ***");
         }
         else {
             this.err("dropped NodeMgtInfo info message = " + message[1] + ", message: " + message);
@@ -753,7 +751,7 @@ class Master extends base_1.Base {
     }
     requestRegisterValue(register) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.version >= 209) {
+            if (this.protocol >= 209) {
                 yield this.send(protocol_1.Protocol.buildRegister(register));
                 this.info("request register: " + register);
             }
@@ -775,7 +773,7 @@ class Master extends base_1.Base {
     }
     setRegisterValue(register, value) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.version >= 209) {
+            if (this.protocol >= 209) {
                 yield this.send(protocol_1.Protocol.buildRegister(register, value));
                 this.info("set register: " + register + ", to: " + value);
             }

package/duotecno/master.ts

@@ -459,7 +459,7 @@ export class Master extends Base {
 
       // if logged in, ask protocol version
       if (this.isLoggedIn) {
-        this.send(Protocol.buildRequestNodeMgt(reqNodeAttributes.nodeVersion));
+        this.send(Protocol.buildRequestNodeMgt(reqNodeAttributes.nodeProtocol));
       }
 
     } else {
@@ -818,11 +818,11 @@ export class Master extends Base {
   }
 
   async requestRegisterValue(register: number) {
-    if (this.version >= 6609) {
+    if (this.protocol >= 209) {
       await this.send(Protocol.buildRegister(register));
       this.info("request register: " + register);
     } else {
-      this.err("FC_REGISTERMAP not available before firmware v66.09")
+      this.err("FC_REGISTERMAP not available before protocol v2.09")
     }
   }
 
@@ -837,11 +837,11 @@ export class Master extends Base {
   }
 
   async setRegisterValue(register: number, value: number) {
-    if (this.version >= 6609) {
+    if (this.protocol >= 209) {
       await this.send(Protocol.buildRegister(register, value));
       this.info("set register: " + register + ", to: " + value);
     } else {
-      this.err("FC_REGISTERMAP not available before firmware v66.09")
+      this.err("FC_REGISTERMAP not available before protocol v2.09")
     }
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "6.4.2",
+  "version": "6.4.4",
   "description": "SmartServer (Proxy Websockets to TCP sockets, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
   "main": "index.js",
   "author": "Johan Coppieters",

package/server/platform.js

@@ -92,11 +92,11 @@ class Platform extends base_1.Base {
         else {
             (0, logger_1.log)("homebridge", "platform - No SmartApp configured.");
         }
-        // startup a SocApp if configured -> for proxy (not needed)
+        // startup a SocApp if configured -> for proxy (not needed for normal operations)
         if (this.config.socapp) {
             try {
                 // reuse the config file from the smartapp
-                this.smartsoc = new socapp_1.SocApp(this.system, 'smartapp');
+                this.smartsoc = new socapp_1.SocApp(this.system, 'socapp');
                 this.smartsoc.serve();
             }
             catch (err) {

package/server/platform.ts

@@ -99,11 +99,11 @@ export class Platform extends Base {
       log("homebridge", "platform - No SmartApp configured.");
     }
 
-    // startup a SocApp if configured -> for proxy (not needed)
+    // startup a SocApp if configured -> for proxy (not needed for normal operations)
     if (this.config.socapp) {
       try {
         // reuse the config file from the smartapp
-        this.smartsoc = new SocApp(this.system, 'smartapp');
+        this.smartsoc = new SocApp(this.system, 'socapp');
         this.smartsoc.serve();
 
       } catch(err) {

package/server/powerbase.js

@@ -249,7 +249,7 @@ class PowerBase extends base_1.Base {
     //
     updateBindings() {
         // sort on channel.
-        this.bindings.sort((a, b) => parseInt(a.channel) - parseInt(b.channel));
+        this.bindings.sort((a, b) => a.register - b.register);
         // sanitize and copy all rules into the config
         this.config.bindings = this.bindings.map(b => types_1.Sanitizers.bindingConfig(b));
         (0, logger_1.debug)("power", "config.bindings = " + JSON.stringify(this.config.bindings));

package/server/socapp.js

@@ -26,7 +26,7 @@ class SocApp extends webapp_1.WebApp {
         // hashmap with all connected clients
         this.clients = {};
         if (this.config.debug)
-            logger_1.logSettings["proxy"] = logger_1.LogLevel.debug;
+            logger_1.logSettings["socapp"] = logger_1.LogLevel.debug;
         this.port = port || this.config.port || this.port || 80;
         this.system = system;
         this.support = new support_1.Support(system);
@@ -53,7 +53,7 @@ class SocApp extends webapp_1.WebApp {
                     return this.serveFile(context, context.path);
                 }
                 catch (error) {
-                    (0, logger_1.err)("proxy", "Error serving URL: " + context.req.url);
+                    (0, logger_1.err)("socapp", "Error serving URL: " + context.req.url);
                     return this.serveFile(context, "/index.html");
                     // return this.notFound(context.req.url);
                 }
@@ -61,7 +61,7 @@ class SocApp extends webapp_1.WebApp {
         });
     }
     serve() {
-        (0, logger_1.log)("proxy", "SocApp - Start http server on port " + this.port);
+        (0, logger_1.log)("socapp", "SocApp - Start http server on port " + this.port);
         super.serve(() => {
             const wsServer = new ws_1.Server({ server: this.server });
             wsServer.on('connection', this.handleClient.bind(this));
@@ -71,7 +71,7 @@ class SocApp extends webapp_1.WebApp {
         var _a, _b;
         const data = fs.readFileSync("www" + fn);
         const type = mime.lookup(fn) || "application/text";
-        (0, logger_1.log)("proxy", "Serve - " + (((_b = (_a = context.req) === null || _a === void 0 ? void 0 : _a.socket) === null || _b === void 0 ? void 0 : _b.remoteAddress) || "no-remote") + ": " + fn + " - " + type);
+        (0, logger_1.log)("socapp", "Serve - " + (((_b = (_a = context.req) === null || _a === void 0 ? void 0 : _a.socket) === null || _b === void 0 ? void 0 : _b.remoteAddress) || "no-remote") + ": " + fn + " - " + type);
         return { status: 200, data, type };
     }
     renderLog() {
@@ -96,9 +96,9 @@ class SocApp extends webapp_1.WebApp {
     handleClient(client, req) {
         let target;
         const clientAddr = client._socket.remoteAddress;
-        const logger = (msg) => (0, logger_1.log)('proxy', clientAddr + ': ' + msg);
+        const logger = (msg) => (0, logger_1.log)('socapp', clientAddr + ': ' + msg);
         const info = (this.config.debug) ?
-            (msg) => logger('Proxy - ' + clientAddr + ': ' + msg) :
+            (msg) => logger('socapp - ' + clientAddr + ': ' + msg) :
             (msg) => null;
         /////////////////////////////////////
         // url parsing to find ip and port //

package/server/socapp.ts

@@ -3,7 +3,6 @@ import * as mime from 'mime-types';
 import * as net from 'net';
 import { Server as WSServer } from 'ws';
 import { System } from '../duotecno/system';
-import { LogFunction } from '../duotecno/types';
 import { log, logSettings, LogLevel, err } from "../duotecno/logger";
 import { Support } from './support';
 import { Context, HttpResponse, WebApp } from "./webapp";
@@ -21,7 +20,7 @@ export class SocApp extends WebApp {
 
   constructor(system: System, type: string, port?: number) {
     super(type);
-    if (this.config.debug) logSettings["proxy"] = LogLevel.debug;
+    if (this.config.debug) logSettings["socapp"] = LogLevel.debug;
 
     this.port = port || this.config.port || this.port || 80;
 
@@ -50,7 +49,7 @@ export class SocApp extends WebApp {
         return this.serveFile(context, context.path);
 
       } catch(error) {
-        err("proxy", "Error serving URL: " + context.req.url);
+        err("socapp", "Error serving URL: " + context.req.url);
         return this.serveFile(context, "/index.html");
         // return this.notFound(context.req.url);
       }
@@ -58,7 +57,7 @@ export class SocApp extends WebApp {
   }
 
   serve() {
-    log("proxy", "SocApp - Start http server on port " + this.port);
+    log("socapp", "SocApp - Start http server on port " + this.port);
     super.serve(() => {
       const wsServer = new WSServer({server: this.server});
       wsServer.on('connection', this.handleClient.bind(this));
@@ -68,7 +67,7 @@ export class SocApp extends WebApp {
   serveFile(context: Context, fn: string): HttpResponse {
     const data = fs.readFileSync("www"+fn);
     const type = mime.lookup(fn) || "application/text";
-    log("proxy", "Serve - " + (context.req?.socket?.remoteAddress || "no-remote") + ": " + fn + " - " + type);
+    log("socapp", "Serve - " + (context.req?.socket?.remoteAddress || "no-remote") + ": " + fn + " - " + type);
     return { status: 200, data, type };
   }
 
@@ -97,9 +96,9 @@ export class SocApp extends WebApp {
   handleClient(client, req) {
     let target: net.Socket;
     const clientAddr = client._socket.remoteAddress;
-    const logger = (msg) => log('proxy', clientAddr + ': '+ msg);
+    const logger = (msg) => log('socapp', clientAddr + ': '+ msg);
     const info = (this.config.debug) ?
-      (msg) => logger('Proxy - ' + clientAddr + ': '+ msg) :
+      (msg) => logger('socapp - ' + clientAddr + ': '+ msg) :
       (msg) => null;
 
     /////////////////////////////////////

package/server/somfy.js

@@ -171,8 +171,9 @@ setup().then(() => {
     init = true;
     busy = false;
 }).catch((e) => {
-    (0, logger_1.debug)("somfy", "error setting up gpio package - running test mode");
-    (0, logger_1.debug)("somfy", e);
+    (0, logger_1.debug)("somfy", "gpio package not initialized");
+    if ((e.code != "EACCES") && (e.code != "ENOENT"))
+        (0, logger_1.debug)("somfy", e);
     init = false;
     busy = false;
 });

package/server/somfy.ts

@@ -165,10 +165,10 @@ setup().then(() => {
   debug("somfy", "gpio package initialized");
   init = true;
   busy = false;
-  
+
 }).catch((e) => {
   debug("somfy", "gpio package not initialized");
-  if (e.code != "EACCES") debug("somfy", e);
+  if ((e.code != "EACCES") && (e.code != "ENOENT")) debug("somfy", e);
   init = false;
   busy = false;
 });

package/www/index.html

@@ -0,0 +1,3 @@
+<html>
+  <h1>Hello world. Please leave me alone</h1>
+</html>