@homebridge-plugins/homebridge-tuya 2.6.0 → 2.7.0

package/dist/util/util.js

@@ -7,6 +7,8 @@ exports.sanitizeName = sanitizeName;
 exports.uuidFromSeed = uuidFromSeed;
 exports.updateBase64 = updateBase64;
 exports.updateHex = updateHex;
+exports.maskSecret = maskSecret;
+exports.redactSensitive = redactSensitive;
 const crypto_1 = require("crypto");
 function remap(value, srcStart, srcEnd, dstStart, dstEnd) {
     const percent = (value - srcStart) / (srcEnd - srcStart);
@@ -101,4 +103,50 @@ function updateBuffer(buf, byteIndex, value) {
     valueBuf.copy(buf, byteIndex);
     return buf;
 }
+/**
+ * Keys whose values must never reach the log, no matter which log level is
+ * active. Note that `PrefixLogger` disables its own masking in debug mode
+ * (`mask = !debugMode`), so redaction has to happen at the call site.
+ */
+const SENSITIVE_KEY_PATTERN = /(password|secret|access_?key|access_?token|refresh_?token|ticket_key|api_?key|tuya_?key)/i;
+/**
+ * Mask an identifier that is not secret enough to print, but useful enough to
+ * correlate log lines (e.g. a smart lock `ticket_id`).
+ */
+function maskSecret(value, visible = 4) {
+    if (value === undefined || value === null) {
+        return '<none>';
+    }
+    const str = `${value}`;
+    if (str.length === 0) {
+        return '<empty>';
+    }
+    if (str.length <= visible) {
+        return '***';
+    }
+    return `***${str.slice(-visible)}`;
+}
+/**
+ * Deep-copy a JSON-ish value, replacing the values of sensitive keys with
+ * `***`. Used before dumping API payloads to the log.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function redactSensitive(value, depth = 0) {
+    if (depth > 10 || value === null || typeof value !== 'object') {
+        return value;
+    }
+    if (Array.isArray(value)) {
+        return value.map(item => redactSensitive(item, depth + 1));
+    }
+    const result = {};
+    for (const [key, item] of Object.entries(value)) {
+        if (SENSITIVE_KEY_PATTERN.test(key)) {
+            result[key] = '***';
+        }
+        else {
+            result[key] = redactSensitive(item, depth + 1);
+        }
+    }
+    return result;
+}
 //# sourceMappingURL=util.js.map

package/dist/util/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util/util.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/test/FanAccessory.test.ts

@@ -0,0 +1,457 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { describe, expect, test, jest, beforeEach } from '@jest/globals';
+import { API, PlatformAccessory } from 'homebridge';
+import FanAccessory from '../src/accessory/FanAccessory';
+import TuyaDevice, { TuyaDeviceSchemaMode, TuyaDeviceSchemaType } from '../src/device/TuyaDevice';
+import { TuyaPlatform } from '../src/platform';
+
+const mockConfigureLight = jest.fn();
+const mockConfigureOn = jest.fn();
+jest.mock('../src/accessory/characteristic/Light', () => ({
+  configureLight: (...args: any[]) => mockConfigureLight(...args),
+}));
+jest.mock('../src/accessory/characteristic/On', () => ({
+  configureOn: (...args: any[]) => mockConfigureOn(...args),
+}));
+jest.mock('../src/accessory/characteristic/Active');
+jest.mock('../src/accessory/characteristic/RotationSpeed');
+jest.mock('../src/accessory/characteristic/SwingMode');
+jest.mock('../src/accessory/characteristic/LockPhysicalControls');
+
+describe('FanAccessory', () => {
+  let mockPlatform: any;
+  let mockAccessory: any;
+  let mockAPI: any;
+  let mockDeviceManager: any;
+
+  beforeEach(() => {
+    mockConfigureLight.mockClear();
+    mockConfigureOn.mockClear();
+
+    mockAPI = {
+      hap: {
+        Service: {
+          Fan: jest.fn(),
+          Fanv2: jest.fn(),
+          Lightbulb: jest.fn(),
+          Switch: jest.fn(),
+          AccessoryInformation: jest.fn(),
+        },
+        Characteristic: {
+          On: jest.fn(),
+          Active: jest.fn(),
+          RotationSpeed: jest.fn(),
+          RotationDirection: jest.fn(),
+          Brightness: jest.fn(),
+        },
+        uuid: {
+          generate: jest.fn(() => 'mock-uuid'),
+        },
+      },
+      user: {
+        persistPath: jest.fn(() => '/mock/path'),
+      },
+    } as unknown as API;
+
+    mockDeviceManager = {
+      getDevice: jest.fn(),
+      sendCommands: jest.fn(),
+    };
+
+    mockPlatform = {
+      api: mockAPI,
+      Service: mockAPI.hap.Service,
+      Characteristic: mockAPI.hap.Characteristic,
+      log: {
+        info: jest.fn(),
+        warn: jest.fn(),
+        error: jest.fn(),
+        debug: jest.fn(),
+      },
+      options: {
+        debug: false,
+        debugLevel: '',
+      },
+      deviceManager: mockDeviceManager,
+      getDeviceConfig: jest.fn(() => undefined),
+      getDeviceSchemaConfig: jest.fn(() => undefined),
+    } as unknown as TuyaPlatform;
+
+    mockAccessory = {
+      UUID: 'mock-uuid',
+      displayName: 'Test Fan',
+      context: {
+        deviceID: 'test-device-id',
+      },
+      services: [],
+      getService: jest.fn((name: string) => {
+        return mockAccessory.services.find((s: any) => s.displayName === name || s.UUID === name);
+      }),
+      addService: jest.fn((serviceType: any, name?: string, subtype?: string) => {
+        const service = {
+          UUID: subtype || name || 'mock-service',
+          displayName: name || 'Mock Service',
+          subtype: subtype,
+          getCharacteristic: jest.fn(() => ({
+            onGet: jest.fn().mockReturnThis(),
+            onSet: jest.fn().mockReturnThis(),
+            setProps: jest.fn().mockReturnThis(),
+            updateValue: jest.fn().mockReturnThis(),
+          })),
+          setCharacteristic: jest.fn().mockReturnThis(),
+        };
+        mockAccessory.services.push(service);
+        return service;
+      }),
+      removeService: jest.fn(),
+    } as unknown as PlatformAccessory;
+  });
+
+  function createMockDevice(codes: string[]): TuyaDevice {
+    const schema = codes.map(code => ({
+      code,
+      mode: TuyaDeviceSchemaMode.READ_WRITE,
+      type: code.includes('bright') ? TuyaDeviceSchemaType.Integer : TuyaDeviceSchemaType.Boolean,
+      property: code.includes('bright')
+        ? { min: 10, max: 1000, scale: 0, step: 1 }
+        : {},
+    }));
+
+    const status = codes.map(code => ({
+      code,
+      value: code.includes('bright') ? 500 : true,
+    }));
+
+    return new TuyaDevice({
+      id: 'test-device-id',
+      uuid: 'test-uuid',
+      name: 'Test Fan',
+      online: true,
+      owner_id: 'owner-1',
+      product_id: 'fs',
+      product_name: 'Smart Fan',
+      category: 'fs',
+      schema,
+      status,
+    });
+  }
+
+  function setupAndConfigure(codes: string[]) {
+    const device = createMockDevice(codes);
+    mockDeviceManager.getDevice.mockReturnValue(device);
+    const fanAccessory = new FanAccessory(mockPlatform, mockAccessory);
+    fanAccessory.configureServices();
+    return fanAccessory;
+  }
+
+  function getDualLightServices() {
+    return mockAccessory.addService.mock.calls.filter((call: any[]) =>
+      call[1] === 'Warm Light' || call[1] === 'White Light',
+    );
+  }
+
+  function expectNoDualLight() {
+    expect(getDualLightServices().length).toBe(0);
+  }
+
+  function expectLightCall(index: number, onCode: string, brightCode?: string) {
+    const args = mockConfigureLight.mock.calls[index];
+    expect(args[2]).toEqual(expect.objectContaining({ code: onCode }));
+    if (brightCode) {
+      expect(args[3]).toEqual(expect.objectContaining({ code: brightCode }));
+    } else {
+      expect(args[3]).toBeUndefined();
+    }
+  }
+
+  // ─── Fan service type ─────────────────────────────────────────────
+
+  describe('fan service type', () => {
+    test('should use Fanv2 when child_lock present', () => {
+      const fanAccessory = setupAndConfigure(['switch', 'fan_speed', 'child_lock']);
+      expect(fanAccessory.fanServiceType()).toBe(mockAPI.hap.Service.Fanv2);
+    });
+
+    test('should use Fanv2 when swing present', () => {
+      const fanAccessory = setupAndConfigure(['switch', 'fan_speed', 'switch_horizontal']);
+      expect(fanAccessory.fanServiceType()).toBe(mockAPI.hap.Service.Fanv2);
+    });
+
+    test('should use Fan when no lock or swing present', () => {
+      const fanAccessory = setupAndConfigure(['switch', 'fan_speed']);
+      expect(fanAccessory.fanServiceType()).toBe(mockAPI.hap.Service.Fan);
+    });
+  });
+
+  // ─── A. Dual-light path ───────────────────────────────────────────
+  // Requires ALL 4: light + bright_value + switch_led + bright_value_1
+
+  describe('dual-light (all 4 DPs present)', () => {
+    test('light + bright_value + switch_led + bright_value_1', () => {
+      setupAndConfigure([
+        'switch', 'fan_speed',
+        'light', 'bright_value', 'switch_led', 'bright_value_1',
+      ]);
+
+      const lightServices = getDualLightServices();
+      expect(lightServices.length).toBe(2);
+      expect(lightServices[0][1]).toBe('Warm Light');
+      expect(lightServices[0][2]).toBe('warm_light');
+      expect(lightServices[1][1]).toBe('White Light');
+      expect(lightServices[1][2]).toBe('white_light');
+
+      expect(mockConfigureLight).toHaveBeenCalledTimes(2);
+      expectLightCall(0, 'light', 'bright_value');
+      expectLightCall(1, 'switch_led', 'bright_value_1');
+    });
+
+    test('dual-light with extra bright_value_v2 (ignored)', () => {
+      setupAndConfigure([
+        'switch', 'fan_speed',
+        'light', 'bright_value', 'bright_value_v2', 'switch_led', 'bright_value_1',
+      ]);
+
+      expect(getDualLightServices().length).toBe(2);
+      expect(mockConfigureLight).toHaveBeenCalledTimes(2);
+      expectLightCall(0, 'light', 'bright_value');
+      expectLightCall(1, 'switch_led', 'bright_value_1');
+    });
+
+    test('dual-light with extra temp_value (not passed to dual-light configureLight)', () => {
+      setupAndConfigure([
+        'switch', 'fan_speed',
+        'light', 'bright_value', 'switch_led', 'bright_value_1', 'temp_value',
+      ]);
+
+      expect(getDualLightServices().length).toBe(2);
+      expect(mockConfigureLight).toHaveBeenCalledTimes(2);
+      // Dual-light calls only pass on+bright, not temp/color/mode
+      expect(mockConfigureLight.mock.calls[0].length).toBe(4);
+      expect(mockConfigureLight.mock.calls[1].length).toBe(4);
+    });
+  });
+
+  // ─── B. Single-light Lightbulb path ───────────────────────────────
+  // Has LIGHT_ON match + at least one of: bright_value/v2, temp_value/v2, colour_data, work_mode
+
+  describe('single-light as Lightbulb', () => {
+    test('light + bright_value', () => {
+      setupAndConfigure(['switch', 'fan_speed', 'light', 'bright_value']);
+
+      expectNoDualLight();
+      expect(mockConfigureLight).toHaveBeenCalledTimes(1);
+      expectLightCall(0, 'light', 'bright_value');
+    });
+
+    test('light + bright_value_v2', () => {
+      setupAndConfigure(['switch', 'fan_speed', 'light', 'bright_value_v2']);
+
+      expectNoDualLight();
+      expect(mockConfigureLight).toHaveBeenCalledTimes(1);
+      expectLightCall(0, 'light', 'bright_value_v2');
+    });
+
+    test('switch_led + bright_value', () => {
+      setupAndConfigure(['switch', 'fan_speed', 'switch_led', 'bright_value']);
+
+      expectNoDualLight();
+      expect(mockConfigureLight).toHaveBeenCalledTimes(1);
+      expectLightCall(0, 'switch_led', 'bright_value');
+    });
+
+    test('switch_led + bright_value_v2', () => {
+      setupAndConfigure(['switch', 'fan_speed', 'switch_led', 'bright_value_v2']);
+
+      expectNoDualLight();
+      expect(mockConfigureLight).toHaveBeenCalledTimes(1);
+      expectLightCall(0, 'switch_led', 'bright_value_v2');
+    });
+
+    test('light + bright_value + both bright versions (prefers bright_value)', () => {
+      setupAndConfigure(['switch', 'fan_speed', 'light', 'bright_value', 'bright_value_v2']);
+
+      expectNoDualLight();
+      expect(mockConfigureLight).toHaveBeenCalledTimes(1);
+      expectLightCall(0, 'light', 'bright_value');
+    });
+
+    test('light + temp_value only (no brightness)', () => {
+      setupAndConfigure(['switch', 'fan_speed', 'light', 'temp_value']);
+
+      expectNoDualLight();
+      expect(mockConfigureLight).toHaveBeenCalledTimes(1);
+      const args = mockConfigureLight.mock.calls[0];
+      expect(args[2]).toEqual(expect.objectContaining({ code: 'light' }));
+      expect(args[3]).toBeUndefined(); // no brightness DP
+      expect(args[4]).toEqual(expect.objectContaining({ code: 'temp_value' }));
+    });
+
+    test('switch_led + temp_value_v2 only', () => {
+      setupAndConfigure(['switch', 'fan_speed', 'switch_led', 'temp_value_v2']);
+
+      expectNoDualLight();
+      expect(mockConfigureLight).toHaveBeenCalledTimes(1);
+      const args = mockConfigureLight.mock.calls[0];
+      expect(args[2]).toEqual(expect.objectContaining({ code: 'switch_led' }));
+      expect(args[4]).toEqual(expect.objectContaining({ code: 'temp_value_v2' }));
+    });
+
+    test('light + bright_value + temp_value + colour_data + work_mode (full feature set)', () => {
+      setupAndConfigure([
+        'switch', 'fan_speed',
+        'light', 'bright_value', 'temp_value', 'colour_data', 'work_mode',
+      ]);
+
+      expectNoDualLight();
+      expect(mockConfigureLight).toHaveBeenCalledTimes(1);
+      const args = mockConfigureLight.mock.calls[0];
+      expect(args[2]).toEqual(expect.objectContaining({ code: 'light' }));
+      expect(args[3]).toEqual(expect.objectContaining({ code: 'bright_value' }));
+      expect(args[4]).toEqual(expect.objectContaining({ code: 'temp_value' }));
+      expect(args[5]).toEqual(expect.objectContaining({ code: 'colour_data' }));
+      expect(args[6]).toEqual(expect.objectContaining({ code: 'work_mode' }));
+    });
+
+    test('both on/off DPs + switch_led fallback: prefers light (LIGHT_ON order)', () => {
+      setupAndConfigure(['switch', 'fan_speed', 'light', 'switch_led', 'bright_value']);
+
+      expectNoDualLight();
+      expect(mockConfigureLight).toHaveBeenCalledTimes(1);
+      expectLightCall(0, 'light', 'bright_value');
+    });
+  });
+
+  // ─── C. Single-light Switch path ──────────────────────────────────
+  // Has LIGHT_ON match but NO brightness/temp/color/mode DPs
+
+  describe('single-light as Switch (on/off only)', () => {
+    test('light only', () => {
+      setupAndConfigure(['switch', 'fan_speed', 'light']);
+
+      expectNoDualLight();
+      expect(mockConfigureLight).not.toHaveBeenCalled();
+      expect(mockConfigureOn).toHaveBeenCalledWith(
+        expect.anything(),
+        undefined,
+        expect.objectContaining({ code: 'light' }),
+      );
+    });
+
+    test('switch_led only', () => {
+      setupAndConfigure(['switch', 'fan_speed', 'switch_led']);
+
+      expectNoDualLight();
+      expect(mockConfigureLight).not.toHaveBeenCalled();
+      expect(mockConfigureOn).toHaveBeenCalledWith(
+        expect.anything(),
+        undefined,
+        expect.objectContaining({ code: 'switch_led' }),
+      );
+    });
+
+    test('light + switch_led, no brightness (prefers light)', () => {
+      setupAndConfigure(['switch', 'fan_speed', 'light', 'switch_led']);
+
+      expectNoDualLight();
+      expect(mockConfigureLight).not.toHaveBeenCalled();
+      expect(mockConfigureOn).toHaveBeenCalledWith(
+        expect.anything(),
+        undefined,
+        expect.objectContaining({ code: 'light' }),
+      );
+    });
+  });
+
+  // ─── D. No light ──────────────────────────────────────────────────
+
+  describe('no light at all', () => {
+    test('fan-only device', () => {
+      setupAndConfigure(['switch', 'fan_speed']);
+
+      expectNoDualLight();
+      expect(mockConfigureLight).not.toHaveBeenCalled();
+    });
+
+    test('brightness DPs without any on/off DP are ignored', () => {
+      setupAndConfigure(['switch', 'fan_speed', 'bright_value']);
+
+      expectNoDualLight();
+      expect(mockConfigureLight).not.toHaveBeenCalled();
+    });
+
+    test('bright_value_1 alone is ignored', () => {
+      setupAndConfigure(['switch', 'fan_speed', 'bright_value_1']);
+
+      expectNoDualLight();
+      expect(mockConfigureLight).not.toHaveBeenCalled();
+    });
+  });
+
+  // ─── E. Edge cases: dual-light guard must NOT match ────────────────
+  // These are the critical backward-compatibility scenarios.
+  // Each has 3 of the 4 required DPs but not the 4th,
+  // so must fall through to the single-light path.
+
+  describe('partial dual-light DPs (must NOT trigger dual-light)', () => {
+    test('missing bright_value_1: light + bright_value + switch_led', () => {
+      setupAndConfigure([
+        'switch', 'fan_speed',
+        'light', 'bright_value', 'switch_led',
+      ]);
+
+      expectNoDualLight();
+      expect(mockConfigureLight).toHaveBeenCalledTimes(1);
+      expectLightCall(0, 'light', 'bright_value');
+    });
+
+    test('missing switch_led: light + bright_value + bright_value_1', () => {
+      setupAndConfigure([
+        'switch', 'fan_speed',
+        'light', 'bright_value', 'bright_value_1',
+      ]);
+
+      expectNoDualLight();
+      expect(mockConfigureLight).toHaveBeenCalledTimes(1);
+      expectLightCall(0, 'light', 'bright_value');
+    });
+
+    test('missing bright_value: light + switch_led + bright_value_1', () => {
+      setupAndConfigure([
+        'switch', 'fan_speed',
+        'light', 'switch_led', 'bright_value_1',
+      ]);
+
+      expectNoDualLight();
+      // lightServiceType: no bright_value/v2, no temp, no color, no mode → Switch
+      expect(mockConfigureLight).not.toHaveBeenCalled();
+      expect(mockConfigureOn).toHaveBeenCalledWith(
+        expect.anything(),
+        undefined,
+        expect.objectContaining({ code: 'light' }),
+      );
+    });
+
+    test('missing light: switch_led + bright_value + bright_value_1', () => {
+      setupAndConfigure([
+        'switch', 'fan_speed',
+        'switch_led', 'bright_value', 'bright_value_1',
+      ]);
+
+      expectNoDualLight();
+      expect(mockConfigureLight).toHaveBeenCalledTimes(1);
+      expectLightCall(0, 'switch_led', 'bright_value');
+    });
+
+    test('has bright_value_v2 instead of bright_value: light + bright_value_v2 + switch_led + bright_value_1', () => {
+      setupAndConfigure([
+        'switch', 'fan_speed',
+        'light', 'bright_value_v2', 'switch_led', 'bright_value_1',
+      ]);
+
+      // bright_value is MISSING so dual-light guard fails
+      expectNoDualLight();
+      expect(mockConfigureLight).toHaveBeenCalledTimes(1);
+      expectLightCall(0, 'light', 'bright_value_v2');
+    });
+  });
+});