homebridge-gree-ac 2.2.2 → 2.3.0-beta.2

package/dist/platformAccessory.d.ts

@@ -1,3 +1,4 @@
+import dgram from 'dgram';
 import type { CharacteristicValue } from 'homebridge';
 import type { GreeACPlatform, MyPlatformAccessory } from './platform.js';
 import { DeviceConfig } from './settings.js';
@@ -9,24 +10,23 @@ import type { CommandValueMap, Commands } from './commands.js';
  */
 export declare class GreeAirConditioner {
     private readonly platform;
-    private readonly accessory;
-    private readonly deviceConfig;
+    readonly accessory: MyPlatformAccessory;
+    readonly deviceConfig: DeviceConfig;
     private readonly tsAccessoryMac;
+    private readonly socket;
     private HeaterCooler?;
     private TemperatureSensor?;
     private Fan?;
-    private socket;
-    private key?;
+    key?: string;
     private cols?;
     private status;
     private tsAccessory;
     private powerPending;
     private modePending;
     private silentTimeRanges?;
-    constructor(platform: GreeACPlatform, accessory: MyPlatformAccessory, deviceConfig: DeviceConfig, tsAccessoryMac: string);
+    constructor(platform: GreeACPlatform, accessory: MyPlatformAccessory, deviceConfig: DeviceConfig, tsAccessoryMac: string, socket: dgram.Socket);
     initCharacteristics(): void;
     initAccessory(): void;
-    checkBindingStatus(bindNo: number): void;
     /**
      * Handle "SET" requests from HomeKit
      * These are sent when the user changes the state of an accessory, for example, turning on a Light bulb.
@@ -102,7 +102,6 @@ export declare class GreeAirConditioner {
         size: number;
     }) => void;
     sendMessage(message: unknown): void;
-    sendBindRequest(): void;
     sendCommand(cmd: Record<string, unknown>): void;
     requestDeviceStatus(): void;
 }

package/dist/platformAccessory.js

@@ -1,5 +1,4 @@
-import dgram from 'dgram';
-import { PLATFORM_NAME, PLUGIN_NAME, TEMPERATURE_TABLE, MODIFY_VERTICAL_SWING_POSITION, TS_TYPE, BINDING_TIMEOUT, TEMPERATURE_LIMITS, DEFAULT_DEVICE_CONFIG } from './settings.js';
+import { PLATFORM_NAME, PLUGIN_NAME, TEMPERATURE_TABLE, MODIFY_VERTICAL_SWING_POSITION, TS_TYPE, TEMPERATURE_LIMITS, DEFAULT_DEVICE_CONFIG } from './settings.js';
 import { GreeAirConditionerTS } from './tsAccessory.js';
 import crypto from './crypto.js';
 import commands from './commands.js';
@@ -13,10 +12,10 @@ export class GreeAirConditioner {
     accessory;
     deviceConfig;
     tsAccessoryMac;
+    socket;
     HeaterCooler;
     TemperatureSensor;
     Fan;
-    socket;
     key;
     cols;
     status;
@@ -24,14 +23,16 @@ export class GreeAirConditioner {
     powerPending = -1;
     modePending = -1;
     silentTimeRanges;
-    constructor(platform, accessory, deviceConfig, tsAccessoryMac) {
+    constructor(platform, accessory, deviceConfig, tsAccessoryMac, socket) {
         this.platform = platform;
         this.accessory = accessory;
         this.deviceConfig = deviceConfig;
         this.tsAccessoryMac = tsAccessoryMac;
+        this.socket = socket;
         // platform, accessory and service initialization is implemented in a separate funcion (initAccessory), because
         // it should be made only on successful binding with network device
         this.platform.log.debug(`[${this.getDeviceLabel()}] deviceConfig -> %j`, deviceConfig);
+        this.status = {};
         // calculate silent time ranges
         if (deviceConfig.silentTimeRange) {
             const time1 = +(deviceConfig.silentTimeRange.substring(0, 5).replace(':', ''));
@@ -48,27 +49,6 @@ export class GreeAirConditioner {
         else {
             this.platform.log.debug(`[${this.getDeviceLabel()}] silentTimeRanges: No silentTimeRange is defined`);
         }
-        // initialize communication with device
-        this.status = {};
-        this.socket = dgram.createSocket({ type: 'udp4', reuseAddr: true });
-        this.socket.on('error', (err) => {
-            this.platform.log.error(`[${this.getDeviceLabel()}] Network - Error:`, err.message);
-        });
-        this.socket.on('message', this.handleMessage);
-        this.socket.on('close', () => {
-            this.platform.log.error(`[${this.getDeviceLabel()}] Network - Connection closed`);
-        });
-        if (this.platform.ports.indexOf(this.deviceConfig.port || 0) >= 0) {
-            this.platform.log.warn(`[${this.getDeviceLabel()}] Warning: Configured port (%i) is already used - replacing with auto assigned port`, this.deviceConfig.port);
-            this.deviceConfig.port = undefined;
-        }
-        this.socket.bind(this.deviceConfig.port, undefined, () => {
-            this.platform.log.info(`[${this.getDeviceLabel()}] Device handler is listening on UDP port %d`, this.socket.address().port);
-            this.platform.ports.push(this.socket.address().port);
-            this.socket.setBroadcast(false);
-            this.sendBindRequest();
-            setTimeout(this.checkBindingStatus.bind(this, 1), BINDING_TIMEOUT);
-        });
     }
     initCharacteristics() {
         // these characteristic properties are not updated by HomeKit, they are initialized only once
@@ -261,29 +241,6 @@ export class GreeAirConditioner {
         this.HeaterCooler.getCharacteristic(this.platform.Characteristic.Name)
             .onGet(this.getName.bind(this));
     }
-    // this function is a callback to check the status of binding after timeout period has ellapsed
-    checkBindingStatus(bindNo) {
-        if (!this.accessory.bound) {
-            this.platform.log.debug(`[${this.getDeviceLabel()}] Device binding timeout`);
-            switch (bindNo) {
-                case 1: {
-                    // 1. timeout -> repeat bind request with alternate encryption version
-                    if (this.accessory.context.device.encryptionVersion === 1) {
-                        this.accessory.context.device.encryptionVersion = 2;
-                    }
-                    else {
-                        this.accessory.context.device.encryptionVersion = 1;
-                    }
-                    this.sendBindRequest();
-                    setTimeout(this.checkBindingStatus.bind(this, bindNo + 1), BINDING_TIMEOUT);
-                    break;
-                }
-                default: {
-                    this.platform.log.error(`[${this.getDeviceLabel()}] Error: Device is not bound`, '(unknown device type or device is malfunctioning [turning the power supply off and on may help])', '- Restart homebridge when issue has fixed!');
-                }
-            }
-        }
-    }
     /**
      * Handle "SET" requests from HomeKit
      * These are sent when the user changes the state of an accessory, for example, turning on a Light bulb.
@@ -1583,19 +1540,7 @@ export class GreeAirConditioner {
             this.platform.log.debug(`[${this.getDeviceLabel()}] handleMessage - Package -> %j`, pack);
             switch (pack.t.toLowerCase()) {
                 case 'bindok': // package type is binding confirmation
-                    if (!this.accessory.bound) {
-                        this.platform.log.debug(`[${this.getDeviceLabel()}] Device binding in progress`);
-                        this.key = pack.key;
-                        this.initAccessory();
-                        this.accessory.bound = true;
-                        this.platform.log.success(`[${this.getDeviceLabel()}] Device is bound -> ${pack.mac} (`, (this.accessory.context.device.uid ?? 0).toString(), ')');
-                        this.platform.log.debug(`[${this.getDeviceLabel()}] Device key -> ${this.key}`);
-                        this.requestDeviceStatus();
-                        setInterval(this.requestDeviceStatus.bind(this), this.deviceConfig.statusUpdateInterval * 1000); // statusUpdateInterval in seconds
-                    }
-                    else {
-                        this.platform.log.debug(`[${this.getDeviceLabel()}] Binding response received from already bound device`);
-                    }
+                    this.platform.log.warn(`[${this.getDeviceLabel()}] Warning: Binding response received from already bound device`);
                     break;
                 case 'dat': // package type is device status
                     if (this.accessory.bound) {
@@ -1697,15 +1642,15 @@ export class GreeAirConditioner {
             return;
         }
         const payload = (tag === '') ? {
-            tcid: this.accessory.context.device.mac.substring(this.accessory.context.device.mac.indexOf('@') + 1),
-            uid: this.accessory.context.device.uid ?? 0,
+            tcid: this.accessory.context.device.mac,
+            uid: 0,
             t: 'pack',
             pack,
             i: this.key === undefined ? 1 : 0,
             cid: 'app',
         } : {
-            tcid: this.accessory.context.device.mac.substring(this.accessory.context.device.mac.indexOf('@') + 1),
-            uid: this.accessory.context.device.uid ?? 0,
+            tcid: this.accessory.context.device.mac,
+            uid: 0,
             t: 'pack',
             pack,
             i: this.key === undefined ? 1 : 0,
@@ -1721,16 +1666,6 @@ export class GreeAirConditioner {
             this.platform.log.error(`[${this.getDeviceLabel()}] sendMessage - Error:`, err.message);
         }
     }
-    sendBindRequest() {
-        const message = {
-            mac: this.accessory.context.device.mac.substring(this.accessory.context.device.mac.indexOf('@') + 1),
-            t: 'bind',
-            uid: this.accessory.context.device.mac.indexOf('@') < 0 ? 0 :
-                this.accessory.context.device.mac.substring(0, this.accessory.context.device.mac.indexOf('@')),
-        };
-        this.platform.log.debug(`[${this.getDeviceLabel()}] Bind to device -> ${this.accessory.context.device.mac}`);
-        this.sendMessage(message);
-    }
     sendCommand(cmd) {
         if (this.isSilentTime()) {
             // add buzzer off command if current time is in silent time range