iobroker.parcel 0.0.13 → 0.0.16

package/README.md

@@ -12,9 +12,10 @@
 
 **Tests:** ![Test and Release](https://github.com/TA2k/ioBroker.parcel/workflows/Test%20and%20Release/badge.svg)
 
-## parcel adapter for ioBroker
+## Paketverfolgung/Sendungsverfolgung Adapter für ioBroker
 
-Parcel tracking
+Parcel tracking / Sendungsverfolgung 
+Verfolge mit deinem ioBroker SmartHome deine Pakete von Amazon, DHL, DPD, Hermes, UPS und GLS. Außerdem wirst du über die Briefverfolgung von der deutschen Post informiert. Direkt per Push auf Telegram, Pushover oder Signal.
 
 ## Loginablauf
 

package/io-package.json

@@ -1,8 +1,14 @@
 {
     "common": {
         "name": "parcel",
-        "version": "0.0.13",
+        "version": "0.0.16",
         "news": {
+            "0.0.16": {
+                "en": "Fix UPS login"
+            },
+            "0.0.15": {
+                "en": "Fix DPD states and remove canvas dependency"
+            },
             "0.0.13": {
                 "en": "Fix Amazon delivery state, add telegram user"
             },

package/main.js

@@ -6,6 +6,17 @@
 
 // The adapter-core module gives you access to the core ioBroker functions
 // you need to create an adapter
+
+//disable canvas because of missing rebuild
+const Module = require("module");
+const originalRequire = Module.prototype.require;
+Module.prototype.require = function () {
+    if (arguments[0] === "canvas") {
+        return { createCanvas: null, createImageData: null, loadImage: null };
+    }
+    return originalRequire.apply(this, arguments);
+};
+
 const utils = require("@iobroker/adapter-core");
 const axios = require("axios");
 const qs = require("qs");
@@ -13,9 +24,11 @@ const Json2iob = require("./lib/json2iob");
 const getPwd = require("./lib/rsaKey");
 const tough = require("tough-cookie");
 const { HttpsCookieAgent } = require("http-cookie-agent");
-const { JSDOM } = require("@applitools/jsdom");
+const { JSDOM } = require("jsdom");
 const fs = require("fs");
 const { v4: uuidv4 } = require("uuid");
+const { sep } = require("path");
+const { tmpdir } = require("os");
 
 class Parcel extends utils.Adapter {
     /**
@@ -40,6 +53,7 @@ class Parcel extends utils.Adapter {
         this.ignoredPath = [];
         this.firstStart = true;
         this.delivery_status = { ERROR: -1, UNKNOWN: 5, REGISTERED: 10, IN_PREPARATION: 20, IN_TRANSIT: 30, OUT_FOR_DELIVERY: 40, DELIVERED: 1 };
+        this.tmpDir = tmpdir();
     }
 
     /**
@@ -448,6 +462,7 @@ class Parcel extends utils.Adapter {
                 return res.data;
             })
             .catch((error) => {
+                this.log.error("Amazon login failed");
                 this.log.error(error);
                 if (error.response) {
                     this.log.error(JSON.stringify(error.response.data));
@@ -821,7 +836,7 @@ class Parcel extends utils.Adapter {
                 UPSSecurity: {
                     UsernameToken: {},
                     ServiceAccessToken: {
-                        AccessLicenseNumber: "BDB176074C16EB9D",
+                        AccessLicenseNumber: "2DBACFA7974B3252",
                     },
                 },
                 LoginSubmitUserIdRequest: {
@@ -919,7 +934,7 @@ class Parcel extends utils.Adapter {
                 ) {
                     this.upsAddressToken = res.data.GetEnrollmentsResponse.MYCEnrollmentSummaries.MYCEnrollmentSummary.AddressToken;
                 } else {
-                    this.log.warn("No UPS address found");
+                    this.log.warn("No UPS address found. Please activate UPS My Choice in the UPS App");
                     this.log.info(JSON.stringify(res.data));
                 }
             })
@@ -1102,7 +1117,7 @@ class Parcel extends utils.Adapter {
                 });
         }
         if (this.sessions["amz"]) {
-            this.getAmazonPackages();
+            await this.getAmazonPackages();
         }
         const statusArrays = {
             dhl: [
@@ -1157,6 +1172,9 @@ class Parcel extends utils.Adapter {
                         accept: "*/*",
                         "user-agent": "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.45 Safari/537.36",
                         "accept-language": "de-de",
+                        "Cache-Control": "no-cache",
+                        Pragma: "no-cache",
+                        Expires: "0",
                     },
                 },
             ],
@@ -1319,6 +1337,11 @@ class Parcel extends utils.Adapter {
                     });
             }
         }
+        this.log.debug("Write states");
+        this.setState("allProviderJson", JSON.stringify(this.mergedJson), true);
+        this.setState("allProviderObjects", JSON.stringify(this.mergedJsonObject), true);
+        this.setState("inDelivery", JSON.stringify(this.inDelivery), true);
+        this.setState("inDeliveryCount", this.inDelivery.length, true);
     }
     async cleanupProvider(id, data) {
         if (id === "dhl" && data.hasOwnProperty("grantToken")) {
@@ -1363,7 +1386,12 @@ class Parcel extends utils.Adapter {
                 if (sendung.sendungsdetails && sendung.sendungsdetails.sendungsverlauf && sendung.sendungsdetails.sendungsverlauf.kurzStatus) {
                     status = sendung.sendungsdetails.sendungsverlauf.kurzStatus;
                 }
-                const sendungsObject = { id: sendung.id, name: sendung.sendungsinfo.sendungsname, status: status, source: "DHL" };
+                if (sendung.sendungsdetails && sendung.sendungsdetails.liveTrackingVerfuegbar && sendung.sendungsdetails.liveTracking) {
+                    status = status + " " + sendung.sendungsdetails.liveTracking.countdown + " Stopps";
+                }
+                const name = sendung.sendungsinfo.sendungsname;
+
+                const sendungsObject = { id: sendung.id, name: name, status: status, source: "DHL" };
 
                 sendungsObject.delivery_status = this.deliveryStatusCheck(sendung, id, sendungsObject);
                 if (sendungsObject.delivery_status === this.delivery_status.OUT_FOR_DELIVERY) {
@@ -1426,19 +1454,19 @@ class Parcel extends utils.Adapter {
         }
 
         if (id === "dpd" && data && data.sendungen) {
-            for (const sendung of data.sendungen) {
-                sendung.source = "DPD";
-                sendung.delivery_status = this.deliveryStatusCheck(sendung, id, sendung);
-                if (sendung.delivery_status === this.delivery_status.OUT_FOR_DELIVERY) {
-                    sendung.inDelivery = true;
-                    this.inDelivery.push(sendung);
-                }
-                if (!sendung.delivery_status) {
-                    this.log.warn("Missing status for " + JSON.stringify(sendung));
+            const sendungsArray = data.sendungen.map((sendung) => {
+                const sendungsObject = { id: sendung.id, name: sendung.name, status: sendung.status || "", source: "DPD" };
+
+                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] = sendung;
-            }
-            this.mergedJson = this.mergedJson.concat(data.sendungen);
+                this.mergedJsonObject[sendung.id] = sendungsObject;
+
+                return sendungsObject;
+            });
+            this.mergedJson = this.mergedJson.concat(sendungsArray);
         }
         if (id === "amz" && data && data.sendungen) {
             const sendungsArray = data.sendungen.map((sendung) => {
@@ -1495,11 +1523,6 @@ class Parcel extends utils.Adapter {
             this.mergedJson = this.mergedJson.concat(sendungsArray);
         }
 
-        this.setState("allProviderJson", JSON.stringify(this.mergedJson), true);
-        this.setState("allProviderObjects", JSON.stringify(this.mergedJsonObject), true);
-        this.setState("inDelivery", JSON.stringify(this.inDelivery), true);
-        this.setState("inDeliveryCount", this.inDelivery.length, true);
-
         if (this.config.sendToActive) {
             const sendungen = this.mergedJsonObject;
             const ids = Object.keys(sendungen);
@@ -1515,12 +1538,30 @@ class Parcel extends utils.Adapter {
                 const sendInstances = this.config.sendToInstance.replace(/ /g, "").split(",");
                 const sendUser = this.config.sendToUser.replace(/ /g, "").split(",");
                 for (const sendInstance of sendInstances) {
+                    const text = "📦 " + sendungen[id].source + " " + sendungen[id].name + "\n" + sendungen[id].status;
                     if (sendUser.length > 0) {
                         for (const user of sendUser) {
-                            await this.sendToAsync(sendInstance, { user: user, text: "📦 " + sendungen[id].name + "\n" + sendungen[id].status });
+                            if (sendInstance.includes("pushover")) {
+                                await this.sendToAsync(sendInstance, { user: user, message: text, title: "Paketstatus" });
+                            } else if (sendInstance.includes("signal-cmb")) {
+                                await this.sendToAsync(sendInstance, "send", {
+                                    text: text,
+                                    phone: user,
+                                });
+                            } else {
+                                await this.sendToAsync(sendInstance, { user: user, text: text });
+                            }
                         }
                     } else {
-                        await this.sendToAsync(sendInstance, "📦 " + sendungen[id].name + "\n" + sendungen[id].status);
+                        if (sendInstance.includes("pushover")) {
+                            await this.sendToAsync(sendInstance, { message: text, title: "Paketstatus" });
+                        } else if (sendInstance.includes("signal-cmb")) {
+                            await this.sendToAsync(sendInstance, "send", {
+                                text: text,
+                            });
+                        } else {
+                            await this.sendToAsync(sendInstance, text);
+                        }
                     }
                 }
             }
@@ -1589,17 +1630,32 @@ class Parcel extends utils.Adapter {
                         return hermes_status[sendung.lastStatusId];
                     }
                 }
-                if (id === "gls" && sendung.status) {
-                    const gls_status = {
+                if (id === "dpd" && sendung.statusId) {
+                    const dpd_status = {
                         0: this.delivery_status.REGISTERED,
-                        1: this.delivery_status.REGISTERED,
-                        2: this.delivery_status.IN_PREPARATION,
+                        1: this.delivery_status.IN_PREPARATION,
+                        2: this.delivery_status.IN_TRANSIT,
                         3: this.delivery_status.IN_TRANSIT,
                         4: this.delivery_status.OUT_FOR_DELIVERY,
+                        5: this.delivery_status.OUT_FOR_DELIVERY,
+                        6: this.delivery_status.DELIVERED,
+                    };
+                    if (dpd_status[sendung.statusId] !== undefined) {
+                        return dpd_status[sendung.statusId];
+                    }
+                }
+                if (id === "gls" && sendung.status) {
+                    const gls_status = {
+                        PREADVICE: this.delivery_status.REGISTERED,
+                        1: this.delivery_status.REGISTERED,
+                        INWAREHOUSE: this.delivery_status.IN_TRANSIT,
+                        INTRANSIT: this.delivery_status.IN_TRANSIT,
+                        INDELIVERY: this.delivery_status.OUT_FOR_DELIVERY,
                         DELIVERED: this.delivery_status.DELIVERED,
+                        DELIVEREDPS: this.delivery_status.DELIVERED,
                     };
-                    if (gls_status[sendung.lastStatusId] !== undefined) {
-                        return gls_status[sendung.lastStatusId];
+                    if (gls_status[sendung.status] !== undefined) {
+                        return gls_status[sendung.status];
                     }
                 }
                 if (id === "amz" && sendung.detailedState && sendung.detailedState.shortStatus) {
@@ -1624,7 +1680,7 @@ class Parcel extends utils.Adapter {
                 }
             }
 
-            return this.delivery_status["UNKOWN"];
+            return this.delivery_status.UNKNOWN;
         } catch (error) {
             this.log.error(error);
             return this.delivery_status["ERROR"];
@@ -1666,10 +1722,15 @@ class Parcel extends utils.Adapter {
         parcelList.querySelectorAll(".btnSelectParcel").forEach((parcel) => {
             const parcelInfo = parcel.firstElementChild;
             this.log.debug(parcelInfo.textContent);
+            let statusId = parcelInfo.querySelector("img").src;
+            if (statusId) {
+                statusId = statusId.replace("images/status_", "").replace(".svg", "");
+            }
             result.sendungen.push({
                 id: parcelInfo.querySelector(".parcelNo").textContent,
                 name: parcelInfo.querySelector(".parcelName").textContent,
                 status: parcelInfo.querySelector(".parcelDeliveryStatus").textContent,
+                statusId: statusId,
             });
         });
         return result;
@@ -2103,25 +2164,42 @@ class Parcel extends utils.Adapter {
                                 return;
                             }
                             const uuid = uuidv4();
-                            fs.writeFileSync("/tmp/" + uuid + ".jpg", imageBuffer.toString("base64"), "base64");
+                            fs.writeFileSync(`${this.tmpDir}${sep}${uuid}.jpg`, imageBuffer.toString("base64"), "base64");
                             const sendInstances = this.config.sendToInstance.replace(/ /g, "").split(",");
                             const sendUser = this.config.sendToUser.replace(/ /g, "").split(",");
 
                             for (const sendInstance of sendInstances) {
-                                if (sendInstance.includes("pushover")) {
-                                    await this.sendToAsync(sendInstance, { file: "/tmp/" + uuid + ".jpg", title: "✉️Briefankündigung" });
-                                } else {
-                                    if (sendUser.length > 0) {
-                                        for (const user of sendUser) {
+                                if (sendUser.length > 0) {
+                                    for (const user of sendUser) {
+                                        if (sendInstance.includes("pushover")) {
+                                            await this.sendToAsync(sendInstance, { user: user, file: `${this.tmpDir}${sep}${uuid}.jpg`, title: "✉️Briefankündigung" });
+                                        } else if (sendInstance.includes("signal-cmb")) {
+                                            await this.sendToAsync(sendInstance, "send", {
+                                                text: "✉️Briefankündigung",
+                                                phone: user,
+                                            });
+                                        } else {
                                             await this.sendToAsync(sendInstance, { user: user, text: "✉️Briefankündigung" });
-                                            await this.sendToAsync(sendInstance, { user: user, text: "/tmp/" + uuid + ".jpg" });
+                                            await this.sendToAsync(sendInstance, { user: user, text: `${this.tmpDir}${sep}${uuid}.jpg` });
                                         }
+                                    }
+                                } else {
+                                    if (sendInstance.includes("pushover")) {
+                                        await this.sendToAsync(sendInstance, { file: `${this.tmpDir}${sep}${uuid}.jpg`, title: "✉️Briefankündigung" });
+                                    } else if (sendInstance.includes("signal-cmb")) {
+                                        await this.sendToAsync(sendInstance, "send", {
+                                            text: "✉️Briefankündigung",
+                                        });
                                     } else {
                                         await this.sendToAsync(sendInstance, "✉️Briefankündigung");
-                                        await this.sendToAsync(sendInstance, "/tmp/" + uuid + ".jpg");
+                                        await this.sendToAsync(sendInstance, `${this.tmpDir}${sep}${uuid}.jpg`);
                                     }
                                 }
-                                fs.unlinkSync("/tmp/" + uuid + ".jpg");
+                            }
+                            try {
+                                fs.unlinkSync(`${this.tmpDir}${sep}${uuid}.jpg`);
+                            } catch (error) {
+                                this.log.error(error);
                             }
                         }
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iobroker.parcel",
-    "version": "0.0.13",
+    "version": "0.0.16",
     "description": "Parcel tracking",
     "author": {
         "name": "TA2k",
@@ -25,33 +25,33 @@
         "url": "https://github.com/TA2k/ioBroker.parcel"
     },
     "dependencies": {
-        "@applitools/jsdom": "^1.0.4",
         "@iobroker/adapter-core": "^2.6.0",
-        "axios": "^0.25.0",
-        "http-cookie-agent": "^1.0.5",
+        "axios": "^0.27.2",
+        "http-cookie-agent": "^1.0.6",
+        "jsdom": "^19.0.0",
         "json-bigint": "^1.0.0",
-        "qs": "^6.10.3",
+        "qs": "^6.10.5",
         "tough-cookie": "^4.0.0",
         "uuid": "^8.3.2"
     },
     "devDependencies": {
-        "@iobroker/testing": "^2.5.6",
-        "@types/chai": "^4.3.0",
+        "@iobroker/testing": "^3.0.2",
+        "@types/chai": "^4.3.1",
         "@types/chai-as-promised": "^7.1.5",
         "@types/gulp": "^4.0.9",
-        "@types/mocha": "^9.1.0",
-        "@types/node": "^14.18.12",
+        "@types/mocha": "^9.1.1",
+        "@types/node": "^18.0.0",
         "@types/proxyquire": "^1.3.28",
         "@types/sinon": "^10.0.11",
         "@types/sinon-chai": "^3.2.8",
         "chai": "^4.3.6",
         "chai-as-promised": "^7.1.1",
-        "eslint": "^7.32.0",
-        "mocha": "^9.2.2",
+        "eslint": "^8.18.0",
+        "mocha": "^10.0.0",
         "proxyquire": "^2.1.3",
-        "sinon": "^12.0.1",
+        "sinon": "^14.0.0",
         "sinon-chai": "^3.7.0",
-        "typescript": "~4.4.4"
+        "typescript": "~4.7.4"
     },
     "main": "main.js",
     "files": [