From b71828155134c27bd1436ab47082633bb5198e54 Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Mon, 29 May 2023 12:25:04 +0200 Subject: [PATCH 1/2] swipe for oneplus 8t --- src/workers/CommandorPage.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index bf5ccec..1ba6556 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -116,7 +116,7 @@ class CommandorPage { // } else { // await delay(10000); // if (!await this.checkIfSuccessful()) { - let cmd = "input swipe 382 482 382 1582" + let cmd = "input swipe 382 682 382 1682" logWithDevice("will send cmd:" + cmd, this.device) this.device.shell(cmd); await delay(3000); @@ -770,11 +770,14 @@ class CommandorPage { logWithDevice("this.browser.isConnected() is " + this.browser.isConnected(), this.device) if (this.browser.isConnected()) { let pages = await this.browser.pages(); + logWithDevice("get pages", this.device) + pages.forEach((currentPage) => { if (currentPage.url() === RDV_URL) { this.page = currentPage; } }) + logWithDevice("this.page.bringToFront();", this.device) await this.page.bringToFront(); // this.page = pages; // this.page.await From 74a7f9e885785a9eb72b836a7c32a2b4302d40f5 Mon Sep 17 00:00:00 2001 From: Lei PAN Date: Mon, 29 May 2023 13:53:03 +0200 Subject: [PATCH 2/2] try catch --- src/workers/CommandorPage.js | 31 ++++++++++++++++++------------- src/workers/OCRChecker.js | 5 ++++- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index 1ba6556..a860b10 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -769,20 +769,25 @@ class CommandorPage { } else { logWithDevice("this.browser.isConnected() is " + this.browser.isConnected(), this.device) if (this.browser.isConnected()) { - let pages = await this.browser.pages(); - logWithDevice("get pages", this.device) + try { + let pages = await this.browser.pages(); + logWithDevice("get pages", this.device) + pages.forEach((currentPage) => { + if (currentPage.url() === RDV_URL) { + this.page = currentPage; + } + }) + logWithDevice("this.page.bringToFront();", this.device) + await this.page.bringToFront(); + // this.page = pages; + // this.page.await + await this.fillFields(this.page) + await delay(2 * 1000); + } catch (e) { + console.log(e) + this.isTerminated = true + } - pages.forEach((currentPage) => { - if (currentPage.url() === RDV_URL) { - this.page = currentPage; - } - }) - logWithDevice("this.page.bringToFront();", this.device) - await this.page.bringToFront(); - // this.page = pages; - // this.page.await - await this.fillFields(this.page) - await delay(2 * 1000); } } // if (!this.browser.isConnected()) { diff --git a/src/workers/OCRChecker.js b/src/workers/OCRChecker.js index 5dfa3e9..21f8bb8 100644 --- a/src/workers/OCRChecker.js +++ b/src/workers/OCRChecker.js @@ -26,6 +26,9 @@ const BLOCKED_MSG_EN = "have been blocked" const BLOCKED_MSG_FR = "avez été bloqué" const CHECKING_MSG_FR = "Verifying" const ERR_CACHE_MISS = "ERR_CACHE_MISS" +const ERR_CACHE_MISS_2 = "ERR_CACHE-MISS" +const ERR_CACHE_MISS_3 = "appuyer sur le bouton d'actualisation" +const ERR_CACHE_MISS_4 = "renvoyer les données" const SLIDING_CAPTCHA_FR = "Pourquoi cette vérification" const MESSAGE_FILL_FIELD_FR = "Demande de rendez-vous pour" const WELCOME_MESSAGE_FR = "Bienvenue dans Chrome" @@ -74,7 +77,7 @@ class OCRChecker { return OCRResult.RECAPTCHA_ERROR } else if (result.includes(BLOCKED_MSG_EN) || result.includes(BLOCKED_MSG_FR)) { return OCRResult.BLOCKED - } else if (result.includes(ERR_CACHE_MISS)) { + } else if (result.includes(ERR_CACHE_MISS) || result.includes(ERR_CACHE_MISS_2) || result.includes(ERR_CACHE_MISS_3) || result.includes(ERR_CACHE_MISS_4)) { return OCRResult.TO_REFRESH } else if (result.includes(CHECKING_MSG_FR)) { return OCRResult.RECHECK