iobroker.parcel 0.0.25 → 0.0.27

package/io-package.json

@@ -1,8 +1,16 @@
 {
     "common": {
         "name": "parcel",
-        "version": "0.0.25",
+        "version": "0.0.27",
         "news": {
+            "0.0.27": {
+                "en": "Fix DHL Refresh token",
+                "de": "DHL Refresh token gefixt"
+            },
+            "0.0.26": {
+                "en": "Fix DHL Login",
+                "de": "DHL Login gefixt"
+            },
             "0.0.25": {
                 "en": "Fix new Amazon UI parsing",
                 "de": "Neues Amazon UI parsing gefixt"

package/main.js

@@ -20,6 +20,7 @@ Module.prototype.require = function () {
 const utils = require("@iobroker/adapter-core");
 const axios = require("axios");
 const qs = require("qs");
+const crypto = require("crypto");
 const Json2iob = require("./lib/json2iob");
 const getPwd = require("./lib/rsaKey");
 const tough = require("tough-cookie");
@@ -87,8 +88,9 @@ class Parcel extends utils.Adapter {
 
     if (this.config.dhlusername && this.config.dhlpassword) {
       this.log.info("Login to DHL");
-      await this.loginDHL();
+      await this.loginDhlNew();
     }
+
     if (this.config.dpdusername && this.config.dpdpassword) {
       this.log.info("Login to DPD");
       await this.loginDPD();
@@ -143,6 +145,299 @@ class Parcel extends utils.Adapter {
       this.log.warn("No login session found");
     }
   }
+  async loginDhlNew() {
+    const validCookies = await this.requestClient({
+      method: "get",
+      url: "https://www.dhl.de/int-stammdaten/public/customerMasterData",
+      headers: {
+        accept: "application/json",
+        "content-type": "application/json",
+        "x-api-key": "a0d5b9049ba8918871e6e20bd5c49974",
+        "accept-language": "de-de",
+        "user-agent": "DHLPaket_PROD/1367 CFNetwork/1240.0.4 Darwin/20.6.0",
+      },
+    })
+      .then((res) => {
+        this.log.debug(res.data);
+        return true;
+      })
+      .catch((err) => {
+        return false;
+      });
+    // if (validCookies) {
+    //   this.log.info("Valid dhl cookies found");
+
+    //   this.setState("info.connection", true, true);
+    //   return;
+    // }
+    const mfaTokenState = await this.getStateAsync("auth.dhlMfaToken");
+    const mfaToken = mfaTokenState ? mfaTokenState.val : null;
+    const [code_verifier, codeChallenge] = this.getCodeChallenge();
+
+    const transactionId = this.randomString(40);
+    const initUrl = await this.requestClient({
+      method: "get",
+      maxBodyLength: Infinity,
+      url: "https://login.dhl.de/af5f9bb6-27ad-4af4-9445-008e7a5cddb8/login/authorize",
+      params: {
+        redirect_uri: "dhllogin://de.deutschepost.dhl/login",
+        state: "eyJycyI6dHJ1ZSwicnYiOmZhbHNlLCJmaWQiOiJhcHAtbG9naW4tbWVoci1mb290ZXIiLCJoaWQiOiJhcHAtbG9naW4tbWVoci1oZWFkZXIiLCJycCI6ZmFsc2V9",
+        client_id: "83471082-5c13-4fce-8dcb-19d2a3fca413",
+        response_type: "code",
+        scope: "openid offline_access",
+        claims:
+          '{"id_token":{"email":null,"post_number":null,"twofa":null,"service_mask":null,"deactivate_account":null,"last_login":null,"customer_type":null,"display_name":null}}',
+        nonce: "",
+        login_hint: "",
+        prompt: "login",
+        ui_locales: "de-DE",
+        code_challenge: codeChallenge,
+        code_challenge_method: 'S256"',
+      },
+      headers: {
+        Host: "login.dhl.de",
+        Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+
+        "User-Agent":
+          "Mozilla/5.0 (iPhone; CPU iPhone OS 14_8 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.2 Mobile/15E148 Safari/604.1",
+        "Accept-Language": "de-de",
+        Connection: "keep-alive",
+      },
+    })
+      .then(async (res) => {
+        // this.log.debug(res.data);
+        return res.request.path;
+      })
+      .catch((error) => {
+        this.log.error(error);
+        error.response && this.log.error(JSON.stringify(error.response.data));
+      });
+    const initParams = qs.parse(initUrl.split("?")[1]);
+    const signin = await this.requestClient({
+      method: "post",
+      maxBodyLength: Infinity,
+      url: "https://login-api.dhl.de/widget/traditional_signin.jsonp",
+      headers: {
+        Host: "login-api.dhl.de",
+        "Content-Type": "application/x-www-form-urlencoded",
+        Origin: "https://login.dhl.de",
+        Connection: "keep-alive",
+        Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+        "User-Agent":
+          "Mozilla/5.0 (iPhone; CPU iPhone OS 14_8 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.2 Mobile/15E148 Safari/604.1",
+        Referer: "https://login.dhl.de/",
+        "Accept-Language": "de-de",
+      },
+      data: {
+        utf8: "✓",
+        capture_screen: "signIn",
+        js_version: "d445bf4",
+        capture_transactionId: transactionId,
+        form: "signInForm",
+        flow: "ciam_flow_001",
+        client_id: "f8s9584t9f9kz5wg9agkp259hc924uq9",
+        redirect_uri: "https://login.dhl.de" + initUrl,
+        response_type: "token",
+        flow_version: "20230309140056615616",
+        settings_version: "",
+        locale: "de-DE",
+        recaptchaVersion: "2",
+        emailOrPostNumber: this.config.dhlusername,
+        currentPassword: this.config.dhlpassword,
+      },
+    })
+      .then(async (res) => {
+        this.log.debug(res.data);
+        return true;
+      })
+      .catch((error) => {
+        this.log.error(error);
+        error.response && this.log.error(JSON.stringify(error.response.data));
+      });
+    if (!signin) {
+      this.log.error("DHL Signin failed");
+      return;
+    }
+    const preSession = await this.requestClient({
+      method: "get",
+      maxBodyLength: Infinity,
+      url: "https://login-api.dhl.de/widget/get_result.jsonp?transactionId=" + transactionId + "&cache=" + Date.now(),
+      headers: {
+        Host: "login-api.dhl.de",
+        Connection: "keep-alive",
+        Accept: "*/*",
+        "User-Agent":
+          "Mozilla/5.0 (iPhone; CPU iPhone OS 14_8 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.2 Mobile/15E148 Safari/604.1",
+        "Accept-Language": "de-de",
+        Referer: "https://login.dhl.de/",
+      },
+    })
+      .then(async (res) => {
+        this.log.debug(res.data);
+        return JSON.parse(res.data.split(")(")[1].split(");")[0]);
+      })
+      .catch((error) => {
+        this.log.error(error);
+        error.response && this.log.error(JSON.stringify(error.response.data));
+      });
+    if (!preSession || !preSession.result) {
+      this.log.error("DHL PreSession failed. Please check username password");
+      return;
+    }
+    const accessToken2 = await this.requestClient({
+      method: "post",
+      maxBodyLength: Infinity,
+      url: "https://login.dhl.de/af5f9bb6-27ad-4af4-9445-008e7a5cddb8/auth-ui/token-url",
+      params: {
+        __aic_csrf: initParams.__aic_csrf,
+        claims:
+          '{"id_token":{"customer_type":null,"deactivate_account":null,"display_name":null,"email":null,"last_login":null,"post_number":null,"service_mask":null,"twofa":null}}',
+        client_id: "83471082-5c13-4fce-8dcb-19d2a3fca413",
+        code_challenge: codeChallenge,
+        code_challenge_method: "S256",
+        login_hint: "",
+        nonce: "",
+        prompt: "login",
+        redirect_uri: "dhllogin://de.deutschepost.dhl/login",
+        response_type: "code",
+        scope: "openid",
+        state: "eyJycyI6dHJ1ZSwicnYiOmZhbHNlLCJmaWQiOiJhcHAtbG9naW4tbWVoci1mb290ZXIiLCJoaWQiOiJhcHAtbG9naW4tbWVoci1oZWFkZXIiLCJycCI6ZmFsc2V9",
+        ui_locales: 'de-DE",',
+      },
+      headers: {
+        Host: "login.dhl.de",
+        "Content-Type": "application/x-www-form-urlencoded",
+        Origin: "https://login.dhl.de",
+        Connection: "keep-alive",
+        Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+        "User-Agent":
+          "Mozilla/5.0 (iPhone; CPU iPhone OS 14_8 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.2 Mobile/15E148 Safari/604.1",
+        "Accept-Language": "de-de",
+      },
+      data: {
+        screen: "signIn",
+        authenticated: "True",
+        registering: "False",
+        accessToken: preSession.result.accessToken,
+        _csrf_token: this.cookieJar.store.idx["login.dhl.de"]["/"]._csrf_token.value,
+      },
+    })
+      .then(async (res) => {
+        // this.log.debug(res.data);
+
+        return res.data.split("existingToken: '")[1].split("'")[0];
+      })
+      .catch((error) => {
+        this.log.error(error);
+        error.response && this.log.error(JSON.stringify(error.response.data));
+      });
+    const idtoken = await this.requestClient({
+      method: "post",
+      maxBodyLength: Infinity,
+      url: "https://login.dhl.de/af5f9bb6-27ad-4af4-9445-008e7a5cddb8/auth-ui/token-url",
+      maxRedirects: 0,
+      params: {
+        __aic_csrf: initParams.__aic_csrf,
+        claims:
+          '{"id_token":{"customer_type":null,"deactivate_account":null,"display_name":null,"email":null,"last_login":null,"post_number":null,"service_mask":null,"twofa":null}}',
+        client_id: "83471082-5c13-4fce-8dcb-19d2a3fca413",
+        code_challenge: codeChallenge,
+        code_challenge_method: "S256",
+        login_hint: "",
+        nonce: "",
+        prompt: "login",
+        redirect_uri: "dhllogin://de.deutschepost.dhl/login",
+        response_type: "code",
+        scope: "openid",
+        state: "eyJycyI6dHJ1ZSwicnYiOmZhbHNlLCJmaWQiOiJhcHAtbG9naW4tbWVoci1mb290ZXIiLCJoaWQiOiJhcHAtbG9naW4tbWVoci1oZWFkZXIiLCJycCI6ZmFsc2V9",
+        ui_locales: "de-DE",
+      },
+      headers: {
+        Host: "login.dhl.de",
+        "Content-Type": "application/x-www-form-urlencoded",
+        Origin: "https://login.dhl.de",
+        Connection: "keep-alive",
+        Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+        "User-Agent":
+          "Mozilla/5.0 (iPhone; CPU iPhone OS 14_8 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.2 Mobile/15E148 Safari/604.1",
+        "Accept-Language": "de-de",
+      },
+      data: {
+        screen: "loginSuccess",
+        accessToken: accessToken2,
+        _csrf_token: this.cookieJar.store.idx["login.dhl.de"]["/"]._csrf_token.value,
+      },
+    })
+      .then(async (res) => {
+        this.log.debug(res.data);
+        return res.data;
+      })
+      .catch((error) => {
+        if (error.response && error.response.status === 302) {
+          return error.response.headers.location.split("id_token_hint=")[1].split("&")[0];
+        }
+        this.log.error(error);
+        error.response && this.log.error(JSON.stringify(error.response.data));
+      });
+    const codeUrl = await this.requestClient({
+      method: "get",
+      maxBodyLength: Infinity,
+      url:
+        'https://login.dhl.de/af5f9bb6-27ad-4af4-9445-008e7a5cddb8/login/authorize?claims={"id_token":{"customer_type":null,"deactivate_account":null,"display_name":null,"email":null,"last_login":null,"post_number":null,"service_mask":null,"twofa":null}}&client_id=83471082-5c13-4fce-8dcb-19d2a3fca413&code_challenge=' +
+        codeChallenge +
+        "&code_challenge_method=S256&prompt=none&redirect_uri=dhllogin://de.deutschepost.dhl/login&response_type=code&scope=openid&state=eyJycyI6dHJ1ZSwicnYiOmZhbHNlLCJmaWQiOiJhcHAtbG9naW4tbWVoci1mb290ZXIiLCJoaWQiOiJhcHAtbG9naW4tbWVoci1oZWFkZXIiLCJycCI6ZmFsc2V9&ui_locales=de-DE&id_token_hint=" +
+        idtoken,
+    })
+      .then(async (res) => {
+        this.log.debug(JSON.stringify(res.data));
+      })
+      .catch((error) => {
+        if (error.message.includes("Unsupported protocol")) {
+          return qs.parse(error.request._options.query);
+        }
+        this.log.error(error);
+        if (error.response) {
+          this.log.error(JSON.stringify(error.response.data));
+        }
+      });
+    await this.requestClient({
+      method: "post",
+      url: "https://login.dhl.de/af5f9bb6-27ad-4af4-9445-008e7a5cddb8/login/token",
+      headers: {
+        Host: "login.dhl.de",
+        "Content-Type": "application/x-www-form-urlencoded",
+        Accept: "application/json, text/plain, */*",
+        Origin: "https://login.dhl.de",
+        Connection: "keep-alive",
+        Authorization: "Basic ODM0NzEwODItNWMxMy00ZmNlLThkY2ItMTlkMmEzZmNhNDEzOg==",
+        "User-Agent": "DHLPaket_PROD/1367 CFNetwork/1240.0.4 Darwin/20.6.0",
+        "Accept-Language": "de-de",
+      },
+      data: {
+        redirect_uri: "dhllogin://de.deutschepost.dhl/login",
+        grant_type: "authorization_code",
+        code_verifier: code_verifier,
+        code: codeUrl.code,
+      },
+    })
+      .then(async (res) => {
+        this.log.debug(JSON.stringify(res.data));
+        this.log.info("Login to DHL successful");
+        this.sessions["dhl"] = res.data;
+        await this.cookieJar.setCookie("dhli=" + res.data.id_token + "; path=/; domain=dhl.de", "https:/dhl.de");
+        await this.cookieJar.setCookie("dhli=" + res.data.id_token + "; path=/; domain=www.dhl.de", "https:/www.dhl.de");
+        this.setState("info.connection", true, true);
+        this.setState("auth.cookie", JSON.stringify(this.cookieJar.toJSON()), true);
+        await this.createDHLStates();
+        return true;
+      })
+      .catch((error) => {
+        this.log.error(error);
+        if (error.response) {
+          this.log.error(JSON.stringify(error.response.data));
+        }
+      });
+  }
   async loginDHL() {
     const mfaTokenState = await this.getStateAsync("auth.dhlMfaToken");
     await this.requestClient({
@@ -1715,6 +2010,7 @@ class Parcel extends utils.Adapter {
             IN_TRANSIT: this.delivery_status.IN_TRANSIT,
             OUT_FOR_DELIVERY: this.delivery_status.OUT_FOR_DELIVERY,
             DELIVERED: this.delivery_status.DELIVERED,
+            PICKED_UP: this.delivery_status.DELIVERED,
           };
           if (amz_status[sendung.detailedState.shortStatus] !== undefined) {
             return amz_status[sendung.detailedState.shortStatus];
@@ -1799,7 +2095,7 @@ class Parcel extends utils.Adapter {
       withCredentials: true,
     })
       .then(async (res) => {
-        this.log.debug(JSON.stringify(res.data));
+        // this.log.debug(JSON.stringify(res.data));
 
         const dom = new JSDOM(res.data);
         const document = dom.window.document;
@@ -1857,7 +2153,7 @@ class Parcel extends utils.Adapter {
         },
       })
         .then(async (res) => {
-          this.log.debug(JSON.stringify(res.data));
+          // this.log.debug(JSON.stringify(res.data));
           const dom = new JSDOM(res.data);
           const document = dom.window.document;
           const statusHandle =
@@ -1878,7 +2174,7 @@ class Parcel extends utils.Adapter {
                 stopsStatus = stateObject.mapTracking.calloutMessage;
               }
             } catch (error) {
-              this.log.error(errror);
+              this.log.error(error);
             }
           }
 
@@ -1945,25 +2241,27 @@ class Parcel extends utils.Adapter {
       if (id === "dhl") {
         await this.requestClient({
           method: "post",
-          url: "https://www.dhl.de/int-erkennen/refresh",
-
+          url: "https://login.dhl.de/af5f9bb6-27ad-4af4-9445-008e7a5cddb8/login/token",
           headers: {
-            "content-type": "application/json",
-            accept: "*/*",
-            "x-requested-with": "XMLHttpRequest",
-            "accept-language": "de-de",
-            origin: "https://www.dhl.de",
-            "user-agent": "Mozilla/5.0 (iPhone; CPU iPhone OS 14_8 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148",
-            referer: "https://www.dhl.de/",
+            Host: "login.dhl.de",
+            "Content-Type": "application/x-www-form-urlencoded",
+            Accept: "application/json, text/plain, */*",
+            Origin: "https://login.dhl.de",
+            Connection: "keep-alive",
+            "User-Agent": "DHLPaket_PROD/1367 CFNetwork/1240.0.4 Darwin/20.6.0",
+            "Accept-Language": "de-de",
+          },
+          data: {
+            client_id: "83471082-5c13-4fce-8dcb-19d2a3fca413",
+            grant_type: "refresh_token",
+            refresh_token: this.sessions["dhl"].refresh_token,
           },
-          data: JSON.stringify({
-            force: false,
-            meta: this.sessions["dhl"].meta,
-          }),
         })
-          .then((res) => {
+          .then(async (res) => {
             this.log.debug(JSON.stringify(res.data));
             this.sessions["dhl"] = res.data;
+            await this.cookieJar.setCookie("dhli=" + res.data.id_token + "; path=/; domain=dhl.de", "https:/dhl.de");
+            await this.cookieJar.setCookie("dhli=" + res.data.id_token + "; path=/; domain=www.dhl.de", "https:/www.dhl.de");
             this.setState("auth.cookie", JSON.stringify(this.cookieJar.toJSON()), true);
             this.setState("info.connection", true, true);
           })
@@ -2085,17 +2383,26 @@ class Parcel extends utils.Adapter {
 
     return matches;
   }
-  // getCodeChallenge() {
-  //     let hash = "";
-  //     let result = "";
-  //     const chars = "0123456789abcdef";
-  //     result = "";
-  //     for (let i = 64; i > 0; --i) result += chars[Math.floor(Math.random() * chars.length)];
-  //     hash = crypto.createHash("sha256").update(result).digest("base64");
-  //     hash = hash.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
-
-  //     return [result, hash];
-  // }
+  randomString(length) {
+    let result = "";
+    const characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+    const charactersLength = characters.length;
+    for (let i = 0; i < length; i++) {
+      result += characters.charAt(Math.floor(Math.random() * charactersLength));
+    }
+    return result;
+  }
+  getCodeChallenge() {
+    let hash = "";
+    let result = "";
+    const chars = "0123456789abcdef";
+    result = "";
+    for (let i = 64; i > 0; --i) result += chars[Math.floor(Math.random() * chars.length)];
+    hash = crypto.createHash("sha256").update(result).digest("base64");
+    hash = hash.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+
+    return [result, hash];
+  }
   /**
    * Is called when adapter shuts down - callback has to be called under any circumstances!
    * @param {() => void} callback

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iobroker.parcel",
-    "version": "0.0.25",
+    "version": "0.0.27",
     "description": "Parcel tracking",
     "author": {
         "name": "TA2k",
@@ -25,12 +25,12 @@
         "url": "https://github.com/TA2k/ioBroker.parcel"
     },
     "dependencies": {
-        "@iobroker/adapter-core": "^2.6.7",
-        "axios": "^1.2.2",
+        "@iobroker/adapter-core": "^2.6.8",
+        "axios": "^1.3.5",
         "http-cookie-agent": "^5.0.2",
-        "jsdom": "^20.0.3",
+        "jsdom": "^21.1.1",
         "json-bigint": "^1.0.0",
-        "qs": "^6.11.0",
+        "qs": "^6.11.1",
         "tough-cookie": "^4.1.2",
         "uuid": "^9.0.0"
     },
@@ -40,18 +40,18 @@
         "@types/chai-as-promised": "^7.1.5",
         "@types/gulp": "^4.0.10",
         "@types/mocha": "^10.0.1",
-        "@types/node": "^18.11.18",
+        "@types/node": "^18.15.11",
         "@types/proxyquire": "^1.3.28",
         "@types/sinon": "^10.0.13",
         "@types/sinon-chai": "^3.2.9",
         "chai": "^4.3.7",
         "chai-as-promised": "^7.1.1",
-        "eslint": "^8.30.0",
+        "eslint": "^8.38.0",
         "mocha": "^10.2.0",
         "proxyquire": "^2.1.3",
-        "sinon": "^15.0.1",
+        "sinon": "^15.0.3",
         "sinon-chai": "^3.7.0",
-        "typescript": "~4.9.4"
+        "typescript": "~5.0.4"
     },
     "main": "main.js",
     "files": [