homebridge-smartsystem 6.8.8 → 6.8.9

package/README.md

@@ -312,6 +312,7 @@ Homebridge UI version
 - 6: 26 aug / removed double error handlers on cloudSocket
 - 7: 28 aug / restart if no free connections
 - 8: 28 aug / less logging (through logConfig) for device set/get functions
+- 9: corrected reading the local config file + dump it in the logs
 
 ## Hardware 
 A Raspberry Pi that connects to a Duotecno IP Node 

package/accessories/garagedoor.js

@@ -10,7 +10,6 @@ const accessory_1 = require("./accessory");
 // - has security, so when opening you need to authenticate
 // - TargetDoorState -> Characteristic.CurrentDoorState.OPEN, .STOPPED, .CLOSED
 //
-//
 class GarageDoor extends accessory_1.Accessory {
     constructor(homebridge, unit) {
         super(homebridge, unit);
@@ -50,7 +49,7 @@ class GarageDoor extends accessory_1.Accessory {
         else if (state == this.homebridge.Characteristic.CurrentDoorState.STOPPED)
             return types_1.UnitMotorCmd.kStop;
         else
-            return 0;
+            return null;
     }
     getDoorState(next) {
         try {

package/accessories/garagedoor.ts

@@ -10,7 +10,6 @@ import { Accessory } from "./accessory";
 // - has security, so when opening you need to authenticate
 // - TargetDoorState -> Characteristic.CurrentDoorState.OPEN, .STOPPED, .CLOSED
 //
-//
 
 
 
@@ -61,7 +60,7 @@ export class GarageDoor extends Accessory {
       return this.homebridge.Characteristic.CurrentDoorState.STOPPED;  // ????
   }
 
-  HB2DT(state): UnitMotorCmd {
+  HB2DT(state): UnitMotorCmd | null {
     if (state == this.homebridge.Characteristic.CurrentDoorState.OPEN)
       return UnitMotorCmd.kOpen;
       
@@ -72,8 +71,7 @@ export class GarageDoor extends Accessory {
       return UnitMotorCmd.kStop;
 
     else 
-      return 0;
-
+      return null;
   }
 
   getDoorState(next) {

package/package.json

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

package/server/proxy.js

@@ -13,6 +13,7 @@ exports.kEmptyProxy = {
     debug: false,
     kind: "solo" // default running under PM2 or other process manager -> don't restart yourself
 };
+const config = Object.assign({}, exports.kEmptyProxy);
 function setProxyConfig(c) {
     // set the proxy config
     if (c) {
@@ -24,19 +25,17 @@ function setProxyConfig(c) {
         config.debug = !!c.debug;
         config.kind = c.kind || exports.kEmptyProxy.kind;
     }
-    else {
-        config = Object.assign({}, exports.kEmptyProxy);
-    }
     return config;
 }
 exports.setProxyConfig = setProxyConfig;
-let config;
 try {
-    setProxyConfig(require('../config-proxy.json'));
+    const configPath = require.resolve('../config-proxy.json');
+    console.log(`Using config file at: ${configPath}`);
+    setProxyConfig(require(configPath));
 }
 catch (e) {
     setProxyConfig();
-    console.log("No config-proxy.json found, using default values from homebridge or other.");
+    log("No config-proxy.json found, using default values from homebridge or other.");
 }
 let connectionChecker = null;
 const gCloudConnections = [];
@@ -102,8 +101,9 @@ function cleanStart(restart = false) {
     }
     if (restart) {
         if (config.uniqueId) {
+            log(`[PROXY] → [CLOUD] Starting proxy with config: ${JSON.stringify(config, null, 2)}`);
             makeNewCloudConnection(config.masterAddress, config.masterPort, config.cloudServer, config.cloudPort, config.uniqueId);
-            // check every 5 second for a free connection
+            // check every 10 second for a free connection
             connectionChecker = setInterval(() => {
                 const freeConnection = gCloudConnections.find((ctx) => (!ctx.deviceSocket) && ctx.cloudSocket && (ctx.cloudSocket.readyState === 'open'));
                 if (freeConnection) {
@@ -113,7 +113,7 @@ function cleanStart(restart = false) {
                     error(`[PROXY] → [CLOUD] No free connections available, restarting proxy. ***************************`);
                     cleanStart(true);
                 }
-            }, 5000);
+            }, 10 * 1000);
         }
         else {
             log(`[PROXY] → [CLOUD] Not restarting, no unique ID configured, not starting the proxy.`);
@@ -312,8 +312,10 @@ function restart() {
 // Graceful shutdown handler
 function handleShutdown(signal) {
     log(`[PROXY] → [SYSTEM] Received ${signal}, shutting down gracefully...`);
-    if (connectionChecker)
+    if (connectionChecker) {
         clearInterval(connectionChecker);
+        connectionChecker = null;
+    }
     // Close all cloud connections
     gCloudConnections.forEach(ctx => ctx.cleanupSockets());
     gCloudConnections.splice(0, gCloudConnections.length);

package/server/proxy.ts

@@ -26,6 +26,8 @@ export const kEmptyProxy: ProxyConfig = {
   kind: "solo"          // default running under PM2 or other process manager -> don't restart yourself
 }
 
+const config = {...kEmptyProxy};
+
 export function setProxyConfig(c?: ProxyConfig): ProxyConfig {
   // set the proxy config
   if (c) {
@@ -36,22 +38,23 @@ export function setProxyConfig(c?: ProxyConfig): ProxyConfig {
     config.uniqueId = c.uniqueId || kEmptyProxy.uniqueId;
     config.debug = !!c.debug;
     config.kind = c.kind || kEmptyProxy.kind;
-  } else {
-    config = {...kEmptyProxy};
   }
   return config;
 }
 
-let config: ProxyConfig;
+
 try {
-  setProxyConfig(require('../config-proxy.json'));
+  const configPath = require.resolve('../config-proxy.json');
+  console.log(`Using config file at: ${configPath}`);
+  setProxyConfig(require(configPath));
+
 } catch (e) {
   setProxyConfig();
-  console.log("No config-proxy.json found, using default values from homebridge or other.");
+  log("No config-proxy.json found, using default values from homebridge or other.");
 }
 
 
-let connectionChecker: NodeJS.Timer | null = null;
+let connectionChecker: NodeJS.Timeout | null = null;
 
 const gCloudConnections: Array<Context> = [];
 const kDebug = config.debug || false; // enable debug mode from config
@@ -130,9 +133,10 @@ export function cleanStart(restart: boolean = false) {
 
   if (restart) {
     if (config.uniqueId) {
+      log(`[PROXY] → [CLOUD] Starting proxy with config: ${JSON.stringify(config, null, 2)}`);
       makeNewCloudConnection(config.masterAddress, config.masterPort, config.cloudServer, config.cloudPort, config.uniqueId);
 
-      // check every 5 second for a free connection
+      // check every 10 second for a free connection
       connectionChecker = setInterval(() => {
         const freeConnection = gCloudConnections.find((ctx: Context) =>
           (!ctx.deviceSocket) && ctx.cloudSocket && (ctx.cloudSocket.readyState === 'open')
@@ -143,7 +147,7 @@ export function cleanStart(restart: boolean = false) {
           error(`[PROXY] → [CLOUD] No free connections available, restarting proxy. ***************************`);
           cleanStart(true);
         }
-      }, 5000);
+      }, 10 * 1000);
 
     } else {
       log(`[PROXY] → [CLOUD] Not restarting, no unique ID configured, not starting the proxy.`);
@@ -387,7 +391,10 @@ function restart() {
 function handleShutdown(signal: string) {
   log(`[PROXY] → [SYSTEM] Received ${signal}, shutting down gracefully...`);
 
-  if (connectionChecker)clearInterval(connectionChecker);
+  if (connectionChecker) {
+    clearInterval(connectionChecker);
+    connectionChecker = null;
+  }
 
   // Close all cloud connections
   gCloudConnections.forEach(ctx => ctx.cleanupSockets());