homebridge-smartsystem 7.1.22 → 7.1.24

package/accessories/accessory.js

@@ -49,7 +49,7 @@ class Accessory {
     getState(next) {
         if (this.unit) {
             (0, logger_1.log)("accessory", "getState was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.status);
-            next(null, this.unit.status);
+            next(null, !!this.unit.status);
         }
         else {
             next(new Error("accessory - getState needs to be overridden if no unit is provided."));
@@ -81,7 +81,7 @@ class Accessory {
             next(new Error("accessory - setState needs to be overridden if no unit is provided."));
     }
     updateState() {
-        this.me.getCharacteristic(this.homebridge.Characteristic.On).updateValue(this.unit.status);
+        this.me.getCharacteristic(this.homebridge.Characteristic.On).updateValue(!!this.unit.status);
         (0, logger_1.log)("accessory", "Received status change -> update accessory -> " + this.unit.getName() + " -> on = " + this.unit.status);
     }
 }

package/accessories/dimmer.js

@@ -28,9 +28,10 @@ class Dimmer extends accessory_1.Accessory {
         return [lightbulbService];
     }
     getBrightness(next) {
+        var _a;
         if (this.unit) {
             (0, logger_1.log)("accessory", "getBrightness was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
-            next(null, this.unit.value);
+            next(null, (_a = this.unit.value) !== null && _a !== void 0 ? _a : 0);
         }
         else {
             next(new Error("accessory - getBrightness needs to be overridden if no unit is provided."));

package/accessories/temperature.js

@@ -21,9 +21,10 @@ class Temperature extends accessory_1.Accessory {
         return [temperatureService];
     }
     getTemperature(next) {
+        var _a;
         if (this.unit) {
             (0, logger_1.log)("accessory", "getTemperature was called for " + this.unit.node.getName() + " - " + this.unit.getName() + " -> " + this.unit.value);
-            const limited = Math.max(-100, Math.min(100, this.unit.value / 10.0));
+            const limited = Math.max(-100, Math.min(100, ((_a = this.unit.value) !== null && _a !== void 0 ? _a : 0) / 10.0));
             next(null, limited);
         }
         else {

package/duotecno/types.js

@@ -14,8 +14,22 @@ 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.cap = exports.char = exports.ascii = exports.wait = exports.Sanitizers = exports.actionValueStr = exports.actionValue = exports.kEmptyBinding = exports.kEmptyDevice = exports.PowerSource = 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");
+exports.makeInt = exports.now = exports.datetime = exports.time = exports.date = exports.watt = exports.hex = exports.two = exports.cap = exports.char = exports.ascii = exports.wait = exports.Sanitizers = exports.actionValueStr = exports.actionValue = exports.kEmptyBinding = exports.kEmptyDevice = exports.PowerSource = 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 = exports.kEmptyProxy = void 0;
+exports.kEmptyProxy = {
+    cloudServer: "masters.duotecno.eu",
+    cloudPort: 5097,
+    masterAddress: "",
+    masterPort: 5001,
+    masterConfigPort: 8080,
+    installationId: "",
+    nodeNumber: 0xff,
+    httpEnabled: false,
+    gatewayPhysicalId: "",
+    debug: false,
+    kind: "gw",
+    dserverEmail: "",
+    dserverPassword: "",
+};
 // Node types
 var NodeType;
 (function (NodeType) {
@@ -419,16 +433,19 @@ exports.Sanitizers = {
     ///////////
     proxy: function (config, system) {
         var _a, _b;
-        const c = Object.assign({}, 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;
+        const c = Object.assign({}, exports.kEmptyProxy);
+        c.cloudServer = (config === null || config === void 0 ? void 0 : config.cloudServer) || exports.kEmptyProxy.cloudServer;
+        c.cloudPort = (config === null || config === void 0 ? void 0 : config.cloudPort) || exports.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.masterConfigPort = (config === null || config === void 0 ? void 0 : config.masterConfigPort) || proxy_1.kEmptyProxy.masterConfigPort;
-        c.installationId = (config === null || config === void 0 ? void 0 : config.installationId) || proxy_1.kEmptyProxy.installationId;
-        c.nodeNumber = (typeof (config === null || config === void 0 ? void 0 : config.nodeNumber) === "number") ? config.nodeNumber : proxy_1.kEmptyProxy.nodeNumber;
+        c.masterConfigPort = (config === null || config === void 0 ? void 0 : config.masterConfigPort) || exports.kEmptyProxy.masterConfigPort;
+        c.installationId = (config === null || config === void 0 ? void 0 : config.installationId) || exports.kEmptyProxy.installationId;
+        c.nodeNumber = (typeof (config === null || config === void 0 ? void 0 : config.nodeNumber) === "number") ? config.nodeNumber : exports.kEmptyProxy.nodeNumber;
         c.httpEnabled = !!(config === null || config === void 0 ? void 0 : config.httpEnabled);
+        c.gatewayPhysicalId = (config === null || config === void 0 ? void 0 : config.gatewayPhysicalId) || exports.kEmptyProxy.gatewayPhysicalId;
         c.kind = "gw";
+        c.dserverEmail = (config === null || config === void 0 ? void 0 : config.dserverEmail) || exports.kEmptyProxy.dserverEmail;
+        c.dserverPassword = (config === null || config === void 0 ? void 0 : config.dserverPassword) || exports.kEmptyProxy.dserverPassword;
         return c;
     },
     //////////////

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "7.1.22",
+  "version": "7.1.24",
   "description": "SmartServer (Proxy TCP sockets to the cloud, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
   "main": "index.js",
   "author": "Johan Coppieters",
@@ -36,7 +36,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/Duotecno-developer/smartsocket.git"
+    "url": "git+https://github.com/Duotecno-developer/smartsocket.git"
   },
   "dependencies": {
     "bonjour-service": "^1.3.0",

package/server/dserver.js

@@ -0,0 +1,175 @@
+"use strict";
+//
+// Minimal client for dserver's Installation Backup API (see
+// installation-backup-api.md in the dserver repo), used by the Proxy Config
+// page's Backup/Restore buttons to push/pull this gateway's own config.json.
+//
+// dserver has no machine/device auth: a gateway authenticates exactly like
+// a human user would (email+password -> rotating ticket), mirroring the
+// Duotecno Designer app's DserverService.ts. The numeric installation id
+// dserver needs is resolved from the same free-form string already used as
+// ProxyConfig.installationId, via GET /identifier/{name} (HTTP Basic Auth
+// only -- IdentifierController.isAllowed() never accepts a ticket there).
+//
+// Uses Node's built-in https module (not fetch) since this project's
+// @types/node predates fetch/FormData/Blob typings.
+//
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.downloadBackupFile = exports.createBackup = exports.getBackupDetail = exports.listBackups = exports.resolveInstallation = exports.clearDserverTicketCache = exports.kGatewayTag = void 0;
+const https = require("https");
+const kDserverHost = "duotecno.eu";
+const kLang = "en";
+exports.kGatewayTag = "gateway";
+// rotating session ticket, cached in memory for the life of this process
+let cachedTicket = null;
+function clearDserverTicketCache() {
+    cachedTicket = null;
+}
+exports.clearDserverTicketCache = clearDserverTicketCache;
+function basicAuthHeader(creds) {
+    return "Basic " + Buffer.from(`${creds.email}:${creds.password}`).toString("base64");
+}
+function rawRequest(options, body) {
+    return new Promise((resolve, reject) => {
+        const req = https.request(Object.assign({ host: kDserverHost }, options), res => {
+            const chunks = [];
+            res.on('data', (c) => chunks.push(c));
+            res.on('end', () => resolve({ status: res.statusCode || 0, body: Buffer.concat(chunks) }));
+        });
+        req.on('error', reject);
+        req.setTimeout(15000, () => req.destroy(new Error("dserver request timed out")));
+        if (body)
+            req.write(body);
+        req.end();
+    });
+}
+function parseJson(body) {
+    try {
+        return JSON.parse(body.toString('utf-8'));
+    }
+    catch (_a) {
+        return null;
+    }
+}
+function login(creds) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        const body = Buffer.from(JSON.stringify({ request: "login", email: creds.email, password: creds.password }));
+        const { status, body: respBody } = yield rawRequest({
+            path: `/${kLang}/api`,
+            method: "POST",
+            headers: { "Content-Type": "application/json", "Content-Length": body.length }
+        }, body);
+        const json = parseJson(respBody);
+        if (status !== 200 || !json || String(json.status).toLowerCase() !== "ok" || !((_a = json.user) === null || _a === void 0 ? void 0 : _a.ticket)) {
+            throw new Error((json === null || json === void 0 ? void 0 : json.message) || `dserver login failed (HTTP ${status})`);
+        }
+        cachedTicket = json.user.ticket;
+        return cachedTicket;
+    });
+}
+function ensureTicket(creds) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return cachedTicket || login(creds);
+    });
+}
+// Ticket-authenticated JSON call against /{lang}{path}, retrying once (with a forced fresh
+// login) if the cached ticket turned out to be stale.
+function call(creds, method, path, query = {}, body, extraHeaders = {}, retry = true) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        const ticket = yield ensureTicket(creds);
+        const params = new URLSearchParams(Object.assign(Object.assign({}, query), { ticket }));
+        const headers = Object.assign({}, extraHeaders);
+        if (!body)
+            headers["Content-Type"] = "application/json"; // forces dserver's JSON (vs HTML) response branch
+        if (body)
+            headers["Content-Length"] = String(body.length);
+        const { status, body: respBody } = yield rawRequest({
+            path: `/${kLang}${path}?${params.toString()}`,
+            method,
+            headers
+        }, body);
+        const json = parseJson(respBody);
+        if (json === null || json === void 0 ? void 0 : json.ticket)
+            cachedTicket = json.ticket; // dserver rotates the ticket on every response
+        if (status === 403 && retry) {
+            cachedTicket = null;
+            return call(creds, method, path, query, body, extraHeaders, false);
+        }
+        if (!json || status < 200 || status >= 300 || ["nok", "err"].includes(String(json.status).toLowerCase())) {
+            throw new Error((json === null || json === void 0 ? void 0 : json.message) || `dserver call failed (HTTP ${status})`);
+        }
+        return (_a = json.data) !== null && _a !== void 0 ? _a : json;
+    });
+}
+// GET /{lang}/identifier/{name} -- the one endpoint that only accepts HTTP Basic Auth,
+// never a ticket (see IdentifierController.isAllowed() in dserver).
+function resolveInstallation(creds, name) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { status, body } = yield rawRequest({
+            path: `/${kLang}/identifier/${encodeURIComponent(name)}?nocookie=1`,
+            method: "GET",
+            headers: { "Authorization": basicAuthHeader(creds), "Content-Type": "application/json" }
+        });
+        const json = parseJson(body);
+        if (status !== 200 || !json || String(json.status).toLowerCase() !== "ok") {
+            throw new Error((json === null || json === void 0 ? void 0 : json.message) || `dserver installation lookup failed (HTTP ${status})`);
+        }
+        return { exists: !!json.exists, id: json.id, name };
+    });
+}
+exports.resolveInstallation = resolveInstallation;
+function listBackups(creds, installationId, tag = exports.kGatewayTag) {
+    return call(creds, "GET", `/installation/${installationId}/backup`, { tag });
+}
+exports.listBackups = listBackups;
+function getBackupDetail(creds, installationId, backupId) {
+    return call(creds, "GET", `/installation/${installationId}/backup/${backupId}`);
+}
+exports.getBackupDetail = getBackupDetail;
+function createBackup(creds, installationId, description, filename, fileContent, tag = exports.kGatewayTag) {
+    const boundary = "----smartsocketBackup" + Date.now().toString(16);
+    const crlf = "\r\n";
+    const parts = [
+        Buffer.from(`--${boundary}${crlf}Content-Disposition: form-data; name="tag"${crlf}${crlf}${tag}${crlf}`),
+    ];
+    if (description) {
+        parts.push(Buffer.from(`--${boundary}${crlf}Content-Disposition: form-data; name="description"${crlf}${crlf}${description}${crlf}`));
+    }
+    parts.push(Buffer.from(`--${boundary}${crlf}Content-Disposition: form-data; name="file"; filename="${filename}"${crlf}Content-Type: application/json${crlf}${crlf}`));
+    parts.push(fileContent);
+    parts.push(Buffer.from(`${crlf}--${boundary}--${crlf}`));
+    const body = Buffer.concat(parts);
+    return call(creds, "POST", `/installation/${installationId}/backup`, {}, body, { "Content-Type": `multipart/form-data; boundary=${boundary}` });
+}
+exports.createBackup = createBackup;
+function downloadBackupFile(creds, installationId, backupId, filename) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const ticket = yield ensureTicket(creds);
+        // filename may contain "/" (a preserved subfolder path) -- encode each segment separately,
+        // matching dserver's own getFilename() which splits the URL path into segments itself.
+        const encodedPath = filename.split("/").map(encodeURIComponent).join("/");
+        const params = new URLSearchParams({ ticket });
+        const { status, body } = yield rawRequest({
+            path: `/${kLang}/installation/${installationId}/backup/${backupId}/files/${encodedPath}?${params.toString()}`,
+            method: "GET",
+            headers: { "Content-Type": "application/json" }
+        });
+        if (status !== 200) {
+            throw new Error(`dserver file download failed: ${filename} (HTTP ${status})`);
+        }
+        return body;
+    });
+}
+exports.downloadBackupFile = downloadBackupFile;
+//# sourceMappingURL=dserver.js.map

package/server/proxy.js

@@ -9,10 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Context = exports.cleanStart = exports.makeNewCloudConnection = exports.gCloudConnections = exports.setProxyConfig = exports.setWebApp = exports.kEmptyProxy = exports.gatewayHttpPort = exports.makeDeviceId = exports.kMasterNodeNumber = void 0;
+exports.Context = exports.cleanStart = exports.makeNewCloudConnection = exports.gCloudConnections = exports.setProxyConfig = exports.setWebApp = exports.gatewayHttpPort = exports.makeDeviceId = exports.kMasterNodeNumber = exports.kEmptyProxy = void 0;
 const net = require("net");
+const os = require("os");
 const child_process_1 = require("child_process");
 const process_1 = require("process");
+const config_1 = require("../duotecno/config");
+const types_1 = require("../duotecno/types");
+Object.defineProperty(exports, "kEmptyProxy", { enumerable: true, get: function () { return types_1.kEmptyProxy; } });
 // Fixed, non-configurable logical node number every Duotecno master identifies itself with
 // on the bus -- used for both of the master's own registrations (raw protocol + Config API).
 exports.kMasterNodeNumber = 0xfc;
@@ -31,19 +35,48 @@ function gatewayHttpPort() {
     return port || 80;
 }
 exports.gatewayHttpPort = gatewayHttpPort;
-exports.kEmptyProxy = {
-    cloudServer: "masters.duotecno.eu",
-    cloudPort: 5097,
-    masterAddress: "",
-    masterPort: 5001,
-    masterConfigPort: 8080,
-    installationId: "",
-    nodeNumber: 0xff,
-    httpEnabled: false,
-    debug: false,
-    kind: "gw" // default running under the gateway or other process manager -> don't restart yourself
-};
-const config = Object.assign({}, exports.kEmptyProxy);
+// The cloud server can tell apart two different physical devices that were accidentally
+// registered under the same unique id (instead of assuming a reconnect and evicting the
+// other one), given a "physical address" -- 1-8 hex digits, formatted "0x..." -- alongside
+// the unique id at registration. Masters have a real one: the Duotecno bus physical address
+// of their own logical node (kMasterNodeNumber). Returns '' if not known yet (e.g. the master
+// hasn't finished its initial discovery), in which case no physical address is sent for this
+// registration, same as old firmware.
+function masterPhysicalAddress() {
+    const system = gWebApp === null || gWebApp === void 0 ? void 0 : gWebApp.system;
+    const master = (system === null || system === void 0 ? void 0 : system.findMaster) ? system.findMaster(config.masterAddress, config.masterPort) : null;
+    const node = (master === null || master === void 0 ? void 0 : master.findNode) ? master.findNode(exports.kMasterNodeNumber) : null;
+    const phys = node === null || node === void 0 ? void 0 : node.physicalAddress;
+    return (typeof phys === "number" && phys > 0) ? "0x" + phys.toString(16) : '';
+}
+// The gateway itself has no Duotecno bus address of its own. Prefer the last two groups of a
+// non-internal IPv6 address (8 hex digits total, e.g. "2afa:23fa:b95:9ebf" -> last two groups
+// "b95:9ebf" -> "0x0b959ebf") if one is available on this machine; otherwise fall back to a
+// random id generated once and persisted in config.json, so it stays stable across restarts
+// and lets the cloud tell two different physical gateways apart even if they were accidentally
+// given the same installation id.
+function gatewayPhysicalAddress() {
+    const interfaces = os.networkInterfaces();
+    for (const name in interfaces) {
+        for (const iface of interfaces[name] || []) {
+            if ((iface.family === "IPv6" || iface.family === 6) && !iface.internal) {
+                const groups = iface.address.split(":").filter(g => g.length > 0);
+                if (groups.length >= 2) {
+                    const last2 = groups.slice(-2).map(g => g.padStart(4, '0')).join('');
+                    return "0x" + last2;
+                }
+            }
+        }
+    }
+    if (!config.gatewayPhysicalId) {
+        config.gatewayPhysicalId = "0x" + Math.floor(Math.random() * 0x100000000).toString(16).padStart(8, '0');
+        (0, config_1.setSubConfig)("proxy", config);
+        (0, config_1.setAPIConfig)();
+        log(`[PROXY] No IPv6 address available, generated and stored a random physical id for this gateway: ${config.gatewayPhysicalId}`);
+    }
+    return config.gatewayPhysicalId;
+}
+const config = Object.assign({}, types_1.kEmptyProxy);
 // Store reference to the webapp so we can close servers before restarting
 let gWebApp = null;
 function setWebApp(webapp) {
@@ -53,16 +86,19 @@ exports.setWebApp = setWebApp;
 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.masterConfigPort = c.masterConfigPort || exports.kEmptyProxy.masterConfigPort;
-        config.installationId = c.installationId || exports.kEmptyProxy.installationId;
-        config.nodeNumber = (typeof c.nodeNumber === "number") ? c.nodeNumber : exports.kEmptyProxy.nodeNumber;
+        config.cloudServer = c.cloudServer || types_1.kEmptyProxy.cloudServer;
+        config.cloudPort = c.cloudPort || types_1.kEmptyProxy.cloudPort;
+        config.masterAddress = c.masterAddress || types_1.kEmptyProxy.masterAddress;
+        config.masterPort = c.masterPort || types_1.kEmptyProxy.masterPort;
+        config.masterConfigPort = c.masterConfigPort || types_1.kEmptyProxy.masterConfigPort;
+        config.installationId = c.installationId || types_1.kEmptyProxy.installationId;
+        config.nodeNumber = (typeof c.nodeNumber === "number") ? c.nodeNumber : types_1.kEmptyProxy.nodeNumber;
         config.httpEnabled = !!c.httpEnabled;
+        config.gatewayPhysicalId = c.gatewayPhysicalId || types_1.kEmptyProxy.gatewayPhysicalId;
         config.debug = !!c.debug;
-        config.kind = c.kind || exports.kEmptyProxy.kind;
+        config.kind = c.kind || types_1.kEmptyProxy.kind;
+        config.dserverEmail = c.dserverEmail || types_1.kEmptyProxy.dserverEmail;
+        config.dserverPassword = c.dserverPassword || types_1.kEmptyProxy.dserverPassword;
     }
     return config;
 }
@@ -114,6 +150,9 @@ function makeNewCloudConnection(master, masterPort, server, serverPort, uniqueId
             // we check every 16 seconds for a free connection, if none found -> restart
         }
     }
+    // lets the cloud tell two genuinely different physical devices apart if they were ever
+    // accidentally configured with the same unique id, instead of assuming a reconnect
+    const physicalAddress = isGateway ? gatewayPhysicalAddress() : masterPhysicalAddress();
     const cloudSocket = new net.Socket();
     cloudSocket.once('error', reconnect);
     // net.Socket.connect() has no default timeout: if the TCP handshake to the cloud gets
@@ -130,9 +169,9 @@ function makeNewCloudConnection(master, masterPort, server, serverPort, uniqueId
         log(`[PROXY] → [CLOUD] Connected to Cloud at ${server}:${serverPort}`);
         cloudSocket.setTimeout(0); // connected -- no longer subject to the connect-attempt timeout
         cloudSocket.removeListener('error', reconnect);
-        // Send unique ID as the first message to identify this proxy/device
-        cloudSocket.write(`[${uniqueId}]`);
-        debug(`[PROXY] → [CLOUD] Sent unique ID: ${uniqueId}`);
+        // Send unique ID (and physical address, if known) as the first message to identify this proxy/device
+        cloudSocket.write(physicalAddress ? `[${uniqueId}][${physicalAddress}]` : `[${uniqueId}]`);
+        debug(`[PROXY] → [CLOUD] Sent unique ID: ${uniqueId}` + (physicalAddress ? ` physical address: ${physicalAddress}` : ''));
         const context = new Context(cloudSocket, master, masterPort, server, serverPort, uniqueId, isGateway);
         exports.gCloudConnections.push(context);
         log(`[PROXY] → [CLOUD] New free connection #${exports.gCloudConnections.length} to the Cloud at ${server}:${serverPort}`);

package/server/smartapp.js

@@ -29,6 +29,8 @@ const config_1 = require("../duotecno/config");
 const HB_1 = require("./HB");
 const HA_API_1 = require("./HA-API");
 const proxy_1 = require("./proxy");
+const config_2 = require("../duotecno/config");
+const dserver_1 = require("./dserver");
 const WebSocket = require("ws");
 const kMaster = { name: "master", type: "string", default: "0.0.0.0:5001" };
 const kAddress = { name: "address", type: "string", default: "0.0.0.0" };
@@ -377,6 +379,11 @@ function SmartSocketInit(message){
     doProxy(context) {
         return __awaiter(this, void 0, void 0, function* () {
             let config = this.read("proxy") || proxy_1.kEmptyProxy;
+            // "grey" (nothing configured yet), "blue" (installation id set, not checked against the
+            // cloud yet) or "warning" (a backup/restore attempt this request found a problem) -- see
+            // doBackupToCloud()/doRestoreFromCloud() below.
+            let backupState = config.installationId ? "blue" : "grey";
+            let backupMessage = "";
             if (context.action === "save") {
                 // save the proxy config
                 config.cloudServer = context.getParam({ name: "cloudServer", type: "string" });
@@ -388,14 +395,33 @@ function SmartSocketInit(message){
                 config.nodeNumber = context.getParam({ name: "nodeNumber", type: "string" })
                     ? parseInt(context.getParam({ name: "nodeNumber", type: "string" }), 16) : proxy_1.kEmptyProxy.nodeNumber;
                 config.httpEnabled = !!context.getParam({ name: "httpEnabled", type: "string" });
+                config.dserverEmail = context.getParam({ name: "dserverEmail", type: "string" });
+                config.dserverPassword = context.getParam({ name: "dserverPassword", type: "string" });
                 this.write("proxy", config);
                 (0, proxy_1.setProxyConfig)(config);
                 // Automatically restart proxy with new config
                 (0, proxy_1.cleanStart)(true);
+                backupState = config.installationId ? "blue" : "grey";
             }
             else if (context.action === "restart") {
                 (0, proxy_1.cleanStart)(true);
             }
+            else if (context.action === "backup") {
+                const result = yield this.doBackupToCloud(config);
+                backupState = result.state;
+                backupMessage = result.message;
+            }
+            else if (context.action === "restore") {
+                const backupId = parseInt(context.getParam({ name: "backupId", type: "string" }) || "", 10);
+                if (backupId) {
+                    const result = yield this.doRestoreFromCloud(config, backupId);
+                    if (result.ok) {
+                        return this.doRestart(false); // process exits, gateway comes back up with the restored config
+                    }
+                    backupState = "warning";
+                    backupMessage = result.message;
+                }
+            }
             else {
                 // just show the proxy config
             }
@@ -412,7 +438,78 @@ function SmartSocketInit(message){
                 configHttp: (0, proxy_1.makeDeviceId)(config, proxy_1.kMasterNodeNumber, "http", config.masterConfigPort || proxy_1.kEmptyProxy.masterConfigPort || 8080),
                 http: (0, proxy_1.makeDeviceId)(config, config.nodeNumber, "http", (0, proxy_1.gatewayHttpPort)()),
             };
-            return this.ejs("proxy", context, { config, connections: proxy_1.gCloudConnections, mdnsStatus, deviceIds });
+            // Best-effort: list existing "gateway"-tagged backups for display, so the page can show
+            // "N backup versions, last: ..." and offer a version to restore. Any failure here (no
+            // credentials yet, installation not registered, cloud unreachable) just shows an empty list
+            // rather than failing the whole page -- the Backup/Restore buttons already surface the same
+            // error more directly when actually clicked.
+            let backups = [];
+            let backupListError = "";
+            if (config.installationId && config.dserverEmail && config.dserverPassword) {
+                try {
+                    const creds = { email: config.dserverEmail, password: config.dserverPassword };
+                    const inst = yield (0, dserver_1.resolveInstallation)(creds, config.installationId);
+                    if (inst.exists && inst.id) {
+                        backups = yield (0, dserver_1.listBackups)(creds, inst.id);
+                    }
+                }
+                catch (e) {
+                    backupListError = e.message || String(e);
+                }
+            }
+            return this.ejs("proxy", context, { config, connections: proxy_1.gCloudConnections, mdnsStatus, deviceIds,
+                backupState, backupMessage, backups, backupListError });
+        });
+    }
+    // Pushes this gateway's own persisted config.json to dserver as a new "gateway"-tagged backup.
+    doBackupToCloud(config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!config.installationId) {
+                return { state: "grey", message: "" };
+            }
+            if (!config.dserverEmail || !config.dserverPassword) {
+                return { state: "warning", message: "No Duotecno account configured -- fill in the account email/password below and save first." };
+            }
+            const creds = { email: config.dserverEmail, password: config.dserverPassword };
+            try {
+                const inst = yield (0, dserver_1.resolveInstallation)(creds, config.installationId);
+                if (!inst.exists || !inst.id) {
+                    return { state: "warning", message: `Installation "${config.installationId}" is not registered on the cloud server.` };
+                }
+                const fileContent = (0, fs_1.readFileSync)(config_2.kConfigFiles + "/config.json");
+                yield (0, dserver_1.createBackup)(creds, inst.id, `Gateway backup ${new Date().toISOString()}`, "config.json", fileContent);
+                return { state: "blue", message: "Backup created." };
+            }
+            catch (e) {
+                return { state: "warning", message: e.message || String(e) };
+            }
+        });
+    }
+    // Downloads the chosen "gateway"-tagged backup's config.json from dserver and overwrites this
+    // gateway's own persisted config.json with it -- caller is responsible for restarting after.
+    doRestoreFromCloud(config, backupId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!config.installationId || !config.dserverEmail || !config.dserverPassword) {
+                return { ok: false, message: "Missing installation ID or Duotecno account credentials." };
+            }
+            const creds = { email: config.dserverEmail, password: config.dserverPassword };
+            try {
+                const inst = yield (0, dserver_1.resolveInstallation)(creds, config.installationId);
+                if (!inst.exists || !inst.id) {
+                    return { ok: false, message: `Installation "${config.installationId}" is not registered on the cloud server.` };
+                }
+                const detail = yield (0, dserver_1.getBackupDetail)(creds, inst.id, backupId);
+                const file = (detail.files || []).find(f => f.filename === "config.json" || f.path === "config.json");
+                if (!file) {
+                    return { ok: false, message: "Selected backup does not contain a config.json file." };
+                }
+                const content = yield (0, dserver_1.downloadBackupFile)(creds, inst.id, backupId, file.path);
+                (0, fs_1.writeFileSync)(config_2.kConfigFiles + "/config.json", content);
+                return { ok: true, message: "Config restored." };
+            }
+            catch (e) {
+                return { ok: false, message: e.message || String(e) };
+            }
         });
     }
     //////////////

package/server/views/proxy.ejs

@@ -14,8 +14,56 @@
           <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>
+          <button class="right btn waves-effect waves-light
+                         <%= backupState === 'warning' ? 'orange darken-1' : (backupState === 'blue' ? 'blue' : 'grey') %>"
+                  type="submit" name="action" value="backup" <%= backupState === 'grey' ? 'disabled' : '' %>>Backup</button>
         </h1>
 
+        <div class="row" style="clear: both; margin: 0 0 1rem 0;">
+          <div class="col s12">
+            <% // dd/mm/yyyy hh:mm:ss, per the backup versions list below
+               function fmtBackupDate(iso) {
+                 const d = new Date(iso);
+                 const two = (n) => (n < 10 ? "0" : "") + n;
+                 return two(d.getDate()) + "/" + two(d.getMonth() + 1) + "/" + d.getFullYear() + " "
+                      + two(d.getHours()) + ":" + two(d.getMinutes()) + ":" + two(d.getSeconds());
+               }
+            %>
+            <% if (backupMessage) { %>
+              <p class="<%= backupState === 'warning' ? 'orange-text text-darken-3' : 'green-text text-darken-3' %>" style="margin: 0 0 0.5rem 0;">
+                <%= backupMessage %>
+              </p>
+            <% } %>
+            <% if (backups && backups.length > 0) { %>
+              <p style="margin: 0 0 0.5rem 0;">
+                <%= backups.length %> backup version<%= backups.length === 1 ? "" : "s" %>, last:
+                <%= fmtBackupDate(backups[0].created) %>
+              </p>
+              <% backups.forEach(function(b, i) { %>
+                <p style="margin: 0;">
+                  <label>
+                    <input name="backupId" type="radio" class="with-gap" value="<%= b.id %>" <%= i === 0 ? "checked" : "" %> />
+                    <span>
+                      <%= fmtBackupDate(b.created) %>
+                      <% if (b.description) { %>&mdash; <%= b.description %><% } %>
+                    </span>
+                  </label>
+                </p>
+              <% }); %>
+              <button class="btn waves-effect waves-light blue" type="submit" name="action" value="restore"
+                      style="margin-top: 0.5rem;"
+                      onclick="return confirm('This will overwrite the current gateway configuration with the selected backup and restart the gateway. Continue?');">
+                Restore
+              </button>
+            <% } else { %>
+              <p class="grey-text" style="margin: 0;">0 backup versions, last: -not yet-</p>
+            <% } %>
+            <% if (backupListError) { %>
+              <p class="red-text" style="margin: 0.5rem 0 0 0;"><small><%= backupListError %></small></p>
+            <% } %>
+          </div>
+        </div>
+
         <h2 style="margin-top: 2rem; font-size: 1.5rem; font-weight: 500;">
           <i class="material-icons left" style="vertical-align: middle;">cloud</i>
           Cloud Server Settings
@@ -60,6 +108,22 @@
           </div>
         </div>
 
+        <p class="grey-text" style="margin-bottom: 1rem;">
+          Duotecno account used by the <strong>Backup</strong>/<strong>Restore</strong> buttons below to push/pull
+          this gateway's config to/from the cloud server, tagged "gateway" -- the same account you'd use to log
+          into Duotecno Designer.
+        </p>
+        <div class="row" style="margin-top: 0;">
+          <div class="input-field col s6">
+            <label for="dserverEmail">Duotecno Account Email</label>
+            <input id="dserverEmail" name="dserverEmail" type="email" value="<%= config.dserverEmail || '' %>">
+          </div>
+          <div class="input-field col s6">
+            <label for="dserverPassword">Duotecno Account Password</label>
+            <input id="dserverPassword" name="dserverPassword" type="password" value="<%= config.dserverPassword || '' %>">
+          </div>
+        </div>
+
         <h2 style="margin-top: 3rem; font-size: 1.5rem; font-weight: 500;">
           <i class="material-icons left" style="vertical-align: middle;">home</i>
           Master Device