@homebridge-plugins/homebridge-tuya 2.7.1-beta.8 → 2.7.1-beta.9

package/dist/accessory/SmokeSensorAccessory.js

@@ -3,31 +3,111 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const util_1 = require("../util/util");
 const BaseAccessory_1 = __importDefault(require("./BaseAccessory"));
 const SCHEMA_CODE = {
-    SENSOR_STATUS: ['smoke_sensor_status', 'smoke_sensor_state'],
+    SMOKE_STATUS: ['smoke_sensor_status', 'smoke_sensor_state'],
+    CO_STATUS: ['co_status', 'co_state'],
+    CO_LEVEL: ['co_value'],
+    BATTERY_STATE: ['battery_state'],
+    BATTERY_PERCENT: ['battery_percentage', 'residual_electricity', 'wireless_electricity', 'va_battery', 'battery'],
+    FAULT: ['fault'],
 };
+/**
+ * Smoke detector (ywbj).
+ *
+ * Combo smoke + CO detectors are also categorized as `ywbj` and expose
+ * `co_state` / `co_status` alongside the smoke DP, so a CarbonMonoxideSensor
+ * service is added when one of those DPs is present.
+ */
 class SmokeSensor extends BaseAccessory_1.default {
     requiredSchema() {
-        return [SCHEMA_CODE.SENSOR_STATUS];
+        return [SCHEMA_CODE.SMOKE_STATUS];
     }
     configureServices() {
-        const schema = this.getSchema(...SCHEMA_CODE.SENSOR_STATUS);
+        const sensorServices = [];
+        const smokeService = this.configureSmokeDetected();
+        if (smokeService) {
+            sensorServices.push(smokeService);
+        }
+        const coService = this.configureCarbonMonoxideDetected();
+        if (coService) {
+            sensorServices.push(coService);
+            this.configureCarbonMonoxideLevel(coService);
+        }
+        for (const service of sensorServices) {
+            this.configureStatusLowBattery(service);
+            this.configureStatusFault(service);
+        }
+    }
+    isAlarm(code) {
+        const status = this.getStatus(code);
+        return status !== undefined && (status.value === 'alarm' || status.value === '1');
+    }
+    configureSmokeDetected() {
+        const schema = this.getSchema(...SCHEMA_CODE.SMOKE_STATUS);
         if (!schema) {
-            return;
+            return undefined;
         }
         const { SMOKE_NOT_DETECTED, SMOKE_DETECTED } = this.Characteristic.SmokeDetected;
         const service = this.accessory.getService(this.Service.SmokeSensor)
             || this.accessory.addService(this.Service.SmokeSensor);
         service.getCharacteristic(this.Characteristic.SmokeDetected)
+            .onGet(() => this.isAlarm(schema.code) ? SMOKE_DETECTED : SMOKE_NOT_DETECTED);
+        return service;
+    }
+    configureCarbonMonoxideDetected() {
+        const schema = this.getSchema(...SCHEMA_CODE.CO_STATUS);
+        if (!schema) {
+            return undefined;
+        }
+        const { CO_LEVELS_ABNORMAL, CO_LEVELS_NORMAL } = this.Characteristic.CarbonMonoxideDetected;
+        const service = this.accessory.getService(this.Service.CarbonMonoxideSensor)
+            || this.accessory.addService(this.Service.CarbonMonoxideSensor);
+        service.getCharacteristic(this.Characteristic.CarbonMonoxideDetected)
+            .onGet(() => this.isAlarm(schema.code) ? CO_LEVELS_ABNORMAL : CO_LEVELS_NORMAL);
+        return service;
+    }
+    configureCarbonMonoxideLevel(service) {
+        const schema = this.getSchema(...SCHEMA_CODE.CO_LEVEL);
+        if (!schema) {
+            return;
+        }
+        const property = schema.property;
+        const multiple = Math.pow(10, property ? property.scale : 0);
+        service.getCharacteristic(this.Characteristic.CarbonMonoxideLevel)
+            .onGet(() => {
+            const status = this.getStatus(schema.code);
+            return (0, util_1.limit)(status.value / multiple, 0, 100);
+        });
+    }
+    configureStatusLowBattery(service) {
+        // When a percentage DP exists, BaseAccessory already exposes a Battery service.
+        if (this.getSchema(...SCHEMA_CODE.BATTERY_PERCENT)) {
+            return;
+        }
+        const schema = this.getSchema(...SCHEMA_CODE.BATTERY_STATE);
+        if (!schema) {
+            return;
+        }
+        const { BATTERY_LEVEL_NORMAL, BATTERY_LEVEL_LOW } = this.Characteristic.StatusLowBattery;
+        service.getCharacteristic(this.Characteristic.StatusLowBattery)
+            .onGet(() => {
+            const status = this.getStatus(schema.code);
+            return (status?.value === 'low') ? BATTERY_LEVEL_LOW : BATTERY_LEVEL_NORMAL;
+        });
+    }
+    configureStatusFault(service) {
+        const schema = this.getSchema(...SCHEMA_CODE.FAULT);
+        if (!schema) {
+            return;
+        }
+        const { NO_FAULT, GENERAL_FAULT } = this.Characteristic.StatusFault;
+        service.getCharacteristic(this.Characteristic.StatusFault)
             .onGet(() => {
+            // `fault` is a bitmap: any bit set means a fault is reported.
             const status = this.getStatus(schema.code);
-            if ((status.value === 'alarm' || status.value === '1')) {
-                return SMOKE_DETECTED;
-            }
-            else {
-                return SMOKE_NOT_DETECTED;
-            }
+            return (Number(status?.value ?? 0) !== 0) ? GENERAL_FAULT : NO_FAULT;
         });
     }
 }

package/dist/accessory/SmokeSensorAccessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"SmokeSensorAccessory.js","sourceRoot":"","sources":["../../src/accessory/SmokeSensorAccessory.ts"],"names":[],"mappings":";;;;;AAAA,oEAA4C;AAE5C,MAAM,WAAW,GAAG;IAClB,aAAa,EAAE,CAAC,qBAAqB,EAAE,oBAAoB,CAAC;CAC7D,CAAC;AAEF,MAAqB,WAAY,SAAQ,uBAAa;IAEpD,cAAc;QACZ,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IACrC,CAAC;IAED,iBAAiB;QACf,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC;QAC5D,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO;QACT,CAAC;QAED,MAAM,EAAE,kBAAkB,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;QACjF,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;eAC9D,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAEzD,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;aACzD,KAAK,CAAC,GAAG,EAAE;YACV,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAE,CAAC;YAC5C,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,OAAO,IAAI,MAAM,CAAC,KAAK,KAAK,GAAG,CAAC,EAAE,CAAC;gBACvD,OAAO,cAAc,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACN,OAAO,kBAAkB,CAAC;YAC5B,CAAC;QACH,CAAC,CAAC,CAAC;IACP,CAAC;CAEF;AA3BD,8BA2BC"}
+{"version":3,"file":"SmokeSensorAccessory.js","sourceRoot":"","sources":["../../src/accessory/SmokeSensorAccessory.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@homebridge-plugins/homebridge-tuya",
   "displayName": "Homebridge Tuya",
-  "version": "2.7.1-beta.8",
+  "version": "2.7.1-beta.9",
   "description": "Forked from 0x5e/homebridge-tuya-platform, with a focus on fixing bugs and adding new device support.",
   "license": "MIT",
   "repository": {

package/test/accessory/smokeSensorAccessory.test.ts

@@ -0,0 +1,215 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { describe, expect, test, beforeEach, jest } from '@jest/globals';
+
+import SmokeSensorAccessory from '../../src/accessory/SmokeSensorAccessory';
+import TuyaDevice, { TuyaDeviceSchemaMode, TuyaDeviceSchemaType } from '../../src/device/TuyaDevice';
+import { initLogger } from '../../src/util/Logger';
+
+// HAP constants, mirroring the real values.
+const SmokeDetected = { SMOKE_NOT_DETECTED: 0, SMOKE_DETECTED: 1 };
+const CarbonMonoxideDetected = { CO_LEVELS_NORMAL: 0, CO_LEVELS_ABNORMAL: 1 };
+const StatusLowBattery = { BATTERY_LEVEL_NORMAL: 0, BATTERY_LEVEL_LOW: 1 };
+const StatusFault = { NO_FAULT: 0, GENERAL_FAULT: 1 };
+
+const enumSchema = (code: string, range: string[]) => ({
+  code,
+  mode: TuyaDeviceSchemaMode.READ_ONLY,
+  type: TuyaDeviceSchemaType.Enum,
+  property: { range },
+});
+
+// Schema of a combo smoke + CO detector reported as category `ywbj`.
+const COMBO_SCHEMA = [
+  enumSchema('smoke_sensor_state', ['alarm', 'normal']),
+  enumSchema('checking_result', ['checking', 'check_success', 'check_failure']),
+  { code: 'fault', mode: TuyaDeviceSchemaMode.READ_ONLY, type: 'Bitmap' as any, property: { label: ['fault'] } },
+  enumSchema('battery_state', ['low', 'middle', 'high']),
+  enumSchema('co_state', ['alarm', 'normal']),
+  { code: 'mute', mode: TuyaDeviceSchemaMode.READ_WRITE, type: TuyaDeviceSchemaType.Boolean, property: {} },
+];
+
+const NORMAL_STATUS = [
+  { code: 'smoke_sensor_state', value: 'normal' },
+  { code: 'checking_result', value: 'check_success' },
+  { code: 'fault', value: 0 },
+  { code: 'battery_state', value: 'high' },
+  { code: 'co_state', value: 'normal' },
+  { code: 'mute', value: false },
+];
+
+describe('SmokeSensorAccessory', () => {
+
+  let services: any[];
+  let mockAccessory: any;
+  let mockPlatform: any;
+  let device: TuyaDevice;
+
+  const makeService = (type: any) => {
+    const characteristics = new Map<any, any>();
+    return {
+      UUID: type,
+      displayName: `${type}`,
+      subtype: undefined,
+      characteristics: [] as any[],
+      getCharacteristic: jest.fn(function(this: any, characteristicType: any) {
+        let characteristic = characteristics.get(characteristicType);
+        if (!characteristic) {
+          characteristic = {
+            type: characteristicType,
+            value: null,
+            getHandler: undefined,
+            onGet: jest.fn((handler: any) => (characteristic.getHandler = handler, characteristic)),
+            onSet: jest.fn(() => characteristic),
+            setProps: jest.fn(() => characteristic),
+            updateValue: jest.fn((value: any) => (characteristic.value = value, characteristic)),
+          };
+          characteristics.set(characteristicType, characteristic);
+          this.characteristics.push(characteristic);
+        }
+        return characteristic;
+      }),
+      setCharacteristic: jest.fn(function(this: any) {
+        return this;
+      }),
+      addOptionalCharacteristic: jest.fn(),
+      testCharacteristic: jest.fn(() => true),
+    };
+  };
+
+  const createDevice = (schema: any[], status: any[]) => new TuyaDevice({
+    id: 'smoke-device-id',
+    uuid: 'smoke-uuid',
+    name: 'Smoke and CO alarm',
+    online: true,
+    owner_id: 'owner-1',
+    product_id: 'smoke-co-product',
+    product_name: 'Smoke and CO alarm',
+    category: 'ywbj',
+    sub: false,
+    schema,
+    status,
+  } as any);
+
+  beforeEach(() => {
+    services = [];
+
+    const hap = {
+      Service: {
+        SmokeSensor: 'SmokeSensor',
+        CarbonMonoxideSensor: 'CarbonMonoxideSensor',
+        AccessoryInformation: 'AccessoryInformation',
+        Battery: 'Battery',
+      },
+      Characteristic: {
+        SmokeDetected,
+        CarbonMonoxideDetected,
+        CarbonMonoxideLevel: 'CarbonMonoxideLevel',
+        StatusLowBattery,
+        StatusFault,
+        ChargingState: { NOT_CHARGING: 0, CHARGING: 1 },
+        BatteryLevel: 'BatteryLevel',
+        StatusActive: 'StatusActive',
+        Manufacturer: 'Manufacturer',
+        Model: 'Model',
+        Name: 'Name',
+        ConfiguredName: 'ConfiguredName',
+        SerialNumber: 'SerialNumber',
+        ProgrammableSwitchEvent: { UUID: 'ProgrammableSwitchEvent' },
+      },
+    };
+
+    const noop = () => undefined;
+    mockPlatform = {
+      api: { hap },
+      options: { debug: false },
+      deviceManager: { getDevice: jest.fn(() => device), sendCommands: jest.fn() },
+      getDeviceConfig: jest.fn(() => undefined),
+      getDeviceSchemaConfig: jest.fn(() => undefined),
+      log: { info: noop, warn: noop, error: noop, debug: noop },
+    };
+    initLogger(mockPlatform.log);
+
+    mockAccessory = {
+      UUID: 'smoke-uuid',
+      displayName: 'Smoke and CO alarm',
+      context: { deviceID: 'smoke-device-id' },
+      services,
+      getService: jest.fn((type: any) => services.find(s => s.UUID === type)),
+      addService: jest.fn((type: any) => {
+        const service = makeService(type);
+        services.push(service);
+        return service;
+      }),
+      removeService: jest.fn(),
+    };
+  });
+
+  const setup = (schema: any[], status: any[]) => {
+    device = createDevice(schema, status);
+    const accessory = new SmokeSensorAccessory(mockPlatform as any, mockAccessory as any);
+    accessory.configureServices();
+    return accessory;
+  };
+
+  const service = (type: string) => services.find(s => s.UUID === type);
+  const read = (serviceType: string, characteristicType: any) =>
+    service(serviceType)?.getCharacteristic(characteristicType).getHandler();
+  const setStatus = (code: string, value: any) => {
+    device.status.find(s => s.code === code)!.value = value;
+  };
+
+  test('smoke-only detector keeps a single SmokeSensor service', () => {
+    setup([enumSchema('smoke_sensor_state', ['alarm', 'normal'])], [{ code: 'smoke_sensor_state', value: 'normal' }]);
+
+    expect(service('SmokeSensor')).toBeDefined();
+    expect(service('CarbonMonoxideSensor')).toBeUndefined();
+    expect(read('SmokeSensor', SmokeDetected)).toBe(SmokeDetected.SMOKE_NOT_DETECTED);
+
+    setStatus('smoke_sensor_state', 'alarm');
+    expect(read('SmokeSensor', SmokeDetected)).toBe(SmokeDetected.SMOKE_DETECTED);
+  });
+
+  test('combo detector exposes both SmokeSensor and CarbonMonoxideSensor', () => {
+    setup(COMBO_SCHEMA, NORMAL_STATUS.map(s => ({ ...s })));
+
+    expect(service('SmokeSensor')).toBeDefined();
+    expect(service('CarbonMonoxideSensor')).toBeDefined();
+    expect(read('SmokeSensor', SmokeDetected)).toBe(SmokeDetected.SMOKE_NOT_DETECTED);
+    expect(read('CarbonMonoxideSensor', CarbonMonoxideDetected)).toBe(CarbonMonoxideDetected.CO_LEVELS_NORMAL);
+  });
+
+  test('smoke and CO alarms are reported independently', () => {
+    setup(COMBO_SCHEMA, NORMAL_STATUS.map(s => ({ ...s })));
+
+    setStatus('co_state', 'alarm');
+    expect(read('CarbonMonoxideSensor', CarbonMonoxideDetected)).toBe(CarbonMonoxideDetected.CO_LEVELS_ABNORMAL);
+    expect(read('SmokeSensor', SmokeDetected)).toBe(SmokeDetected.SMOKE_NOT_DETECTED);
+
+    setStatus('co_state', 'normal');
+    setStatus('smoke_sensor_state', 'alarm');
+    expect(read('CarbonMonoxideSensor', CarbonMonoxideDetected)).toBe(CarbonMonoxideDetected.CO_LEVELS_NORMAL);
+    expect(read('SmokeSensor', SmokeDetected)).toBe(SmokeDetected.SMOKE_DETECTED);
+  });
+
+  test('battery_state without a percentage DP maps to StatusLowBattery on the sensors', () => {
+    setup(COMBO_SCHEMA, NORMAL_STATUS.map(s => ({ ...s })));
+
+    expect(service('Battery')).toBeUndefined();
+    expect(read('SmokeSensor', StatusLowBattery)).toBe(StatusLowBattery.BATTERY_LEVEL_NORMAL);
+
+    setStatus('battery_state', 'low');
+    expect(read('SmokeSensor', StatusLowBattery)).toBe(StatusLowBattery.BATTERY_LEVEL_LOW);
+    expect(read('CarbonMonoxideSensor', StatusLowBattery)).toBe(StatusLowBattery.BATTERY_LEVEL_LOW);
+  });
+
+  test('a non-zero fault bitmap maps to StatusFault', () => {
+    setup(COMBO_SCHEMA, NORMAL_STATUS.map(s => ({ ...s })));
+
+    expect(read('SmokeSensor', StatusFault)).toBe(StatusFault.NO_FAULT);
+
+    setStatus('fault', 4);
+    expect(read('SmokeSensor', StatusFault)).toBe(StatusFault.GENERAL_FAULT);
+    expect(read('CarbonMonoxideSensor', StatusFault)).toBe(StatusFault.GENERAL_FAULT);
+  });
+
+});