From 14715d6bed63548857068ca79ac77181b8575b5b Mon Sep 17 00:00:00 2001
From: PAN Lei <panleicim@gmail.com>
Date: Sat, 18 May 2024 20:19:06 +0200
Subject: [PATCH] support brave version 1.65.133

---
 src/models/OCRResult.js      |  1 +
 src/workers/CommandorPage.js | 41 ++++++++++++++++++++++++------------
 src/workers/OCRChecker.js    |  5 +++++
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/models/OCRResult.js b/src/models/OCRResult.js
index b5d7be6..c5844ac 100644
--- a/src/models/OCRResult.js
+++ b/src/models/OCRResult.js
@@ -25,6 +25,7 @@ const OCRResult = {
     BRAVE_PRIVACY: Symbol("BRAVE_PRIVACY"),
     BRAVE_PRIVACY_PUB: Symbol("BRAVE_PRIVACY_PUB"),
     BRAVE_NOTIFICATION: Symbol("BRAVE_NOTIFICATION"),
+    BRAVE_PUSH_NOTIFICATION: Symbol("BRAVE_PUSH_NOTIFICATION"),
     CHOOSE_POSITION: Symbol("CHOOSE_POSITION"),
     BRAVE_VPN_SKIP: Symbol("BRAVE_VPN_SKIP"),
 }
diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js
index 4c5c077..a8dc4b9 100644
--- a/src/workers/CommandorPage.js
+++ b/src/workers/CommandorPage.js
@@ -220,7 +220,7 @@ class CommandorPage {
             if (this.isTerminated) {
                 log(this.device.model() + ":request terminated, send cancel()");
                 try {
-                    if (this.page !== undefined) {
+                    if (this.page !== undefined && !this.page.isClosed()) {
                         await this.page.close()
                     }
                 } catch (e) {
@@ -1048,6 +1048,12 @@ class CommandorPage {
                 await delay(2000);
                 await this.checkResultWithOcr();
                 break;
+            case OCRResult.BRAVE_PUSH_NOTIFICATION:
+                logWithDevice("BRAVE_NOTIFICATION", this.device)
+                await this.handleBravePushNotification()
+                await delay(3000);
+                await this.checkResultWithOcr();
+                break
             case OCRResult.BRAVE_NOTIFICATION:
                 logWithDevice("BRAVE_NOTIFICATION", this.device)
                 if (this.device.model() === "21091116C") {
@@ -1289,19 +1295,21 @@ class CommandorPage {
 
     async sendCookiesToQueue() {
         try {
-            const cookiesSet = await this.page.cookies();
-            let cookiesString = ""
-            cookiesSet.forEach((cookie) => {
-                cookiesString = cookiesString + cookie.name + "=" + cookie.value + ";"
-            })
-            console.log(cookiesString);
-            if (this.shareCookiesWithRequests) {
-                let pojoToSend = await this.getRequestData()
-                pojoToSend.cookiesStr = cookiesString
-                // this.sender.sendMessage(JSON.stringify(pojoToSend), REQUEST_DATA_OBJECT)
-                this.sender.sendMessage(JSON.stringify(pojoToSend), TEST_QUEUE)
-            } else {
-                this.sender.sendMessage(cookiesString)
+            if (!this.page.isClosed()) {
+                const cookiesSet = await this.page.cookies();
+                let cookiesString = ""
+                cookiesSet.forEach((cookie) => {
+                    cookiesString = cookiesString + cookie.name + "=" + cookie.value + ";"
+                })
+                console.log(cookiesString);
+                if (this.shareCookiesWithRequests) {
+                    let pojoToSend = await this.getRequestData()
+                    pojoToSend.cookiesStr = cookiesString
+                    // this.sender.sendMessage(JSON.stringify(pojoToSend), REQUEST_DATA_OBJECT)
+                    this.sender.sendMessage(JSON.stringify(pojoToSend), TEST_QUEUE)
+                } else {
+                    this.sender.sendMessage(cookiesString)
+                }
             }
         } catch (e) {
             console.log(e)
@@ -1527,6 +1535,11 @@ class CommandorPage {
         }
         return findIp
     }
+
+    async handleBravePushNotification() {
+        await this.tapForDevice(this.device, 100, 400)
+
+    }
 }
 
 module
diff --git a/src/workers/OCRChecker.js b/src/workers/OCRChecker.js
index 3578827..ca7d1f6 100644
--- a/src/workers/OCRChecker.js
+++ b/src/workers/OCRChecker.js
@@ -77,6 +77,8 @@ const BRAVE_SKIP_PRIVACY_PAGE = "Partagez des informations"
 const BRAVE_SKIP_PRIVACY_PAGE_3 = "Partagez de informations"
 const BRAVE_SKIP_PRIVACY_PAGE_2 = "Partagez des renseignements"
 
+const PUSH_NOTIFICATION_1 = "Brave à vous envoyer des notifications "
+
 class OCRChecker {
 
     constructor(device, contact) {
@@ -101,6 +103,9 @@ class OCRChecker {
             } else if (result.includes(BRAVE_NOTIFICATION)) {
                 await this.deleteFile(fileName)
                 return OCRResult.BRAVE_NOTIFICATION
+            } else if (result.includes(PUSH_NOTIFICATION_1)) {
+                await this.deleteFile(fileName)
+                return OCRResult.BRAVE_PUSH_NOTIFICATION
             } else if (result.includes(CHOOSE_POSITION_GOOGLE_FR)) {
                 await this.deleteFile(fileName)
                 return OCRResult.CHOOSE_POSITION