@homebridge-plugins/homebridge-tuya 3.0.0-beta.2 → 3.0.0-beta.21

package/test/localDeviceManager.behavior.test.ts

@@ -1,6 +1,9 @@
 import { beforeEach, describe, expect, jest, test } from '@jest/globals';
 import LocalDeviceManager from '../src/local/LocalDeviceManager';
 import type { LocalConfig } from '../src/local/config';
+import { TuyaPluginMode } from '../src/config';
+import { TuyaDeviceSchemaType } from '../src/cloud/device/TuyaDevice';
+import { ExLogger, initLogger } from '../src/shared/util/Logger';
 
 const createdConnections: any[] = [];
 
@@ -29,37 +32,22 @@ jest.mock('../src/local/TuyaDiscovery', () => ({
   },
 }));
 
-jest.mock('../src/shared/util/Logger', () => ({
-  __esModule: true,
-  default: class Logger {
-    log() {}
-    info() {}
-    warn() {}
-    error() {}
-    debug() {}
-  },
-  PrefixLogger: class PrefixLogger {
-    constructor(public parentLog: unknown, public name: string, public debugMode: boolean) {}
-    log() {}
-    info() {}
-    warn() {}
-    error() {}
-    debug() {}
-  },
-}));
+// Mock Logger
+const mockLog: ExLogger = {
+  debug: jest.fn(),
+  info: jest.fn(),
+  warn: jest.fn(),
+  error: jest.fn(),
+  log: jest.fn(),
+  success: jest.fn(),
+} as unknown as ExLogger;
 
 describe('LocalDeviceManager command and local mapping behavior', () => {
   let log: any;
 
   beforeEach(() => {
+    initLogger(mockLog);
     createdConnections.length = 0;
-    log = {
-      log: jest.fn(),
-      info: jest.fn(),
-      warn: jest.fn(),
-      error: jest.fn(),
-      debug: jest.fn(),
-    };
     jest.clearAllMocks();
   });
 
@@ -74,7 +62,7 @@ describe('LocalDeviceManager command and local mapping behavior', () => {
       ],
     };
 
-    const manager = new LocalDeviceManager(config, log);
+    const manager = new LocalDeviceManager(config);
     await manager.initLocalDevices();
 
     expect(manager.getDevice('dev-1')).toBeDefined();
@@ -98,7 +86,7 @@ describe('LocalDeviceManager command and local mapping behavior', () => {
       ],
     };
 
-    const manager = new LocalDeviceManager(config, log);
+    const manager = new LocalDeviceManager(config);
     await manager.initLocalDevices();
 
     const result = await manager.sendCommands('dev-1', [
@@ -121,12 +109,12 @@ describe('LocalDeviceManager command and local mapping behavior', () => {
       devices: [],
     };
 
-    const manager = new LocalDeviceManager(config, log);
+    const manager = new LocalDeviceManager(config);
     await manager.initLocalDevices();
 
     const result = await manager.sendCommands('missing-device', [{ code: 'switch_1', value: true }]);
 
-    expect(result).toBeUndefined();
+    expect(result).toBe(false);
   });
 
   test('updates existing configured device IP on discovery and disconnects stale connection', async () => {
@@ -142,7 +130,7 @@ describe('LocalDeviceManager command and local mapping behavior', () => {
       ],
     };
 
-    const manager = new LocalDeviceManager(config, log);
+    const manager = new LocalDeviceManager(config);
     await manager.initLocalDevices();
     manager.connectAllDevices();
 
@@ -166,7 +154,7 @@ describe('LocalDeviceManager command and local mapping behavior', () => {
       devices: [],
     };
 
-    const manager = new LocalDeviceManager(config, log);
+    const manager = new LocalDeviceManager(config);
     await manager.initLocalDevices();
 
     (manager as any)._onDiscovered({
@@ -182,4 +170,181 @@ describe('LocalDeviceManager command and local mapping behavior', () => {
     expect(discovered?.ip).toBe('192.168.1.30');
     expect(discovered?.product_id).toBe('prod1');
   });
+
+  test('keeps DP mapping when a local override uses the same code as a no-op rename', async () => {
+    const config: LocalConfig = {
+      autoDiscoverDevices: false,
+      deviceOverrides: [{
+        id: 'dev-1',
+        configFor: TuyaPluginMode.local,
+        schema: [{
+          code: 'humidity_indoor',
+          newCode: 'humidity_indoor',
+          type: TuyaDeviceSchemaType.Integer,
+          property: { min: 0, max: 100, scale: 0, step: 1 },
+        }],
+      }],
+      devices: [{
+        tuyaDeviceId: 'dev-1',
+        ip: '192.168.1.10',
+        tuyaKey: 'abcdef1234567890',
+        protocolVersion: '3.5',
+        dpMapping: {
+          humidity_indoor: 6,
+        },
+      }],
+    };
+
+    const manager = new LocalDeviceManager(config);
+    await manager.initLocalDevices();
+
+    const device = manager.getDevice('dev-1');
+    const dpMap = (manager as any).dpMaps.get('dev-1');
+    const reverseMap = (manager as any).reverseDpMaps.get('dev-1');
+
+    expect(dpMap?.humidity_indoor).toBe(6);
+    expect(reverseMap?.[6]).toBe('humidity_indoor');
+    expect(device?.schema.some(schema => schema.code === 'humidity_indoor' && schema.type === TuyaDeviceSchemaType.Integer)).toBe(true);
+  });
+
+  test('applies local overrides without a rename using the original code', async () => {
+    const config: LocalConfig = {
+      autoDiscoverDevices: false,
+      deviceOverrides: [{
+        id: 'dev-1',
+        configFor: TuyaPluginMode.local,
+        schema: [{
+          code: 'humidity_indoor',
+          type: TuyaDeviceSchemaType.Integer,
+          property: { min: 0, max: 100, scale: 0, step: 1 },
+        }],
+      }],
+      devices: [{
+        tuyaDeviceId: 'dev-1',
+        ip: '192.168.1.10',
+        tuyaKey: 'abcdef1234567890',
+        protocolVersion: '3.5',
+        dpMapping: {
+          humidity_indoor: 6,
+        },
+      }],
+    };
+
+    const manager = new LocalDeviceManager(config);
+    await manager.initLocalDevices();
+
+    const device = manager.getDevice('dev-1');
+    const schema = device?.schema.find(item => item.code === 'humidity_indoor');
+
+    expect(schema).toBeDefined();
+    expect(schema?.type).toBe(TuyaDeviceSchemaType.Integer);
+    expect(device?.schema.every(item => !!item.code)).toBe(true);
+  });
+
+  test('applies local overrides', async () => {
+    const config: LocalConfig = {
+      autoDiscoverDevices: false,
+      devices: [],
+      deviceOverrides: [{
+        id: 'dev-1',
+        category: 'jsq',
+        configFor: TuyaPluginMode.local,
+        schema: [{
+          code: 'humidity_indoor',
+          type: TuyaDeviceSchemaType.Integer,
+          property: { min: 0, max: 100, scale: 0, step: 1 },
+        }],
+      }],
+    };
+
+    const manager = new LocalDeviceManager(config);
+    await manager.initLocalDevices();
+
+    (manager as any)._onDiscovered({
+      id: 'dev-1',
+      ip: '192.168.0.1',
+      version: '3.3',
+      productKey: 'prod1',
+    });
+
+    const device = manager.getDevice('dev-1');
+
+    expect(device).toBeDefined();
+    expect(device?.ip).toBe('192.168.0.1');
+    expect(device?.product_id).toBe('prod1');
+    expect(device?.category).toBe('jsq');
+    expect(device?.schema?.length).toBe(1);
+    expect(device?.schema?.[0].code).toBe('humidity_indoor');
+  });
+
+  test('do not apply cloud overrides to local devices', async () => {
+    const config: LocalConfig = {
+      autoDiscoverDevices: false,
+      devices: [],
+      deviceOverrides: [{
+        id: 'dev-1',
+        category: 'jsq',
+        configFor: TuyaPluginMode.cloud,
+        schema: [{
+          code: 'humidity_indoor',
+          type: TuyaDeviceSchemaType.Integer,
+          property: { min: 0, max: 100, scale: 0, step: 1 },
+        }],
+      }],
+    };
+
+    const manager = new LocalDeviceManager(config);
+    await manager.initLocalDevices();
+
+    (manager as any)._onDiscovered({
+      id: 'dev-1',
+      ip: '192.168.0.1',
+      version: '3.3',
+      productKey: 'prod1',
+    });
+
+    const device = manager.getDevice('dev-1');
+
+    expect(device).toBeDefined();
+    expect(device?.ip).toBe('192.168.0.1');
+    expect(device?.product_id).toBe('prod1');
+    expect(device?.category).toBe('unknown');
+    expect(device?.schema?.length).toBe(0);
+  });
+
+  test('applies overrides local device (configFor:both)', async () => {
+    const config: LocalConfig = {
+      autoDiscoverDevices: false,
+      devices: [],
+      deviceOverrides: [{
+        id: 'dev-1',
+        category: 'jsq',
+        configFor: TuyaPluginMode.both,
+        schema: [{
+          code: 'humidity_indoor',
+          type: TuyaDeviceSchemaType.Integer,
+          property: { min: 0, max: 100, scale: 0, step: 1 },
+        }],
+      }],
+    };
+
+    const manager = new LocalDeviceManager(config);
+    await manager.initLocalDevices();
+
+    (manager as any)._onDiscovered({
+      id: 'dev-1',
+      ip: '192.168.0.1',
+      version: '3.3',
+      productKey: 'prod1',
+    });
+
+    const device = manager.getDevice('dev-1');
+
+    expect(device).toBeDefined();
+    expect(device?.ip).toBe('192.168.0.1');
+    expect(device?.product_id).toBe('prod1');
+    expect(device?.category).toBe('jsq');
+    expect(device?.schema?.length).toBe(1);
+    expect(device?.schema?.[0].code).toBe('humidity_indoor');
+  });
 });

package/test/localDeviceManager.test.ts

@@ -2,17 +2,19 @@
 import { describe, expect, test, beforeEach, afterEach, jest } from '@jest/globals';
 import LocalDeviceManager from '../src/local/LocalDeviceManager';
 import { LocalConfig } from '../src/local/config';
-import Logger from '../src/shared/util/Logger';
+import ExLogger, { initLogger, logger } from '../src/shared/util/Logger';
+import { ConfigHash } from '../src/shared/util/ConfigHash';
 import TuyaDevice from '../src/cloud/device/TuyaDevice';
 
 // Mock Logger
-const mockLog: Logger = {
+const mockLog: ExLogger = {
   debug: jest.fn(),
   info: jest.fn(),
   warn: jest.fn(),
   error: jest.fn(),
   log: jest.fn(),
-} as unknown as Logger;
+  success: jest.fn(),
+} as unknown as ExLogger;
 
 describe('LocalDeviceManager', () => {
   let manager: LocalDeviceManager;
@@ -21,7 +23,8 @@ describe('LocalDeviceManager', () => {
     const config: LocalConfig = {
       devices: [],
     };
-    manager = new LocalDeviceManager(config, mockLog);
+    manager = new LocalDeviceManager(config);
+    initLogger(mockLog);
   });
 
   afterEach(() => {
@@ -73,7 +76,7 @@ describe('LocalDeviceManager', () => {
       const config: LocalConfig = {
         devices: [],
       };
-      const mgr = new LocalDeviceManager(config, mockLog);
+      const mgr = new LocalDeviceManager(config);
       expect(mgr).toBeDefined();
     });
 
@@ -88,7 +91,7 @@ describe('LocalDeviceManager', () => {
           },
         ],
       };
-      const mgr = new LocalDeviceManager(config, mockLog);
+      const mgr = new LocalDeviceManager(config);
       expect(mgr).toBeDefined();
     });
 
@@ -108,9 +111,107 @@ describe('LocalDeviceManager', () => {
           },
         ],
       };
-      const mgr = new LocalDeviceManager(config, mockLog);
+      const mgr = new LocalDeviceManager(config);
       expect(mgr).toBeDefined();
     });
+
+    test('uses outletCount for effective switch count hashing when switchCount is absent', () => {
+      const cfg = {
+        tuyaDeviceId: 'device1',
+        name: 'Patio Lights',
+        outletCount: 2,
+      };
+      const mgr = new LocalDeviceManager({ devices: [cfg as any] });
+      const device = new TuyaDevice({ id: 'device1', uuid: 'device1', name: 'Patio Lights', schema: [], status: [] });
+      (device as any).switchCount = 1;
+
+      const hash = mgr.createDeviceConfigHash(device);
+      const expectedHash = ConfigHash.computeHash({
+        tuyaDeviceId: cfg.tuyaDeviceId,
+        name: cfg.name,
+        tuyaKey: undefined,
+        dpMapping: (mgr as any)._getDPMap(cfg.tuyaDeviceId),
+        switchCount: 2,
+        outletCount: 2,
+        protocolVersion: undefined,
+        category: undefined,
+      });
+
+      expect(hash).toBe(expectedHash);
+    });
+
+    test('creates a DP map from dpMapping and dpMappingArray', () => {
+      const mgr = new LocalDeviceManager({ devices: [] });
+      const cfg = {
+        tuyaDeviceId: 'device1',
+        dpMapping: {
+          switch_1: 1,
+          bright_value: 2,
+        },
+        dpMappingArray: [
+          { dpCode: 'switch_2', dpID: 2 },
+          { dpCode: 'temp_value', dpID: 3 },
+        ],
+      };
+
+      const dpMap = (mgr as any)._createDPMap(cfg);
+
+      expect(dpMap).toEqual({
+        switch_1: 1,
+        bright_value: 2,
+        switch_2: 2,
+        temp_value: 3,
+      });
+    });
+
+    test('applies schema rename overrides when creating DP map', () => {
+      const mgr = new LocalDeviceManager({
+        devices: [],
+        deviceOverrides: [{
+          id: 'device1',
+          configFor: 'local',
+          schema: [{ code: 'switch_1', newCode: 'relay_1' }],
+        } as any],
+      });
+      const cfg = {
+        tuyaDeviceId: 'device1',
+        dpMapping: {
+          switch_1: 1,
+        },
+      };
+
+      const dpMap = (mgr as any)._createDPMap(cfg);
+
+      expect(dpMap).toEqual({
+        relay_1: 1,
+      });
+    });
+
+    test('creating DP map with DEFAULT', () => {
+      const mgr = new LocalDeviceManager({
+        devices: [],
+      });
+      const cfg = {};
+
+      const dpMap = (mgr as any)._createDPMap(cfg);
+
+      expect(dpMap).toEqual({
+        "switch_1": 1,
+        "switch_2": 2,
+        "switch_3": 3,
+        "switch_4": 4,
+        "bright_value": 2,
+        "bright_value_v2": 22,
+        "temp_value": 3,
+        "temp_value_v2": 23,
+        "work_mode": 2,
+        "colour_data": 5,
+        "colour_data_v2": 24,
+        "switch_led": 1,
+        "countdown_1": 9,
+      });
+    });
+
   });
 
   describe('device discovery', () => {
@@ -118,7 +219,7 @@ describe('LocalDeviceManager', () => {
       const config: LocalConfig = {
         devices: [],
       };
-      const mgr = new LocalDeviceManager(config, mockLog);
+      const mgr = new LocalDeviceManager(config);
 
       // Should not throw
       await expect(mgr.initLocalDevices()).resolves.not.toThrow();
@@ -139,15 +240,15 @@ describe('LocalDeviceManager', () => {
       };
 
       // Should create manager without crashing
-      const mgr = new LocalDeviceManager(config, mockLog);
+      const mgr = new LocalDeviceManager(config);
       expect(mgr).toBeDefined();
     });
 
     test('falls back when local command has no response after 10 seconds', async () => {
       jest.useFakeTimers();
-      const mgr = new LocalDeviceManager({ devices: [] }, mockLog);
+      const mgr = new LocalDeviceManager({ devices: [] });
       mgr['dpMaps'].set('device1', { switch_1: 1 });
-      mgr['localDevices'].push(new TuyaDevice({ id: 'device1', uuid: 'device1', name: 'Device 1', schema: [], status: [] }));
+      mgr['devices'].push(new TuyaDevice({ id: 'device1', uuid: 'device1', name: 'Device 1', schema: [], status: [] }));
 
       const conn = new (require('events').EventEmitter)();
       conn.connected = true;
@@ -157,15 +258,15 @@ describe('LocalDeviceManager', () => {
       const sendPromise = mgr.sendCommands('device1', [{ code: 'switch_1', value: true }]);
       jest.advanceTimersByTime(10000);
 
-      await expect(sendPromise).rejects.toThrow('Local command response timeout');
+      await expect(sendPromise).resolves.toBe(false);
       jest.useRealTimers();
     });
 
     test('cancels older pending local responses when newer command supersedes same DP', async () => {
       jest.useFakeTimers();
-      const mgr = new LocalDeviceManager({ devices: [] }, mockLog);
+      const mgr = new LocalDeviceManager({ devices: [] });
       mgr['dpMaps'].set('device1', { switch_1: 1 });
-      mgr['localDevices'].push(new TuyaDevice({ id: 'device1', uuid: 'device1', name: 'Device 1', schema: [], status: [] }));
+      mgr['devices'].push(new TuyaDevice({ id: 'device1', uuid: 'device1', name: 'Device 1', schema: [], status: [] }));
 
       const conn = new (require('events').EventEmitter)();
       conn.connected = true;
@@ -177,7 +278,7 @@ describe('LocalDeviceManager', () => {
 
       await expect(firstSend).resolves.toBe(true);
       jest.advanceTimersByTime(10000);
-      await expect(secondSend).rejects.toThrow('Local command response timeout');
+      await expect(secondSend).resolves.toBe(false);
       jest.useRealTimers();
     });
 
@@ -192,7 +293,7 @@ describe('LocalDeviceManager', () => {
           },
         ],
       };
-      const mgr = new LocalDeviceManager(config, mockLog);
+      const mgr = new LocalDeviceManager(config);
 
       // Should not throw during init
       await expect(mgr.initLocalDevices()).resolves.not.toThrow();
@@ -211,7 +312,7 @@ describe('LocalDeviceManager', () => {
       };
 
       // Should create manager without immediate error
-      const mgr = new LocalDeviceManager(config, mockLog);
+      const mgr = new LocalDeviceManager(config);
       expect(mgr).toBeDefined();
     });
 
@@ -227,7 +328,7 @@ describe('LocalDeviceManager', () => {
           } as any,
         ],
       };
-      const mgr = new LocalDeviceManager(config, mockLog);
+      const mgr = new LocalDeviceManager(config);
       (mgr as any)._registerDeviceConfig(config.devices![0]);
 
       expect(mgr.devices.length).toBe(0);
@@ -242,7 +343,7 @@ describe('LocalDeviceManager', () => {
       const config: LocalConfig = {
         devices: [],
       };
-      const mgr = new LocalDeviceManager(config, mockLog);
+      const mgr = new LocalDeviceManager(config);
       expect(mgr).toBeDefined();
       // Default mappings should be applied internally
     });
@@ -264,25 +365,7 @@ describe('LocalDeviceManager', () => {
           },
         ],
       };
-      const mgr = new LocalDeviceManager(config, mockLog);
-      expect(mgr).toBeDefined();
-    });
-  });
-
-  describe('logging', () => {
-    test('uses provided logger', () => {
-      const customLog: Logger = {
-        debug: jest.fn(),
-        info: jest.fn(),
-        warn: jest.fn(),
-        error: jest.fn(),
-        log: jest.fn(),
-      } as unknown as Logger;
-
-      const config: LocalConfig = {
-        devices: [],
-      };
-      const mgr = new LocalDeviceManager(config, customLog);
+      const mgr = new LocalDeviceManager(config);
       expect(mgr).toBeDefined();
     });
   });
@@ -305,8 +388,8 @@ describe('LocalDeviceManager Integration', () => {
       ],
     };
 
-    const mgr1 = new LocalDeviceManager(config1, mockLog);
-    const mgr2 = new LocalDeviceManager(config2, mockLog);
+    const mgr1 = new LocalDeviceManager(config1);
+    const mgr2 = new LocalDeviceManager(config2);
 
     expect(mgr1).toBeDefined();
     expect(mgr2).toBeDefined();
@@ -317,7 +400,7 @@ describe('LocalDeviceManager Integration', () => {
     const config: LocalConfig = {
       devices: [],
     };
-    const mgr = new LocalDeviceManager(config, mockLog);
+    const mgr = new LocalDeviceManager(config);
 
     await mgr.initLocalDevices();
     await mgr.initLocalDevices(); // Should handle multiple inits

package/test/mqttMessages.test.ts

@@ -1,21 +1,19 @@
 /* eslint-disable no-console */
 import { describe, expect, test, beforeEach, jest } from '@jest/globals';
-import TuyaDeviceManager from '../src/cloud/device/TuyaDeviceManager';
+import TuyaDeviceManager from '../src/cloud/device/TuyaCloudDeviceManager';
 import TuyaDevice from '../src/cloud/device/TuyaDevice';
+import TuyaHomeDeviceManager from '../src/cloud/device/TuyaHomeDeviceManager';
+import { ExLogger, initLogger } from '../src/shared/util/Logger';
 
 // Mock Logger
-jest.mock('../src/shared/util/Logger', () => ({
-  __esModule: true,
-  default: class Logger {
-    log() {}
-    info() {}
-    warn() {}
-    error() {}
-  },
-  PrefixLogger: class PrefixLogger {
-    constructor(public log: any, public name: string, public debug: boolean) {}
-  },
-}));
+const mockLog: ExLogger = {
+  debug: jest.fn(),
+  info: jest.fn(),
+  warn: jest.fn(),
+  error: jest.fn(),
+  log: jest.fn(),
+  success: jest.fn(),
+} as unknown as ExLogger;
 
 // Mock TuyaOpenMQ
 jest.mock('../src/cloud/api/TuyaOpenMQ', () => {
@@ -44,8 +42,11 @@ jest.mock('../src/cloud/api/TuyaOpenMQ', () => {
 describe('MQTT Device Updates - TuyaDeviceManager Message Handling', () => {
   let manager: TuyaDeviceManager;
   let mockAPI: any;
+  let mockConfig: any;
 
   beforeEach(() => {
+    initLogger(mockLog);
+
     mockAPI = {
       log: { log: console.log } as any,
       post: jest.fn(),
@@ -53,7 +54,25 @@ describe('MQTT Device Updates - TuyaDeviceManager Message Handling', () => {
       tokenInfo: { uid: 'test_uid' },
     };
 
-    manager = new TuyaDeviceManager(mockAPI, false);
+    mockConfig = {
+      platform: 'TuyaPlatform',
+      name: 'Tuya',
+      mode: 'cloud',
+      cloud: {
+        projectType: '2',
+        accessId: 'test_id',
+        accessKey: 'test_key',
+        countryCode: 1,
+        username: 'user@example.com',
+        password: 'password',
+        appSchema: 'tuyaSmart',
+        generateWeatherAccessory: false,
+        weatherAPI: '',
+        forceIPv4: false,
+      },
+    };
+
+    manager = new TuyaHomeDeviceManager(mockAPI, mockConfig.cloud, false);
   });
 
   describe('device status updates', () => {