homebridge-winix-purifiers 2.2.4 → 2.2.6

package/dist/characteristic.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CharacteristicWrapper = exports.CharacteristicManager = void 0;
+const winix_api_1 = require("winix-api");
 const errors_1 = require("./errors");
 /**
  * Manager to provide a consistent way to get and set characteristics
@@ -62,7 +63,15 @@ class CharacteristicWrapper {
         }
         catch (e) {
             (0, errors_1.assertError)(e);
-            this.log.error('error calling Winix API:', e.message);
+            // Known transient upstream conditions (rate limit, 5xx, DNS, malformed body)
+            // still fail the HAP call so HomeKit knows the action didn't land, but log at
+            // warn without the implication of a plugin bug.
+            if (e instanceof winix_api_1.RateLimitError || e instanceof winix_api_1.UpstreamUnavailableError) {
+                this.log.warn(`Winix API transient: ${e.constructor.name}: ${e.message}`);
+            }
+            else {
+                this.log.error('error calling Winix API:', e.message);
+            }
             throw new this.platform.HapStatusError(-70402 /* HAPStatus.SERVICE_COMMUNICATION_FAILURE */);
         }
     }

package/dist/device.js

@@ -5,6 +5,9 @@ const winix_api_1 = require("winix-api");
 const MAX_BACKOFF_MS = 5 * 60 * 1000;
 const COMMAND_DELAY_MS = 1500;
 const UNREACHABLE_THRESHOLD = 3;
+// 90s clears WinixClient's internal 60s rate-limit cooldown plus a small buffer,
+// so the first poll after a rate-limited initialFetch actually has a chance to succeed.
+const FAILED_FETCH_RETRY_MS = 90 * 1000;
 class Device {
     constructor(deviceId, pollIntervalMs, log, client) {
         this.deviceId = deviceId;
@@ -41,8 +44,8 @@ class Device {
             this.log.debug('device:initialFetch()', JSON.stringify(this.state));
         }
         catch (e) {
-            if (e instanceof winix_api_1.RateLimitError) {
-                this.log.warn('device:initialFetch() rate limited, using defaults');
+            if (e instanceof winix_api_1.RateLimitError || e instanceof winix_api_1.UpstreamUnavailableError) {
+                this.log.warn(`device:initialFetch() ${e.constructor.name}, using defaults (will retry soon)`);
                 return;
             }
             this.log.warn('device:initialFetch() failed, using defaults:', e.message);
@@ -50,10 +53,14 @@ class Device {
     }
     startPolling(onUpdate) {
         this.onUpdate = onUpdate;
-        // Stagger the first poll with a random delay to avoid all devices
-        // hitting the API at the same time
-        const jitter = Math.floor(Math.random() * this.pollIntervalMs);
-        this.schedulePoll(jitter);
+        // If initialFetch failed (rate limited, upstream unavailable, etc.), the device
+        // is unreachable in HomeKit until the first successful poll. Skip the full-interval
+        // jitter and retry soon to close that window. Otherwise stagger the first poll
+        // with a random delay to avoid all devices hitting the API at the same time.
+        const delay = this.hasReceivedData
+            ? Math.floor(Math.random() * this.pollIntervalMs)
+            : Math.min(FAILED_FETCH_RETRY_MS, this.pollIntervalMs);
+        this.schedulePoll(delay);
     }
     resetPollTimer(delayMs = 3000) {
         this.schedulePoll(delayMs);
@@ -168,9 +175,18 @@ class Device {
                 this.schedulePoll(this.pollIntervalMs);
                 return;
             }
+            // Transient upstream conditions (Winix "no data", 5xx, DNS/connect failures,
+            // malformed bodies). Keep last-known state and don't count toward unreachable.
+            if (e instanceof winix_api_1.NoDataError || e instanceof winix_api_1.UpstreamUnavailableError) {
+                this.log.debug(`device:poll() ${e.constructor.name}, retaining last-known state`);
+                this.schedulePoll(this.pollIntervalMs);
+                return;
+            }
             this.consecutiveFailures++;
             const backoffMs = Math.min(this.pollIntervalMs * Math.pow(2, this.consecutiveFailures), MAX_BACKOFF_MS);
-            this.log.error(`device:poll() error: ${e.message} (retry in ${Math.round(backoffMs / 1000)}s)`);
+            const err = e;
+            this.log.error(`device:poll() error: ${err.constructor?.name ?? 'Error'}: ${err.message} ` +
+                `(retry in ${Math.round(backoffMs / 1000)}s)`);
             this.schedulePoll(backoffMs);
             return;
         }

package/dist/winix.js

@@ -10,6 +10,7 @@ const promises_1 = require("node:fs/promises");
 const node_path_1 = __importDefault(require("node:path"));
 const TOKEN_DIRECTORY_NAME = 'winix-purifiers';
 const TOKEN_FILE_NAME = 'token.json';
+const MIN_RELOGIN_INTERVAL_MS = 5 * 60 * 1000;
 class NotConfiguredError extends Error {
     constructor() {
         super('Account not configured');
@@ -25,6 +26,7 @@ exports.UnauthenticatedError = UnauthenticatedError;
 class WinixHandler {
     constructor(storagePath, encryptionKey) {
         this.encryptionKey = encryptionKey;
+        this.lastReloginAt = 0;
         this.refreshTokenPath = node_path_1.default.join(storagePath, TOKEN_DIRECTORY_NAME, TOKEN_FILE_NAME);
     }
     /**
@@ -110,10 +112,19 @@ class WinixHandler {
             devices = await this.winix.getDevices();
         }
         catch (e) {
-            if (!(e instanceof winix_api_1.RefreshTokenExpiredError)) {
+            if (e instanceof winix_api_1.RefreshTokenExpiredError) {
+                await this.login(this.auth.username, this.auth.password);
+                return await this.winix.getDevices();
+            }
+            if (!(e instanceof winix_api_1.MobileSessionInvalidError)) {
+                throw e;
+            }
+            // Mobile session invalidated (MULTI LOGIN / "user is not valid"). Re-login
+            // is throttled to prevent ping-pong with another active session.
+            if (Date.now() - this.lastReloginAt < MIN_RELOGIN_INTERVAL_MS) {
                 throw e;
             }
-            // if we get a refresh token expiry, we need to re-login and get devices again
+            this.lastReloginAt = Date.now();
             await this.login(this.auth.username, this.auth.password);
             return await this.winix.getDevices();
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Winix Air Purifiers",
   "name": "homebridge-winix-purifiers",
-  "version": "2.2.4",
+  "version": "2.2.6",
   "description": "Homebridge plugin for Winix air purifiers",
   "license": "Apache-2.0",
   "repository": {
@@ -46,6 +46,7 @@
     "test": "vitest run",
     "test:integration": "vitest run --config vitest.integration.config.ts tests/integration/integration.test.ts --reporter=verbose",
     "test:integration:rate-limit": "vitest run --config vitest.integration.config.ts tests/integration/integration-rate-limit.test.ts --reporter=verbose",
+    "test:integration:session-recovery": "node --env-file-if-exists=.env ./node_modules/vitest/vitest.mjs run --config vitest.integration.config.ts tests/integration/integration-session-recovery.test.ts --reporter=verbose",
     "test:watch": "vitest",
     "test:coverage": "vitest run --coverage",
     "validate": "yarn lint && yarn build && yarn test",
@@ -65,7 +66,7 @@
   ],
   "dependencies": {
     "@homebridge/plugin-ui-utils": "1.0.3",
-    "winix-api": "2.0.0"
+    "winix-api": "2.0.2"
   },
   "devDependencies": {
     "@types/node": "20.11.0",