diff --git a/clear_data.sh b/clear_data.sh index 8042464..ac9565b 100644 --- a/clear_data.sh +++ b/clear_data.sh @@ -3,4 +3,13 @@ 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 adb -s 07f9c883 shell pm clear com.android.chrome adb -s 07f9c883 shell am set-debug-app --persistent com.android.chrome -adb -s 07f9c883 shell am start -n com.android.chrome/com.google.android.apps.chrome.Main \ No newline at end of file +adb -s 07f9c883 shell am start -n com.android.chrome/com.google.android.apps.chrome.Main +adb -s RQ3005CA88 shell pm clear com.android.chrome +adb -s RQ3005CA88 shell am set-debug-app --persistent com.android.chrome +adb -s RQ3005CA88 shell am start -n com.android.chrome/com.google.android.apps.chrome.Main +adb -s J4AXB761H2322WJ shell pm clear com.android.chrome +adb -s J4AXB761H2322WJ shell am set-debug-app --persistent com.android.chrome +adb -s J4AXB761H2322WJ shell am start -n com.android.chrome/com.google.android.apps.chrome.Main +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 \ No newline at end of file diff --git a/main.js b/main.js index e697fd8..1bf839b 100644 --- a/main.js +++ b/main.js @@ -7,7 +7,14 @@ const mongoManager = new MongoManager(); let excelUtil = new ExcelUtil(); let contactList = excelUtil.readContacts(); -mongoManager.connect().then(r => console.log("mongo connected")) +mongoManager.connect().then(r => + + android.devices().then((devices) => { + let segmentNumber = contactList.length / devices.length; + for (let i = 0; i < devices.length; i++) { + startWithList(contactList.slice(i * segmentNumber, segmentNumber * (i + 1)), devices[i]); + } + })) // Connect to the device. @@ -48,12 +55,12 @@ async function startWithList(contacts, device) { }, Promise.resolve()); } -(async () => { - android.devices().then((devices) => { - let segmentNumber = contactList.length / devices.length; - for (let i = 0; i < devices.length; i++) { - startWithList(contactList.slice(i * segmentNumber, segmentNumber * (i + 1)), devices[i]); - } - }) -})() +// (async () => { +// android.devices().then((devices) => { +// let segmentNumber = contactList.length / devices.length; +// for (let i = 0; i < devices.length; i++) { +// startWithList(contactList.slice(i * segmentNumber, segmentNumber * (i + 1)), devices[i]); +// } +// }) +// })() diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index 4f08cfa..6cc2ce0 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -71,7 +71,7 @@ class CommandorPage { this.page.on("response", (response) => { this.onResponse(response) }) - await this.page.goto(RDV_URL); + await this.page.goto(RDV_URL, {timeout: 90 * 1000}); //wait 10 mins // Close the device. @@ -215,10 +215,12 @@ class CommandorPage { } async onResponse(response) { - let rex = new RegExp(REGEX_RDV_URL) - if (rex.test(response.url)) { - console.log("rdv url found:" + response.url) - } + // let rex = new RegExp(REGEX_RDV_URL) + // console.log("onResponse with url:" + response.url()) + // if (rex.test(response.url())) { + // console.log("rdv url found:" + response.url()) + // await this.push_message_to_db(PublishType.SUCCESS, response.url()) + // } } async push_message_to_queue(publishType) { @@ -235,6 +237,20 @@ class CommandorPage { this.isTerminated = true } + 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") { + return + } + // save to mongoDb + let reserve = ReserveResultPojo.create_from_contact(this.contact, id, this.page.url(), 1, publishType); + reserve.source_from = this.device.model(); + await this.mongoManager.saveReserveToDb(reserve.to_mongo_dict()) + await delay(2 * 1000) + this.isTerminated = true + } + }