homebridge-smartsystem 7.2.2 → 7.2.4

package/package.json

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

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);

package/server/views/proxy.ejs

@@ -12,7 +12,8 @@
         <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" type="submit" name="action" value="save"
+                  onclick="return confirmNodeNumber();">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') %>"
@@ -116,11 +117,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="text" 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>
 
@@ -177,7 +181,8 @@
         </h2>
         <p class="grey-text" style="margin-bottom: 2rem;">
           Reach this configuration interface itself through the cloud server, at
-          <code>https://<%= config.cloudServer %>/connect/<%= deviceIds.http %>/</code>.
+          <code>https://<%= config.cloudServer %>/connect/<%= deviceIds.http %>/ <br>
+          and fill in your username + password.</code>.
         </p>
 
         <div class="row" style="margin-top: 1rem;">
@@ -335,5 +340,19 @@
 
     </body>
 
+    <script>
+      // The gateway has no Duotecno bus address of its own -- it always registers under the
+      // reserved node 0xff. Deviating from that is an exceptional setup that can collide with
+      // another device's registration on the cloud server, so confirm it explicitly on Save.
+      function confirmNodeNumber() {
+        var el = document.getElementById('nodeNumber');
+        var v = (el.value || '').trim().toLowerCase().replace(/^0x/, '');
+        if (v === '' || v === 'ff') return true;
+        return confirm('You changed the reserved node number away from the default (0xff). ' +
+          'This is an exceptional setup and may conflict with another device registered on the ' +
+          'cloud server. Continue anyway?');
+      }
+    </script>
+
     <%- include('/views/scripts'); -%>
   </html>