From a56649e3a7899b7c3636a53182269e9379b3dfb1 Mon Sep 17 00:00:00 2001 From: PAN Lei Date: Mon, 12 Sep 2022 22:53:50 +0200 Subject: [PATCH 1/4] add show all devices script --- show_all_devices.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 show_all_devices.js diff --git a/show_all_devices.js b/show_all_devices.js new file mode 100644 index 0000000..d7c3d3f --- /dev/null +++ b/show_all_devices.js @@ -0,0 +1,18 @@ +const {_android: android} = require('playwright'); +const {exec} = require("child_process"); +android.devices().then((devices) => { + devices.forEach((device) => { + exec("scrcpy -s " + device.serial(), (error, stdout, stderr) => { + if (error) { + console.log(`error: ${error.message}`); + return; + } + if (stderr) { + console.log(`stderr: ${stderr}`); + return; + } + console.log(`stdout: ${stdout}`); + }); + }) + +}) \ No newline at end of file From 44c096aea7b2bc4e7096691c1a39fffdf5a611b1 Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Tue, 13 Sep 2022 13:49:40 +0200 Subject: [PATCH 2/4] check page is closed or not before inputing user info with try catch --- src/workers/CommandorPage.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index cac8ade..ea4d228 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -120,9 +120,15 @@ class CommandorPage { } async fillEmail(page) { - await page.locator(EMAIL_ID).focus(); - await delay(getRandomWaitTime()) - await page.locator(EMAIL_ID).fill(this.contact.mail); + try { + if (!page.isClosed()) { + await page.locator(EMAIL_ID).focus(); + await delay(getRandomWaitTime()) + await page.locator(EMAIL_ID).fill(this.contact.mail); + } + } catch (e) { + console.log(e) + } } async inputPhoneNumber(page) { From 1ea0c04664526011b81db34b92bd01b660f5aa5f Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Tue, 13 Sep 2022 18:44:49 +0200 Subject: [PATCH 3/4] check page is closed or not before inputing user info with try catch --- src/workers/CommandorPage.js | 47 +++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index ea4d228..f2bdc7e 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -163,24 +163,47 @@ class CommandorPage { } async inputPassportId(page) { - await page.locator(PASSPORT_ID).focus() - await delay(getRandomWaitTime()) - await page.locator(PASSPORT_ID).fill(this.contact.passportNumber.toString()) + try { + if (!page.isClosed()) { + + await page.locator(PASSPORT_ID).focus() + await delay(getRandomWaitTime()) + await page.locator(PASSPORT_ID).fill(this.contact.passportNumber.toString()) + } + } catch (e) { + console.log(e); + this.isTerminated = true; + } + } async checkCGU(page) { - await page.locator(CGU_ID).focus() - await page.locator(CGU_ID).click() - await delay(getRandomWaitTime()) - await page.locator(PROCESSING_ID).focus() - await page.locator(PROCESSING_ID).click() + try { + if (!page.isClosed()) { + await page.locator(CGU_ID).focus() + await page.locator(CGU_ID).click() + await delay(getRandomWaitTime()) + await page.locator(PROCESSING_ID).focus() + await page.locator(PROCESSING_ID).click() + } + } catch (e) { + console.log(e); + this.isTerminated = true; + } } async chooseStore(page) { - await page.locator(PREFER_STORE).focus() - await delay(1000) - await page.click(PREFER_STORE); - await page.selectOption(PREFER_STORE, "faubourg"); + try { + if (!page.isClosed()) { + await page.locator(PREFER_STORE).focus() + await delay(1000) + await page.click(PREFER_STORE); + await page.selectOption(PREFER_STORE, "faubourg"); + } + } catch (e) { + console.log(e); + this.isTerminated = true; + } // await page.click(PREFER_STORE); } From 0d495701d59219a40ba602ce5150ae702ecab14f Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Tue, 13 Sep 2022 20:52:44 +0200 Subject: [PATCH 4/4] add huawei device --- clear_data.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clear_data.sh b/clear_data.sh index 146b45f..7695911 100644 --- a/clear_data.sh +++ b/clear_data.sh @@ -17,10 +17,10 @@ adb -s 76a3ac8d shell am start -n com.android.chrome/com.google.android.apps.chr adb -s 47e7e36b shell pm clear com.android.chrome adb -s 47e7e36b shell am set-debug-app --persistent com.android.chrome adb -s 47e7e36b shell am start -n com.android.chrome/com.google.android.apps.chrome.Main -#asus tab -adb -s 751005221815 shell pm clear com.android.chrome -adb -s 751005221815 shell am set-debug-app --persistent com.android.chrome -adb -s 751005221815 shell am start -n com.android.chrome/com.google.android.apps.chrome.Main +#huawei +adb -s EPHUT20825001518 shell pm clear com.android.chrome +adb -s EPHUT20825001518 shell am set-debug-app --persistent com.android.chrome +adb -s EPHUT20825001518 shell am start -n com.android.chrome/com.google.android.apps.chrome.Main #xiaomi tab adb -s 5ac879a2 shell pm clear com.android.chrome