iobroker.parcel 0.1.6 → 0.2.0

package/io-package.json

@@ -1,8 +1,12 @@
 {
   "common": {
     "name": "parcel",
-    "version": "0.1.6",
+    "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"

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={}]
@@ -1206,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;
@@ -2590,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;
@@ -2605,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.6",
+    "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.3",
-        "@types/node": "^20.8.7",
-        "@types/proxyquire": "^1.3.30",
+        "@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.11",
+        "@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",