iobroker.parcel 0.0.30 → 0.0.32

package/io-package.json

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

package/main.js

@@ -2103,67 +2103,12 @@ class Parcel extends utils.Adapter {
     this.log.debug("Get Amazon Packages");
     const amzResult = { sendungen: [] };
 
-    const orders = await this.requestClient({
-      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",
-
-        "accept-language": "de-de",
-      },
-      jar: this.cookieJar,
-      withCredentials: true,
-    })
-      .then(async (res) => {
-        // this.log.debug(JSON.stringify(res.data));
-
-        const dom = new JSDOM(res.data);
-
-        if (res.data.includes("auth-workflow")) {
-          this.log.debug("Amazon Login required");
-          this.loginAmz();
-          return;
-        }
-        const document = dom.window.document;
-        const elements = [];
-        const orders = document.querySelectorAll(".order-card.js-order-card");
-
-        for (const order of orders) {
-          const descHandle = order.querySelector(
-            ".a-fixed-right-grid-col.a-col-left .a-fixed-left-grid-col.a-col-right div:first-child .a-link-normal",
-          );
-          const desc = descHandle ? descHandle.textContent.replace(/\n */g, "") : "";
-          let url = order.querySelector(".track-package-button a")
-            ? order.querySelector(".track-package-button a").getAttribute("href")
-            : "";
-          if (!url) {
-            const allLinks = order.querySelectorAll(".a-button-inner a");
-            for (const link of allLinks) {
-              if (link.textContent.includes("Lieferung verfolgen")) {
-                url = link.getAttribute("href");
-              }
-            }
-          }
-          if (!url) {
-            url = order.querySelector(".yohtmlc-shipment-level-connections .a-button-inner a")
-              ? order.querySelector(".yohtmlc-shipment-level-connections .a-button-inner a").getAttribute("href")
-              : "";
-          }
-          if (url) {
-            elements.push({ desc: desc, url: url });
-          }
-        }
-        return elements;
-      })
-      .catch((error) => {
-        this.log.error("Failed to get Amazon Orders");
-        this.log.error(error);
-        if (error.response) {
-          this.log.error(JSON.stringify(error.response.data));
-        }
-      });
+    let orders = await this.getAmazonOrders();
+    if (!orders) {
+      orders = await this.getAmazonOrders();
+    }
     if (!orders) {
-      this.log.warn("No Amazon orders found");
+      this.log.info("No Amazon orders found");
       return;
     }
     this.log.debug("Found " + orders.length + " Amazon Orders");
@@ -2264,6 +2209,67 @@ class Parcel extends utils.Adapter {
     await this.setStateAsync("auth.cookie", JSON.stringify(this.cookieJar.toJSON()), true);
     await this.setStateAsync("amazon.json", JSON.stringify(amzResult), true);
   }
+  async getAmazonOrders() {
+    return await this.requestClient({
+      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",
+
+        "accept-language": "de-de",
+      },
+      jar: this.cookieJar,
+      withCredentials: true,
+    })
+      .then(async (res) => {
+        // this.log.debug(JSON.stringify(res.data));
+        const dom = new JSDOM(res.data);
+
+        if (res.data.includes("auth-workflow")) {
+          this.log.debug("Amazon Login required");
+          await this.loginAmz();
+          return;
+        }
+        const document = dom.window.document;
+        const elements = [];
+        const orders = document.querySelectorAll(".order-card.js-order-card");
+
+        for (const order of orders) {
+          const descHandle = order.querySelector(
+            ".a-fixed-right-grid-col.a-col-left .a-fixed-left-grid-col.a-col-right div:first-child .a-link-normal",
+          );
+          const desc = descHandle ? descHandle.textContent.replace(/\n */g, "") : "";
+          let url = order.querySelector(".track-package-button a")
+            ? order.querySelector(".track-package-button a").getAttribute("href")
+            : "";
+          if (!url) {
+            const allLinks = order.querySelectorAll(".a-button-inner a");
+            for (const link of allLinks) {
+              if (link.textContent.includes("Lieferung verfolgen")) {
+                url = link.getAttribute("href");
+              }
+            }
+          }
+          if (!url) {
+            url = order.querySelector(".yohtmlc-shipment-level-connections .a-button-inner a")
+              ? order.querySelector(".yohtmlc-shipment-level-connections .a-button-inner a").getAttribute("href")
+              : "";
+          }
+          if (url) {
+            elements.push({ desc: desc, url: url });
+          }
+        }
+        return elements;
+      })
+      .catch((error) => {
+        this.log.error("Failed to get Amazon Orders");
+        this.log.error(error);
+        if (error.response) {
+          this.log.error(JSON.stringify(error.response.data));
+        }
+      });
+  }
+
   async refreshToken() {
     if (Object.keys(this.sessions).length === 0) {
       this.log.error("No session found relogin");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iobroker.parcel",
-    "version": "0.0.30",
+    "version": "0.0.32",
     "description": "Parcel tracking",
     "author": {
         "name": "TA2k",
@@ -27,7 +27,7 @@
     "dependencies": {
         "@iobroker/adapter-core": "^2.6.8",
         "axios": "^1.4.0",
-        "http-cookie-agent": "^5.0.2",
+        "http-cookie-agent": "^5.0.4",
         "jsdom": "^21.1.2",
         "json-bigint": "^1.0.0",
         "qs": "^6.11.2",
@@ -39,18 +39,18 @@
         "@types/chai": "^4.3.5",
         "@types/chai-as-promised": "^7.1.5",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^18.16.16",
+        "@types/node": "^20.4.4",
         "@types/proxyquire": "^1.3.28",
         "@types/sinon": "^10.0.15",
         "@types/sinon-chai": "^3.2.9",
         "chai": "^4.3.7",
         "chai-as-promised": "^7.1.1",
-        "eslint": "^8.42.0",
+        "eslint": "^8.45.0",
         "mocha": "^10.2.0",
         "proxyquire": "^2.1.3",
-        "sinon": "^15.1.0",
+        "sinon": "^15.2.0",
         "sinon-chai": "^3.7.0",
-        "typescript": "~5.1.3"
+        "typescript": "~5.1.6"
     },
     "main": "main.js",
     "files": [