homebridge-smartsystem 7.2.1 → 7.2.3

package/duotecno/types.js

@@ -20,7 +20,9 @@ exports.kEmptyProxy = {
     cloudPort: 5097,
     masterAddress: "",
     masterPort: 5001,
+    masterPortEnabled: false,
     masterConfigPort: 8080,
+    masterConfigPortEnabled: false,
     installationId: "",
     nodeNumber: 0xff,
     httpEnabled: false,
@@ -441,7 +443,9 @@ exports.Sanitizers = {
         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.masterPortEnabled = !!(config === null || config === void 0 ? void 0 : config.masterPortEnabled);
         c.masterConfigPort = (config === null || config === void 0 ? void 0 : config.masterConfigPort) || exports.kEmptyProxy.masterConfigPort;
+        c.masterConfigPortEnabled = !!(config === null || config === void 0 ? void 0 : config.masterConfigPortEnabled);
         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);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "7.2.1",
+  "version": "7.2.3",
   "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

@@ -90,7 +90,9 @@ function setProxyConfig(c) {
         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.masterPortEnabled = !!c.masterPortEnabled;
         config.masterConfigPort = c.masterConfigPort || types_1.kEmptyProxy.masterConfigPort;
+        config.masterConfigPortEnabled = !!c.masterConfigPortEnabled;
         config.installationId = c.installationId || types_1.kEmptyProxy.installationId;
         config.nodeNumber = (typeof c.nodeNumber === "number") ? c.nodeNumber : types_1.kEmptyProxy.nodeNumber;
         config.httpEnabled = !!c.httpEnabled;
@@ -194,21 +196,25 @@ function cleanStart(restart = false) {
     if (restart) {
         log(`[PROXY] → [CLOUD] Restarting proxy...`);
         let connectionsStarted = 0;
-        // Start connection for the master device's raw protocol port if an installation ID is configured.
-        // Masters always register under the fixed master node number (kMasterNodeNumber), not the
-        // gateway's own (configurable) nodeNumber.
-        if (config.installationId && config.masterAddress) {
+        // Start connection for the master device's raw protocol port if an installation ID is configured
+        // and this tunnel is explicitly enabled (off by default). Masters always register under the
+        // fixed master node number (kMasterNodeNumber), not the gateway's own (configurable) nodeNumber.
+        if (config.installationId && config.masterAddress && config.masterPortEnabled) {
             const masterId = makeDeviceId(config, exports.kMasterNodeNumber, "tcp", config.masterPort);
             log(`[PROXY] Starting proxy for master device: ${masterId}`);
             makeNewCloudConnection(config.masterAddress, config.masterPort, config.cloudServer, config.cloudPort, masterId);
             connectionsStarted++;
         }
+        else if (config.installationId && config.masterAddress) {
+            log(`[PROXY] → [CLOUD] Master TCP tunnel disabled, skipping master connection.`);
+        }
         else if (config.installationId) {
             log(`[PROXY] → [CLOUD] Installation ID configured but no masterAddress, skipping master connection.`);
         }
         // Start a proxy for the master's Config API port -- this is an HTTP API, so it's tagged
         // "http" rather than "tcp" even though the tunnel itself just relays raw bytes either way.
-        if (config.installationId && config.masterAddress && config.masterConfigPort) {
+        // Also off by default, only started when explicitly enabled.
+        if (config.installationId && config.masterAddress && config.masterConfigPort && config.masterConfigPortEnabled) {
             const configId = makeDeviceId(config, exports.kMasterNodeNumber, "http", config.masterConfigPort);
             log(`[PROXY] Starting proxy for Config API: ${configId} -> ${config.masterAddress}:${config.masterConfigPort}`);
             // All connections use the same cloud port for WebSocket multiplexing

package/server/smartapp.js

@@ -263,6 +263,10 @@ function SmartSocketInit(message){
                     // save username / password in config
                     this.config.username = user;
                     this.config.password = pw;
+                    // remember the username as the login page's default, so it doesn't keep falling back
+                    // to the hardcoded "duotecno" default for gateways whose actual account uses another name
+                    this.config.user = user;
+                    this.user = user;
                     this.writeConfig();
                     this.token = access_token;
                     (0, config_1.setToken)(this.token);
@@ -392,7 +396,9 @@ function SmartSocketInit(message){
                 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.masterPortEnabled = !!context.getParam({ name: "masterPortEnabled", type: "string" });
                 config.masterConfigPort = context.getParam({ name: "masterConfigPort", type: "integer" });
+                config.masterConfigPortEnabled = !!context.getParam({ name: "masterConfigPortEnabled", type: "string" });
                 config.installationId = context.getParam({ name: "installationId", type: "string" });
                 config.nodeNumber = context.getParam({ name: "nodeNumber", type: "string" })
                     ? parseInt(context.getParam({ name: "nodeNumber", type: "string" }), 16) : proxy_1.kEmptyProxy.nodeNumber;

package/server/views/proxy.ejs

@@ -116,11 +116,14 @@
         <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 || '' %>">
+            <input id="dserverEmail" name="dserverEmail" type="email" autocomplete="off"
+                   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 || '' %>">
+            <input id="dserverPassword" name="dserverPassword" type="text" autocomplete="off"
+                   style="-webkit-text-security: disc;"
+                   value="<%= config.dserverPassword || '' %>">
           </div>
         </div>
 
@@ -144,7 +147,8 @@
           <div class="col s6">
             <p>
               <label>
-                <input type="checkbox" class="filled-in" checked disabled />
+                <input type="checkbox" class="filled-in" id="masterPortEnabled" name="masterPortEnabled" value="Y"
+                       <%= config.masterPortEnabled ? "checked" : "" %> />
                 <span><strong>Websocket</strong></span>
               </label>
             </p>
@@ -157,7 +161,8 @@
           <div class="col s6">
             <p>
               <label>
-                <input type="checkbox" class="filled-in" checked disabled />
+                <input type="checkbox" class="filled-in" id="masterConfigPortEnabled" name="masterConfigPortEnabled" value="Y"
+                       <%= config.masterConfigPortEnabled ? "checked" : "" %> />
                 <span><strong>Config port</strong></span>
               </label>
             </p>