iobroker.mg-saic 0.1.0 → 0.1.1

package/README.md

@@ -3,15 +3,17 @@
 [![NPM version](https://img.shields.io/npm/v/iobroker.mg-saic.svg)](https://www.npmjs.com/package/iobroker.mg-saic)
 [![Downloads](https://img.shields.io/npm/dm/iobroker.mg-saic.svg)](https://www.npmjs.com/package/iobroker.mg-saic)
 
-<img src="MG.png" alt="MG" width="314">
+<img src="admin/MG.png" alt="MG" width="314">
 
 The adapter is intended for connecting MG and SAIC vehicles to ioBroker through the iSmart cloud service. It is not affiliated with or endorsed by MG, SAIC, or iSmart.
 
+For manufacturer information, see [MG Motor](https://www.mgmotor.eu/) and [SAIC Motor](https://www.saicmotor.com/).
+
 ## Setup
 
 ### Before you start
 
-- Node.js 24.0.0 or later is required.
+- Node.js 22.22.2 or later is required.
 - ioBroker js-controller 7.2.2 or later is required.
 - ioBroker Admin 8.2.0 or later is required.
 - Use an iSmart account that has access to the vehicle. A separate account shared with the vehicle is recommended to avoid interfering with the mobile app session.
@@ -23,7 +25,7 @@ The adapter is intended for connecting MG and SAIC vehicles to ioBroker through
 1. Install the adapter and create an instance in ioBroker Admin.
 2. Select the account region and login type (email or phone number).
 3. Enter the account's email address or phone number and password. For phone login, also enter the phone country calling code.
-4. Set the status polling interval in seconds. The default is 1800 seconds.
+4. Set the status polling interval >60 seconds. The default is 1800 seconds.
 5. Save the settings and start the instance. Vehicles available to the account appear under `vehicles.<VIN>`.
 
 ## Features
@@ -41,6 +43,11 @@ The adapter is published on npm but has not yet been added to the ioBroker adapt
 [![Donate](https://camo.githubusercontent.com/ef8c60305542390406855547e32850909812a73c4abada236de22a6dc88b313f/68747470733a2f2f7777772e70617970616c6f626a656374732e636f6d2f64655f44452f44452f692f62746e2f62746e5f646f6e61746543435f4c472e676966)](https://www.paypal.com/donate/?hosted_button_id=3RJQGSJNRSHUJ)
 
 ## Changelog
+### 0.1.1 (2026-11-07)
+
+- (Voodoo2man) Lowered the minimum Node.js requirement to 22.22.2.
+- (Voodoo2man) Improved charging datapoint labels and units, enforced safe polling interval limits, and added manufacturer references.
+
 ### 0.1.0 (2026-11-01)
 
 - (Voodoo2man) Reported real-time charging power in kW using the pack current and voltage.
@@ -66,10 +73,6 @@ Older changelog entries are available in [CHANGELOG_OLD.md](CHANGELOG_OLD.md).
 
 - (Voodoo2man) Added regional iSmart account setup, vehicle status, and supported remote controls.
 
-### 0.0.1 (2026-10-20)
-
-- (Voodoo2man) Initial Version
-
 ## License
 
 MIT License

package/admin/jsonConfig.json

@@ -110,7 +110,8 @@
 					"type": "number",
 					"label": "Status polling interval (seconds)",
 					"default": 1800,
-					"min": 1,
+					"min": 60,
+					"max": 2147483,
 					"step": 1,
 					"xs": 12,
 					"sm": 12,

package/build/config.js

@@ -19,16 +19,18 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var config_exports = {};
 __export(config_exports, {
   DEFAULT_POLL_INTERVAL_SECONDS: () => DEFAULT_POLL_INTERVAL_SECONDS,
+  MAX_POLL_INTERVAL_SECONDS: () => MAX_POLL_INTERVAL_SECONDS,
   validateConfig: () => validateConfig
 });
 module.exports = __toCommonJS(config_exports);
 var import_regions = require("./regions");
 const DEFAULT_POLL_INTERVAL_SECONDS = 1800;
+const MAX_POLL_INTERVAL_SECONDS = 2147483;
 function validateConfig(config) {
   var _a, _b, _c;
   const errors = [];
-  if (config.pollIntervalSeconds !== void 0 && (!Number.isInteger(config.pollIntervalSeconds) || config.pollIntervalSeconds < 1)) {
-    errors.push("Polling interval must be a positive integer number of seconds");
+  if (config.pollIntervalSeconds !== void 0 && (!Number.isInteger(config.pollIntervalSeconds) || config.pollIntervalSeconds < 60 || config.pollIntervalSeconds > MAX_POLL_INTERVAL_SECONDS)) {
+    errors.push(`Polling interval must be an integer between 60 and ${MAX_POLL_INTERVAL_SECONDS} seconds`);
   }
   if (!((_a = config.region) == null ? void 0 : _a.trim())) {
     errors.push("Region/backend code is required");
@@ -54,6 +56,7 @@ function validateConfig(config) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DEFAULT_POLL_INTERVAL_SECONDS,
+  MAX_POLL_INTERVAL_SECONDS,
   validateConfig
 });
 //# sourceMappingURL=config.js.map

package/build/config.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/config.ts"],
-  "sourcesContent": ["import { isIndiaRegion, resolveSaicRegion } from './regions';\n\n/** Settings entered for one iSmart account and backend. */\nexport interface MgSaicConfig {\n\t/** Automatic status polling interval in seconds. */\n\tpollIntervalSeconds?: number;\n\t/** Backend region code. */\n\tregion?: string;\n\t/** Whether the account identifier is an email address or phone number. */\n\taccountType?: string;\n\t/** Email address or phone number used to sign in. */\n\taccountIdentifier?: string;\n\t/** International calling code when using a phone account. */\n\tphoneCountryCode?: string;\n\t/** Account password, decrypted by ioBroker for the adapter process. */\n\tpassword?: string;\n}\n\nexport const DEFAULT_POLL_INTERVAL_SECONDS = 1800;\n\n/**\n * Returns configuration problems without logging any credential values.\n *\n * @param config The instance's native configuration.\n */\nexport function validateConfig(config: MgSaicConfig): string[] {\n\tconst errors: string[] = [];\n\tif (\n\t\tconfig.pollIntervalSeconds !== undefined &&\n\t\t(!Number.isInteger(config.pollIntervalSeconds) || config.pollIntervalSeconds < 1)\n\t) {\n\t\terrors.push('Polling interval must be a positive integer number of seconds');\n\t}\n\tif (!config.region?.trim()) {\n\t\terrors.push('Region/backend code is required');\n\t} else if (isIndiaRegion(config.region)) {\n\t\terrors.push('India TAP connectivity is not implemented yet');\n\t} else if (!resolveSaicRegion(config.region)) {\n\t\terrors.push('Unsupported SAIC region');\n\t}\n\tif (config.accountType !== 'email' && config.accountType !== 'phone') {\n\t\terrors.push('Login type must be email or phone');\n\t}\n\tif (!config.accountIdentifier?.trim()) {\n\t\terrors.push('Email address or phone number is required');\n\t}\n\tif (config.accountType === 'phone' && !config.phoneCountryCode?.trim()) {\n\t\terrors.push('Phone country calling code is required');\n\t}\n\tif (!config.password) {\n\t\terrors.push('Password is required');\n\t}\n\treturn errors;\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAiD;AAkB1C,MAAM,gCAAgC;AAOtC,SAAS,eAAe,QAAgC;AAzB/D;AA0BC,QAAM,SAAmB,CAAC;AAC1B,MACC,OAAO,wBAAwB,WAC9B,CAAC,OAAO,UAAU,OAAO,mBAAmB,KAAK,OAAO,sBAAsB,IAC9E;AACD,WAAO,KAAK,+DAA+D;AAAA,EAC5E;AACA,MAAI,GAAC,YAAO,WAAP,mBAAe,SAAQ;AAC3B,WAAO,KAAK,iCAAiC;AAAA,EAC9C,eAAW,8BAAc,OAAO,MAAM,GAAG;AACxC,WAAO,KAAK,+CAA+C;AAAA,EAC5D,WAAW,KAAC,kCAAkB,OAAO,MAAM,GAAG;AAC7C,WAAO,KAAK,yBAAyB;AAAA,EACtC;AACA,MAAI,OAAO,gBAAgB,WAAW,OAAO,gBAAgB,SAAS;AACrE,WAAO,KAAK,mCAAmC;AAAA,EAChD;AACA,MAAI,GAAC,YAAO,sBAAP,mBAA0B,SAAQ;AACtC,WAAO,KAAK,2CAA2C;AAAA,EACxD;AACA,MAAI,OAAO,gBAAgB,WAAW,GAAC,YAAO,qBAAP,mBAAyB,SAAQ;AACvE,WAAO,KAAK,wCAAwC;AAAA,EACrD;AACA,MAAI,CAAC,OAAO,UAAU;AACrB,WAAO,KAAK,sBAAsB;AAAA,EACnC;AACA,SAAO;AACR;",
+  "sourcesContent": ["import { isIndiaRegion, resolveSaicRegion } from './regions';\n\n/** Settings entered for one iSmart account and backend. */\nexport interface MgSaicConfig {\n\t/** Automatic status polling interval in seconds. */\n\tpollIntervalSeconds?: number;\n\t/** Backend region code. */\n\tregion?: string;\n\t/** Whether the account identifier is an email address or phone number. */\n\taccountType?: string;\n\t/** Email address or phone number used to sign in. */\n\taccountIdentifier?: string;\n\t/** International calling code when using a phone account. */\n\tphoneCountryCode?: string;\n\t/** Account password, decrypted by ioBroker for the adapter process. */\n\tpassword?: string;\n}\n\nexport const DEFAULT_POLL_INTERVAL_SECONDS = 1800;\nexport const MAX_POLL_INTERVAL_SECONDS = 2_147_483;\n\n/**\n * Returns configuration problems without logging any credential values.\n *\n * @param config The instance's native configuration.\n */\nexport function validateConfig(config: MgSaicConfig): string[] {\n\tconst errors: string[] = [];\n\tif (\n\t\tconfig.pollIntervalSeconds !== undefined &&\n\t\t(!Number.isInteger(config.pollIntervalSeconds) ||\n\t\t\tconfig.pollIntervalSeconds < 60 ||\n\t\t\tconfig.pollIntervalSeconds > MAX_POLL_INTERVAL_SECONDS)\n\t) {\n\t\terrors.push(`Polling interval must be an integer between 60 and ${MAX_POLL_INTERVAL_SECONDS} seconds`);\n\t}\n\tif (!config.region?.trim()) {\n\t\terrors.push('Region/backend code is required');\n\t} else if (isIndiaRegion(config.region)) {\n\t\terrors.push('India TAP connectivity is not implemented yet');\n\t} else if (!resolveSaicRegion(config.region)) {\n\t\terrors.push('Unsupported SAIC region');\n\t}\n\tif (config.accountType !== 'email' && config.accountType !== 'phone') {\n\t\terrors.push('Login type must be email or phone');\n\t}\n\tif (!config.accountIdentifier?.trim()) {\n\t\terrors.push('Email address or phone number is required');\n\t}\n\tif (config.accountType === 'phone' && !config.phoneCountryCode?.trim()) {\n\t\terrors.push('Phone country calling code is required');\n\t}\n\tif (!config.password) {\n\t\terrors.push('Password is required');\n\t}\n\treturn errors;\n}\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,qBAAiD;AAkB1C,MAAM,gCAAgC;AACtC,MAAM,4BAA4B;AAOlC,SAAS,eAAe,QAAgC;AA1B/D;AA2BC,QAAM,SAAmB,CAAC;AAC1B,MACC,OAAO,wBAAwB,WAC9B,CAAC,OAAO,UAAU,OAAO,mBAAmB,KAC5C,OAAO,sBAAsB,MAC7B,OAAO,sBAAsB,4BAC7B;AACD,WAAO,KAAK,sDAAsD,yBAAyB,UAAU;AAAA,EACtG;AACA,MAAI,GAAC,YAAO,WAAP,mBAAe,SAAQ;AAC3B,WAAO,KAAK,iCAAiC;AAAA,EAC9C,eAAW,8BAAc,OAAO,MAAM,GAAG;AACxC,WAAO,KAAK,+CAA+C;AAAA,EAC5D,WAAW,KAAC,kCAAkB,OAAO,MAAM,GAAG;AAC7C,WAAO,KAAK,yBAAyB;AAAA,EACtC;AACA,MAAI,OAAO,gBAAgB,WAAW,OAAO,gBAAgB,SAAS;AACrE,WAAO,KAAK,mCAAmC;AAAA,EAChD;AACA,MAAI,GAAC,YAAO,sBAAP,mBAA0B,SAAQ;AACtC,WAAO,KAAK,2CAA2C;AAAA,EACxD;AACA,MAAI,OAAO,gBAAgB,WAAW,GAAC,YAAO,qBAAP,mBAAyB,SAAQ;AACvE,WAAO,KAAK,wCAAwC;AAAA,EACrD;AACA,MAAI,CAAC,OAAO,UAAU;AACrB,WAAO,KAAK,sBAAsB;AAAA,EACnC;AACA,SAAO;AACR;",
   "names": []
 }

package/build/main.js

@@ -22,6 +22,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var utils = __toESM(require("@iobroker/adapter-core"));
+var import_promises = require("node:fs/promises");
+var import_node_path = require("node:path");
 var import_config = require("./config");
 var import_saic_client = require("./saic-client");
 var import_regions = require("./regions");
@@ -105,6 +107,7 @@ const settingInputsByAction = {
   batteryHeatingScheduleApply: ["batteryHeatingScheduleEnabled", "batteryHeatingScheduleStart"]
 };
 const EXPOSE_SOURCE_STATUS_DATAPOINTS = false;
+const PENDING_SETTING_EDITS_FILE = "pending-setting-edits.json";
 class MgSaic extends utils.Adapter {
   constructor(options = {}) {
     super({
@@ -142,16 +145,12 @@ class MgSaic extends utils.Adapter {
     await this.extendObjectAsync("info.backend", { common: { name: (0, import_runtime_translations.getRuntimeName)("backend") } });
     await this.extendObjectAsync("info.connection", { common: { name: (0, import_runtime_translations.getRuntimeName)("connection") } });
     await this.extendObjectAsync("info.lastError", { common: { name: (0, import_runtime_translations.getRuntimeName)("lastError") } });
-    await this.setObjectNotExistsAsync("internal", {
-      type: "channel",
-      common: { name: "Internal" },
-      native: {}
-    });
-    await this.setObjectNotExistsAsync("internal.pendingSettingEdits", {
-      type: "state",
-      common: { name: "Pending setting edits", type: "string", role: "json", read: true, write: false },
-      native: {}
-    });
+    try {
+      await this.migrateLegacyPendingSettingEdits();
+    } catch (error) {
+      const details = error instanceof Error ? error.message : "Unknown storage error";
+      this.log.warn(`Could not migrate pending setting edits: ${details}`);
+    }
     await this.setObjectNotExistsAsync("commands", {
       type: "channel",
       common: { name: (0, import_runtime_translations.getRuntimeName)("commands") },
@@ -250,7 +249,12 @@ class MgSaic extends utils.Adapter {
         }
         await this.delObjectAsync(`vehicles.${vehicle.vin}.canonicalStatus`, { recursive: true });
       }
-      await this.restorePendingSettingEdits();
+      try {
+        await this.restorePendingSettingEdits();
+      } catch (error) {
+        const details = error instanceof Error ? error.message : "Unknown storage error";
+        this.log.warn(`Could not restore pending setting edits: ${details}`);
+      }
       await this.setState("info.connection", true, true);
       this.log.info(`SAIC account authenticated; discovered ${this.vehicles.length} vehicle(s).`);
       if (this.vehicles.length === 0) {
@@ -554,21 +558,62 @@ class MgSaic extends utils.Adapter {
     }
   }
   async persistPendingSettingEdits() {
-    const serialized = (0, import_pending_setting_edits.serializePendingSettingEdits)(this.pendingSettingEdits.keys());
     const write = this.pendingSettingEditsWrite.catch(() => void 0).then(async () => {
-      await this.setStateAsync("internal.pendingSettingEdits", { val: serialized, ack: true });
+      await this.writePendingSettingEditsFile((0, import_pending_setting_edits.serializePendingSettingEdits)(this.pendingSettingEdits.keys()));
     });
     this.pendingSettingEditsWrite = write;
     await write;
   }
+  async migrateLegacyPendingSettingEdits() {
+    const legacyObject = await this.getObjectAsync("internal.pendingSettingEdits");
+    if (legacyObject) {
+      const legacyState = await this.getStateAsync("internal.pendingSettingEdits");
+      const savedFileValue = await this.readPendingSettingEditsFile();
+      await (0, import_pending_setting_edits.migrateLegacyPendingSettingEdits)(
+        savedFileValue,
+        { exists: true, value: legacyState == null ? void 0 : legacyState.val },
+        (serialized) => this.writePendingSettingEditsFile(serialized),
+        () => this.delObjectAsync("internal.pendingSettingEdits")
+      );
+    }
+    const internalObject = await this.getObjectAsync("internal");
+    if (!internalObject) {
+      return;
+    }
+    const children = await this.getObjectListAsync({
+      startkey: `${this.namespace}.internal.`,
+      endkey: `${this.namespace}.internal.\u9999`
+    });
+    if (children.rows.length === 0) {
+      await this.delObjectAsync("internal");
+    }
+  }
+  async readPendingSettingEditsFile() {
+    try {
+      return await (0, import_promises.readFile)(this.getPendingSettingEditsFilePath(), "utf8");
+    } catch (error) {
+      if (error && typeof error === "object" && "code" in error && error.code === "ENOENT") {
+        return void 0;
+      }
+      throw error;
+    }
+  }
+  async writePendingSettingEditsFile(serialized) {
+    const directory = utils.getAbsoluteInstanceDataDir(this);
+    await (0, import_promises.mkdir)(directory, { recursive: true });
+    await (0, import_promises.writeFile)(this.getPendingSettingEditsFilePath(), serialized, "utf8");
+  }
+  getPendingSettingEditsFilePath() {
+    return (0, import_node_path.join)(utils.getAbsoluteInstanceDataDir(this), PENDING_SETTING_EDITS_FILE);
+  }
   async restorePendingSettingEdits() {
     const validStateIds = new Set(
       this.vehicles.flatMap(
         ({ vin }) => Object.keys(settingGroups).filter((stateId) => stateId !== "driverSeatHeatLevel" && stateId !== "passengerSeatHeatLevel").map((stateId) => vehicleCommandPath(vin, stateId))
       )
     );
-    const savedState = await this.getStateAsync("internal.pendingSettingEdits");
-    for (const stateId of (0, import_pending_setting_edits.parsePendingSettingEdits)(savedState == null ? void 0 : savedState.val, validStateIds)) {
+    const savedFileValue = await this.readPendingSettingEditsFile();
+    for (const stateId of (0, import_pending_setting_edits.parsePendingSettingEdits)(savedFileValue, validStateIds)) {
       this.pendingSettingEdits.set(stateId, ++this.settingEditSequence);
     }
     for (const stateId of validStateIds) {