iobroker.parcel 0.0.13 → 0.0.14

package/io-package.json

@@ -1,8 +1,11 @@
 {
     "common": {
         "name": "parcel",
-        "version": "0.0.13",
+        "version": "0.0.14",
         "news": {
+            "0.0.14": {
+                "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
+var Module = require("module");
+var 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");
@@ -16,6 +27,8 @@ const { HttpsCookieAgent } = require("http-cookie-agent");
 const { JSDOM } = require("@applitools/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));
@@ -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: [
@@ -1319,6 +1334,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")) {
@@ -1426,19 +1446,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 +1515,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);
@@ -1517,10 +1532,18 @@ class Parcel extends utils.Adapter {
                 for (const sendInstance of sendInstances) {
                     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: "📦 " + sendungen[id].name + "\n" + sendungen[id].status, title: "Paketstatus" });
+                            } else {
+                                await this.sendToAsync(sendInstance, { user: user, text: "📦 " + sendungen[id].name + "\n" + sendungen[id].status });
+                            }
                         }
                     } else {
-                        await this.sendToAsync(sendInstance, "📦 " + sendungen[id].name + "\n" + sendungen[id].status);
+                        if (sendInstance.includes("pushover")) {
+                            await this.sendToAsync(sendInstance, { message: "📦 " + sendungen[id].name + "\n" + sendungen[id].status, title: "Paketstatus" });
+                        } else {
+                            await this.sendToAsync(sendInstance, "📦 " + sendungen[id].name + "\n" + sendungen[id].status);
+                        }
                     }
                 }
             }
@@ -1589,17 +1612,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 +1662,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 +1704,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 +2146,25 @@ 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" });
+                                    await this.sendToAsync(sendInstance, { file: `${this.tmpDir}${sep}${uuid}.jpg`, title: "✉️Briefankündigung" });
                                 } else {
                                     if (sendUser.length > 0) {
                                         for (const user of sendUser) {
                                             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 {
                                         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");
+                                fs.unlinkSync(`${this.tmpDir}${sep}${uuid}.jpg`);
                             }
                         }
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iobroker.parcel",
-    "version": "0.0.13",
+    "version": "0.0.14",
     "description": "Parcel tracking",
     "author": {
         "name": "TA2k",
@@ -25,10 +25,10 @@
         "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",
+        "jsdom": "^19.0.0",
         "json-bigint": "^1.0.0",
         "qs": "^6.10.3",
         "tough-cookie": "^4.0.0",
@@ -76,4 +76,4 @@
         "url": "https://github.com/TA2k/ioBroker.parcel/issues"
     },
     "readmeFilename": "README.md"
-}
+}