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

package/test/zigbee/LocalDevice.zigbee.test.ts

@@ -2,19 +2,17 @@
 import { describe, expect, it, beforeEach, jest } from '@jest/globals';
 import EventEmitter from 'events';
 import LocalDevice, { LocalDeviceContext } from '../../src/local/LocalDevice';
+import { ExLogger, initLogger } from '../../src/shared/util/Logger';
 
 // ── Logger mock ───────────────────────────────────────────────────────────────
-
-jest.mock('../../src/shared/util/Logger', () => ({
-  __esModule: true,
-  default: class Logger {
-    log() {}; info() {}; warn() {}; error() {}; debug() {};
-  },
-  PrefixLogger: class PrefixLogger {
-    constructor(public _log: any, public prefix: string) {}
-    debug() {}; info() {}; warn() {}; error() {};
-  },
-}));
+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;
 
 // ── Protocol mock ──────────────────────────────────────────────────────────────
 
@@ -46,11 +44,6 @@ jest.mock('net', () => ({
 }));
 
 // ── Helpers ────────────────────────────────────────────────────────────────────
-
-function makeLogger() {
-  return { log: jest.fn(), info: jest.fn(), warn: jest.fn(), error: jest.fn(), debug: jest.fn() } as any;
-}
-
 function makeParent(overrides: Partial<LocalDeviceContext> = {}): LocalDevice {
   const ctx: LocalDeviceContext = {
     id: 'gateway_001',
@@ -60,7 +53,7 @@ function makeParent(overrides: Partial<LocalDeviceContext> = {}): LocalDevice {
     name: 'Test Gateway',
     ...overrides,
   };
-  return new LocalDevice(ctx, makeLogger());
+  return new LocalDevice(ctx);
 }
 
 function makeChild(parent: LocalDevice, cid: string): LocalDevice {
@@ -71,7 +64,7 @@ function makeChild(parent: LocalDevice, cid: string): LocalDevice {
     version: '3.3',
     name: 'Test Child',
   };
-  const child = new LocalDevice(ctx, makeLogger());
+  const child = new LocalDevice(ctx);
   child.parentDevice = parent;
   child.childId = cid;
   parent.children.set(cid, child);
@@ -81,6 +74,9 @@ function makeChild(parent: LocalDevice, cid: string): LocalDevice {
 // ── Tests ──────────────────────────────────────────────────────────────────────
 
 describe('LocalDevice – Zigbee parent/child', () => {
+  beforeEach(() => {
+    initLogger(mockLog);
+  });
 
   describe('children Map', () => {
     it('starts as an empty Map', () => {

package/test/zigbee/LocalDeviceManager.cloud-discovery.test.ts

@@ -1,20 +1,19 @@
 import { describe, expect, it, 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';
-
-function makeMockLog(): Logger {
-  return {
-    debug: jest.fn(),
-    info: jest.fn(),
-    warn: jest.fn(),
-    error: jest.fn(),
-    log: jest.fn(),
-  } as unknown as Logger;
-}
+import { ExLogger, initLogger } from '../../src/shared/util/Logger';
+
+// 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 – Cloud-based child discovery', () => {
-  let log: Logger;
   let manager: LocalDeviceManager;
 
   const GATEWAY_ID = 'cloud_gw_001';
@@ -22,7 +21,7 @@ describe('LocalDeviceManager – Cloud-based child discovery', () => {
   const DEVICE_IP = '192.168.1.200';
 
   beforeEach(() => {
-    log = makeMockLog();
+    initLogger(mockLog);
   });
 
   afterEach(() => {
@@ -46,7 +45,7 @@ describe('LocalDeviceManager – Cloud-based child discovery', () => {
       ],
     };
 
-    manager = new LocalDeviceManager(config, log);
+    manager = new LocalDeviceManager(config);
 
     const cloudDevices = [
       { id: GATEWAY_ID },
@@ -65,7 +64,7 @@ describe('LocalDeviceManager – Cloud-based child discovery', () => {
       devices: [],
     };
 
-    manager = new LocalDeviceManager(config, log);
+    manager = new LocalDeviceManager(config);
 
     const cloudDevices = [
       { id: 'unknown_gw', gateway_id: undefined },
@@ -74,7 +73,7 @@ describe('LocalDeviceManager – Cloud-based child discovery', () => {
 
     manager.discoverChildrenFromCloud(cloudDevices);
 
-    const debugSpy = log.debug as jest.MockedFunction<typeof log.debug>;
+    const debugSpy = jest.spyOn(mockLog, 'debug');
     expect(debugSpy.mock.calls.length).toBeGreaterThan(0);
   });
 
@@ -91,7 +90,7 @@ describe('LocalDeviceManager – Cloud-based child discovery', () => {
       ],
     };
 
-    manager = new LocalDeviceManager(config, log);
+    manager = new LocalDeviceManager(config);
 
     // Should not throw
     expect(() => {
@@ -115,7 +114,7 @@ describe('LocalDeviceManager – Cloud-based child discovery', () => {
       ],
     };
 
-    manager = new LocalDeviceManager(config, log);
+    manager = new LocalDeviceManager(config);
 
     const cloudDevices = [
       { id: GATEWAY_ID },
@@ -125,7 +124,7 @@ describe('LocalDeviceManager – Cloud-based child discovery', () => {
     manager.discoverChildrenFromCloud(cloudDevices);
 
     // Should not log auto-discovery (device is not a gateway)
-    const infoSpy = log.info as jest.MockedFunction<typeof log.info>;
+    const infoSpy = jest.spyOn(mockLog, 'info');
     const callsWithAutoDiscovery = infoSpy.mock.calls.filter(c =>
       String(c[0]).includes('auto-discovery'),
     );
@@ -146,7 +145,7 @@ describe('LocalDeviceManager – Cloud-based child discovery', () => {
       ],
     };
 
-    manager = new LocalDeviceManager(config, log);
+    manager = new LocalDeviceManager(config);
 
     const cloudDevices = [
       { id: GATEWAY_ID },

package/test/zigbee/LocalDeviceManager.zigbee.reconnect.test.ts

@@ -1,21 +1,19 @@
 import { describe, expect, it, beforeEach, afterEach, jest } from '@jest/globals';
 import LocalDeviceManager from '../../src/local/LocalDeviceManager';
-import { LocalConfig, LocalDeviceConfig } from '../../src/local/config';
-import TuyaDeviceManager from '../../src/cloud/device/TuyaDeviceManager';
-import Logger from '../../src/shared/util/Logger';
-
-function makeMockLog(): Logger {
-  return {
-    debug: jest.fn(),
-    info: jest.fn(),
-    warn: jest.fn(),
-    error: jest.fn(),
-    log: jest.fn(),
-  } as unknown as Logger;
-}
+import { LocalConfig } from '../../src/local/config';
+import { ExLogger, initLogger } from '../../src/shared/util/Logger';
+
+// 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 – Zigbee gateway reconnection', () => {
-  let log: Logger;
   let manager: LocalDeviceManager;
 
   const GATEWAY_ID = 'gw_reconnect_001';
@@ -50,8 +48,8 @@ describe('LocalDeviceManager – Zigbee gateway reconnection', () => {
   }
 
   beforeEach(() => {
-    log = makeMockLog();
-    manager = new LocalDeviceManager(zigbeeReconnectConfig(), log);
+    initLogger(mockLog);
+    manager = new LocalDeviceManager(zigbeeReconnectConfig());
   });
 
   afterEach(() => {
@@ -81,6 +79,7 @@ describe('LocalDeviceManager – Zigbee gateway reconnection', () => {
           ip: DEVICE_IP,
           tuyaKey: DEVICE_KEY,
           dpMapping: { 'switch_1': 1, 'bright_value': 2 },
+          isZigbeeGateway: true
         },
         {
           tuyaDeviceId: CHILD_ID,
@@ -94,7 +93,7 @@ describe('LocalDeviceManager – Zigbee gateway reconnection', () => {
       ],
     };
 
-    const mgr = new LocalDeviceManager(configWithOverride, log);
+    const mgr = new LocalDeviceManager(configWithOverride);
     // Should initialize without error even with per-child DP overrides
     await mgr.initLocalDevices();
 
@@ -131,7 +130,7 @@ describe('LocalDeviceManager – Zigbee gateway reconnection', () => {
       ],
     };
 
-    const mgr = new LocalDeviceManager(configWithCategoryOverride, log);
+    const mgr = new LocalDeviceManager(configWithCategoryOverride);
     await mgr.initLocalDevices();
 
     const gwDevice = mgr.getDevice(GATEWAY_ID);
@@ -173,10 +172,10 @@ describe('LocalDeviceManager – Zigbee gateway reconnection', () => {
       ],
     };
 
-    const mgr = new LocalDeviceManager(multiChildConfig, log);
+    const mgr = new LocalDeviceManager(multiChildConfig);
+    const infoSpy = jest.spyOn(mockLog, 'info');
     await mgr.initLocalDevices();
 
-    const infoSpy = log.info as jest.MockedFunction<typeof log.info>;
     const infoCalls = infoSpy.mock.calls.map(c => String(c[0]));
     const gatewayLine = infoCalls.find(s => s.includes('Zigbee gateway detected'));
 

package/test/zigbee/LocalDeviceManager.zigbee.test.ts

@@ -1,20 +1,19 @@
 import { describe, expect, it, beforeEach, afterEach, jest } from '@jest/globals';
 import LocalDeviceManager from '../../src/local/LocalDeviceManager';
 import { LocalConfig } from '../../src/local/config';
-import TuyaDeviceManager from '../../src/cloud/device/TuyaDeviceManager';
-import Logger from '../../src/shared/util/Logger';
+import TuyaDevice from '../../src/cloud/device/TuyaDevice';
+import TuyaCloudDeviceManager from '../../src/cloud/device/TuyaCloudDeviceManager';
+import Logger, { ExLogger, initLogger } from '../../src/shared/util/Logger';
 
 // ── Logger mock ───────────────────────────────────────────────────────────────
-
-function makeMockLog(): Logger {
-  return {
-    debug: jest.fn(),
-    info: jest.fn(),
-    warn: jest.fn(),
-    error: jest.fn(),
-    log: jest.fn(),
-  } as unknown as 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;
 
 // ── Minimal config helpers ──────────────────────────────────────────────────
 
@@ -82,11 +81,10 @@ function standaloneConfig(): LocalConfig {
 // ── Tests ──────────────────────────────────────────────────────────────────────
 
 describe('LocalDeviceManager – Zigbee integration', () => {
-  let log: Logger;
   let manager: LocalDeviceManager;
 
   beforeEach(() => {
-    log = makeMockLog();
+    initLogger(mockLog);
   });
 
   afterEach(() => {
@@ -98,7 +96,7 @@ describe('LocalDeviceManager – Zigbee integration', () => {
 
   describe('initLocalDevices() – child device handling', () => {
     it('does not register child devices as TuyaDevices during first init pass', async () => {
-      manager = new LocalDeviceManager(zigbeeConfig(), log);
+      manager = new LocalDeviceManager(zigbeeConfig());
       await manager.initLocalDevices();
 
       // Only the gateway should be in the device list initially
@@ -110,17 +108,17 @@ describe('LocalDeviceManager – Zigbee integration', () => {
     });
 
     it('registers standalone devices normally', async () => {
-      manager = new LocalDeviceManager(standaloneConfig(), log);
+      manager = new LocalDeviceManager(standaloneConfig());
       await manager.initLocalDevices();
 
       expect(manager.devices.map(d => d.id)).toContain('standalone_001');
     });
 
     it('logs gateway relationships when detected', async () => {
-      manager = new LocalDeviceManager(zigbeeConfig(), log);
+      manager = new LocalDeviceManager(zigbeeConfig());
+      const infoSpy = jest.spyOn(mockLog, 'info');
       await manager.initLocalDevices();
 
-      const infoSpy = log.info as jest.MockedFunction<typeof log.info>;
       const infoCalls = infoSpy.mock.calls.map(c => String(c[0]));
       const gatewayLine = infoCalls.find(s => s.includes('Zigbee gateway'));
       expect(gatewayLine).toBeDefined();
@@ -128,7 +126,7 @@ describe('LocalDeviceManager – Zigbee integration', () => {
     });
 
     it('proceeds without fatal errors when no Zigbee devices in config', async () => {
-      manager = new LocalDeviceManager(standaloneConfig(), log);
+      manager = new LocalDeviceManager(standaloneConfig());
       await expect(manager.initLocalDevices()).resolves.not.toThrow();
     });
   });
@@ -160,30 +158,70 @@ describe('LocalDeviceManager – Zigbee integration', () => {
         ],
       };
 
-      manager = new LocalDeviceManager(badConfig, log);
+      manager = new LocalDeviceManager(badConfig);
+      const errorSpy = jest.spyOn(mockLog, 'error');
       await expect(manager.initLocalDevices()).resolves.not.toThrow();
 
-      const errorSpy = log.error as jest.MockedFunction<typeof log.error>;
       const errorCalls = errorSpy.mock.calls.map(c => String(c[0]));
       const zigbeeErrorLine = errorCalls.find(s => s.includes('Zigbee'));
       expect(zigbeeErrorLine).toBeDefined();
     });
   });
 
+  // ── _syncConnectionInfo: shared local connection metadata ───────────────
+
+  describe('_syncConnectionInfo()', () => {
+    it('copies connection metadata from the sub-device to the parent when the parent is missing it', () => {
+      manager = new LocalDeviceManager(standaloneConfig());
+      const parent = new TuyaDevice({ id: 'parent', name: 'Parent' });
+      const sub = new TuyaDevice({ id: 'sub', name: 'Sub' });
+
+      (sub as TuyaDevice & { localIp?: string }).localIp = '192.168.1.11';
+      (sub as TuyaDevice & { localKey?: string }).localKey = 'sub-key';
+      (sub as TuyaDevice & { localVersion?: string }).localVersion = '3.4';
+
+      (manager as any)._syncConnectionInfo(parent, sub);
+
+      expect((parent as TuyaDevice & { localIp?: string }).localIp).toBe('192.168.1.11');
+      expect((parent as TuyaDevice & { localKey?: string }).localKey).toBe('sub-key');
+      expect((parent as TuyaDevice & { localVersion?: string }).localVersion).toBe('3.4');
+      expect((sub as TuyaDevice & { localIp?: string }).localIp).toBe('192.168.1.11');
+    });
+
+    it('prefers sub-device values over parent values when both are already populated', () => {
+      manager = new LocalDeviceManager(standaloneConfig());
+      const parent = new TuyaDevice({ id: 'parent', name: 'Parent' });
+      const sub = new TuyaDevice({ id: 'sub', name: 'Sub' });
+
+      (parent as TuyaDevice & { localIp?: string }).localIp = '192.168.1.10';
+      (parent as TuyaDevice & { localKey?: string }).localKey = 'parent-key';
+      (parent as TuyaDevice & { localVersion?: string }).localVersion = '3.3';
+      (sub as TuyaDevice & { localIp?: string }).localIp = '192.168.1.12';
+      (sub as TuyaDevice & { localKey?: string }).localKey = 'sub-key';
+      (sub as TuyaDevice & { localVersion?: string }).localVersion = '3.5';
+
+      (manager as any)._syncConnectionInfo(parent, sub);
+
+      expect((parent as TuyaDevice & { localIp?: string }).localIp).toBe('192.168.1.12');
+      expect((parent as TuyaDevice & { localKey?: string }).localKey).toBe('sub-key');
+      expect((parent as TuyaDevice & { localVersion?: string }).localVersion).toBe('3.5');
+    });
+  });
+
   // ── sendCommands: Zigbee child routing ─────────────────────────────────────
 
   describe('sendCommands() – Zigbee child routing', () => {
     it('returns without acting when device has no dpMapping (unknown device)', async () => {
-      manager = new LocalDeviceManager(zigbeeConfig(), log);
+      manager = new LocalDeviceManager(zigbeeConfig());
       await manager.initLocalDevices();
 
       // CHILD_ID_A is not yet registered in the first pass
       const result = await manager.sendCommands('nonexistent_device', [{ code: 'switch_1', value: true }]);
-      expect(result).toBeUndefined();
+      expect(result).toBe(false);
     });
 
     it('handles sendCommands for a known device that has a dpMapping', async () => {
-      manager = new LocalDeviceManager(standaloneConfig(), log);
+      manager = new LocalDeviceManager(standaloneConfig());
       await manager.initLocalDevices();
 
       // 'standalone_001' is in the device list but has no IP connection (autoDiscover=false, no connect called)
@@ -198,14 +236,14 @@ describe('LocalDeviceManager – Zigbee integration', () => {
 
   describe('stopLocalDevices()', () => {
     it('does not throw when called with Zigbee gateway config and no active connections', async () => {
-      manager = new LocalDeviceManager(zigbeeConfig(), log);
+      manager = new LocalDeviceManager(zigbeeConfig());
       await manager.initLocalDevices();
 
       expect(() => manager.stopLocalDevices()).not.toThrow();
     });
 
     it('can be called multiple times without error', async () => {
-      manager = new LocalDeviceManager(zigbeeConfig(), log);
+      manager = new LocalDeviceManager(zigbeeConfig());
       await manager.initLocalDevices();
 
       expect(() => {
@@ -220,11 +258,11 @@ describe('LocalDeviceManager – Zigbee integration', () => {
   describe('_setupZigbeeChildren() – via gateway connect event', () => {
     it('emits DEVICE_ADD for child when gateway connects', async () => {
       const EventEmitter = (await import('events')).default;
-      manager = new LocalDeviceManager(zigbeeConfig(), log);
+      manager = new LocalDeviceManager(zigbeeConfig());
       await manager.initLocalDevices();
 
       const deviceAddEvents: string[] = [];
-      manager.on(TuyaDeviceManager.Events.DEVICE_ADD, (device: any) => {
+      manager.on(TuyaCloudDeviceManager.Events.DEVICE_ADD, (device: any) => {
         deviceAddEvents.push(device.id);
       });
 
@@ -249,7 +287,7 @@ describe('LocalDeviceManager – Zigbee integration', () => {
     });
 
     it('correctly maps child deviceId <-> cid in the relationship', async () => {
-      manager = new LocalDeviceManager(zigbeeConfig(), log);
+      manager = new LocalDeviceManager(zigbeeConfig());
       await manager.initLocalDevices();
 
       const gatewayRelationships = (manager as any).gatewayRelationships as Map<string, any>;
@@ -271,7 +309,7 @@ describe('LocalDeviceManager – Zigbee integration', () => {
 
   describe('getDevice()', () => {
     it('returns the gateway TuyaDevice by ID', async () => {
-      manager = new LocalDeviceManager(zigbeeConfig(), log);
+      manager = new LocalDeviceManager(zigbeeConfig());
       await manager.initLocalDevices();
 
       const gw = manager.getDevice(GATEWAY_ID);
@@ -281,7 +319,7 @@ describe('LocalDeviceManager – Zigbee integration', () => {
     });
 
     it('returns undefined for a child device before parent connects', async () => {
-      manager = new LocalDeviceManager(zigbeeConfig(), log);
+      manager = new LocalDeviceManager(zigbeeConfig());
       await manager.initLocalDevices();
 
       // Children not yet registered (lazy registration happens on parent connect)
@@ -290,7 +328,7 @@ describe('LocalDeviceManager – Zigbee integration', () => {
     });
 
     it('returns undefined for a completely unknown device', async () => {
-      manager = new LocalDeviceManager(zigbeeConfig(), log);
+      manager = new LocalDeviceManager(zigbeeConfig());
       await manager.initLocalDevices();
 
       expect(manager.getDevice('no_such_device')).toBeUndefined();
@@ -315,7 +353,7 @@ describe('LocalDeviceManager – Zigbee integration', () => {
         ],
       };
 
-      manager = new LocalDeviceManager(mixedConfig, log);
+      manager = new LocalDeviceManager(mixedConfig);
       await manager.initLocalDevices();
 
       const ids = manager.devices.map(d => d.id);
@@ -326,7 +364,7 @@ describe('LocalDeviceManager – Zigbee integration', () => {
     });
 
     it('detects the correct number of gateway relationships', async () => {
-      manager = new LocalDeviceManager(zigbeeConfig(), log);
+      manager = new LocalDeviceManager(zigbeeConfig());
       await manager.initLocalDevices();
 
       const gatewayRelationships = (manager as any).gatewayRelationships as Map<string, any>;
@@ -334,7 +372,7 @@ describe('LocalDeviceManager – Zigbee integration', () => {
     });
 
     it('has no gateway relationships for purely standalone config', async () => {
-      manager = new LocalDeviceManager(standaloneConfig(), log);
+      manager = new LocalDeviceManager(standaloneConfig());
       await manager.initLocalDevices();
 
       const gatewayRelationships = (manager as any).gatewayRelationships as Map<string, any>;

package/test/zigbee/ZigbeeGatewayDetection.test.ts

@@ -112,13 +112,13 @@ describe('ZigbeeGatewayDetection', () => {
         device('child_1', { parentDeviceId: 'gw_1' }),
       ];
       expect(() => ZigbeeGatewayDetection.detectFromDevices(devices))
-        .toThrow('parentDeviceId but is missing zigbeeChildId');
+        .toThrow('Device "child_1" has parentDeviceId:gw_1 but is missing zigbeeChildId. Both fields are required for Zigbee sub-devices.');
     });
 
     it('throws when zigbeeChildId is set without parentDeviceId', () => {
       const devices = [device('child_1', { zigbeeChildId: '0011223344556601' })];
       expect(() => ZigbeeGatewayDetection.detectFromDevices(devices))
-        .toThrow('zigbeeChildId but is missing parentDeviceId');
+        .toThrow('Device "child_1" has zigbeeChildId:0011223344556601 but is missing parentDeviceId. Both fields are required for Zigbee sub-devices.');
     });
 
     it('throws for an invalid CID (too short)', () => {