iobroker.parcel 0.2.10 → 0.3.0

package/README.md

@@ -62,6 +62,11 @@ Den Datenpunkt parcel.0.dhl.briefe....image ein "String img src" element als Obj
 <https://forum.iobroker.net/topic/51795/test-adapter-parcel-paketverfolgung-dhl-v0-0-1>
 
 ## Changelog
+### 0.3.0 (2026-04-05)
+
+- DHL: Neuer Login über Browser-Code (dhllogin://)
+- Amazon: Login Fix und Captcha-Erkennung mit Hinweis
+
 ### 0.2.10 (2025-01-15)
 
 - add alternative way for dhl login

package/admin/index_m.html

@@ -99,38 +99,24 @@
 
       <div class="row">
         <div class="col"><h5>DHL</h5></div>
-      </div>
-      <div class="row">
-        <div class="col s6 input-field">
-          <input type="text" class="value" id="dhlusername" />
-          <label for="dhlusername" class="translate">App Email</label>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col s6 input-field">
-          <input type="password" class="value" id="dhlpassword" />
-          <label for="dhlpassword" class="translate">App Password</label>
-        </div>
-      </div>
-      <div class="row">
-        <div class="col s6 input-field">
-          <input type="text" class="value" id="dhlMfa" />
-          <label for="dhlMfa" class="translate">SMS/Mail Pin nach erstem Start</label>
+        <div class="col">
+          <input type="checkbox" class="value" id="dhlActive" />
+          <label for="dhlActive" class="translate">Aktiviert</label>
         </div>
       </div>
       <div class="row">
         <div class="col s6 input-field" id="captchaResponse">
-          If normal login is not working alternate DHL login method is available
+          Login über Browser-Code:
           <p></p>
-          1. Open the Url below in Chrome and login with your account
+          1. Unten auf den Link klicken und im CHROME Browser einloggen
           <p></p>
-          2. Open Developer Console F12 or Option + Command + I
+          2. Developer Console öffnen: F12 oder Option + Command + I
           <p></p>
-          3. You see a failed redirect in the Console copy the dhllogin:// url
+          3. Im Console-Tab die fehlgeschlagene Weiterleitung sehen und die dhllogin:// URL kopieren
           <p></p>
           <img src="copyurl.png" style="width: 30rem" />
           <p></p>
-          4. Paste the url in the input field below
+          4. Die URL unten einfügen und speichern
 
           <p></p>
           <p></p>
@@ -138,7 +124,7 @@
             href="https://login.dhl.de/af5f9bb6-27ad-4af4-9445-008e7a5cddb8/login/authorize?redirect_uri=dhllogin://de.deutschepost.dhl/login&state=eyJycyI6dHJ1ZSwicnYiOmZhbHNlLCJmaWQiOiJhcHAtbG9naW4tbWVoci1mb290ZXIiLCJoaWQiOiJhcHAtbG9naW4tbWVoci1oZWFkZXIiLCJycCI6ZmFsc2V9&client_id=83471082-5c13-4fce-8dcb-19d2a3fca413&response_type=code&scope=openid%20offline_access&claims=%7B%22id_token%22:%7B%22email%22:null,%22post_number%22:null,%22twofa%22:null,%22service_mask%22:null,%22deactivate_account%22:null,%22last_login%22:null,%22customer_type%22:null,%22display_name%22:null,%22data_confirmation_required%22:null%7D%7D&nonce=&login_hint=&prompt=login&ui_locales=de-DE&code_challenge=MAhrhXXZP-Owy-R7ruyB7Fn-Z8ODW6qxCoHg4uXELCw&code_challenge_method=S256"
             target="_blank"
             style="color: red !important"
-            >DHL Login Url CLICK HERE</a
+            >DHL Login URL HIER KLICKEN</a
           >
           <p></p>
           <input type="text" class="value" id="dhlCode" placeholder="dhllogin://de.deutschepost.dhl/login?code=Jqbzy3wbJ..." />
@@ -147,6 +133,10 @@
       </div>
       <div class="row">
         <div class="col"><h5>Amazon</h5></div>
+        <div class="col">
+          <input type="checkbox" class="value" id="amzActive" />
+          <label for="amzActive" class="translate">Aktiviert</label>
+        </div>
       </div>
       <div class="row">
         <div class="col s6 input-field">
@@ -167,8 +157,32 @@
           <label for="amzotp" class="translate">Amazon OTP Token vor dem Login eingeben. 2FA Aktivierung ist Empfohlen.</label>
         </div>
       </div>
+      <div class="row">
+        <div class="col s6">
+          <div>
+            <input type="checkbox" class="value" id="amzResetCookies" />
+            <label for="amzResetCookies" class="translate">Amazon Cookies beim nächsten Start löschen (bei Login-Problemen)</label>
+          </div>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col s6 input-field">
+          Um den Login zu erleichtern oder Captchas zu verhindern, einmal im Browser abmelden und mit Passwort einloggen:
+          <p></p>
+          <a
+            href="https://www.amazon.de/ap/signin?_encoding=UTF8&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.return_to=https%3A%2F%2Fwww.amazon.de&switch_account=signin&ignoreAuthState=1&disableLoginPrepopulate=1"
+            target="_blank"
+            style="color: red !important"
+            >Amazon Login CLICK HERE</a
+          >
+        </div>
+      </div>
       <div class="row">
         <div class="col"><h5>DPD</h5></div>
+        <div class="col">
+          <input type="checkbox" class="value" id="dpdActive" />
+          <label for="dpdActive" class="translate">Aktiviert</label>
+        </div>
       </div>
       <div class="row">
         <div class="col s6 input-field">
@@ -184,6 +198,10 @@
       </div>
       <div class="row">
         <div class="col"><h5>GLS</h5></div>
+        <div class="col">
+          <input type="checkbox" class="value" id="glsActive" />
+          <label for="glsActive" class="translate">Aktiviert</label>
+        </div>
       </div>
       <div class="row">
         <div class="col s6 input-field">
@@ -199,6 +217,10 @@
       </div>
       <div class="row">
         <div class="col"><h5>Hermes</h5></div>
+        <div class="col">
+          <input type="checkbox" class="value" id="hermesActive" />
+          <label for="hermesActive" class="translate">Aktiviert</label>
+        </div>
       </div>
       <div class="row">
         <div class="col s6 input-field">
@@ -214,6 +236,10 @@
       </div>
       <div class="row">
         <div class="col"><h5>UPS</h5></div>
+        <div class="col">
+          <input type="checkbox" class="value" id="upsActive" />
+          <label for="upsActive" class="translate">Aktiviert</label>
+        </div>
       </div>
       <div class="row">
         <div class="col s6 input-field">
@@ -229,6 +255,10 @@
       </div>
       <div class="row">
         <div class="col"><h5>17Track Normal User</h5></div>
+        <div class="col">
+          <input type="checkbox" class="value" id="t17Active" />
+          <label for="t17Active" class="translate">Aktiviert</label>
+        </div>
       </div>
       <div class="row">
         <div class="col s6 input-field">
@@ -245,6 +275,9 @@
       <div class="row">
         <div class="col">
           <div><h5>17Track</h5></div>
+          <input type="checkbox" class="value" id="t17ApiActive" />
+          <label for="t17ApiActive" class="translate">Aktiviert</label>
+          <p></p>
           <a href="https://api.17track.net/en/admin/settings" target="_blank">Register HERE to receive a API Key</a>
         </div>
       </div>

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "parcel",
-    "version": "0.2.10",
+    "version": "0.3.0",
     "news": {
+      "0.3.0": {
+        "en": "DHL: Neuer Login über Browser-Code (dhllogin://)\nAmazon: Login Fix und Captcha-Erkennung mit Hinweis",
+        "de": "DHL: Neuer Login über Browser-Code (dhllogin://)\nAmazon: Login Fix und Captcha-Erkennung mit Hinweis",
+        "ru": "DHL: Neuer Login über Browser-Code (dhllogin://)\nAmazon: Login Fix und Captcha-Erkennung mit Hinweis",
+        "pt": "DHL: Neuer Login über Browser-Code (dhllogin://)\nAmazon: Login Fix und Captcha-Erkennung mit Hinweis",
+        "nl": "DHL: Neuer Login über Browser-Code (dhllogin://)\nAmazon: Login Fix und Captcha-Erkennung mit Hinweis",
+        "fr": "DHL: Neuer Login über Browser-Code (dhllogin://)\nAmazon: Connexion Fix und Captcha-Erkennung mit Hinweis",
+        "it": "DHL: Neuer Login über Browser-Code (dhllogin://)\nAmazon: Login Fix und Captcha-Erkennung mit Hinweis",
+        "es": "DHL: Neuer Login über Browser-Code (dhllogin://)\nAmazon: Acceder Fijar und Captcha-Erkennung mit Hinweis",
+        "pl": "DHL: Neuer Login über Browser- Code (dhllogin: / /)\nAmazon: Login Fix und Captcha- Erkennung mit Hinweis",
+        "uk": "DHL: Нейєр Логін über Browser-Code (dhllogin://)\nУкраїнська Русский English",
+        "zh-cn": "DHL: Neuer Login über 浏览器-代码 (dhllogin://)\n亚马逊:登录 修复 und Captcha- Erkennung mit Hinweis 系统"
+      },
       "0.2.10": {
         "en": "add alternative way for dhl login\nmove dhl connections error to info level",
         "de": "alternative möglichkeit für dhl anmelden\ndhl-verbindungen fehler auf info-ebene verschieben",
@@ -62,10 +75,6 @@
       "0.2.6": {
         "en": "Improve DHL Status and add link to shipment in the telegram notification",
         "de": "Verbesserung des DHL Status und Link zur Sendung in der Telegram Benachrichtigung hinzugefügt"
-      },
-      "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"
       }
     },
     "title": "Parcel tracking",
@@ -142,7 +151,6 @@
     ]
   },
   "encryptedNative": [
-    "dhlpassword",
     "amzpassword",
     "dpdpassword",
     "t17password",
@@ -153,7 +161,6 @@
     "glspassword"
   ],
   "protectedNative": [
-    "dhlpassword",
     "amzpassword",
     "dpdpassword",
     "t17password",
@@ -164,6 +171,14 @@
     "glspassword"
   ],
   "native": {
+    "dhlActive": true,
+    "amzActive": true,
+    "dpdActive": true,
+    "glsActive": true,
+    "upsActive": true,
+    "hermesActive": true,
+    "t17Active": true,
+    "t17ApiActive": true,
     "amzusername": "",
     "amzpassword": "",
     "aliUsername": "",
@@ -180,14 +195,12 @@
     "postatusername": "",
     "postatpassword": "",
     "amzotp": "",
+    "amzResetCookies": false,
     "t17username": "",
     "t17password": "",
     "dpdusername": "",
     "dpdpassword": "",
-    "dhlusername": "",
-    "dhlpassword": "",
     "dhlCode": "",
-    "dhlMfa": "",
     "17trackKey": "",
     "sendToActive": false,
     "noFirstStartSend": false,
@@ -300,18 +313,6 @@
       },
       "native": {}
     },
-    {
-      "_id": "auth.dhlMfaToken",
-      "type": "state",
-      "common": {
-        "role": "state",
-        "name": "DHL Mfa Token",
-        "type": "string",
-        "read": true,
-        "write": false
-      },
-      "native": {}
-    },
     {
       "_id": "auth.cookie",
       "type": "state",

package/lib/dhlLogin.js

@@ -0,0 +1,70 @@
+'use strict';
+
+const qs = require('qs');
+
+// Fixed PKCE pair matching the login URL in admin settings
+const CODE_VERIFIER = 'zmVs5AKfGvv45a9aUvuOid9a_erOirp7XL1sn9kWT_o';
+
+/**
+ * DHL Login via dhllogin:// code (manual browser flow).
+ * User opens the DHL login URL in browser, logs in, copies the dhllogin:// redirect URL.
+ *
+ * @param {object} options
+ * @param {function} options.requestClient - axios-like request function
+ * @param {string} options.dhlCode - dhllogin://de.deutschepost.dhl/login?code=...
+ * @param {object} [options.log] - logger with .info/.debug/.error/.warn
+ * @returns {Promise<object|null>} session data (with id_token, refresh_token, etc.) or null on failure
+ */
+async function loginDhlNew({ requestClient, dhlCode, log }) {
+  if (!log) {
+    log = { info: console.log, debug: console.log, error: console.error, warn: console.warn };
+  }
+
+  if (!dhlCode || !dhlCode.startsWith('dhllogin://')) {
+    log.error('No valid dhllogin:// code provided. Please use the login button in adapter settings.');
+    return null;
+  }
+
+  const codeUrl = qs.parse(dhlCode.split('?')[1]);
+  if (!codeUrl.code) {
+    log.error('No code found in dhllogin:// URL');
+    return null;
+  }
+
+  const sessionData = await 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) => {
+      log.debug(JSON.stringify(res.data));
+      log.info('Login to DHL successful');
+      return res.data;
+    })
+    .catch((error) => {
+      log.error(error);
+      if (error.response) {
+        log.error(JSON.stringify(error.response.data));
+      }
+      return null;
+    });
+
+  return sessionData;
+}
+
+module.exports = { loginDhlNew };

package/lib/tools.js

@@ -65,7 +65,7 @@ async function translateYandex(text, targetLang, apiKey) {
     }
     throw new Error('Invalid response for translate request');
   } catch (e) {
-    throw new Error(`Could not translate to "${targetLang}": ${e}`);
+    throw new Error(`Could not translate to "${targetLang}": ${e}`, { cause: e });
   }
 }
 
@@ -88,9 +88,9 @@ async function translateGoogle(text, targetLang) {
     throw new Error('Invalid response for translate request');
   } catch (e) {
     if (e.response && e.response.status === 429) {
-      throw new Error(`Could not translate to "${targetLang}": Rate-limited by Google Translate`);
+      throw new Error(`Could not translate to "${targetLang}": Rate-limited by Google Translate`, { cause: e });
     } else {
-      throw new Error(`Could not translate to "${targetLang}": ${e}`);
+      throw new Error(`Could not translate to "${targetLang}": ${e}`, { cause: e });
     }
   }
 }