iobroker.parcel 0.0.9 → 0.0.12

package/io-package.json

@@ -1,9 +1,15 @@
 {
     "common": {
         "name": "parcel",
-        "version": "0.0.9",
+        "version": "0.0.12",
         "news": {
-            "0.0.9": {
+            "0.0.12": {
+                "en": "Add delivery status"
+            },
+            "0.0.11": {
+                "en": "Briefankündigung wird gestoppt, falls sie nicht funktioniert"
+            },
+            "0.0.10": {
                 "en": "in Zustellung DP, DPD Bugfix, detailierte DPs für Amazon, Option für keine Benachrichtigung bei Adapterstart"
             },
             "0.0.8": {
@@ -84,7 +90,7 @@
         "materialize": true,
         "plugins": {
             "sentry": {
-                "dsn": ""
+                "dsn": "https://6296452769de44959c1809642564a7e3@sentry.iobroker.net/171"
             }
         },
         "dependencies": [
@@ -186,13 +192,25 @@
             "type": "state",
             "common": {
                 "role": "json",
-                "name": "In delivery packages",
+                "name": "Today in delivery/Heute in Zustellung",
                 "type": "string",
                 "read": true,
                 "write": false
             },
             "native": {}
         },
+        {
+            "_id": "inDeliveryCount",
+            "type": "state",
+            "common": {
+                "role": "value",
+                "name": "Number of in delivery/Anzahl in Zustellung",
+                "type": "number",
+                "read": true,
+                "write": false
+            },
+            "native": {}
+        },
         {
             "_id": "auth",
             "type": "channel",

package/lib/rsaKey.js

@@ -0,0 +1,605 @@
+const crypto = require('crypto');
+const RSAKey = function() {
+    function a(a, b, c) {
+        null != a && ("number" == typeof a ? this.fromNumber(a, b, c) : null == b && "string" != typeof a ? this.fromString(a, 256) : this.fromString(a, b))
+    }
+    function b() {
+        return new a(null)
+    }
+    function c(a, b, c, d, e, f) {
+        for (; --f >= 0; ) {
+            var g = b * this[a++] + c[d] + e;
+            e = Math.floor(g / 67108864),
+            c[d++] = 67108863 & g
+        }
+        return e
+    }
+    function d(a, b, c, d, e, f) {
+        for (var g = 32767 & b, h = b >> 15; --f >= 0; ) {
+            var i = 32767 & this[a]
+              , j = this[a++] >> 15
+              , k = h * i + j * g;
+            i = g * i + ((32767 & k) << 15) + c[d] + (1073741823 & e),
+            e = (i >>> 30) + (k >>> 15) + h * j + (e >>> 30),
+            c[d++] = 1073741823 & i
+        }
+        return e
+    }
+    function e(a, b, c, d, e, f) {
+        for (var g = 16383 & b, h = b >> 14; --f >= 0; ) {
+            var i = 16383 & this[a]
+              , j = this[a++] >> 14
+              , k = h * i + j * g;
+            i = g * i + ((16383 & k) << 14) + c[d] + e,
+            e = (i >> 28) + (k >> 14) + h * j,
+            c[d++] = 268435455 & i
+        }
+        return e
+    }
+    function f(a) {
+        return ka.charAt(a)
+    }
+    function g(a, b) {
+        var c = la[a.charCodeAt(b)];
+        return null == c ? -1 : c
+    }
+    function h(a) {
+        for (var b = this.t - 1; b >= 0; --b)
+            a[b] = this[b];
+        a.t = this.t,
+        a.s = this.s
+    }
+    function i(a) {
+        this.t = 1,
+        this.s = 0 > a ? -1 : 0,
+        a > 0 ? this[0] = a : -1 > a ? this[0] = a + this.DV : this.t = 0
+    }
+    function j(a) {
+        var c = b();
+        return c.fromInt(a),
+        c
+    }
+    function k(b, c) {
+        var d;
+        if (16 == c)
+            d = 4;
+        else if (8 == c)
+            d = 3;
+        else if (256 == c)
+            d = 8;
+        else if (2 == c)
+            d = 1;
+        else if (32 == c)
+            d = 5;
+        else {
+            if (4 != c)
+                return void this.fromRadix(b, c);
+            d = 2
+        }
+        this.t = 0,
+        this.s = 0;
+        for (var e = b.length, f = !1, h = 0; --e >= 0; ) {
+            var i = 8 == d ? 255 & b[e] : g(b, e);
+            0 > i ? "-" == b.charAt(e) && (f = !0) : (f = !1,
+            0 == h ? this[this.t++] = i : h + d > this.DB ? (this[this.t - 1] |= (i & (1 << this.DB - h) - 1) << h,
+            this[this.t++] = i >> this.DB - h) : this[this.t - 1] |= i << h,
+            h += d,
+            h >= this.DB && (h -= this.DB))
+        }
+        8 == d && 0 != (128 & b[0]) && (this.s = -1,
+        h > 0 && (this[this.t - 1] |= (1 << this.DB - h) - 1 << h)),
+        this.clamp(),
+        f && a.ZERO.subTo(this, this)
+    }
+    function l() {
+        for (var a = this.s & this.DM; this.t > 0 && this[this.t - 1] == a; )
+            --this.t
+    }
+    function m(a) {
+        if (this.s < 0)
+            return "-" + this.negate().toString(a);
+        var b;
+        if (16 == a)
+            b = 4;
+        else if (8 == a)
+            b = 3;
+        else if (2 == a)
+            b = 1;
+        else if (32 == a)
+            b = 5;
+        else {
+            if (4 != a)
+                return this.toRadix(a);
+            b = 2
+        }
+        var c, d = (1 << b) - 1, e = !1, g = "", h = this.t, i = this.DB - h * this.DB % b;
+        if (h-- > 0)
+            for (i < this.DB && (c = this[h] >> i) > 0 && (e = !0,
+            g = f(c)); h >= 0; )
+                b > i ? (c = (this[h] & (1 << i) - 1) << b - i,
+                c |= this[--h] >> (i += this.DB - b)) : (c = this[h] >> (i -= b) & d,
+                0 >= i && (i += this.DB,
+                --h)),
+                c > 0 && (e = !0),
+                e && (g += f(c));
+        return e ? g : "0"
+    }
+    function n() {
+        var c = b();
+        return a.ZERO.subTo(this, c),
+        c
+    }
+    function o() {
+        return this.s < 0 ? this.negate() : this
+    }
+    function p(a) {
+        var b = this.s - a.s;
+        if (0 != b)
+            return b;
+        var c = this.t;
+        if (b = c - a.t,
+        0 != b)
+            return this.s < 0 ? -b : b;
+        for (; --c >= 0; )
+            if (0 != (b = this[c] - a[c]))
+                return b;
+        return 0
+    }
+    function q(a) {
+        var b, c = 1;
+        return 0 != (b = a >>> 16) && (a = b,
+        c += 16),
+        0 != (b = a >> 8) && (a = b,
+        c += 8),
+        0 != (b = a >> 4) && (a = b,
+        c += 4),
+        0 != (b = a >> 2) && (a = b,
+        c += 2),
+        0 != (b = a >> 1) && (a = b,
+        c += 1),
+        c
+    }
+    function r() {
+        return this.t <= 0 ? 0 : this.DB * (this.t - 1) + q(this[this.t - 1] ^ this.s & this.DM)
+    }
+    function s(a, b) {
+        var c;
+        for (c = this.t - 1; c >= 0; --c)
+            b[c + a] = this[c];
+        for (c = a - 1; c >= 0; --c)
+            b[c] = 0;
+        b.t = this.t + a,
+        b.s = this.s
+    }
+    function t(a, b) {
+        for (var c = a; c < this.t; ++c)
+            b[c - a] = this[c];
+        b.t = Math.max(this.t - a, 0),
+        b.s = this.s
+    }
+    function u(a, b) {
+        var c, d = a % this.DB, e = this.DB - d, f = (1 << e) - 1, g = Math.floor(a / this.DB), h = this.s << d & this.DM;
+        for (c = this.t - 1; c >= 0; --c)
+            b[c + g + 1] = this[c] >> e | h,
+            h = (this[c] & f) << d;
+        for (c = g - 1; c >= 0; --c)
+            b[c] = 0;
+        b[g] = h,
+        b.t = this.t + g + 1,
+        b.s = this.s,
+        b.clamp()
+    }
+    function v(a, b) {
+        b.s = this.s;
+        var c = Math.floor(a / this.DB);
+        if (c >= this.t)
+            return void (b.t = 0);
+        var d = a % this.DB
+          , e = this.DB - d
+          , f = (1 << d) - 1;
+        b[0] = this[c] >> d;
+        for (var g = c + 1; g < this.t; ++g)
+            b[g - c - 1] |= (this[g] & f) << e,
+            b[g - c] = this[g] >> d;
+        d > 0 && (b[this.t - c - 1] |= (this.s & f) << e),
+        b.t = this.t - c,
+        b.clamp()
+    }
+    function w(a, b) {
+        for (var c = 0, d = 0, e = Math.min(a.t, this.t); e > c; )
+            d += this[c] - a[c],
+            b[c++] = d & this.DM,
+            d >>= this.DB;
+        if (a.t < this.t) {
+            for (d -= a.s; c < this.t; )
+                d += this[c],
+                b[c++] = d & this.DM,
+                d >>= this.DB;
+            d += this.s
+        } else {
+            for (d += this.s; c < a.t; )
+                d -= a[c],
+                b[c++] = d & this.DM,
+                d >>= this.DB;
+            d -= a.s
+        }
+        b.s = 0 > d ? -1 : 0,
+        -1 > d ? b[c++] = this.DV + d : d > 0 && (b[c++] = d),
+        b.t = c,
+        b.clamp()
+    }
+    function x(b, c) {
+        var d = this.abs()
+          , e = b.abs()
+          , f = d.t;
+        for (c.t = f + e.t; --f >= 0; )
+            c[f] = 0;
+        for (f = 0; f < e.t; ++f)
+            c[f + d.t] = d.am(0, e[f], c, f, 0, d.t);
+        c.s = 0,
+        c.clamp(),
+        this.s != b.s && a.ZERO.subTo(c, c)
+    }
+    function y(a) {
+        for (var b = this.abs(), c = a.t = 2 * b.t; --c >= 0; )
+            a[c] = 0;
+        for (c = 0; c < b.t - 1; ++c) {
+            var d = b.am(c, b[c], a, 2 * c, 0, 1);
+            (a[c + b.t] += b.am(c + 1, 2 * b[c], a, 2 * c + 1, d, b.t - c - 1)) >= b.DV && (a[c + b.t] -= b.DV,
+            a[c + b.t + 1] = 1)
+        }
+        a.t > 0 && (a[a.t - 1] += b.am(c, b[c], a, 2 * c, 0, 1)),
+        a.s = 0,
+        a.clamp()
+    }
+    function z(c, d, e) {
+        var f = c.abs();
+        if (!(f.t <= 0)) {
+            var g = this.abs();
+            if (g.t < f.t)
+                return null != d && d.fromInt(0),
+                void (null != e && this.copyTo(e));
+            null == e && (e = b());
+            var h = b()
+              , i = this.s
+              , j = c.s
+              , k = this.DB - q(f[f.t - 1]);
+            k > 0 ? (f.lShiftTo(k, h),
+            g.lShiftTo(k, e)) : (f.copyTo(h),
+            g.copyTo(e));
+            var l = h.t
+              , m = h[l - 1];
+            if (0 != m) {
+                var n = m * (1 << this.F1) + (l > 1 ? h[l - 2] >> this.F2 : 0)
+                  , o = this.FV / n
+                  , p = (1 << this.F1) / n
+                  , r = 1 << this.F2
+                  , s = e.t
+                  , t = s - l
+                  , u = null == d ? b() : d;
+                for (h.dlShiftTo(t, u),
+                e.compareTo(u) >= 0 && (e[e.t++] = 1,
+                e.subTo(u, e)),
+                a.ONE.dlShiftTo(l, u),
+                u.subTo(h, h); h.t < l; )
+                    h[h.t++] = 0;
+                for (; --t >= 0; ) {
+                    var v = e[--s] == m ? this.DM : Math.floor(e[s] * o + (e[s - 1] + r) * p);
+                    if ((e[s] += h.am(0, v, e, t, 0, l)) < v)
+                        for (h.dlShiftTo(t, u),
+                        e.subTo(u, e); e[s] < --v; )
+                            e.subTo(u, e)
+                }
+                null != d && (e.drShiftTo(l, d),
+                i != j && a.ZERO.subTo(d, d)),
+                e.t = l,
+                e.clamp(),
+                k > 0 && e.rShiftTo(k, e),
+                0 > i && a.ZERO.subTo(e, e)
+            }
+        }
+    }
+    function A(c) {
+        var d = b();
+        return this.abs().divRemTo(c, null, d),
+        this.s < 0 && d.compareTo(a.ZERO) > 0 && c.subTo(d, d),
+        d
+    }
+    function B(a) {
+        this.m = a
+    }
+    function C(a) {
+        return a.s < 0 || a.compareTo(this.m) >= 0 ? a.mod(this.m) : a
+    }
+    function D(a) {
+        return a
+    }
+    function E(a) {
+        a.divRemTo(this.m, null, a)
+    }
+    function F(a, b, c) {
+        a.multiplyTo(b, c),
+        this.reduce(c)
+    }
+    function G(a, b) {
+        a.squareTo(b),
+        this.reduce(b)
+    }
+    function H() {
+        if (this.t < 1)
+            return 0;
+        var a = this[0];
+        if (0 == (1 & a))
+            return 0;
+        var b = 3 & a;
+        return b = b * (2 - (15 & a) * b) & 15,
+        b = b * (2 - (255 & a) * b) & 255,
+        b = b * (2 - ((65535 & a) * b & 65535)) & 65535,
+        b = b * (2 - a * b % this.DV) % this.DV,
+        b > 0 ? this.DV - b : -b
+    }
+    function I(a) {
+        this.m = a,
+        this.mp = a.invDigit(),
+        this.mpl = 32767 & this.mp,
+        this.mph = this.mp >> 15,
+        this.um = (1 << a.DB - 15) - 1,
+        this.mt2 = 2 * a.t
+    }
+    function J(c) {
+        var d = b();
+        return c.abs().dlShiftTo(this.m.t, d),
+        d.divRemTo(this.m, null, d),
+        c.s < 0 && d.compareTo(a.ZERO) > 0 && this.m.subTo(d, d),
+        d
+    }
+    function K(a) {
+        var c = b();
+        return a.copyTo(c),
+        this.reduce(c),
+        c
+    }
+    function L(a) {
+        for (; a.t <= this.mt2; )
+            a[a.t++] = 0;
+        for (var b = 0; b < this.m.t; ++b) {
+            var c = 32767 & a[b]
+              , d = c * this.mpl + ((c * this.mph + (a[b] >> 15) * this.mpl & this.um) << 15) & a.DM;
+            for (c = b + this.m.t,
+            a[c] += this.m.am(0, d, a, b, 0, this.m.t); a[c] >= a.DV; )
+                a[c] -= a.DV,
+                a[++c]++
+        }
+        a.clamp(),
+        a.drShiftTo(this.m.t, a),
+        a.compareTo(this.m) >= 0 && a.subTo(this.m, a)
+    }
+    function M(a, b) {
+        a.squareTo(b),
+        this.reduce(b)
+    }
+    function N(a, b, c) {
+        a.multiplyTo(b, c),
+        this.reduce(c)
+    }
+    function O() {
+        return 0 == (this.t > 0 ? 1 & this[0] : this.s)
+    }
+    function P(c, d) {
+        if (c > 4294967295 || 1 > c)
+            return a.ONE;
+        var e = b()
+          , f = b()
+          , g = d.convert(this)
+          , h = q(c) - 1;
+        for (g.copyTo(e); --h >= 0; )
+            if (d.sqrTo(e, f),
+            (c & 1 << h) > 0)
+                d.mulTo(f, g, e);
+            else {
+                var i = e;
+                e = f,
+                f = i
+            }
+        return d.revert(e)
+    }
+    function Q(a, b) {
+        var c;
+        return c = 256 > a || b.isEven() ? new B(b) : new I(b),
+        this.exp(a, c)
+    }
+    function R() {
+        this.i = 0,
+        this.j = 0,
+        this.S = new Array
+    }
+    function S(a) {
+        var b, c, d;
+        for (b = 0; 256 > b; ++b)
+            this.S[b] = b;
+        for (c = 0,
+        b = 0; 256 > b; ++b)
+            c = c + this.S[b] + a[b % a.length] & 255,
+            d = this.S[b],
+            this.S[b] = this.S[c],
+            this.S[c] = d;
+        this.i = 0,
+        this.j = 0
+    }
+    function T() {
+        var a;
+        return this.i = this.i + 1 & 255,
+        this.j = this.j + this.S[this.i] & 255,
+        a = this.S[this.i],
+        this.S[this.i] = this.S[this.j],
+        this.S[this.j] = a,
+        this.S[a + this.S[this.i] & 255]
+    }
+    function U() {
+        return new R
+    }
+    function V(a) {
+        na[oa++] ^= 255 & a,
+        na[oa++] ^= a >> 8 & 255,
+        na[oa++] ^= a >> 16 & 255,
+        na[oa++] ^= a >> 24 & 255,
+        oa >= pa && (oa -= pa)
+    }
+    function W() {
+        V((new Date).getTime())
+    }
+    function X() {
+        if (null == ma) {
+            for (W(),
+            ma = U(),
+            ma.init(na),
+            oa = 0; oa < na.length; ++oa)
+                na[oa] = 0;
+            oa = 0
+        }
+        return ma.next()
+    }
+    function Y(a) {
+        var b;
+        for (b = 0; b < a.length; ++b)
+            a[b] = X()
+    }
+    function Z() {}
+    function $(b, c) {
+        return new a(b,c)
+    }
+    function _(b, c) {
+        if (c < b.length + 11)
+            return alert("Message too long for RSA"),
+            null;
+        for (var d = new Array, e = b.length - 1; e >= 0 && c > 0; ) {
+            var f = b.charCodeAt(e--);
+            128 > f ? d[--c] = f : f > 127 && 2048 > f ? (d[--c] = 63 & f | 128,
+            d[--c] = f >> 6 | 192) : (d[--c] = 63 & f | 128,
+            d[--c] = f >> 6 & 63 | 128,
+            d[--c] = f >> 12 | 224)
+        }
+        d[--c] = 0;
+        for (var g = new Z, h = new Array; c > 2; ) {
+            for (h[0] = 0; 0 == h[0]; )
+                g.nextBytes(h);
+            d[--c] = h[0]
+        }
+        return d[--c] = 2,
+        d[--c] = 0,
+        new a(d)
+    }
+    function aa() {
+        this.n = null,
+        this.e = 0,
+        this.d = null,
+        this.p = null,
+        this.q = null,
+        this.dmp1 = null,
+        this.dmq1 = null,
+        this.coeff = null
+    }
+    function ba(a, b) {
+        null != a && null != b && a.length > 0 && b.length > 0 ? (this.n = $(a, 16),
+        this.e = parseInt(b, 16)) : alert("Invalid RSA public key")
+    }
+    function ca(a) {
+        return a.modPowInt(this.e, this.n)
+    }
+    function da(a) {
+        var b = _(a, this.n.bitLength() + 7 >> 3);
+        if (null == b)
+            return null;
+        var c = this.doPublic(b);
+        if (null == c)
+            return null;
+        var d = c.toString(16);
+        return 0 == (1 & d.length) ? d : "0" + d
+    }
+    var ea, fa = 0xdeadbeefcafe, ga = 15715070 == (16777215 & fa);
+    a.prototype.am = e,
+    ea = 28,
+    a.prototype.DB = ea,
+    a.prototype.DM = (1 << ea) - 1,
+    a.prototype.DV = 1 << ea;
+    var ha = 52;
+    a.prototype.FV = Math.pow(2, ha),
+    a.prototype.F1 = ha - ea,
+    a.prototype.F2 = 2 * ea - ha;
+    var ia, ja, ka = "0123456789abcdefghijklmnopqrstuvwxyz", la = new Array;
+    for (ia = "0".charCodeAt(0),
+    ja = 0; 9 >= ja; ++ja)
+        la[ia++] = ja;
+    for (ia = "a".charCodeAt(0),
+    ja = 10; 36 > ja; ++ja)
+        la[ia++] = ja;
+    for (ia = "A".charCodeAt(0),
+    ja = 10; 36 > ja; ++ja)
+        la[ia++] = ja;
+    B.prototype.convert = C,
+    B.prototype.revert = D,
+    B.prototype.reduce = E,
+    B.prototype.mulTo = F,
+    B.prototype.sqrTo = G,
+    I.prototype.convert = J,
+    I.prototype.revert = K,
+    I.prototype.reduce = L,
+    I.prototype.mulTo = N,
+    I.prototype.sqrTo = M,
+    a.prototype.copyTo = h,
+    a.prototype.fromInt = i,
+    a.prototype.fromString = k,
+    a.prototype.clamp = l,
+    a.prototype.dlShiftTo = s,
+    a.prototype.drShiftTo = t,
+    a.prototype.lShiftTo = u,
+    a.prototype.rShiftTo = v,
+    a.prototype.subTo = w,
+    a.prototype.multiplyTo = x,
+    a.prototype.squareTo = y,
+    a.prototype.divRemTo = z,
+    a.prototype.invDigit = H,
+    a.prototype.isEven = O,
+    a.prototype.exp = P,
+    a.prototype.toString = m,
+    a.prototype.negate = n,
+    a.prototype.abs = o,
+    a.prototype.compareTo = p,
+    a.prototype.bitLength = r,
+    a.prototype.mod = A,
+    a.prototype.modPowInt = Q,
+    a.ZERO = j(0),
+    a.ONE = j(1),
+    R.prototype.init = S,
+    R.prototype.next = T;
+    var ma, na, oa, pa = 256;
+    if (null == na) {
+        na = new Array,
+        oa = 0;
+        var qa;
+        if (crypto && crypto.getRandomValues) {
+            var ra = new Uint8Array(32);
+            for (crypto.getRandomValues(ra),
+            qa = 0; 32 > qa; ++qa)
+                na[oa++] = ra[qa]
+        }
+ 
+        for (; pa > oa; )
+            qa = Math.floor(65536 * Math.random()),
+            na[oa++] = qa >>> 8,
+            na[oa++] = 255 & qa;
+        oa = 0,
+        W()
+    }
+    Z.prototype.nextBytes = Y,
+    aa.prototype.doPublic = ca,
+    aa.prototype.setPublic = ba,
+    aa.prototype.encrypt = da;
+    return aa
+}();
+
+module.exports = function getPwd(b){
+    g = new RSAKey;
+    g.setPublic("d3bcef1f00424f3261c89323fa8cdfa12bbac400d9fe8bb627e8d27a44bd5d59dce559135d678a8143beb5b8d7056c4e1f89c4e1f152470625b7b41944a97f02da6f605a49a93ec6eb9cbaf2e7ac2b26a354ce69eb265953d2c29e395d6d8c1cdb688978551aa0f7521f290035fad381178da0bea8f9e6adce39020f513133fb","10001");
+    return g.encrypt(b)
+}

package/main.js

@@ -10,9 +10,10 @@ const utils = require("@iobroker/adapter-core");
 const axios = require("axios");
 const qs = require("qs");
 const Json2iob = require("./lib/json2iob");
+const getPwd = require("./lib/rsaKey");
 const tough = require("tough-cookie");
 const { HttpsCookieAgent } = require("http-cookie-agent");
-const { JSDOM } = require("jsdom");
+const { JSDOM } = require("@applitools/jsdom");
 const fs = require("fs");
 const { v4: uuidv4 } = require("uuid");
 
@@ -36,7 +37,9 @@ class Parcel extends utils.Adapter {
         this.mergedJsonObject = {};
         this.images = {};
         this.alreadySentMessages = {};
+        this.ignoredPath = [];
         this.firstStart = true;
+        this.delivery_status = { ERROR: -1, UNKNOWN: 5, REGISTERED: 10, IN_PREPARATION: 20, IN_TRANSIT: 30, OUT_FOR_DELIVERY: 40, DELIVERED: 1 };
     }
 
     /**
@@ -75,6 +78,10 @@ class Parcel extends utils.Adapter {
             this.log.info("Login to T17 User");
             await this.login17T();
         }
+        if (this.config.aliUsername && this.config.aliPassword) {
+            this.log.info("Login to AliExpres");
+            await this.loginAli();
+        }
 
         if (this.config["17trackKey"]) {
             this.sessions["17track"] = this.config["17trackKey"];
@@ -278,6 +285,151 @@ class Parcel extends utils.Adapter {
                 });
         }
     }
+    async loginAli() {
+        const loginData = await this.requestClient({
+            method: "get",
+            url: "https://passport.aliexpress.com/mini_login.htm?lang=de_de&appName=aebuyer&appEntrance=default&styleType=auto&bizParams=&notLoadSsoView=false&notKeepLogin=false&isMobile=false&cssLink=https://i.alicdn.com/noah-static/4.0.2/common/css/reset-havana.css&cssUrl=https://i.alicdn.com/noah-static/4.0.2/common/css/reset-havana-new-page.css&showMobilePwdLogin=false&defaultCountryCode=DE&ut=&rnd=0.9085151696364684",
+            headers: {
+                "sec-ch-ua": '" Not A;Brand";v="99", "Chromium";v="100", "Google Chrome";v="100"',
+                "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",
+                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",
+                "sec-fetch-mode": "navigate",
+                "sec-fetch-dest": "iframe",
+                referer: "https://login.aliexpress.com/",
+                "accept-language": "de",
+            },
+            jar: this.cookieJar,
+            withCredentials: true,
+        })
+            .then(async (res) => {
+                this.log.debug(JSON.stringify(res.data));
+                if (res.data.indexOf("window.viewData = ") !== -1) {
+                    try {
+                        const loginData = res.data.split("window.viewData = ")[1].split(";")[0].replace(/\\/g, "");
+                        return JSON.parse(loginData).loginFormData;
+                    } catch (error) {
+                        this.log.error(error);
+                    }
+                } else {
+                    this.log.error("Failed Step 1 Aliexpress");
+                }
+            })
+            .catch((error) => {
+                this.log.error(error);
+                if (error.response) {
+                    this.log.error(JSON.stringify(error.response.data));
+                }
+            });
+
+        if (!loginData) {
+            return;
+        }
+        if (!this.config.aliMfa) {
+            loginData.loginId = this.config.aliUsername;
+            loginData.password2 = getPwd(this.config.aliPassword);
+            await this.requestClient({
+                method: "post",
+                url: "https://passport.aliexpress.com/newlogin/login.do?appName=aebuyer&fromSite=13&_bx-v=2.0.39",
+                headers: {
+                    "sec-ch-ua": '" Not A;Brand";v="99", "Chromium";v="100", "Google Chrome";v="100"',
+                    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",
+                    "sec-ch-ua-platform": '"macOS"',
+                    origin: "https://login.aliexpress.com",
+                    "sec-fetch-site": "same-site",
+                    "sec-fetch-mode": "cors",
+                    "sec-fetch-dest": "empty",
+                    referer: "https://login.aliexpress.com/",
+                    "accept-language": "de",
+                },
+                jar: this.cookieJar,
+                withCredentials: true,
+                data: qs.stringify(loginData),
+            })
+                .then(async (res) => {
+                    if (res.data.url && res.data.url.indexOf("punish") !== -1) {
+                        this.log.error("Failed because of captcha");
+                    }
+                    //  this.log.debug(JSON.stringify(res.data));
+                })
+                .catch((error) => {
+                    this.log.error(error);
+                    if (error.response) {
+                        this.log.error(JSON.stringify(error.response.data));
+                    }
+                });
+            await this.requestClient({
+                method: "get",
+                url: "https://www.aliexpress.com/p/order/index.html",
+                jar: this.cookieJar,
+                withCredentials: true,
+            })
+                .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");
+                })
+                .catch(async (error) => {
+                    error.response && this.log.error(JSON.stringify(error.response.data));
+                    this.log.error(error);
+                });
+        } else {
+            this.log.info("Login to AliExpress with MFA token");
+            this.log.debug("MFA: " + this.config.dhlMfa);
+            await this.requestClient({
+                method: "post",
+                url: "https://www.dhl.de/int-erkennen/2fa",
+                headers: {
+                    Host: "www.dhl.de",
+                    "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",
+                },
+                jar: this.cookieJar,
+                withCredentials: true,
+                data: JSON.stringify({
+                    value: this.config.dhlMfa,
+                    remember2fa: true,
+                    language: "de",
+                    context: "app",
+                    meta: "",
+                    intermediateMfaToken: mfaToken,
+                }),
+            })
+                .then(async (res) => {
+                    this.log.debug(JSON.stringify(res.data));
+                    this.log.info("Login to DHL successful");
+                    this.sessions["dhl"] = res.data;
+                    this.setState("info.connection", true, true);
+                    this.setState("auth.cookie", JSON.stringify(this.cookieJar.toJSON()), true);
+                    await this.createDHLStates();
+                })
+                .catch(async (error) => {
+                    this.log.error(error);
+                    if (error.response) {
+                        this.setState("info.connection", false, true);
+                        this.log.error(JSON.stringify(error.response.data));
+                        const adapterConfig = "system.adapter." + this.name + "." + this.instance;
+                        this.log.error("MFA incorrect");
+                        this.getForeignObject(adapterConfig, (error, obj) => {
+                            if (obj && obj.native && obj.native.dhlMfa) {
+                                obj.native.dhlMfa = "";
+                                this.setForeignObject(adapterConfig, obj);
+                            }
+                        });
+                        return;
+                    }
+                });
+        }
+    }
 
     async loginAmz() {
         let body = await this.requestClient({
@@ -359,6 +511,17 @@ class Parcel extends utils.Adapter {
                         },
                         native: {},
                     });
+                    await this.setObjectNotExistsAsync("amazon.json", {
+                        type: "state",
+                        common: {
+                            name: "Json Sendungen",
+                            write: false,
+                            read: true,
+                            type: "string",
+                            role: "json",
+                        },
+                        native: {},
+                    });
                     return;
                 }
                 if (res.data.indexOf("auth-mfa-otpcode") !== -1) {
@@ -499,6 +662,15 @@ class Parcel extends utils.Adapter {
                     this.log.error(JSON.stringify(error.response.data));
                 }
             });
+        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);
+        });
     }
     async loginGLS(silent) {
         await this.requestClient({
@@ -980,7 +1152,7 @@ class Parcel extends utils.Adapter {
             dpd: [
                 {
                     path: "dpd",
-                    url: "https://my.dpd.de/myParcel.aspx?dpd_token=" + this.dpdToken,
+                    url: "https://my.dpd.de/myParcel.aspx", //?dpd_token=" + this.dpdToken,
                     header: {
                         accept: "*/*",
                         "user-agent": "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.45 Safari/537.36",
@@ -1038,6 +1210,10 @@ class Parcel extends utils.Adapter {
         for (const id of Object.keys(this.sessions)) {
             for (const element of statusArrays[id]) {
                 this.log.debug(element.url);
+                if (this.ignoredPath.includes(element.path)) {
+                    this.log.debug("Ignore: " + element.path);
+                    continue;
+                }
                 await this.requestClient({
                     method: element.method ? element.method : "get",
                     url: element.url,
@@ -1073,13 +1249,18 @@ class Parcel extends utils.Adapter {
                         }
                         if (id === "hermes") {
                             try {
-                                for (const parcel of res.data) {
-                                    parcel.id = parcel.shipmentId;
+                                if (res.data) {
+                                    if (typeof res.data === "string") {
+                                        res.data = JSON.parse(res.data);
+                                    }
+                                    for (const parcel of res.data) {
+                                        parcel.id = parcel.shipmentId;
+                                    }
+                                    data = { sendungen: res.data };
                                 }
-                                data = { sendungen: res.data };
                             } catch (error) {
-                                this.log.error(error);
-                                this.log.error(res.data);
+                                this.log.warn("Hermes response incomplete cannot parse result");
+                                this.log.debug(res.data);
                                 data = { sendungen: [] };
                             }
                         }
@@ -1101,11 +1282,12 @@ class Parcel extends utils.Adapter {
                             await this.activateToken(res.data.grantToken, res.data.accessTokenUrl);
                             await this.sleep(1000);
                         }
-
-                        await this.cleanupProvider(id, data);
-                        this.mergeProviderJson(id, data);
-                        this.json2iob.parse(element.path, data, { forceIndex: forceIndex, preferedArrayName: preferedArrayName });
-                        data && this.setState(element.path + ".json", JSON.stringify(data), true);
+                        if (data) {
+                            await this.cleanupProvider(id, data);
+                            this.mergeProviderJson(id, data);
+                            this.json2iob.parse(element.path, data, { forceIndex: forceIndex, preferedArrayName: preferedArrayName });
+                            data && this.setState(element.path + ".json", JSON.stringify(data), true);
+                        }
                     })
                     .catch((error) => {
                         if (error.response) {
@@ -1114,6 +1296,7 @@ class Parcel extends utils.Adapter {
                                     this.log.debug(error);
                                     return;
                                 }
+
                                 error.response && this.log.debug(JSON.stringify(error.response.data));
 
                                 this.log.info(element.path + " receive 401 error. Refresh Token in 60 seconds");
@@ -1125,6 +1308,10 @@ class Parcel extends utils.Adapter {
                                 }
                                 return;
                             }
+                            if (element.path === "dhl.briefe") {
+                                this.log.info("Briefankündigung is not working. Stopped until restart");
+                                this.ignoredPath.push(element.path);
+                            }
                         }
                         this.log.error(element.url);
                         this.log.error(error);
@@ -1155,12 +1342,14 @@ class Parcel extends utils.Adapter {
             });
             for (const sendungsIdKey in states) {
                 const index = Object.keys(states).indexOf(sendungsIdKey);
-                const sendungsId = states[sendungsIdKey].val;
-                if (sendungsArray[index] !== sendungsId) {
-                    const idArray = sendungsIdKey.split(".");
-                    idArray.pop();
-                    this.log.debug("deleting " + sendungsIdKey);
-                    await this.delObjectAsync(idArray.join("."), { recursive: true });
+                if (states[sendungsIdKey]) {
+                    const sendungsId = states[sendungsIdKey].val;
+                    if (sendungsArray[index] !== sendungsId) {
+                        const idArray = sendungsIdKey.split(".");
+                        idArray.pop();
+                        this.log.debug("deleting " + sendungsIdKey);
+                        await this.delObjectAsync(idArray.join("."), { recursive: true });
+                    }
                 }
             }
         }
@@ -1174,8 +1363,14 @@ class Parcel extends utils.Adapter {
                 if (sendung.sendungsdetails && sendung.sendungsdetails.sendungsverlauf && sendung.sendungsdetails.sendungsverlauf.kurzStatus) {
                     status = sendung.sendungsdetails.sendungsverlauf.kurzStatus;
                 }
-                const sendungsObject = { id: sendung.id, name: sendung.sendungsinfo.sendungsname, status: status, source: "DHL", direction: sendung.sendungsinfo.sendungsrichtung };
-                sendungsObject.inDelivery = this.inDeliveryCheck(sendungsObject);
+                const sendungsObject = { id: sendung.id, name: sendung.sendungsinfo.sendungsname, status: status, source: "DHL" };
+
+                sendungsObject.delivery_status = this.deliveryStatusCheck(sendung, id, sendungsObject);
+                if (sendungsObject.delivery_status === this.delivery_status.OUT_FOR_DELIVERY) {
+                    sendungsObject.inDelivery = true;
+                    this.inDelivery.push(sendungsObject);
+                }
+                sendungsObject.direction = sendung.sendungsinfo.sendungsrichtung;
                 this.mergedJsonObject[sendung.id] = sendungsObject;
                 return sendungsObject;
             });
@@ -1184,7 +1379,12 @@ class Parcel extends utils.Adapter {
         if (id === "gls" && data.sendungen) {
             const sendungsArray = data.sendungen.map((sendung) => {
                 const sendungsObject = { id: sendung.id, name: sendung.label || sendung.parcelNumber, status: sendung.status, source: "GLS", direction: sendung.type };
-                sendungsObject.inDelivery = this.inDeliveryCheck(sendungsObject);
+
+                sendungsObject.delivery_status = this.deliveryStatusCheck(sendung, id, sendungsObject);
+                if (sendungsObject.delivery_status === this.delivery_status.OUT_FOR_DELIVERY) {
+                    sendungsObject.inDelivery = true;
+                    this.inDelivery.push(sendungsObject);
+                }
                 this.mergedJsonObject[sendung.id] = sendungsObject;
                 return sendungsObject;
             });
@@ -1194,7 +1394,11 @@ class Parcel extends utils.Adapter {
             const sendungsArray = data.sendungen.map((sendung) => {
                 const sendungsObject = { id: sendung.id, name: sendung.shipFromName, status: sendung.locStatus || sendung.status, source: "UPS" };
 
-                sendungsObject.inDelivery = this.inDeliveryCheck(sendungsObject);
+                sendungsObject.delivery_status = this.deliveryStatusCheck(sendung, id, sendungsObject);
+                if (sendungsObject.delivery_status === this.delivery_status.OUT_FOR_DELIVERY) {
+                    sendungsObject.inDelivery = true;
+                    this.inDelivery.push(sendungsObject);
+                }
                 this.mergedJsonObject[sendung.id] = sendungsObject;
 
                 return sendungsObject;
@@ -1203,8 +1407,17 @@ class Parcel extends utils.Adapter {
         }
         if (id === "hermes" && data.sendungen) {
             const sendungsArray = data.sendungen.map((sendung) => {
-                const sendungsObject = { id: sendung.id, name: sendung.description, status: sendung.lastStatusMessage, source: "Hermes" };
-                sendungsObject.inDelivery = this.inDeliveryCheck(sendungsObject);
+                let name = sendung.description;
+                if (sendung.sender && sendung.sender.lastname) {
+                    name = name + " " + sendung.sender.lastname;
+                }
+                const sendungsObject = { id: sendung.id, name: name, status: sendung.lastStatusMessage || "", source: "Hermes" };
+
+                sendungsObject.delivery_status = this.deliveryStatusCheck(sendung, id, sendungsObject);
+                if (sendungsObject.delivery_status === this.delivery_status.OUT_FOR_DELIVERY) {
+                    sendungsObject.inDelivery = true;
+                    this.inDelivery.push(sendungsObject);
+                }
                 this.mergedJsonObject[sendung.id] = sendungsObject;
 
                 return sendungsObject;
@@ -1215,25 +1428,43 @@ class Parcel extends utils.Adapter {
         if (id === "dpd" && data && data.sendungen) {
             for (const sendung of data.sendungen) {
                 sendung.source = "DPD";
-                sendung.inDelivery = this.inDeliveryCheck(sendung);
-
+                sendung.delivery_status = this.deliveryStatusCheck(sendung, id, sendung);
+                if (sendung.delivery_status === this.delivery_status.OUT_FOR_DELIVERY) {
+                    sendung.inDelivery = true;
+                    this.inDelivery.push(sendung);
+                }
+                if (!sendung.delivery_status) {
+                    this.log.warn("Missing status for " + JSON.stringify(sendung));
+                }
                 this.mergedJsonObject[sendung.id] = sendung;
             }
             this.mergedJson = this.mergedJson.concat(data.sendungen);
         }
         if (id === "amz" && data && data.sendungen) {
-            for (const sendung of data.sendungen) {
-                sendung.source = "AMZ";
-                sendung.inDelivery = this.inDeliveryCheck(sendung);
-                this.mergedJsonObject[sendung.id] = sendung;
-            }
-            this.mergedJson = this.mergedJson.concat(data.sendungen);
+            const sendungsArray = data.sendungen.map((sendung) => {
+                const sendungsObject = { id: sendung.id, name: sendung.name, status: sendung.status, source: "AMZ" };
+
+                sendungsObject.delivery_status = this.deliveryStatusCheck(sendung, id, sendungsObject);
+                if (sendungsObject.delivery_status === this.delivery_status.OUT_FOR_DELIVERY) {
+                    sendungsObject.inDelivery = true;
+                    this.inDelivery.push(sendungsObject);
+                }
+                this.mergedJsonObject[sendung.id] = sendungsObject;
+
+                return sendungsObject;
+            });
+            this.mergedJson = this.mergedJson.concat(sendungsArray);
         }
         if (id === "17track" && data.accepted) {
             const sendungsArray = data.accepted.map((sendung) => {
                 const sendungsObject = { id: sendung.number, name: sendung.number, status: sendung.track.z0 ? sendung.track.z0.z : "", source: "17track" };
                 if (!this.mergedJsonObject[sendung.id]) {
-                    sendungsObject.inDelivery = this.inDeliveryCheck(sendungsObject);
+                    sendungsObject.delivery_status = this.deliveryStatusCheck(sendung, id, sendungsObject);
+                    if (sendungsObject.delivery_status === this.delivery_status.OUT_FOR_DELIVERY) {
+                        sendungsObject.inDelivery = true;
+                        this.inDelivery.push(sendungsObject);
+                    }
+
                     this.mergedJsonObject[sendung.id] = sendungsObject;
                 }
                 return sendungsObject;
@@ -1248,7 +1479,12 @@ class Parcel extends utils.Adapter {
                     }
                     const sendungsObject = { id: sendung.FTrackNo, name: sendung.FTrackInfoId, status: sendung.FLastEvent ? sendung.FLastEvent.z : "", source: "17tuser" };
                     if (!this.mergedJsonObject[sendung.id]) {
-                        sendungsObject.inDelivery = this.inDeliveryCheck(sendungsObject);
+                        sendungsObject.delivery_status = this.deliveryStatusCheck(sendung, id, sendungsObject);
+                        if (sendungsObject.delivery_status === this.delivery_status.OUT_FOR_DELIVERY) {
+                            sendungsObject.inDelivery = true;
+                            this.inDelivery.push(sendungsObject);
+                        }
+
                         this.mergedJsonObject[sendung.id] = sendungsObject;
                     }
                     return sendungsObject;
@@ -1262,6 +1498,7 @@ class Parcel extends utils.Adapter {
         this.setState("allProviderJson", JSON.stringify(this.mergedJson), true);
         this.setState("allProviderObjects", JSON.stringify(this.mergedJsonObject), true);
         this.setState("inDelivery", JSON.stringify(this.inDelivery), true);
+        this.setState("inDeliveryCount", this.inDelivery.length, true);
 
         if (this.config.sendToActive) {
             const sendungen = this.mergedJsonObject;
@@ -1283,25 +1520,109 @@ class Parcel extends utils.Adapter {
         }
     }
     inDeliveryCheck(sendungsObject) {
+        if (!sendungsObject.status) {
+            return false;
+        }
         if (
             sendungsObject.status.toLocaleLowerCase().includes("in zustellung") ||
             sendungsObject.status.toLocaleLowerCase().includes("zustellung heute") ||
-            sendungsObject.status.toLocaleLowerCase().includes("heute zugestell") ||
+            //sendungsObject.status.toLocaleLowerCase().includes("heute zugestell") ||
             sendungsObject.status.toLocaleLowerCase().includes("wird zugestellt") ||
             sendungsObject.status.toLocaleLowerCase().includes("zustellfahrzeug")
         ) {
-            if (
-                sendungsObject.status.toLocaleLowerCase().includes("geliefert heute") ||
-                sendungsObject.status.toLocaleLowerCase().includes("unterschrieben von") ||
-                sendungsObject.status.toLocaleLowerCase().includes("hausbewohner übergeben")
-            ) {
+            if (this.deliveredCheck(sendungsObject)) {
                 return false;
             }
-            this.inDelivery.push(sendungsObject);
             return true;
         }
         return false;
     }
+    deliveredCheck(sendungsObject) {
+        if (!sendungsObject.status) {
+            return false;
+        }
+        if (
+            sendungsObject.status.toLocaleLowerCase().includes("geliefert heute") ||
+            sendungsObject.status.toLocaleLowerCase().includes("geliefert. heute zugestellt") ||
+            sendungsObject.status.toLocaleLowerCase().includes("unterschrieben von") ||
+            sendungsObject.status.toLocaleLowerCase().includes("hausbewohner übergeben") ||
+            sendungsObject.status.toLocaleLowerCase().includes("zustellung erfolgreich") ||
+            sendungsObject.status.toLocaleLowerCase().includes("paket zugestellt")
+        ) {
+            return true;
+        }
+        return false;
+    }
+    deliveryStatusCheck(sendung, id, sendungsObject) {
+        try {
+            if (sendung) {
+                if (id === "dhl" && sendung.sendungsdetails && sendung.sendungsdetails.sendungsverlauf && sendung.sendungsdetails.sendungsverlauf.fortschritt) {
+                    const dhl_status = {
+                        0: this.delivery_status.REGISTERED,
+                        1: this.delivery_status.REGISTERED,
+                        2: this.delivery_status.IN_PREPARATION,
+                        3: this.delivery_status.IN_TRANSIT,
+                        4: this.delivery_status.OUT_FOR_DELIVERY,
+                        5: this.delivery_status.DELIVERED,
+                    };
+                    if (dhl_status[sendung.sendungsdetails.sendungsverlauf.fortschritt] !== undefined) {
+                        return dhl_status[sendung.sendungsdetails.sendungsverlauf.fortschritt];
+                    }
+                }
+                if (id === "hermes" && sendung.lastStatusId) {
+                    const hermes_status = {
+                        0: this.delivery_status.REGISTERED,
+                        1: this.delivery_status.REGISTERED,
+                        2: this.delivery_status.IN_PREPARATION,
+                        3: this.delivery_status.IN_TRANSIT,
+                        4: this.delivery_status.OUT_FOR_DELIVERY,
+                        5: this.delivery_status.DELIVERED,
+                    };
+                    if (hermes_status[sendung.lastStatusId] !== undefined) {
+                        return hermes_status[sendung.lastStatusId];
+                    }
+                }
+                if (id === "gls" && sendung.status) {
+                    const gls_status = {
+                        0: this.delivery_status.REGISTERED,
+                        1: this.delivery_status.REGISTERED,
+                        2: this.delivery_status.IN_PREPARATION,
+                        3: this.delivery_status.IN_TRANSIT,
+                        4: this.delivery_status.OUT_FOR_DELIVERY,
+                        DELIVERED: this.delivery_status.DELIVERED,
+                    };
+                    if (gls_status[sendung.lastStatusId] !== undefined) {
+                        return gls_status[sendung.lastStatusId];
+                    }
+                }
+                if (id === "amz" && sendung.detailedState && sendung.detailedState.progressTracker && sendung.detailedState.progressTracker.numberOfReachedMilestones) {
+                    const amz_status = {
+                        0: this.delivery_status.REGISTERED,
+                        1: this.delivery_status.REGISTERED,
+                        2: this.delivery_status.IN_TRANSIT,
+                        3: this.delivery_status.OUT_FOR_DELIVERY,
+                        4: this.delivery_status.DELIVERED,
+                    };
+                    if (amz_status[sendung.detailedState.progressTracker.numberOfReachedMilestones] !== undefined) {
+                        return amz_status[sendung.detailedState.progressTracker.numberOfReachedMilestones];
+                    }
+                }
+            }
+            if (sendungsObject) {
+                if (this.inDeliveryCheck(sendungsObject)) {
+                    return this.delivery_status.OUT_FOR_DELIVERY;
+                }
+                if (this.deliveredCheck(sendungsObject)) {
+                    return this.delivery_status.DELIVERED;
+                }
+            }
+
+            return this.delivery_status["UNKOWN"];
+        } catch (error) {
+            this.log.error(error);
+            return this.delivery_status["ERROR"];
+        }
+    }
 
     async activateToken(grant_token, url) {
         await this.requestClient({
@@ -1385,6 +1706,10 @@ class Parcel extends utils.Adapter {
                     this.log.error(JSON.stringify(error.response.data));
                 }
             });
+        if (!orders) {
+            this.log.warn("No Amazon orders found");
+            return;
+        }
         this.log.debug("Found " + orders.length + " Amazon Orders");
         for (const order of orders) {
             if (order.url.indexOf("http") === -1) {
@@ -1470,8 +1795,10 @@ class Parcel extends utils.Adapter {
         }
 
         this.json2iob.parse("amazon", amzResult, { forceIndex: true });
+
         this.mergeProviderJson("amz", amzResult);
         await this.setStateAsync("auth.cookie", JSON.stringify(this.cookieJar.toJSON()), true);
+        await this.setStateAsync("amazon.json", JSON.stringify(amzResult), true);
     }
     async refreshToken() {
         if (Object.keys(this.sessions).length === 0) {
@@ -1519,7 +1846,7 @@ class Parcel extends utils.Adapter {
                     });
             }
             if (id === "dpd") {
-                //  this.loginDPD(true);
+                this.loginDPD(true);
             }
             if (id === "17tuser") {
                 this.login17T(true);
@@ -1741,7 +2068,7 @@ class Parcel extends utils.Adapter {
                         });
                 }
             } else {
-                if (id.indexOf("dhl.briefe") !== -1 && id.indexOf("image_url") !== -1) {
+                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({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iobroker.parcel",
-    "version": "0.0.9",
+    "version": "0.0.12",
     "description": "Parcel tracking",
     "author": {
         "name": "TA2k",
@@ -25,18 +25,17 @@
         "url": "https://github.com/TA2k/ioBroker.parcel"
     },
     "dependencies": {
+        "@applitools/jsdom": "^1.0.4",
         "@iobroker/adapter-core": "^2.6.0",
         "axios": "^0.25.0",
-        "canvas": "^2.9.0",
-        "http-cookie-agent": "^1.0.3",
-        "jsdom": "^19.0.0",
+        "http-cookie-agent": "^1.0.5",
         "json-bigint": "^1.0.0",
         "qs": "^6.10.3",
         "tough-cookie": "^4.0.0",
         "uuid": "^8.3.2"
     },
     "devDependencies": {
-        "@iobroker/testing": "^2.5.4",
+        "@iobroker/testing": "^2.5.6",
         "@types/chai": "^4.3.0",
         "@types/chai-as-promised": "^7.1.5",
         "@types/gulp": "^4.0.9",
@@ -48,7 +47,7 @@
         "chai": "^4.3.6",
         "chai-as-promised": "^7.1.1",
         "eslint": "^7.32.0",
-        "mocha": "^9.2.1",
+        "mocha": "^9.2.2",
         "proxyquire": "^2.1.3",
         "sinon": "^12.0.1",
         "sinon-chai": "^3.7.0",