iobroker.parcel 0.0.2 → 0.0.3

package/README.md

@@ -24,33 +24,6 @@ DHL:
 * SMS/EMail Code erhalten
 * In die Instanzeinstellungen eingeben und speichern
 
-## Amazon Vorbedingungen
-
-Es müssen auf Linuxsysteme Pakete installiert werden.
-Nach jeder Variante den Adapter neustarten um zu sehen ob der Login funktioniert.
-
-Variante #1 minimal
-
-```
-sudo apt-get install -y libnss3 libatk1.0-0 libatk-bridge2.0-0 libcups2 libdrm-dev libxkbcommon-dev libxcomposite1 libxdamage1 libxfixes3 libxrandr2 libgbm-dev libpango-1.0-0
-```
-
-Variante #2 falls Variante #1 nicht funktioniert
-
-```
-sudo apt-get install -yq \
-          gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 \
-          libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 \
-          libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 \
-          libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates \
-          fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget
- ```
-
-Variante #3 **Nur Falls Variante #2 nicht funktioniert**
-
-```
-sudo apt-get install -y chromium-browser
-```
 
 ## Skripte
 

package/admin/index_m.html

@@ -88,19 +88,25 @@
                 </div>
             </div>
             <div class="row">
-                <div class="col">Amazon (erhöhter RAM Verbrauch)</div>
-                <a href="https://github.com/TA2k/ioBroker.parcel/blob/master/README.md#amazon-vorbedingungen" target="_blank">Linux Zusatzpakete installieren</a>
+                <div class="col">Amazon</div>
             </div>
             <div class="row">
                 <div class="col s6 input-field">
                     <input type="text" class="value" id="amzusername" />
-                    <label for="amzusername" class="translate">App Email</label>
+                    <label for="amzusername" class="translate">Amazon Email</label>
                 </div>
             </div>
+
             <div class="row">
                 <div class="col s6 input-field">
                     <input type="password" class="value" id="amzpassword" />
-                    <label for="amzpassword" class="translate">App Password</label>
+                    <label for="amzpassword" class="translate">Amazon Password</label>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col s6 input-field">
+                    <input type="text" class="value" id="amzotp" />
+                    <label for="amzotp" class="translate">Amazon OTP Token falls 2FA aktiviert ist</label>
                 </div>
             </div>
             <div class="row">

package/io-package.json

@@ -1,9 +1,9 @@
 {
     "common": {
         "name": "parcel",
-        "version": "0.0.2",
+        "version": "0.0.3",
         "news": {
-            "0.0.2": {
+            "0.0.3": {
                 "en": "initial release",
                 "de": "Erstveröffentlichung",
                 "ru": "Начальная версия",
@@ -99,6 +99,7 @@
     "native": {
         "amzusername": "",
         "amzpassword": "",
+        "amzotp": "",
         "t17username": "",
         "t17password": "",
         "dpdusername": "",

package/main.js

@@ -8,7 +8,6 @@
 // you need to create an adapter
 const utils = require("@iobroker/adapter-core");
 const axios = require("axios");
-const puppeteer = require("puppeteer");
 const qs = require("qs");
 const Json2iob = require("./lib/json2iob");
 const tough = require("tough-cookie");
@@ -77,89 +76,7 @@ class Parcel extends utils.Adapter {
             this.setState("info.connection", true, true);
         }
         if (this.config.amzusername && this.config.amzpassword) {
-            this.log.info("Login to Amazon");
-            this.browser = await puppeteer
-                .launch({
-                    args: ["--no-sandbox", "--disable-setuid-sandbox"],
-                })
-                .catch((e) => {
-                    if (e.message && e.message.indexOf("Unterminated quoted string") !== -1) {
-                        this.log.warn("Puppeteer native browser is not ARM compatible. Try to start local chromium browser installed via sudo apt-get install chromium-browser");
-                    } else {
-                        this.log.error(e);
-                    }
-                });
-            //try local instance
-            if (!this.browser) {
-                this.log.info("Try to start local instance of chromium");
-                this.browser = await puppeteer
-                    .launch({
-                        args: ["--no-sandbox", "--disable-setuid-sandbox"],
-                        executablePath: "/usr/bin/chromium-browser",
-                    })
-                    .catch((e) => {
-                        this.log.error(e);
-                    });
-            }
-            if (!this.browser) {
-                this.log.error("Can't start puppeteer please execute on your ioBroker command line");
-                this.log.error(
-                    "sudo apt-get install -y libnss3 libatk1.0-0 libatk-bridge2.0-0 libcups2 libdrm-dev libxkbcommon-dev libxcomposite1 libxdamage1 libxfixes3 libxrandr2 libgbm-dev libpango-1.0-0"
-                );
-                this.log.error("More infos: https://github.com/TA2k/ioBroker.parcel/blob/master/README.md#amazon-vorbedingungen");
-                return;
-            }
-            this.page = await this.browser.newPage().catch((e) => this.log.error(e));
-            await this.page.goto("https://www.amazon.de/gp/css/order-history?ref_=nav_orders_first").catch((e) => this.log.error(e));
-            await this.page
-                .evaluate((config) => {
-                    const email = document.querySelector("#ap_email");
-                    email.value = config.amzusername;
-                    const next = document.querySelector(".a-button-input");
-                    next.click();
-                }, this.config)
-                .catch((e) => this.log.error(e));
-            await this.page.waitForSelector("#ap_password").catch((e) => this.log.error(e));
-            await this.page
-                .evaluate((config) => {
-                    const email = document.querySelector("#ap_password");
-                    email.value = config.amzpassword;
-                    const remember = document.querySelector("input[name*='rememberMe']");
-                    remember.click();
-                    const next = document.querySelector("#signInSubmit");
-                    next.click();
-                }, this.config)
-                .catch((e) => this.log.error(e));
-
-            const success = await this.page
-                .waitForSelector("#yourOrdersContent")
-                .then(() => true)
-                .catch(async (e) => {
-                    this.log.debug(await this.page.content());
-
-                    this.log.error(e);
-
-                    this.log.error("Amazon login failed. Please check your credentials and login manually");
-                    const errorHandle = await this.page.$(".a-alert-content .a-list-item");
-                    if (errorHandle) {
-                        this.log.error(await errorHandle.evaluate((node) => node.innerText));
-                    }
-                    return false;
-                });
-            if (!success) {
-                return;
-            }
-
-            await this.setObjectNotExistsAsync("amazon", {
-                type: "device",
-                common: {
-                    name: "Amazon Tracking",
-                },
-                native: {},
-            });
-            this.log.info("Login to Amazon successful");
-            this.sessions["amz"] = true;
-            this.setState("info.connection", true, true);
+            await this.loginAmz();
         }
         this.updateInterval = null;
         this.reLoginTimeout = null;
@@ -340,7 +257,7 @@ class Parcel extends utils.Adapter {
         }
     }
 
-    async loginAmzLegacy() {
+    async loginAmz() {
         const body = await this.requestClient({
             method: "get",
             url: "https://www.amazon.de/ap/signin?openid.return_to=https://www.amazon.de/ap/maplanding&openid.oa2.code_challenge_method=S256&openid.assoc_handle=amzn_mshop_ios_v2_de&openid.identity=http://specs.openid.net/auth/2.0/identifier_select&pageId=amzn_mshop_ios_v2_de&accountStatusPolicy=P1&openid.claimed_id=http://specs.openid.net/auth/2.0/identifier_select&openid.mode=checkid_setup&openid.ns.oa2=http://www.amazon.com/ap/ext/oauth/2&openid.oa2.client_id=device:32467234687368746238704723437432432&openid.oa2.code_challenge=IeFTKnKcmHEPij50cdHHCq6ZVMbFYJMQQtbrMvKbgz0&openid.ns.pape=http://specs.openid.net/extensions/pape/1.0&openid.oa2.scope=device_auth_access&openid.ns=http://specs.openid.net/auth/2.0&openid.pape.max_auth_age=0&openid.oa2.response_type=code",
@@ -383,21 +300,67 @@ class Parcel extends utils.Adapter {
         })
             .then(async (res) => {
                 this.log.debug(JSON.stringify(res.data));
+                if (res.data.indexOf("auth-mfa-otpcode") !== -1) {
+                    this.log.info("Found MFA token login");
+                    const form = this.extractHidden(res.data);
+                    form.otpCode = this.config.amzotp;
+                    form.rememberDevice = true;
+
+                    await this.requestClient({
+                        method: "post",
+                        url: "https://www.amazon.de/ap/signin",
+                        headers: {
+                            accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+                            "content-type": "application/x-www-form-urlencoded",
+                            origin: "https://www.amazon.de",
+                            "accept-language": "de-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",
+                            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));
+                            this.log.error("Login to Amazon failed, please login to Amazon and check your credentials");
+                            this.setState("info.connection", false, true);
+                        })
+                        .catch(async (error) => {
+                            if (error.response) {
+                                if (error.response.status === 404) {
+                                    this.log.info("Login to Amazon successful");
+                                    this.sessions["amz"] = true;
+                                    this.setState("info.connection", true, true);
+                                    this.setState("auth.cookie", JSON.stringify(this.cookieJar.toJSON()), true);
+                                    await this.setObjectNotExistsAsync("amazon", {
+                                        type: "device",
+                                        common: {
+                                            name: "Amazon Tracking",
+                                        },
+                                        native: {},
+                                    });
+                                    return;
+                                }
+                                this.setState("info.connection", false, true);
+                                this.log.error(JSON.stringify(error.response.data));
+                            }
+
+                            this.log.error(error);
+                        });
+                    return;
+                }
                 if (res.data.indexOf("Amazon Anmelden") !== -1) {
                     this.log.error("Login to Amazon failed, please login to Amazon and check your credentials");
                     return;
                 }
-                this.log.info("Login to Amazon successful");
-                this.sessions["amz"] = true;
-                this.setState("info.connection", true, true);
-                this.setState("auth.cookie", JSON.stringify(this.cookieJar.toJSON()), true);
-                await this.setObjectNotExistsAsync("amazon", {
-                    type: "device",
-                    common: {
-                        name: "Amazon Tracking",
-                    },
-                    native: {},
-                });
+                if (res.data.indexOf("Zurücksetzen des Passworts erforderlich") !== -1) {
+                    this.log.error("Zurücksetzen des Passworts erforderlich");
+                    return;
+                }
+                this.log.error("Login to Amazon failed, please login to Amazon and check your credentials");
+                this.setState("info.connection", false, true);
+                return;
             })
             .catch(async (error) => {
                 if (error.response) {
@@ -862,15 +825,28 @@ class Parcel extends utils.Adapter {
         this.log.debug("Get Amazon Packages");
         const amzResult = { sendungen: [] };
 
-        await this.page.goto("https://www.amazon.de/gp/css/order-history?ref_=nav_orders_first").catch((e) => this.log.error(e));
-        const orders = await this.page
-            .evaluate(() => {
+        const orders = await this.requestClient({
+            method: "get",
+            url: "https://www.amazon.de/gp/css/order-history?ref_=nav_orders_first&disableCsd=missing-library",
+            headers: {
+                accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+
+                "accept-language": "de-de",
+            },
+            jar: this.cookieJar,
+            withCredentials: true,
+        })
+            .then(async (res) => {
+                //this.log.debug(JSON.stringify(res.data));
+
+                const dom = new JSDOM(res.data);
+                const document = dom.window.document;
                 const elements = [];
                 const orders = document.querySelectorAll(".a-box.shipment");
 
                 for (const order of orders) {
                     const descHandle = order.querySelector(".a-fixed-right-grid-col.a-col-left .a-row div:first-child .a-fixed-left-grid-col.a-col-right div:first-child .a-link-normal");
-                    const desc = descHandle ? descHandle.innerText.replace(/\n +/g, "") : "";
+                    const desc = descHandle ? descHandle.textContent.replace(/\n */g, "") : "";
                     const url = order.querySelector(".track-package-button a") ? order.querySelector(".track-package-button a").getAttribute("href") : "";
                     if (url) {
                         elements.push({ desc: desc, url: url });
@@ -878,28 +854,62 @@ class Parcel extends utils.Adapter {
                 }
                 return elements;
             })
-            .catch((e) => this.log.error(e));
-        this.log.debug("found " + orders.length + " packages");
+            .catch((error) => {
+                this.log.error(error);
+                if (error.response) {
+                    this.log.error(JSON.stringify(error.response.data));
+                }
+            });
+        this.log.debug("Found " + orders.length + " Amazon Orders");
         for (const order of orders) {
             if (order.url.indexOf("http") === -1) {
                 order.url = "https://www.amazon.de" + order.url;
             }
             this.log.debug(order.url);
-            await this.page.goto(order.url).catch((e) => this.log.error(e));
-            const element = await this.page
-                .evaluate(() => {
+            order.url = order.url + "&disableCsd=missing-library";
+            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",
+                },
+                jar: this.cookieJar,
+                withCredentials: true,
+            })
+                .then(async (res) => {
+                    // this.log.debug(JSON.stringify(res.data));
+                    const dom = new JSDOM(res.data);
+                    const document = dom.window.document;
                     const statusHandle = document.querySelector(".milestone-primaryMessage.alpha") || document.querySelector(".milestone-primaryMessage") || null;
-                    const additionalStatus = document.querySelector("#primaryStatus") ? document.querySelector("#primaryStatus").innerText.replace(/\n +/g, "") : "";
-                    const secondaryStatus = document.querySelector("#secondaryStatus") ? document.querySelector("#secondaryStatus").innerText.replace(/\n +/g, "") : "";
-                    let status = statusHandle ? statusHandle.innerText.replace(/\n +/g, "") : "";
-                    status = status + " " + additionalStatus + " " + secondaryStatus;
+                    const additionalStatus = document.querySelector("#primaryStatus") ? document.querySelector("#primaryStatus").textContent.replace(/\n */g, "") : "";
+                    const secondaryStatus = document.querySelector("#secondaryStatus") ? document.querySelector("#secondaryStatus").textContent.replace(/\n */g, "") : "";
+                    let status = statusHandle ? statusHandle.textContent.replace(/\n */g, "") : "";
+                    if (!status) {
+                        status = additionalStatus;
+                    }
+                    if (additionalStatus && status !== additionalStatus) {
+                        status = status + " " + additionalStatus;
+                    }
+                    if (secondaryStatus) {
+                        status = status + " " + secondaryStatus;
+                    }
+
                     return {
-                        id: document.querySelector(".carrierRelatedInfo-trackingId-text") ? document.querySelector(".carrierRelatedInfo-trackingId-text").innerText.replace("Trackingnummer ", "") : "",
-                        name: document.querySelector(".carrierRelatedInfo-mfn-providerTitle") ? document.querySelector(".carrierRelatedInfo-mfn-providerTitle").innerText.replace(/\n +/g, "") : "",
+                        id: document.querySelector(".carrierRelatedInfo-trackingId-text")
+                            ? document.querySelector(".carrierRelatedInfo-trackingId-text").textContent.replace("Trackingnummer ", "")
+                            : "",
+                        name: document.querySelector(".carrierRelatedInfo-mfn-providerTitle") ? document.querySelector(".carrierRelatedInfo-mfn-providerTitle").textContent.replace(/\\n */g, "") : "",
                         status: status,
                     };
                 })
-                .catch((e) => this.log.error(e));
+                .catch((error) => {
+                    this.log.error(error);
+                    if (error.response) {
+                        this.log.error(JSON.stringify(error.response.data));
+                    }
+                });
+
             if (element) {
                 const orderId = qs.parse(order.url).orderId;
                 element.name = order.desc;
@@ -915,8 +925,8 @@ 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);
     }
     async refreshToken() {
         if (Object.keys(this.sessions).length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iobroker.parcel",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "description": "Parcel tracking",
     "author": {
         "name": "TA2k",
@@ -28,7 +28,6 @@
         "http-cookie-agent": "^1.0.3",
         "jsdom": "^19.0.0",
         "json-bigint": "^1.0.0",
-        "puppeteer": "^13.1.3",
         "qs": "^6.10.3",
         "tough-cookie": "^4.0.0"
     },
@@ -74,4 +73,4 @@
         "url": "https://github.com/TA2k/ioBroker.parcel/issues"
     },
     "readmeFilename": "README.md"
-}
+}