npm - @pietrolubini/homebridge-ecoflow - Versions diffs - 1.7.0-alpha.0 → 1.7.0-alpha.6 - Mend

@pietrolubini/homebridge-ecoflow 1.7.0-alpha.0 → 1.7.0-alpha.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (137) hide show

package/dist/helpers/converter.js ADDED Viewed

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Converter = void 0;
+class Converter {
+    static convertFahrenheitToCelsius(fahrenheit) {
+        if (fahrenheit === undefined || fahrenheit === null) {
+            return undefined;
+        }
+        return ((fahrenheit - 32) * 5) / 9;
+    }
+}
+exports.Converter = Converter;
+//# sourceMappingURL=converter.js.map

package/dist/helpers/converter.js.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"converter.js","sourceRoot":"","sources":["../../src/helpers/converter.ts"],"names":[],"mappings":";;;AAAA,MAAa,SAAS;IACb,MAAM,CAAC,0BAA0B,CAAC,UAAmB;QAC1D,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;YACpD,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,CAAC,CAAC,UAAU,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;CACF;AAPD,8BAOC"}

package/dist/helpers/converter.spec.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/dist/homebridge-ui/public/index.html CHANGED Viewed

@@ -3,4 +3,4 @@
     if (typeof renderEcoFlowPluginConfig === 'function') {
       renderEcoFlowPluginConfig(homebridge);
     }
-  });</script><script defer="defer" src="./index.js?q=b8e3d35346c614e2345b"></script>
+  });</script><script defer="defer" src="./index.js?q=7fd077c867f7c5bf95c9"></script>

package/dist/homebridge-ui/public/index.js CHANGED Viewed

	@@ -1 +1 @@
1	- (()=>{"use strict";var e={~~999:~~(e,r~~)=>{Object.defineProperty(r~~,~~"__esModule",{value:!0}),r.ComponentRenderer=void 0,r.ComponentRenderer=class{renderTextBox(e,r,i,~~n,t){const o='\n <div class="form-group">\n <label for="device{id}" class="{requiredClass}">{title}</label>\n <input type="text" class="form-control" id="device{id}" placeholder="{description}" required="{required}" />\n </div>'.replace(/{id}/g,r).replace(/{title}/g,i.title).replace(/{description}/g,i.description??"").replace(/{requiredClass}/g,i.required?"required-label":"").replace(/{required}/g,(i.required??!1).toString());e.append(o);const a=e.find(`#device${r}`);a.val(n),a.on("change",(()=>t(a.val()?.toString()\|\|"")))}renderDropDown(e,r,i,n,t){const o='\n <div class="form-group">\n <label for="device{id}" class="{requiredClass}">{title}</label>\n <select class="form-control" id="device{id}" required="{required}"></select>\n </div>'.replace(/{id}/g,r).replace(/{title}/g,i.title).replace(/{requiredClass}/g,i.required?"required-label":"").replace(/{required}/g,(i.required??!1).toString());e.append(o);const a=e.find(`#device${r}`);i.enum.forEach((e=>{const r=$("<option>").val(e).text(e);a.append(r)})),a.val(n),a.on("change",(()=>t(a.val()?.toString()\|\|"")))}}},84:(e,r,i)=>{Object.defineProperty(r,"__esModule",{value:!0}),r.PluginConfigDevicesRenderer=void 0;const n=i(536);class t extends n.PluginConfigRendererBase{form;$tabs;$tabPanels;_hideDeviceSettingsPerModel;constructor(e){super(e),this.$tabs=$("#devicesTabs"),this.$tabPanels=$("#devicesPanels"),this._hideDeviceSettingsPerModel={"Delta 2":["powerStream","powerOcean","outlet"],"Delta 2 Max":["powerStream","powerOcean","outlet"],"Delta Pro":["powerStream","powerOcean","outlet"],"Delta Pro 3":["powerStream","powerOcean","outlet"],"Delta Pro Ultra":["powerStream","powerOcean","outlet"],Discovery:["battery","powerStream","powerOcean","outlet"],PowerStream:["battery","powerOcean","outlet"],PowerOcean:["battery","powerStream","outlet"],"Smart Plug":["battery","powerStream","powerOcean"],Glacier:["powerStream","powerOcean","outlet"]}}get hideDeviceSettingsPerModel(){return this._hideDeviceSettingsPerModel}render(e){this.renderDevicesSettings({homebridgeProvider:e.homebridgeProvider,configSchema:e.configSchema,configuration:e.configuration,hideDeviceSettingsPerModel:this.hideDeviceSettingsPerModel})}renderDevicesSettings(e,r){$("#devicesLabel").text(e.configSchema.schema.properties.devices.title);const i=!r\|\|r<0?0:r;this.renderDeviceTabs(e,i)}renderDeviceTabs(e,r){this.clearDeviceTabs();const i='\n <li class="nav-item">\n <a class="nav-link {activeClass}" data-toggle="tab" href="#deviceTabPanel{index}" id="deviceTab{index}">{name}</a>\n </li>\n ';e.configuration.devices.forEach(((n,t)=>{const o=i.replace(/{activeClass}/g,t===r?"active":"").replace(/{index}/g,t.toString()).replace(/{name}/g,n.name??`Device${t+1}`);this.$tabs.append(o),this.renderDeviceTabPanel(e,n,t,r,this.$tabs.find(`#deviceTab${t}`))})),this.renderAddNewDeviceTab(i,e)}clearDeviceTabs(){this.$tabs.empty(),this.$tabPanels.empty(),this.form?.end()}renderAddNewDeviceTab(e,r){const i=e.replace(/{activeClass}/g,"").replace(/{index}/g,"Add").replace(/{name}/g,"Add Device");this.$tabs.append(i),this.$tabs.find("#deviceTabAdd").on("click",(()=>{r.configuration.devices.push(this.getDefaultDeviceConfiguration(r.configSchema)),this.renderDevicesSettings(r,r.configuration.devices.length-1)}))}renderDeviceTabPanel(e,r,i,n,t){const o='\n <div class="tab-pane container fade {activeClass} card card-body list-group-item" id="deviceTabPanel{index}">\n <button type="button" class="close pull-right" id="deviceTabPanelClose{index}">\n <span>×</span>\n <span class="sr-only">Close</span>\n </button>\n </div>\n '.replace(/{activeClass}/g,i~~===n~~?"in show active":"").replace(/{index}/g,i.toString());this.$tabPanels.append(o);const a=this.$tabPanels.find(`#deviceTabPanel${i}`),s=this.clone(e.configSchema.schema.properties.devices.items),c=s.properties.model;this.renderModelDropDown(t,a,i,e,s,c,r),this.renderRemoveButton(a,i,e),this.renderForm(t,i,n,e,s,r)}renderModelDropDown(e,r,i,n,t,o,a){this.componentRenderer.renderDropDown(r,"model"+i,o,a.model,(r=>{a.model=r,this.renderForm(e,i,i,n,t,a)}))}renderRemoveButton(e,r,i){e.find(`#deviceTabPanelClose${r}`).on("click",(()=>{i.configuration.devices.splice(r,1),this.renderDevicesSettings(i,r-1)}))}renderForm(e,r,i,n,t,o){delete(t=this.clone(t)).properties.model,n.hideDeviceSettingsPerModel[o.model].forEach((e=>{delete t.properties[e]})),e.off("click").on("click",(()=>{this.form?.end(),this.form=n.homebridgeProvider.createForm({schema:t},o),this.form.onChange((async i=>{const t=n.configuration.devices[r].name;this.applyChanges(n.configuration.devices[r],i,["model"]),await this.updatePluginConfig(n),i.name!==t&&e.text(i.name)}))})),r===i&&e.trigger("click")}getDefaultDeviceConfiguration(e){const r={},i=e.schema.properties.devices.items.properties;return Object.keys(i).filter((e=>!!i[e]?.default)).forEach((e=>{r[e]=i[e]?.default})),r}applyChanges(e,r,i){Object.assign(e,r);for(const n in e)void 0!==r[n]\|\|i.includes(n)\|\|delete e[n]}}r.PluginConfigDevicesRenderer=t},102:(e,r,i)=>{Object.defineProperty(r,"__esModule",{value:!0}),r.PluginConfigNameRenderer=void 0;const n=i(536);class t extends n.PluginConfigRendererBase{render(e){this.componentRenderer.renderTextBox($("#generalSettings"),"name",e.configSchema.schema.properties.name,e.configuration.name,(async r=>{e.configuration.name=r,await this.updatePluginConfig(e)}))}}r.PluginConfigNameRenderer=t},653:(e,r)=>{Object.defineProperty(r,"__esModule",{value:!0}),r.PluginConfigRenderer=void 0,r.PluginConfigRenderer=class{renderers;constructor(e){this.renderers=e}render(e){void 0===e.configuration&&(e.configuration={name:void 0,devices:[]}),this.renderers.forEach((r=>r.render(e)))}}},~~536:~~(e,r)=>{Object.defineProperty(r,"__esModule",{value:!0}),r.~~PluginConfigRendererBase~~=void 0,r.~~PluginConfigRendererBase~~=class{~~componentRenderer;constructor~~(e){~~this~~.~~componentRenderer~~=e}~~async updatePluginConfig~~(e){const r=~~this~~.~~clone~~(e.~~configuration~~);~~delete~~ r.~~platform,await~~ e.~~homebridgeProvider~~.~~updatePluginConfig~~([r])}~~clone~~(e)~~{return JSON~~.~~parse~~(~~JSON~~.~~stringify~~(e))}}}},r={};function i(n){var t=r[n];if(void 0!==t)return t.exports;var o=r[n]={exports:{}};return e[n](o,o.exports,i),o.exports}(()=>{const e=i(999),r=i(84),n=i(102),t=i(653);window.renderEcoFlowPluginConfig=async function(i){const o=await i.getPluginConfig(),a=await i.getPluginConfigSchema(),s=o[0],c=new e.ComponentRenderer;new t.PluginConfigRenderer([new n.PluginConfigNameRenderer(c),new r.PluginConfigDevicesRenderer(c)]).render({homebridgeProvider:i,configuration:s,configSchema:a})}})()})();
1	+ (()=>{"use strict";var e={84(e,r,n){Object.defineProperty(r,"__esModule",{value:!0}),r.PluginConfigDevicesRenderer=void 0;const i=n(536);class t extends i.PluginConfigRendererBase{form;$tabs;$tabPanels;_hideDeviceSettingsPerModel;constructor(e){super(e),this.$tabs=$("#devicesTabs"),this.$tabPanels=$("#devicesPanels"),this._hideDeviceSettingsPerModel={"Delta 2":["powerStream","powerOcean","outlet"],"Delta 2 Max":["powerStream","powerOcean","outlet"],"Delta Pro":["powerStream","powerOcean","outlet"],"Delta Pro 3":["powerStream","powerOcean","outlet"],"Delta Pro Ultra":["powerStream","powerOcean","outlet"],Discovery:["battery","powerStream","powerOcean","outlet"],PowerStream:["battery","powerOcean","outlet"],PowerOcean:["battery","powerStream","outlet"],"Smart Plug":["battery","powerStream","powerOcean"],Glacier:["powerStream","powerOcean","outlet"],Wave:["powerStream","powerOcean","outlet"]}}get hideDeviceSettingsPerModel(){return this._hideDeviceSettingsPerModel}render(e){this.renderDevicesSettings({homebridgeProvider:e.homebridgeProvider,configSchema:e.configSchema,configuration:e.configuration,hideDeviceSettingsPerModel:this.hideDeviceSettingsPerModel})}renderDevicesSettings(e,r){$("#devicesLabel").text(e.configSchema.schema.properties.devices.title);const n=!r\|\|r<0?0:r;this.renderDeviceTabs(e,n)}renderDeviceTabs(e,r){this.clearDeviceTabs();const n='\n <li class="nav-item">\n <a class="nav-link {activeClass}" data-toggle="tab" href="#deviceTabPanel{index}" id="deviceTab{index}">{name}</a>\n </li>\n ';e.configuration.devices.forEach((i,t)=>{const o=n.replace(/{activeClass}/g,t===r?"active":"").replace(/{index}/g,t.toString()).replace(/{name}/g,i.name??`Device${t+1}`);this.$tabs.append(o),this.renderDeviceTabPanel(e,i,t,r,this.$tabs.find(`#deviceTab${t}`))}),this.renderAddNewDeviceTab(n,e)}clearDeviceTabs(){this.$tabs.empty(),this.$tabPanels.empty(),this.form?.end()}renderAddNewDeviceTab(e,r){const n=e.replace(/{activeClass}/g,"").replace(/{index}/g,"Add").replace(/{name}/g,"Add Device");this.$tabs.append(n),this.$tabs.find("#deviceTabAdd").on("click",()=>{r.configuration.devices.push(this.getDefaultDeviceConfiguration(r.configSchema)),this.renderDevicesSettings(r,r.configuration.devices.length-1)})}renderDeviceTabPanel(e,r,n,i,t){const o='\n <div class="tab-pane container fade {activeClass} card card-body list-group-item" id="deviceTabPanel{index}">\n <button type="button" class="close pull-right" id="deviceTabPanelClose{index}">\n <span>×</span>\n <span class="sr-only">Close</span>\n </button>\n </div>\n '.replace(/{activeClass}/g,n===i?"in show active":"").replace(/{index}/g,n.toString());this.$tabPanels.append(o);const a=this.$tabPanels.find(`#deviceTabPanel${n}`),s=this.clone(e.configSchema.schema.properties.devices.items),c=s.properties.model;this.renderModelDropDown(t,a,n,e,s,c,r),this.renderRemoveButton(a,n,e),this.renderForm(t,n,i,e,s,r)}renderModelDropDown(e,r,n,i,t,o,a){this.componentRenderer.renderDropDown(r,"model"+n,o,a.model,r=>{a.model=r,this.renderForm(e,n,n,i,t,a)})}renderRemoveButton(e,r,n){e.find(`#deviceTabPanelClose${r}`).on("click",()=>{n.configuration.devices.splice(r,1),this.renderDevicesSettings(n,r-1)})}renderForm(e,r,n,i,t,o){delete(t=this.clone(t)).properties.model,i.hideDeviceSettingsPerModel[o.model].forEach(e=>{delete t.properties[e]}),e.off("click").on("click",()=>{this.form?.end(),this.form=i.homebridgeProvider.createForm({schema:t},o),this.form.onChange(async n=>{const t=i.configuration.devices[r].name;this.applyChanges(i.configuration.devices[r],n,["model"]),await this.updatePluginConfig(i),n.name!==t&&e.text(n.name)})}),r===n&&e.trigger("click")}getDefaultDeviceConfiguration(e){const r={},n=e.schema.properties.devices.items.properties;return Object.keys(n).filter(e=>!!n[e]?.default).forEach(e=>{r[e]=n[e]?.default}),r}applyChanges(e,r,n){Object.assign(e,r);for(const i in e)void 0!==r[i]\|\|n.includes(i)\|\|delete e[i]}}r.PluginConfigDevicesRenderer=t},102(e,r,n){Object.defineProperty(r,"__esModule",{value:!0}),r.PluginConfigNameRenderer=void 0;const i=n(536);class t extends i.PluginConfigRendererBase{render(e){this.componentRenderer.renderTextBox($("#generalSettings"),"name",e.configSchema.schema.properties.name,e.configuration.name,async r=>{e.configuration.name=r,await this.updatePluginConfig(e)})}}r.PluginConfigNameRenderer=t},536(e,r){Object.defineProperty(r,"__esModule",{value:!0}),r.PluginConfigRendererBase=void 0,r.PluginConfigRendererBase=class{componentRenderer;constructor(e){this.componentRenderer=e}async updatePluginConfig(e){const r=this.clone(e.configuration);delete r.platform,await e.homebridgeProvider.updatePluginConfig([r])}clone(e){return JSON.parse(JSON.stringify(e))}}},653(e,r){Object.defineProperty(r,"__esModule",{value:!0}),r.PluginConfigRenderer=void 0,r.PluginConfigRenderer=class{renderers;constructor(e){this.renderers=e}render(e){void 0===e.configuration&&(e.configuration={name:void 0,devices:[]}),this.renderers.forEach(r=>r.render(e))}}},999(e,r){Object.defineProperty(r,"__esModule",{value:!0}),r.ComponentRenderer=void 0,r.ComponentRenderer=class{renderTextBox(e,r,n,i,t){const o='\n <div class="form-group">\n <label for="device{id}" class="{requiredClass}">{title}</label>\n <input type="text" class="form-control" id="device{id}" placeholder="{description}" required="{required}" />\n </div>'.replace(/{id}/g,r).replace(/{title}/g,n.title).replace(/{description}/g,n.description??"").replace(/{requiredClass}/g,n.required?"required-label":"").replace(/{required}/g,(n.required??!1).toString());e.append(o);const a=e.find(`#device${r}`);a.val(i),a.on("change",()=>t(a.val()?.toString()\|\|""))}renderDropDown(e,r,n,i,t){const o='\n <div class="form-group">\n <label for="device{id}" class="{requiredClass}">{title}</label>\n <select class="form-control" id="device{id}" required="{required}"></select>\n </div>'.replace(/{id}/g,r).replace(/{title}/g,n.title).replace(/{requiredClass}/g,n.required?"required-label":"").replace(/{required}/g,(n.required??!1).toString());e.append(o);const a=e.find(`#device${r}`);n.enum.forEach(e=>{const r=$("<option>").val(e).text(e);a.append(r)}),a.val(i),a.on("change",()=>t(a.val()?.toString()\|\|""))}}}},r={};function n(i){var t=r[i];if(void 0!==t)return t.exports;var o=r[i]={exports:{}};return e[i](o,o.exports,n),o.exports}(()=>{const e=n(999),r=n(84),i=n(102),t=n(653);window.renderEcoFlowPluginConfig=async function(n){const o=await n.getPluginConfig(),a=await n.getPluginConfigSchema(),s=o[0],c=new e.ComponentRenderer;new t.PluginConfigRenderer([new i.PluginConfigNameRenderer(c),new r.PluginConfigDevicesRenderer(c)]).render({homebridgeProvider:n,configuration:s,configSchema:a})}})()})();

package/dist/platform.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { API, Characteristic, DynamicPlatformPlugin, HAP, Logging, PlatformAccessory, PlatformConfig, Service } from 'homebridge';
+import { API, Characteristic, DynamicPlatformPlugin, Logging, PlatformAccessory, PlatformConfig, Service } from 'homebridge';
 import { CustomCharacteristics } from '@ecoflow/characteristics/customCharacteristic';
 /**
  * HomebridgePlatform
@@ -18,7 +18,7 @@ export declare class EcoFlowHomebridgePlatform implements DynamicPlatformPlugin
     private readonly mqttApiManager;
     private readonly batteryStatusProvider;
     constructor(commonLog: Logging, config: PlatformConfig, api: API);
-    static InitCustomCharacteristics(hap: HAP): void;
+    static InitCharacteristics(api: API): void;
     /**
      * This function is invoked when homebridge restores cached accessories from disk at startup.
      * It should be used to set up event handlers for characteristics and update respective values.

package/dist/platform.js CHANGED Viewed

@@ -12,8 +12,11 @@ const powerStreamAccessory_1 = require("@ecoflow/accessories/powerstream/powerSt
 const powerStreamSimulator_1 = require("@ecoflow/accessories/powerstream/simulations/powerStreamSimulator");
 const smartPlugSimulator_1 = require("@ecoflow/accessories/smartplug/simulations/smartPlugSimulator");
 const smartPlugAccessory_1 = require("@ecoflow/accessories/smartplug/smartPlugAccessory");
+const waveSimulator_1 = require("@ecoflow/accessories/wave/simulations/waveSimulator");
+const waveAccessory_1 = require("@ecoflow/accessories/wave/waveAccessory");
 const ecoFlowHttpApiManager_1 = require("@ecoflow/apis/ecoFlowHttpApiManager");
 const ecoFlowMqttApiManager_1 = require("@ecoflow/apis/ecoFlowMqttApiManager");
+const characteristicExtensions_1 = require("@ecoflow/characteristics/characteristicExtensions");
 const customCharacteristic_1 = require("@ecoflow/characteristics/customCharacteristic");
 const config_1 = require("@ecoflow/config");
 const batteryStatusProvider_1 = require("@ecoflow/helpers/batteryStatusProvider");
@@ -36,7 +39,7 @@ class EcoFlowHomebridgePlatform {
         this.commonLog = commonLog;
         this.config = config;
         this.api = api;
-        EcoFlowHomebridgePlatform.InitCustomCharacteristics(api.hap);
+        EcoFlowHomebridgePlatform.InitCharacteristics(api);
         this.ecoFlowConfig = this.config;
         this.Service = api.hap.Service;
         this.Characteristic = {
@@ -57,11 +60,9 @@ class EcoFlowHomebridgePlatform {
             this.registerDevices();
         });
     }
-    static InitCustomCharacteristics(hap) {
-        customCharacteristic_1.CustomCharacteristics.PowerConsumption.InputConsumptionWatts = (0, customCharacteristic_1.InputConsumptionWattFactory)(hap);
-        customCharacteristic_1.CustomCharacteristics.PowerConsumption.OutputConsumptionWatts = (0, customCharacteristic_1.OutputConsumptionWattFactory)(hap);
-        customCharacteristic_1.CustomCharacteristics.PowerConsumption.OutputVoltage = (0, customCharacteristic_1.OutputVoltageFactory)(hap);
-        customCharacteristic_1.CustomCharacteristics.PowerConsumption.OutputCurrent = (0, customCharacteristic_1.OutputCurrentFactory)(hap);
+    static InitCharacteristics(api) {
+        (0, customCharacteristic_1.InitCustomCharacteristics)(api.hap);
+        (0, characteristicExtensions_1.InitCharacteristicExtensions)(api);
     }
     /**
      * This function is invoked when homebridge restores cached accessories from disk at startup.
@@ -209,6 +210,10 @@ class EcoFlowHomebridgePlatform {
                 EcoFlowAccessoryType = smartPlugAccessory_1.SmartPlugAccessory;
                 EcoFlowAccessorySimulatorType = smartPlugSimulator_1.SmartPlugSimulator;
                 break;
+            case config_1.DeviceModel.Wave:
+                EcoFlowAccessoryType = waveAccessory_1.WaveAccessory;
+                EcoFlowAccessorySimulatorType = waveSimulator_1.WaveSimulator;
+                break;
             default:
                 log.warn(`"${config.model}" is not supported. Ignoring the device`);
         }

package/dist/platform.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":";;;~~AAYA~~,2FAAwF;AACxF,iGAA8F;AAC9F,uGAAoG;AACpG,oGAAiG;AACjG,gHAA6G;AAC7G,0FAAuF;AACvF,sGAAmG;AAEnG,gGAA6F;AAC7F,4GAAyG;AACzG,sGAAmG;AACnG,0FAAuF;AACvF,+EAA4E;AAC5E,+EAA4E;AAE5E,~~wFAMuD~~;~~AACvD~~,4CAA2E;AAC3E,kFAA+E;AAC/E,oDAAiD;AACjD,0EAAuE;AACvE,gDAA+D;AAU/D,MAAa,yBAAyB;~~IAiBjB~~;IACD;IACA;~~IAlBD~~,aAAa,CAAgB;IAC9B,OAAO,CAAiB;IACxB,cAAc,CAAwB;IAEtD,oDAAoD;IACpC,WAAW,GAAwB,EAAE,CAAC;IAErC,cAAc,GAA0B,IAAI,6CAAqB,EAAE,CAAC;IACpE,cAAc,GAA0B,IAAI,6CAAqB,~~CAChF~~,IAAI,CAAC,cAAc,~~EACnB~~,IAAI,qCAAiB,EAAE,~~CACxB~~,CAAC;~~IAEe~~,qBAAqB,GAA0B,IAAI,6CAAqB,EAAE,CAAC;IAE5F,YACmB,SAAkB,EACnB,MAAsB,EACtB,GAAQ;QAFP,cAAS,GAAT,SAAS,CAAS;QACnB,WAAM,GAAN,MAAM,CAAgB;QACtB,QAAG,GAAH,GAAG,CAAK;QAExB,yBAAyB,CAAC,~~yBAAyB~~,CAAC,GAAG,CAAC,~~GAAG,~~CAAC~~,CAAC~~;~~QAC7D~~,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,MAAuB,CAAC;QAClD,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC;QAC/B,IAAI,CAAC,cAAc,GAAG;YACpB,GAAG,GAAG,CAAC,GAAG,CAAC,cAAc;YACzB,GAAG,4CAAqB;SACW,CAAC;QAEtC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,iCAAiC,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAE9E,8FAA8F;QAC9F,uFAAuF;QACvF,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;YAC5B,IAAI,CAAC,SAAS,CAAC,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC;QAC1C,CAAC;QAED,8FAA8F;QAC9F,4FAA4F;QAC5F,2FAA2F;QAC3F,yCAAyC;QACzC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,oBAAoB,EAAE,GAAG,EAAE;YACrC,IAAI,CAAC,eAAe,EAAE,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,~~yBAAyB~~,CAAC,GAAQ;~~QAC9C~~,~~4CAAqB,CAAC,gBAAgB,CAAC,qBAAqB,GAAG,~~IAAA,~~kDAA2B~~,EAAC,GAAG,CAAC,~~CAAC;QAChG,4CAAqB,CAAC,gBAAgB,CAAC,sBAAsB,~~GAAG,~~IAAA,mDAA4B,EAAC,GAAG,~~CAAC,CAAC;~~QAClG~~,~~4CAAqB,CAAC,gBAAgB,CAAC,aAAa,GAAG,~~IAAA,~~2CAAoB~~,EAAC,GAAG,CAAC,CAAC;~~QACjF~~,~~4CAAqB,~~CAAC~~,gBAAgB,CAAC,aAAa,GAAG,IAAA,2CAAoB,EAAC,GAAG,CAAC,CAAC~~;~~IACnF,CAAC;~~IAED;;;OAGG;IACI,kBAAkB,CAAC,SAA4B;QACpD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,+BAA+B,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QAE5E,yGAAyG;QACzG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACnC,CAAC;IAEO,oBAAoB,CAAC,MAAoB;QAC/C,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;YAC7B,OAAO,oBAAoB,CAAC;QAC9B,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO,oCAAoC,CAAC;QAC9C,CAAC;QAED,IAAI,MAAM,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACtC,OAAO,4CAA4C,CAAC;QACtD,CAAC;QAED,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,yCAAyC,CAAC;QACnD,CAAC;QAED,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACnC,OAAO,yCAAyC,CAAC;QACnD,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,eAAe;QACrB,MAAM,IAAI,GAA4B,EAAE,CAAC;QACzC,MAAM,qBAAqB,GAAwB,EAAE,CAAC;QACtD,MAAM,4BAA4B,GAA2B,EAAE,CAAC;QAChE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;YAChC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;YAClD,OAAO;QACT,CAAC;QACD,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;YAChD,MAAM,GAAG,GAAG,eAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YACvD,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;YAC5D,IAAI,iBAAiB,KAAK,SAAS,EAAE,CAAC;gBACpC,GAAG,CAAC,IAAI,CAAC,GAAG,iBAAiB,uBAAuB,CAAC,CAAC;gBACtD,SAAS;YACX,CAAC;YAED,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,IAAI,~~CAClD~~,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,YAAY,KAAK,MAAM,CAAC,YAAY,~~CACjF~~,CAAC;~~YACF~~,IAAI,iBAAiB,EAAE,CAAC;gBACtB,GAAG,CAAC,IAAI,CAAC,4BAA4B,MAAM,CAAC,YAAY,uCAAuC,CAAC,CAAC;gBACjG,SAAS;YACX,CAAC;YAED,uEAAuE;YACvE,0EAA0E;YAC1E,wBAAwB;YACxB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAE7D,uFAAuF;YACvF,wEAAwE;YACxE,IAAI,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAC5E,IAAI,gBAAgB,GAAgC,IAAI,CAAC;YACzD,IAAI,SAAS,EAAE,CAAC;gBACd,GAAG,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;gBACpD,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACN,CAAC,EAAE,SAAS,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;YAC3E,CAAC;YACD,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACtC,IAAI,gBAAgB,EAAE,CAAC;gBACrB,4BAA4B,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YACtD,CAAC;YACD,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,GAAG,GAAG,CAAC;QACpC,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,qBAAqB,EAAE,4BAA4B,EAAE,IAAI,CAAC,CAAC;IACjF,CAAC;IAEO,YAAY,CAClB,GAAY,EACZ,MAAoB,EACpB,IAAY;QAEZ,GAAG,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACjC,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACpE,SAAS,CAAC,OAAO,CAAC,YAAY,GAAG,MAAM,CAAC;QACxC,MAAM,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAEtE,IAAI,gBAAgB,EAAE,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,sBAAW,EAAE,wBAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;QAChF,CAAC;QACD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,CAAC;IACzC,CAAC;IAEO,cAAc,CACpB,qBAA0C,EAC1C,4BAAoD,EACpD,IAA6B;QAE7B,MAAM,kBAAkB,GAAwB,EAAE,CAAC;QACnD,IAAI,CAAC,WAAW;aACb,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,qBAAqB,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;aAC/D,OAAO,CAAC,SAAS,CAAC,EAAE;YACnB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,8BAA8B,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;YAC3E,IAAI,CAAC,GAAG,CAAC,6BAA6B,CAAC,sBAAW,EAAE,wBAAa,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;YAChF,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QACL,MAAM,kBAAkB,GAAG,4BAA4B,CAAC,MAAM,~~CAC5D~~,gBAAgB,CAAC,EAAE,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,gBAAgB,CAAC,SAAS,CAAC,~~CAC7E~~,CAAC;~~QACF~~,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,WAAmC,EAAE,IAA6B;QACzF,KAAK,MAAM,SAAS,IAAI,WAAW,EAAE,CAAC;YACpC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YACrE,MAAM,SAAS,CAAC,UAAU,EAAE,CAAC;YAC7B,IAAI,SAAS,CAAC,MAAM,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACvC,MAAM,SAAS,CAAC,uBAAuB,EAAE,CAAC;YAC5C,CAAC;YACD,MAAM,SAAS,CAAC,eAAe,EAAE,CAAC;QACpC,CAAC;IACH,CAAC;IAEO,eAAe,~~CACrB~~,SAA4C,~~EAC5C~~,MAAoB,~~EACpB~~,GAAY;~~QAEZ~~,IAAI,oBAAoB,GAAgC,IAAI,CAAC;QAC7D,IAAI,6BAA6B,GAA8C,SAAS,CAAC;QACzF,QAAQ,MAAM,CAAC,KAAK,EAAE,CAAC;YACrB,KAAK,oBAAW,CAAC,SAAS;gBACxB,oBAAoB,GAAG,uCAAkB,CAAC;gBAC1C,6BAA6B,GAAG,iCAAe,CAAC;gBAChD,MAAM;YACR,KAAK,oBAAW,CAAC,MAAM;gBACrB,oBAAoB,GAAG,iCAAe,CAAC;gBACvC,6BAA6B,GAAG,iCAAe,CAAC;gBAChD,MAAM;YACR,6BAA6B;YAC7B,6CAA6C;YAC7C,sDAAsD;YACtD,UAAU;YACV,KAAK,oBAAW,CAAC,SAAS;gBACxB,oBAAoB,GAAG,uCAAkB,CAAC;gBAC1C,6BAA6B,GAAG,uCAAkB,CAAC;gBACnD,MAAM;YACR,kCAAkC;YAClC,mDAAmD;YACnD,4DAA4D;YAC5D,WAAW;YACX,KAAK,oBAAW,CAAC,SAAS;gBACxB,oBAAoB,GAAG,uCAAkB,CAAC;gBAC1C,6BAA6B,GAAG,uCAAkB,CAAC;gBACnD,MAAM;YACR,4BAA4B;YAC5B,6CAA6C;YAC7C,sDAAsD;YACtD,WAAW;YACX,+BAA+B;YAC/B,gDAAgD;YAChD,yDAAyD;YACzD,WAAW;YACX,KAAK,oBAAW,CAAC,WAAW;gBAC1B,oBAAoB,GAAG,2CAAoB,CAAC;gBAC5C,6BAA6B,GAAG,2CAAoB,CAAC;gBACrD,MAAM;YACR,KAAK,oBAAW,CAAC,SAAS;gBACxB,oBAAoB,GAAG,uCAAkB,CAAC;gBAC1C,6BAA6B,GAAG,uCAAkB,CAAC;gBACnD,MAAM;YACR;gBACE,GAAG,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,yCAAyC,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,CAAC,SAAS,GAAG,6BAA6B,CAAC;QACjD,IAAI,oBAAoB,KAAK,IAAI,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,oBAAoB,~~CAC7B~~,IAAI,~~EACJ~~,SAAS,~~EACT~~,MAAM,~~EACN~~,GAAG,~~EACH~~,IAAI,CAAC,cAAc,~~EACnB~~,IAAI,CAAC,cAAc,~~EACnB~~,IAAI,CAAC,qBAAqB,~~CAC3B~~,CAAC;~~IACJ~~,CAAC;CACF;~~AAtPD~~,~~8DAsPC~~"}
1	+ {"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}

package/dist/services/fanPositionedService.d.ts ADDED Viewed

@@ -0,0 +1,14 @@
+import { EcoFlowAccessoryBase } from '@ecoflow/accessories/ecoFlowAccessoryBase';
+import { Enum } from '@ecoflow/apis/interfaces/generalContacts';
+import { FanServiceBase } from '@ecoflow/services/fanServiceBase';
+export declare abstract class FanPositionedServiceBase<TPositionType, TPositionTypeObj extends Enum> extends FanServiceBase {
+    private readonly positionLength;
+    private readonly positionValues;
+    constructor(ecoFlowAccessory: EcoFlowAccessoryBase, serviceSubType: string, positionTypeObj: TPositionTypeObj);
+    updatePositionedRotationSpeed(value: TPositionType): void;
+    updateRotationSpeed(value: number): void;
+    protected processOnSetRotationSpeed(value: number, revert: () => void): Promise<void>;
+    protected abstract processOnSetPositionedRotationSpeed(value: TPositionType, revert: () => void): Promise<void>;
+    private covertToPositionedValue;
+    private covertFromPositionedValue;
+}

package/dist/services/fanPositionedService.js ADDED Viewed

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FanPositionedServiceBase = void 0;
+const fanServiceBase_1 = require("@ecoflow/services/fanServiceBase");
+class FanPositionedServiceBase extends fanServiceBase_1.FanServiceBase {
+    positionLength;
+    positionValues;
+    constructor(ecoFlowAccessory, serviceSubType, positionTypeObj) {
+        super(ecoFlowAccessory, 100, serviceSubType);
+        this.positionValues = Object.values(positionTypeObj)
+            .filter(v => typeof v === 'number')
+            .map(v => v);
+        this.positionLength = 100 / this.positionValues.length;
+    }
+    updatePositionedRotationSpeed(value) {
+        super.updateRotationSpeed(this.covertFromPositionedValue(value));
+    }
+    updateRotationSpeed(value) {
+        super.updateRotationSpeed(this.covertFromPositionedValue(this.covertToPositionedValue(value)));
+    }
+    async processOnSetRotationSpeed(value, revert) {
+        const positionedValue = this.covertToPositionedValue(value);
+        await this.processOnSetPositionedRotationSpeed(positionedValue, revert);
+    }
+    covertToPositionedValue(value) {
+        const pos = Math.floor(value / this.positionLength);
+        return this.positionValues[Math.max(0, pos - 1)];
+    }
+    covertFromPositionedValue(value) {
+        const pos = value;
+        return Math.round((pos + 1) * this.positionLength);
+    }
+}
+exports.FanPositionedServiceBase = FanPositionedServiceBase;
+//# sourceMappingURL=fanPositionedService.js.map

package/dist/services/fanPositionedService.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"fanPositionedService.js","sourceRoot":"","sources":["../../src/services/fanPositionedService.ts"],"names":[],"mappings":";;;AAEA,qEAAkE;AAElE,MAAsB,wBAAuE,SAAQ,+BAAc;IAChG,cAAc,CAAS;IACvB,cAAc,CAAkB;IACjD,YAAY,gBAAsC,EAAE,cAAsB,EAAE,eAAiC;QAC3G,KAAK,CAAC,gBAAgB,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC;QAC7C,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;aACjD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC;aAClC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAkB,CAAC,CAAC;QAChC,IAAI,CAAC,cAAc,GAAG,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;IACzD,CAAC;IAEM,6BAA6B,CAAC,KAAoB;QACvD,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC,CAAC;IACnE,CAAC;IAEM,mBAAmB,CAAC,KAAa;QACtC,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjG,CAAC;IAEkB,KAAK,CAAC,yBAAyB,CAAC,KAAa,EAAE,MAAkB;QAClF,MAAM,eAAe,GAAG,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QAC5D,MAAM,IAAI,CAAC,mCAAmC,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IAC1E,CAAC;IAIO,uBAAuB,CAAC,KAAa;QAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACnD,CAAC;IAEO,yBAAyB,CAAC,KAAoB;QACpD,MAAM,GAAG,GAAG,KAA0B,CAAC;QACvC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC;IACrD,CAAC;CACF;AAnCD,4DAmCC"}

package/dist/services/fanPositionedService.spec.d.ts ADDED Viewed

@@ -0,0 +1,6 @@
+export declare enum MockFanSpeedType {
+    Level1 = 0,
+    Level2 = 1,
+    Level3 = 2,
+    Level4 = 3
+}

package/dist/services/fanServiceBase.d.ts CHANGED Viewed

@@ -13,6 +13,6 @@ export declare abstract class FanServiceBase extends ServiceBase {
     updateState(state: boolean): void;
     updateRotationSpeed(value: number): void;
     protected setRotationSpeed(value: number): void;
-    protected abstract processOnSetOn(value: boolean, revert: () => void): Promise<void>;
-    protected abstract processOnSetRotationSpeed(value: number, revert: () => void): Promise<void>;
+    protected processOnSetOn(value: boolean, revert: () => void): Promise<void>;
+    protected processOnSetRotationSpeed(value: number, revert: () => void): Promise<void>;
 }

package/dist/services/fanServiceBase.js CHANGED Viewed

@@ -17,18 +17,26 @@ class FanServiceBase extends serviceBase_1.ServiceBase {
     addCharacteristics() {
         const onCharacteristic = this.addCharacteristic(this.platform.Characteristic.On)
             .onGet(() => this.processOnGet(this.state))
-            .onSet(value => this.processOnSet(this.platform.Characteristic.On.name, () => {
-            this.state = value;
-            this.processOnSetOn(this.state, () => this.updateState(!this.state));
-        }));
+            .onSet(value => {
+            this.processOnSetVerify(this.platform.Characteristic.On.name);
+            const revert = () => this.updateState(!value);
+            this.processOnSet(async () => {
+                this.state = value;
+                await this.processOnSetOn(this.state, revert);
+            }, revert);
+        });
         this.rotationSpeedCharacteristic = this.addCharacteristic(this.platform.Characteristic.RotationSpeed)
             .onGet(() => this.processOnGet(this.rotationSpeedPercents))
-            .onSet(percents => this.processOnSet(this.platform.Characteristic.RotationSpeed.name, () => {
-            this.rotationSpeedPercents = percents;
+            .onSet(percents => {
+            this.processOnSetVerify(this.platform.Characteristic.RotationSpeed.name);
             const prevRotationSpeed = this.rotationSpeed;
-            this.rotationSpeed = this.covertPercentsToValue(this.rotationSpeedPercents, this.maxRotationSpeed);
-            this.processOnSetRotationSpeed(this.rotationSpeed, () => this.updateRotationSpeed(prevRotationSpeed));
-        }));
+            const revert = () => this.updateRotationSpeed(prevRotationSpeed);
+            this.processOnSet(async () => {
+                this.rotationSpeedPercents = percents;
+                this.rotationSpeed = this.covertPercentsToValue(this.rotationSpeedPercents, this.maxRotationSpeed);
+                await this.processOnSetRotationSpeed(this.rotationSpeed, revert);
+            }, revert);
+        });
         return [onCharacteristic, this.rotationSpeedCharacteristic];
     }
     updateState(state) {
@@ -43,6 +51,16 @@ class FanServiceBase extends serviceBase_1.ServiceBase {
     setRotationSpeed(value) {
         this.rotationSpeedCharacteristic?.setValue(value);
     }
+    /* istanbul ignore next */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    processOnSetOn(value, revert) {
+        return Promise.resolve();
+    }
+    /* istanbul ignore next */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    processOnSetRotationSpeed(value, revert) {
+        return Promise.resolve();
+    }
 }
 exports.FanServiceBase = FanServiceBase;
 //# sourceMappingURL=fanServiceBase.js.map

package/dist/services/fanServiceBase.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"fanServiceBase.js","sourceRoot":"","sources":["../../src/services/fanServiceBase.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAG5D,MAAsB,cAAe,SAAQ,yBAAW;IAOjC;IACF;IAPX,KAAK,GAAY,KAAK,CAAC;IACvB,qBAAqB,GAAW,CAAC,CAAC;IAClC,aAAa,GAAG,CAAC,CAAC;IAClB,2BAA2B,GAA0B,IAAI,CAAC;IAElE,YACqB,gBAAsC,EACxC,gBAAwB,EACzC,cAAsB;QAEtB,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QAJ5D,qBAAgB,GAAhB,gBAAgB,CAAsB;QACxC,qBAAgB,GAAhB,gBAAgB,CAAQ;IAI3C,CAAC;IAEkB,kBAAkB;QACnC,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;aAC7E,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC1C,KAAK,CAAC,KAAK,CAAC,EAAE,~~CACb,~~IAAI,CAAC,~~YAAY~~,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,IAAI,~~EAAE~~,GAAG,EAAE~~;YAC3D~~,IAAI,CAAC,~~KAAK~~,~~GAAG~~,~~KAAgB~~,CAAC;~~YAC9B~~,IAAI,CAAC,~~cAAc~~,CAAC,IAAI,CAAC,KAAK,~~EAAE,~~GAAG,~~EAAE~~,CAAC,IAAI,CAAC,~~WAAW~~,CAAC,~~CAAC,~~IAAI,CAAC,KAAK,~~CAAC~~,CAAC,CAAC;~~QACvE~~,CAAC,CAAC,~~CACH~~,CAAC;~~QAEJ~~,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAC;aAClG,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;aAC1D,KAAK,CAAC,QAAQ,CAAC,EAAE,~~CAChB,~~IAAI,CAAC,~~YAAY~~,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAC,IAAI,~~EAAE~~,GAAG,~~EAAE~~;~~YACtE~~,IAAI,CAAC,~~qBAAqB~~,~~GAAG~~,~~QAAkB~~,CAAC;~~YAChD~~,~~MAAM~~,~~iBAAiB~~,~~GAAG~~,IAAI,CAAC,~~aAAa~~,CAAC;~~YAC7C~~,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;~~YACnG~~,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,aAAa,EAAE,~~GAAG~~,~~EAAE,~~CAAC,~~IAAI,~~CAAC,~~mBAAmB,~~CAAC,~~iBAAiB~~,~~CAAC~~,CAAC,CAAC;~~QACxG~~,CAAC,CAAC,~~CACH,~~CAAC;~~QAEJ~~,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAC9D,CAAC;IAEM,WAAW,CAAC,KAAc;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7E,CAAC;IAEM,mBAAmB,CAAC,KAAa;QACtC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACtF,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,EAAE,eAAe,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACnH,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;IAC7B,CAAC;IAES,gBAAgB,CAAC,KAAa;QACtC,IAAI,CAAC,2BAA2B,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpD,CAAC;~~CAKF~~;~~AAxDD~~,~~wCAwDC~~"}
1	+ {"version":3,"file":"fanServiceBase.js","sourceRoot":"","sources":["../../src/services/fanServiceBase.ts"],"names":[],"mappings":"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"}

package/dist/services/lightBulbServiceBase.d.ts CHANGED Viewed

@@ -13,6 +13,6 @@ export declare abstract class LightBulbServiceBase extends ServiceBase {
     updateState(state: boolean): void;
     updateBrightness(value: number): void;
     protected setBrightness(value: number): void;
-    protected abstract processOnSetOn(value: boolean, revert: () => void): Promise<void>;
-    protected abstract processOnSetBrightness(value: number, revert: () => void): Promise<void>;
+    protected processOnSetOn(value: boolean, revert: () => void): Promise<void>;
+    protected processOnSetBrightness(value: number, revert: () => void): Promise<void>;
 }

package/dist/services/lightBulbServiceBase.js CHANGED Viewed

@@ -17,18 +17,26 @@ class LightBulbServiceBase extends serviceBase_1.ServiceBase {
     addCharacteristics() {
         const onCharacteristic = this.addCharacteristic(this.platform.Characteristic.On)
             .onGet(() => this.processOnGet(this.state))
-            .onSet(value => this.processOnSet(this.platform.Characteristic.On.name, () => {
-            this.state = value;
-            this.processOnSetOn(this.state, () => this.updateState(!this.state));
-        }));
+            .onSet(value => {
+            this.processOnSetVerify(this.platform.Characteristic.On.name);
+            const revert = () => this.updateState(!value);
+            this.processOnSet(async () => {
+                this.state = value;
+                await this.processOnSetOn(this.state, revert);
+            }, revert);
+        });
         this.brightnessCharacteristic = this.addCharacteristic(this.platform.Characteristic.Brightness)
             .onGet(() => this.processOnGet(this.brightnessPercents))
-            .onSet(percents => this.processOnSet(this.platform.Characteristic.Brightness.name, () => {
-            this.brightnessPercents = percents;
+            .onSet(percents => {
+            this.processOnSetVerify(this.platform.Characteristic.Brightness.name);
             const prevBrightness = this.brightness;
-            this.brightness = this.covertPercentsToValue(this.brightnessPercents, this.maxBrightness);
-            this.processOnSetBrightness(this.brightness, () => this.updateBrightness(prevBrightness));
-        }));
+            const revert = () => this.updateBrightness(prevBrightness);
+            this.processOnSet(async () => {
+                this.brightnessPercents = percents;
+                this.brightness = this.covertPercentsToValue(this.brightnessPercents, this.maxBrightness);
+                await this.processOnSetBrightness(this.brightness, revert);
+            }, revert);
+        });
         return [onCharacteristic, this.brightnessCharacteristic];
     }
     updateState(state) {
@@ -43,6 +51,16 @@ class LightBulbServiceBase extends serviceBase_1.ServiceBase {
     setBrightness(value) {
         this.brightnessCharacteristic?.setValue(value);
     }
+    /* istanbul ignore next */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    processOnSetOn(value, revert) {
+        return Promise.resolve();
+    }
+    /* istanbul ignore next */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    processOnSetBrightness(value, revert) {
+        return Promise.resolve();
+    }
 }
 exports.LightBulbServiceBase = LightBulbServiceBase;
 //# sourceMappingURL=lightBulbServiceBase.js.map

package/dist/services/lightBulbServiceBase.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"lightBulbServiceBase.js","sourceRoot":"","sources":["../../src/services/lightBulbServiceBase.ts"],"names":[],"mappings":";;;AACA,+DAA4D;AAG5D,MAAsB,oBAAqB,SAAQ,yBAAW;IAOvC;IACF;IAPX,KAAK,GAAY,KAAK,CAAC;IACvB,kBAAkB,GAAW,CAAC,CAAC;IAC/B,UAAU,GAAW,CAAC,CAAC;IACvB,wBAAwB,GAA0B,IAAI,CAAC;IAE/D,YACqB,gBAAsC,EACxC,aAAqB,EACtC,cAAsB;QAEtB,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QAJlE,qBAAgB,GAAhB,gBAAgB,CAAsB;QACxC,kBAAa,GAAb,aAAa,CAAQ;IAIxC,CAAC;IAEkB,kBAAkB;QACnC,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;aAC7E,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC1C,KAAK,CAAC,KAAK,CAAC,EAAE,~~CACb,~~IAAI,CAAC,~~YAAY~~,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,IAAI,~~EAAE~~,GAAG,EAAE~~;YAC3D~~,IAAI,CAAC,~~KAAK~~,~~GAAG~~,~~KAAgB~~,CAAC;~~YAC9B~~,IAAI,CAAC,~~cAAc~~,CAAC,IAAI,CAAC,KAAK,~~EAAE,~~GAAG,~~EAAE~~,CAAC,IAAI,CAAC,~~WAAW~~,CAAC,~~CAAC,~~IAAI,CAAC,KAAK,~~CAAC~~,CAAC,CAAC;~~QACvE~~,CAAC,CAAC,~~CACH~~,CAAC;~~QAEJ~~,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC;aAC5F,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;aACvD,KAAK,CAAC,QAAQ,CAAC,EAAE,~~CAChB,~~IAAI,CAAC,~~YAAY~~,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,~~EAAE~~,GAAG,~~EAAE~~;~~YACnE~~,IAAI,CAAC,~~kBAAkB~~,~~GAAG~~,~~QAAkB~~,CAAC;~~YAC7C~~,~~MAAM~~,~~cAAc~~,~~GAAG~~,IAAI,CAAC,~~UAAU~~,CAAC;~~YACvC~~,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;~~YAC1F~~,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,UAAU,EAAE,~~GAAG~~,~~EAAE,~~CAAC,~~IAAI,~~CAAC,~~gBAAgB,~~CAAC,~~cAAc~~,~~CAAC~~,CAAC,CAAC;~~QAC5F~~,CAAC,CAAC,~~CACH,~~CAAC;~~QAEJ~~,OAAO,CAAC,gBAAgB,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAC3D,CAAC;IAEM,WAAW,CAAC,KAAc;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7E,CAAC;IAEM,gBAAgB,CAAC,KAAa;QACnC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAChF,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,UAAU,EAAE,YAAY,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC1G,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC1B,CAAC;IAES,aAAa,CAAC,KAAa;QACnC,IAAI,CAAC,wBAAwB,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;~~CAKF~~;~~AAxDD~~,~~oDAwDC~~"}
1	+ {"version":3,"file":"lightBulbServiceBase.js","sourceRoot":"","sources":["../../src/services/lightBulbServiceBase.ts"],"names":[],"mappings":"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"}

package/dist/services/outletBatteryServiceBase.d.ts CHANGED Viewed

@@ -1,11 +1,12 @@
 import { EcoFlowAccessoryBase } from '@ecoflow/accessories/ecoFlowAccessoryBase';
+import { CharacteristicPermsType } from '@ecoflow/characteristics/characteristicContracts';
 import { AdditionalBatteryCharacteristicType as BatteryCharacteristicType } from '@ecoflow/config';
 import { BatteryStatusProvider } from '@ecoflow/helpers/batteryStatusProvider';
 import { OutletServiceBase } from '@ecoflow/services/outletServiceBase';
 import { Characteristic } from 'homebridge';
 export declare abstract class OutletBatteryServiceBase extends OutletServiceBase {
     private readonly batteryStatusProvider;
-    constructor(ecoFlowAccessory: EcoFlowAccessoryBase, batteryStatusProvider: BatteryStatusProvider, serviceSubType: string, additionalCharacteristics?: BatteryCharacteristicType[]);
+    constructor(ecoFlowAccessory: EcoFlowAccessoryBase, batteryStatusProvider: BatteryStatusProvider, serviceSubType: string, onCharacteristicPermsType: CharacteristicPermsType, additionalCharacteristics?: BatteryCharacteristicType[]);
     updateInputConsumption(watt: number): void;
     updateBatteryLevel(batteryLevel: number, dischargeLimit: number): void;
     updateChargingState(isCharging: boolean): void;

package/dist/services/outletBatteryServiceBase.js CHANGED Viewed

@@ -5,8 +5,8 @@ const config_1 = require("@ecoflow/config");
 const outletServiceBase_1 = require("@ecoflow/services/outletServiceBase");
 class OutletBatteryServiceBase extends outletServiceBase_1.OutletServiceBase {
     batteryStatusProvider;
-    constructor(ecoFlowAccessory, batteryStatusProvider, serviceSubType, additionalCharacteristics) {
-        super(ecoFlowAccessory, additionalCharacteristics, serviceSubType);
+    constructor(ecoFlowAccessory, batteryStatusProvider, serviceSubType, onCharacteristicPermsType, additionalCharacteristics) {
+        super(ecoFlowAccessory, additionalCharacteristics, serviceSubType, onCharacteristicPermsType);
         this.batteryStatusProvider = batteryStatusProvider;
     }
     updateInputConsumption(watt) {

package/dist/services/outletBatteryServiceBase.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"outletBatteryServiceBase.js","sourceRoot":"","sources":["../../src/services/outletBatteryServiceBase.ts"],"names":[],"mappings":";;;~~AACA~~,4CAGyB;AAEzB,2EAAwE;AAGxE,MAAsB,wBAAyB,SAAQ,qCAAiB;IAGnD;IAFnB,YACE,gBAAsC,EACrB,qBAA4C,EAC7D,cAAsB,EACtB,yBAAuD;QAEvD,KAAK,CAAC,gBAAgB,EAAE,yBAAyB,EAAE,cAAc,CAAC,CAAC;~~QAJlD~~,0BAAqB,GAArB,qBAAqB,CAAuB;~~IAK~~/D,CAAC;IAEM,sBAAsB,CAAC,IAAY;QACxC,IAAI,CAAC,0BAA0B,CAC7B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,qBAAqB,EACnE,sBAAsB,EACtB,GAAG,EAAE,CAAC,IAAI,EACV,kDAA+B,CAAC,uBAAuB,CACxD,CAAC;IACJ,CAAC;IAEM,kBAAkB,CAAC,YAAoB,EAAE,cAAsB;QACpE,IAAI,CAAC,0BAA0B,CAC7B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EACzC,kBAAkB,EAClB,GAAG,EAAE,CAAC,YAAY,EAClB,kDAA+B,CAAC,YAAY,CAC7C,CAAC;QACF,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAC5D,CAAC;IAEM,mBAAmB,CAAC,UAAmB;QAC5C,IAAI,CAAC,0BAA0B,CAC7B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,EAC1C,eAAe,EACf,GAAG,EAAE,CAAC,UAAU,EAChB,kDAA+B,CAAC,aAAa,CAC9C,CAAC;IACJ,CAAC;IAEkB,kBAAkB;QACnC,MAAM,eAAe,GAAG,KAAK,CAAC,kBAAkB,EAAE,CAAC;QACnD,MAAM,yBAAyB,GAAG;YAChC,IAAI,CAAC,0BAA0B,CAC7B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,qBAAqB,EACnE,kDAA+B,CAAC,uBAAuB,CACxD;YACD,IAAI,CAAC,0BAA0B,~~CAC7B~~,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,~~EACzC~~,kDAA+B,CAAC,YAAY,~~CAC7C~~;~~YACD~~,IAAI,CAAC,0BAA0B,~~CAC7B~~,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,~~EAC1C~~,kDAA+B,CAAC,aAAa,~~CAC9C~~;~~YACD~~,IAAI,CAAC,0BAA0B,~~CAC7B~~,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,~~EAC7C~~,kDAA+B,CAAC,gBAAgB,~~CACjD~~;~~SACF~~,CAAC;QAEF,OAAO,CAAC,GAAG,eAAe,EAAE,GAAG,yBAAyB,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,cAAc,KAAK,IAAI,CAAC,CAAC;IAC9G,CAAC;IAEO,sBAAsB,CAAC,YAAoB,EAAE,cAAsB;QACzE,IAAI,CAAC,0BAA0B,CAC7B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,EAC7C,kBAAkB,EAClB,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,YAAY,EAAE,cAAc,CAAC,EAChH,kDAA+B,CAAC,gBAAgB,CACjD,CAAC;IACJ,CAAC;CACF;~~AAtED~~,~~4DAsEC~~"}
1	+ {"version":3,"file":"outletBatteryServiceBase.js","sourceRoot":"","sources":["../../src/services/outletBatteryServiceBase.ts"],"names":[],"mappings":";;;AAEA,4CAGyB;AAEzB,2EAAwE;AAGxE,MAAsB,wBAAyB,SAAQ,qCAAiB;IAGnD;IAFnB,YACE,gBAAsC,EACrB,qBAA4C,EAC7D,cAAsB,EACtB,yBAAkD,EAClD,yBAAuD;QAEvD,KAAK,CAAC,gBAAgB,EAAE,yBAAyB,EAAE,cAAc,EAAE,yBAAyB,CAAC,CAAC;QAL7E,0BAAqB,GAArB,qBAAqB,CAAuB;IAM/D,CAAC;IAEM,sBAAsB,CAAC,IAAY;QACxC,IAAI,CAAC,0BAA0B,CAC7B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,qBAAqB,EACnE,sBAAsB,EACtB,GAAG,EAAE,CAAC,IAAI,EACV,kDAA+B,CAAC,uBAAuB,CACxD,CAAC;IACJ,CAAC;IAEM,kBAAkB,CAAC,YAAoB,EAAE,cAAsB;QACpE,IAAI,CAAC,0BAA0B,CAC7B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EACzC,kBAAkB,EAClB,GAAG,EAAE,CAAC,YAAY,EAClB,kDAA+B,CAAC,YAAY,CAC7C,CAAC;QACF,IAAI,CAAC,sBAAsB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;IAC5D,CAAC;IAEM,mBAAmB,CAAC,UAAmB;QAC5C,IAAI,CAAC,0BAA0B,CAC7B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,EAC1C,eAAe,EACf,GAAG,EAAE,CAAC,UAAU,EAChB,kDAA+B,CAAC,aAAa,CAC9C,CAAC;IACJ,CAAC;IAEkB,kBAAkB;QACnC,MAAM,eAAe,GAAG,KAAK,CAAC,kBAAkB,EAAE,CAAC;QACnD,MAAM,yBAAyB,GAAG;YAChC,IAAI,CAAC,0BAA0B,CAC7B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,qBAAqB,EACnE,kDAA+B,CAAC,uBAAuB,CACxD;YACD,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,EAAE,kDAA+B,CAAC,YAAY,CAAC;YACxH,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,aAAa,EAAE,kDAA+B,CAAC,aAAa,CAAC;YAC1H,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,EAAE,kDAA+B,CAAC,gBAAgB,CAAC;SACjI,CAAC;QAEF,OAAO,CAAC,GAAG,eAAe,EAAE,GAAG,yBAAyB,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,cAAc,KAAK,IAAI,CAAC,CAAC;IAC9G,CAAC;IAEO,sBAAsB,CAAC,YAAoB,EAAE,cAAsB;QACzE,IAAI,CAAC,0BAA0B,CAC7B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,EAC7C,kBAAkB,EAClB,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE,YAAY,EAAE,cAAc,CAAC,EAChH,kDAA+B,CAAC,gBAAgB,CACjD,CAAC;IACJ,CAAC;CACF;AA9DD,4DA8DC"}

package/dist/services/outletReadOnlyService.d.ts CHANGED Viewed

@@ -4,5 +4,4 @@ import { BatteryStatusProvider } from '@ecoflow/helpers/batteryStatusProvider';
 import { OutletBatteryServiceBase } from '@ecoflow/services/outletBatteryServiceBase';
 export declare class OutletReadOnlyService extends OutletBatteryServiceBase {
     constructor(ecoFlowAccessory: EcoFlowAccessoryBase, batteryStatusProvider: BatteryStatusProvider, serviceSubType: string, additionalCharacteristics?: CharacteristicType[]);
-    protected processOnSetOn(): Promise<void>;
 }

package/dist/services/outletReadOnlyService.js CHANGED Viewed

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OutletReadOnlyService = void 0;
+const characteristicContracts_1 = require("@ecoflow/characteristics/characteristicContracts");
 const outletBatteryServiceBase_1 = require("@ecoflow/services/outletBatteryServiceBase");
 class OutletReadOnlyService extends outletBatteryServiceBase_1.OutletBatteryServiceBase {
     constructor(ecoFlowAccessory, batteryStatusProvider, serviceSubType, additionalCharacteristics) {
-        super(ecoFlowAccessory, batteryStatusProvider, serviceSubType, additionalCharacteristics);
-    }
-    processOnSetOn() {
-        throw new this.platform.api.hap.HapStatusError(-70404 /* this.platform.api.hap.HAPStatus.READ_ONLY_CHARACTERISTIC */);
+        super(ecoFlowAccessory, batteryStatusProvider, serviceSubType, characteristicContracts_1.CharacteristicPermsType.READ_ONLY, additionalCharacteristics);
     }
 }
 exports.OutletReadOnlyService = OutletReadOnlyService;

package/dist/services/outletReadOnlyService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"outletReadOnlyService.js","sourceRoot":"","sources":["../../src/services/outletReadOnlyService.ts"],"names":[],"mappings":";;;~~AAGA~~,yFAAsF;AAEtF,MAAa,qBAAsB,SAAQ,mDAAwB;IACjE,YACE,gBAAsC,EACtC,qBAA4C,EAC5C,cAAsB,EACtB,yBAAgD;QAEhD,KAAK,CAAC,gBAAgB,EAAE,qBAAqB,EAAE,cAAc,EAAE,~~yBAAyB~~,CAAC,~~CAAC;IAC5F~~,~~CAAC;IAEkB~~,~~cAAc;QAC/B~~,~~MAAM,IAAI,IAAI,~~CAAC,~~QAAQ,~~CAAC~~,GAAG,CAAC,GAAG,CAAC,cAAc,uEAA0D,CAAC~~;~~IAC3G~~,CAAC;CACF;~~AAbD~~,~~sDAaC~~"}
1	+ {"version":3,"file":"outletReadOnlyService.js","sourceRoot":"","sources":["../../src/services/outletReadOnlyService.ts"],"names":[],"mappings":";;;AACA,8FAA2F;AAG3F,yFAAsF;AAEtF,MAAa,qBAAsB,SAAQ,mDAAwB;IACjE,YACE,gBAAsC,EACtC,qBAA4C,EAC5C,cAAsB,EACtB,yBAAgD;QAEhD,KAAK,CAAC,gBAAgB,EAAE,qBAAqB,EAAE,cAAc,EAAE,iDAAuB,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;IAC/H,CAAC;CACF;AATD,sDASC"}

package/dist/services/outletServiceBase.d.ts CHANGED Viewed

@@ -1,16 +1,18 @@
 import { EcoFlowAccessoryBase } from '@ecoflow/accessories/ecoFlowAccessoryBase';
+import { CharacteristicPermsType } from '@ecoflow/characteristics/characteristicContracts';
 import { ServiceBase } from '@ecoflow/services/serviceBase';
 import { Characteristic, CharacteristicValue, WithUUID } from 'homebridge';
 export declare abstract class OutletServiceBase extends ServiceBase {
     private readonly additionalCharacteristics?;
+    private readonly onCharacteristicPermsType;
     private state;
-    constructor(ecoFlowAccessory: EcoFlowAccessoryBase, additionalCharacteristics?: string[] | undefined, serviceSubType?: string);
+    constructor(ecoFlowAccessory: EcoFlowAccessoryBase, additionalCharacteristics?: string[] | undefined, serviceSubType?: string, onCharacteristicPermsType?: CharacteristicPermsType);
     updateState(state: boolean): void;
     updateOutputConsumption(watt: number): void;
     updateOutputVoltage(volt: number): void;
     updateOutputCurrent(ampere: number): void;
     protected addCharacteristics(): Characteristic[];
-    protected abstract processOnSetOn(value: boolean, revert: () => void): Promise<void>;
+    protected processOnSetOn(value: boolean, revert: () => void): Promise<void>;
     protected tryAddCustomCharacteristic(characteristic: WithUUID<{
         new (): Characteristic;
     }>, characteristicType: string): Characteristic | null;

package/dist/services/outletServiceBase.js CHANGED Viewed

@@ -1,14 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OutletServiceBase = void 0;
+const characteristicContracts_1 = require("@ecoflow/characteristics/characteristicContracts");
 const config_1 = require("@ecoflow/config");
 const serviceBase_1 = require("@ecoflow/services/serviceBase");
 class OutletServiceBase extends serviceBase_1.ServiceBase {
     additionalCharacteristics;
+    onCharacteristicPermsType;
     state = false;
-    constructor(ecoFlowAccessory, additionalCharacteristics, serviceSubType) {
+    constructor(ecoFlowAccessory, additionalCharacteristics, serviceSubType, onCharacteristicPermsType = characteristicContracts_1.CharacteristicPermsType.DEFAULT) {
         super(ecoFlowAccessory.platform.Service.Outlet, ecoFlowAccessory, serviceSubType);
         this.additionalCharacteristics = additionalCharacteristics;
+        this.onCharacteristicPermsType = onCharacteristicPermsType;
     }
     updateState(state) {
         this.state = state;
@@ -26,11 +29,16 @@ class OutletServiceBase extends serviceBase_1.ServiceBase {
     }
     addCharacteristics() {
         const onCharacteristic = this.addCharacteristic(this.platform.Characteristic.On)
+            .setPropsPerms(this.onCharacteristicPermsType)
             .onGet(() => this.processOnGet(this.state))
-            .onSet((value) => this.processOnSet(this.platform.Characteristic.On.name, () => {
-            this.state = value;
-            this.processOnSetOn(this.state, () => this.updateState(!this.state));
-        }));
+            .onSet((value) => {
+            this.processOnSetVerify(this.platform.Characteristic.On.name);
+            const revert = () => this.updateState(!value);
+            this.processOnSet(async () => {
+                this.state = value;
+                await this.processOnSetOn(this.state, revert);
+            }, revert);
+        });
         const characteristics = [
             this.addCharacteristic(this.platform.Characteristic.OutletInUse),
             onCharacteristic,
@@ -41,6 +49,11 @@ class OutletServiceBase extends serviceBase_1.ServiceBase {
         this.service.setCharacteristic(this.platform.Characteristic.Name, this.serviceName);
         return characteristics.filter(characteristic => characteristic !== null);
     }
+    /* istanbul ignore next */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    processOnSetOn(value, revert) {
+        return Promise.resolve();
+    }
     tryAddCustomCharacteristic(characteristic, characteristicType) {
         if (this.additionalCharacteristics?.includes(characteristicType)) {
             return this.addCharacteristic(characteristic);

package/dist/services/outletServiceBase.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"outletServiceBase.js","sourceRoot":"","sources":["../../src/services/outletServiceBase.ts"],"names":[],"mappings":";;;AACA,4CAAiG;AACjG,+DAA4D;AAG5D,MAAsB,iBAAkB,SAAQ,yBAAW;IAKtC;~~IAJX~~,KAAK,GAAY,KAAK,CAAC;IAE/B,YACE,gBAAsC,EACrB,yBAAoC,EACrD,cAAuB;~~QAEvB~~,KAAK,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;~~QAHjE~~,8BAAyB,GAAzB,yBAAyB,CAAW;~~IAIvD~~,CAAC;IAEM,WAAW,CAAC,KAAc;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7E,CAAC;IAEM,uBAAuB,CAAC,IAAY;QACzC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC;QACvF,IAAI,CAAC,0BAA0B,CAC7B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,sBAAsB,EACpE,uBAAuB,EACvB,GAAG,EAAE,CAAC,IAAI,EACV,2CAAwB,CAAC,wBAAwB,CAClD,CAAC;IACJ,CAAC;IAEM,mBAAmB,CAAC,IAAY;QACrC,IAAI,CAAC,0BAA0B,CAC7B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,aAAa,EAC3D,mBAAmB,EACnB,GAAG,EAAE,CAAC,IAAI,EACV,2CAAwB,CAAC,aAAa,CACvC,CAAC;IACJ,CAAC;IAEM,mBAAmB,CAAC,MAAc;QACvC,IAAI,CAAC,0BAA0B,CAC7B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,aAAa,EAC3D,mBAAmB,EACnB,GAAG,EAAE,CAAC,MAAM,EACZ,2CAAwB,CAAC,aAAa,CACvC,CAAC;IACJ,CAAC;IAEkB,kBAAkB;QACnC,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;aAC7E,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC1C,KAAK,CAAC,CAAC,KAA0B,EAAE,EAAE,~~CACpC,~~IAAI,CAAC,~~YAAY~~,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,IAAI,~~EAAE~~,GAAG,EAAE~~;YAC3D~~,IAAI,CAAC,~~KAAK~~,~~GAAG~~,~~KAAgB~~,CAAC;~~YAC9B~~,IAAI,CAAC,~~cAAc~~,CAAC,IAAI,CAAC,KAAK,~~EAAE,~~GAAG,~~EAAE~~,CAAC,IAAI,CAAC,~~WAAW~~,CAAC,~~CAAC,~~IAAI,CAAC,KAAK,~~CAAC~~,CAAC,CAAC;~~QACvE~~,CAAC,CAAC,~~CACH~~,CAAC;~~QAEJ~~,MAAM,eAAe,GAAG;YACtB,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC;YAChE,gBAAgB;YAChB,IAAI,CAAC,0BAA0B,~~CAC7B~~,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,aAAa,~~EAC3D~~,2CAAwB,CAAC,aAAa,~~CACvC~~;~~YACD~~,IAAI,CAAC,0BAA0B,~~CAC7B~~,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,aAAa,~~EAC3D~~,2CAAwB,CAAC,aAAa,~~CACvC~~;~~YACD~~,IAAI,CAAC,0BAA0B,CAC7B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,gBAAgB,CAAC,sBAAsB,EACpE,2CAAwB,CAAC,wBAAwB,CAClD;SACF,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAEpF,OAAO,eAAe,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,cAAc,KAAK,IAAI,CAAC,CAAC;IAC3E,CAAC;~~IAIS~~,0BAA0B,~~CAClC~~,cAAoD,~~EACpD~~,kBAA0B;~~QAE1B~~,IAAI,IAAI,CAAC,yBAAyB,EAAE,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACjE,OAAO,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAES,0BAA0B,CAClC,cAAoD,EACpD,IAAY,EACZ,SAAoC,EACpC,kBAA0B;QAE1B,IAAI,IAAI,CAAC,yBAAyB,EAAE,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACjE,IAAI,CAAC,oBAAoB,CAAC,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;CACF;~~AAjGD~~,~~8CAiGC~~"}
1	+ {"version":3,"file":"outletServiceBase.js","sourceRoot":"","sources":["../../src/services/outletServiceBase.ts"],"names":[],"mappings":"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"}

package/dist/services/serviceBase.d.ts CHANGED Viewed

@@ -32,7 +32,8 @@ export declare abstract class ServiceBase {
     protected covertValueToPercents(value: number, maxValue: number): number;
     protected onDisabled(): void;
     protected processOnGet<TValue>(value: TValue): TValue;
-    protected processOnSet(name: string, func: () => void): void;
+    protected processOnSetVerify(name: string): void;
+    protected processOnSet(process: () => Promise<void>, revert: () => void): Promise<void>;
     private checkIsReachable;
     private checkIsEnabled;
 }

package/dist/services/serviceBase.js CHANGED Viewed

@@ -60,8 +60,7 @@ class ServiceBase {
         return this.service.getCharacteristic(characteristic);
     }
     getOrAddService(service, displayName) {
-        const result = this.ecoFlowAccessory.accessory.getService(service) ||
-            this.ecoFlowAccessory.accessory.addService(service, displayName, service.UUID);
+        const result = this.ecoFlowAccessory.accessory.getService(service) || this.ecoFlowAccessory.accessory.addService(service, displayName, service.UUID);
         result.displayName = displayName ?? result.displayName;
         return result;
     }
@@ -86,10 +85,18 @@ class ServiceBase {
         this.checkIsReachable();
         return value;
     }
-    processOnSet(name, func) {
+    processOnSetVerify(name) {
         this.checkIsReachable();
         this.checkIsEnabled(name);
-        func();
+    }
+    async processOnSet(process, revert) {
+        try {
+            await process();
+        }
+        catch (error) {
+            this.log.warn('Failed to process onSet. Reverting value...', error);
+            setTimeout(() => revert(), 300);
+        }
     }
     checkIsReachable() {
         if (!this.isReachable) {