iobroker.zendure-solarflow 1.6.7 → 1.7.1

package/build/services/mqttService.js

@@ -30,10 +30,13 @@ var mqttService_exports = {};
 __export(mqttService_exports, {
   addOrUpdatePackData: () => addOrUpdatePackData,
   connectMqttClient: () => connectMqttClient,
+  setAcSwitch: () => setAcSwitch,
   setAutoRecover: () => setAutoRecover,
   setBuzzerSwitch: () => setBuzzerSwitch,
   setChargeLimit: () => setChargeLimit,
+  setDcSwitch: () => setDcSwitch,
   setDischargeLimit: () => setDischargeLimit,
+  setInputLimit: () => setInputLimit,
   setOutputLimit: () => setOutputLimit,
   setPassMode: () => setPassMode,
   triggerFullTelemetryUpdate: () => triggerFullTelemetryUpdate
@@ -42,14 +45,15 @@ module.exports = __toCommonJS(mqttService_exports);
 var mqtt = __toESM(require("mqtt"));
 var import_adapterService = require("./adapterService");
 var import_calculationService = require("./calculationService");
+var import_ISolarFlowMqttProperties = require("../models/ISolarFlowMqttProperties");
 var import_jobSchedule = require("./jobSchedule");
 let adapter = void 0;
-const addOrUpdatePackData = async (productKey, deviceKey, packData) => {
+const addOrUpdatePackData = async (productKey, deviceKey, packData, isSolarFlow) => {
   if (adapter && productKey && deviceKey) {
     await packData.forEach(async (x) => {
       if (x.sn && adapter) {
         const key = (productKey + "." + deviceKey + ".packData." + x.sn).replace(adapter.FORBIDDEN_CHARS, "");
-        await (adapter == null ? void 0 : adapter.extendObjectAsync(key + ".sn", {
+        await (adapter == null ? void 0 : adapter.extendObject(key + ".sn", {
           type: "state",
           common: {
             name: {
@@ -66,7 +70,7 @@ const addOrUpdatePackData = async (productKey, deviceKey, packData) => {
         }));
         await (adapter == null ? void 0 : adapter.setStateAsync(key + ".sn", x.sn, true));
         if (x.socLevel) {
-          await (adapter == null ? void 0 : adapter.extendObjectAsync(key + ".socLevel", {
+          await (adapter == null ? void 0 : adapter.extendObject(key + ".socLevel", {
             type: "state",
             common: {
               name: {
@@ -84,7 +88,7 @@ const addOrUpdatePackData = async (productKey, deviceKey, packData) => {
           await (adapter == null ? void 0 : adapter.setStateAsync(key + ".socLevel", x.socLevel, true));
         }
         if (x.maxTemp) {
-          await (adapter == null ? void 0 : adapter.extendObjectAsync(key + ".maxTemp", {
+          await (adapter == null ? void 0 : adapter.extendObject(key + ".maxTemp", {
             type: "state",
             common: {
               name: {
@@ -106,7 +110,7 @@ const addOrUpdatePackData = async (productKey, deviceKey, packData) => {
           ));
         }
         if (x.minVol) {
-          await (adapter == null ? void 0 : adapter.extendObjectAsync(key + ".minVol", {
+          await (adapter == null ? void 0 : adapter.extendObject(key + ".minVol", {
             type: "state",
             common: {
               name: "minVol",
@@ -121,7 +125,7 @@ const addOrUpdatePackData = async (productKey, deviceKey, packData) => {
           await (adapter == null ? void 0 : adapter.setStateAsync(key + ".minVol", x.minVol / 100, true));
         }
         if (x.maxVol) {
-          await (adapter == null ? void 0 : adapter.extendObjectAsync(key + ".maxVol", {
+          await (adapter == null ? void 0 : adapter.extendObject(key + ".maxVol", {
             type: "state",
             common: {
               name: "maxVol",
@@ -133,10 +137,10 @@ const addOrUpdatePackData = async (productKey, deviceKey, packData) => {
             },
             native: {}
           }));
-          await (adapter == null ? void 0 : adapter.setStateAsync(key + ".maxVol", x.maxVol / 100, true));
+          await (adapter == null ? void 0 : adapter.setState(key + ".maxVol", x.maxVol / 100, true));
         }
         if (x.totalVol) {
-          await (adapter == null ? void 0 : adapter.extendObjectAsync(key + ".totalVol", {
+          await (adapter == null ? void 0 : adapter.extendObject(key + ".totalVol", {
             type: "state",
             common: {
               name: "totalVol",
@@ -149,15 +153,17 @@ const addOrUpdatePackData = async (productKey, deviceKey, packData) => {
             native: {}
           }));
           const totalVol = x.totalVol / 100;
-          await (adapter == null ? void 0 : adapter.setStateAsync(key + ".totalVol", totalVol, true));
-          (0, import_adapterService.checkVoltage)(adapter, productKey, deviceKey, totalVol);
+          await (adapter == null ? void 0 : adapter.setState(key + ".totalVol", totalVol, true));
+          if (isSolarFlow) {
+            (0, import_adapterService.checkVoltage)(adapter, productKey, deviceKey, totalVol);
+          }
         }
       }
     });
   }
 };
 const onMessage = async (topic, message) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V, _W, _X, _Y, _Z, __, _$, _aa, _ba, _ca, _da, _ea, _fa, _ga, _ha, _ia;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V, _W, _X, _Y, _Z, __, _$, _aa, _ba, _ca, _da, _ea, _fa, _ga, _ha, _ia, _ja, _ka, _la, _ma, _na, _oa, _pa, _qa, _ra, _sa, _ta, _ua, _va, _wa, _xa, _ya, _za, _Aa, _Ba, _Ca, _Da, _Ea;
   if (adapter) {
     const topicSplitted = topic.split("/");
     const productKey = topicSplitted[1];
@@ -169,6 +175,13 @@ const onMessage = async (topic, message) => {
       const txt = message.toString();
       adapter.log.error(`[JSON PARSE ERROR] ${txt}`);
     }
+    let isSolarFlow = false;
+    const productName = await adapter.getStateAsync(
+      `${productKey}.${deviceKey}.productName`
+    );
+    if (((_a = productName == null ? void 0 : productName.val) == null ? void 0 : _a.toString().toLowerCase().includes("solarflow")) || ((_b = productName == null ? void 0 : productName.val) == null ? void 0 : _b.toString().toLowerCase().includes("hyper"))) {
+      isSolarFlow = true;
+    }
     (0, import_adapterService.updateSolarFlowState)(
       adapter,
       productKey,
@@ -176,7 +189,7 @@ const onMessage = async (topic, message) => {
       "lastUpdate",
       (/* @__PURE__ */ new Date()).getTime()
     );
-    if (((_a = obj.properties) == null ? void 0 : _a.electricLevel) != null && ((_b = obj.properties) == null ? void 0 : _b.electricLevel) != void 0) {
+    if (((_c = obj.properties) == null ? void 0 : _c.electricLevel) != null && ((_d = obj.properties) == null ? void 0 : _d.electricLevel) != void 0) {
       (0, import_adapterService.updateSolarFlowState)(
         adapter,
         productKey,
@@ -184,37 +197,37 @@ const onMessage = async (topic, message) => {
         "electricLevel",
         obj.properties.electricLevel
       );
-      if ((adapter == null ? void 0 : adapter.config.useCalculation) && obj.properties.electricLevel == 100) {
+      if ((adapter == null ? void 0 : adapter.config.useCalculation) && obj.properties.electricLevel == 100 && isSolarFlow) {
         (0, import_calculationService.setEnergyWhMax)(adapter, productKey, deviceKey);
       }
       const minSoc = await (adapter == null ? void 0 : adapter.getStateAsync(
         `${productKey}.${deviceKey}.minSoc`
       ));
-      if ((adapter == null ? void 0 : adapter.config.useCalculation) && minSoc && minSoc.val && obj.properties.electricLevel <= Number(minSoc.val)) {
+      if ((adapter == null ? void 0 : adapter.config.useCalculation) && minSoc && minSoc.val && obj.properties.electricLevel <= Number(minSoc.val) && isSolarFlow) {
         (0, import_calculationService.setSocToZero)(adapter, productKey, deviceKey);
       }
     }
-    if (((_c = obj.properties) == null ? void 0 : _c.packState) != null && ((_d = obj.properties) == null ? void 0 : _d.packState) != void 0) {
-      const value = ((_e = obj.properties) == null ? void 0 : _e.packState) == 0 ? "Idle" : ((_f = obj.properties) == null ? void 0 : _f.packState) == 1 ? "Charging" : ((_g = obj.properties) == null ? void 0 : _g.packState) == 2 ? "Discharging" : "Unknown";
+    if (((_e = obj.properties) == null ? void 0 : _e.packState) != null && ((_f = obj.properties) == null ? void 0 : _f.packState) != void 0) {
+      const value = ((_g = obj.properties) == null ? void 0 : _g.packState) == 0 ? "Idle" : ((_h = obj.properties) == null ? void 0 : _h.packState) == 1 ? "Charging" : ((_i = obj.properties) == null ? void 0 : _i.packState) == 2 ? "Discharging" : "Unknown";
       (0, import_adapterService.updateSolarFlowState)(adapter, productKey, deviceKey, "packState", value);
     }
-    if (((_h = obj.properties) == null ? void 0 : _h.passMode) != null && ((_i = obj.properties) == null ? void 0 : _i.passMode) != void 0) {
-      const value = ((_j = obj.properties) == null ? void 0 : _j.passMode) == 0 ? "Automatic" : ((_k = obj.properties) == null ? void 0 : _k.passMode) == 1 ? "Always off" : ((_l = obj.properties) == null ? void 0 : _l.passMode) == 2 ? "Always on" : "Unknown";
+    if (((_j = obj.properties) == null ? void 0 : _j.passMode) != null && ((_k = obj.properties) == null ? void 0 : _k.passMode) != void 0) {
+      const value = ((_l = obj.properties) == null ? void 0 : _l.passMode) == 0 ? "Automatic" : ((_m = obj.properties) == null ? void 0 : _m.passMode) == 1 ? "Always off" : ((_n = obj.properties) == null ? void 0 : _n.passMode) == 2 ? "Always on" : "Unknown";
       (0, import_adapterService.updateSolarFlowState)(adapter, productKey, deviceKey, "passMode", value);
       (0, import_adapterService.updateSolarFlowControlState)(
         adapter,
         productKey,
         deviceKey,
         "passMode",
-        (_m = obj.properties) == null ? void 0 : _m.passMode
+        (_o = obj.properties) == null ? void 0 : _o.passMode
       );
     }
-    if (((_n = obj.properties) == null ? void 0 : _n.pass) != null && ((_o = obj.properties) == null ? void 0 : _o.pass) != void 0) {
-      const value = ((_p = obj.properties) == null ? void 0 : _p.pass) == 0 ? false : true;
+    if (((_p = obj.properties) == null ? void 0 : _p.pass) != null && ((_q = obj.properties) == null ? void 0 : _q.pass) != void 0) {
+      const value = ((_r = obj.properties) == null ? void 0 : _r.pass) == 0 ? false : true;
       (0, import_adapterService.updateSolarFlowState)(adapter, productKey, deviceKey, "pass", value);
     }
-    if (((_q = obj.properties) == null ? void 0 : _q.autoRecover) != null && ((_r = obj.properties) == null ? void 0 : _r.autoRecover) != void 0) {
-      const value = ((_s = obj.properties) == null ? void 0 : _s.autoRecover) == 0 ? false : true;
+    if (((_s = obj.properties) == null ? void 0 : _s.autoRecover) != null && ((_t = obj.properties) == null ? void 0 : _t.autoRecover) != void 0) {
+      const value = ((_u = obj.properties) == null ? void 0 : _u.autoRecover) == 0 ? false : true;
       (0, import_adapterService.updateSolarFlowState)(
         adapter,
         productKey,
@@ -230,7 +243,7 @@ const onMessage = async (topic, message) => {
         value
       );
     }
-    if (((_t = obj.properties) == null ? void 0 : _t.outputHomePower) != null && ((_u = obj.properties) == null ? void 0 : _u.outputHomePower) != void 0) {
+    if (((_v = obj.properties) == null ? void 0 : _v.outputHomePower) != null && ((_w = obj.properties) == null ? void 0 : _w.outputHomePower) != void 0) {
       (0, import_adapterService.updateSolarFlowState)(
         adapter,
         productKey,
@@ -239,7 +252,16 @@ const onMessage = async (topic, message) => {
         obj.properties.outputHomePower
       );
     }
-    if (((_v = obj.properties) == null ? void 0 : _v.outputLimit) != null && ((_w = obj.properties) == null ? void 0 : _w.outputLimit) != void 0) {
+    if (((_x = obj.properties) == null ? void 0 : _x.energyPower) != null && ((_y = obj.properties) == null ? void 0 : _y.energyPower) != void 0) {
+      (0, import_adapterService.updateSolarFlowState)(
+        adapter,
+        productKey,
+        deviceKey,
+        "energyPower",
+        obj.properties.energyPower
+      );
+    }
+    if (((_z = obj.properties) == null ? void 0 : _z.outputLimit) != null && ((_A = obj.properties) == null ? void 0 : _A.outputLimit) != void 0) {
       (0, import_adapterService.updateSolarFlowState)(
         adapter,
         productKey,
@@ -255,8 +277,8 @@ const onMessage = async (topic, message) => {
         obj.properties.outputLimit
       );
     }
-    if (((_x = obj.properties) == null ? void 0 : _x.buzzerSwitch) != null && ((_y = obj.properties) == null ? void 0 : _y.buzzerSwitch) != void 0) {
-      const value = ((_z = obj.properties) == null ? void 0 : _z.buzzerSwitch) == 0 ? false : true;
+    if (((_B = obj.properties) == null ? void 0 : _B.buzzerSwitch) != null && ((_C = obj.properties) == null ? void 0 : _C.buzzerSwitch) != void 0) {
+      const value = ((_D = obj.properties) == null ? void 0 : _D.buzzerSwitch) == 0 ? false : true;
       (0, import_adapterService.updateSolarFlowState)(
         adapter,
         productKey,
@@ -272,7 +294,7 @@ const onMessage = async (topic, message) => {
         value
       );
     }
-    if (((_A = obj.properties) == null ? void 0 : _A.outputPackPower) != null && ((_B = obj.properties) == null ? void 0 : _B.outputPackPower) != void 0) {
+    if (((_E = obj.properties) == null ? void 0 : _E.outputPackPower) != null && ((_F = obj.properties) == null ? void 0 : _F.outputPackPower) != void 0) {
       (0, import_adapterService.updateSolarFlowState)(
         adapter,
         productKey,
@@ -282,7 +304,7 @@ const onMessage = async (topic, message) => {
       );
       (0, import_adapterService.updateSolarFlowState)(adapter, productKey, deviceKey, "packInputPower", 0);
     }
-    if (((_C = obj.properties) == null ? void 0 : _C.packInputPower) != null && ((_D = obj.properties) == null ? void 0 : _D.packInputPower) != void 0) {
+    if (((_G = obj.properties) == null ? void 0 : _G.packInputPower) != null && ((_H = obj.properties) == null ? void 0 : _H.packInputPower) != void 0) {
       let standbyUsage = 0;
       const solarInputPower = await (adapter == null ? void 0 : adapter.getStateAsync(
         `${productKey}.${deviceKey}.solarInputPower`
@@ -305,7 +327,7 @@ const onMessage = async (topic, message) => {
         0
       );
     }
-    if (((_E = obj.properties) == null ? void 0 : _E.solarInputPower) != null && ((_F = obj.properties) == null ? void 0 : _F.solarInputPower) != void 0) {
+    if (((_I = obj.properties) == null ? void 0 : _I.solarInputPower) != null && ((_J = obj.properties) == null ? void 0 : _J.solarInputPower) != void 0) {
       (0, import_adapterService.updateSolarFlowState)(
         adapter,
         productKey,
@@ -314,7 +336,7 @@ const onMessage = async (topic, message) => {
         obj.properties.solarInputPower
       );
     }
-    if (((_G = obj.properties) == null ? void 0 : _G.pvPower1) != null && ((_H = obj.properties) == null ? void 0 : _H.pvPower1) != void 0) {
+    if (((_K = obj.properties) == null ? void 0 : _K.pvPower1) != null && ((_L = obj.properties) == null ? void 0 : _L.pvPower1) != void 0) {
       (0, import_adapterService.updateSolarFlowState)(
         adapter,
         productKey,
@@ -324,7 +346,7 @@ const onMessage = async (topic, message) => {
         obj.properties.pvPower1
       );
     }
-    if (((_I = obj.properties) == null ? void 0 : _I.pvPower2) != null && ((_J = obj.properties) == null ? void 0 : _J.pvPower2) != void 0) {
+    if (((_M = obj.properties) == null ? void 0 : _M.pvPower2) != null && ((_N = obj.properties) == null ? void 0 : _N.pvPower2) != void 0) {
       (0, import_adapterService.updateSolarFlowState)(
         adapter,
         productKey,
@@ -334,7 +356,7 @@ const onMessage = async (topic, message) => {
         obj.properties.pvPower2
       );
     }
-    if (((_K = obj.properties) == null ? void 0 : _K.solarPower1) != null && ((_L = obj.properties) == null ? void 0 : _L.solarPower1) != void 0) {
+    if (((_O = obj.properties) == null ? void 0 : _O.solarPower1) != null && ((_P = obj.properties) == null ? void 0 : _P.solarPower1) != void 0) {
       (0, import_adapterService.updateSolarFlowState)(
         adapter,
         productKey,
@@ -343,7 +365,7 @@ const onMessage = async (topic, message) => {
         obj.properties.solarPower1
       );
     }
-    if (((_M = obj.properties) == null ? void 0 : _M.solarPower2) != null && ((_N = obj.properties) == null ? void 0 : _N.solarPower2) != void 0) {
+    if (((_Q = obj.properties) == null ? void 0 : _Q.solarPower2) != null && ((_R = obj.properties) == null ? void 0 : _R.solarPower2) != void 0) {
       (0, import_adapterService.updateSolarFlowState)(
         adapter,
         productKey,
@@ -352,7 +374,7 @@ const onMessage = async (topic, message) => {
         obj.properties.solarPower2
       );
     }
-    if (((_O = obj.properties) == null ? void 0 : _O.remainOutTime) != null && ((_P = obj.properties) == null ? void 0 : _P.remainOutTime) != void 0) {
+    if (((_S = obj.properties) == null ? void 0 : _S.remainOutTime) != null && ((_T = obj.properties) == null ? void 0 : _T.remainOutTime) != void 0) {
       (0, import_adapterService.updateSolarFlowState)(
         adapter,
         productKey,
@@ -361,7 +383,7 @@ const onMessage = async (topic, message) => {
         obj.properties.remainOutTime
       );
     }
-    if (((_Q = obj.properties) == null ? void 0 : _Q.remainInputTime) != null && ((_R = obj.properties) == null ? void 0 : _R.remainInputTime) != void 0) {
+    if (((_U = obj.properties) == null ? void 0 : _U.remainInputTime) != null && ((_V = obj.properties) == null ? void 0 : _V.remainInputTime) != void 0) {
       (0, import_adapterService.updateSolarFlowState)(
         adapter,
         productKey,
@@ -370,7 +392,7 @@ const onMessage = async (topic, message) => {
         obj.properties.remainInputTime
       );
     }
-    if (((_S = obj.properties) == null ? void 0 : _S.socSet) != null && ((_T = obj.properties) == null ? void 0 : _T.socSet) != void 0) {
+    if (((_W = obj.properties) == null ? void 0 : _W.socSet) != null && ((_X = obj.properties) == null ? void 0 : _X.socSet) != void 0) {
       (0, import_adapterService.updateSolarFlowState)(
         adapter,
         productKey,
@@ -386,7 +408,7 @@ const onMessage = async (topic, message) => {
         Number(obj.properties.socSet) / 10
       );
     }
-    if (((_U = obj.properties) == null ? void 0 : _U.minSoc) != null && ((_V = obj.properties) == null ? void 0 : _V.minSoc) != void 0) {
+    if (((_Y = obj.properties) == null ? void 0 : _Y.minSoc) != null && ((_Z = obj.properties) == null ? void 0 : _Z.minSoc) != void 0) {
       (0, import_adapterService.updateSolarFlowState)(
         adapter,
         productKey,
@@ -402,11 +424,64 @@ const onMessage = async (topic, message) => {
         Number(obj.properties.minSoc) / 10
       );
     }
-    if (((_W = obj.properties) == null ? void 0 : _W.pvBrand) != null && ((_X = obj.properties) == null ? void 0 : _X.pvBrand) != void 0) {
-      const value = ((_Y = obj.properties) == null ? void 0 : _Y.pvBrand) == 0 ? "Others" : ((_Z = obj.properties) == null ? void 0 : _Z.pvBrand) == 1 ? "Hoymiles" : ((__ = obj.properties) == null ? void 0 : __.pvBrand) == 2 ? "Enphase" : ((_$ = obj.properties) == null ? void 0 : _$.pvBrand) == 3 ? "APSystems" : ((_aa = obj.properties) == null ? void 0 : _aa.pvBrand) == 4 ? "Anker" : ((_ba = obj.properties) == null ? void 0 : _ba.pvBrand) == 5 ? "Deye" : ((_ca = obj.properties) == null ? void 0 : _ca.pvBrand) == 6 ? "Bosswerk" : "Unknown";
+    if (((__ = obj.properties) == null ? void 0 : __.inputLimit) != null && ((_$ = obj.properties) == null ? void 0 : _$.inputLimit) != void 0) {
+      (0, import_adapterService.updateSolarFlowState)(
+        adapter,
+        productKey,
+        deviceKey,
+        "inputLimit",
+        obj.properties.inputLimit
+      );
+    }
+    if (((_aa = obj.properties) == null ? void 0 : _aa.gridInputPower) != null && ((_ba = obj.properties) == null ? void 0 : _ba.gridInputPower) != void 0) {
+      (0, import_adapterService.updateSolarFlowState)(
+        adapter,
+        productKey,
+        deviceKey,
+        "gridInputPower",
+        obj.properties.gridInputPower
+      );
+    }
+    if (((_ca = obj.properties) == null ? void 0 : _ca.acOutputPower) != null && ((_da = obj.properties) == null ? void 0 : _da.acOutputPower) != void 0) {
+      (0, import_adapterService.updateSolarFlowState)(
+        adapter,
+        productKey,
+        deviceKey,
+        "acOutputPower",
+        obj.properties.acOutputPower
+      );
+    }
+    if (((_ea = obj.properties) == null ? void 0 : _ea.gridPower) != null && ((_fa = obj.properties) == null ? void 0 : _fa.gridPower) != void 0) {
+      (0, import_adapterService.updateSolarFlowState)(
+        adapter,
+        productKey,
+        deviceKey,
+        "gridPower",
+        obj.properties.gridPower
+      );
+    }
+    if (((_ga = obj.properties) == null ? void 0 : _ga.acSwitch) != null && ((_ha = obj.properties) == null ? void 0 : _ha.acSwitch) != void 0) {
+      const value = ((_ia = obj.properties) == null ? void 0 : _ia.acSwitch) == 0 ? false : true;
+      (0, import_adapterService.updateSolarFlowState)(adapter, productKey, deviceKey, "acSwitch", value);
+    }
+    if (((_ja = obj.properties) == null ? void 0 : _ja.dcSwitch) != null && ((_ka = obj.properties) == null ? void 0 : _ka.dcSwitch) != void 0) {
+      const value = ((_la = obj.properties) == null ? void 0 : _la.dcSwitch) == 0 ? false : true;
+      (0, import_adapterService.updateSolarFlowState)(adapter, productKey, deviceKey, "dcSwitch", value);
+    }
+    if (((_ma = obj.properties) == null ? void 0 : _ma.dcOutputPower) != null && ((_na = obj.properties) == null ? void 0 : _na.dcOutputPower) != void 0) {
+      (0, import_adapterService.updateSolarFlowState)(
+        adapter,
+        productKey,
+        deviceKey,
+        "dcOutputPower",
+        obj.properties.dcOutputPower
+      );
+    }
+    if (((_oa = obj.properties) == null ? void 0 : _oa.pvBrand) != null && ((_pa = obj.properties) == null ? void 0 : _pa.pvBrand) != void 0) {
+      const value = ((_qa = obj.properties) == null ? void 0 : _qa.pvBrand) == 0 ? "Others" : ((_ra = obj.properties) == null ? void 0 : _ra.pvBrand) == 1 ? "Hoymiles" : ((_sa = obj.properties) == null ? void 0 : _sa.pvBrand) == 2 ? "Enphase" : ((_ta = obj.properties) == null ? void 0 : _ta.pvBrand) == 3 ? "APSystems" : ((_ua = obj.properties) == null ? void 0 : _ua.pvBrand) == 4 ? "Anker" : ((_va = obj.properties) == null ? void 0 : _va.pvBrand) == 5 ? "Deye" : ((_wa = obj.properties) == null ? void 0 : _wa.pvBrand) == 6 ? "Bosswerk" : "Unknown";
       (0, import_adapterService.updateSolarFlowState)(adapter, productKey, deviceKey, "pvBrand", value);
     }
-    if (((_da = obj.properties) == null ? void 0 : _da.inverseMaxPower) != null && ((_ea = obj.properties) == null ? void 0 : _ea.inverseMaxPower) != void 0) {
+    if (((_xa = obj.properties) == null ? void 0 : _xa.inverseMaxPower) != null && ((_ya = obj.properties) == null ? void 0 : _ya.inverseMaxPower) != void 0) {
       (0, import_adapterService.updateSolarFlowState)(
         adapter,
         productKey,
@@ -415,7 +490,7 @@ const onMessage = async (topic, message) => {
         obj.properties.inverseMaxPower
       );
     }
-    if (((_fa = obj.properties) == null ? void 0 : _fa.wifiState) != null && ((_ga = obj.properties) == null ? void 0 : _ga.wifiState) != void 0) {
+    if (((_za = obj.properties) == null ? void 0 : _za.wifiState) != null && ((_Aa = obj.properties) == null ? void 0 : _Aa.wifiState) != void 0) {
       (0, import_adapterService.updateSolarFlowState)(
         adapter,
         productKey,
@@ -424,7 +499,16 @@ const onMessage = async (topic, message) => {
         obj.properties.wifiState == 1 ? "Connected" : "Disconnected"
       );
     }
-    if (((_ha = obj.properties) == null ? void 0 : _ha.hubState) != null && ((_ia = obj.properties) == null ? void 0 : _ia.hubState) != void 0) {
+    if (((_Ba = obj.properties) == null ? void 0 : _Ba.packNum) != null && ((_Ca = obj.properties) == null ? void 0 : _Ca.packNum) != void 0) {
+      (0, import_adapterService.updateSolarFlowState)(
+        adapter,
+        productKey,
+        deviceKey,
+        "packNum",
+        obj.properties.packNum
+      );
+    }
+    if (((_Da = obj.properties) == null ? void 0 : _Da.hubState) != null && ((_Ea = obj.properties) == null ? void 0 : _Ea.hubState) != void 0) {
       (0, import_adapterService.updateSolarFlowState)(
         adapter,
         productKey,
@@ -434,7 +518,17 @@ const onMessage = async (topic, message) => {
       );
     }
     if (obj.packData) {
-      addOrUpdatePackData(productKey, deviceKey, obj.packData);
+      addOrUpdatePackData(productKey, deviceKey, obj.packData, isSolarFlow);
+    }
+    if (obj.properties) {
+      Object.entries(obj.properties).forEach(([key, value]) => {
+        if (import_ISolarFlowMqttProperties.knownMqttProps.includes(key)) {
+        } else {
+          console.log(
+            `${productName == null ? void 0 : productName.val}: ${key} with value ${value} is a UNKNOWN Mqtt Prop!`
+          );
+        }
+      });
     }
   }
 };
@@ -500,7 +594,25 @@ const setOutputLimit = async (adapter2, productKey, deviceKey, limit) => {
         const topic = `iot/${productKey}/${deviceKey}/properties/write`;
         const outputlimit = { properties: { outputLimit: limit } };
         (_b = adapter2.mqttClient) == null ? void 0 : _b.publish(topic, JSON.stringify(outputlimit));
-      } else {
+      }
+    }
+  }
+};
+const setInputLimit = async (adapter2, productKey, deviceKey, limit) => {
+  var _a, _b;
+  if (adapter2.mqttClient && productKey && deviceKey) {
+    const currentLimit = (_a = await adapter2.getStateAsync(productKey + "." + deviceKey + ".inputLimit")) == null ? void 0 : _a.val;
+    limit = Math.ceil(limit / 100) * 100;
+    if (limit < 0) {
+      limit = 0;
+    } else if (limit > 900) {
+      limit = 900;
+    }
+    if (currentLimit != null && currentLimit != void 0) {
+      if (currentLimit != limit) {
+        const topic = `iot/${productKey}/${deviceKey}/properties/write`;
+        const inputLimitContent = { properties: { inputLimit: limit } };
+        (_b = adapter2.mqttClient) == null ? void 0 : _b.publish(topic, JSON.stringify(inputLimitContent));
       }
     }
   }
@@ -551,6 +663,32 @@ const setAutoRecover = async (adapter2, productKey, deviceKey, autoRecover) => {
     (_a = adapter2.mqttClient) == null ? void 0 : _a.publish(topic, JSON.stringify(setAutoRecoverContent));
   }
 };
+const setDcSwitch = async (adapter2, productKey, deviceKey, dcSwitch) => {
+  var _a;
+  if (adapter2.mqttClient && productKey && deviceKey) {
+    const topic = `iot/${productKey}/${deviceKey}/properties/write`;
+    const setDcSwitchContent = {
+      properties: { dcSwitch: dcSwitch ? 1 : 0 }
+    };
+    adapter2.log.debug(
+      `[setPassMode] Set DC Switch for device ${deviceKey} to ${dcSwitch}!`
+    );
+    (_a = adapter2.mqttClient) == null ? void 0 : _a.publish(topic, JSON.stringify(setDcSwitchContent));
+  }
+};
+const setAcSwitch = async (adapter2, productKey, deviceKey, dcSwitch) => {
+  var _a;
+  if (adapter2.mqttClient && productKey && deviceKey) {
+    const topic = `iot/${productKey}/${deviceKey}/properties/write`;
+    const setDcSwitchContent = {
+      properties: { dcSwitch: dcSwitch ? 1 : 0 }
+    };
+    adapter2.log.debug(
+      `[setPassMode] Set AC Switch for device ${deviceKey} to ${dcSwitch}!`
+    );
+    (_a = adapter2.mqttClient) == null ? void 0 : _a.publish(topic, JSON.stringify(setDcSwitchContent));
+  }
+};
 const onConnected = () => {
   adapter == null ? void 0 : adapter.log.info("[onConnected] Connected with MQTT!");
 };
@@ -618,6 +756,39 @@ const connectMqttClient = (_adapter) => {
                 onSubscribeIotTopic(error, device.productKey, device.deviceKey);
               });
             }, 1500 * index);
+            if (device.packList && device.packList.length > 0) {
+              device.packList.forEach(async (subDevice) => {
+                if (subDevice.productName.toLocaleLowerCase() == "ace 1500") {
+                  const reportTopic2 = `/${subDevice.productKey}/${subDevice.deviceKey}/properties/report`;
+                  const iotTopic2 = `iot/${subDevice.productKey}/${subDevice.deviceKey}/#`;
+                  setTimeout(() => {
+                    var _a;
+                    if (adapter) {
+                      adapter.log.debug(
+                        `[connectMqttClient] Subscribing to MQTT Topic: ${reportTopic2}`
+                      );
+                      (_a = adapter.mqttClient) == null ? void 0 : _a.subscribe(
+                        reportTopic2,
+                        onSubscribeReportTopic
+                      );
+                    }
+                  }, 1e3 * index);
+                  setTimeout(() => {
+                    var _a;
+                    adapter == null ? void 0 : adapter.log.debug(
+                      `[connectMqttClient] Subscribing to MQTT Topic: ${iotTopic2}`
+                    );
+                    (_a = adapter == null ? void 0 : adapter.mqttClient) == null ? void 0 : _a.subscribe(iotTopic2, (error) => {
+                      onSubscribeIotTopic(
+                        error,
+                        subDevice.productKey,
+                        subDevice.deviceKey
+                      );
+                    });
+                  }, 1500 * index);
+                }
+              });
+            }
           }
         }
       );
@@ -635,10 +806,13 @@ const connectMqttClient = (_adapter) => {
 0 && (module.exports = {
   addOrUpdatePackData,
   connectMqttClient,
+  setAcSwitch,
   setAutoRecover,
   setBuzzerSwitch,
   setChargeLimit,
+  setDcSwitch,
   setDischargeLimit,
+  setInputLimit,
   setOutputLimit,
   setPassMode,
   triggerFullTelemetryUpdate