iobroker.parcel 0.2.1 → 0.2.2

package/io-package.json

@@ -1,8 +1,12 @@
 {
   "common": {
     "name": "parcel",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "news": {
+      "0.2.2": {
+        "en": "Improvment for Amazon Login and fix for Briefaanündigung Image",
+        "de": "Verbesserung für Amazon Login und Fix für Briefankündigung Image State"
+      },
       "0.2.1": {
         "en": "Fix for Briefankündigung",
         "de": "Briefankündigung wieder aktiviert"
@@ -166,6 +170,9 @@
   "native": {
     "amzusername": "",
     "amzpassword": "",
+    "aliUsername": "",
+    "aliPassword": "",
+    "aliMfa": "",
     "glsusername": "",
     "glspassword": "",
     "upsusername": "",

package/main.js

@@ -18,7 +18,7 @@ Module.prototype.require = function () {
 };
 
 const utils = require('@iobroker/adapter-core');
-const axios = require('axios');
+const axios = require('axios').default;
 const qs = require('qs');
 const crypto = require('crypto');
 const Json2iob = require('json2iob');
@@ -64,6 +64,7 @@ class Parcel extends utils.Adapter {
       DELIVERED: 1,
     };
     this.tmpDir = tmpdir();
+    this.requestClient = axios.create();
   }
 
   /**
@@ -403,6 +404,10 @@ class Parcel extends utils.Adapter {
           this.log.error(JSON.stringify(error.response.data));
         }
       });
+    if (!codeUrl) {
+      this.log.error('DHL codeUrl failed');
+      return;
+    }
     await this.requestClient({
       method: 'post',
       url: 'https://login.dhl.de/af5f9bb6-27ad-4af4-9445-008e7a5cddb8/login/token',
@@ -451,8 +456,6 @@ class Parcel extends utils.Adapter {
         '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',
       },
-      jar: this.cookieJar,
-      withCredentials: true,
     })
       .then(async (res) => {
         this.log.debug(JSON.stringify(res.data));
@@ -482,8 +485,6 @@ class Parcel extends utils.Adapter {
         force: false,
         meta: '',
       }),
-      jar: this.cookieJar,
-      withCredentials: true,
     })
       .then(async (res) => {
         this.log.debug(JSON.stringify(res.data));
@@ -620,8 +621,6 @@ class Parcel extends utils.Adapter {
         referer: 'https://login.aliexpress.com/',
         'accept-language': 'de',
       },
-      jar: this.cookieJar,
-      withCredentials: true,
     })
       .then(async (res) => {
         this.log.debug(JSON.stringify(res.data));
@@ -699,6 +698,7 @@ class Parcel extends utils.Adapter {
     } else {
       this.log.info('Login to AliExpress with MFA token');
       this.log.debug('MFA: ' + this.config.dhlMfa);
+      const mfaToken = '';
       await this.requestClient({
         method: 'post',
         url: 'https://www.dhl.de/int-erkennen/2fa',
@@ -775,8 +775,6 @@ class Parcel extends utils.Adapter {
         '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',
       },
-      jar: this.cookieJar,
-      withCredentials: true,
     })
       .then(async (res) => {
         this.log.debug(JSON.stringify(res.data));
@@ -807,8 +805,6 @@ class Parcel extends utils.Adapter {
           referer: 'https://www.amazon.de/ap/signin',
         },
         data: qs.stringify(form),
-        jar: this.cookieJar,
-        withCredentials: true,
       })
         .then(async (res) => {
           this.log.debug(JSON.stringify(res.data));
@@ -841,13 +837,11 @@ class Parcel extends utils.Adapter {
         referer: 'https://www.amazon.de/ap/signin',
       },
       data: qs.stringify(form),
-      jar: this.cookieJar,
-      withCredentials: true,
     })
       .then(async (res) => {
         this.log.debug(JSON.stringify(res.data));
         if (res.data.indexOf('js-yo-main-content') !== -1) {
-          this.log.info('Login to Amazon successful');
+          this.log.info('Relogin to Amazon successful');
           this.sessions['amz'] = true;
           this.setState('info.connection', true, true);
           this.setState('auth.cookie', JSON.stringify(this.cookieJar.toJSON()), true);
@@ -872,8 +866,6 @@ class Parcel extends utils.Adapter {
               referer: 'https://www.amazon.de/ap/signin',
             },
             data: qs.stringify(form),
-            jar: this.cookieJar,
-            withCredentials: true,
           })
             .then(async (res) => {
               this.log.debug(JSON.stringify(res.data));
@@ -943,8 +935,6 @@ class Parcel extends utils.Adapter {
     await this.requestClient({
       method: 'get',
       url: 'https://my.dpd.de/logout.aspx',
-      jar: this.cookieJar,
-      withCredentials: true,
     }).catch(async (error) => {
       error.response && this.log.error(JSON.stringify(error.response.data));
       this.log.error(error);
@@ -964,8 +954,6 @@ class Parcel extends utils.Adapter {
         dpg_username: this.config.dpdusername,
         dpg_password: this.config.dpdpassword,
       }),
-      jar: this.cookieJar,
-      withCredentials: true,
       maxRedirects: 0,
     })
       .then(async (res) => {
@@ -1010,8 +998,6 @@ class Parcel extends utils.Adapter {
     await this.requestClient({
       method: 'get',
       url: 'https://my.dpd.de/myParcel.aspx?dpd_token=' + this.dpdToken,
-      jar: this.cookieJar,
-      withCredentials: true,
     }).catch(async (error) => {
       error.response && this.log.error(JSON.stringify(error.response.data));
       this.log.error(error);
@@ -1037,8 +1023,6 @@ class Parcel extends utils.Adapter {
         username: this.config.glsusername,
         password: this.config.glspassword,
       }),
-      jar: this.cookieJar,
-      withCredentials: true,
     })
       .then(async (res) => {
         this.sessions['gls'] = res.data;
@@ -1066,8 +1050,6 @@ class Parcel extends utils.Adapter {
         'X-Client-Id': 'iOS',
         'X-Auth-Token': this.glstoken,
       },
-      jar: this.cookieJar,
-      withCredentials: true,
     })
       .then(async (res) => {
         !silent && this.log.info('Login to GLS successful');
@@ -1110,9 +1092,6 @@ class Parcel extends utils.Adapter {
         '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));
@@ -1178,8 +1157,6 @@ class Parcel extends utils.Adapter {
           IsMobile: 'true',
         },
       }),
-      jar: this.cookieJar,
-      withCredentials: true,
     })
       .then(async (res) => {
         this.log.debug(JSON.stringify(res.data));
@@ -1259,8 +1236,6 @@ class Parcel extends utils.Adapter {
           },
         },
       }),
-      jar: this.cookieJar,
-      withCredentials: true,
     })
       .then(async (res) => {
         this.log.debug(JSON.stringify(res.data));
@@ -1357,8 +1332,6 @@ class Parcel extends utils.Adapter {
         '","Password":"' +
         this.config.t17password +
         '","CaptchaCode":""},"sourcetype":0,"timeZoneOffset":-60}',
-      jar: this.cookieJar,
-      withCredentials: true,
     })
       .then(async (res) => {
         this.log.debug(JSON.stringify(res.data));
@@ -1695,17 +1668,17 @@ class Parcel extends utils.Adapter {
   async cleanupProvider(id, data) {
     if (id === 'dhl' && data.hasOwnProperty('grantToken')) {
       await this.delObjectAsync('dhl.briefe', { recursive: true });
-      // await this.setObjectNotExistsAsync("dhl.briefe.json", {
-      //   type: "state",
-      //   common: {
-      //     name: "Json Briefe",
-      //     write: false,
-      //     read: true,
-      //     type: "string",
-      //     role: "json",
-      //   },
-      //   native: {},
-      // });
+      await this.setObjectNotExistsAsync('dhl.briefe.json', {
+        type: 'state',
+        common: {
+          name: 'Json Briefe',
+          write: false,
+          read: true,
+          type: 'string',
+          role: 'json',
+        },
+        native: {},
+      });
     }
     if ((id === 'dhl' || id === 'dpd' || id === 'amz' || id === 'gls' || id === 'ups' || id === 'hermes') && data && data.sendungen) {
       const states = await this.getStatesAsync(id + '.sendungen*.id');
@@ -1738,6 +1711,9 @@ class Parcel extends utils.Adapter {
         if (sendung.sendungsdetails && sendung.sendungsdetails.liveTrackingVerfuegbar && sendung.sendungsdetails.liveTracking) {
           status = status + ' ' + sendung.sendungsdetails.liveTracking.countdown + ' Stopps';
         }
+        if (status === '') {
+          return;
+        }
         const name = sendung.sendungsinfo.sendungsname || 'Unbekannt';
 
         const sendungsObject = { id: sendung.id, name: name, status: status, source: 'DHL' };
@@ -2135,6 +2111,7 @@ class Parcel extends utils.Adapter {
     this.log.debug('Get Amazon Packages');
     const amzResult = { sendungen: [] };
 
+    await this.loginAmz();
     let orders = await this.getAmazonOrders();
     if (!orders) {
       orders = await this.getAmazonOrders();
@@ -2152,13 +2129,38 @@ class Parcel extends utils.Adapter {
         order.url = 'https://www.amazon.de' + order.url;
       }
       this.log.debug(order.url);
-      order.url = order.url + '&disableCsd=missing-library';
+      order.url = order.url + '';
       const element = await this.requestClient({
         method: 'get',
         url: order.url,
         headers: {
-          accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-          'accept-language': 'de-de',
+          authority: 'www.amazon.de',
+          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.7',
+          'accept-language': 'de,en;q=0.9,es;q=0.8,hi;q=0.7,kn;q=0.6',
+          'cache-control': 'no-cache',
+          'device-memory': '8',
+          downlink: '2',
+          dpr: '2',
+          ect: '4g',
+          pragma: 'no-cache',
+          referer: 'https://www.amazon.de/gp/css/order-history?ref_=nav_orders_first',
+          rtt: '50',
+          'sec-ch-device-memory': '8',
+          'sec-ch-dpr': '2',
+          'sec-ch-ua': '"Google Chrome";v="119", "Chromium";v="119", "Not?A_Brand";v="24"',
+          'sec-ch-ua-mobile': '?0',
+          'sec-ch-ua-platform': '"macOS"',
+          'sec-ch-ua-platform-version': '"14.1.1"',
+          'sec-ch-viewport-width': '1264',
+          'sec-fetch-dest': 'document',
+          'sec-fetch-mode': 'navigate',
+          'sec-fetch-site': 'same-origin',
+          'sec-fetch-user': '?1',
+          'upgrade-insecure-requests': '1',
+          'user-agent':
+            'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36',
+          'viewport-width': '1264',
         },
       })
         .then(async (res) => {
@@ -2209,6 +2211,18 @@ class Parcel extends utils.Adapter {
           if (!status) {
             status = stateObject.promise?.promiseMessage;
           }
+          if (!status) {
+            const shippingInfo = document.querySelector('.js-shipment-info-container');
+            if (shippingInfo) {
+              status = shippingInfo.textContent.replace(/\n */g, '');
+            }
+          }
+          if (!status) {
+            const returnInfo = document.querySelector('.a-alert-container .a-text-bold');
+            if (returnInfo) {
+              status = returnInfo.textContent.replace(/\n */g, '');
+            }
+          }
           if (!additionalStatus) {
             additionalStatus = stateObject.promise?.pdwHelpIconMessage;
           }
@@ -2226,7 +2240,11 @@ class Parcel extends utils.Adapter {
           if (stopsStatus) {
             status = status + '. ' + stopsStatus;
           }
-
+          if (!status) {
+            this.log.info('No status found for ' + order.url);
+            this.log.debug(res.data);
+            return;
+          }
           return {
             id: document.querySelector('.pt-delivery-card-trackingId')
               ? document.querySelector('.pt-delivery-card-trackingId').textContent.replace('Trackingnummer ', '')
@@ -2268,16 +2286,35 @@ class Parcel extends utils.Adapter {
   async getAmazonOrders() {
     return await this.requestClient({
       method: 'get',
-      url: 'https://www.amazon.de/gp/css/order-history?ref_=nav_orders_first&disableCsd=missing-library',
+      url: 'https://www.amazon.de/gp/css/order-history?ref_=nav_orders_first',
       headers: {
         authority: 'www.amazon.de',
+        Connection: 'keep-alive',
+        'Cache-Control': 'no-cache',
         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.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',
-        'viewport-width': '1272',
+        Pragma: 'no-cache',
+        'Sec-Fetch-Dest': 'document',
+        'Sec-Fetch-Mode': 'navigate',
+        'Sec-Fetch-Site': 'none',
+        'Sec-Fetch-User': '?1',
+        'Upgrade-Insecure-Requests': '1',
+        'User-Agent':
+          'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36',
+        'device-memory': '8',
+        downlink: '10',
+        dpr: '2',
+        ect: '4g',
+        rtt: '50',
+        'sec-ch-device-memory': '8',
+        'sec-ch-dpr': '2',
+        'sec-ch-ua': '"Google Chrome";v="119", "Chromium";v="119", "Not?A_Brand";v="24"',
+        'sec-ch-ua-mobile': '?0',
+        'sec-ch-ua-platform': '"macOS"',
+        'sec-ch-ua-platform-version': '"14.1.1"',
+        'sec-ch-viewport-width': '1264',
+        'viewport-width': '1264',
       },
     })
       .then(async (res) => {
@@ -2286,6 +2323,8 @@ class Parcel extends utils.Adapter {
 
         if (res.data.includes('auth-workflow')) {
           this.log.debug('Amazon Login required');
+
+          this.log.debug(res.data);
           await this.loginAmz();
           return;
         }
@@ -2581,8 +2620,7 @@ class Parcel extends utils.Adapter {
           await this.requestClient({
             method: 'post',
             url: 'https://buyer.17track.net/orderapi/call',
-            header: { 'content-type': 'application/x-www-form-urlencoded' },
-
+            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
             data: JSON.stringify({
               version: '1.0',
               timeZoneOffset: -60,
@@ -2702,6 +2740,8 @@ class Parcel extends utils.Adapter {
                 this.log.error(error);
               }
             }
+          } else {
+            this.setState(id.replace('image_url', 'image'), imageBase64, true);
           }
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iobroker.parcel",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "description": "Parcel tracking",
     "author": {
         "name": "TA2k",
@@ -26,7 +26,7 @@
     },
     "dependencies": {
         "@iobroker/adapter-core": "^3.0.4",
-        "axios": "^1.6.0",
+        "axios": "^1.6.2",
         "http-cookie-agent": "^5.0.4",
         "jsdom": "^21.1.2",
         "json2iob": "^2.4.8",
@@ -39,7 +39,7 @@
         "@types/chai": "^4.3.10",
         "@types/chai-as-promised": "^7.1.8",
         "@types/mocha": "^10.0.4",
-        "@types/node": "^20.9.0",
+        "@types/node": "^20.9.1",
         "@types/proxyquire": "^1.3.31",
         "@types/sinon": "^10.0.20",
         "@types/sinon-chai": "^3.2.12",