homebridge-tuya-without-developer-account 1.0.11 → 1.0.13

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 1.0.13
+
+- Changed Smart Pet Feeder presentation to use a refined HomeKit `Valve` service as the main **Feed Now** control.
+- `Active` triggers the configured `manual_feed` amount when available, falling back to `quick_feed` when needed.
+- `InUse` reflects `feed_state` so HomeKit can show when the feeder is currently feeding.
+- Kept the dedicated Quick Feed switch, optional Slow Feed switch, Battery service, and Feeding occupancy/status sensor.
+- Removes the old cached Manual Feed switch from feeder accessories when reconfigured, since the Valve now handles manual feeding.
+
+## 1.0.12
+
+- Stopped exposing `switch_inching` as a HomeKit switch because it is an internal Tuya inching/timer configuration DP, not a user-facing relay.
+- Automatically removes cached `switch_inching` Switch/Outlet services from multi-gang switch accessories when the accessory is reconfigured.
+- Filters hidden/internal switch configuration DPs from switch auto-discovery so they cannot create invalid HomeKit names.
+- Prevents future HAP-NodeJS invalid-name warnings caused by the raw `switch_inching` service after the affected accessory cache is refreshed.
+
 ## 1.0.11
 
 - Fixed custom Homebridge UI initialization so the Adaptive Lighting checkbox stays checked after saving and reopening plugin settings.

package/README.md

@@ -351,6 +351,6 @@ Version **1.0.5** adds support for DP10-style Tuya dimmer plugs that expose `swi
 
 ## Version 1.0.7 device support
 
-This release adds native support for Tuya Smart Pet Feeders and Tuya alarm panels that expose `master_mode`. Pet feeders expose quick/manual feed controls, optional slow-feed control, feed-state sensor, and battery when available. Alarm panels are exposed as HomeKit Security System accessories, with optional extra switches controlled through `deviceOverrides[].alarm`.
+This release adds native support for Tuya Smart Pet Feeders and Tuya alarm panels that expose `master_mode`. Pet feeders expose a refined HomeKit Valve-style **Feed Now** control, Quick Feed switch, optional Slow Feed switch, feed-state sensor, and battery when available. Alarm panels are exposed as HomeKit Security System accessories, with optional extra switches controlled through `deviceOverrides[].alarm`.
 
 Aroma diffuser devices whose Tuya QR cloud schema is empty remain visible as unsupported direct devices, but any diffuser scenes returned by Tuya are still exposed separately.

package/SUPPORTED_DEVICES.md

@@ -222,6 +222,8 @@ They are exposed to HomeKit as a Lightbulb with On and Brightness. After upgradi
 
 Supported when Tuya exposes one or more of: `quick_feed`, `manual_feed`, `slow_feed`, `feed_state`, `battery_percentage`, `charge_state`.
 
+From v1.0.13 the feeder uses a refined HomeKit `Valve` service as the main **Feed Now** control. Activating it sends the configured `manual_feed` amount when available, or falls back to `quick_feed`. `InUse` reflects `feed_state`. The plugin also keeps the Quick Feed switch, optional Slow Feed switch, Feeding occupancy/status sensor, and Battery service.
+
 ### Alarm / Security System
 
 Supported when Tuya exposes `master_mode`. Alarm-triggered state is detected from `master_state=alarm`, `sos_state=true`, or `master_mode=sos` when available. Optional extra switches can be enabled through `deviceOverrides[].alarm`.

package/config.schema.json

@@ -135,12 +135,12 @@
                 "petFeeder": {
                   "type": "object",
                   "title": "Smart Pet Feeder Options",
-                  "description": "Optional settings for Tuya pet feeders. The plugin exposes quick/manual feed switches, feed-state sensor, and battery when supported.",
+                  "description": "Optional settings for Tuya pet feeders. The plugin exposes a refined HomeKit Valve-style Feed Now control, Quick Feed switch, optional Slow Feed switch, feeding-state sensor, and battery when supported.",
                   "properties": {
                     "manualFeedAmount": {
                       "type": "integer",
                       "title": "Manual feed amount",
-                      "description": "Portions sent when the Manual Feed switch is turned on.",
+                      "description": "Portions sent when the Valve-style Feed Now control is activated.",
                       "minimum": 1,
                       "maximum": 12,
                       "default": 1

package/dist/shared/accessories/PetFeederAccessory.js

@@ -27,10 +27,92 @@ class PetFeederAccessory extends BaseAccessory_1.default {
         };
     }
     configureServices() {
+        this.configureFeedNowValve();
         this.configureQuickFeed();
-        this.configureManualFeed();
         this.configureSlowFeed();
         this.configureFeedState();
+        this.removeLegacyManualFeedSwitch();
+    }
+    isFeeding() {
+        const schema = this.getSchema(...SCHEMA_CODE.FEED_STATE);
+        if (!schema) {
+            return false;
+        }
+        const status = this.getStatus(schema.code);
+        if (!status) {
+            return false;
+        }
+        const value = status.value;
+        if (typeof value === 'boolean') {
+            return value;
+        }
+        if (typeof value === 'number') {
+            return value > 0;
+        }
+        const text = String(value ?? '').trim().toLowerCase();
+        if (!text) {
+            return false;
+        }
+        return !['0', 'false', 'idle', 'standby', 'normal', 'done', 'finish', 'finished', 'complete', 'completed', 'none', 'ready'].includes(text);
+    }
+    getFeedNowCommand() {
+        const manualSchema = this.getSchema(...SCHEMA_CODE.MANUAL_FEED);
+        if (manualSchema) {
+            const { manualFeedAmount } = this.getPetFeederConfig();
+            return [{ code: manualSchema.code, value: manualFeedAmount }];
+        }
+        const quickSchema = this.getSchema(...SCHEMA_CODE.QUICK_FEED);
+        if (quickSchema) {
+            return [{ code: quickSchema.code, value: true }];
+        }
+        return undefined;
+    }
+    configureFeedNowValve() {
+        const commands = this.getFeedNowCommand();
+        if (!commands) {
+            return;
+        }
+        const name = `${this.device?.name || 'Pet Feeder'} Feed Now`;
+        const service = this.accessory.getServiceById(this.Service.Valve, 'feed_now')
+            || this.accessory.addService(this.Service.Valve, name, 'feed_now');
+        (0, Name_1.configureName)(this, service, name);
+        const valveType = this.Characteristic.ValveType.GENERIC_VALVE ?? this.Characteristic.ValveType.IRRIGATION;
+        service.setCharacteristic(this.Characteristic.ValveType, valveType);
+        const { ACTIVE, INACTIVE } = this.Characteristic.Active;
+        const { IN_USE, NOT_IN_USE } = this.Characteristic.InUse;
+        service.getCharacteristic(this.Characteristic.Active)
+            .onGet(() => {
+            this.checkOnlineStatus();
+            return this.isFeeding() ? ACTIVE : INACTIVE;
+        })
+            .onSet(async (value) => {
+            this.checkOnlineStatus();
+            if (value === ACTIVE) {
+                await this.sendCommands(commands, true);
+                service.getCharacteristic(this.Characteristic.Active).updateValue(ACTIVE);
+                service.getCharacteristic(this.Characteristic.InUse).updateValue(IN_USE);
+                setTimeout(() => {
+                    if (!this.isFeeding()) {
+                        service.getCharacteristic(this.Characteristic.Active).updateValue(INACTIVE);
+                        service.getCharacteristic(this.Characteristic.InUse).updateValue(NOT_IN_USE);
+                    }
+                }, 2500);
+            }
+            else {
+                // Tuya pet feeders usually expose manual_feed/quick_feed as momentary actions,
+                // not cancellable feed sessions.  Show HomeKit as inactive but do not send a
+                // fake cancel command that the device does not support.
+                service.getCharacteristic(this.Characteristic.Active).updateValue(INACTIVE);
+                if (!this.isFeeding()) {
+                    service.getCharacteristic(this.Characteristic.InUse).updateValue(NOT_IN_USE);
+                }
+            }
+        });
+        service.getCharacteristic(this.Characteristic.InUse)
+            .onGet(() => {
+            this.checkOnlineStatus();
+            return this.isFeeding() ? IN_USE : NOT_IN_USE;
+        });
     }
     configureActionSwitch(schema, name, subtype, onSet) {
         if (!schema) {
@@ -42,7 +124,7 @@ class PetFeederAccessory extends BaseAccessory_1.default {
         service.getCharacteristic(this.Characteristic.On)
             .onGet(() => {
             this.checkOnlineStatus();
-            // quick_feed/manual_feed are momentary actions.  Always display them as off.
+            // quick_feed is a momentary action. Always display it as off.
             return false;
         })
             .onSet(async (value) => {
@@ -74,13 +156,6 @@ class PetFeederAccessory extends BaseAccessory_1.default {
             await this.sendCommands([{ code: schema.code, value: true }], true);
         });
     }
-    configureManualFeed() {
-        const schema = this.getSchema(...SCHEMA_CODE.MANUAL_FEED);
-        const { manualFeedAmount } = this.getPetFeederConfig();
-        this.configureActionSwitch(schema, `${this.device?.name || 'Pet Feeder'} Manual Feed`, 'manual_feed', async () => {
-            await this.sendCommands([{ code: schema.code, value: manualFeedAmount }], true);
-        });
-    }
     configureSlowFeed() {
         const schema = this.getSchema(...SCHEMA_CODE.SLOW_FEED);
         const { exposeSlowFeed } = this.getPetFeederConfig();
@@ -101,10 +176,16 @@ class PetFeederAccessory extends BaseAccessory_1.default {
         service.getCharacteristic(this.Characteristic.OccupancyDetected)
             .onGet(() => {
             this.checkOnlineStatus();
-            const value = this.getStatus(schema.code)?.value;
-            return value === 'feeding' ? OCCUPANCY_DETECTED : OCCUPANCY_NOT_DETECTED;
+            return this.isFeeding() ? OCCUPANCY_DETECTED : OCCUPANCY_NOT_DETECTED;
         });
     }
+    removeLegacyManualFeedSwitch() {
+        const service = this.accessory.getServiceById(this.Service.Switch, 'manual_feed');
+        if (service) {
+            this.log.warn(`Removing old pet feeder Manual Feed switch from cache: ${service.displayName}`);
+            this.accessory.removeService(service);
+        }
+    }
 }
 exports.default = PetFeederAccessory;
 //# sourceMappingURL=PetFeederAccessory.js.map

package/dist/shared/accessories/SwitchAccessory.js

@@ -20,6 +20,9 @@ const SCHEMA_CODE = {
     CURRENT_HUMIDITY: ['va_humidity', 'humidity_value'],
     INCHING: ['switch_inching'],
 };
+const INTERNAL_SWITCH_SCHEMA_CODES = new Set([
+    'switch_inching',
+]);
 class SwitchAccessory extends BaseAccessory_1.default {
     requiredSchema() {
         return [SCHEMA_CODE.ON];
@@ -30,7 +33,9 @@ class SwitchAccessory extends BaseAccessory_1.default {
             this.platform.log.warn('Remove old service:', oldService.UUID);
             this.accessory.removeService(oldService);
         }
-        const schemata = this.device.schema.filter((schema) => schema.code.startsWith('switch') && schema.type === TuyaDevice_1.TuyaDeviceSchemaType.Boolean);
+        const schemata = this.device.schema.filter((schema) => schema.code.startsWith('switch')
+            && schema.type === TuyaDevice_1.TuyaDeviceSchemaType.Boolean
+            && !INTERNAL_SWITCH_SCHEMA_CODES.has(schema.code));
         this.log.info(`[SwitchAccessory] Found ${schemata.length} switch schemas: ${schemata.map(s => s.code).join(', ')}`);
         // Track which switch services should exist
         const validSubtypes = new Set(schemata.map(s => s.code));
@@ -38,20 +43,27 @@ class SwitchAccessory extends BaseAccessory_1.default {
         // Match both Switch and Outlet UUIDs since OutletAccessory uses Service.Outlet.
         const switchOrOutletUUIDs = new Set([this.Service.Switch.UUID, this.Service.Outlet.UUID]);
         const allSwitchServices = this.accessory.services.filter(s => switchOrOutletUUIDs.has(s.UUID) && s.subtype);
+        for (const oldService of [...allSwitchServices]) {
+            if (oldService.subtype && INTERNAL_SWITCH_SCHEMA_CODES.has(oldService.subtype)) {
+                this.log.warn(`Removing internal Tuya switch config service from cache: ${oldService.displayName} (subtype: ${oldService.subtype})`);
+                this.accessory.removeService(oldService);
+            }
+        }
+        const activeSwitchServices = this.accessory.services.filter(s => switchOrOutletUUIDs.has(s.UUID) && s.subtype);
         // Check early if we'll be keeping services due to auto-detect or config unchanged
         const configChanged = this.device?.configChanged ?? true;
         const isAutoDetecting = this.device?.isAutoDetecting ?? false;
         const shouldRemoveExtras = configChanged && !isAutoDetecting;
-        if (allSwitchServices.length > schemata.length) {
+        if (activeSwitchServices.length > schemata.length) {
             if (shouldRemoveExtras) {
-                this.log.warn(`[SwitchAccessory] Found ${allSwitchServices.length} cached switch services but only ${schemata.length} in schema. Removing extras...`);
+                this.log.warn(`[SwitchAccessory] Found ${activeSwitchServices.length} cached switch services but only ${schemata.length} in schema. Removing extras...`);
             }
             else {
-                this.log.info(`[SwitchAccessory] Found ${allSwitchServices.length} cached switch services but only ${schemata.length} in schema. ${isAutoDetecting ? 'Auto-detect in progress' : 'Config unchanged'} – keeping for now...`);
+                this.log.info(`[SwitchAccessory] Found ${activeSwitchServices.length} cached switch services but only ${schemata.length} in schema. ${isAutoDetecting ? 'Auto-detect in progress' : 'Config unchanged'} – keeping for now...`);
             }
         }
         const keptCachedServices = new Map();
-        for (const oldService of allSwitchServices) {
+        for (const oldService of activeSwitchServices) {
             if (!validSubtypes.has(oldService.subtype)) {
                 if (shouldRemoveExtras) {
                     // Config changed and not in auto-detect, so enforce the new schema
@@ -95,7 +107,7 @@ class SwitchAccessory extends BaseAccessory_1.default {
         // Other
         (0, CurrentTemperature_1.configureCurrentTemperature)(this, undefined, this.getSchema(...SCHEMA_CODE.CURRENT_TEMP));
         (0, CurrentRelativeHumidity_1.configureCurrentRelativeHumidity)(this, undefined, this.getSchema(...SCHEMA_CODE.CURRENT_HUMIDITY));
-        this.configureInching();
+        this.removeInternalSwitchServices();
     }
     async onDeviceInfoUpdate(info) {
         // Re-run service configuration so newly auto-detected switches get their handlers registered.
@@ -115,33 +127,16 @@ class SwitchAccessory extends BaseAccessory_1.default {
             (0, EnergyUsage_1.configureEnergyUsage)(this.platform.api, this, service, this.getSchema(...SCHEMA_CODE.CURRENT), this.getSchema(...SCHEMA_CODE.POWER), this.getSchema(...SCHEMA_CODE.VOLTAGE), this.getSchema(...SCHEMA_CODE.TOTAL_POWER));
         }
     }
-    configureInching() {
-        const schema = this.getSchema(...SCHEMA_CODE.INCHING);
-        if (!schema || schema.type !== TuyaDevice_1.TuyaDeviceSchemaType.String) {
-            return;
-        }
-        const service = this.accessory.getService(schema.code)
-            || this.accessory.addService(this.Service.Switch, schema.code, schema.code);
-        (0, Name_1.configureName)(this, service, schema.code);
-        service.getCharacteristic(this.Characteristic.On)
-            .onGet(() => {
-            this.checkOnlineStatus();
-            const status = this.getStatus(schema.code);
-            const buffer = Buffer.from(status.value, 'base64');
-            return (buffer.length === 3) && (buffer[0] === 1);
-        })
-            .onSet(async (value) => {
-            const status = this.getStatus(schema.code);
-            let buffer = Buffer.from(status.value, 'base64');
-            if (buffer.length !== 3) {
-                buffer = Buffer.alloc(3);
+    removeInternalSwitchServices() {
+        const switchOrOutletUUIDs = new Set([this.Service.Switch.UUID, this.Service.Outlet.UUID]);
+        for (const service of [...this.accessory.services]) {
+            if (switchOrOutletUUIDs.has(service.UUID)
+                && service.subtype
+                && INTERNAL_SWITCH_SCHEMA_CODES.has(service.subtype)) {
+                this.log.warn(`Removing internal Tuya switch config service from cache: ${service.displayName} (subtype: ${service.subtype})`);
+                this.accessory.removeService(service);
             }
-            buffer[0] = value ? 1 : 0;
-            await this.sendCommands([{
-                    code: schema.code,
-                    value: buffer.toString('base64'),
-                }], true);
-        });
+        }
     }
 }
 exports.default = SwitchAccessory;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-tuya-without-developer-account",
   "displayName": "Tuya without developer account for Homebridge",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "Homebridge plugin for Tuya and Smart Life devices using QR cloud authentication without a Tuya IoT developer account.",
   "license": "MIT",
   "author": "Kosztyk",