iobroker.mg-saic 0.1.1 → 0.1.2

package/README.md

@@ -36,13 +36,19 @@ For manufacturer information, see [MG Motor](https://www.mgmotor.eu/) and [SAIC
 
 ## Installation
 
-The adapter is published on npm but has not yet been added to the ioBroker adapter catalog.
+The adapter is published on npm and available from ioBroker's Latest adapter repository.
 
 ## Support
 
 [![Donate](https://camo.githubusercontent.com/ef8c60305542390406855547e32850909812a73c4abada236de22a6dc88b313f/68747470733a2f2f7777772e70617970616c6f626a656374732e636f6d2f64655f44452f44452f692f62746e2f62746e5f646f6e61746543435f4c472e676966)](https://www.paypal.com/donate/?hosted_button_id=3RJQGSJNRSHUJ)
 
 ## Changelog
+### 0.1.2 (2026-11-08)
+
+- (Voodoo2man) Prevented unsafe or case-colliding API fields and vehicle IDs from creating duplicate datapoints, kept status IDs stable across field-casing changes, scheduled polling after each completed cycle while honoring queued manual refreshes, and removed an unused cloud-backend translation.
+- (Voodoo2man) Replaced untrusted cloud error text with English code-based diagnostics and standardized the product title as MG/SAIC across locales.
+- (Voodoo2man) Reused dynamic charging datapoints across field-name casing changes and normalized known status fields.
+
 ### 0.1.1 (2026-11-07)
 
 - (Voodoo2man) Lowered the minimum Node.js requirement to 22.22.2.
@@ -69,10 +75,6 @@ The adapter is published on npm but has not yet been added to the ioBroker adapt
 
 Older changelog entries are available in [CHANGELOG_OLD.md](CHANGELOG_OLD.md).
 
-### 0.0.2 (2026-10-20)
-
-- (Voodoo2man) Added regional iSmart account setup, vehicle status, and supported remote controls.
-
 ## License
 
 MIT License

package/admin/i18n/de.json

@@ -7,7 +7,6 @@
 	"Region": "Region",
 	"European Union": "Europäische Union",
 	"Rest of World": "Rest der Welt",
-	"Cloud connectivity is not implemented yet. This value does not select a working backend.": "Die Cloud-Anbindung ist noch nicht implementiert. Dieser Wert wählt kein funktionsfähiges Backend aus.",
 	"Login type": "Anmeldetyp",
 	"Email": "E-Mail",
 	"Phone number": "Telefonnummer",

package/admin/i18n/en.json

@@ -7,7 +7,6 @@
 	"Region": "Region",
 	"European Union": "European Union",
 	"Rest of World": "Rest of World",
-	"Cloud connectivity is not implemented yet. This value does not select a working backend.": "Cloud connectivity is not implemented yet. This value does not select a working backend.",
 	"Login type": "Login type",
 	"Email": "Email",
 	"Phone number": "Phone number",

package/admin/i18n/es.json

@@ -7,7 +7,6 @@
 	"Region": "Región",
 	"European Union": "Unión Europea",
 	"Rest of World": "Resto del mundo",
-	"Cloud connectivity is not implemented yet. This value does not select a working backend.": "La conexión a la nube aún no está implementada. Este valor no selecciona un servicio operativo.",
 	"Login type": "Tipo de inicio de sesión",
 	"Email": "Correo electrónico",
 	"Phone number": "Número de teléfono",

package/admin/i18n/fr.json

@@ -7,7 +7,6 @@
 	"Region": "Région",
 	"European Union": "Union européenne",
 	"Rest of World": "Reste du monde",
-	"Cloud connectivity is not implemented yet. This value does not select a working backend.": "La connexion au cloud n'est pas encore implémentée. Cette valeur ne sélectionne pas de service fonctionnel.",
 	"Login type": "Type de connexion",
 	"Email": "E-mail",
 	"Phone number": "Numéro de téléphone",

package/admin/i18n/it.json

@@ -7,7 +7,6 @@
 	"Region": "Regione",
 	"European Union": "Unione europea",
 	"Rest of World": "Resto del mondo",
-	"Cloud connectivity is not implemented yet. This value does not select a working backend.": "La connessione cloud non è ancora implementata. Questo valore non seleziona un servizio funzionante.",
 	"Login type": "Tipo di accesso",
 	"Email": "E-mail",
 	"Phone number": "Numero di telefono",

package/admin/i18n/nl.json

@@ -7,7 +7,6 @@
 	"Region": "Regio",
 	"European Union": "Europese Unie",
 	"Rest of World": "Rest van de wereld",
-	"Cloud connectivity is not implemented yet. This value does not select a working backend.": "Cloudverbinding is nog niet geïmplementeerd. Deze waarde selecteert geen werkende backend.",
 	"Login type": "Aanmeldtype",
 	"Email": "E-mailadres",
 	"Phone number": "Telefoonnummer",

package/admin/i18n/pl.json

@@ -7,7 +7,6 @@
 	"Region": "Region",
 	"European Union": "Unia Europejska",
 	"Rest of World": "Reszta świata",
-	"Cloud connectivity is not implemented yet. This value does not select a working backend.": "Połączenie z chmurą nie jest jeszcze zaimplementowane. Ta wartość nie wybiera działającej usługi.",
 	"Login type": "Typ logowania",
 	"Email": "E-mail",
 	"Phone number": "Numer telefonu",

package/admin/i18n/pt.json

@@ -7,7 +7,6 @@
 	"Region": "Região",
 	"European Union": "União Europeia",
 	"Rest of World": "Resto do mundo",
-	"Cloud connectivity is not implemented yet. This value does not select a working backend.": "A ligação à nuvem ainda não está implementada. Este valor não seleciona um serviço funcional.",
 	"Login type": "Tipo de início de sessão",
 	"Email": "E-mail",
 	"Phone number": "Número de telefone",

package/admin/i18n/ru.json

@@ -7,7 +7,6 @@
 	"Region": "Регион",
 	"European Union": "Европейский союз",
 	"Rest of World": "Остальной мир",
-	"Cloud connectivity is not implemented yet. This value does not select a working backend.": "Подключение к облаку пока не реализовано. Это значение не выбирает работающий сервер.",
 	"Login type": "Тип входа",
 	"Email": "Электронная почта",
 	"Phone number": "Номер телефона",

package/admin/i18n/uk.json

@@ -7,7 +7,6 @@
 	"Region": "Регіон",
 	"European Union": "Європейський Союз",
 	"Rest of World": "Решта світу",
-	"Cloud connectivity is not implemented yet. This value does not select a working backend.": "Підключення до хмари ще не реалізовано. Це значення не вибирає робочий сервер.",
 	"Login type": "Тип входу",
 	"Email": "Електронна пошта",
 	"Phone number": "Номер телефону",

package/admin/i18n/zh-cn.json

@@ -7,7 +7,6 @@
 	"Region": "地区",
 	"European Union": "欧盟",
 	"Rest of World": "其他地区",
-	"Cloud connectivity is not implemented yet. This value does not select a working backend.": "云连接尚未实现。此选项不会选择可用的后端服务。",
 	"Login type": "登录类型",
 	"Email": "电子邮箱",
 	"Phone number": "电话号码",

package/build/main.js

@@ -28,6 +28,8 @@ var import_config = require("./config");
 var import_saic_client = require("./saic-client");
 var import_regions = require("./regions");
 var import_refresh_command = require("./refresh-command");
+var import_refresh_poll_queue = require("./refresh-poll-queue");
+var import_refresh_poll_timer = require("./refresh-poll-timer");
 var import_pending_setting_edits = require("./pending-setting-edits");
 var import_status_metadata = require("./status-metadata");
 var import_runtime_translations = require("./runtime-translations");
@@ -114,13 +116,17 @@ class MgSaic extends utils.Adapter {
       ...options,
       name: "mg-saic"
     });
+    this.pollTimer = new import_refresh_poll_timer.RefreshPollTimer(
+      (callback, milliseconds) => this.setTimeout(callback, milliseconds),
+      (timer) => this.clearTimeout(timer)
+    );
     this.on("ready", this.onReady.bind(this));
     this.on("stateChange", this.onStateChange.bind(this));
     this.on("unload", this.onUnload.bind(this));
   }
   pollTimer;
-  pollInProgress = false;
-  refreshQueued = false;
+  pollIntervalMilliseconds;
+  refreshPollQueue = new import_refresh_poll_queue.RefreshPollQueue();
   stopping = false;
   unloadCallbackCalled = false;
   abortController = new AbortController();
@@ -129,6 +135,7 @@ class MgSaic extends utils.Adapter {
   accessToken;
   accessTokenExpiresAt = 0;
   vehicles = [];
+  vehicleStatusFieldIds = /* @__PURE__ */ new Map();
   lastStatusTimes = /* @__PURE__ */ new Map();
   lastCanonicalStatusTimes = /* @__PURE__ */ new Map();
   vehicleCommandsInProgress = /* @__PURE__ */ new Set();
@@ -262,11 +269,9 @@ class MgSaic extends utils.Adapter {
         this.log.warn("No vehicles are linked to this SAIC account.");
         return;
       }
-      await this.refreshVehicleStatuses();
       const intervalSeconds = (_e = config.pollIntervalSeconds) != null ? _e : import_config.DEFAULT_POLL_INTERVAL_SECONDS;
-      if (!this.stopping) {
-        this.pollTimer = this.setInterval(() => this.triggerRefresh(), intervalSeconds * 1e3);
-      }
+      this.pollIntervalMilliseconds = intervalSeconds * 1e3;
+      await this.refreshVehicleStatuses();
     } catch (error) {
       if (this.stopping) {
         return;
@@ -289,26 +294,31 @@ class MgSaic extends utils.Adapter {
     await this.setState("info.connection", true, true);
   }
   triggerRefresh() {
+    this.pollTimer.clear();
     void this.refreshVehicleStatuses().catch((error) => {
       const details = error instanceof Error ? error.message : "Unknown refresh error";
       this.log.error(`Vehicle status refresh failed: ${details}`);
     });
   }
+  scheduleNextPoll() {
+    if (this.stopping || this.pollIntervalMilliseconds === void 0) {
+      return;
+    }
+    this.pollTimer.schedule(() => this.triggerRefresh(), this.pollIntervalMilliseconds);
+  }
   async refreshVehicleStatuses() {
     var _a;
     if (this.stopping || !this.client || !this.loginOptions || !this.accessToken) {
       return;
     }
-    if (this.pollInProgress) {
-      this.refreshQueued = true;
+    if (!this.refreshPollQueue.request()) {
       return;
     }
-    this.pollInProgress = true;
     const statusErrors = [];
     let followUpUsed = false;
     try {
       do {
-        this.refreshQueued = false;
+        this.refreshPollQueue.clearQueuedRefresh();
         for (const vehicle of this.vehicles) {
           if (this.stopping) {
             break;
@@ -375,7 +385,7 @@ class MgSaic extends utils.Adapter {
               }
             } else {
               const details = error instanceof Error ? error.message : "Unknown error";
-              const diagnostic = error instanceof import_saic_client.SaicRemoteInstructionError ? `SAIC/MG returned remote instruction code 4 for ${vehicle.vin}; this is a response from the MG/SAIC service or vehicle, not an adapter parsing/processing error. SAIC message: ${details}` : details;
+              const diagnostic = error instanceof import_saic_client.SaicRemoteInstructionError ? `SAIC/MG returned remote instruction code 4 for ${vehicle.vin}; this is a response from the MG/SAIC service or vehicle, not an adapter parsing/processing error. Diagnostic: ${details}` : details;
               statusErrors.push(`Vehicle status request failed for ${vehicle.vin}: ${diagnostic}`);
               this.log.warn(
                 `Could not retrieve current status for vehicle ${vehicle.vin}: ${diagnostic}`
@@ -478,17 +488,21 @@ class MgSaic extends utils.Adapter {
             this.log.error(`Could not write live status for ${vehicle.vin}: ${details}`);
           }
         }
-        if (this.refreshQueued && followUpUsed) {
-          this.refreshQueued = false;
-        } else if (this.refreshQueued) {
+        if (this.refreshPollQueue.hasQueuedRefresh && followUpUsed) {
+          this.refreshPollQueue.clearQueuedRefresh();
+        } else if (this.refreshPollQueue.hasQueuedRefresh) {
           followUpUsed = true;
         }
-      } while (this.refreshQueued && !this.stopping);
+      } while (this.refreshPollQueue.hasQueuedRefresh && !this.stopping);
       if (!this.stopping) {
         await this.setState("info.lastError", statusErrors.join("; "), true);
       }
     } finally {
-      this.pollInProgress = false;
+      this.refreshPollQueue.finish(
+        this.stopping,
+        () => this.triggerRefresh(),
+        () => this.scheduleNextPoll()
+      );
     }
   }
   onStateChange(id, state) {
@@ -801,6 +815,21 @@ class MgSaic extends utils.Adapter {
       this.vehicleCommandsInProgress.delete(vin);
     }
   }
+  async getVehicleStatusFieldIds(channelId) {
+    const cachedIds = this.vehicleStatusFieldIds.get(channelId);
+    if (cachedIds) {
+      return cachedIds;
+    }
+    const objectIdPrefix = `${this.namespace}.${channelId}.`;
+    const objects = await this.getObjectListAsync({
+      startkey: objectIdPrefix,
+      endkey: `${objectIdPrefix}\u9999`
+    });
+    const stateIds = objects.rows.filter((row) => row.value.type === "state" && row.id.startsWith(`${this.namespace}.`)).map((row) => row.id.slice(this.namespace.length + 1));
+    const fieldIds = (0, import_status_metadata.indexVehicleStatusFieldIds)(stateIds, channelId);
+    this.vehicleStatusFieldIds.set(channelId, fieldIds);
+    return fieldIds;
+  }
   async createVehicleStatusObjects(vin, status, channel = "status", channelName = "currentStatus") {
     if (this.stopping) {
       return;
@@ -809,10 +838,6 @@ class MgSaic extends utils.Adapter {
       return;
     }
     const statusId = `vehicles.${vin}.${channel}`;
-    for (const key of import_status_metadata.excludedVehicleStatusFields) {
-      const stateId = `${statusId}.${(0, import_status_metadata.getVehicleStatusGroup)(key)}.${key}`;
-      await this.delObjectAsync(stateId);
-    }
     await this.setObjectNotExistsAsync(statusId, {
       type: "channel",
       common: { name: (0, import_runtime_translations.getRuntimeName)(channelName) },
@@ -822,6 +847,11 @@ class MgSaic extends utils.Adapter {
     if (this.stopping) {
       return;
     }
+    const fieldIds = await this.getVehicleStatusFieldIds(statusId);
+    for (const key of import_status_metadata.excludedVehicleStatusFields) {
+      const stateId = (0, import_status_metadata.resolveVehicleStatusFieldId)(fieldIds, statusId, (0, import_status_metadata.getVehicleStatusGroup)(key), key);
+      await this.delObjectAsync(stateId);
+    }
     const values = { ...status.basicVehicleStatus };
     if (status.statusTime !== void 0) {
       values.statusTime = status.statusTime;
@@ -834,15 +864,17 @@ class MgSaic extends utils.Adapter {
       if (this.stopping) {
         return;
       }
-      if (import_status_metadata.excludedVehicleStatusFields.some((excludedKey) => excludedKey === key)) {
-        await this.delObjectAsync(`${statusId}.${(0, import_status_metadata.getVehicleStatusGroup)(key)}.${key}`);
+      const stateId = (0, import_status_metadata.resolveVehicleStatusFieldId)(fieldIds, statusId, (0, import_status_metadata.getVehicleStatusGroup)(key), key);
+      const separator = stateId.lastIndexOf(".");
+      const fieldName = stateId.slice(separator + 1);
+      const groupId = stateId.slice(0, separator);
+      const group = groupId.slice(statusId.length + 1);
+      if (import_status_metadata.excludedVehicleStatusFields.some((excludedKey) => excludedKey.toLowerCase() === fieldName.toLowerCase())) {
+        await this.delObjectAsync(stateId);
         continue;
       }
-      const group = (0, import_status_metadata.getVehicleStatusGroup)(key);
-      const groupId = `${statusId}.${group}`;
-      const stateId = `${groupId}.${key}`;
       if (value === void 0) {
-        if ((0, import_status_metadata.shouldDeleteUnavailableStatusValue)(key)) {
+        if ((0, import_status_metadata.shouldDeleteUnavailableStatusValue)(fieldName)) {
           await this.delObjectAsync(stateId);
         } else {
           const previousState = await this.getStateAsync(stateId);
@@ -852,7 +884,7 @@ class MgSaic extends utils.Adapter {
         }
         continue;
       }
-      const normalizedValue = (0, import_status_metadata.normalizeVehicleStatusValue)(key, value);
+      const normalizedValue = (0, import_status_metadata.normalizeVehicleStatusValue)(fieldName, value);
       if (normalizedValue === void 0) {
         await this.delObjectAsync(stateId);
         continue;
@@ -866,7 +898,7 @@ class MgSaic extends utils.Adapter {
       if (this.stopping) {
         return;
       }
-      const metadata = (0, import_status_metadata.getVehicleStatusMetadata)(key);
+      const metadata = (0, import_status_metadata.getVehicleStatusMetadata)(fieldName);
       const common = {
         name: metadata.name,
         type: metadata.type,
@@ -895,7 +927,7 @@ class MgSaic extends utils.Adapter {
       if (this.stopping) {
         return;
       }
-      const seatSetting = key === "frontLeftSeatHeatLevel" ? "driverSeatHeatLevel" : key === "frontRightSeatHeatLevel" ? "passengerSeatHeatLevel" : void 0;
+      const seatSetting = fieldName === "frontLeftSeatHeatLevel" ? "driverSeatHeatLevel" : fieldName === "frontRightSeatHeatLevel" ? "passengerSeatHeatLevel" : void 0;
       if (seatSetting && Number.isInteger(value) && value >= 0 && value <= 3) {
         const settingId = vehicleCommandPath(vin, seatSetting);
         const settingState = await this.getStateAsync(settingId);
@@ -903,12 +935,32 @@ class MgSaic extends utils.Adapter {
           await this.setStateAsync(settingId, { val: value, ack: true });
         }
       }
-      await this.delObjectAsync(`${statusId}.${key}`);
+      await this.delObjectAsync(`${statusId}.${fieldName}`);
     }
   }
   async createVehicleChargingObjects(vin, charging, series) {
+    var _a, _b;
     await this.ensureVehicleChargingGroups(vin);
     const rootId = `vehicles.${vin}.status.charging`;
+    const existingObjects = await this.getObjectListAsync({
+      startkey: `${this.namespace}.${rootId}.`,
+      endkey: `${this.namespace}.${rootId}.\u9999`
+    });
+    const existingFieldIds = new Map(chargingGroups.map(({ id }) => [id, []]));
+    for (const { id: objectId, value: object } of existingObjects.rows) {
+      if (object.type !== "state") {
+        continue;
+      }
+      const group = chargingGroups.find(({ id }) => objectId.startsWith(`${this.namespace}.${rootId}.${id}.`));
+      if (!group) {
+        continue;
+      }
+      const prefix = `${this.namespace}.${rootId}.${group.id}.`;
+      const fieldId = objectId.slice(prefix.length);
+      if (fieldId && !fieldId.includes(".")) {
+        (_a = existingFieldIds.get(group.id)) == null ? void 0 : _a.push(fieldId);
+      }
+    }
     for (const { source, id } of chargingGroups) {
       const groupId = `${rootId}.${id}`;
       const excludedFields = id === "session" ? import_status_metadata.excludedChargingSessionFields : import_status_metadata.excludedChargingStatisticsFields;
@@ -916,27 +968,34 @@ class MgSaic extends utils.Adapter {
       for (const field of excludedFields) {
         await this.delObjectAsync(`${groupId}.${field}`);
       }
-      for (const [field, value] of fields) {
+      const valuesByField = new Map(fields);
+      const resolvedFieldIds = (0, import_status_metadata.resolveChargingFieldIds)(
+        fields.map(([field]) => field),
+        (_b = existingFieldIds.get(id)) != null ? _b : []
+      );
+      for (const [responseField, field] of resolvedFieldIds) {
         if (this.stopping) {
           return;
         }
-        if (excludedFields.some((excludedField) => excludedField === field)) {
+        const value = valuesByField.get(responseField);
+        const canonicalField = (0, import_status_metadata.resolveChargingFieldName)(field);
+        if (excludedFields.some((excludedField) => excludedField === canonicalField)) {
           await this.delObjectAsync(`${groupId}.${field}`);
           continue;
         }
         const stateId = `${groupId}.${field}`;
-        if (value === void 0 && field !== "realtimePower" && field !== "batteryAvailableEnergy") {
+        if (value === void 0 && canonicalField !== "realtimePower" && canonicalField !== "batteryAvailableEnergy") {
           await this.delObjectAsync(stateId);
           continue;
         }
-        const normalizedValue = field === "realtimePower" ? (0, import_status_metadata.calculateRealtimePower)(charging.chrgMgmtData.bmsPackCrnt, charging.chrgMgmtData.bmsPackVol) : value === void 0 ? void 0 : (0, import_status_metadata.normalizeChargingValue)(field, value, series);
-        if (normalizedValue === void 0 && field !== "batteryAvailableEnergy") {
+        const normalizedValue = canonicalField === "realtimePower" ? (0, import_status_metadata.calculateRealtimePower)(charging.chrgMgmtData.bmsPackCrnt, charging.chrgMgmtData.bmsPackVol) : value === void 0 ? void 0 : (0, import_status_metadata.normalizeChargingValue)(canonicalField, value, series);
+        if (normalizedValue === void 0 && canonicalField !== "batteryAvailableEnergy") {
           await this.delObjectAsync(stateId);
           continue;
         }
-        const metadata = (0, import_status_metadata.getChargingFieldMetadata)(field, series);
+        const metadata = (0, import_status_metadata.getChargingFieldMetadata)(canonicalField, series);
         const common = {
-          name: (0, import_runtime_translations.getChargingFieldName)(field),
+          name: (0, import_runtime_translations.getChargingFieldName)(canonicalField),
           type: metadata.type === "boolean" ? "boolean" : typeof normalizedValue === "string" ? "string" : "number",
           role: typeof normalizedValue === "string" ? "text" : metadata.role,
           read: true,
@@ -1314,10 +1373,8 @@ class MgSaic extends utils.Adapter {
     this.unloadCallbackCalled = true;
     this.stopping = true;
     this.abortController.abort(new DOMException("Adapter is stopping", "AbortError"));
-    this.refreshQueued = false;
-    if (this.pollTimer) {
-      this.clearInterval(this.pollTimer);
-    }
+    this.refreshPollQueue.clearQueuedRefresh();
+    this.pollTimer.clear();
     callback();
   }
 }