homebridge-smartsystem 6.7.4 → 6.8.0

package/README.md

@@ -301,6 +301,9 @@ Homebridge UI version
 - 3: do dimmers/up-downs
 - 4: better up-down values to and from HB
 
+### v6.8.0 - 08/07/2025
+- 0: first version including the proxy
+
 ## Hardware 
 A Raspberry Pi that connects to a Duotecno IP Node 
 and (if configured) to a Smappee Infinity (power and plugs) 

package/config.json

@@ -480,5 +480,14 @@
       "gateway2": ""
     }
   },
-  "p1": false
+  "p1": false,
+  "proxy": {
+    "cloudServer": "ws.duotecno.eu",
+    "cloudPort": 5098,
+    "masterAddress": "192.168.0.97",
+    "masterPort": 5001,
+    "uniqueId": "",
+    "debug": false,
+    "kind": "solo"
+  }
 }

package/duotecno/types.js

@@ -15,6 +15,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeInt = exports.now = exports.datetime = exports.time = exports.date = exports.watt = exports.hex = exports.two = exports.char = exports.ascii = exports.wait = exports.Sanitizers = exports.actionValueStr = exports.actionValue = exports.kEmptyBinding = exports.kEmptyLink = exports.LinkType = exports.kEmptySwitch = exports.SwitchType = exports.kEmptyRule = exports.kEmptyAction = exports.RuleType = exports.Boundaries = exports.kEmptyCommRecord = exports.WriteError = exports.kEmptySettings = exports.kEmptyNetworkConfig = exports.kEmptyGroup = exports.kEmptyScene = exports.kEmptyUnitScene = exports.kEmptyUnit = exports.UnitExtendedType = exports.UnitType = exports.UnitMotorCmd = exports.UnitState = exports.NodeType = void 0;
+const proxy_1 = require("../server/proxy");
 // Node types
 var NodeType;
 (function (NodeType) {
@@ -204,6 +205,7 @@ exports.Sanitizers = {
         config.shelly = config.shelly || false;
         config.smartapp = config.smartapp || null;
         config.system = exports.Sanitizers.system(config.system);
+        config.proxy = exports.Sanitizers.proxy(config.proxy, config.system);
         return config;
     },
     homebridge: function (config) {
@@ -358,6 +360,19 @@ exports.Sanitizers = {
             b.channel = binding.channel || "0";
         return b;
     },
+    ///////////
+    // Proxy //
+    ///////////
+    proxy: function (config, system) {
+        var _a, _b;
+        const c = proxy_1.kEmptyProxy;
+        c.cloudServer = (config === null || config === void 0 ? void 0 : config.cloudServer) || proxy_1.kEmptyProxy.cloudServer;
+        c.cloudPort = (config === null || config === void 0 ? void 0 : config.cloudPort) || proxy_1.kEmptyProxy.cloudPort;
+        c.masterAddress = (config === null || config === void 0 ? void 0 : config.masterAddress) || ((_a = system === null || system === void 0 ? void 0 : system.cmasters[0]) === null || _a === void 0 ? void 0 : _a.address) || "";
+        c.masterPort = (config === null || config === void 0 ? void 0 : config.masterPort) || ((_b = system === null || system === void 0 ? void 0 : system.cmasters[0]) === null || _b === void 0 ? void 0 : _b.port) || 5001;
+        c.uniqueId = (config === null || config === void 0 ? void 0 : config.uniqueId) || proxy_1.kEmptyProxy.uniqueId;
+        return c;
+    },
     //////////////
     // Duotecno //
     //////////////

package/duotecno/types.ts

@@ -4,6 +4,7 @@
 // v3 - smart server version, Mar 2020
 // v3.1 - added scenes from app version, May 2020
 
+import { kEmptyProxy, ProxyConfig } from "../server/proxy";
 import { Unit } from "./protocol";
 
 // for Active=Y/N or New=X
@@ -412,6 +413,7 @@ export const Sanitizers = {
     config.shelly = config.shelly || false;
     config.smartapp = config.smartapp || null;
     config.system = Sanitizers.system(config.system);
+    config.proxy = Sanitizers.proxy(config.proxy, config.system);
     
     return config;
   },
@@ -581,6 +583,19 @@ export const Sanitizers = {
     return b;
   },
 
+  ///////////
+  // Proxy //
+  ///////////
+  proxy: function(config?: ProxyConfig, system?: SystemConfig): ProxyConfig {
+    const c = kEmptyProxy as ProxyConfig;
+    c.cloudServer = config?.cloudServer || kEmptyProxy.cloudServer;
+    c.cloudPort = config?.cloudPort || kEmptyProxy.cloudPort;
+    c.masterAddress = config?.masterAddress || system?.cmasters[0]?.address || "";
+    c.masterPort = config?.masterPort || system?.cmasters[0]?.port || 5001;
+    c.uniqueId = config?.uniqueId || kEmptyProxy.uniqueId;
+    return c;
+  },
+
   //////////////
   // Duotecno //
   //////////////

package/package.json

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

package/server/platform.js

@@ -30,8 +30,10 @@ const p1_1 = require("./p1");
 const shelly_1 = require("./shelly");
 const config_1 = require("../duotecno/config");
 const fs_1 = require("fs");
+const proxy_1 = require("./proxy");
 class Platform extends base_1.Base {
     constructor(logger, pConfig, api) {
+        var _a;
         super("homebridge");
         this.accessoryList = [];
         this.ready = false;
@@ -109,6 +111,15 @@ class Platform extends base_1.Base {
         else {
             (0, logger_1.log)("homebridge", "platform - No SocApp configured.");
         }
+        if (this.config.proxy && ((_a = this.config.proxy) === null || _a === void 0 ? void 0 : _a.uniqueId)) {
+            this.config.proxy.kind = "gw";
+            (0, proxy_1.setProxyConfig)(this.config.proxy);
+            (0, proxy_1.cleanStart)(true);
+            (0, logger_1.log)("homebridge", "platform - Proxy configured: " + JSON.stringify(this.config.proxy, null, 2));
+        }
+        else {
+            (0, logger_1.log)("homebridge", "platform - No Proxy configured.");
+        }
     }
     startPower(type, PowerMgr) {
         // startup a power handler, if configured

package/server/platform.ts

@@ -20,7 +20,8 @@ import { Lock } from "../accessories/lock";
 import { P1 } from "./p1";
 import { Shelly } from "./shelly";
 import { kConfigFiles, setConfig } from "../duotecno/config";
-import { fstat, readFileSync } from "fs";
+import { readFileSync } from "fs";
+import { cleanStart, setProxyConfig } from "./proxy";
 
 
 export class Platform extends Base {
@@ -115,6 +116,15 @@ export class Platform extends Base {
     } else {
       log("homebridge", "platform - No SocApp configured.");
     }
+
+    if (this.config.proxy && this.config.proxy?.uniqueId) {
+      this.config.proxy.kind = "gw";
+      setProxyConfig(this.config.proxy);
+      cleanStart(true);
+      log("homebridge", "platform - Proxy configured: " + JSON.stringify(this.config.proxy, null, 2));
+    } else {
+      log("homebridge", "platform - No Proxy configured.");
+    }
   }
 
   startPower(type: string, PowerMgr: any) {

package/server/proxy.js

@@ -0,0 +1,257 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Context = exports.cleanStart = exports.makeNewCloudConnection = exports.setProxyConfig = exports.kEmptyProxy = void 0;
+const net = require("net");
+const WebSocket = require("ws");
+const child_process_1 = require("child_process");
+const process_1 = require("process");
+exports.kEmptyProxy = {
+    cloudServer: "ws.duotecno.eu",
+    cloudPort: 5098,
+    masterAddress: "",
+    masterPort: 5001,
+    uniqueId: "",
+    debug: false,
+    kind: "solo" // default running under PM2 or other process manager -> don't restart yourself
+};
+function setProxyConfig(c) {
+    // set the proxy config
+    if (c) {
+        config.cloudServer = c.cloudServer || exports.kEmptyProxy.cloudServer;
+        config.cloudPort = c.cloudPort || exports.kEmptyProxy.cloudPort;
+        config.masterAddress = c.masterAddress || exports.kEmptyProxy.masterAddress;
+        config.masterPort = c.masterPort || exports.kEmptyProxy.masterPort;
+        config.uniqueId = c.uniqueId || exports.kEmptyProxy.uniqueId;
+        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'));
+}
+catch (e) {
+    setProxyConfig();
+    console.log("No config-proxy.json found, using default values from homebridge or other.");
+}
+const gCloudConnections = [];
+const kDebug = config.debug || false; // enable debug mode from config
+/////////////
+// Logging //
+/////////////
+function debug(str) {
+    if (kDebug) {
+        console.log(`DEBUG: ${str}`);
+    }
+}
+function warning(str) {
+    console.warn(`WARNING: ${str}`);
+}
+function log(str) {
+    console.log(`LOG: ${str}`);
+}
+function error(str) {
+    console.error(`ERROR: **** ${str} ****`);
+}
+///////////////////////////////
+// Start up the proxy server //
+///////////////////////////////
+// if (config.kind != "gw") {
+//   makeNewCloudConnection(config.masterAddress, config.masterPort, config.cloudServer, config.cloudPort, config.uniqueId);
+// }
+function makeNewCloudConnection(master, masterPort, server, serverPort, uniqueId) {
+    const cloudSocket = new WebSocket('ws://' + server + ':' + serverPort + "/" + uniqueId);
+    cloudSocket.on('open', () => {
+        log(`[PROXY] → [CLOUD] Connected to Cloud at ${server}:${serverPort}`);
+        const context = new Context(cloudSocket, master, masterPort, server, serverPort, uniqueId);
+        gCloudConnections.push(context);
+        log(`[PROXY] → [CLOUD] New free connection #${gCloudConnections.length} to the Cloud at ${server}:${serverPort}`);
+    });
+    log(`[PROXY] → [CLOUD] Attempting to start a new free connection for ${config.uniqueId} to the Cloud at ${server}:${serverPort}`);
+}
+exports.makeNewCloudConnection = makeNewCloudConnection;
+////////////////
+// Restarting //
+////////////////
+function cleanStart(restart = false) {
+    if (gCloudConnections.length) {
+        gCloudConnections.forEach(context => {
+            if (context.deviceSocket) {
+                context.deviceSocket.end();
+                context.deviceSocket = null;
+            }
+            context.cloudSocket.close();
+            context.cloudSocket = null;
+        });
+        gCloudConnections.splice(0, gCloudConnections.length); // clear the array
+        log(`[PROXY] → [CLOUD] Cleaned up all cloud connections.`);
+    }
+    if (restart) {
+        if (config.uniqueId) {
+            makeNewCloudConnection(config.masterAddress, config.masterPort, config.cloudServer, config.cloudPort, config.uniqueId);
+        }
+        else {
+            log(`[PROXY] → [CLOUD] Not restarting, no unique ID configured, not starting the proxy.`);
+        }
+    }
+    else {
+        log(`[PROXY] → [CLOUD] Not restarting, no new cloud connection, just cleaning up.`);
+    }
+}
+exports.cleanStart = cleanStart;
+class Context {
+    constructor(cloudSocket, master, masterPort, server, serverPort, uniqueId) {
+        this.deviceSocket = null;
+        this.master = master;
+        this.masterPort = masterPort;
+        this.cloudSocket = cloudSocket;
+        this.server = server;
+        this.serverPort = serverPort;
+        this.uniqueId = uniqueId;
+        this.setupCloudSocket();
+    }
+    setupCloudSocket() {
+        // set up handlers for the cloud socket
+        this.cloudSocket.on('message', message => {
+            this.handleDataFromCloud(message);
+        });
+        this.cloudSocket.on('close', (code, reason) => {
+            warning('[CLOUD] Connection closed: ' + code + ' ' + reason);
+            if (this.deviceSocket) {
+                this.deviceSocket.end();
+                this.deviceSocket = null;
+            }
+        });
+        this.cloudSocket.on('error', err => {
+            error(`[CLOUD] Error: ${err.message}`);
+            if (this.deviceSocket) {
+                this.deviceSocket.end();
+                this.deviceSocket = null;
+            }
+        });
+    }
+    handleDataFromCloud(data) {
+        debug(`[CLOUD] → [PROXY]: Data from Cloud: ${data.toString().slice(0, -1)}`);
+        if (!this.deviceSocket) {
+            // we either have a real client that wants to connect to the device,
+            // or we receive a heartbeat from the cloud server
+            if (this.isHeartbeatRequest(data)) {
+                debug(`[CLOUD] → [PROXY]: Received heartbeat from Cloud, returning response.`);
+                // respond to the heartbeat of the cloud server
+                this.cloudSocket.send("[72,3]"); // command([Command.HeartbeatStatus, CommandMethod.Heartbeat.server])
+            }
+            else {
+                // There is incomming data, it's a fresh connection, so: a new client wants to connect to the device
+                // 1) create a new (free) connection to the cloud server for the next client
+                // 2) connect to the device and send the initial data
+                log(`[PROXY] → [CLOUD] New client connection, creating new free connection for this proxy/device: ${this.uniqueId}.`);
+                makeNewCloudConnection(this.master, this.masterPort, this.server, this.serverPort, this.uniqueId);
+                this.makeDeviceConnection(this.master, this.masterPort, data);
+            }
+        }
+        else if (this.deviceSocket.readyState === 'open') {
+            this.deviceSocket.write(data);
+            debug(`[PROXY] → [DEVICE] forwarding data to device: ${data.toString().slice(0, -1)}`);
+        }
+        else {
+            warning(`[PROXY] → [DEVICE] Device socket is not open yet, waiting for connection... what to do with the data??`);
+        }
+    }
+    makeDeviceConnection(address, port, data) {
+        log(`[PROXY] → [DEVICE] Attempting to connect to local device at ${address}:${port}`);
+        if (!this.deviceSocket) {
+            this.deviceSocket = new net.Socket();
+            // Connect to local device and send the data that came in from the cloud
+            this.deviceSocket.connect(port, address, () => {
+                log(`[PROXY] → [DEVICE] Connected to local device at ${address}:${port}`);
+                this.setUpDeviceSocket();
+                log(`[PROXY] → [DEVICE] Sending initial message: ${data.toString().slice(0, -1)}`);
+                this.deviceSocket.write(data);
+            });
+        }
+        else if (this.deviceSocket.readyState === 'open') {
+            warning(`[PROXY] → [DEVICE] Device socket already open, sending data directly -- STRANGE !!`);
+            this.deviceSocket.write(data);
+        }
+        else {
+            error(`[PROXY] → [DEVICE] Device socket exists, but is not open yet !!`);
+        }
+    }
+    setUpDeviceSocket() {
+        this.deviceSocket.on('data', (data) => {
+            const message = data.toString('utf-8');
+            debug(`[DEVICE] → [PROXY] forwarding data to Cloud: ${message.slice(0, -1)}`);
+            this.cloudSocket.send(message);
+        });
+        this.deviceSocket.on('close', () => {
+            log(`[DEVICE] → [PROXY] Device socket closed`);
+            this.removeConnection();
+        });
+        this.deviceSocket.on('error', (err) => {
+            error(`[DEVICE] → [PROXY] Device socket error: ${err.message}`);
+            this.removeConnection();
+        });
+    }
+    removeConnection() {
+        this.deviceSocket = null;
+        // remove this context and close the cloud socket
+        const index = gCloudConnections.indexOf(this);
+        if (index !== -1) {
+            this.cloudSocket.close();
+            this.cloudSocket = null;
+            gCloudConnections.splice(index, 1);
+            log(`[PROXY] → [CLOUD] Closed socket to Cloud and removed context for device ${this.master}`);
+        }
+        if (gCloudConnections.length === 0) {
+            log(`[PROXY] → [CLOUD] No more cloud connections, restarting proxy.`);
+            // just to be sure: restart...
+            if (config.kind === "pm2") {
+                // PM2 should restart us.
+                log(`[PROXY] → [CLOUD] PM2 should restart us, exiting now.`);
+                process.exit();
+            }
+            else if (config.kind === "solo") {
+                log(`[PROXY] → [CLOUD] Running solo, restarting proxy.`);
+                this.restart();
+            }
+            else {
+                log(`[PROXY] → [CLOUD] Running under gateway/homebridge, not restarting... not sure what to do here.`);
+            }
+        }
+    }
+    ///////////////
+    // Utilities //
+    ///////////////
+    restart() {
+        console.log('🔄 Restarting...');
+        (0, child_process_1.spawn)(process_1.execPath, process_1.argv.slice(1), {
+            cwd: (0, process_1.cwd)(),
+            detached: true,
+            stdio: 'inherit',
+        });
+        process.exit();
+    }
+    // check if it's a heartbeat request from the server
+    isHeartbeatRequest(data) {
+        // heartbeatKind = (poll = 1, poll_old = 2, serve = 3)
+        if (typeof data === 'string') {
+            return data === "[215,3]";
+        }
+        else {
+            return ((data[0] === 91) && // [
+                (data[1] === 50) && // 2
+                (data[2] === 49) && // 1
+                (data[3] === 53) && // 5
+                (data[4] === 44) && // ,
+                (data[5] === 51) && // 3
+                (data[6] === 93)); // ]
+        }
+    }
+}
+exports.Context = Context;
+//# sourceMappingURL=proxy.js.map

package/server/proxy.ts

@@ -0,0 +1,315 @@
+import * as net from 'net';
+import * as WebSocket from 'ws';
+import { spawn } from 'child_process';
+import { argv, cwd, execPath } from 'process';
+
+//
+// [ device (TCP) ] ←→ [ Proxy = WebSocket client (ws) ] ←→ [ Cloud = 2 x WebSocket server (ws) ] ←→ [ browser client ]
+//
+
+export interface ProxyConfig {
+  cloudServer: string;   // cloud server address
+  cloudPort: number;     // cloud server port
+  masterAddress: string; // local master address
+  masterPort: number;    // local master port
+  uniqueId: string;      // unique ID for the device (for now the no-ip address + port)
+  debug?: boolean;       // debug mode
+  kind?: "pm2" | "gw" | "solo"; 
+}
+export const kEmptyProxy: ProxyConfig = {
+  cloudServer: "ws.duotecno.eu",
+  cloudPort: 5098,
+  masterAddress: "",
+  masterPort: 5001,
+  uniqueId: "",         // no unique ID -> don't start the proxy
+  debug: false,         // default nodebug mode
+  kind: "solo"          // default running under PM2 or other process manager -> don't restart yourself
+}
+
+export function setProxyConfig(c?: ProxyConfig): ProxyConfig {
+  // set the proxy config
+  if (c) {
+    config.cloudServer = c.cloudServer || kEmptyProxy.cloudServer;
+    config.cloudPort = c.cloudPort || kEmptyProxy.cloudPort;
+    config.masterAddress = c.masterAddress || kEmptyProxy.masterAddress;
+    config.masterPort = c.masterPort || kEmptyProxy.masterPort;
+    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'))
+} catch (e) {
+  setProxyConfig();
+  console.log("No config-proxy.json found, using default values from homebridge or other.");
+}
+
+const gCloudConnections: Array<Context> = [];
+const kDebug = config.debug || false; // enable debug mode from config
+
+/////////////
+// Logging //
+/////////////
+function debug(str: string) {
+  if (kDebug) {
+    console.log(`DEBUG: ${str}`);
+  }
+}
+function warning(str: string) {
+  console.warn(`WARNING: ${str}`);
+}
+function log(str: string) {
+  console.log(`LOG: ${str}`);
+}
+function error(str: string) {
+  console.error(`ERROR: **** ${str} ****`);
+}
+
+
+///////////////////////////////
+// Start up the proxy server //
+///////////////////////////////
+
+// if (config.kind != "gw") {
+//   makeNewCloudConnection(config.masterAddress, config.masterPort, config.cloudServer, config.cloudPort, config.uniqueId);
+// }
+
+
+export function makeNewCloudConnection(master: string, masterPort: number, server: string, serverPort: number, uniqueId: string) {
+  const cloudSocket = new WebSocket('ws://'+server+':'+serverPort+"/"+uniqueId);
+
+  cloudSocket.on('open', ()  => {
+    log(`[PROXY] → [CLOUD] Connected to Cloud at ${server}:${serverPort}`);
+
+    const context = new Context(cloudSocket, master, masterPort, server, serverPort, uniqueId);
+    gCloudConnections.push(context);
+    log(`[PROXY] → [CLOUD] New free connection #${gCloudConnections.length} to the Cloud at ${server}:${serverPort}`);
+  });
+
+  log(`[PROXY] → [CLOUD] Attempting to start a new free connection for ${config.uniqueId} to the Cloud at ${server}:${serverPort}`);
+}
+
+////////////////
+// Restarting //
+////////////////
+export function cleanStart(restart: boolean = false) {
+  if (gCloudConnections.length) {
+    gCloudConnections.forEach(context => {
+      if (context.deviceSocket) {
+        context.deviceSocket.end();
+        context.deviceSocket = null;
+      }
+      context.cloudSocket.close();
+      context.cloudSocket = null;
+    });
+    gCloudConnections.splice(0, gCloudConnections.length); // clear the array
+    log(`[PROXY] → [CLOUD] Cleaned up all cloud connections.`);
+  }
+
+  if (restart) {
+    if (config.uniqueId) {
+      makeNewCloudConnection(config.masterAddress, config.masterPort, config.cloudServer, config.cloudPort, config.uniqueId);
+    } else {
+      log(`[PROXY] → [CLOUD] Not restarting, no unique ID configured, not starting the proxy.`);
+    }
+  } else {
+    log(`[PROXY] → [CLOUD] Not restarting, no new cloud connection, just cleaning up.`);
+  }
+}
+
+
+export class Context {
+  deviceSocket: net.Socket;
+  master: string;
+  masterPort: number;
+
+  cloudSocket: WebSocket;
+  server: string;
+  serverPort: number;
+
+  // unique identifier for this device-gateway combination
+  uniqueId: string; 
+
+  constructor(cloudSocket: WebSocket, master: string, masterPort: number, server: string, serverPort: number, uniqueId: string) {
+    this.deviceSocket = null;
+    this.master = master;
+    this.masterPort = masterPort;
+
+    this.cloudSocket = cloudSocket;
+    this.server = server;
+    this.serverPort = serverPort;
+
+    this.uniqueId = uniqueId;
+
+    this.setupCloudSocket();
+  }
+
+  setupCloudSocket() {
+    // set up handlers for the cloud socket
+    this.cloudSocket.on('message', message => {
+      this.handleDataFromCloud(message as Buffer);
+    });
+
+    this.cloudSocket.on('close', (code, reason) => {
+      warning('[CLOUD] Connection closed: ' + code + ' ' + reason);
+      if (this.deviceSocket) {
+        this.deviceSocket.end();
+        this.deviceSocket = null;
+      }
+    });
+
+    this.cloudSocket.on('error', err => {
+      error(`[CLOUD] Error: ${err.message}`);
+      if (this.deviceSocket) {
+        this.deviceSocket.end();
+        this.deviceSocket = null;
+      }
+    });
+  }
+
+  handleDataFromCloud(data: Buffer) {
+    debug(`[CLOUD] → [PROXY]: Data from Cloud: ${data.toString().slice(0, -1)}`);
+
+    if (!this.deviceSocket) {
+      // we either have a real client that wants to connect to the device,
+      // or we receive a heartbeat from the cloud server
+
+      if (this.isHeartbeatRequest(data)) {
+        debug(`[CLOUD] → [PROXY]: Received heartbeat from Cloud, returning response.`);
+         // respond to the heartbeat of the cloud server
+        this.cloudSocket.send("[72,3]"); // command([Command.HeartbeatStatus, CommandMethod.Heartbeat.server])
+
+      } else {
+        // There is incomming data, it's a fresh connection, so: a new client wants to connect to the device
+        // 1) create a new (free) connection to the cloud server for the next client
+        // 2) connect to the device and send the initial data
+        log(`[PROXY] → [CLOUD] New client connection, creating new free connection for this proxy/device: ${this.uniqueId}.`);
+        makeNewCloudConnection(this.master, this.masterPort, this.server, this.serverPort, this.uniqueId);
+        this.makeDeviceConnection(this.master, this.masterPort, data);
+      }
+
+    } else if (this.deviceSocket.readyState === 'open') {
+      this.deviceSocket.write(data);
+      debug(`[PROXY] → [DEVICE] forwarding data to device: ${data.toString().slice(0, -1)}`);
+
+    } else {
+      warning(`[PROXY] → [DEVICE] Device socket is not open yet, waiting for connection... what to do with the data??`);
+    }
+  }
+
+
+  makeDeviceConnection(address: string, port: number, data: Buffer) {
+    log(`[PROXY] → [DEVICE] Attempting to connect to local device at ${address}:${port}`);
+
+    if (!this.deviceSocket) {
+      this.deviceSocket = new net.Socket();
+    
+      // Connect to local device and send the data that came in from the cloud
+      this.deviceSocket.connect(port, address, () => {
+        log(`[PROXY] → [DEVICE] Connected to local device at ${address}:${port}`);
+
+        this.setUpDeviceSocket();
+  
+        log(`[PROXY] → [DEVICE] Sending initial message: ${data.toString().slice(0, -1)}`);
+        this.deviceSocket.write(data);
+      });
+
+    } else if (this.deviceSocket.readyState === 'open') {
+        warning(`[PROXY] → [DEVICE] Device socket already open, sending data directly -- STRANGE !!`);
+        this.deviceSocket.write(data);
+
+    } else {
+      error(`[PROXY] → [DEVICE] Device socket exists, but is not open yet !!`);
+    }
+  }
+
+  setUpDeviceSocket() {
+    this.deviceSocket.on('data', (data: Buffer) => {
+      const message = data.toString('utf-8');
+      debug(`[DEVICE] → [PROXY] forwarding data to Cloud: ${message.slice(0, -1)}`);
+      this.cloudSocket.send(message);
+    });
+
+    this.deviceSocket.on('close', () => {
+      log(`[DEVICE] → [PROXY] Device socket closed`);
+      this.removeConnection()  
+    });
+
+    this.deviceSocket.on('error', (err) => {
+      error(`[DEVICE] → [PROXY] Device socket error: ${err.message}`);
+      this.removeConnection()  
+    });
+  }
+
+  removeConnection() {
+    this.deviceSocket = null;
+
+    // remove this context and close the cloud socket
+    const index = gCloudConnections.indexOf(this);
+    if (index !== -1) {
+      this.cloudSocket.close();
+      this.cloudSocket = null;
+      gCloudConnections.splice(index, 1);
+      log(`[PROXY] → [CLOUD] Closed socket to Cloud and removed context for device ${this.master}`);
+    }
+
+    if (gCloudConnections.length === 0) {
+        log(`[PROXY] → [CLOUD] No more cloud connections, restarting proxy.`);
+      // just to be sure: restart...
+
+      if (config.kind === "pm2") {
+        // PM2 should restart us.
+        log(`[PROXY] → [CLOUD] PM2 should restart us, exiting now.`);
+        process.exit(); 
+
+      } else if (config.kind === "solo"){
+        log(`[PROXY] → [CLOUD] Running solo, restarting proxy.`);
+        this.restart();
+
+      } else {
+        log(`[PROXY] → [CLOUD] Running under gateway/homebridge, not restarting... not sure what to do here.`);
+      }
+    }
+  }
+
+  
+  ///////////////
+  // Utilities //
+  ///////////////
+
+  restart() {
+    console.log('🔄 Restarting...');
+
+    spawn(execPath, argv.slice(1), {
+      cwd: cwd(),
+      detached: true,
+      stdio: 'inherit',
+    });
+
+    process.exit();
+  }
+
+  // check if it's a heartbeat request from the server
+  isHeartbeatRequest(data: Buffer): boolean {
+    // heartbeatKind = (poll = 1, poll_old = 2, serve = 3)
+
+    if (typeof data === 'string') {
+      return data === "[215,3]";
+
+    } else {
+      return ((data[0] === 91) &&           // [
+              (data[1] === 50) &&           // 2
+              (data[2] === 49) &&           // 1
+              (data[3] === 53) &&           // 5
+              (data[4] === 44) &&           // ,
+              (data[5] === 51) &&           // 3
+              (data[6] === 93));            // ]
+    }
+  }
+}

package/server/smartapp.js

@@ -28,6 +28,7 @@ const fs_1 = require("fs");
 const config_1 = require("../duotecno/config");
 const HB_1 = require("./HB");
 const HA_API_1 = require("./HA-API");
+const proxy_1 = require("./proxy");
 const kMaster = { name: "master", type: "string", default: "0.0.0.0:5001" };
 const kAddress = { name: "address", type: "string", default: "0.0.0.0" };
 const kAddresses = { name: "addresses", type: "string", default: "[0.0.0.0]" };
@@ -81,6 +82,7 @@ class SmartApp extends webapp_1.WebApp {
         this.addFile("materializeCSS", __dirname + "/views/assets/materialize.min.css", "text/css");
         this.addFile("materializeJS", __dirname + "/views/assets/materialize.min.js", "text/javascript");
         this.addFile("favicon", __dirname + "/views/assets/favicon.ico", "image/x-icon");
+        this.addFile("proxy", __dirname + "/views/proxy.ejs", "text/html");
     }
     writeConfig() {
         // copy switches into config, eliminate the runtime stuff (like unit)
@@ -185,6 +187,9 @@ class SmartApp extends webapp_1.WebApp {
             else if (context.request === "settings") {
                 return this.doSettings(context);
             }
+            else if (context.request === "proxy") {
+                return this.doProxy(context);
+            }
             else {
                 return _super.doRequest.call(this, context);
             }
@@ -225,6 +230,31 @@ class SmartApp extends webapp_1.WebApp {
         return { name, value, masterAddress: context["masterAddress"], masterPort: context["masterPort"],
             logicalAddress, logicalNodeAddress };
     }
+    ///////////
+    // Proxy //
+    ///////////
+    doProxy(context) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let config = this.config.proxy || proxy_1.kEmptyProxy;
+            if (context.action === "save") {
+                // save the proxy config
+                config.cloudServer = context.getParam({ name: "cloudServer", type: "string" });
+                config.cloudPort = context.getParam({ name: "cloudPort", type: "integer" });
+                config.masterAddress = context.getParam({ name: "masterAddress", type: "string" });
+                config.masterPort = context.getParam({ name: "masterPort", type: "integer" });
+                config.uniqueId = context.getParam({ name: "uniqueId", type: "string" });
+                this.write("proxy", config);
+                (0, proxy_1.setProxyConfig)(config);
+            }
+            else if (context.action === "restart") {
+                (0, proxy_1.cleanStart)(true);
+            }
+            else {
+                // just show the proxy config
+            }
+            return this.ejs("proxy", context, { config });
+        });
+    }
     //////////////
     // Settings //
     //////////////

package/server/smartapp.ts

@@ -24,6 +24,7 @@ import { setToken } from "../duotecno/config";
 import { PowerBase } from "./powerbase";
 import { dt2hbvalue, hb2dtvalue, hbAccessories, hbGetValue, hbLogin, hbName, hbService, hbSetState, hbSubscribe } from "./HB";
 import { httpRequest, ContentType } from "./HA-API";
+import { cleanStart, kEmptyProxy, ProxyConfig, setProxyConfig } from "./proxy";
 
 const kMaster = {name: "master", type: "string", default: "0.0.0.0:5001"} as const;
 const kAddress = {name: "address", type: "string", default: "0.0.0.0"} as const;
@@ -59,6 +60,7 @@ export class SmartApp extends WebApp {
   platform: Platform;
   switches: Array<Switch>;
   links: Array<Link>;
+  proxy: ProxyConfig;
 
 
   constructor(system: System, power: Power, platform: Platform) {
@@ -100,6 +102,8 @@ export class SmartApp extends WebApp {
     this.addFile("materializeCSS", __dirname + "/views/assets/materialize.min.css", "text/css");
     this.addFile("materializeJS", __dirname + "/views/assets/materialize.min.js", "text/javascript");
     this.addFile("favicon", __dirname + "/views/assets/favicon.ico", "image/x-icon");
+
+    this.addFile("proxy", __dirname + "/views/proxy.ejs", "text/html");
   }
 
   writeConfig() {
@@ -212,6 +216,9 @@ export class SmartApp extends WebApp {
     } else if (context.request === "settings") {
       return this.doSettings(context);
 
+    } else if (context.request === "proxy") {
+      return this.doProxy(context);
+
     } else {
       return super.doRequest(context);
     }
@@ -254,6 +261,31 @@ export class SmartApp extends WebApp {
              logicalAddress, logicalNodeAddress };
   }
 
+  ///////////
+  // Proxy //
+  ///////////
+  async doProxy(context: Context): Promise<HttpResponse> {
+    let config: ProxyConfig = this.config.proxy || kEmptyProxy;
+
+    if (context.action === "save") {
+      // save the proxy config
+      config.cloudServer = context.getParam({name: "cloudServer", type: "string"});
+      config.cloudPort = context.getParam({name: "cloudPort", type: "integer"});
+      config.masterAddress = context.getParam({name: "masterAddress", type: "string"});
+      config.masterPort = context.getParam({name: "masterPort", type: "integer"});
+      config.uniqueId = context.getParam({name: "uniqueId", type: "string"});
+      this.write("proxy", config);
+      setProxyConfig(config);
+
+    } else if (context.action === "restart") {
+      cleanStart(true);
+      
+    } else {
+      // just show the proxy config
+    }
+    return this.ejs("proxy", context, { config });
+  }
+
   //////////////
   // Settings //
   //////////////

package/server/views/nav.ejs

@@ -4,6 +4,7 @@
     <ul id="nav-mobile" class="right">
       <li <%= (request === "masters") ? 'class="active"' : '' %></li><a href="/masters">Masters</a></li>
       <li <%= (request === "services") ? 'class="active"' : '' %></li><a href="/services">Services</a></li>
+      <li <%= (request === "proxy") ? 'class="active"' : '' %></li><a href="/proxy">Proxy</a></li>
       <li <%= (request === "links") ? 'class="active"' : '' %></li><a href="/links">Links</a></li>
       <% if (hasSmappee) { %><li <%= ((request === "power") && (type === "smappee")) ? 'class="active"' : '' %></li><a href="/power?type=smappee">Smappee</a></li><% } %>
       <% if (hasP1) { %><li <%= ((request === "power") && (type === "p1")) ? 'class="active"' : '' %></li><a href="/power?type=p1">P1</a></li><% } %>

package/server/views/proxy.ejs

@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+  <html>
+    <head>
+      <link type="text/css" rel="stylesheet" href="/files/min.css"  media="screen,projection"/>
+
+      <!--Let browser know website is optimized for mobile-->
+      <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+      <link rel="shortcut icon" href="/files/favicon.ico" type="image/x-icon" />
+      <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+
+      <%- include('/views/style'); -%>
+    </head>
+
+    <body>
+      <%- include('/views/nav', this); -%>
+
+      <form method="POST" action="/proxy">
+        <input type="hidden" name="daction" value="save">
+        <h1>
+          Proxy Config
+          <button class="right btn waves-effect waves-light" type="submit" name="action" value="cancel">Back</button>
+          <button class="right btn waves-effect waves-light" type="submit" name="action" value="save">Save</button>
+          <button class="right btn waves-effect waves-light red" type="submit" name="action" value="restart">Restart</button>
+        </h1>
+
+        <div class="row">
+          <div class="input-field col s12">
+            <input placeholder="ws.duotecno.eu" id="cloudServer" name="cloudServer" type="text" 
+                   value="<%= config.cloudServer %>">
+            <label for="name">CloudServer</label>
+          </div>
+        </div>
+        <div class="row">
+          <div class="input-field col s12">
+            <input placeholder="5099" id="cloudPort" name="cloudPort" type="number" 
+                   value="<%= config.cloudPort %>">
+            <label for="name">CloudPort</label>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="input-field col s12">
+            <input placeholder="192.168.0.2" id="masterAddress" name="masterAddress" type="text" 
+                   value="<%= config.masterAddress %>">
+            <label for="name">MasterAddress</label>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="input-field col s12">
+            <input placeholder="5001" id="masterPort" name="masterPort" type="text" 
+                   value="<%= config.masterPort %>">
+            <label for="name">MasterPort</label>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="input-field col s12">
+            <input placeholder="client:5002" id="uniqueId" name="uniqueId" type="text" 
+                   value="<%= config.uniqueId %>">
+            <label for="name">UniqueId</label>
+          </div>
+        </div>
+
+      </form>
+      <%- include('/views/footer'); -%>
+
+    </body>
+
+    <%- include('/views/scripts'); -%>
+  </html>