From 46af10ceac9583aeaf15c3f7f798c2a0e8fb48df Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Sat, 4 Mar 2023 13:28:10 +0100 Subject: [PATCH 01/12] can slide when blocked by captcha --- package.json | 2 + src/excel/ExcelUtil.js | 5 +- src/models/Position.js | 7 ++ src/workers/CommandorPage.js | 30 ++++--- src/workers/GeoCaptchaSolver.js | 4 +- src/workers/SlidingCaptchaSolver.js | 120 ++++++++++++++++++++++++++++ 6 files changed, 154 insertions(+), 14 deletions(-) create mode 100644 src/models/Position.js create mode 100644 src/workers/SlidingCaptchaSolver.js diff --git a/package.json b/package.json index ea750ec..bb97f21 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,8 @@ "node-xlsx": "^0.21.0", "playwright": "1.23.0", "read-ini-file": "^3.0.1", + "uuid": "^9.0.0", + "image-size": "^1.0.2", "winston": "^3.8.2", "yarn": "^1.22.19" }, diff --git a/src/excel/ExcelUtil.js b/src/excel/ExcelUtil.js index b1d336c..8b4a7c0 100644 --- a/src/excel/ExcelUtil.js +++ b/src/excel/ExcelUtil.js @@ -10,7 +10,10 @@ class ExcelUtil { (info, index, list) => { if (index > 0 && info.length > 0) { // console.log(info) - let name = info[0].split(" ") + if (info[0].includes("Aijing")){ + console.log("found"); + } + let name = info[0].trim().split(" ") let firstName = name[1]; let lastName = name[0]; let phoneNumber = info[1]; diff --git a/src/models/Position.js b/src/models/Position.js new file mode 100644 index 0000000..fe33771 --- /dev/null +++ b/src/models/Position.js @@ -0,0 +1,7 @@ +class Position { + constructor(x, y) { + this.x = x; + this.y = y; + } +} +module.exports = Position \ No newline at end of file diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index f9ae6fd..55f13ca 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -7,6 +7,7 @@ const { shell } = require('electron') const GeoCaptchaSolver = require("./GeoCaptchaSolver"); +const SlidingCaptchaSolver = require("./SlidingCaptchaSolver"); // const RDV_URL = "http://192.168.0.41:8000/test_appointment.html" const RDV_URL = "https://rendezvousparis.hermes.com/client/register"; const BLANK_URL = "about:blank" @@ -36,7 +37,7 @@ const CAPTCHA_ERROR_MESSAGE = "Error verifying captcha, please try again" const CAPTCHA_ERROR_MESSAGE_FR = "La vérification du captcha a échoué" const REGEX_RDV_URL = "https:\/\/rendezvousparis\.hermes\.com\/client\/register\/[A-Z0-9]+" const DEFAULT_STORE = 'faubourg'; -const searchTexts = ['hermes+rdv', 'hermes+rendezvous', 'hermes+appointment', 'hermes+appointment+online', 'appointment+hermes', 'hermes+rendez+vous','hermes+rendez+vous+paris', 'online+appointment+hermes', 'hermes+online+appointment', 'paris+hermes+online+appointment'] +const searchTexts = ['hermes+rdv', 'hermes+rendezvous', 'hermes+appointment', 'hermes+appointment+online', 'appointment+hermes', 'hermes+rendez+vous', 'hermes+rendez+vous+paris', 'online+appointment+hermes', 'hermes+online+appointment', 'paris+hermes+online+appointment'] function delay(delayInMs) { return new Promise(resolve => { @@ -96,7 +97,6 @@ class CommandorPage { try { const item = searchTexts[Math.floor(Math.random() * searchTexts.length)]; await this.page.goto("https://www.google.com/search?q=" + item + "&lr=lang_en", {timeout: 90 * 1000}); - // await this.page.goto(RDV_URL, {timeout: 90 * 1000}); } catch (e) { log(e) this.isTerminated = true @@ -117,7 +117,9 @@ class CommandorPage { this.page.locator(':nth-match(:text("Online Appointment"), 1)').click() } catch (e) { log(e) - this.isTerminated = true + if (!this.page.url().includes(RDV_URL)) { + this.isTerminated = true; + } } let cancel @@ -386,20 +388,26 @@ class CommandorPage { async checkAudioBtn() { let isBlocked = await this.isBlocked() if (!isBlocked) { - let audioBtn = await this.page.frameLocator("iframe").locator("#captcha__audio__button"); - log("audioBtn found") - audioBtn.click() - let captchaSolver = new GeoCaptchaSolver(this.page, this.device, this.isTerminated) - await captchaSolver.solve((isSuccessful) => { - if (!isSuccessful) { - this.isTerminated = true + //try to sliding capthca at first + let slidingCaptchaSolver = new SlidingCaptchaSolver(this.device); + await slidingCaptchaSolver.solve(this.page, async (isSuccessful) => { + let isAlwaysBlocked = await this.isBlocked(); + if (isAlwaysBlocked) { + let audioBtn = await this.page.frameLocator("iframe").locator("#captcha__audio__button"); + log("audioBtn found") + audioBtn.click() + let captchaSolver = new GeoCaptchaSolver(this.page, this.device, this.isTerminated) + await captchaSolver.solve((isSuccessful) => { + if (!isSuccessful) { + this.isTerminated = true + } + }) } }) } else { log("audioBtn not found") console.log("audioBtn not found") console.log("we are blocked") - // await this.resetBrowser() } } diff --git a/src/workers/GeoCaptchaSolver.js b/src/workers/GeoCaptchaSolver.js index 8eba16f..2f48b01 100644 --- a/src/workers/GeoCaptchaSolver.js +++ b/src/workers/GeoCaptchaSolver.js @@ -60,7 +60,7 @@ async function sendRequest(fileName, callback) { } } -class GeoCaptchaSolver { +class AudioCaptchaSolver { constructor(page, device, isTerminated) { this.page = page; this.isTerminated = isTerminated @@ -170,4 +170,4 @@ class GeoCaptchaSolver { } -module.exports = GeoCaptchaSolver +module.exports = AudioCaptchaSolver diff --git a/src/workers/SlidingCaptchaSolver.js b/src/workers/SlidingCaptchaSolver.js new file mode 100644 index 0000000..2ca0037 --- /dev/null +++ b/src/workers/SlidingCaptchaSolver.js @@ -0,0 +1,120 @@ +const fs = require("fs"); +const {exec} = require("child_process"); + +const {promisify} = require('util') +const Position = require("../models/Position"); + +const sizeOf = promisify(require('image-size')); + +const axios = require("axios"); +const {v4: uuidv4} = require('uuid'); + +const DEEPLEARNING_CAPTCHA_HOST = "http://appointment.lpaconsulting.fr:9000" + +function delay(delayInMs) { + return new Promise(resolve => { + setTimeout(() => { + resolve(2); + }, delayInMs); + }); +} + +function randomIntFromInterval(min, max) { // min and max included + return Math.floor(Math.random() * (max - min + 1) + min) +} + +const positionInfo = new Map(); + +positionInfo.set("2109119DG", new Position(211, 1710)) +positionInfo.set("ONEPLUS A6000", new Position(211, 1706)) +positionInfo.set("SM-C5000", new Position(180, 1794)) + +class SlidingCaptchaSolver { + constructor(device) { + this.device = device; + } + + async solve(page, onResult) { + await this.sliding_captcha(this.device, onResult) + } + + async take_screen_shot(name, device) { + // let stdout1 = await exec("adb -s " + device.serial() + " shell screencap -p /sdcard/" + name) + let stdout1 = await exec("adb -s " + device.serial() + " exec-out screencap -p > " + name) + await delay(1000); + console.log(`stdout: ${stdout1}`); + } + + + async sliding_captcha(device, onResult) { +// take screenshot + let blockedFileName = uuidv4(); + let blockedImageFileName = "blocked_" + blockedFileName + await this.take_screen_shot(blockedImageFileName, device) + //get resolution of screen + let dimensions = await sizeOf(blockedImageFileName) + console.log(dimensions.width, dimensions.height); + await this.sendRequest(blockedImageFileName, async (detectedPosition) => { + console.log("detectedPosition is " + detectedPosition); + let startPosition = positionInfo.get(device.model()) + if (startPosition === undefined) { + startPosition = new Position(210, dimensions.height * 0.7125) + } + if (startPosition !== undefined) { + let y0 = startPosition.y; + let x0 = startPosition.x; + let x1 = detectedPosition.x1; + let x2 = detectedPosition.x2; + let width = x2 - detectedPosition.x1; + let randomTime = randomIntFromInterval(100, 500) + let cmd = `adb -s ${device.serial()} shell input swipe ${x0} ${y0} ${x1 + width * 0.8} ${y0} ${1000 + randomTime}` + await delay(2000); + console.log("cmd is " + cmd); + console.log("will slide captcha"); + await exec(cmd); + await delay(3000); + onResult(true); + } else { + console.log("startPosition not found for " + device.model()) + onResult(false); + } + }) + + } + + async sendRequest(fileName, callback) { + const fileStream = fs.createReadStream(fileName); + let response = await axios.post(DEEPLEARNING_CAPTCHA_HOST, fileStream, { + headers: { + 'Content-Type': 'wav', + 'Authorization': 'Bearer 97e36f7e-340e-4c02-b329-9415faee38c3' + }, + timeout: 90 * 1000 + }).catch(err => { + console.log(err.code); + console.log(err.stack); + console.log(err.message); + callback([]); + }) + if (response === undefined) { + await callback({}); + return + } + if (response.status === 200) { + let result = response.data; + console.log(result); + await callback(result); + // console.log("will delete png file: " + fileName); + // await fs.unlink(fileName, (err) => { + // if (err) throw err; + // console.log(fileName + ' was deleted'); + // }) + } else { + console.log("error"); + await callback({}); + console.log("will delete wav file: " + fileName); + } + } +} + +module.exports = SlidingCaptchaSolver \ No newline at end of file From db21a699261a54883221cae0a8e87a514bd54ece Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Tue, 11 Apr 2023 16:23:44 +0200 Subject: [PATCH 02/12] do not duplicate contacts --- src/appointment.js | 6 ++- src/workers/CommandorPage.js | 25 ++++++----- src/workers/SlidingCaptchaSolver.js | 66 ++++++++++++++++------------- 3 files changed, 56 insertions(+), 41 deletions(-) diff --git a/src/appointment.js b/src/appointment.js index dbd69d1..c7f6a68 100644 --- a/src/appointment.js +++ b/src/appointment.js @@ -10,7 +10,8 @@ const SEVEN_DAYS_IN_S = 3600 * 24 * 7; const NINETY_DAYS_IN_S = 3600 * 24 * 30 * 3; let excelUtil = new ExcelUtil(); let collectionName = formatDate(new Date()) -device_to_excludes = ["47e7e36b", "e30eb015"] +// device_to_excludes = ["47e7e36b", "e30eb015"] +device_to_excludes = ["47e7e36b"] async function filterAlreadyBookedContacts(contactList) { let alreadyBookedContacts = await mongoManager.getAllSuccessfulItemsForDay(collectionName); @@ -123,7 +124,8 @@ async function startBook(contactPojo, device, selectedStore, audioAnalyse, alert } async function startWithList(contacts, device, selectedStore, audioAnalyse, alertBeep) { - let duplicatedList = [].concat(contacts).concat(contacts).concat(contacts) + // let duplicatedList = [].concat(contacts).concat(contacts).concat(contacts) + let duplicatedList = [].concat(contacts) await duplicatedList.reduce(async (promise, contactPojo) => { // This line will wait for the last async function to finish. // The first iteration uses an already resolved Promise diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index 55f13ca..c15f7e7 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -182,7 +182,7 @@ class CommandorPage { if (!page.isClosed()) { if (!this.isPhoneInput) { await page.locator(PHONE_NUMBER).focus(); - await page.locator(PHONE_NUMBER).fill("0" + this.contact.phoneNumber); + await page.locator(PHONE_NUMBER).fill("+330" + this.contact.phoneNumber); this.isPhoneInput = true; } } @@ -391,17 +391,10 @@ class CommandorPage { //try to sliding capthca at first let slidingCaptchaSolver = new SlidingCaptchaSolver(this.device); await slidingCaptchaSolver.solve(this.page, async (isSuccessful) => { + console.log("check isAlwaysBlocked") let isAlwaysBlocked = await this.isBlocked(); if (isAlwaysBlocked) { - let audioBtn = await this.page.frameLocator("iframe").locator("#captcha__audio__button"); - log("audioBtn found") - audioBtn.click() - let captchaSolver = new GeoCaptchaSolver(this.page, this.device, this.isTerminated) - await captchaSolver.solve((isSuccessful) => { - if (!isSuccessful) { - this.isTerminated = true - } - }) + await this.resolveByAudio(); } }) } else { @@ -412,6 +405,18 @@ class CommandorPage { } } + async resolveByAudio() { + let audioBtn = await this.page.frameLocator("iframe").locator("#captcha__audio__button"); + log("audioBtn found") + audioBtn.click() + let captchaSolver = new GeoCaptchaSolver(this.page, this.device, this.isTerminated) + await captchaSolver.solve((isSuccessful) => { + if (!isSuccessful) { + this.isTerminated = true + } + }) + } + async onResponse(response) { // let rex = new RegExp(REGEX_RDV_URL) // log("onResponse with url:" + response.url()) diff --git a/src/workers/SlidingCaptchaSolver.js b/src/workers/SlidingCaptchaSolver.js index 2ca0037..7b8bf85 100644 --- a/src/workers/SlidingCaptchaSolver.js +++ b/src/workers/SlidingCaptchaSolver.js @@ -40,43 +40,52 @@ class SlidingCaptchaSolver { async take_screen_shot(name, device) { // let stdout1 = await exec("adb -s " + device.serial() + " shell screencap -p /sdcard/" + name) - let stdout1 = await exec("adb -s " + device.serial() + " exec-out screencap -p > " + name) + console.log("take screenshot " + name); + await device.screenshot({path: name}); + // let stdout1 = await exec("adb -s " + device.serial() + " exec-out screencap -p > " + name) await delay(1000); - console.log(`stdout: ${stdout1}`); + // console.log(`stdout: ${stdout1}`); } async sliding_captcha(device, onResult) { // take screenshot + console.log("take screenshot") let blockedFileName = uuidv4(); - let blockedImageFileName = "blocked_" + blockedFileName + let blockedImageFileName = "blocked_" + blockedFileName + ".png" await this.take_screen_shot(blockedImageFileName, device) //get resolution of screen - let dimensions = await sizeOf(blockedImageFileName) - console.log(dimensions.width, dimensions.height); - await this.sendRequest(blockedImageFileName, async (detectedPosition) => { - console.log("detectedPosition is " + detectedPosition); - let startPosition = positionInfo.get(device.model()) - if (startPosition === undefined) { - startPosition = new Position(210, dimensions.height * 0.7125) - } - if (startPosition !== undefined) { - let y0 = startPosition.y; - let x0 = startPosition.x; - let x1 = detectedPosition.x1; - let x2 = detectedPosition.x2; - let width = x2 - detectedPosition.x1; - let randomTime = randomIntFromInterval(100, 500) - let cmd = `adb -s ${device.serial()} shell input swipe ${x0} ${y0} ${x1 + width * 0.8} ${y0} ${1000 + randomTime}` - await delay(2000); - console.log("cmd is " + cmd); - console.log("will slide captcha"); - await exec(cmd); - await delay(3000); - onResult(true); + await this.sendRequest(blockedImageFileName, async (detectedPositionList) => { + console.log("detectedPosition is " + detectedPositionList); + if (detectedPositionList.length === 2) { + // #xiaomi + let startPosition = detectedPositionList.filter((positionInfo) => { + return positionInfo.label === "origin" + })[0] + let targetPosition = detectedPositionList.filter((positionInfo) => { + return positionInfo.label === "target" + })[0] + if (startPosition !== undefined) { + let y0 = (startPosition.y2 + startPosition.y1) / 2.0; + let x0 = (startPosition.x2 + startPosition.x1) / 2.0; + let y1 = (targetPosition.y2 + targetPosition.y1) / 2.0; + let x1 = (targetPosition.x2 + targetPosition.x1) / 2.0; + let width = targetPosition.x2 - targetPosition.x1; + let randomTime = randomIntFromInterval(100, 500) + let cmd = `adb -s ${device.serial()} shell input swipe ${x0} ${y0} ${x1 + width * 0.5} ${y0} ${1000 + randomTime}` + await delay(2000); + console.log("cmd is " + cmd); + console.log("will slide captcha"); + await exec(cmd); + await delay(5000); + onResult(true) + } else { + console.log("startPosition not found for " + device.model()) + onResult(false) + } } else { console.log("startPosition not found for " + device.model()) - onResult(false); + onResult(false) } }) @@ -89,7 +98,7 @@ class SlidingCaptchaSolver { 'Content-Type': 'wav', 'Authorization': 'Bearer 97e36f7e-340e-4c02-b329-9415faee38c3' }, - timeout: 90 * 1000 + timeout: 30 * 1000 }).catch(err => { console.log(err.code); console.log(err.stack); @@ -111,8 +120,7 @@ class SlidingCaptchaSolver { // }) } else { console.log("error"); - await callback({}); - console.log("will delete wav file: " + fileName); + await callback([]); } } } From 66209894d69c1490c9728acd3405941532558707 Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Fri, 14 Apr 2023 12:29:09 +0200 Subject: [PATCH 03/12] handle french blocke ,msg --- src/workers/CommandorPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index c15f7e7..b3811cc 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -342,7 +342,7 @@ class CommandorPage { let captcha_container = await iframeHandler.locator(CAPTCHA_CONTAINER) let html = await captcha_container.innerHTML() console.log("audio_tag: " + html); - return html.includes("You have been blocked") + return html.includes("You have been blocked") || html.includes("Vous avez été bloqué") } async onPageLoad(currentPage) { From 087a847d98a8cae73c04cc58c4c5018da0556f6f Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Thu, 20 Apr 2023 19:32:11 +0200 Subject: [PATCH 04/12] try to save data while onResponse --- clear_data.sh | 4 ---- src/workers/CommandorPage.js | 17 +++++++++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/clear_data.sh b/clear_data.sh index 744840f..bb2c533 100644 --- a/clear_data.sh +++ b/clear_data.sh @@ -13,10 +13,6 @@ adb -s 07f9c883 shell am start -n com.android.chrome/com.google.android.apps.chr adb -s 76a3ac8d shell pm clear com.android.chrome adb -s 76a3ac8d shell am set-debug-app --persistent com.android.chrome adb -s 76a3ac8d shell am start -n com.android.chrome/com.google.android.apps.chrome.Main -#xiao mi -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 #huawei adb -s EPHUT20825001518 shell pm clear com.android.chrome adb -s EPHUT20825001518 shell am set-debug-app --persistent com.android.chrome diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index b3811cc..a8029e3 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -418,16 +418,21 @@ class CommandorPage { } async onResponse(response) { - // let rex = new RegExp(REGEX_RDV_URL) - // log("onResponse with url:" + response.url()) - // if (rex.test(response.url())) { - // log("rdv url found:" + response.url()) - // await this.push_message_to_db(PublishType.SUCCESS, response.url()) - // } + let rex = new RegExp(REGEX_RDV_URL) + log("onResponse with url:" + response.url()) + // log("onResponse with url:" + response.body()) + if (rex.test(response.url())) { + log("rdv url found:" + response.url()) + await this.push_message_to_db(PublishType.SUCCESS, response.url()) + } } async push_message_to_queue(publishType) { let url = this.page.url(); + await this.push_message_to_db(publishType, url) + } + + async push_message_to_db(publishType, url) { let splitedUrl = url.split("/"); let id = splitedUrl[splitedUrl.length - 1]; if (url === "https://rendezvousparis.hermes.com/client/welcome") { From 29e8448f0f0f3c7405bbed6ab955421cc1473111 Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Fri, 21 Apr 2023 15:56:07 +0200 Subject: [PATCH 05/12] correction on save result --- src/workers/CommandorPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index a8029e3..c0ae618 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -439,7 +439,7 @@ class CommandorPage { return } // save to mongoDb - let reserve = ReserveResultPojo.create_from_contact(this.contact, id, this.page.url(), this.choosedStore, publishType); + let reserve = ReserveResultPojo.create_from_contact(this.contact, id, url, this.choosedStore, publishType); reserve.source_from = this.device.model(); await this.mongoManager.saveReserveToDb(reserve.to_mongo_dict()) await this.deleteFromBlackList() From 5800c599481b4140ac0dc5d8b50b930f156482ac Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Sat, 22 Apr 2023 10:18:44 +0200 Subject: [PATCH 06/12] add logWithDevice method --- src/workers/CommandorPage.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index bbc32c9..e22feef 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -60,6 +60,10 @@ function log(message) { appointmentLogger.log({level: "info", message: message}) } +function logWithDevice(message, device) { + appointmentLogger.log({level: "info", device: device.model(), message: message}) +} + class CommandorPage { constructor(contact, device, mongoManager, selectedStore = DEFAULT_STORE, audioAnalyse = false, alertBeep = false) { this.contact = contact; @@ -374,7 +378,10 @@ class CommandorPage { shell.beep() } } - log("发现datadome"); + logWithDevice("发现datadome", this.device); + } else if (content.includes("502 Bad Gateway")) { + logWithDevice("502 Bad Gateway found", this.device) + await this.page.reload() } else if (currentPage.url().includes("sorry")) { await this.resetBrowser() } else { From d46d424c28c61e720e33b9b0a0aef00bd300ebf9 Mon Sep 17 00:00:00 2001 From: PAN Lei Date: Sat, 22 Apr 2023 10:22:26 +0200 Subject: [PATCH 07/12] handle proxy error --- src/workers/CommandorPage.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index e22feef..6498e3e 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -384,6 +384,14 @@ class CommandorPage { await this.page.reload() } else if (currentPage.url().includes("sorry")) { await this.resetBrowser() + } else if (content.includes("PROXY_CONNECTION_FAILED")) { + logWithDevice("PROXY_CONNECTION_FAILED, will reload page", this.device); + await delay(2000) + await this.page.reload() + } else if (content.includes("ERR_NETWORK_CHANGED")) { + logWithDevice("ERR_NETWORK_CHANGED, will reload page", this.device); + await delay(2000) + await this.page.reload() } else { if (currentPage.url() === RDV_URL) { await this.fillFields(this.page); From 286daf569fa848ef7fe59327514f8f50d5822294 Mon Sep 17 00:00:00 2001 From: PAN Lei Date: Sat, 22 Apr 2023 10:51:32 +0200 Subject: [PATCH 08/12] handle ERR_TIMED_OUT error --- src/workers/CommandorPage.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index 6498e3e..bbaec77 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -392,6 +392,10 @@ class CommandorPage { logWithDevice("ERR_NETWORK_CHANGED, will reload page", this.device); await delay(2000) await this.page.reload() + } else if (content.includes("ERR_TIMED_OUT")) { + logWithDevice("ERR_TIMED_OUT, will reload page", this.device); + await delay(2000) + await this.page.reload() } else { if (currentPage.url() === RDV_URL) { await this.fillFields(this.page); From dc5aeeab07cd13b1f64af5afa2949e45e02740b7 Mon Sep 17 00:00:00 2001 From: PAN Lei Date: Sat, 22 Apr 2023 11:11:38 +0200 Subject: [PATCH 09/12] handle Request Time-out error --- src/workers/CommandorPage.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index bbaec77..722e356 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -396,6 +396,10 @@ class CommandorPage { logWithDevice("ERR_TIMED_OUT, will reload page", this.device); await delay(2000) await this.page.reload() + } else if (content.includes("408 Request Time-out")) { + logWithDevice("Request Time-out, will reload page", this.device); + await delay(2000) + await this.page.reload() } else { if (currentPage.url() === RDV_URL) { await this.fillFields(this.page); From 08d70516c55065d70f7b1b11aabd2806d7612daa Mon Sep 17 00:00:00 2001 From: PAN Lei Date: Tue, 25 Apr 2023 17:49:53 +0200 Subject: [PATCH 10/12] add setup cache methode --- src/workers/CommandorPage.js | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index 722e356..6307c16 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -61,7 +61,7 @@ function log(message) { } function logWithDevice(message, device) { - appointmentLogger.log({level: "info", device: device.model(), message: message}) + appointmentLogger.log({level: "info", message: device.model() + ":" + message}) } class CommandorPage { @@ -118,6 +118,7 @@ class CommandorPage { log(e) } try { + await this.setUpCookies() this.page.locator(':nth-match(:text("rendezvousparis"), 1)').click() } catch (e) { log(e) @@ -560,6 +561,23 @@ class CommandorPage { await delay(1000) this.isTerminated = true } + + async setUpCookies() { + // load cookies from file + logWithDevice("will add cookies", this.device) + const fs = require('fs'); + // let cookiesFile = fs.readFileSync('vampuka_fisherleyba@aol.com.txt', 'utf8'); + let cookiesFile = fs.readFileSync('cookies.txt', 'utf8'); + let cookiesList = cookiesFile.split("\n") + let cookiesListToAdd = [] + cookiesList.forEach((cookie) => { + let cookieToAdd = JSON.parse(cookie) + // if (cookieToAdd.name === "datadome") { + cookiesListToAdd.push(cookieToAdd) + // } + }) + await this.context.addCookies(cookiesListToAdd) + } } module.exports = CommandorPage \ No newline at end of file From b323e6d4aa032e8009f9414bdb2c39807a974828 Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Wed, 26 Apr 2023 14:03:22 +0200 Subject: [PATCH 11/12] restart b --- clear_data.sh | 9 +++++++ src/appointment.js | 4 +-- src/workers/CommandorPage.js | 51 ++++++++++++++++++++++++------------ start_avds.sh | 3 +-- 4 files changed, 46 insertions(+), 21 deletions(-) diff --git a/clear_data.sh b/clear_data.sh index 58ee5ae..587fb7c 100644 --- a/clear_data.sh +++ b/clear_data.sh @@ -20,6 +20,15 @@ adb -s 5ac879a2 shell pm clear com.android.chrome adb -s 5ac879a2 shell am set-debug-app --persistent com.android.chrome adb -s 5ac879a2 shell am start -n com.android.chrome/com.google.android.apps.chrome.Main +#oppo tab +adb -s 774687ff shell pm clear com.android.chrome +adb -s 774687ff shell am set-debug-app --persistent com.android.chrome +adb -s 774687ff shell am start -n com.android.chrome/com.google.android.apps.chrome.Main + +#oneplus 6 tab +adb -s e30eb015 shell pm clear com.android.chrome +adb -s e30eb015 shell am set-debug-app --persistent com.android.chrome +adb -s e30eb015 shell am start -n com.android.chrome/com.google.android.apps.chrome.Main #xiaomi tab adb -s 835dca3e shell pm clear com.android.chrome adb -s 835dca3e shell am set-debug-app --persistent com.android.chrome diff --git a/src/appointment.js b/src/appointment.js index c7f6a68..4fbb38c 100644 --- a/src/appointment.js +++ b/src/appointment.js @@ -124,8 +124,8 @@ async function startBook(contactPojo, device, selectedStore, audioAnalyse, alert } async function startWithList(contacts, device, selectedStore, audioAnalyse, alertBeep) { - // let duplicatedList = [].concat(contacts).concat(contacts).concat(contacts) - let duplicatedList = [].concat(contacts) + let duplicatedList = [].concat(contacts).concat(contacts).concat(contacts) + // let duplicatedList = [].concat(contacts) await duplicatedList.reduce(async (promise, contactPojo) => { // This line will wait for the last async function to finish. // The first iteration uses an already resolved Promise diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index 6307c16..d99a4bb 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -118,7 +118,7 @@ class CommandorPage { log(e) } try { - await this.setUpCookies() + // await this.setUpCookies() this.page.locator(':nth-match(:text("rendezvousparis"), 1)').click() } catch (e) { log(e) @@ -296,6 +296,7 @@ class CommandorPage { } async clickValid(page) { + await this.saveCookies() await delay(getRandomWaitTime()) try { if (!this.page.isClosed()) { @@ -393,6 +394,11 @@ class CommandorPage { logWithDevice("ERR_NETWORK_CHANGED, will reload page", this.device); await delay(2000) await this.page.reload() + } else if (content.includes("CACHE_MISS")) { + logWithDevice("CACHE_MISS, will reload page", this.device); + await delay(2000) + // await this.setUpCookies() + await this.page.reload() } else if (content.includes("ERR_TIMED_OUT")) { logWithDevice("ERR_TIMED_OUT, will reload page", this.device); await delay(2000) @@ -404,6 +410,7 @@ class CommandorPage { } else { if (currentPage.url() === RDV_URL) { await this.fillFields(this.page); + await this.saveCookies() // if (this.isFillingFields) // await this.getErrors() } else { @@ -438,6 +445,27 @@ class CommandorPage { } } + async setUpCookies() { + // load cookies from file + try { + logWithDevice("will add cookies", this.device) + const fs = require('fs'); + // let cookiesFile = fs.readFileSync('vampuka_fisherleyba@aol.com.txt', 'utf8'); + let cookiesFile = fs.readFileSync(this.contact.mail + '.txt', 'utf8'); + let cookiesList = cookiesFile.split("\n") + let cookiesListToAdd = [] + cookiesList.forEach((cookie) => { + let cookieToAdd = JSON.parse(cookie) + // if (cookieToAdd.name === "datadome") { + cookiesListToAdd.push(cookieToAdd) + // } + }) + await this.context.addCookies(cookiesListToAdd) + } catch (e) { + console.log(e) + } + } + async checkAudioBtn() { let isBlocked = await this.isBlocked() if (!isBlocked) { @@ -480,6 +508,10 @@ class CommandorPage { await this.saveCookies(); await this.push_message_to_db(PublishType.SUCCESS, response.url()) } + // if (response.url().includes("geo.captcha-delivery.com/interstitial")) { + // logWithDevice("interstitial: response.status is " + response.status()) + // await this.setUpCookies() + // } } async push_message_to_queue(publishType) { @@ -562,22 +594,7 @@ class CommandorPage { this.isTerminated = true } - async setUpCookies() { - // load cookies from file - logWithDevice("will add cookies", this.device) - const fs = require('fs'); - // let cookiesFile = fs.readFileSync('vampuka_fisherleyba@aol.com.txt', 'utf8'); - let cookiesFile = fs.readFileSync('cookies.txt', 'utf8'); - let cookiesList = cookiesFile.split("\n") - let cookiesListToAdd = [] - cookiesList.forEach((cookie) => { - let cookieToAdd = JSON.parse(cookie) - // if (cookieToAdd.name === "datadome") { - cookiesListToAdd.push(cookieToAdd) - // } - }) - await this.context.addCookies(cookiesListToAdd) - } + } module.exports = CommandorPage \ No newline at end of file diff --git a/start_avds.sh b/start_avds.sh index 162d52d..ed6924d 100644 --- a/start_avds.sh +++ b/start_avds.sh @@ -1,4 +1,3 @@ -emulator -avd Pixel_2_API_30 & emulator -avd Pixel_2_API_30_1 & emulator -avd Pixel_2_API_30_2 & emulator -avd Pixel_2_API_30_3 & @@ -8,5 +7,5 @@ emulator -avd Pixel_2_API_30_6 & emulator -avd Pixel_2_API_30_7 & emulator -avd Pixel_2_API_30_8 & emulator -avd Pixel_2_API_30_9 & -#emulator -avd Pixel_2_API_30_10 & +emulator -avd Pixel_2_API_30_10 & #emulator -avd Pixel_2_API_30_11 & \ No newline at end of file From 8d753342e60fa1868a26e35d2f01fd95059ae78e Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Fri, 5 May 2023 17:05:20 +0200 Subject: [PATCH 12/12] add mi note 10 --- clear_data.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/clear_data.sh b/clear_data.sh index 587fb7c..25671d2 100644 --- a/clear_data.sh +++ b/clear_data.sh @@ -15,6 +15,11 @@ 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 +#huawei +adb -s 4e8ca027 shell pm clear com.android.chrome +adb -s 4e8ca027 shell am set-debug-app --persistent com.android.chrome +adb -s 4e8ca027 shell am start -n com.android.chrome/com.google.android.apps.chrome.Main + #xiaomi tab adb -s 5ac879a2 shell pm clear com.android.chrome adb -s 5ac879a2 shell am set-debug-app --persistent com.android.chrome