iobroker.parcel 0.0.32 → 0.1.0

package/io-package.json

@@ -1,8 +1,11 @@
 {
   "common": {
     "name": "parcel",
-    "version": "0.0.32",
+    "version": "0.1.0",
     "news": {
+      "0.1.0": {
+        "en": "Fix Hermes login"
+      },
       "0.0.32": {
         "en": "Fix Amazon relogin"
       },

package/main.js

@@ -21,7 +21,7 @@ const utils = require("@iobroker/adapter-core");
 const axios = require("axios");
 const qs = require("qs");
 const crypto = require("crypto");
-const Json2iob = require("./lib/json2iob");
+const Json2iob = require("json2iob");
 const getPwd = require("./lib/rsaKey");
 const tough = require("tough-cookie");
 const { HttpsCookieAgent } = require("http-cookie-agent/http");
@@ -1089,12 +1089,12 @@ class Parcel extends utils.Adapter {
   async loginHermes() {
     await this.requestClient({
       method: "post",
-      url: "https://mobile-app-api.a0930.prd.hc.de/api/v11/users/login",
+      url: "https://mobile-app-api.a0930.prd.hc.de/api/v12/users/login",
       headers: {
         accept: "application/json",
         "api-key": "acefe97f-89fc-4f4e-9543-fc6b90f68928",
         "content-type": "application/json; charset=utf-8",
-        "user-agent": "Hermes - ios - 11.1.2 (2386)",
+        "user-agent": "Hermes - ios - 12.1.1 (2689)",
         "accept-language": "de-de",
       },
       data: { username: this.config.hermesusername, password: this.config.hermespassword },
@@ -1514,11 +1514,11 @@ class Parcel extends utils.Adapter {
       hermes: [
         {
           path: "hermes",
-          url: "https://mobile-app-api.a0930.prd.hc.de/api/v11/shipments",
+          url: "https://mobile-app-api.a0930.prd.hc.de/api/v12/shipments",
           header: {
             accept: "application/json",
             "api-key": "acefe97f-89fc-4f4e-9543-fc6b90f68928",
-            "user-agent": "Hermes - ios - 11.1.2 (2386)",
+            "user-agent": "Hermes - ios - 12.1.1 (2689)",
             "accept-language": "de-de",
             authorization: "Bearer " + this.hermesAuthToken,
           },
@@ -1594,7 +1594,7 @@ class Parcel extends utils.Adapter {
                     res.data = JSON.parse(res.data);
                   }
                   for (const parcel of res.data) {
-                    parcel.id = parcel.shipmentId;
+                    parcel.id = parcel.shipmentId || parcel.externalId;
                   }
                   data = { sendungen: res.data };
                 }
@@ -1770,28 +1770,33 @@ class Parcel extends utils.Adapter {
       this.mergedJson = this.mergedJson.concat(sendungsArray);
     }
     if (id === "hermes" && data.sendungen) {
-      const sendungsArray = data.sendungen.map((sendung) => {
-        let name = sendung.description;
-        if (sendung.sender && sendung.sender.lastname) {
-          name = name + " " + sendung.sender.lastname;
-        }
-        const sendungsObject = {
-          id: sendung.id,
-          name: name,
-          status: sendung.lastStatusMessage || "",
-          source: "Hermes",
-        };
+      try {
+        const sendungsArray = data.sendungen.map((sendung) => {
+          let name = sendung.description;
+          if (sendung.sender && sendung.sender.lastname) {
+            name = name + " " + sendung.sender.lastname;
+          }
+          const sendungsObject = {
+            id: sendung.id,
+            name: name,
+            status: sendung.status.text.longText || "",
+            source: "Hermes",
+          };
 
-        sendungsObject.delivery_status = this.deliveryStatusCheck(sendung, id, sendungsObject);
-        if (sendungsObject.delivery_status === this.delivery_status.OUT_FOR_DELIVERY) {
-          sendungsObject.inDelivery = true;
-          this.inDelivery.push(sendungsObject);
-        }
-        this.mergedJsonObject[sendung.id] = sendungsObject;
+          sendungsObject.delivery_status = this.deliveryStatusCheck(sendung, id, sendungsObject);
+          if (sendungsObject.delivery_status === this.delivery_status.OUT_FOR_DELIVERY) {
+            sendungsObject.inDelivery = true;
+            this.inDelivery.push(sendungsObject);
+          }
+          this.mergedJsonObject[sendung.id] = sendungsObject;
 
-        return sendungsObject;
-      });
-      this.mergedJson = this.mergedJson.concat(sendungsArray);
+          return sendungsObject;
+        });
+        this.mergedJson = this.mergedJson.concat(sendungsArray);
+      } catch (error) {
+        this.log.info("Hermes response incomplete cannot parse result");
+        this.log.info(error);
+      }
     }
 
     if (id === "dpd" && data && data.sendungen) {
@@ -1982,18 +1987,21 @@ class Parcel extends utils.Adapter {
             return dhl_status[sendung.sendungsdetails.sendungsverlauf.fortschritt];
           }
         }
-        if (id === "hermes" && sendung.lastStatusId) {
+        if (id === "hermes" && sendung.status) {
           const hermes_status = {
-            0: this.delivery_status.REGISTERED,
+            AM_PKS_ABGEGEBEN: this.delivery_status.REGISTERED,
             1: this.delivery_status.REGISTERED,
-            2: this.delivery_status.IN_PREPARATION,
-            3: this.delivery_status.IN_TRANSIT,
-            4: this.delivery_status.OUT_FOR_DELIVERY,
-            5: this.delivery_status.DELIVERED,
+            PAKETSHOP_AN_FAHRER_UEBERGEBEN: this.delivery_status.IN_PREPARATION,
+            UNTERWEGS: this.delivery_status.IN_TRANSIT,
+            ZUSTELLTOUR: this.delivery_status.OUT_FOR_DELIVERY,
+            ZUGESTELLT: this.delivery_status.DELIVERED,
           };
-          if (hermes_status[sendung.lastStatusId] !== undefined) {
-            return hermes_status[sendung.lastStatusId];
+          if (hermes_status[sendung.status.parcelStatus] !== undefined) {
+            return hermes_status[sendung.status.parcelStatus];
           }
+          // if (hermes_status[sendung.status.parcelStatus] !== undefined) {
+          //   return hermes_status[sendung.status.parcelStatus];
+          // }
         }
         if (id === "dpd" && sendung.statusId) {
           const dpd_status = {
@@ -2214,12 +2222,15 @@ class Parcel extends utils.Adapter {
       method: "get",
       url: "https://www.amazon.de/gp/css/order-history?ref_=nav_orders_first&disableCsd=missing-library",
       headers: {
-        accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
-
+        authority: "www.amazon.de",
+        accept:
+          "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
         "accept-language": "de-de",
+        "cache-control": "max-age=0",
+        "user-agent":
+          "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/537.36",
+        "viewport-width": "1272",
       },
-      jar: this.cookieJar,
-      withCredentials: true,
     })
       .then(async (res) => {
         // this.log.debug(JSON.stringify(res.data));
@@ -2331,12 +2342,12 @@ class Parcel extends utils.Adapter {
       if (id === "hermes") {
         await this.requestClient({
           method: "post",
-          url: "https://mobile-app-api.a0930.prd.hc.de/api/v11/users/refreshtoken",
+          url: "https://mobile-app-api.a0930.prd.hc.de/api/v12/users/refreshtoken",
           headers: {
             "Content-Type": "application/json; charset=utf-8",
             Accept: "application/json",
             "api-key": "acefe97f-89fc-4f4e-9543-fc6b90f68928",
-            "User-Agent": "Hermes - ios - 11.1.2 (2386)",
+            "User-Agent": "Hermes - ios - 12.1.1 (2689)",
             "Accept-Language": "de-de",
           },
           data: `{"refreshToken":"${this.sessions["hermes"].refreshToken}"}`,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iobroker.parcel",
-    "version": "0.0.32",
+    "version": "0.1.0",
     "description": "Parcel tracking",
     "author": {
         "name": "TA2k",
@@ -29,7 +29,7 @@
         "axios": "^1.4.0",
         "http-cookie-agent": "^5.0.4",
         "jsdom": "^21.1.2",
-        "json-bigint": "^1.0.0",
+        "json2iob": "^2.4.5",
         "qs": "^6.11.2",
         "tough-cookie": "^4.1.3",
         "uuid": "^9.0.0"
@@ -39,13 +39,13 @@
         "@types/chai": "^4.3.5",
         "@types/chai-as-promised": "^7.1.5",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^20.4.4",
+        "@types/node": "^20.4.10",
         "@types/proxyquire": "^1.3.28",
-        "@types/sinon": "^10.0.15",
+        "@types/sinon": "^10.0.16",
         "@types/sinon-chai": "^3.2.9",
         "chai": "^4.3.7",
         "chai-as-promised": "^7.1.1",
-        "eslint": "^8.45.0",
+        "eslint": "^8.47.0",
         "mocha": "^10.2.0",
         "proxyquire": "^2.1.3",
         "sinon": "^15.2.0",

package/lib/json2iob.js

@@ -1,290 +0,0 @@
-//v1.4
-/*
-options:
-write //set common write variable to true
-forceIndex //instead of trying to find names for array entries, use the index as the name
-channelName //set name of the root channel
-preferedArrayName //set key to use this as an array entry name
-autoCast (true false) // make JSON.parse to parse numbers correctly
-descriptions: Object of names for state keys
-*/
-const JSONbig = require("json-bigint")({ storeAsString: true });
-module.exports = class Json2iob {
-    constructor(adapter) {
-        this.adapter = adapter;
-        this.alreadyCreatedObjects = {};
-    }
-
-    async parse(path, element, options) {
-        try {
-            if (element === null || element === undefined) {
-                this.adapter.log.debug("Cannot extract empty: " + path);
-                return;
-            }
-
-            const objectKeys = Object.keys(element);
-
-            if (!options || !options.write) {
-                if (!options) {
-                    options = { write: false };
-                } else {
-                    options["write"] = false;
-                }
-            }
-
-            if (typeof element === "string" || typeof element === "number") {
-                let name = element;
-                if (typeof element === "number") {
-                    name = element.toString();
-                }
-                if (!this.alreadyCreatedObjects[path]) {
-                    await this.adapter
-                        .setObjectNotExistsAsync(path, {
-                            type: "state",
-                            common: {
-                                name: name,
-                                role: this.getRole(element, options.write),
-                                type: element !== null ? typeof element : "mixed",
-                                write: options.write,
-                                read: true,
-                            },
-                            native: {},
-                        })
-                        .then(() => {
-                            // this.alreadyCreatedObjects[path] = true;
-                        })
-                        .catch((error) => {
-                            this.adapter.log.error(error);
-                        });
-                }
-
-                this.adapter.setState(path, element, true);
-
-                return;
-            }
-            if (!this.alreadyCreatedObjects[path]) {
-                await this.adapter
-                    .setObjectNotExistsAsync(path, {
-                        type: "channel",
-                        common: {
-                            name: options.channelName || "",
-                            type: "mixed",
-                            write: false,
-                            read: true,
-                        },
-                        native: {},
-                    })
-                    .then(() => {
-                        // this.alreadyCreatedObjects[path] = true;
-                        options.channelName = undefined;
-                    })
-                    .catch((error) => {
-                        this.adapter.log.error(error);
-                    });
-            }
-            if (Array.isArray(element)) {
-                this.extractArray(element, "", path, options);
-                return;
-            }
-            objectKeys.forEach(async (key) => {
-                if (this.isJsonString(element[key]) && options.autoCast) {
-                    element[key] = JSONbig.parse(element[key]);
-                }
-
-                if (Array.isArray(element[key])) {
-                    this.extractArray(element, key, path, options);
-                } else if (element[key] !== null && typeof element[key] === "object") {
-                    this.parse(path + "." + key, element[key], options);
-                } else {
-                    if (!this.alreadyCreatedObjects[path + "." + key]) {
-                        let objectName = key;
-                        if (options.descriptions && options.descriptions[key]) {
-                            objectName = options.descriptions[key];
-                        }
-                        const type = element[key] !== null ? typeof element[key] : "mixed";
-                        const common = {
-                            name: objectName,
-                            role: this.getRole(element[key], options.write),
-                            type: type,
-                            write: options.write,
-                            read: true,
-                        };
-
-                        await this.adapter
-                            .setObjectNotExistsAsync(path + "." + key, {
-                                type: "state",
-                                common: common,
-                                native: {},
-                            })
-                            .then(() => {
-                                // this.alreadyCreatedObjects[path + "." + key] = true;
-                            })
-                            .catch((error) => {
-                                this.adapter.log.error(error);
-                            });
-                    }
-                    this.adapter.setState(path + "." + key, element[key], true);
-                }
-            });
-        } catch (error) {
-            this.adapter.log.error("Error extract keys: " + path + " " + JSON.stringify(element));
-            this.adapter.log.error(error);
-        }
-    }
-    extractArray(element, key, path, options) {
-        try {
-            if (key) {
-                element = element[key];
-            }
-            element.forEach(async (arrayElement, index) => {
-                index = index + 1;
-                if (index < 10) {
-                    index = "0" + index;
-                }
-                let arrayPath = key + index;
-                if (typeof arrayElement === "string") {
-                    this.parse(path + "." + key + "." + arrayElement, arrayElement, options);
-                    return;
-                }
-                if (typeof arrayElement[Object.keys(arrayElement)[0]] === "string") {
-                    arrayPath = arrayElement[Object.keys(arrayElement)[0]];
-                }
-                Object.keys(arrayElement).forEach((keyName) => {
-                    if (keyName.endsWith("Id") && arrayElement[keyName] !== null) {
-                        if (arrayElement[keyName] && arrayElement[keyName].replace) {
-                            arrayPath = arrayElement[keyName].replace(/\./g, "");
-                        } else {
-                            arrayPath = arrayElement[keyName];
-                        }
-                    }
-                });
-                Object.keys(arrayElement).forEach((keyName) => {
-                    if (keyName.endsWith("Name")) {
-                        if (arrayElement[keyName] && arrayElement[keyName].replace) {
-                            arrayPath = arrayElement[keyName].replace(/\./g, "");
-                        } else {
-                            arrayPath = arrayElement[keyName];
-                        }
-                    }
-                });
-
-                if (arrayElement.id) {
-                    if (arrayElement.id.replace) {
-                        arrayPath = arrayElement.id.replace(/\./g, "");
-                    } else {
-                        arrayPath = arrayElement.id;
-                    }
-                }
-                if (arrayElement.name) {
-                    arrayPath = arrayElement.name.replace(/\./g, "");
-                }
-                if (arrayElement.label) {
-                    arrayPath = arrayElement.label.replace(/\./g, "");
-                }
-                if (arrayElement.labelText) {
-                    arrayPath = arrayElement.labelText.replace(/\./g, "");
-                }
-                if (arrayElement.start_date_time) {
-                    arrayPath = arrayElement.start_date_time.replace(/\./g, "");
-                }
-                if (options.preferedArrayName && options.preferedArrayName.indexOf("+") !== -1) {
-                    const preferedArrayNameArray = options.preferedArrayName.split("+");
-                    if (arrayElement[preferedArrayNameArray[0]]) {
-                        const element0 = arrayElement[preferedArrayNameArray[0]].replace(/\./g, "").replace(/\ /g, "");
-                        let element1 = "";
-                        if (preferedArrayNameArray[1].indexOf("/") !== -1) {
-                            const subArray = preferedArrayNameArray[1].split("/");
-                            const subElement = arrayElement[subArray[0]];
-                            if (subElement && subElement[subArray[1]] !== undefined) {
-                                element1 = subElement[subArray[1]];
-                            } else if (arrayElement[subArray[1]] !== undefined) {
-                                element1 = arrayElement[subArray[1]];
-                            }
-                        } else {
-                            element1 = arrayElement[preferedArrayNameArray[1]].replace(/\./g, "").replace(/\ /g, "");
-                        }
-                        arrayPath = element0 + "-" + element1;
-                    }
-                } else if (options.preferedArrayName && options.preferedArrayName.indexOf("/") !== -1) {
-                    const preferedArrayNameArray = options.preferedArrayName.split("/");
-                    const subElement = arrayElement[preferedArrayNameArray[0]];
-                    if (subElement) {
-                        arrayPath = subElement[preferedArrayNameArray[1]].replace(/\./g, "").replace(/\ /g, "");
-                    }
-                } else if (options.preferedArrayName && arrayElement[options.preferedArrayName]) {
-                    arrayPath = arrayElement[options.preferedArrayName].replace(/\./g, "");
-                }
-
-                if (options.forceIndex) {
-                    arrayPath = key + index;
-                }
-                //special case array with 2 string objects
-                if (
-                    !options.forceIndex &&
-                    Object.keys(arrayElement).length === 2 &&
-                    typeof Object.keys(arrayElement)[0] === "string" &&
-                    typeof Object.keys(arrayElement)[1] === "string" &&
-                    typeof arrayElement[Object.keys(arrayElement)[0]] !== "object" &&
-                    typeof arrayElement[Object.keys(arrayElement)[1]] !== "object" &&
-                    arrayElement[Object.keys(arrayElement)[0]] !== "null"
-                ) {
-                    let subKey = arrayElement[Object.keys(arrayElement)[0]];
-                    const subValue = arrayElement[Object.keys(arrayElement)[1]];
-                    const subName = Object.keys(arrayElement)[0] + " " + Object.keys(arrayElement)[1];
-                    if (key) {
-                        subKey = key + "." + subKey;
-                    }
-                    if (!this.alreadyCreatedObjects[path + "." + subKey]) {
-                        await this.adapter
-                            .setObjectNotExistsAsync(path + "." + subKey, {
-                                type: "state",
-                                common: {
-                                    name: subName,
-                                    role: this.getRole(subValue, options.write),
-                                    type: subValue !== null ? typeof subValue : "mixed",
-                                    write: options.write,
-                                    read: true,
-                                },
-                                native: {},
-                            })
-                            .then(() => {
-                                // this.alreadyCreatedObjects[path + "." + subKey] = true;
-                            });
-                    }
-                    this.adapter.setState(path + "." + subKey, subValue, true);
-                    return;
-                }
-                this.parse(path + "." + arrayPath, arrayElement, options);
-            });
-        } catch (error) {
-            this.adapter.log.error("Cannot extract array " + path);
-            this.adapter.log.error(error);
-        }
-    }
-    isJsonString(str) {
-        try {
-            JSON.parse(str);
-        } catch (e) {
-            return false;
-        }
-        return true;
-    }
-    getRole(element, write) {
-        if (typeof element === "boolean" && !write) {
-            return "indicator";
-        }
-        if (typeof element === "boolean" && write) {
-            return "switch";
-        }
-        if (typeof element === "number" && !write) {
-            return "value";
-        }
-        if (typeof element === "number" && write) {
-            return "level";
-        }
-        if (typeof element === "string") {
-            return "text";
-        }
-        return "state";
-    }
-};