Bump version

This reverts commit 425ff34ea0.

manifest.json

@@ -1,7 +1,7 @@
 {
     "manifest_version": 3,
     "name": "not-a-rescheduler",
-    "version": "0.0.6",
+    "version": "0.0.10",
     "permissions": [ "storage", "tabs", "activeTab", "notifications", "declarativeContent" ],
     "content_scripts": [
         {

popup/popup.js

@@ -148,21 +148,19 @@ function smoothTextChange(element, newText) {
         consCfg[c].autoBook = e.target.checked;
         await chrome.storage.local.set({ "cfg_consulates": consCfg });
       });
+
       // update current & best dates
       chrome.storage.onChanged.addListener((changes, area) => {
         if (changes.ctx_consulates) {
-          const newConsulates = changes.ctx_consulates.newValue;
+          let newCurrentDate = changes.ctx_consulates.newValue[c].currentDate || "-";
+          let newBestDate = changes.ctx_consulates.newValue[c].bestDate || "-";
 
-          if (newConsulates[c].currentDate) {
-            let el = document.getElementById(`currentDate-${cId}`);
-            if (el && el.innerText != newConsulates[c].currentDate)
-              smoothTextChange(el, newConsulates[c].currentDate);
-          }
-          if (newConsulates[c].bestDate) {
-            let el = document.getElementById(`bestDate-${cId}`);
-            if (el && el.innerText != newConsulates[c].bestDate)
-              smoothTextChange(el, newConsulates[c].bestDate);
-          }
+          let el = document.getElementById(`currentDate-${cId}`);
+          if (el && el.innerText != newCurrentDate)
+            smoothTextChange(el, newCurrentDate);
+          el = document.getElementById(`bestDate-${cId}`);
+          if (el && el.innerText != newBestDate)
+            smoothTextChange(el, newBestDate);
         }
       });    
     }

scripts/content.js

@@ -5,9 +5,12 @@ const pathnameRegex = /^\/\w{2}-\w{2}\/n?iv/;
 const MAX_SIGNIN_ATTEMPTS = 3;
 const PAGE_WAIT_TIME = 3792;
 const MINUTE = 60;
-const RANDOM_JITTER = 0.1;
+const RND_VAR_COEFF = 0.1;
 const SOFT_BAN_TIMEOUT = 27;
-const NOTIF_CHANNEL = "snegov_test"
+const NOTIF_CHANNEL = "snegov";
+const CHECK_OPER_HOURS = true;
+const OPER_HOURS_START = 23;
+const OPER_HOURS_END = 9;
 
 let cfg = {
     activate: undefined,
@@ -37,11 +40,12 @@ async function delay(ms) {
 }
 
 async function sendNotification(message, channel = NOTIF_CHANNEL) {
+    const msg = "[US visa bot] " + message
     await fetch('https://ntfy.sh/' + channel, {
         method: 'POST',
-        body: "[US visa bot] " + message,
+        body: msg,
     })
-    .then(() => console.log('Notification sent'))
+    .then(() => console.log('Notification sent: ' + msg))
     .catch(e => console.error(e));
 }
 
@@ -49,18 +53,22 @@ function getRandomInt(max) {
     return Math.floor(Math.random() * Math.floor(max));
 }
 
-
-function getJitter(frequency) {
-    return frequency * MINUTE * RANDOM_JITTER;
-}
-
-function getFutureDate(minutes, maxRandomSeconds = 0) {
+function getFutureDate(minutes, frequency) {
     // return date some amount of minutes in future plus random amount of seconds
     let futureDate = new Date();
-    futureDate.setSeconds(futureDate.getSeconds() + minutes * MINUTE + getRandomInt(maxRandomSeconds));
+    const randomVariation = frequency * MINUTE * RND_VAR_COEFF;
+    const randomSign = Math.random() < 0.5 ? -1 : 1;
+    const offset = randomSign * getRandomInt(randomVariation);
+
+    futureDate.setSeconds(futureDate.getSeconds() + minutes * MINUTE + offset);
     return futureDate.toISOString();
 }
 
+function isNoBanTime(frequency = 5) {
+    let now = new Date();
+    return (now.getHours() === OPER_HOURS_START && now.getMinutes() < frequency);
+}
+
 function hiddenPassword(cfg) {
     return {
         ...cfg,
@@ -105,7 +113,7 @@ function ensureRequiredConsulateProperties(consCtx, consCfg, frequency = 1) {
                 "id": consCtx[c]?.id || null,
                 "bestDate": consCtx[c]?.bestDate || null,
                 "currentDate": consCtx[c]?.currentDate || null,
-                "nextCheckAt": consCtx[c]?.nextCheckAt || getFutureDate(0, frequency * MINUTE),
+                "nextCheckAt": consCtx[c]?.nextCheckAt || getFutureDate(0, frequency),
             };
         }    
         if (!consCfg[c] || !hasAllKeys(consCfg[c], reqCfgKeys)) {
@@ -155,17 +163,6 @@ function isNotEnglishPage() {
         ) && !window.location.pathname.match(/^\/en-/);
 }
 
-async function handleHttpError(e) {
-    if (e.response && e.response.status === 401) {
-        msg = "Unauthorized";
-        console.log(msg);
-        await sendNotification(msg);
-        await logOut();
-    } else {
-        console.error(e);
-    }
-}
-
 async function switchToEnglishPage() {
     window.location.href(window.location.pathname.replace(/^\/\w{2}-{2}/, '/en-us'));
     await delay(PAGE_WAIT_TIME);
@@ -244,28 +241,31 @@ async function getConsulates() {
 }
 
 async function getAvailableDates(consulateId) {
-    // let addressUri = window.location.pathname + `/address/${consulateId}`
-    // fetch(addressUri, { headers: { "x-requested-with": "XMLHttpRequest" } })
-    //     .catch(error => console.error('Error:', error));
-
-    let datesUri = window.location.pathname + `/days/${consulateId}.json?appointments[expedite]=false`
-    let dates = fetch(datesUri, { headers: {
+    const datesUri = window.location.pathname + `/days/${consulateId}.json?appointments[expedite]=false`
+    try {
+        const response = await fetch(datesUri, { headers: {
             "x-requested-with": "XMLHttpRequest",
             "accept": "application/json, text/javascript, */*; q=0.01",
             "cache-control": "no-cache",
-        }})
-        .catch(async e => {
-            await handleHttpError(e);
-            throw e;
-        })
-        .then(d => d.json())
-        .then(data => {
-            let dateList = data.map(item => item.date);
-            dateList.sort();
-            return dateList;
-        })
-        .catch(e => null);
-    return dates;
+        }});
+
+        if (!response.ok) {
+            if (response.status === 401) {
+                console.log('Logged out due to 401 error');
+                await logOut();    
+            }
+            const body = await response.text();
+            throw new Error(`HTTP error ${response.status}: ${body}`);
+        }
+
+        const data = await response.json();
+        const dateList = data.map(item => item.date);
+        dateList.sort();
+        return dateList;
+    } catch (e) {
+        console.error('Error:', e);
+        return null;
+    }
 }
 
 async function filterDates(dates, currentAppt, deltaFromAppt, deltaFromNow) {
@@ -280,10 +280,6 @@ async function filterDates(dates, currentAppt, deltaFromAppt, deltaFromNow) {
 async function getAvailableTimes(consulateId, date) {
     let uri = window.location.pathname + `/times/${consulateId}.json?date=${date}&appointments[expedite]=false`
     let times = fetch(uri, { headers: { "x-requested-with": "XMLHttpRequest" } })
-        .catch(async e => {
-            await handleHttpError(e);
-            throw e;
-        })
         .then(d => d.json())
         .then(data => data.available_times)
         .catch(e => null);
@@ -343,7 +339,7 @@ async function runner() {
             if (key === 'frequency') {
                 let wasChanged = false;
                 for (let c in ctx.consulates) {
-                    let newNextCheckAt = getFutureDate(cfg.frequency, getJitter(cfg.frequency));
+                    let newNextCheckAt = getFutureDate(cfg.frequency, cfg.frequency);
                     if (ctx.consulates[c].nextCheckAt > newNextCheckAt) {
                         console.log(`Reducing wait time for ${c} from ${ctx.consulates[c].nextCheckAt} to ${newNextCheckAt}`);
                         ctx.consulates[c].nextCheckAt = newNextCheckAt;
@@ -393,15 +389,17 @@ async function runner() {
         return;
     }
 
-    // Check if current time is between 11pm and 9am UTC (4pm - 2am PST)
-    let now = new Date();
-    let currentHourUTC = now.getUTCHours();
-    if (currentHourUTC >= 23 || currentHourUTC < 9) {
-        // Continue running the code
-    } else {
-        await chrome.storage.local.set({ "ctx_statusMsg": "not operational hours" });
-        isRunning = false;
-        return;
+    if (CHECK_OPER_HOURS) {
+        // Check if current time is between 11pm and 9am UTC (4pm - 2am PST)
+        let now = new Date();
+        let currentHourUTC = now.getUTCHours();
+        if (currentHourUTC >= OPER_HOURS_START || currentHourUTC < OPER_HOURS_END) {
+            // Continue running the code
+        } else {
+            await chrome.storage.local.set({ "ctx_statusMsg": "not operational hours" });
+            isRunning = false;
+            return;
+        }
     }
 
     if (isFoundAppointment) {
@@ -503,8 +501,12 @@ async function runner() {
         }
 
         if (apptDate != ctx.currentAppt.date || apptConsulate != ctx.currentAppt.consulate) {
-            console.log(`New appointment date: ${apptDate} at ${apptConsulate},
-                            old: ${ctx.currentAppt.consulate} at ${ctx.currentAppt.date}`);
+            msg = `New appointment date: ${apptDate} at ${apptConsulate}`
+            if (ctx.currentAppt.date != null) {
+                sendNotification(msg);
+            }
+            msg += `, was: ${ctx.currentAppt.consulate} at ${ctx.currentAppt.date}`
+            console.log(msg);
             ctx.currentAppt = { consulate: apptConsulate, date: apptDate };
             await chrome.storage.local.set({ "ctx_currentAppt": ctx.currentAppt });
         }
@@ -590,6 +592,19 @@ async function runner() {
             if (processedConsulates > 0) {
                 break;
             }
+
+            // Reset all soft bans in the first 5 minutes of the first operational hour
+            let now = new Date();
+            if (isNoBanTime(cfg.frequency)) {
+                let nextCheckAt = new Date(ctx.consulates[c].nextCheckAt);
+                let differenceInMinutes = (nextCheckAt.getTime() - now.getTime()) / (1000 * 60);
+
+                if (differenceInMinutes > cfg.frequency) {
+                    console.log(`Resetting soft ban for ${c}`);
+                    ctx.consulates[c].nextCheckAt = getFutureDate(0, cfg.frequency);
+                }
+            }
+
             // skip if not time to check
             if (ctx.consulates[c].nextCheckAt > new Date().toISOString()) {
                 continue;
@@ -601,7 +616,7 @@ async function runner() {
             console.log(msg);
             await chrome.storage.local.set({ "ctx_statusMsg": msg });
             let availDates = await getAvailableDates(ctx.consulates[c].id);
-            ctx.consulates[c].nextCheckAt = getFutureDate(cfg.frequency, getJitter(cfg.frequency));
+            ctx.consulates[c].nextCheckAt = getFutureDate(cfg.frequency, cfg.frequency);
 
             if (!availDates) {
                 msg = `Failed to fetch available dates in ${c}`;
@@ -612,20 +627,16 @@ async function runner() {
 
             // if empty list, either we're banned or non operational hours or dead consulate
             // wait for some time before checking again
-            let now = new Date();
-            let currentHourUTC = now.getUTCHours();
-            let currentMinuteUTC = now.getUTCMinutes();
-
             if (availDates.length == 0) {
-                msg = `No available dates in ${c}, probably banned`;
+                msg = `No available dates in ${c}`;
                 console.log(msg);
                 await chrome.storage.local.set({ "ctx_statusMsg": msg });
 
-                // Only set SOFT_BAN_TIMEOUT if it's not the first 5 minutes of 23pm UTC
-                if (!(currentHourUTC === 23 && currentMinuteUTC < 5)) {
-                    ctx.consulates[c].nextCheckAt = getFutureDate(SOFT_BAN_TIMEOUT, getJitter(cfg.frequency));
+                if (!isNoBanTime(cfg.frequency)) {
+                    console.log(`Setting soft ban for ${c}`);
+                    ctx.consulates[c].nextCheckAt = getFutureDate(SOFT_BAN_TIMEOUT, cfg.frequency);
                 }
-            
+                ctx.consulates[c].currentDate = null;            
                 continue;
             }
 
@@ -671,7 +682,7 @@ async function runner() {
                 continue;
             }
             console.log(`Available timeslots in ${c} at ${chosenDate}: ${availTimes}`);
-            let chosenTime = availTimes[0];
+            let chosenTime = availTimes[availTimes.length - 1];
     
             // fill timeslot in reschedule form
             await delay(PAGE_WAIT_TIME);