homebridge-midea-platform 0.2.1 → 0.3.0

package/dist/accessory/DehumidifierAccessory.js

@@ -0,0 +1,294 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const BaseAccessory_1 = __importDefault(require("./BaseAccessory"));
+const settings_1 = require("../settings");
+class DehumidifierAccessory extends BaseAccessory_1.default {
+    /*********************************************************************
+     * Constructor registers all the service types with Homebridge, registers
+     * a callback function with the MideaDevice class, and requests device status.
+     */
+    constructor(platform, accessory, device, configDev) {
+        super(platform, accessory, device, configDev);
+        this.device = device;
+        this.configDev = configDev;
+        this.service =
+            this.accessory.getService(this.platform.Service.HumidifierDehumidifier) ||
+                this.accessory.addService(this.platform.Service.HumidifierDehumidifier);
+        this.service.setCharacteristic(this.platform.Characteristic.Name, this.device.name);
+        this.accessories = this.platform.accessories.filter((acc) => acc.context.id === this.accessory.UUID && acc !== this.accessory);
+        this.service
+            .getCharacteristic(this.platform.Characteristic.Active)
+            .onGet(this.getActive.bind(this))
+            .onSet(this.setActive.bind(this));
+        this.service
+            .getCharacteristic(this.platform.Characteristic.CurrentHumidifierDehumidifierState)
+            .onGet(this.getCurrentHumidifierDehumidifierState.bind(this));
+        this.service
+            .getCharacteristic(this.platform.Characteristic.TargetHumidifierDehumidifierState)
+            .onGet(this.getTargetHumidifierDehumidifierState.bind(this))
+            .onSet(this.setTargetHumidifierDehumidifierState.bind(this))
+            .setProps({
+            validValues: [
+                this.platform.Characteristic.TargetHumidifierDehumidifierState
+                    .HUMIDIFIER_OR_DEHUMIDIFIER,
+                this.platform.Characteristic.TargetHumidifierDehumidifierState
+                    .HUMIDIFIER,
+                this.platform.Characteristic.TargetHumidifierDehumidifierState
+                    .DEHUMIDIFIER,
+            ],
+        });
+        this.service
+            .getCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity)
+            .onGet(this.getCurrentRelativeHumidity.bind(this))
+            .setProps({
+            minValue: 0,
+            maxValue: 100,
+            minStep: 1,
+        });
+        this.service
+            .getCharacteristic(this.platform.Characteristic.RelativeHumidityDehumidifierThreshold)
+            .onGet(this.getRelativeHumidityDehumidifierThreshold.bind(this))
+            .onSet(this.setRelativeHumidityDehumidifierThreshold.bind(this))
+            .setProps({
+            minValue: 0,
+            maxValue: 100,
+            minStep: 5,
+        });
+        this.service
+            .getCharacteristic(this.platform.Characteristic.RotationSpeed)
+            .onGet(this.getRotationSpeed.bind(this))
+            .onSet(this.setRotationSpeed.bind(this));
+        this.service
+            .getCharacteristic(this.platform.Characteristic.SwingMode)
+            .onGet(this.getSwingMode.bind(this))
+            .onSet(this.setSwingMode.bind(this));
+        this.service
+            .getCharacteristic(this.platform.Characteristic.LockPhysicalControls)
+            .onGet(this.getChildLockMode.bind(this))
+            .onSet(this.setChildLockMode.bind(this));
+        this.service
+            .getCharacteristic(this.platform.Characteristic.WaterLevel)
+            .onGet(this.getWaterLevel.bind(this));
+        // Register a callback function with MideaDevice and then refresh device status.  The callback
+        // is called whenever there is a change in any attribute value from the device.
+        this.device.on('update', this.updateCharacteristics.bind(this));
+        this.device.refresh_status();
+        // Remove unused accessories
+        this.platform.api.unregisterPlatformAccessories(settings_1.PLUGIN_NAME, settings_1.PLATFORM_NAME, this.accessories);
+    }
+    /*********************************************************************
+     * Callback function called by MideaDevice whenever there is a change to
+     * any attribute value.
+     */
+    async updateCharacteristics(attributes) {
+        for (const [k, v] of Object.entries(attributes)) {
+            this.platform.log.debug(`[${this.device.name}] Set attribute ${k} to: ${v}`);
+            let updateState = false;
+            switch (k.toLowerCase()) {
+                case 'power':
+                    this.service.updateCharacteristic(this.platform.Characteristic.Active, v
+                        ? this.platform.Characteristic.Active.ACTIVE
+                        : this.platform.Characteristic.Active.INACTIVE);
+                    updateState = true;
+                    break;
+                case 'target_humidity':
+                    this.service.updateCharacteristic(this.platform.Characteristic.RelativeHumidityDehumidifierThreshold, v);
+                    updateState = true;
+                    break;
+                case 'fan_speed':
+                    this.service.updateCharacteristic(this.platform.Characteristic.RotationSpeed, v);
+                    break;
+                case 'current_humidity':
+                    this.service.updateCharacteristic(this.platform.Characteristic.CurrentRelativeHumidity, v);
+                    updateState = true;
+                    break;
+                case 'mode':
+                    updateState = true;
+                    break;
+                case 'swing':
+                    this.service.updateCharacteristic(this.platform.Characteristic.SwingMode, v
+                        ? this.platform.Characteristic.SwingMode.SWING_ENABLED
+                        : this.platform.Characteristic.SwingMode.SWING_DISABLED);
+                    break;
+                case 'current_temperature':
+                    // Not currently supported
+                    break;
+                case 'tank_level':
+                    this.service.updateCharacteristic(this.platform.Characteristic.WaterLevel, v);
+                    break;
+                case 'tank_full':
+                    // No HomeKit characteristic
+                    break;
+                case 'water_level_set':
+                    // No HomeKit characteristic
+                    break;
+                case 'child_lock':
+                    this.service.updateCharacteristic(this.platform.Characteristic.LockPhysicalControls, v
+                        ? this.platform.Characteristic.LockPhysicalControls
+                            .CONTROL_LOCK_ENABLED
+                        : this.platform.Characteristic.LockPhysicalControls
+                            .CONTROL_LOCK_DISABLED);
+                    break;
+                default:
+                    this.platform.log.warn(`[${this.device.name}] Attempt to set unsupported attribute ${k} to ${v}`);
+            }
+            if (updateState) {
+                this.service.updateCharacteristic(this.platform.Characteristic.TargetHumidifierDehumidifierState, this.platform.Characteristic.TargetHumidifierDehumidifierState
+                    .DEHUMIDIFIER);
+                this.service.updateCharacteristic(this.platform.Characteristic.CurrentHumidifierDehumidifierState, this.currentHumidifierDehumidifierState());
+            }
+        }
+    }
+    /*********************************************************************
+     * Callback functions for each Homebridge/HomeKit service
+     *
+     */
+    async getActive() {
+        this.platform.log.debug(`[${this.device.name}] GET Active, value: ${this.device.attributes.POWER}`);
+        return this.device.attributes.POWER
+            ? this.platform.Characteristic.Active.ACTIVE
+            : this.platform.Characteristic.Active.INACTIVE;
+    }
+    async setActive(value) {
+        this.platform.log.debug(`[${this.device.name}] SET Active to: ${value}`);
+        await this.device.set_attribute({ POWER: !!value });
+    }
+    // Handle requests to get the current value of the "HumidifierDehumidifierState" characteristic
+    async getCurrentHumidifierDehumidifierState() {
+        this.platform.log.debug(`[${this.device.name}] GET CurrentHumidifierDehumidifierState, value: ${this.device.attributes.POWER},${this.device.attributes.MODE}`);
+        return this.currentHumidifierDehumidifierState();
+    }
+    currentHumidifierDehumidifierState() {
+        if (!this.device.attributes.POWER) {
+            // Powered off, must be inactive
+            return this.platform.Characteristic.CurrentHumidifierDehumidifierState
+                .INACTIVE;
+        }
+        else {
+            // Powered on, check mode
+            if (this.device.attributes.MODE >= 2) {
+                // Dehumidifying
+                return this.platform.Characteristic.CurrentHumidifierDehumidifierState
+                    .DEHUMIDIFYING;
+            }
+            else if (this.device.attributes.MODE === 1) {
+                // Whether deumidifying depends on whether we have reached target.  This is not
+                // always accurate, but is best we can do to signal whether actively dehumidifing or not.
+                if (this.device.attributes.CURRENT_HUMIDITY <
+                    this.device.attributes.TARGET_HUMIDITY) {
+                    return this.platform.Characteristic.CurrentHumidifierDehumidifierState
+                        .IDLE;
+                }
+                else {
+                    return this.platform.Characteristic.CurrentHumidifierDehumidifierState
+                        .DEHUMIDIFYING;
+                }
+            }
+            return this.platform.Characteristic.CurrentHumidifierDehumidifierState
+                .IDLE;
+        }
+    }
+    // Handle requests to get the target value of the "HumidifierDehumidifierState" characteristic
+    async getTargetHumidifierDehumidifierState() {
+        this.platform.log.debug(`[${this.device.name}] GET TargetHumidifierDehumidifierState, value: 
+      ${this.platform.Characteristic.TargetHumidifierDehumidifierState.DEHUMIDIFIER}`);
+        // Always return that we are a dehumidifier, other states not supported.
+        return this.platform.Characteristic.TargetHumidifierDehumidifierState
+            .DEHUMIDIFIER;
+    }
+    // Handle requests to set the target value of the "HumidifierDehumidifierState" characteristic
+    async setTargetHumidifierDehumidifierState(value) {
+        this.platform.log.debug(`[${this.device.name}] SET TargetHumidifierDehumidifierState to: ${value}`);
+        if (value !==
+            this.platform.Characteristic.TargetHumidifierDehumidifierState
+                .DEHUMIDIFIER) {
+            throw new Error(`Device ${this.device.name} (${this.device.id}) can only be a DeHumidifier, illegal value: ${value}`);
+        }
+    }
+    // Handle requests to get the current value of the "RelativeHumidity" characteristic
+    async getCurrentRelativeHumidity() {
+        this.platform.log.debug(`[${this.device.name}] GET CurrentRelativeHumidity, value: ${this.device.attributes.CURRENT_HUMIDITY}`);
+        return this.device.attributes.CURRENT_HUMIDITY;
+    }
+    // Handle requests to get the Relative value of the "HumidityDehumidifierThreshold" characteristic
+    async getRelativeHumidityDehumidifierThreshold() {
+        this.platform.log.debug(`[${this.device.name}] GET RelativeHumidityDehumidifierThreshold, value: ${this.device.attributes.TARGET_HUMIDITY}`);
+        return this.device.attributes.TARGET_HUMIDITY;
+    }
+    // Handle requests to set the Relative value of the "HumidityDehumidifierThreshold" characteristic
+    async setRelativeHumidityDehumidifierThreshold(value) {
+        let RequestedHumidity = value;
+        // valid humidity has to be between min and max values
+        RequestedHumidity =
+            RequestedHumidity < this.device.MIN_HUMIDITY
+                ? this.device.MIN_HUMIDITY
+                : RequestedHumidity > this.device.MAX_HUMIDITY
+                    ? this.device.MAX_HUMIDITY
+                    : RequestedHumidity;
+        this.platform.log.debug(`[${this.device.name}] SET RelativeHumidityDehumidifierThreshold to: ${RequestedHumidity} (${value})`);
+        await this.device.set_attribute({ TARGET_HUMIDITY: RequestedHumidity });
+        // Update HomeKit in case we adjusted the value outside of min and max values
+        if (RequestedHumidity !== value) {
+            // We had to adjust the requested value to within permitted range...  Update homekit to actual value set.
+            // Calling updateCharacteristic within set handler seems to fail, new value is not accepted.  Workaround is
+            // to request the update after short delay (say 50ms) to allow homebridge/homekit to complete the set handler.
+            setTimeout(() => {
+                this.service.updateCharacteristic(this.platform.Characteristic.RelativeHumidityDehumidifierThreshold, RequestedHumidity);
+            }, 50);
+        }
+    }
+    // Handle requests to get the current value of the "RotationSpeed" characteristic
+    async getRotationSpeed() {
+        this.platform.log.debug(`[${this.device.name}] GET RotationSpeed, value: ${this.device.attributes.FAN_SPEED}`);
+        return this.device.attributes.FAN_SPEED;
+    }
+    // Handle requests to set the "RotationSpeed" characteristic
+    async setRotationSpeed(value) {
+        let speed = value;
+        speed = speed <= 40 ? 40 : speed > 40 && speed <= 60 ? 60 : 80;
+        this.platform.log.debug(`[${this.device.name}] SET RotationSpeed to: ${speed} (${value})`);
+        await this.device.set_attribute({ FAN_SPEED: speed });
+        if (speed !== value) {
+            // We had to adjust the requested value to within permitted range...  Update homekit to actual value set.
+            // Calling updateCharacteristic within set handler seems to fail, new value is not accepted.  Workaround is
+            // to request the update after short delay (say 50ms) to allow homebridge/homekit to complete the set handler.
+            setTimeout(() => {
+                this.service.updateCharacteristic(this.platform.Characteristic.RotationSpeed, speed);
+            }, 50);
+        }
+    }
+    // Handle requests to get the current value of the "WaterLevel" characteristic
+    async getWaterLevel() {
+        this.platform.log.debug(`[${this.device.name}] GET WaterLevel, value: ${this.device.attributes.TANK_LEVEL}`);
+        return this.device.attributes.TANK_LEVEL;
+    }
+    // Handle requests to get the current value of the "swingMode" characteristic
+    async getSwingMode() {
+        this.platform.log.debug(`[${this.device.name}] GET SwingMode, value: ${this.device.attributes.SWING}`);
+        return this.device.attributes.SWING
+            ? this.platform.Characteristic.SwingMode.SWING_ENABLED
+            : this.platform.Characteristic.SwingMode.SWING_DISABLED;
+    }
+    // Handle requests to set the "swingMode" characteristic
+    async setSwingMode(value) {
+        this.platform.log.debug(`[${this.device.name}] SET SwingMode to: ${value}`);
+        await this.device.set_attribute({ SWING: !!value });
+    }
+    // Handle requests to get the current value of the "LockPhysicalControls" characteristic
+    async getChildLockMode() {
+        this.platform.log.debug(`[${this.device.name}] GET LockPhysicalControls, value: ${this.device.attributes.SWING}`);
+        return this.device.attributes.CHILD_LOCK
+            ? this.platform.Characteristic.LockPhysicalControls.CONTROL_LOCK_ENABLED
+            : this.platform.Characteristic.LockPhysicalControls.CONTROL_LOCK_DISABLED;
+    }
+    // Handle requests to set the "LockPhysicalControls" characteristic
+    async setChildLockMode(value) {
+        this.platform.log.debug(`[${this.device.name}] SET LockPhysicalControls to: ${value}`);
+        await this.device.set_attribute({ CHILD_LOCK: !!value });
+    }
+}
+exports.default = DehumidifierAccessory;
+//# sourceMappingURL=DehumidifierAccessory.js.map

package/dist/accessory/DehumidifierAccessory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DehumidifierAccessory.js","sourceRoot":"","sources":["../../src/accessory/DehumidifierAccessory.ts"],"names":[],"mappings":"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"}

package/dist/core/MideaCloud.d.ts

@@ -1,4 +1,13 @@
 /// <reference types="node" />
+/***********************************************************************
+ * Midea Cloud access functions
+ *
+ * Copyright (c) 2023 Kovalovszky Patrik, https://github.com/kovapatrik
+ * Portions Copyright (c) 2023 David Kerr, https://github.com/dkerr64
+ *
+ * With thanks to https://github.com/georgezhao2010/midea_ac_lan
+ *
+ */
 import { Logger } from 'homebridge';
 import { CloudSecurity } from './MideaSecurity';
 import { Endianness } from './MideaConstants';
@@ -17,6 +26,8 @@ export declare abstract class CloudBase<T extends CloudSecurity> {
     protected abstract API_URL: string;
     protected access_token?: string;
     protected key?: string;
+    private semaphore;
+    private loggedIn;
     constructor(account: string, password: string, logger: Logger, security: T);
     protected timestamp(): string;
     apiRequest(endpoint: string, args?: {

package/dist/core/MideaCloud.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MideaCloud.d.ts","sourceRoot":"","sources":["../../src/core/MideaCloud.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAKpC,OAAO,EAAE,aAAa,EAAwC,MAAM,iBAAiB,CAAC;AAEtF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,8BAAsB,SAAS,CAAC,CAAC,SAAS,aAAa;IAgBnD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM;IAClC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM;IACnC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM;IACjC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;IAlBhC,SAAS,CAAC,QAAQ,CAAC,WAAW,KAAK;IACnC,SAAS,CAAC,QAAQ,CAAC,MAAM,KAAK;IAC9B,SAAS,CAAC,QAAQ,CAAC,OAAO,cAAc;IAExC,SAAS,CAAC,QAAQ,CAAC,QAAQ,WAAW;IACtC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAU;IAC3C,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAU;IACxC,SAAS,CAAC,QAAQ,CAAC,SAAS,SAAkC;IAE9D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACnC,SAAS,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;gBAIF,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,CAAC;IAGhC,SAAS,CAAC,SAAS;IAKb,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,EAAE,IAAI,CAAC,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC;IA8CrF,UAAU;IAYV,KAAK;IA8BL,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAkBpF;AAyGD,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,MAAM,CAAC,WAAW,CAChB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,GACZ,SAAS,CAAC,aAAa,CAAC;CAc5B"}
+{"version":3,"file":"MideaCloud.d.ts","sourceRoot":"","sources":["../../src/core/MideaCloud.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAKpC,OAAO,EACL,aAAa,EAId,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,8BAAsB,SAAS,CAAC,CAAC,SAAS,aAAa;IAkBnD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM;IAClC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM;IACnC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM;IACjC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;IApBhC,SAAS,CAAC,QAAQ,CAAC,WAAW,KAAK;IACnC,SAAS,CAAC,QAAQ,CAAC,MAAM,KAAK;IAC9B,SAAS,CAAC,QAAQ,CAAC,OAAO,cAAc;IAExC,SAAS,CAAC,QAAQ,CAAC,QAAQ,WAAW;IACtC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAU;IAC3C,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAU;IACxC,SAAS,CAAC,QAAQ,CAAC,SAAS,SAAkC;IAE9D,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACnC,SAAS,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAEvB,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,QAAQ,CAAS;gBAGJ,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,CAAC;IAMhC,SAAS,CAAC,SAAS;IAIb,UAAU,CACd,QAAQ,EAAE,MAAM,EAEhB,IAAI,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAE7B,IAAI,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;IAmDzB,UAAU;IAaV,KAAK;IAgDL,QAAQ,CACZ,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,UAAU,GACpB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAuB7B;AAmID,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,MAAM,CAAC,WAAW,CAChB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,GACZ,SAAS,CAAC,aAAa,CAAC;CAc5B"}

package/dist/core/MideaCloud.js

@@ -9,6 +9,7 @@ const luxon_1 = require("luxon");
 const axios_1 = __importDefault(require("axios"));
 const MideaSecurity_1 = require("./MideaSecurity");
 const MideaUtils_1 = require("./MideaUtils");
+const semaphore_promise_1 = require("semaphore-promise");
 class CloudBase {
     constructor(account, password, logger, security) {
         this.account = account;
@@ -22,21 +23,27 @@ class CloudBase {
         this.APP_ID = '1010';
         this.SRC = '1010';
         this.DEVICE_ID = (0, crypto_1.randomBytes)(8).toString('hex');
+        this.loggedIn = false;
+        // Required to serialize access to some cloud functions.
+        this.semaphore = new semaphore_promise_1.Semaphore();
     }
     timestamp() {
-        return luxon_1.DateTime.utc().toFormat('yyyyMMddHHmmss');
+        return luxon_1.DateTime.now().toFormat('yyyyMMddHHmmss');
     }
+    async apiRequest(endpoint, 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    async apiRequest(endpoint, args, data) {
+    args, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    data) {
         if (data === undefined) {
             data = {
-                'appId': this.APP_ID,
-                'format': this.FORMAT,
-                'clientType': this.CLIENT_TYPE,
-                'language': this.LANGUAGE,
-                'src': this.SRC,
-                'stamp': this.timestamp(),
-                'deviceId': this.DEVICE_ID,
+                appId: this.APP_ID,
+                format: this.FORMAT,
+                clientType: this.CLIENT_TYPE,
+                language: this.LANGUAGE,
+                src: this.SRC,
+                stamp: this.timestamp(),
+                deviceId: this.DEVICE_ID,
             };
         }
         data = { ...data, ...args };
@@ -48,10 +55,10 @@ class CloudBase {
         const sign = this.security.sign(JSON.stringify(data), random);
         const headers = {
             'Content-Type': 'application/json',
-            'secretVersion': '1',
-            'sign': sign,
-            'random': random,
-            'accessToken': this.access_token,
+            secretVersion: '1',
+            sign: sign,
+            random: random,
+            accessToken: this.access_token,
         };
         for (let i = 0; i < 3; i++) {
             try {
@@ -71,52 +78,74 @@ class CloudBase {
     }
     async getLoginId() {
         const response = await this.apiRequest('/v1/user/login/id/get', {
-            'loginAccount': this.account,
+            loginAccount: this.account,
         });
         if (response) {
+            this.logger.info('Logged in to Midea Cloud.');
             return response['loginId'];
         }
         throw new Error('Failed to get login ID.');
     }
     async login() {
-        const login_id = await this.getLoginId();
-        const response = await this.apiRequest('/mj/user/login', {
-            'data': {
-                'appKey': this.APP_KEY,
-                'platform': this.FORMAT,
-                'deviceId': this.DEVICE_ID,
-            },
-            'iotData': {
-                'appId': this.APP_ID,
-                'clientType': this.CLIENT_TYPE,
-                'iampwd': this.security.encrpytIAMPassword(login_id, this.password),
-                'loginAccount': this.account,
-                'password': this.security.encrpytPassword(login_id, this.password),
-                'pushToken': (0, crypto_1.randomBytes)(20).toString('base64url'),
-                'reqId': (0, crypto_1.randomBytes)(16).toString('hex'),
-                'src': this.SRC,
-                'stamp': this.timestamp(),
-            },
-        });
-        if (response) {
-            this.access_token = response['mdata']['accessToken'];
-            if (response['key'] !== undefined) {
-                this.key = response['key'];
+        // We need to protect against multiple attempts to login, so we only login if not already
+        // logged in.  Protect this block with a semaphone.
+        const releaseSemaphore = await this.semaphore.acquire('Obtain login semaphore');
+        try {
+            if (this.loggedIn) {
+                return;
+            }
+            // Not logged in so proceed...
+            const login_id = await this.getLoginId();
+            const response = await this.apiRequest('/mj/user/login', {
+                data: {
+                    appKey: this.APP_KEY,
+                    platform: this.FORMAT,
+                    deviceId: this.DEVICE_ID,
+                },
+                iotData: {
+                    appId: this.APP_ID,
+                    clientType: this.CLIENT_TYPE,
+                    iampwd: this.security.encrpytIAMPassword(login_id, this.password),
+                    loginAccount: this.account,
+                    password: this.security.encrpytPassword(login_id, this.password),
+                    pushToken: (0, crypto_1.randomBytes)(20).toString('base64url'),
+                    reqId: (0, crypto_1.randomBytes)(16).toString('hex'),
+                    src: this.SRC,
+                    stamp: this.timestamp(),
+                },
+            });
+            if (response) {
+                this.access_token = response['mdata']['accessToken'];
+                if (response['key'] !== undefined) {
+                    this.key = response['key'];
+                }
+                this.loggedIn = true;
+            }
+            else {
+                this.loggedIn = false;
+                throw new Error('Failed to login.');
             }
         }
-        else {
-            throw new Error('Failed to login.');
+        catch (e) {
+            const msg = e instanceof Error ? e.stack : e;
+            throw new Error(`Error in Adding new accessory:\n${msg}`);
+        }
+        finally {
+            releaseSemaphore();
         }
     }
     async getToken(device_id, endianess) {
         const udpid = MideaSecurity_1.CloudSecurity.getUDPID((0, MideaUtils_1.numberToUint8Array)(device_id, 6, endianess));
         const response = await this.apiRequest('/v1/iot/secure/getToken', {
-            'udpid': udpid,
+            udpid: udpid,
         });
         if (response) {
             for (const token of response['tokenlist']) {
                 if (token['udpId'] === udpid) {
-                    return [Buffer.from(token['token'], 'hex'), Buffer.from(token['key'], 'hex')];
+                    return [
+                        Buffer.from(token['token'], 'hex'),
+                        Buffer.from(token['key'], 'hex'),
+                    ];
                 }
             }
         }
@@ -139,31 +168,24 @@ class MeijuCloud extends CloudBase {
         this.API_URL = 'https://mp-prod.smartmidea.net/mas/v5/app/proxy?alias=';
     }
 }
-class NetHomePlusCloud extends CloudBase {
-    constructor(account, password, logger) {
-        super(account, password, logger, new MideaSecurity_1.CloudSecurity('xhdiwjnchekd4d512chdjx5d8e4c394D2D7S'));
-        this.API_URL = 'https://mapp.appsmb.com';
-        this.APP_ID = '1017';
-        this.SRC = '1017';
-    }
-}
-class MideaAirCloud extends CloudBase {
-    constructor(account, password, logger) {
-        super(account, password, logger, new MideaSecurity_1.MideaAirSecurity('ff0cf6f5f0c3471de36341cab3f7a9af', undefined));
+class UnProxiedCloudBase extends CloudBase {
+    constructor(account, password, logger, security) {
+        super(account, password, logger, security);
         this.API_URL = 'https://mapp.appsmb.com';
-        this.APP_ID = '1117';
-        this.SRC = '17';
     }
+    async apiRequest(endpoint, 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    async apiRequest(endpoint, args, data) {
+    args, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    data) {
         if (data === undefined) {
             data = {
-                'appId': this.APP_ID,
-                'format': this.FORMAT,
-                'clientType': this.CLIENT_TYPE,
-                'language': this.LANGUAGE,
-                'src': this.SRC,
-                'stamp': this.timestamp(),
+                appId: this.APP_ID,
+                format: this.FORMAT,
+                clientType: this.CLIENT_TYPE,
+                language: this.LANGUAGE,
+                src: this.SRC,
+                stamp: this.timestamp(),
             };
         }
         data = { ...data, ...args };
@@ -172,11 +194,16 @@ class MideaAirCloud extends CloudBase {
         }
         const url = `${this.API_URL}${endpoint}`;
         const queryParams = new URLSearchParams(data);
+        queryParams.sort();
         data['sign'] = this.security.sign(url, queryParams.toString());
+        const headers = {
+            'Content-Type': 'application/x-www-form-urlencoded',
+        };
         for (let i = 0; i < 3; i++) {
             try {
-                const response = await axios_1.default.post(url, data);
-                if (response.data['errorCode'] !== undefined && Number.parseInt(response.data['errorCode']) !== 0 &&
+                const response = await axios_1.default.post(url, data, { headers: headers });
+                if (response.data['errorCode'] !== undefined &&
+                    Number.parseInt(response.data['errorCode']) === 0 &&
                     response.data['result'] !== undefined) {
                     return response.data['result'];
                 }
@@ -190,8 +217,8 @@ class MideaAirCloud extends CloudBase {
     async login() {
         const login_id = await this.getLoginId();
         const response = await this.apiRequest('/v1/user/login', {
-            'loginAccount': this.account,
-            'password': this.security.encrpytPassword(login_id, this.password),
+            loginAccount: this.account,
+            password: this.security.encrpytPassword(login_id, this.password),
         });
         if (response) {
             this.access_token = response['accessToken'];
@@ -202,6 +229,20 @@ class MideaAirCloud extends CloudBase {
         }
     }
 }
+class NetHomePlusCloud extends UnProxiedCloudBase {
+    constructor(account, password, logger) {
+        super(account, password, logger, new MideaSecurity_1.NetHomePlusSecurity('3742e9e5842d4ad59c2db887e12449f9'));
+        this.APP_ID = '1017';
+        this.SRC = '1017';
+    }
+}
+class MideaAirCloud extends UnProxiedCloudBase {
+    constructor(account, password, logger) {
+        super(account, password, logger, new MideaSecurity_1.MideaAirSecurity('ff0cf6f5f0c3471de36341cab3f7a9af'));
+        this.APP_ID = '1117';
+        this.SRC = '17';
+    }
+}
 class CloudFactory {
     static createCloud(account, password, logger, cloud) {
         switch (cloud) {