iobroker.parcel 0.0.7 → 0.0.8

package/README.md

@@ -35,10 +35,25 @@ Login und Passwort eingeben
 
 In den Instanz Einstellung aktivieren und z.B. telegram.0 eingeben
 
+## Vis ##
 
-### DHL Briefverfolgung in der Vis anzeigen.
+**Sendungen als Vis Table darstellen**
 
-Den Datenpunkt image ein "String img src" element als Object ID zuordnen
+Datenpunkte alle Sendungen:
+parcel.0.allProviderJson
+
+Datenpunkte in Zustellung:
+parcel.0.inDelivery
+
+**Widget: json Table**
+
+Anleitung:
+https://www.smarthome-tricks.de/software-iobroker/iobroker-vis-json-table-widget-teil-1-basics/
+
+
+**DHL Briefverfolgung in Vis anzeigen.**
+
+Den Datenpunkt parcel.0.dhl.briefe....image ein "String img src" element als Object ID zuordnen
 
 ## Diskussion und Fragen
 

package/admin/index_m.html

@@ -159,6 +159,21 @@
                     <label for="glspassword" class="translate">App Password</label>
                 </div>
             </div>
+            <div class="row">
+                <div class="col"><h5>Hermes</h5></div>
+            </div>
+            <div class="row">
+                <div class="col s6 input-field">
+                    <input type="text" class="value" id="hermesusername" />
+                    <label for="hermesusername" class="translate">App Username</label>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col s6 input-field">
+                    <input type="password" class="value" id="hermespassword" />
+                    <label for="hermespassword" class="translate">App Password</label>
+                </div>
+            </div>
             <div class="row">
                 <div class="col"><h5>UPS</h5></div>
             </div>

package/io-package.json

@@ -1,8 +1,11 @@
 {
     "common": {
         "name": "parcel",
-        "version": "0.0.7",
+        "version": "0.0.8",
         "news": {
+            "0.0.8": {
+                "en": "Hermes hinzugefügt"
+            },
             "0.0.7": {
                 "en": "Datenpunkt für in Zustellung hinzugefügt, Fix für wiederholende Benachrichtigungen"
             },
@@ -55,6 +58,7 @@
             "dhl",
             "gls",
             "ups",
+            "hermes",
             "paket",
             "17Track",
             "Amazon",
@@ -97,6 +101,7 @@
         "dpdpassword",
         "t17password",
         "upspassword",
+        "hermespassword",
         "postchpassword",
         "postatpassword",
         "glspassword"
@@ -107,6 +112,7 @@
         "dpdpassword",
         "t17password",
         "upspassword",
+        "hermespassword",
         "postchpassword",
         "postatpassword",
         "glspassword"
@@ -118,6 +124,8 @@
         "glspassword": "",
         "upsusername": "",
         "upspassword": "",
+        "hermespassword": "",
+        "hermesusername": "",
         "postchusername": "",
         "postchpassword": "",
         "postatusername": "",

package/main.js

@@ -49,10 +49,6 @@ class Parcel extends utils.Adapter {
             this.config.interval = 0.5;
         }
 
-        // const alreadySentMessagesState = await this.getStateAsync("alreadySentMessages");
-        // if (alreadySentMessagesState && alreadySentMessagesState.val) {
-        //     this.alreadySentMessages = JSON.parse(alreadySentMessagesState.val);
-        // }
         this.cookieJar = new tough.CookieJar();
         const cookieState = await this.getStateAsync("auth.cookie");
         if (cookieState && cookieState.val) {
@@ -97,6 +93,10 @@ class Parcel extends utils.Adapter {
             this.log.info("Login to UPS");
             await this.loginUPS();
         }
+        if (this.config.hermesusername && this.config.hermespassword) {
+            this.log.info("Login to Hermes");
+            await this.loginHermes();
+        }
 
         this.updateInterval = null;
         this.reLoginTimeout = null;
@@ -451,7 +451,7 @@ class Parcel extends utils.Adapter {
         })
             .then(async (res) => {
                 if (res.data && res.data.indexOf("Login fehlgeschlagen") !== -1) {
-                    this.log.warn("Login to DPD failed");
+                    this.log.error("Login to DPD failed, please check username and password");
                     return;
                 }
             })
@@ -569,6 +569,61 @@ class Parcel extends utils.Adapter {
                 this.log.error(error);
             });
     }
+    async loginHermes() {
+        await this.requestClient({
+            method: "post",
+            url: "https://mobile-api.myhermes.de/mobile-api-web/v2/users/login",
+            headers: {
+                Host: "mobile-api.myhermes.de",
+                accept: "application/json",
+                "content-type": "application/json; charset=utf-8",
+                "user-agent": "Hermes/33 CFNetwork/1240.0.4 Darwin/20.6.0",
+                "accept-language": "de-de",
+            },
+            data: `{"username":"${this.config.hermesusername}","password":"${this.config.hermespassword}"}`,
+
+            jar: this.cookieJar,
+            withCredentials: true,
+        })
+            .then(async (res) => {
+                this.log.debug(JSON.stringify(res.data));
+                if (res.data.accessToken) {
+                    this.hermesAuthToken = res.data.accessToken;
+                    this.sessions["hermes"] = res.data;
+                    this.log.info("Login to Hermes successful");
+                    await this.setObjectNotExistsAsync("hermes", {
+                        type: "device",
+                        common: {
+                            name: "Hermes Tracking",
+                        },
+                        native: {},
+                    });
+                    await this.setObjectNotExistsAsync("hermes.json", {
+                        type: "state",
+                        common: {
+                            name: "Json Sendungen",
+                            write: false,
+                            read: true,
+                            type: "string",
+                            role: "json",
+                        },
+                        native: {},
+                    });
+                    this.setState("info.connection", true, true);
+                } else {
+                    this.log.error("Login to Hermes failed");
+                    this.log.error(JSON.stringify(res.data));
+                }
+
+                return;
+            })
+            .catch((error) => {
+                this.log.error(error);
+                if (error.response) {
+                    this.log.error(JSON.stringify(error.response.data));
+                }
+            });
+    }
     async loginUPS() {
         await this.requestClient({
             method: "post",
@@ -934,6 +989,18 @@ class Parcel extends utils.Adapter {
                     },
                 },
             ],
+            hermes: [
+                {
+                    path: "hermes",
+                    url: "https://mobile-api.myhermes.de/mobile-api-web/v2/shipments",
+                    header: {
+                        accept: "application/json",
+                        "user-agent": "Hermes/33 CFNetwork/1240.0.4 Darwin/20.6.0",
+                        "accept-language": "de-de",
+                        authorization: "Bearer " + this.hermesAuthToken,
+                    },
+                },
+            ],
             ups: [
                 {
                     path: "ups",
@@ -993,6 +1060,12 @@ class Parcel extends utils.Adapter {
                             }
                             data = { sendungen: res.data.response.shipments };
                         }
+                        if (id === "hermes") {
+                            for (const parcel of res.data) {
+                                parcel.id = parcel.shipmentId;
+                            }
+                            data = { sendungen: res.data };
+                        }
                         const forceIndex = true;
                         const preferedArrayName = null;
                         if (id === "dpd") {
@@ -1057,7 +1130,7 @@ class Parcel extends utils.Adapter {
                 native: {},
             });
         }
-        if ((id === "dhl" || id === "dpd" || id === "amz" || id === "gls" || id === "ups") && data && data.sendungen) {
+        if ((id === "dhl" || id === "dpd" || id === "amz" || id === "gls" || id === "ups" || id === "hermes") && data && data.sendungen) {
             const states = await this.getStatesAsync(id + ".sendungen*.id");
             const sendungsArray = data.sendungen.map((sendung) => {
                 return sendung.id;
@@ -1108,6 +1181,15 @@ class Parcel extends utils.Adapter {
             });
             this.mergedJson = this.mergedJson.concat(sendungsArray);
         }
+        if (id === "hermes" && data.sendungen) {
+            const sendungsArray = data.sendungen.map((sendung) => {
+                const sendungsObject = { id: sendung.id, name: sendung.description, status: sendung.lastStatusMessage, source: "Hermes" };
+                this.mergedJsonObject[sendung.id] = sendungsObject;
+                this.inDeliveryCheck(sendungsObject);
+                return sendungsObject;
+            });
+            this.mergedJson = this.mergedJson.concat(sendungsArray);
+        }
 
         if (id === "dpd" && data && data.sendungen) {
             for (const sendung of data.sendungen) {
@@ -1169,14 +1251,13 @@ class Parcel extends utils.Adapter {
                 this.sendTo(this.config.sendToInstance, "📦 " + sendungen[id].name + "\n" + sendungen[id].status);
                 this.alreadySentMessages[id + sendungen[id].source] = sendungen[id].status;
             }
-
-            // this.setState("alreadySentMessages", JSON.stringify(this.alreadySentMessages), true);
         }
     }
     inDeliveryCheck(sendungsObject) {
         if (
             sendungsObject.status.toLocaleLowerCase().includes("in zustellung") ||
-            (sendungsObject.status.toLocaleLowerCase().includes("heute") && !sendungsObject.status.toLocaleLowerCase().includes("heute bestellt")) ||
+            sendungsObject.status.toLocaleLowerCase().includes("zustellung heute") ||
+            sendungsObject.status.toLocaleLowerCase().includes("heute zugestell") ||
             sendungsObject.status.toLocaleLowerCase().includes("wird zugestellt") ||
             sendungsObject.status.toLocaleLowerCase().includes("zustellfahrzeug")
         ) {
@@ -1386,6 +1467,12 @@ class Parcel extends utils.Adapter {
             if (id === "gls") {
                 this.loginGLS();
             }
+            if (id === "ups") {
+                this.loginUPS();
+            }
+            if (id === "hermes") {
+                this.loginHermes();
+            }
         }
     }
     async createDHLStates() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iobroker.parcel",
-    "version": "0.0.7",
+    "version": "0.0.8",
     "description": "Parcel tracking",
     "author": {
         "name": "TA2k",
@@ -15,6 +15,7 @@
         "briefe",
         "dpd",
         "gls",
+        "hermes",
         "ups",
         "amazon",
         "paket"