iobroker.parcel 0.1.5 → 0.2.0

package/io-package.json

@@ -1,8 +1,16 @@
 {
   "common": {
     "name": "parcel",
-    "version": "0.1.5",
+    "version": "0.2.0",
     "news": {
+      "0.2.0": {
+        "en": "Fix for Briefankündigung",
+        "de": "Briefankündigung wieder aktiviert"
+      },
+      "0.1.6": {
+        "en": "Fix DHL and UPS",
+        "de": "DHL und UPS gefixt"
+      },
       "0.1.5": {
         "en": "Improve failed Amazon Login",
         "de": "Verbesserter Amazon Login im Fehlerfall"

package/lib/dhldecrypt.js

@@ -0,0 +1,63 @@
+const crypto = require('crypto');
+const axios = require('axios').default;
+function getUuidFromUrl(url) {
+  return (url = (url = url.split('/').pop()).includes('?') ? url.split('?')[0] : url), new TextEncoder().encode(url);
+}
+function getKeySet(keyArray) {
+  return {
+    secretKey: keyArray.subarray(0, 32),
+    iv: keyArray.subarray(32, 44),
+    aad: keyArray.subarray(44, 56),
+  };
+}
+
+async function decryptAdviceWebCrypto(url, requestClient) {
+  const decryptImage = await requestClient(url, {
+    withCredentials: true,
+    method: 'GET',
+    responseType: 'arraybuffer',
+  })
+    .then(async function (response) {
+      const uuid = getUuidFromUrl(url);
+      return await crypto.subtle
+        .digest('SHA-512', uuid)
+        .then(function (hashedUuid) {
+          return getKeySet(new Uint8Array(hashedUuid));
+        })
+        .then(async function (keySet) {
+          const data = response.data;
+          const secretKey = keySet.secretKey;
+          return await crypto.subtle
+            .importKey('raw', secretKey, 'AES-GCM', false, ['decrypt'])
+            .then(async function (importedKey) {
+              const decryptionParams = {
+                name: 'AES-GCM',
+                iv: keySet.iv,
+                additionalData: keySet.aad,
+              };
+              return await crypto.subtle
+                .decrypt(decryptionParams, importedKey, data)
+                .then(function (decryptedData) {
+                  return decryptedData;
+                  // return URL.createObjectURL(new Blob([decryptedData]));
+                })
+                .catch(function (error) {
+                  throw error;
+                });
+            })
+            .catch(function (error) {
+              throw error;
+            });
+        })
+
+        .catch(function (error) {
+          throw error;
+        });
+    })
+    .catch(function (error) {
+      throw error;
+    });
+  return decryptImage;
+}
+
+module.exports = decryptAdviceWebCrypto;

package/main.js

@@ -31,6 +31,7 @@ const { v4: uuidv4 } = require('uuid');
 const { sep } = require('path');
 const { tmpdir } = require('os');
 
+const dhlDecrypt = require('./lib/dhldecrypt');
 class Parcel extends utils.Adapter {
   /**
    * @param {Partial<utils.AdapterOptions>} [options={}]
@@ -180,8 +181,7 @@ class Parcel extends utils.Adapter {
       url: 'https://login.dhl.de/af5f9bb6-27ad-4af4-9445-008e7a5cddb8/login/authorize',
       params: {
         redirect_uri: 'dhllogin://de.deutschepost.dhl/login',
-        state:
-          'eyJycyI6dHJ1ZSwicnYiOmZhbHNlLCJmaWQiOiJhcHAtbG9naW4tbWVoci1mb290ZXIiLCJoaWQiOiJhcHAtbG9naW4tbWVoci1oZWFkZXIiLCJycCI6ZmFsc2V9',
+        state: 'eyJycyI6dHJ1ZSwicnYiOmZhbHNlLCJmaWQiOiJhcHAtbG9naW4tbWVoci1mb290ZXIiLCJoaWQiOiJhcHAtbG9naW4tbWVoci1oZWFkZXIiLCJycCI6ZmFsc2V9',
         client_id: '83471082-5c13-4fce-8dcb-19d2a3fca413',
         response_type: 'code',
         scope: 'openid offline_access',
@@ -301,8 +301,7 @@ class Parcel extends utils.Adapter {
         redirect_uri: 'dhllogin://de.deutschepost.dhl/login',
         response_type: 'code',
         scope: 'openid',
-        state:
-          'eyJycyI6dHJ1ZSwicnYiOmZhbHNlLCJmaWQiOiJhcHAtbG9naW4tbWVoci1mb290ZXIiLCJoaWQiOiJhcHAtbG9naW4tbWVoci1oZWFkZXIiLCJycCI6ZmFsc2V9',
+        state: 'eyJycyI6dHJ1ZSwicnYiOmZhbHNlLCJmaWQiOiJhcHAtbG9naW4tbWVoci1mb290ZXIiLCJoaWQiOiJhcHAtbG9naW4tbWVoci1oZWFkZXIiLCJycCI6ZmFsc2V9',
         ui_locales: 'de-DE",',
       },
       headers: {
@@ -350,8 +349,7 @@ class Parcel extends utils.Adapter {
         redirect_uri: 'dhllogin://de.deutschepost.dhl/login',
         response_type: 'code',
         scope: 'openid',
-        state:
-          'eyJycyI6dHJ1ZSwicnYiOmZhbHNlLCJmaWQiOiJhcHAtbG9naW4tbWVoci1mb290ZXIiLCJoaWQiOiJhcHAtbG9naW4tbWVoci1oZWFkZXIiLCJycCI6ZmFsc2V9',
+        state: 'eyJycyI6dHJ1ZSwicnYiOmZhbHNlLCJmaWQiOiJhcHAtbG9naW4tbWVoci1mb290ZXIiLCJoaWQiOiJhcHAtbG9naW4tbWVoci1oZWFkZXIiLCJycCI6ZmFsc2V9',
         ui_locales: 'de-DE',
       },
       headers: {
@@ -609,8 +607,7 @@ class Parcel extends utils.Adapter {
         'sec-ch-ua-mobile': '?0',
         'sec-ch-ua-platform': '"macOS"',
         'upgrade-insecure-requests': '1',
-        'user-agent':
-          'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.20 Safari/537.36',
+        'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.20 Safari/537.36',
         accept:
           'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9',
         'sec-fetch-site': 'same-site',
@@ -656,8 +653,7 @@ class Parcel extends utils.Adapter {
           accept: 'application/json, text/plain, */*',
           'content-type': 'application/x-www-form-urlencoded',
           'sec-ch-ua-mobile': '?0',
-          'user-agent':
-            'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.20 Safari/537.36',
+          'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.20 Safari/537.36',
           'sec-ch-ua-platform': '"macOS"',
           origin: 'https://login.aliexpress.com',
           'sec-fetch-site': 'same-site',
@@ -687,9 +683,7 @@ class Parcel extends utils.Adapter {
       })
         .then(async (res) => {
           //  this.log.debug(JSON.stringify(res.data));
-          res.data.indexOf('Session has expired') !== -1
-            ? this.log.error('Session has expired')
-            : this.log.info('Login to Aliexpress successful');
+          res.data.indexOf('Session has expired') !== -1 ? this.log.error('Session has expired') : this.log.info('Login to Aliexpress successful');
         })
         .catch(async (error) => {
           error.response && this.log.error(JSON.stringify(error.response.data));
@@ -784,7 +778,7 @@ class Parcel extends utils.Adapter {
       .catch((error) => {
         this.log.error('Amazon first login step failed');
         this.log.error(
-          'https://www.amazon.de/ap/signin?_encoding=UTF8&accountStatusPolicy=P1&openid.assoc_handle=deflex&openid.claimed_id=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&openid.identity=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&openid.mode=checkid_setup&openid.ns=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0&openid.ns.pape=http%3A%2F%2Fspecs.openid.net%2Fextensions%2Fpape%2F1.0&openid.pape.max_auth_age=0&openid.return_to=https%3A%2F%2Fwww.amazon.de%2Fgp%2Fcss%2Forder-history%3Fie%3DUTF8%26ref_%3Dnav_orders_first&pageId=webcs-yourorder&showRmrMe=1',
+          'https://www.amazon.de/ap/signin?_encoding=UTF8&accountStatusPolicy=P1&openid.assoc_handle=deflex&openid.claimed_id=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&openid.identity=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0%2Fidentifier_select&openid.mode=checkid_setup&openid.ns=http%3A%2F%2Fspecs.openid.net%2Fauth%2F2.0&openid.ns.pape=http%3A%2F%2Fspecs.openid.net%2Fextensions%2Fpape%2F1.0&openid.pape.max_auth_age=0&openid.return_to=https%3A%2F%2Fwww.amazon.de%2Fgp%2Fcss%2Forder-history%3Fie%3DUTF8%26ref_%3Dnav_orders_first&pageId=webcs-yourorder&showRmrMe=1'
         );
         this.log.error(error);
         if (error.response) {
@@ -820,7 +814,7 @@ class Parcel extends utils.Adapter {
             this.log.error(JSON.stringify(error.response.data));
           }
           this.log.info(
-            'Delete amazon cookie please restart the adapter to trigger relogin. If this is not working please manualy delete parcel.0.auth.cookie',
+            'Delete amazon cookie please restart the adapter to trigger relogin. If this is not working please manualy delete parcel.0.auth.cookie'
           );
           delete this.cookieJar.store.idx['amazon.de'];
         });
@@ -908,11 +902,11 @@ class Parcel extends utils.Adapter {
           this.log.error('Login to Amazon failed, please login to Amazon manually and check the login');
           if (res.data.indexOf('captcha-placeholder') !== -1) {
             this.log.warn(
-              'Captcha required. Please login into your account to check the state of the account. If this is not wokring please pause the adapter for 24h.',
+              'Captcha required. Please login into your account to check the state of the account. If this is not wokring please pause the adapter for 24h.'
             );
           }
           this.log.info(
-            'Amazon cookie are removed. Please restart the adapter to trigger a relogin. If this is not working please manually delete parcel.0.auth.cookie',
+            'Amazon cookie are removed. Please restart the adapter to trigger a relogin. If this is not working please manually delete parcel.0.auth.cookie'
           );
           delete this.cookieJar.store.idx['amazon.de'];
           this.log.info('Start relogin');
@@ -953,8 +947,7 @@ class Parcel extends utils.Adapter {
       url: 'https://www.dpd.com/de/de/mydpd-anmelden-und-registrieren/',
       headers: {
         'content-type': 'application/x-www-form-urlencoded',
-        'user-agent':
-          'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.66 Safari/537.36',
+        'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.66 Safari/537.36',
         accept:
           'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9',
         'accept-language': 'de,en;q=0.9',
@@ -1166,7 +1159,7 @@ class Parcel extends utils.Adapter {
         UPSSecurity: {
           UsernameToken: {},
           ServiceAccessToken: {
-            AccessLicenseNumber: '2DBACFA7974B3252',
+            AccessLicenseNumber: '3DE112BAD1F163E0',
           },
         },
         LoginSubmitUserIdRequest: {
@@ -1214,6 +1207,9 @@ class Parcel extends utils.Adapter {
         } else {
           this.log.warn('Login to UPS failed');
           this.log.info(JSON.stringify(res.data));
+          if (JSON.stringify(res.data).includes('Legal Agreement Required')) {
+            this.log.warn('Please login into UPS and accept the Legal Agreement');
+          }
         }
 
         return;
@@ -1430,10 +1426,12 @@ class Parcel extends utils.Adapter {
       dataDhl = await this.requestClient({
         method: 'get',
         url: 'https://www.dhl.de/int-verfolgen/data/search?noRedirect=true&language=de&cid=app',
-        accept: 'application/json',
-        'content-type': 'application/json',
-        'user-agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 14_8 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148',
-        'accept-language': 'de-de',
+        headers: {
+          accept: 'application/json',
+          'content-type': 'application/json',
+          'user-agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 14_8 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148',
+          'accept-language': 'de-de',
+        },
       })
 
         .then(async (res) => {
@@ -2269,8 +2267,7 @@ class Parcel extends utils.Adapter {
           'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
         'accept-language': 'de-de',
         'cache-control': 'max-age=0',
-        'user-agent':
-          'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/537.36',
+        'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/537.36',
         'viewport-width': '1272',
       },
     })
@@ -2289,12 +2286,10 @@ class Parcel extends utils.Adapter {
 
         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',
+            '.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')
-            : '';
+          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) {
@@ -2599,11 +2594,18 @@ class Parcel extends utils.Adapter {
         if (id.indexOf('dhl.briefe') !== -1 && id.indexOf('image_url') !== -1 && id.indexOf('oldAdvices') === -1) {
           let imageBase64 = this.images[state.val];
           if (!imageBase64) {
-            const image = await this.requestClient({
-              method: 'get',
-              url: state.val,
-              responseType: 'arraybuffer',
-            }).catch((error) => {
+            // const image = await this.requestClient({
+            //   method: 'get',
+            //   url: state.val,
+            //   responseType: 'arraybuffer',
+            // }).catch((error) => {
+            //   if (error.response && error.response.status === 401) {
+            //     this.log.debug(error);
+            //     return;
+            //   }
+            //   this.log.error(state.val + ' ' + error);
+            // });
+            const image = await dhlDecrypt(state.val, this.requestClient).catch((error) => {
               if (error.response && error.response.status === 401) {
                 this.log.debug(error);
                 return;
@@ -2614,8 +2616,8 @@ class Parcel extends utils.Adapter {
               this.log.debug('No image received for ' + state.val);
               return;
             }
-            const imageBuffer = Buffer.from(image.data, 'binary');
-            imageBase64 = 'data:' + image.headers['content-type'] + ';base64, ' + imageBuffer.toString('base64');
+            const imageBuffer = Buffer.from(image, 'binary');
+            imageBase64 = 'data:image/png;base64, ' + imageBuffer.toString('base64');
             this.images[state.val] = imageBase64;
             const pathArray = id.split('.');
             pathArray.pop();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iobroker.parcel",
-    "version": "0.1.5",
+    "version": "0.2.0",
     "description": "Parcel tracking",
     "author": {
         "name": "TA2k",
@@ -26,7 +26,7 @@
     },
     "dependencies": {
         "@iobroker/adapter-core": "^3.0.4",
-        "axios": "^1.5.1",
+        "axios": "^1.6.0",
         "http-cookie-agent": "^5.0.4",
         "jsdom": "^21.1.2",
         "json2iob": "^2.4.8",
@@ -36,16 +36,16 @@
     },
     "devDependencies": {
         "@iobroker/testing": "^4.1.0",
-        "@types/chai": "^4.3.9",
-        "@types/chai-as-promised": "^7.1.7",
-        "@types/mocha": "^10.0.2",
-        "@types/node": "^20.8.6",
-        "@types/proxyquire": "^1.3.29",
-        "@types/sinon": "^10.0.19",
-        "@types/sinon-chai": "^3.2.10",
+        "@types/chai": "^4.3.10",
+        "@types/chai-as-promised": "^7.1.8",
+        "@types/mocha": "^10.0.4",
+        "@types/node": "^20.9.0",
+        "@types/proxyquire": "^1.3.31",
+        "@types/sinon": "^10.0.20",
+        "@types/sinon-chai": "^3.2.12",
         "chai": "^4.3.10",
         "chai-as-promised": "^7.1.1",
-        "eslint": "^8.51.0",
+        "eslint": "^8.53.0",
         "mocha": "^10.2.0",
         "proxyquire": "^2.1.3",
         "sinon": "^15.2.0",