@homebridge-plugins/homebridge-tuya 2.7.2-beta.0 → 2.7.2-beta.1

package/dist/accessory/WeatherStationAccessory.js

@@ -4,8 +4,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const BaseAccessory_1 = __importDefault(require("./BaseAccessory"));
+const CurrentRelativeHumidity_1 = require("./characteristic/CurrentRelativeHumidity");
+const CurrentTemperature_1 = require("./characteristic/CurrentTemperature");
+// Standard (indoor / main unit) DPs of the qxj instruction set.
+const SCHEMA_CODE = {
+    CURRENT_TEMP: ['temp_current', 'va_temperature'],
+    CURRENT_HUMIDITY: ['humidity_value', 'va_humidity'],
+};
 class TemperatureHumiditySensorAccessory extends BaseAccessory_1.default {
     configureServices() {
+        const tempSchema = this.getSchema(...SCHEMA_CODE.CURRENT_TEMP);
+        if (tempSchema) {
+            (0, CurrentTemperature_1.configureCurrentTemperature)(this, this.getMainService(this.Service.TemperatureSensor), tempSchema);
+        }
+        const humiditySchema = this.getSchema(...SCHEMA_CODE.CURRENT_HUMIDITY);
+        if (humiditySchema) {
+            (0, CurrentRelativeHumidity_1.configureCurrentRelativeHumidity)(this, this.getMainService(this.Service.HumiditySensor), humiditySchema);
+        }
         const { temperatureSchemas, humiditySchemas } = this.getDynamicSchemaCodes();
         temperatureSchemas.forEach((schema, index) => {
             const serviceName = `Temperature Sensor ${index + 1}`;
@@ -40,6 +55,11 @@ class TemperatureHumiditySensorAccessory extends BaseAccessory_1.default {
             });
         });
     }
+    // The service without subtype; getService(type) could return one of the per-channel services instead.
+    getMainService(type) {
+        return this.accessory.services.find(service => service.UUID === type.UUID && !service.subtype)
+            || this.accessory.addService(type);
+    }
     getDynamicSchemaCodes() {
         const temperatureSchemas = [];
         const humiditySchemas = [];

package/dist/accessory/WeatherStationAccessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"WeatherStationAccessory.js","sourceRoot":"","sources":["../../src/accessory/WeatherStationAccessory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WeatherStationAccessory.js","sourceRoot":"","sources":["../../src/accessory/WeatherStationAccessory.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.2-beta.0",
+  "version": "2.7.2-beta.1",
   "description": "Forked from 0x5e/homebridge-tuya-platform, with a focus on fixing bugs and adding new device support.",
   "license": "MIT",
   "repository": {

package/test/accessory/weatherStationAccessory.test.ts

@@ -0,0 +1,186 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { describe, expect, test, beforeEach, jest } from '@jest/globals';
+
+import WeatherStationAccessory from '../../src/accessory/WeatherStationAccessory';
+import TuyaDevice, { TuyaDeviceSchemaMode, TuyaDeviceSchemaType } from '../../src/device/TuyaDevice';
+import { initLogger } from '../../src/util/Logger';
+
+const integerSchema = (code: string, unit: string, min: number, max: number, scale: number) => ({
+  code,
+  mode: TuyaDeviceSchemaMode.READ_ONLY,
+  type: TuyaDeviceSchemaType.Integer,
+  property: { unit, min, max, scale, step: 1 },
+});
+
+// Schema of a Tuya "LED temperature and humidity alarm clock" (category `qxj`), standard DPs only.
+const CLOCK_SCHEMA = [
+  integerSchema('temp_current', '℃', -100, 600, 1),
+  integerSchema('humidity_value', '%', 0, 100, 0),
+  { code: 'volume', mode: TuyaDeviceSchemaMode.READ_WRITE, type: TuyaDeviceSchemaType.Enum, property: { range: ['mute', 'low'] } },
+];
+const CLOCK_STATUS = [
+  { code: 'temp_current', value: 304 },
+  { code: 'humidity_value', value: 64 },
+  { code: 'volume', value: 'low' },
+];
+
+// Multi-channel weather station: per-channel outdoor sensor DPs.
+const CHANNEL_SCHEMA = [
+  integerSchema('ch1_ToutCh', '℃', -400, 800, 1),
+  integerSchema('ch1_HoutCh', '%', 0, 100, 0),
+];
+const CHANNEL_STATUS = [
+  { code: 'ch1_ToutCh', value: 125 },
+  { code: 'ch1_HoutCh', value: 88 },
+];
+
+describe('WeatherStationAccessory', () => {
+
+  let services: any[];
+  let mockAccessory: any;
+  let mockPlatform: any;
+  let device: TuyaDevice;
+
+  const Service = {
+    TemperatureSensor: { UUID: 'TemperatureSensor' },
+    HumiditySensor: { UUID: 'HumiditySensor' },
+    AccessoryInformation: { UUID: 'AccessoryInformation' },
+    Battery: { UUID: 'Battery' },
+  };
+
+  const makeService = (type: any, subtype?: string) => {
+    const characteristics = new Map<any, any>();
+    return {
+      UUID: type.UUID,
+      displayName: `${type.UUID}`,
+      subtype,
+      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: 'qxj-device-id',
+    uuid: 'qxj-uuid',
+    name: 'Clock',
+    online: true,
+    owner_id: 'owner-1',
+    product_id: 'qxj-product',
+    product_name: 'LED temperature and humidity alarm clock',
+    category: 'qxj',
+    sub: false,
+    schema,
+    status,
+  } as any);
+
+  beforeEach(() => {
+    services = [];
+
+    const hap = {
+      Service,
+      Characteristic: {
+        CurrentTemperature: 'CurrentTemperature',
+        CurrentRelativeHumidity: 'CurrentRelativeHumidity',
+        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: 'qxj-uuid',
+      displayName: 'Clock',
+      context: { deviceID: 'qxj-device-id' },
+      services,
+      getService: jest.fn((type: any) => services.find(s => s.UUID === type.UUID)),
+      getServiceById: jest.fn((type: any, subtype: string) => services.find(s => s.UUID === type.UUID && s.subtype === subtype)),
+      addService: jest.fn((type: any, _name?: string, subtype?: string) => {
+        const service = makeService(type, subtype);
+        services.push(service);
+        return service;
+      }),
+      removeService: jest.fn(),
+    };
+  });
+
+  const setup = (schema: any[], status: any[]) => {
+    device = createDevice(schema, status);
+    const accessory = new WeatherStationAccessory(mockPlatform as any, mockAccessory as any);
+    accessory.configureServices();
+    return accessory;
+  };
+
+  const find = (type: string, subtype?: string) => services.filter(s => s.UUID === type && s.subtype === subtype);
+  const read = (type: string, subtype: string | undefined, characteristicType: string) =>
+    find(type, subtype)[0]?.getCharacteristic(characteristicType).getHandler();
+
+  test('standard temp_current / humidity_value are exposed (clock with no channel DPs)', () => {
+    setup(CLOCK_SCHEMA, CLOCK_STATUS.map(s => ({ ...s })));
+
+    expect(find('TemperatureSensor')).toHaveLength(1);
+    expect(find('HumiditySensor')).toHaveLength(1);
+    expect(read('TemperatureSensor', undefined, 'CurrentTemperature')).toBe(30.4);
+    expect(read('HumiditySensor', undefined, 'CurrentRelativeHumidity')).toBe(64);
+  });
+
+  test('multi-channel station without standard DPs is unchanged', () => {
+    setup(CHANNEL_SCHEMA, CHANNEL_STATUS.map(s => ({ ...s })));
+
+    expect(find('TemperatureSensor')).toHaveLength(0);
+    expect(find('HumiditySensor')).toHaveLength(0);
+    expect(read('TemperatureSensor', 'temperature_sensor_1', 'CurrentTemperature')).toBe(12.5);
+    expect(read('HumiditySensor', 'humidity_sensor_1', 'CurrentRelativeHumidity')).toBe(88);
+  });
+
+  test('main unit and channels get separate services, also with cached channel services', () => {
+    // Restored from cache: channel services already exist before the main-unit ones.
+    services.push(makeService(Service.TemperatureSensor, 'temperature_sensor_1'));
+    services.push(makeService(Service.HumiditySensor, 'humidity_sensor_1'));
+
+    setup([...CLOCK_SCHEMA, ...CHANNEL_SCHEMA], [...CLOCK_STATUS, ...CHANNEL_STATUS].map(s => ({ ...s })));
+
+    expect(services.filter(s => s.UUID === 'TemperatureSensor')).toHaveLength(2);
+    expect(services.filter(s => s.UUID === 'HumiditySensor')).toHaveLength(2);
+    expect(read('TemperatureSensor', undefined, 'CurrentTemperature')).toBe(30.4);
+    expect(read('HumiditySensor', undefined, 'CurrentRelativeHumidity')).toBe(64);
+    expect(read('TemperatureSensor', 'temperature_sensor_1', 'CurrentTemperature')).toBe(12.5);
+    expect(read('HumiditySensor', 'humidity_sensor_1', 'CurrentRelativeHumidity')).toBe(88);
+  });
+
+});