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

package/test/config.test.ts

@@ -19,7 +19,7 @@ describe('TuyaPlatformConfig', () => {
       const config: TuyaPlatformConfig = {
         platform: 'TuyaPlatform',
         name: 'Tuya',
-        options: {
+        cloud: {
           projectType: '2',
           accessId: 'test_access_id',
           accessKey: 'test_access_key',
@@ -29,19 +29,20 @@ describe('TuyaPlatformConfig', () => {
           appSchema: 'tuyaSmart',
           generateWeatherAccessory: true,
           weatherAPI: 'openweathermap',
+          forceIPv4: false
         },
       };
 
-      expect(config.options).toBeDefined();
-      expect(config.options?.projectType).toBe('2');
-      expect((config.options as any)?.countryCode).toBe(1);
+      expect(config.cloud).toBeDefined();
+      expect(config.cloud?.projectType).toBe('2');
+      expect((config.cloud as any)?.countryCode).toBe(1);
     });
 
     test('accepts config with custom options', () => {
       const config: TuyaPlatformConfig = {
         platform: 'TuyaPlatform',
         name: 'Tuya',
-        options: {
+        cloud: {
           projectType: '1',
           endpoint: 'https://openapi.tuyaeu.com',
           accessId: 'test_access_id',
@@ -50,11 +51,12 @@ describe('TuyaPlatformConfig', () => {
           password: 'password',
           generateWeatherAccessory: true,
           weatherAPI: 'openweathermap',
+          forceIPv4: false
         },
       };
 
-      expect(config.options?.projectType).toBe('1');
-      expect((config.options as any)?.endpoint).toBe('https://openapi.tuyaeu.com');
+      expect(config.cloud?.projectType).toBe('1');
+      expect((config.cloud as any)?.endpoint).toBe('https://openapi.tuyaeu.com');
     });
   });
 
@@ -309,7 +311,7 @@ describe('TuyaPlatformConfig', () => {
       const config: TuyaPlatformConfig = {
         platform: 'TuyaPlatform',
         name: 'Tuya',
-        options: {
+        cloud: {
           projectType: '2',
           accessId: 'test_access_id',
           accessKey: 'test_access_key',
@@ -319,6 +321,7 @@ describe('TuyaPlatformConfig', () => {
           appSchema: 'tuyaSmart',
           generateWeatherAccessory: true,
           weatherAPI: 'openweathermap',
+          forceIPv4: false
         },
         local: {
           devices: [
@@ -332,9 +335,9 @@ describe('TuyaPlatformConfig', () => {
         },
       };
 
-      expect(config.options).toBeDefined();
+      expect(config.cloud).toBeDefined();
       expect(config.local).toBeDefined();
-      expect(config.options?.projectType).toBe('2');
+      expect(config.cloud?.projectType).toBe('2');
       expect(config.local?.devices).toHaveLength(1);
     });
   });
@@ -344,7 +347,7 @@ describe('TuyaPlatformConfig', () => {
       const config: TuyaPlatformConfig = {
         platform: 'TuyaPlatform',
         name: 'My Tuya Devices',
-        options: {
+        cloud: {
           projectType: '2',
           accessId: 'test_access_id',
           accessKey: 'test_access_key',
@@ -354,19 +357,20 @@ describe('TuyaPlatformConfig', () => {
           appSchema: 'tuyaSmart',
           generateWeatherAccessory: true,
           weatherAPI: 'openweathermap',
+          forceIPv4: false
         },
       };
 
       expect(config.platform).toBe('TuyaPlatform');
       expect(config.name).toBe('My Tuya Devices');
-      expect((config.options as any)?.username).toBe('test@example.com');
+      expect((config.cloud as any)?.username).toBe('test@example.com');
     });
 
     test('allows custom properties through interface', () => {
       const config: TuyaPlatformConfig = {
         platform: 'TuyaPlatform',
         name: 'Tuya',
-        options: {} as any,
+        cloud: {} as any,
       };
 
       expect(config).toBeDefined();

package/test/custom.test.ts

@@ -11,7 +11,7 @@ import { config, expectDevice, expectSuccessResponse } from './util';
 const { options } = config;
 if (options?.projectType === '1') {
   const api = new TuyaOpenAPI(options.endpoint, options.accessId, options.accessKey);
-  const deviceManager = new TuyaCustomDeviceManager(api);
+  const deviceManager = new TuyaCustomDeviceManager(api, options);
 
   describe('TuyaOpenAPI', () => {
     test('getToken()', async () => {
@@ -26,7 +26,7 @@ if (options?.projectType === '1') {
 
     test('customCreateUser()', async () => {
       const res = await api.customCreateUser('homebridge', 'homebridge');
-      if (res.success === false && res.code === 14520015) {
+      if (!res.success && res.code === 14520015) {
         // already exist
       } else {
         expectSuccessResponse(res);

package/test/errorHandling.test.ts

@@ -1,22 +1,22 @@
 /* eslint-disable no-console */
 import { describe, expect, test, beforeEach, jest } from '@jest/globals';
 import TuyaDevice from '../src/cloud/device/TuyaDevice';
+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;
 
 describe('Error Handling & Edge Cases', () => {
+  beforeEach(() => {
+    initLogger(mockLog);
+  });
   describe('device initialization edge cases', () => {
     test('handles device with minimal properties', () => {
       const device = new TuyaDevice({

package/test/home.test.ts

@@ -11,7 +11,7 @@ import { config, expectDevice, expectSuccessResponse } from './util';
 const { options } = config;
 if (options?.projectType === '2') {
   const api = new TuyaOpenAPI(TuyaOpenAPI.Endpoints.CHINA, options.accessId, options.accessKey);
-  const deviceManager = new TuyaHomeDeviceManager(api);
+  const deviceManager = new TuyaHomeDeviceManager(api, options);
 
   describe('TuyaOpenAPI', () => {
     test('homeLogin()', async () => {