@pietrolubini/homebridge-ecoflow 1.0.3 → 1.2.0

package/.prettierrc.json

@@ -7,5 +7,6 @@
   "arrowParens": "avoid",
   "trailingComma": "es5",
   "bracketSameLine": true,
-  "printWidth": 120
+  "printWidth": 120,
+  "plugins": ["prettier-plugin-organize-imports"]
 }

package/README.md

@@ -22,6 +22,7 @@ The goal is to add HomeKit support to EcoFlow devices and make them fully contro
 
 ## Supported device types
 
+- Delta 2
 - Delta 2 Max
 
 For a full list of devices that could be potentially added check [here](https://developer-eu.ecoflow.com/us/document/introduction)
@@ -63,6 +64,37 @@ Example configuration:
 }
 ```
 
+### Battery-specific Configuration
+
+If `devices`.`model` is one of [`Delta 2`, `Delta 2 Max`] it is possible to set turn on/off additional characteristics:
+
+- Input Consumption, W
+- Output Consumption, W
+- Battery Level, %
+
+```js
+{
+  ...
+  "devices": [
+    {
+      ...,
+      "model": "Delta 2 Max",
+      "battery": {
+        "additionalCharacteristics": [
+          "Battery Level, %",
+          "Input Consumption, W",
+          "Output Consumption, W"
+        ]
+      }
+    }
+  ],
+}
+```
+
+The characteristics could be used as conditions in HomeKit Automation that uses Shortcuts:
+
+<img src="docs/images/BatteryAdditionalCharacteristics.jpg" alt="Battery Additional Characteristics" width="300">
+
 ### AccessKey and SecretKey
 
 For the plugin to work EcoFlow account's `AccessKey` and `SecretKey` is required. To retrieve them

package/config.schema.json

@@ -28,7 +28,7 @@
               "title": "Model",
               "type": "string",
               "required": true,
-              "enum": ["Delta 2 Max"]
+              "enum": ["Delta 2", "Delta 2 Max"]
             },
             "serialNumber": {
               "title": "Serial Number",
@@ -47,6 +47,23 @@
               "type": "string",
               "required": true,
               "description": "Secret Key from \"EcoFlow IoT Developer Platform\" (https://developer-eu.ecoflow.com)"
+            },
+            "battery": {
+              "title": "Battery Settings",
+              "type": "object",
+              "properties": {
+                "additionalCharacteristics": {
+                  "title": "Additional characteristics",
+                  "description": "List of additional characteristics for battery",
+                  "type": "array",
+                  "uniqueItems": true,
+                  "items": {
+                    "title": "Characteristic",
+                    "type": "string",
+                    "enum": ["Battery Level, %", "Input Consumption, W", "Output Consumption, W"]
+                  }
+                }
+              }
             }
           }
         }

package/dist/accessories/batteries/batteryAccessory.d.ts

@@ -0,0 +1,59 @@
+import { Logging, PlatformAccessory } from 'homebridge';
+import { MqttQuotaMessage } from '../../apis/ecoFlowMqttApi.js';
+import { DeviceConfig } from '../../config.js';
+import { EcoFlowHomebridgePlatform } from '../../platform.js';
+import { ServiceBase } from '../../services/serviceBase.js';
+import { EcoFlowAccessoryWithQuota } from '../ecoFlowAccessory.js';
+export declare abstract class BatteryAccessory extends EcoFlowAccessoryWithQuota<BatteryAllQuotaData> {
+    private readonly batteryService;
+    private readonly outletUsbService;
+    private readonly outletAcService;
+    private readonly outletCarService;
+    constructor(platform: EcoFlowHomebridgePlatform, accessory: PlatformAccessory, config: DeviceConfig, log: Logging);
+    protected getServices(): ServiceBase[];
+    protected processQuotaMessage(message: MqttQuotaMessage): void;
+    protected updateInitialValues(initialData: BatteryAllQuotaData): void;
+    private updateBmsInitialValues;
+    private updateInvInitialValues;
+    private updatePdInitialValues;
+    private updateBmsValues;
+    private updateInvValues;
+    private updatePdValues;
+    private getUsbWatts;
+}
+interface BmsStatus {
+    f32ShowSoc: number;
+}
+interface InvStatusAc {
+    outputWatts?: number;
+    cfgAcEnabled?: boolean;
+    cfgAcXboost?: boolean;
+    cfgAcOutFreq?: number;
+    cfgAcOutVol?: number;
+}
+interface InvStatus extends InvStatusAc {
+    inputWatts: number;
+}
+interface PdStatusCar {
+    carState?: boolean;
+    carWatts?: number;
+}
+interface PdStatusUsb {
+    dcOutState?: boolean;
+    usb1Watts?: number;
+    usb2Watts?: number;
+    qcUsb1Watts?: number;
+    qcUsb2Watts?: number;
+    typec1Watts?: number;
+    typec2Watts?: number;
+}
+interface PdStatus extends PdStatusUsb, PdStatusCar {
+    carState?: boolean;
+    carWatts?: number;
+}
+export interface BatteryAllQuotaData {
+    bms_bmsStatus: BmsStatus;
+    inv: InvStatus;
+    pd: PdStatus;
+}
+export {};

package/dist/accessories/batteries/batteryAccessory.js

@@ -0,0 +1,120 @@
+import { MqttMessageType } from '../../apis/ecoFlowMqttApi.js';
+import { BatteryStatusService } from '../../services/batteryStatusService.js';
+import { OutletAcService } from '../../services/outletAcService.js';
+import { OutletCarService } from '../../services/outletCarService.js';
+import { OutletUsbService } from '../../services/outletUsbService.js';
+import { EcoFlowAccessoryWithQuota } from '../ecoFlowAccessory.js';
+export class BatteryAccessory extends EcoFlowAccessoryWithQuota {
+    batteryService;
+    outletUsbService;
+    outletAcService;
+    outletCarService;
+    constructor(platform, accessory, config, log) {
+        super(platform, accessory, config, log);
+        this.batteryService = new BatteryStatusService(this);
+        this.outletUsbService = new OutletUsbService(this);
+        this.outletAcService = new OutletAcService(this);
+        this.outletCarService = new OutletCarService(this);
+    }
+    getServices() {
+        return [this.batteryService, this.outletUsbService, this.outletAcService, this.outletCarService];
+    }
+    processQuotaMessage(message) {
+        if (message.typeCode === MqttMessageType.BMS) {
+            const bmsStatus = message.params;
+            this.log.debug('BMS:', bmsStatus);
+            Object.assign(this.quota.bms_bmsStatus, bmsStatus);
+            this.updateBmsValues(bmsStatus);
+        }
+        else if (message.typeCode === MqttMessageType.INV) {
+            const invStatus = message.params;
+            this.log.debug('INV:', invStatus);
+            Object.assign(this.quota.inv, invStatus);
+            this.updateInvValues(invStatus);
+        }
+        else if (message.typeCode === MqttMessageType.PD) {
+            const pdStatus = message.params;
+            this.log.debug('PD:', pdStatus);
+            Object.assign(this.quota.pd, pdStatus);
+            this.updatePdValues(pdStatus);
+        }
+    }
+    updateInitialValues(initialData) {
+        this.updateBmsInitialValues(initialData.bms_bmsStatus);
+        this.updateInvInitialValues(initialData.inv);
+        this.updatePdInitialValues(initialData.pd);
+    }
+    updateBmsInitialValues(params) {
+        const message = {
+            typeCode: MqttMessageType.BMS,
+            params,
+        };
+        this.processQuotaMessage(message);
+    }
+    updateInvInitialValues(params) {
+        const message = {
+            typeCode: MqttMessageType.INV,
+            params,
+        };
+        this.processQuotaMessage(message);
+    }
+    updatePdInitialValues(params) {
+        const message = {
+            typeCode: MqttMessageType.PD,
+            params,
+        };
+        this.processQuotaMessage(message);
+    }
+    updateBmsValues(params) {
+        if (params.f32ShowSoc !== undefined) {
+            this.batteryService.updateStatusLowBattery(params.f32ShowSoc);
+            this.batteryService.updateBatteryLevel(params.f32ShowSoc);
+            this.outletAcService.updateBatteryLevel(params.f32ShowSoc);
+            this.outletUsbService.updateBatteryLevel(params.f32ShowSoc);
+            this.outletCarService.updateBatteryLevel(params.f32ShowSoc);
+        }
+    }
+    updateInvValues(params) {
+        if (params.inputWatts !== undefined) {
+            this.batteryService.updateChargingState(params.inputWatts);
+            this.outletAcService.updateInputConsumption(params.inputWatts);
+            this.outletUsbService.updateInputConsumption(params.inputWatts);
+            this.outletCarService.updateInputConsumption(params.inputWatts);
+        }
+        if (params.cfgAcEnabled !== undefined) {
+            this.outletAcService.updateState(params.cfgAcEnabled);
+        }
+        if (params.outputWatts !== undefined) {
+            this.outletAcService.updateOutputConsumption(params.outputWatts);
+        }
+    }
+    updatePdValues(params) {
+        if (params.carState !== undefined) {
+            this.outletCarService.updateState(params.carState);
+        }
+        if (params.carWatts !== undefined) {
+            this.outletCarService.updateOutputConsumption(params.carWatts);
+        }
+        if (params.dcOutState !== undefined) {
+            this.outletUsbService.updateState(params.dcOutState);
+        }
+        if (params.usb1Watts !== undefined ||
+            params.usb2Watts !== undefined ||
+            params.qcUsb1Watts !== undefined ||
+            params.qcUsb2Watts !== undefined ||
+            params.typec1Watts !== undefined ||
+            params.typec2Watts !== undefined) {
+            const usbWatts = this.getUsbWatts(params.usb1Watts, params.usb2Watts, params.qcUsb1Watts, params.qcUsb2Watts, params.typec1Watts, params.typec2Watts);
+            this.outletUsbService.updateOutputConsumption(usbWatts);
+        }
+    }
+    getUsbWatts(usb1Watts, usb2Watts, qcUsb1Watts, qcUsb2Watts, typec1Watts, typec2Watts) {
+        return ((usb1Watts ?? 0) +
+            (usb2Watts ?? 0) +
+            (qcUsb1Watts ?? 0) +
+            (qcUsb2Watts ?? 0) +
+            (typec1Watts ?? 0) +
+            (typec2Watts ?? 0));
+    }
+}
+//# sourceMappingURL=batteryAccessory.js.map

package/dist/accessories/batteries/batteryAccessory.js.map

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

package/dist/accessories/batteries/delta2Accessory.d.ts

@@ -0,0 +1,3 @@
+import { BatteryAccessory } from './batteryAccessory.js';
+export declare class Delta2Accessory extends BatteryAccessory {
+}

package/dist/accessories/batteries/delta2Accessory.js

@@ -0,0 +1,4 @@
+import { BatteryAccessory } from './batteryAccessory.js';
+export class Delta2Accessory extends BatteryAccessory {
+}
+//# sourceMappingURL=delta2Accessory.js.map

package/dist/accessories/batteries/delta2Accessory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"delta2Accessory.js","sourceRoot":"","sources":["../../../src/accessories/batteries/delta2Accessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,OAAO,eAAgB,SAAQ,gBAAgB;CAAG"}

package/dist/accessories/batteries/delta2maxAccessory.d.ts

@@ -0,0 +1,3 @@
+import { BatteryAccessory } from './batteryAccessory.js';
+export declare class Delta2MaxAccessory extends BatteryAccessory {
+}

package/dist/accessories/batteries/delta2maxAccessory.js

@@ -0,0 +1,4 @@
+import { BatteryAccessory } from './batteryAccessory.js';
+export class Delta2MaxAccessory extends BatteryAccessory {
+}
+//# sourceMappingURL=delta2maxAccessory.js.map

package/dist/accessories/batteries/delta2maxAccessory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"delta2maxAccessory.js","sourceRoot":"","sources":["../../../src/accessories/batteries/delta2maxAccessory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,OAAO,kBAAmB,SAAQ,gBAAgB;CAAG"}

package/dist/accessories/ecoFlowAccessory.d.ts

@@ -1,34 +1,42 @@
 import { Logging, PlatformAccessory } from 'homebridge';
-import { EcoFlowHomebridgePlatform } from '../platform.js';
-import { DeviceConfig } from '../config.js';
-import { ServiceBase } from './services/serviceBase.js';
-import { EcoFlowMqttApi } from './apis/ecoFlowMqttApi.js';
-import { EcoFlowHttpApi } from './apis/ecoFlowHttpApi.js';
-import { CmdResponseData } from './apis/interfaces/ecoFlowHttpContacts.js';
 import { Subscription } from 'rxjs';
+import { EcoFlowHttpApi } from '../apis/ecoFlowHttpApi.js';
+import { EcoFlowMqttApi, MqttQuotaMessage, MqttSetMessage, MqttSetReplyMessage } from '../apis/ecoFlowMqttApi.js';
+import { DeviceConfig } from '../config.js';
+import { EcoFlowHomebridgePlatform } from '../platform.js';
+import { ServiceBase } from '../services/serviceBase.js';
 export declare abstract class EcoFlowAccessory {
     readonly platform: EcoFlowHomebridgePlatform;
     readonly accessory: PlatformAccessory;
     readonly config: DeviceConfig;
     readonly log: Logging;
-    readonly mqttApi: EcoFlowMqttApi;
+    protected readonly mqttApi: EcoFlowMqttApi;
     protected readonly httpApi: EcoFlowHttpApi;
     private services;
     private reconnectMqttTimeoutId;
     private isMqttConnected;
     private subscriptions;
+    readonly setReplies: Record<string, {
+        requestMessage: MqttSetMessage;
+        revert: () => void;
+    }>;
     constructor(platform: EcoFlowHomebridgePlatform, accessory: PlatformAccessory, config: DeviceConfig, log: Logging);
     initialize(): Promise<void>;
     destroy(): void;
+    sendSetCommand<TParams>(moduleType: number, operateType: string, params: TParams, revert: () => void): Promise<void>;
     protected abstract getServices(): ServiceBase[];
-    protected abstract subscribeOnParameterUpdates(): Subscription[];
+    protected subscribeOnParameterUpdates(): Subscription[];
+    protected abstract processQuotaMessage(message: MqttQuotaMessage): void;
+    protected processSetReplyMessage(message: MqttSetReplyMessage): void;
+    private getMqttSetMessageKey;
     private initializeServices;
     private cleanupServices;
     private connectMqtt;
     private initMqtt;
 }
-export declare abstract class EcoFlowAccessoryWithQuota<TGetQuotasCmdResponseData extends CmdResponseData> extends EcoFlowAccessory {
-    private initialData;
+export declare abstract class EcoFlowAccessoryWithQuota<TAllQuotaData> extends EcoFlowAccessory {
+    private _quota;
     initialize(): Promise<void>;
-    protected abstract updateInitialValues(initialData: TGetQuotasCmdResponseData): void;
+    get quota(): TAllQuotaData;
+    protected abstract updateInitialValues(quota: TAllQuotaData): void;
 }

package/dist/accessories/ecoFlowAccessory.js

@@ -1,6 +1,6 @@
-import { EcoFlowMqttApi } from './apis/ecoFlowMqttApi.js';
-import { AccessoryInformationService } from './services/accessoryInformationService.js';
-import { EcoFlowHttpApi } from './apis/ecoFlowHttpApi.js';
+import { EcoFlowHttpApi } from '../apis/ecoFlowHttpApi.js';
+import { EcoFlowMqttApi, } from '../apis/ecoFlowMqttApi.js';
+import { AccessoryInformationService } from '../services/accessoryInformationService.js';
 export class EcoFlowAccessory {
     platform;
     accessory;
@@ -12,6 +12,7 @@ export class EcoFlowAccessory {
     reconnectMqttTimeoutId = null;
     isMqttConnected = false;
     subscriptions = [];
+    setReplies = {};
     constructor(platform, accessory, config, log) {
         this.platform = platform;
         this.accessory = accessory;
@@ -34,6 +35,38 @@ export class EcoFlowAccessory {
         }
         this.subscriptions.forEach(subscription => subscription.unsubscribe());
     }
+    async sendSetCommand(moduleType, operateType, params, revert) {
+        const requestMessage = {
+            id: Math.floor(Math.random() * 1000000),
+            version: '1.0',
+            moduleType,
+            operateType,
+            params,
+        };
+        this.setReplies[this.getMqttSetMessageKey(requestMessage)] = { requestMessage, revert };
+        await this.mqttApi.sendSetCommand(this.config.serialNumber, requestMessage);
+    }
+    subscribeOnParameterUpdates() {
+        return [
+            this.mqttApi.quota$.subscribe(message => this.processQuotaMessage(message)),
+            this.mqttApi.setReply$.subscribe(message => this.processSetReplyMessage(message)),
+        ];
+    }
+    processSetReplyMessage(message) {
+        const messageKey = this.getMqttSetMessageKey(message);
+        const command = this.setReplies[messageKey];
+        delete this.setReplies[messageKey];
+        if (message.data.ack) {
+            this.log.warn('Failed to set a value. Reverts value back for:', command.requestMessage.operateType);
+            command.revert();
+        }
+        else {
+            this.log.debug('Setting of a value was successful for:', command.requestMessage.operateType);
+        }
+    }
+    getMqttSetMessageKey(message) {
+        return `${message.operateType}_${message.id}`;
+    }
     initializeServices() {
         this.services.forEach(service => {
             service.initialize();
@@ -48,6 +81,9 @@ export class EcoFlowAccessory {
             this.log.info('Removing obsolete service from accessory:', service.displayName);
             this.accessory.removeService(service);
         });
+        this.services
+            .filter(service => this.accessory.services.includes(service.service))
+            .forEach(service => service.cleanupCharacteristics());
     }
     async connectMqtt() {
         await this.initMqtt();
@@ -59,17 +95,22 @@ export class EcoFlowAccessory {
         }, 60 * 1000);
     }
     async initMqtt() {
-        this.isMqttConnected = await this.mqttApi.subscribe('/open/<certificateAccount>/<sn>/quota', this.config.serialNumber);
+        this.isMqttConnected =
+            (await this.mqttApi.subscribeOnQuota(this.config.serialNumber)) &&
+                (await this.mqttApi.subscribeOnSetReply(this.config.serialNumber));
     }
 }
 export class EcoFlowAccessoryWithQuota extends EcoFlowAccessory {
-    initialData = null;
+    _quota = null;
     async initialize() {
-        if (!this.initialData) {
-            this.initialData = await this.httpApi.getAllQuotas();
+        if (!this._quota) {
+            this._quota = await this.httpApi.getAllQuotas();
         }
         await super.initialize();
-        this.updateInitialValues(this.initialData);
+        this.updateInitialValues(this._quota);
+    }
+    get quota() {
+        return this._quota;
     }
 }
 //# sourceMappingURL=ecoFlowAccessory.js.map

package/dist/accessories/ecoFlowAccessory.js.map

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

package/dist/apis/ecoFlowHttpApi.d.ts

@@ -0,0 +1,46 @@
+import { Logging } from 'homebridge';
+import { DeviceConfig } from '../config.js';
+export declare enum HttpMethod {
+    Get = "GET",
+    Post = "POST"
+}
+export interface CmdResponse {
+    code: string;
+    message: string;
+    failed: boolean;
+}
+export interface CmdResponseWithData<TData> extends CmdResponse {
+    code: string;
+    message: string;
+    data: TData;
+}
+export interface GetCmdRequest {
+    sn: string;
+}
+export interface GetQuotasCmdRequest extends GetCmdRequest {
+    params: GetQuotasCmdRequestParams;
+}
+export interface GetQuotasCmdRequestParams {
+    quotas: string[];
+}
+export interface AcquireCertificateData {
+    certificateAccount: string;
+    certificatePassword: string;
+    url: string;
+    port: string;
+    protocol: string;
+}
+export declare class EcoFlowHttpApi {
+    private readonly config;
+    private readonly log;
+    constructor(config: DeviceConfig, log: Logging);
+    getQuotas<TData>(quotas: string[]): Promise<TData>;
+    getAllQuotas<TData>(): Promise<TData>;
+    acquireCertificate(): Promise<AcquireCertificateData | null>;
+    protected execute<TResponse extends CmdResponse>(relativeUrl: string, method: HttpMethod, queryParameters?: object | null, body?: object | null): Promise<TResponse>;
+    private getNonce;
+    private composeSignMessage;
+    private createHmacSha256;
+    private stringifyOptions;
+    private convertData;
+}

package/dist/{accessories/apis → apis}/ecoFlowHttpApi.js

@@ -1,9 +1,13 @@
 import * as crypto from 'crypto';
-import { HttpMethod, } from './interfaces/ecoFlowHttpContacts.js';
 const ApiUrl = 'https://api-e.ecoflow.com';
 const QuotaPath = '/iot-open/sign/device/quota';
 const QuotaAllPath = '/iot-open/sign/device/quota/all';
 const CertificatePath = '/iot-open/sign/certification';
+export var HttpMethod;
+(function (HttpMethod) {
+    HttpMethod["Get"] = "GET";
+    HttpMethod["Post"] = "POST";
+})(HttpMethod || (HttpMethod = {}));
 export class EcoFlowHttpApi {
     config;
     log;
@@ -21,7 +25,7 @@ export class EcoFlowHttpApi {
         };
         const response = await this.execute(QuotaPath, HttpMethod.Post, requestCmd);
         if (!response.failed) {
-            const data = response.data;
+            const data = this.convertData(response.data);
             this.log.debug('Quotas:', data);
             return data;
         }
@@ -34,7 +38,7 @@ export class EcoFlowHttpApi {
         };
         const response = await this.execute(QuotaAllPath, HttpMethod.Get, requestCmd);
         if (!response.failed) {
-            const data = response.data;
+            const data = this.convertData(response.data);
             this.log.debug('All quotas:', data);
             return data;
         }
@@ -44,7 +48,6 @@ export class EcoFlowHttpApi {
         this.log.debug('Acquire certificate for MQTT connection');
         const response = await this.execute(CertificatePath, HttpMethod.Get);
         if (!response.failed) {
-            this.log.debug('Certificate data:', response.data);
             return response.data;
         }
         return null;
@@ -76,13 +79,18 @@ export class EcoFlowHttpApi {
             const response = await fetch(requestUrl, options);
             const result = (await response.json());
             if (result.code !== '0') {
-                throw Error(`Request to "${requestUrl}" with options: "${this.stringifyOptions(options)}" is failed [${response.status}]: ${response.statusText}; result: ${JSON.stringify(result)}`);
+                throw Error(`Request to "${requestUrl}" with options: "${this.stringifyOptions(options)}" is failed
+          [${response.status}]: ${response.statusText}; result: ${JSON.stringify(result)}`);
             }
             return result;
         }
         catch (e) {
             this.log.error('Request is failed:', e);
-            return { code: '500', message: e?.message, failed: true };
+            return {
+                code: '500',
+                message: e?.message,
+                failed: true,
+            };
         }
     }
     getNonce() {
@@ -131,5 +139,22 @@ export class EcoFlowHttpApi {
         };
         return JSON.stringify(newOptions);
     }
+    convertData(data) {
+        const result = {};
+        Object.keys(data).forEach(key => {
+            const keys = key.split('.');
+            let current = result;
+            keys.forEach((k, index) => {
+                if (index === keys.length - 1) {
+                    current[k] = data[key];
+                }
+                else {
+                    current[k] = current[k] || {};
+                    current = current[k];
+                }
+            });
+        });
+        return result;
+    }
 }
 //# sourceMappingURL=ecoFlowHttpApi.js.map

package/dist/apis/ecoFlowHttpApi.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ecoFlowHttpApi.js","sourceRoot":"","sources":["../../src/apis/ecoFlowHttpApi.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAIjC,MAAM,MAAM,GAAG,2BAA2B,CAAC;AAC3C,MAAM,SAAS,GAAG,6BAA6B,CAAC;AAChD,MAAM,YAAY,GAAG,iCAAiC,CAAC;AACvD,MAAM,eAAe,GAAG,8BAA8B,CAAC;AAEvD,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,yBAAW,CAAA;IACX,2BAAa,CAAA;AACf,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB;AAuCD,MAAM,OAAO,cAAc;IAEN;IACA;IAFnB,YACmB,MAAoB,EACpB,GAAY;QADZ,WAAM,GAAN,MAAM,CAAc;QACpB,QAAG,GAAH,GAAG,CAAS;IAC5B,CAAC;IAEG,KAAK,CAAC,SAAS,CAAQ,MAAgB;QAC5C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;QACtC,MAAM,UAAU,GAAwB;YACtC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;YAC5B,MAAM,EAAE;gBACN,MAAM;aACP;SACF,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAA4B,SAAS,EAAE,UAAU,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACvG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAQ,QAAQ,CAAC,IAAI,CAAC,CAAC;YACpD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YAChC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,EAAW,CAAC;IACrB,CAAC;IAEM,KAAK,CAAC,YAAY;QACvB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACjC,MAAM,UAAU,GAAkB;YAChC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;SAC7B,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAA4B,YAAY,EAAE,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACzG,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAQ,QAAQ,CAAC,IAAI,CAAC,CAAC;YACpD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;YACpC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,EAAW,CAAC;IACrB,CAAC;IAEM,KAAK,CAAC,kBAAkB;QAC7B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAA8C,eAAe,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;QAClH,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrB,OAAO,QAAQ,CAAC,IAAI,CAAC;QACvB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAES,KAAK,CAAC,OAAO,CACrB,WAAmB,EACnB,MAAkB,EAClB,kBAAiC,IAAI,EACrC,OAAsB,IAAI;QAE1B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;QAC7D,IAAI,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,WAAW,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAClD,MAAM,iBAAiB,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACxD,MAAM,GAAG,iBAAiB,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,iBAAiB,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC;QACvE,MAAM,OAAO,GAAG,GAAG,MAAM,aAAa,SAAS,UAAU,KAAK,cAAc,SAAS,EAAE,CAAC;QACxF,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,WAAW,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;QAE/D,MAAM,OAAO,GAAgB;YAC3B,SAAS;YACT,KAAK;YACL,SAAS,EAAE,SAAS,CAAC,QAAQ,EAAE;YAC/B,IAAI,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC;SAC5D,CAAC;QACF,MAAM,OAAO,GAAgB,EAAE,MAAM,EAAE,CAAC;QACxC,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACpC,OAAO,CAAC,cAAc,CAAC,GAAG,kBAAkB,CAAC;QAC/C,CAAC;QACD,OAAO,CAAC,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;QAEvC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YAClD,MAAM,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAyB,CAAC;YAC/D,IAAI,MAAM,CAAC,IAAI,KAAK,GAAG,EAAE,CAAC;gBACxB,MAAM,KAAK,CACT,eAAe,UAAU,oBAAoB,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;aACxE,QAAQ,CAAC,MAAM,MAAM,QAAQ,CAAC,UAAU,aAAa,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CACjF,CAAC;YACJ,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC;YACxC,OAAO;gBACL,IAAI,EAAE,KAAK;gBACX,OAAO,EAAG,CAAW,EAAE,OAAO;gBAC9B,MAAM,EAAE,IAAI;aACA,CAAC;QACjB,CAAC;IACH,CAAC;IAEO,QAAQ;QACd,MAAM,GAAG,GAAG,CAAC,CAAC;QACd,MAAM,GAAG,GAAG,MAAM,CAAC;QACnB,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;QACvE,OAAO,YAAY,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAClD,CAAC;IAEO,kBAAkB,CAAC,GAAgB,EAAE,SAAiB,EAAE;QAC9D,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,UAAU,GAAa,EAAE,CAAC;QAEhC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;aACb,IAAI,EAAE;aACN,OAAO,CAAC,GAAG,CAAC,EAAE;YACb,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;YACvB,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;YAErD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzB,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;oBAC5B,UAAU,CAAC,IAAI,CAAC,GAAG,UAAU,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC,CAAC;gBACrD,CAAC,CAAC,CAAC;YACL,CAAC;iBAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACvD,oCAAoC;gBACpC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;YAC9D,CAAC;iBAAM,CAAC;gBACN,0BAA0B;gBAC1B,UAAU,CAAC,IAAI,CAAC,GAAG,UAAU,IAAI,KAAK,EAAE,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC,CAAC,CAAC;QAEL,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC;IAEO,gBAAgB,CAAC,GAAW,EAAE,OAAe;QACnD,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACxE,CAAC;IAEO,gBAAgB,CAAC,OAAoB;QAC3C,MAAM,aAAa,GAEf,EAAE,CAAC;QACN,OAAO,CAAC,OAAmB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YAClD,aAAa,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,MAAM,UAAU,GAAG;YACjB,GAAG,OAAO;YACV,OAAO,EAAE,aAAa;SACvB,CAAC;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IAEO,WAAW,CAAQ,IAAU;QACnC,MAAM,MAAM,GAAS,EAAE,CAAC;QACxB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC9B,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC5B,IAAI,OAAO,GAAG,MAAM,CAAC;YAErB,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;gBACxB,IAAI,KAAK,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC9B,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;gBACzB,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;oBAC9B,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBACvB,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,MAAe,CAAC;IACzB,CAAC;CACF"}