homebridge-tuya-plus 3.14.0-dev.4 → 3.14.0-dev.40

package/lib/WledDimmerAccessory.js

@@ -1,4 +1,4 @@
-const BaseAccessory = require('./BaseAccessory');
+const SimpleDimmerAccessory = require('./SimpleDimmerAccessory');
 const http = require('http');
 const maxWledBrightness = 255;
 
@@ -6,30 +6,14 @@ const maxWledBrightness = 255;
 const wledDebounceMs = 50;
 const wledWarmupMs = 8000;
 
-class WledDimmerAccessory extends BaseAccessory {
-    static getCategory(Categories) {
-        return Categories.LIGHTBULB;
-    }
-
-    constructor(...props) {
-        super(...props);
-    }
-
-    _registerPlatformAccessory() {
-        const {Service} = this.hap;
-
-        this.accessory.addService(Service.Lightbulb, this.device.context.name);
-
-        super._registerPlatformAccessory();
-    }
-
+class WledDimmerAccessory extends SimpleDimmerAccessory {
     _registerCharacteristics(dps) {
-        const {Service, Characteristic} = this.hap;
-        const service = this.accessory.getService(Service.Lightbulb);
-        this._checkServiceName(service, this.device.context.name);
-
-        this.dpPower = this._getCustomDP(this.device.context.dpPower) || '1';
-        this.dpBrightness = this._getCustomDP(this.device.context.dpBrightness) || this._getCustomDP(this.device.context.dp) || '2';
+        // The Lightbulb service, On/Brightness characteristics, default DPs and
+        // the device 'change' listener are all set up by SimpleDimmerAccessory.
+        // WLED only layers optional brightness sync and preset-effect switches
+        // on top, so without syncBrightnessToWled configured this behaves
+        // exactly like a plain SimpleDimmer.
+        super._registerCharacteristics(dps);
 
         // State for debounced / delayed WLED updates
         this._wledPendingBri = null;
@@ -47,32 +31,20 @@ class WledDimmerAccessory extends BaseAccessory {
             null;
         this.syncBrightnessToWled = (syncCfg && ('' + syncCfg).trim()) || null;
 
-        this.log.info(
+        this.log.debug(
             '[WLED Sync] %s: syncBrightnessToWled=%s',
             this.device.context.name,
             this.syncBrightnessToWled || 'disabled'
         );
 
-        const characteristicOn = service.getCharacteristic(Characteristic.On)
-            .updateValue(dps[this.dpPower])
-            .onGet(() => this.getStateAsync(this.dpPower))
-            .onSet(value => this.setStateAsync(this.dpPower, value));
-
-        const characteristicBrightness = service.getCharacteristic(Characteristic.Brightness);
-        // Keep a reference so we can update brightness from background WLED calls
-        this._characteristicBrightness = characteristicBrightness;
-
         if (this.syncBrightnessToWled) {
             // Start with 100% locally while we fetch the actual WLED brightness
-            characteristicBrightness
-                .updateValue(100)
-                .onGet(() => this.getBrightness())
-                .onSet(value => this.setBrightness(value));
+            this._characteristicBrightness.updateValue(100);
 
             // Force Tuya dimmer brightness to 100% on startup
             const maxTuyaBrightness = this.convertBrightnessFromHomeKitToTuya(100);
             if (dps[this.dpBrightness] !== maxTuyaBrightness) {
-                this.log.info(
+                this.log.debug(
                     '[WLED Sync] %s: setting Tuya brightness DP%s to max (%s)',
                     this.device.context.name,
                     this.dpBrightness,
@@ -80,19 +52,6 @@ class WledDimmerAccessory extends BaseAccessory {
                 );
                 this.setState(this.dpBrightness, maxTuyaBrightness, () => {});
             }
-        } else {
-            const initial = this.convertBrightnessFromTuyaToHomeKit(dps[this.dpBrightness]);
-            this.log.debug(
-                '%s: initial Tuya brightness DP%s=%s -> HomeKit %s%%',
-                this.device.context.name,
-                this.dpBrightness,
-                dps[this.dpBrightness],
-                initial
-            );
-            characteristicBrightness
-                .updateValue(initial)
-                .onGet(() => this.getBrightness())
-                .onSet(value => this.setBrightness(value));
         }
 
         // Optional: create one HomeKit Switch per configured WLED preset effect.
@@ -148,7 +107,7 @@ class WledDimmerAccessory extends BaseAccessory {
                             return callback();
                         }
 
-                        this.log.info(
+                        this.log.debug(
                             '[WLED Sync] %s: setting preset effect "%s" (id=%s, index=%s)',
                             this.device.context.name,
                             effectName,
@@ -196,6 +155,7 @@ class WledDimmerAccessory extends BaseAccessory {
                         });
                     })
                     .on('get', cb => {
+                        if (!this.device.connected) return cb(this._commError());
                         cb(null, this.device.state[this.dpPower] && this._wledCurrentEffectIndex === (index + 1));
                     });
 
@@ -211,15 +171,17 @@ class WledDimmerAccessory extends BaseAccessory {
                 .filter(service => service.UUID === HapService.Switch.UUID && service.subtype && service.subtype.startsWith('wledEffect '))
                 .forEach(service => {
                     if (!validEffectServices.includes(service)) {
-                        this.log.info('Removing', service.displayName);
+                        this.log.debug('Removing', service.displayName);
                         this.accessory.removeService(service);
                     }
                 });
         }
+    }
 
+    _registerChangeListener() {
         this.device.on('change', changes => {
             // Log full DPS changes so we can see exactly what Tuya reported
-            this.log.info(
+            this.log.debug(
                 '%s DPS changes: %s %s was:',
                 this.device.context.name,
                 JSON.stringify(changes),
@@ -228,10 +190,10 @@ class WledDimmerAccessory extends BaseAccessory {
             );
 
             if (changes.hasOwnProperty(this.dpPower)) {
-                const oldPower = !!characteristicOn.value;
+                const oldPower = !!this._characteristicOn.value;
                 const newPower = !!changes[this.dpPower];
 
-                this.log.info(
+                this.log.debug(
                     '%s power change detected on DP%s: %s -> %s',
                     this.device.context.name,
                     this.dpPower,
@@ -240,13 +202,13 @@ class WledDimmerAccessory extends BaseAccessory {
                 );
 
                 if (oldPower !== newPower) {
-                    characteristicOn.updateValue(newPower);
+                    this._characteristicOn.updateValue(newPower);
                 }
 
                 // Track warmup window for WLED after power ON
                 if (this.syncBrightnessToWled && newPower) {
                     this._wledReadyAt = Date.now() + wledWarmupMs;
-                    this.log.info(
+                    this.log.debug(
                         '[WLED Sync] %s: power ON -> delaying WLED API calls for %sms',
                         this.device.context.name,
                         wledWarmupMs
@@ -270,7 +232,7 @@ class WledDimmerAccessory extends BaseAccessory {
 
                 // Ignore the "forced back to 100%" update to avoid feedback loops
                 if (tuyaValue === maxTuyaBrightness) {
-                    this.log.info(
+                    this.log.debug(
                         '[WLED Sync] %s: Tuya DP%s reported max brightness (%s), ignoring',
                         this.device.context.name,
                         this.dpBrightness,
@@ -282,7 +244,7 @@ class WledDimmerAccessory extends BaseAccessory {
                 const percent = this.convertBrightnessFromTuyaToHomeKit(tuyaValue);
                 const bri = Math.max(0, Math.min(maxWledBrightness, Math.round((percent / 100) * maxWledBrightness)));
 
-                this.log.info(
+                this.log.debug(
                     '[WLED Sync] %s: Tuya DP%s changed to %s -> %s%% -> WLED bri=%s (debounced)',
                     this.device.context.name,
                     this.dpBrightness,
@@ -303,14 +265,14 @@ class WledDimmerAccessory extends BaseAccessory {
                     }
 
                     // Reflect that brightness back into HomeKit
-                    characteristicBrightness.updateValue(percent);
+                    this._characteristicBrightness.updateValue(percent);
 
                     // After a short delay, force Tuya brightness back to 100% so it stops dimming the strip
                     if (this._wledForceMaxTimeout) {
                         clearTimeout(this._wledForceMaxTimeout);
                     }
                     this._wledForceMaxTimeout = setTimeout(() => {
-                        this.log.info(
+                        this.log.debug(
                             '[WLED Sync] %s: forcing Tuya DP%s back to max (%s) after Tuya app change',
                             this.device.context.name,
                             this.dpBrightness,
@@ -319,17 +281,18 @@ class WledDimmerAccessory extends BaseAccessory {
                         this.setState(this.dpBrightness, maxTuyaBrightness, () => {});
                     }, 5000);
                 });
-            } else if (!this.syncBrightnessToWled && changes.hasOwnProperty(this.dpBrightness) && this.convertBrightnessFromHomeKitToTuya(characteristicBrightness.value) !== changes[this.dpBrightness]) {
-                characteristicBrightness.updateValue(this.convertBrightnessFromTuyaToHomeKit(changes[this.dpBrightness]));
+            } else if (!this.syncBrightnessToWled && changes.hasOwnProperty(this.dpBrightness) && this.convertBrightnessFromHomeKitToTuya(this._characteristicBrightness.value) !== changes[this.dpBrightness]) {
+                this._characteristicBrightness.updateValue(this.convertBrightnessFromTuyaToHomeKit(changes[this.dpBrightness]));
             }
         });
     }
 
     getBrightness() {
+        if (!this.device.connected) throw this._commError();
         if (this.syncBrightnessToWled) {
             // If we already have a cached WLED brightness, return it immediately.
             if (this._lastWledPercent != null) {
-                this.log.info(
+                this.log.debug(
                     '[WLED Sync] %s: getBrightness() -> using cached %s%%',
                     this.device.context.name,
                     this._lastWledPercent
@@ -338,13 +301,14 @@ class WledDimmerAccessory extends BaseAccessory {
             }
             return 50;
         } else {
-            return this.convertBrightnessFromTuyaToHomeKit(this.device.state[this.dpBrightness]);
+            // No WLED sync: behave as a plain SimpleDimmer.
+            return super.getBrightness();
         }
     }
 
     setBrightness(value) {
         if (this.syncBrightnessToWled) {
-            this.log.info(
+            this.log.debug(
                 '[WLED Sync] %s: setBrightness(%s%%)',
                 this.device.context.name,
                 value
@@ -356,19 +320,19 @@ class WledDimmerAccessory extends BaseAccessory {
             // Ensure Tuya stays at 100% so it doesn't interfere with WLED.
             const maxTuyaBrightness = this.convertBrightnessFromHomeKitToTuya(100);
             if (this.device.state[this.dpBrightness] !== maxTuyaBrightness) {
-                this.log.info(
+                this.log.debug(
                     '[WLED Sync] %s: ensuring Tuya DP%s=%s (max)',
                     this.device.context.name,
                     this.dpBrightness,
                     maxTuyaBrightness
                 );
                 // Fire-and-forget; don't tie HomeKit callback to Tuya I/O.
-                this.setStateAsync(this.dpBrightness, maxTuyaBrightness);
+                this.setStateInBackground(this.dpBrightness, maxTuyaBrightness);
             }
 
             // Compute desired WLED brightness once.
             const bri = Math.max(0, Math.min(maxWledBrightness, Math.round((value / 100) * maxWledBrightness)));
-            this.log.info(
+            this.log.debug(
                 '[WLED Sync] %s: mapped HomeKit %s%% -> WLED bri=%s (debounced background)',
                 this.device.context.name,
                 value,
@@ -381,7 +345,8 @@ class WledDimmerAccessory extends BaseAccessory {
             // Return to HomeKit immediately; don't wait for network I/O.
             return null;
         } else {
-            return this.setStateAsync(this.dpBrightness, this.convertBrightnessFromHomeKitToTuya(value));
+            // No WLED sync: behave as a plain SimpleDimmer.
+            return super.setBrightness(value);
         }
     }
 
@@ -390,7 +355,7 @@ class WledDimmerAccessory extends BaseAccessory {
         const parts = String(this.syncBrightnessToWled).split(':');
         const host = parts[0];
         const port = parts[1] ? parseInt(parts[1], 10) || 80 : 80;
-        this.log.info(
+        this.log.debug(
             '[WLED Sync] %s: target host=%s port=%s',
             this.device.context.name,
             host,
@@ -424,7 +389,7 @@ class WledDimmerAccessory extends BaseAccessory {
             timeout: 1000
         };
 
-        this.log.info(
+        this.log.debug(
             '[WLED Sync] %s: GET http://%s:%s/json/state',
             this.device.context.name,
             target.host,
@@ -447,7 +412,7 @@ class WledDimmerAccessory extends BaseAccessory {
                         );
                         return done(true);
                     }
-                    this.log.info(
+                    this.log.debug(
                         '[WLED Sync] %s: /json/state -> bri=%s',
                         this.device.context.name,
                         bri
@@ -506,7 +471,7 @@ class WledDimmerAccessory extends BaseAccessory {
             timeout: 1000
         };
 
-        this.log.info(
+        this.log.debug(
             '[WLED Sync] %s: POST http://%s:%s/json/state body=%s',
             this.device.context.name,
             target.host,
@@ -518,7 +483,7 @@ class WledDimmerAccessory extends BaseAccessory {
             // Consume response and ignore body
             res.on('data', () => {});
             res.on('end', () => {
-                this.log.info(
+                this.log.debug(
                     '[WLED Sync] %s: WLED brightness set, HTTP %s',
                     this.device.context.name,
                     res.statusCode
@@ -581,7 +546,7 @@ class WledDimmerAccessory extends BaseAccessory {
             timeout: 1000
         };
 
-        this.log.info(
+        this.log.debug(
             '[WLED Sync] %s: POST http://%s:%s/json/state body=%s (preset effect)',
             this.device.context.name,
             target.host,
@@ -593,7 +558,7 @@ class WledDimmerAccessory extends BaseAccessory {
             // Consume response and ignore body
             res.on('data', () => {});
             res.on('end', () => {
-                this.log.info(
+                this.log.debug(
                     '[WLED Sync] %s: WLED effect set to %s, HTTP %s',
                     this.device.context.name,
                     effectId,
@@ -657,7 +622,7 @@ class WledDimmerAccessory extends BaseAccessory {
         const warmupDelay = this._wledReadyAt && now < this._wledReadyAt ? (this._wledReadyAt - now) : 0;
         const delay = warmupDelay + wledDebounceMs;
 
-        this.log.info(
+        this.log.debug(
             '[WLED Sync] %s: scheduling WLED bri=%s in %sms (%s)',
             this.device.context.name,
             brightness,
@@ -670,7 +635,7 @@ class WledDimmerAccessory extends BaseAccessory {
 
             // If the light is now off, skip the call.
             if (!this.device.state[this.dpPower]) {
-                this.log.info(
+                this.log.debug(
                     '[WLED Sync] %s: skipping scheduled WLED bri=%s because power is OFF',
                     this.device.context.name,
                     this._wledPendingBri

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "homebridge-tuya-plus",
-  "version": "3.14.0-dev.4",
-  "description": "A community-maintained Homebridge plugin for controlling Tuya devices locally over LAN. Includes new features, fixes, and updated device support.",
+  "version": "3.14.0-dev.40",
+  "description": "A community-maintained Homebridge plugin for controlling Tuya devices in HomeKit. LAN-first, with an optional Tuya Cloud fallback for any device the LAN can't reach.",
   "main": "index.js",
   "scripts": {
     "test": "jest",
-    "lint": "eslint index.js lib/**.js bin/**.js"
+    "lint": "eslint index.js lib/**.js bin/**.js",
+    "cleanup:pr-tags": "node scripts/cleanup-pr-tags.js"
   },
   "bin": {
     "tuya-lan": "./bin/cli.js",
@@ -28,12 +29,10 @@
     "fs-extra": "^8.1.0",
     "http-mitm-proxy": "^1.1.0",
     "json5": "^2.2.0",
+    "mqtt": "^5.15.1",
     "qrcode": "^1.4.1",
     "yaml": "^1.6.0"
   },
-  "optionalDependencies": {
-    "mqtt": "^5.15.1"
-  },
   "keywords": [
     "homebridge-plugin",
     "homebridge",

package/scripts/cleanup-pr-tags.js

@@ -0,0 +1,122 @@
+#!/usr/bin/env node
+'use strict';
+
+/**
+ * Prune stale `pr-<N>` npm dist-tags created by the `/publish` PR-test-build
+ * workflow (.github/workflows/publish-dev.yml).
+ *
+ * Token-free by design: it shells out to `npm dist-tag`, which uses your
+ * existing local npm login — the same one you use to publish releases. No CI
+ * secret is involved. (npm's OIDC trusted publishing only covers `npm publish`,
+ * not dist-tag management, which is why this is a local maintainer script
+ * rather than a CI job.)
+ *
+ * Default: removes the `pr-<N>` tag for every PR that is MERGED or CLOSED, and
+ * keeps tags for PRs that are still open. PR state is read from the public
+ * GitHub API (unauthenticated).
+ *
+ * Usage:
+ *   npm run cleanup:pr-tags                # remove tags for merged/closed PRs
+ *   npm run cleanup:pr-tags -- --dry-run   # preview only, change nothing
+ *   npm run cleanup:pr-tags -- --all       # remove ALL pr-* tags (incl. open)
+ *
+ * Note: this removes the dist-tag pointer only. The underlying prerelease
+ * versions stay published (npm disallows unpublishing after 72h), but they sort
+ * below `latest`/`dev` and are never installed by default.
+ */
+
+const { execFileSync } = require('child_process');
+const path = require('path');
+
+const pkgJson = require(path.join(__dirname, '..', 'package.json'));
+const PKG = pkgJson.name;
+const NPM = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+
+const args = process.argv.slice(2);
+const DRY_RUN = args.includes('--dry-run') || args.includes('-n');
+const ALL = args.includes('--all');
+
+// Derive "owner/repo" from package.json's repository URL.
+function repoSlug() {
+  const url = (pkgJson.repository && pkgJson.repository.url) || '';
+  const m = url.match(/github\.com[/:]([^/]+)\/(.+?)(?:\.git)?$/i);
+  if (!m) throw new Error(`Cannot parse a GitHub repo from repository.url: "${url}"`);
+  return `${m[1]}/${m[2]}`;
+}
+
+// Parse `npm dist-tag ls <pkg>` output ("pr-57: 3.14.0-pr.57.3") into pr-* tags.
+function listPrTags() {
+  let out;
+  try {
+    out = execFileSync(NPM, ['dist-tag', 'ls', PKG], { encoding: 'utf8' });
+  } catch (err) {
+    throw new Error(`Failed to list dist-tags for ${PKG}: ${err.message}`);
+  }
+  const tags = [];
+  for (const line of out.split('\n')) {
+    const m = line.match(/^(pr-(\d+)):\s*(.+)$/);
+    if (m) tags.push({ tag: m[1], pr: Number(m[2]), version: m[3].trim() });
+  }
+  return tags;
+}
+
+async function prState(slug, num) {
+  const res = await fetch(`https://api.github.com/repos/${slug}/pulls/${num}`, {
+    headers: { Accept: 'application/vnd.github+json', 'User-Agent': `${PKG}-cleanup` },
+  });
+  if (res.status === 404) return 'unknown';
+  if (!res.ok) throw new Error(`GitHub API responded ${res.status}`);
+  const data = await res.json();
+  return data.merged ? 'merged' : data.state; // 'merged' | 'open' | 'closed'
+}
+
+async function main() {
+  const slug = repoSlug();
+  const tags = listPrTags();
+  if (tags.length === 0) {
+    console.log(`No pr-* dist-tags on ${PKG}. Nothing to do.`);
+    return;
+  }
+  console.log(`Found ${tags.length} pr-* tag(s) on ${PKG}${DRY_RUN ? ' (dry run)' : ''}:`);
+
+  let removed = 0;
+  for (const { tag, pr, version } of tags) {
+    let remove = ALL;
+    let reason = 'forced by --all';
+    if (!ALL) {
+      let state;
+      try {
+        state = await prState(slug, pr);
+      } catch (err) {
+        console.log(`  • ${tag} -> ${version}: skip (could not check PR #${pr}: ${err.message})`);
+        continue;
+      }
+      remove = state === 'merged' || state === 'closed';
+      reason = `PR #${pr} is ${state}`;
+    }
+
+    if (!remove) {
+      console.log(`  • ${tag} -> ${version}: keep (${reason})`);
+      continue;
+    }
+    if (DRY_RUN) {
+      console.log(`  • ${tag} -> ${version}: would remove (${reason})`);
+      removed++;
+      continue;
+    }
+    try {
+      execFileSync(NPM, ['dist-tag', 'rm', PKG, tag], { encoding: 'utf8' });
+      console.log(`  • ${tag} -> ${version}: removed (${reason})`);
+      removed++;
+    } catch (err) {
+      console.log(`  • ${tag}: FAILED to remove (${err.message}). Are you \`npm login\`'d?`);
+    }
+  }
+
+  console.log(DRY_RUN ? `Would remove ${removed} tag(s).` : `Removed ${removed} tag(s).`);
+}
+
+main().catch((err) => {
+  console.error(err.message);
+  process.exit(1);
+});