diff --git a/src/appointment.js b/src/appointment.js index ae38ebe..d34c51d 100644 --- a/src/appointment.js +++ b/src/appointment.js @@ -35,12 +35,14 @@ async function needToBook(contact, mongoManager) { ) if (needToBook) { await blackListItems.forEach((blackListItem) => { - console.log("=====handle blacklist item====") - console.log("update_at_s is " + blackListItem.update_at_in_s) - console.log("email is " + blackListItem.mail) - needToBook = blackListItem.update_at_in_s <= (new Date()) + SEVEN_DAYS_IN_S; - if (!needToBook) { - console.log("skip") + if (blackListItem.mail === contact.mail) { + console.log("=====handle blacklist item====") + console.log("update_at_s is " + blackListItem.update_at_in_s) + console.log("email is " + blackListItem.mail) + needToBook = blackListItem.update_at_in_s + SEVEN_DAYS_IN_S <= (new Date()) / 1000; + if (!needToBook) { + console.log("skip") + } } }) } @@ -48,8 +50,8 @@ async function needToBook(contact, mongoManager) { } async function startBook(contactPojo, device, selectedStore, audioAnalyse, alertBeep) { - console.log(`型号: ${device.model()}`); - console.log(`序列号: ${device.serial()}`); + console.log(`model: ${device.model()}`); + console.log(`serial: ${device.serial()}`); if (await needToBook(contactPojo, mongoManager)) { let commandor = new CommandorPage(contactPojo, device, mongoManager, selectedStore, audioAnalyse, alertBeep); //read contacts form excel diff --git a/src/workers/GeoCaptchaSolver.js b/src/workers/GeoCaptchaSolver.js index 0cc46ed..6985965 100644 --- a/src/workers/GeoCaptchaSolver.js +++ b/src/workers/GeoCaptchaSolver.js @@ -102,14 +102,14 @@ class GeoCaptchaSolver { if (result) { let audioUrl = result[0]; let fileName = crypto.randomUUID() + ".wav"; - wget({url: audioUrl, dest: dest_dir + fileName}, function (error, response, body) { + wget({url: audioUrl, dest: dest_dir + fileName}, async function (error, response, body) { if (error) { console.log('--- error:'); console.log(error); // error encountered } else { console.log('download the file successfully'); // send request to get numbers - sendRequest(dest_dir + fileName, callback); + await sendRequest(dest_dir + fileName, callback); } }) }