homebridge-smartsystem 7.1.20 → 7.1.21

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "7.1.20",
+  "version": "7.1.21",
   "description": "SmartServer (Proxy TCP sockets to the cloud, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
   "main": "index.js",
   "author": "Johan Coppieters",
@@ -16,7 +16,8 @@
     "check-published": "npm view homebridge-smartsystem version",
     "release:patch": "echo 'npm login !!' && git add -A && git commit -m 'pre-release' --allow-empty && npm version patch && npm publish && git push && git push --tags && echo 'Waiting for npm to propagate...' && sleep 5 && npm run check-published",
     "release:minor": "echo 'npm login !!' && git add -A && git commit -m 'pre-release' --allow-empty && npm version minor && npm publish && git push && git push --tags && echo 'Waiting for npm to propagate...' && sleep 5 && npm run check-published",
-    "release:major": "git add -A && git commit -m 'pre-release' --allow-empty && npm version major && npm publish && git push && git push --tags && echo 'Waiting for npm to propagate...' && sleep 5 && npm run check-published"
+    "release:major": "git add -A && git commit -m 'pre-release' --allow-empty && npm version major && npm publish && git push && git push --tags && echo 'Waiting for npm to propagate...' && sleep 5 && npm run check-published",
+    "push:azure": "bash scripts/push-azure.sh master"
   },
   "engines": {
     "node": "^18.20.4 || ^20.15.1 || ^22",

package/server/HB.js

@@ -9,11 +9,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hbUnsubscribe = exports.hbSubscribe = exports.hbStop = exports.hbGetValue = exports.hbSetState = exports.dt2hbvalue = exports.hb2dtvalue = exports.hbLogin = exports.hbAccessories = exports.hbService = exports.hbName = void 0;
+exports.hbUnsubscribe = exports.hbSubscribe = exports.hbStop = exports.hbGetValue = exports.hbSetState = exports.dt2hbvalue = exports.hb2dtvalue = exports.hbLogin = exports.hbAccessories = exports.hbService = exports.hbName = exports.HbAuthError = void 0;
 const logger_1 = require("../duotecno/logger");
 const HA_API_1 = require("./HA-API");
 let gAccessories = [];
 let timer = null;
+// Thrown when the Homebridge API rejects a request because the access token is
+// missing/expired, so callers can force a fresh hbLogin() instead of silently
+// failing forever with the same stale token.
+class HbAuthError extends Error {
+    constructor(message = "Homebridge API rejected the request: token expired?") {
+        super(message);
+        this.name = "HbAuthError";
+    }
+}
+exports.HbAuthError = HbAuthError;
+function checkHbAuth(respBody) {
+    if (respBody && (respBody.statusCode === 401 || /unauthorized/i.test(respBody.message || respBody.error || ""))) {
+        throw new HbAuthError();
+    }
+}
 function hbName(id) {
     var _a;
     return ((_a = gAccessories.find(item => item.id === id)) === null || _a === void 0 ? void 0 : _a.name) || "Unknown";
@@ -265,6 +280,7 @@ function hbSetState(server, id, service, value, token) {
         const respBody = yield (0, HA_API_1.httpRequest)(server + "/api/accessories/" + id, 'PUT', JSON.stringify(data), HA_API_1.ContentType.json, {
             Authorization: 'Bearer ' + token
         });
+        checkHbAuth(respBody);
         if (respBody && respBody.error) {
             (0, logger_1.log)("HB", "hbSetState: " + id + " -> error: " + JSON.stringify(respBody));
         }
@@ -277,6 +293,7 @@ function hbGetValue(server, id, service, token) {
         const respBody = yield (0, HA_API_1.httpRequest)(server + "/api/accessories/" + id, 'GET', "", HA_API_1.ContentType.json, {
             Authorization: 'Bearer ' + token
         });
+        checkHbAuth(respBody);
         if (respBody && respBody.error) {
             (0, logger_1.log)("HB", "hbGetState: " + id + " -> error: " + JSON.stringify(respBody));
             return undefined;
@@ -298,6 +315,7 @@ function hbStop(server, id, service, token) {
         const respBody = yield (0, HA_API_1.httpRequest)(server + "/api/accessories/" + id, 'GET', "", HA_API_1.ContentType.json, {
             Authorization: 'Bearer ' + token
         });
+        checkHbAuth(respBody);
         if (respBody && respBody.error) {
             (0, logger_1.log)("HB", "hbGetState: " + id + " -> error: " + JSON.stringify(respBody));
             return undefined;

package/server/smartapp.js

@@ -532,17 +532,30 @@ class SmartApp extends webapp_1.WebApp {
             if (this.links.length && (yield this.checkToken())) {
                 for (const link of this.links) {
                     if ((link.type === types_1.LinkType.kAccessory) && link.unit) {
-                        const hbValue = yield (0, HB_1.hbGetValue)(this.config.apiHost + ":" + this.config.apiPort, link.accId, link.accService, this.token);
-                        (0, logger_1.debug)("smartapp", "Received HB value for accessory: " + link.accName + " -> " + hbValue + " from accessory");
-                        if (typeof hbValue != "undefined") {
-                            const { dtValue, dtTarget } = (0, HB_1.hb2dtvalue)(link.unit, hbValue);
-                            if (dtValue !== link.dtValue) { //  || state !== link.status
-                                (0, logger_1.log)("smartapp", "-> Setting value of Duotecno unit: " + link.unit.getDisplayName() + " to " + dtTarget + " of HB accessory: " + link.accName + " with value " + hbValue);
-                                link.dtValue = dtValue;
-                                link.unit.setState(dtTarget);
+                        try {
+                            const hbValue = yield (0, HB_1.hbGetValue)(this.config.apiHost + ":" + this.config.apiPort, link.accId, link.accService, this.token);
+                            (0, logger_1.debug)("smartapp", "Received HB value for accessory: " + link.accName + " -> " + hbValue + " from accessory");
+                            if (typeof hbValue != "undefined") {
+                                const { dtValue, dtTarget } = (0, HB_1.hb2dtvalue)(link.unit, hbValue);
+                                if (dtValue !== link.dtValue) { //  || state !== link.status
+                                    (0, logger_1.log)("smartapp", "-> Setting value of Duotecno unit: " + link.unit.getDisplayName() + " to " + dtTarget + " of HB accessory: " + link.accName + " with value " + hbValue);
+                                    link.dtValue = dtValue;
+                                    link.unit.setState(dtTarget);
+                                }
+                                else {
+                                    (0, logger_1.debug)("smartapp", "-> No change for unit: " + link.unit.getDisplayName() + " to " + dtValue);
+                                }
+                            }
+                        }
+                        catch (e) {
+                            if (e instanceof HB_1.HbAuthError) {
+                                (0, logger_1.err)("smartapp", "initLinks: Homebridge API token expired -> forcing re-login on next round");
+                                this.token = "";
+                                (0, config_1.setToken)("");
+                                break;
                             }
                             else {
-                                (0, logger_1.debug)("smartapp", "-> No change for unit: " + link.unit.getDisplayName() + " to " + dtValue);
+                                (0, logger_1.err)("smartapp", "initLinks: failed to get HB value for accessory " + link.accName + " -> " + e.toString());
                             }
                         }
                     }
@@ -553,6 +566,10 @@ class SmartApp extends webapp_1.WebApp {
     informLinks(u, kind) {
         return __awaiter(this, void 0, void 0, function* () {
             (0, logger_1.debug)("smartapp", "Received DT value from unit: " + u.getDisplayName() + " -> " + u.value + " / " + u.status + " from unit");
+            if (!this.links.length)
+                return;
+            if (!(yield this.checkToken()))
+                return;
             for (const link of this.links) {
                 if (u.isUnit(link.masterAddress, link.masterPort, link.logicalNodeAddress, link.logicalAddress)) {
                     const hbValue = (0, HB_1.dt2hbvalue)(u, link.hbValue, link.min, link.max);
@@ -574,7 +591,14 @@ class SmartApp extends webapp_1.WebApp {
                             }
                         }
                         catch (e) {
-                            (0, logger_1.err)("smartapp", "informLinks: failed to set HB value for accessory " + link.accName + " -> " + e.toString());
+                            if (e instanceof HB_1.HbAuthError) {
+                                (0, logger_1.err)("smartapp", "informLinks: Homebridge API token expired for accessory " + link.accName + " -> forcing re-login on next update");
+                                this.token = "";
+                                (0, config_1.setToken)("");
+                            }
+                            else {
+                                (0, logger_1.err)("smartapp", "informLinks: failed to set HB value for accessory " + link.accName + " -> " + e.toString());
+                            }
                         }
                     }
                 }