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

package/test/platform.validation.local.test.ts

@@ -1,50 +1,59 @@
 import { beforeEach, describe, expect, jest, test } from '@jest/globals';
 import { TuyaPlatform } from '../src/platform';
-
-jest.mock('../src/shared/util/Logger', () => ({
-  __esModule: true,
-  default: class Logger {
-    log() {}
-    info() {}
-    warn() {}
-    error() {}
-  },
-  PrefixLogger: class PrefixLogger {
-    constructor(public log: unknown, public name: string, public debug: boolean) {}
-  },
-}));
+import { initLogger } from '../src/shared/util/Logger';
+import { Logger } from 'homebridge';
+
+// Mock Logger
+const mockLog: Logger = {
+  debug: jest.fn(),
+  info: jest.fn(),
+  warn: jest.fn(),
+  error: jest.fn(),
+  log: jest.fn(),
+  success: jest.fn(),
+} as unknown as Logger;
 
 jest.mock('../src/cloud/api/TuyaOpenAPI', () => {
   return class MockTuyaOpenAPI {
     log = console;
+    static getDefaultEndpoint = jest.fn().mockReturnValue([1]);
   };
 });
 
-jest.mock('../src/cloud/device/TuyaDeviceManager', () => {
-  class MockTuyaDeviceManager {
-    static readonly Events = {
-      DEVICE_ADD: 'DEVICE_ADD',
-      DEVICE_INFO_UPDATE: 'DEVICE_INFO_UPDATE',
-      DEVICE_STATUS_UPDATE: 'DEVICE_STATUS_UPDATE',
-      DEVICE_DELETE: 'DEVICE_DELETE',
-    };
-  }
-  return MockTuyaDeviceManager;
-});
-
 jest.mock('../src/cloud/device/TuyaCustomDeviceManager', () => {
-  return class MockTuyaCustomDeviceManager {};
+  return class MockTuyaCustomDeviceManager {
+    pullDevices = jest.fn().mockReturnValue([]);
+    updateInfraredRemotes = jest.fn();
+    getDeviceSchemaConfig = jest.fn();
+    devices = [];
+    api = mockAPI;
+    on = jest.fn();
+  };
 });
 
 jest.mock('../src/cloud/device/TuyaHomeDeviceManager', () => {
-  return class MockTuyaHomeDeviceManager {};
+  return class MockTuyaHomeDeviceManager {
+    pullDevices = jest.fn().mockReturnValue([]);
+    updateInfraredRemotes = jest.fn();
+    getDeviceSchemaConfig = jest.fn();
+    devices = [];
+    api = mockAPI;
+    on = jest.fn();
+  };
 });
 
 jest.mock('../src/local/LocalDeviceManager', () => {
-  return class MockLocalDeviceManager {};
+  return class MockLocalDeviceManager {
+    pullDevices = jest.fn().mockReturnValue([]);
+    updateInfraredRemotes = jest.fn();
+    getDeviceSchemaConfig = jest.fn();
+    devices = [];
+    api = mockAPI;
+    on = jest.fn();
+  };
 });
 
-jest.mock('../src/shared/accessories/AccessoryFactory', () => ({
+jest.mock('../src/shared/accessory/AccessoryFactory', () => ({
   __esModule: true,
   default: {
     configAccessory: jest.fn(),
@@ -57,6 +66,13 @@ jest.mock('../src/shared/util/util', () => ({
   retry: jest.fn(async (fn: () => Promise<unknown>) => fn()),
 }));
 
+jest.mock('../src/shared/util/ConfigMigrator', () => ({
+  __esModule: true,
+  default: class ConfigMigrator {
+    migrate(arg:any) { return arg; }
+  }
+}));
+
 const mockAPI = {
   hap: {
     Service: {},
@@ -69,19 +85,13 @@ const mockAPI = {
   user: {
     persistPath: () => '/tmp',
   },
+  tokenInfo: {}
 } as any;
 
 describe('TuyaPlatform validation around cloud/local modes', () => {
-  let log: any;
-
   beforeEach(() => {
-    log = {
-      debug: jest.fn(),
-      info: jest.fn(),
-      warn: jest.fn(),
-      error: jest.fn(),
-    };
     jest.clearAllMocks();
+    initLogger(mockLog);
   });
 
   test('rejects mode both when local block is missing', () => {
@@ -89,7 +99,7 @@ describe('TuyaPlatform validation around cloud/local modes', () => {
       platform: 'TuyaPlatform',
       name: 'Tuya',
       mode: 'both',
-      options: {
+      cloud: {
         projectType: '2',
         accessId: 'id',
         accessKey: 'key',
@@ -102,9 +112,9 @@ describe('TuyaPlatform validation around cloud/local modes', () => {
       },
     };
 
-    const platform = new TuyaPlatform(log, config, mockAPI);
+    const platform = new TuyaPlatform(mockLog, config, mockAPI);
     expect(platform.validate()).toBe(false);
-    expect(log.error).toHaveBeenCalledWith('mode is "both" but no "local" config block found.');
+    expect(mockLog.error).toHaveBeenCalledWith('mode is "both" but no "local" config block found.');
   });
 
   test('rejects mode both when cloud options are missing', () => {
@@ -115,9 +125,9 @@ describe('TuyaPlatform validation around cloud/local modes', () => {
       local: { devices: [] },
     };
 
-    const platform = new TuyaPlatform(log, config, mockAPI);
+    const platform = new TuyaPlatform(mockLog, config, mockAPI);
     expect(platform.validate()).toBe(false);
-    expect(log.error).toHaveBeenCalledWith('Not configured — "options" block is required for cloud mode, exit.');
+    expect(mockLog.error).toHaveBeenCalledWith('Not configured — "cloud" block is required for cloud mode, exit.');
   });
 
   test('detects duplicate device override ids', () => {
@@ -125,7 +135,7 @@ describe('TuyaPlatform validation around cloud/local modes', () => {
       platform: 'TuyaPlatform',
       name: 'Tuya',
       mode: 'cloud',
-      options: {
+      cloud: {
         projectType: '2',
         accessId: 'id',
         accessKey: 'key',
@@ -142,8 +152,8 @@ describe('TuyaPlatform validation around cloud/local modes', () => {
       },
     };
 
-    const platform = new TuyaPlatform(log, config, mockAPI);
-    expect(platform.validateDeviceOverrides()).toBe(false);
+    const platform = new TuyaPlatform(mockLog, config, mockAPI);
+    expect(platform.validateDeviceOverrides(config.cloud.deviceOverrides)).toBe(false);
   });
 
   test('detects duplicate schema codes inside one device override', () => {
@@ -151,7 +161,7 @@ describe('TuyaPlatform validation around cloud/local modes', () => {
       platform: 'TuyaPlatform',
       name: 'Tuya',
       mode: 'cloud',
-      options: {
+      cloud: {
         projectType: '2',
         accessId: 'id',
         accessKey: 'key',
@@ -173,78 +183,7 @@ describe('TuyaPlatform validation around cloud/local modes', () => {
       },
     };
 
-    const platform = new TuyaPlatform(log, config, mockAPI);
-    expect(platform.validateSchema()).toBe(false);
-  });
-
-  test('resolves device config precedence: device, then product, then global', () => {
-    const config = {
-      platform: 'TuyaPlatform',
-      name: 'Tuya',
-      mode: 'cloud',
-      options: {
-        projectType: '2',
-        accessId: 'id',
-        accessKey: 'key',
-        countryCode: 1,
-        username: 'user@example.com',
-        password: 'secret',
-        appSchema: 'tuyaSmart',
-        generateWeatherAccessory: false,
-        weatherAPI: '',
-        deviceOverrides: [
-          { id: 'global', category: 'global-cat' },
-          { id: 'prod-1', category: 'product-cat' },
-          { id: 'device-1', category: 'device-cat' },
-        ],
-      },
-    };
-
-    const platform = new TuyaPlatform(log, config, mockAPI);
-
-    const exact = platform.getDeviceConfig({ id: 'device-1', uuid: 'uuid-1', product_id: 'prod-1' } as any);
-    const byProduct = platform.getDeviceConfig({ id: 'device-2', uuid: 'uuid-2', product_id: 'prod-1' } as any);
-    const fallback = platform.getDeviceConfig({ id: 'device-3', uuid: 'uuid-3', product_id: 'prod-3' } as any);
-
-    expect(exact?.category).toBe('device-cat');
-    expect(byProduct?.category).toBe('product-cat');
-    expect(fallback?.category).toBe('global-cat');
-  });
-
-  test('finds schema config case-insensitively and migrates oldCode', () => {
-    const config = {
-      platform: 'TuyaPlatform',
-      name: 'Tuya',
-      mode: 'cloud',
-      options: {
-        projectType: '2',
-        accessId: 'id',
-        accessKey: 'key',
-        countryCode: 1,
-        username: 'user@example.com',
-        password: 'secret',
-        appSchema: 'tuyaSmart',
-        generateWeatherAccessory: false,
-        weatherAPI: '',
-        deviceOverrides: [
-          {
-            id: 'device-1',
-            schema: [
-              { oldCode: 'switch_1', code: 'new_switch_1', hidden: true },
-            ],
-          },
-        ],
-      },
-    };
-
-    const platform = new TuyaPlatform(log, config, mockAPI);
-    const device = { id: 'device-1', uuid: 'device-1', product_id: 'prod-1' } as any;
-
-    const result = platform.getDeviceSchemaConfig(device, 'SWITCH_1');
-
-    expect(result).toBeDefined();
-    expect(result?.code).toBe('switch_1');
-    expect((result as any).newCode).toBe('new_switch_1');
-    expect(result?.hidden).toBe(true);
+    const platform = new TuyaPlatform(mockLog, config, mockAPI);
+    expect(platform.validateSchema(config.cloud.deviceOverrides)).toBe(false);
   });
 });

package/test/tuyaCustomDeviceManager.test.ts

@@ -2,20 +2,18 @@
 import { describe, expect, test, beforeEach, jest } from '@jest/globals';
 import TuyaCustomDeviceManager from '../src/cloud/device/TuyaCustomDeviceManager';
 import TuyaDevice from '../src/cloud/device/TuyaDevice';
+import { TuyaPlatformCustomConfig, TuyaPluginMode } from '../src/config';
+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', () => {
@@ -30,16 +28,31 @@ jest.mock('../src/cloud/api/TuyaOpenMQ', () => {
 describe('TuyaCustomDeviceManager', () => {
   let manager: TuyaCustomDeviceManager;
   let mockAPI: any;
+  let mockConfig: any;
 
   beforeEach(() => {
+    jest.clearAllMocks();
+    initLogger(mockLog);
+    
     mockAPI = {
       log: { log: console.log } as any,
       post: jest.fn(),
       get: jest.fn(),
       tokenInfo: { uid: 'test_uid' },
     };
-
-    manager = new TuyaCustomDeviceManager(mockAPI, false);
+    mockConfig = {
+      projectType: '1',
+      endpoint: 'https://openapi.tuyaeu.com',
+      accessId: 'test_access_id',
+      accessKey: 'test_access_key',
+      username: 'user@example.com',
+      password: 'password',
+      generateWeatherAccessory: true,
+      weatherAPI: 'openweathermap',
+      forceIPv4: false
+    }
+
+    manager = new TuyaCustomDeviceManager(mockAPI, mockConfig, false);
   });
 
   describe('initialization', () => {
@@ -49,7 +62,7 @@ describe('TuyaCustomDeviceManager', () => {
     });
 
     test('sets MQTT version to 2.0', () => {
-      const customManager = new TuyaCustomDeviceManager(mockAPI, false);
+      const customManager = new TuyaCustomDeviceManager(mockAPI, mockConfig, false);
       expect(customManager.mq.version).toBe('2.0');
     });
 
@@ -59,7 +72,7 @@ describe('TuyaCustomDeviceManager', () => {
     });
 
     test('supports debug mode', () => {
-      const debugManager = new TuyaCustomDeviceManager(mockAPI, true);
+      const debugManager = new TuyaCustomDeviceManager(mockAPI, mockConfig, true);
       expect(debugManager.debug).toBe(true);
     });
   });
@@ -466,4 +479,81 @@ describe('TuyaCustomDeviceManager', () => {
       expect(mockAPI.post.mock.calls[0][1].asset_ids).toBe(assetIds.join(','));
     });
   });
+
+  describe('get device config', () => {
+    test('resolves device config precedence: device, then product, then global', () => {
+      const config = {
+        platform: 'TuyaPlatform',
+        name: 'Tuya',
+        mode: 'cloud',
+        cloud: {
+          projectType: '1',
+          endpoint: 'https://openapi.tuyaeu.com',
+          accessId: 'test_access_id',
+          accessKey: 'test_access_key',
+          username: 'user@example.com',
+          password: 'password',
+          generateWeatherAccessory: true,
+          weatherAPI: 'openweathermap',
+          forceIPv4: false,
+          deviceOverrides: [
+            { id: 'global', category: 'global-cat', configFor: TuyaPluginMode.cloud },
+            { id: 'prod-1', category: 'product-cat', configFor: TuyaPluginMode.cloud },
+            { id: 'device-1', category: 'device-cat', configFor: TuyaPluginMode.cloud },
+          ],
+        } as TuyaPlatformCustomConfig,
+      };
+  
+      const deviceManager = new TuyaCustomDeviceManager(mockAPI, config.cloud, false);
+  
+      const exact = deviceManager.getDeviceConfig({ id: 'device-1', uuid: 'uuid-1', product_id: 'prod-1' } as any);
+      const byProduct = deviceManager.getDeviceConfig({ id: 'device-2', uuid: 'uuid-2', product_id: 'prod-1' } as any);
+      const fallback = deviceManager.getDeviceConfig({ id: 'device-3', uuid: 'uuid-3', product_id: 'prod-3' } as any);
+  
+      expect(exact?.category).toBe('device-cat');
+      expect(byProduct?.category).toBe('product-cat');
+      expect(fallback?.category).toBe('global-cat');
+    });
+  });
+
+  describe('get device config', () => {
+    test('finds schema config case-insensitively', () => {
+      const config = {
+        platform: 'TuyaPlatform',
+        name: 'Tuya',
+        mode: 'cloud',
+        cloud: {
+          projectType: '1',
+          endpoint: 'https://openapi.tuyaeu.com',
+          accessId: 'test_access_id',
+          accessKey: 'test_access_key',
+          username: 'user@example.com',
+          password: 'password',
+          generateWeatherAccessory: true,
+          weatherAPI: 'openweathermap',
+          forceIPv4: false,
+          deviceOverrides: [
+            {
+              id: 'device-1',
+              schema: [
+                { code: 'switch_1', newCode: 'new_switch_1', hidden: true },
+              ],
+              configFor: TuyaPluginMode.cloud
+            },
+          ],
+        } as TuyaPlatformCustomConfig,
+      };
+  
+      const deviceManager = new TuyaCustomDeviceManager(mockAPI, config.cloud, false);
+
+      const device = { id: 'device-1', uuid: 'device-1', product_id: 'prod-1' } as any;
+
+      const result = deviceManager!.getDeviceSchemaConfig(device, 'SWITCH_1');
+
+      expect(result).toBeDefined();
+      expect(result?.code).toBe('switch_1');
+      expect((result as any).newCode).toBe('new_switch_1');
+      expect(result?.hidden).toBe(true);
+    });
+  });
 });