@internetarchive/ia-book-actions 1.1.0-alpha7 → 1.1.0-alpha8

package/demo/index.html

@@ -131,7 +131,7 @@
     iaBookActions.returnUrl = '';
     iaBookActions.localCache = localCache;
 
-    let loanTotalTime2Min = { loanTotalTime: 80, loanRenewAtLast: 55, pageChangedInLast: 15 };
+    let loanTotalTime2Min = { loanTotalTime: 170, loanRenewAtLast: 80, pageChangedInLast: 15 };
     let loanTotalTime5Min = { loanTotalTime: 300, loanRenewAtLast: 180, pageChangedInLast: 15 };
     let loanTotalTime1Hour = { loanTotalTime: 3600, loanRenewAtLast: 660, pageChangedInLast: 900 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-book-actions",
-  "version": "1.1.0-alpha7",
+  "version": "1.1.0-alpha8",
   "description": "Bookreader actions for borrowable book",
   "author": "Internet Archive",
   "license": "AGPL-3.0-only",

package/src/assets/data/lending-get-status-service.js

@@ -118,7 +118,7 @@ export const canBrowseAndBorrow = {
   loanStartDate: '2021-07-30 09:57:40',
   loansUrl: '/details/@neeraj-archive?tab=loans#loans-on-loan',
   maxLoans: 10,
-  secondsLeftOnLoan: 155,
+  secondsLeftOnLoan: 170,
   shouldProtectImages: true,
   totalWaitlistCount: 0,
   userHasBorrowed: false,

package/src/components/timer-countdown.js

@@ -47,7 +47,7 @@ export default class TimerCountdown extends LitElement {
   }
 
   render() {
-    const viewClass = this.displayTime ? 'view' : 'hide';
+    const viewClass = this.displayTime ? 'view' : 'hide1';
     return html`
       <button
         id="timer-counter"

package/src/ia-book-actions.js

@@ -90,7 +90,7 @@ export default class IABookActions extends LitElement {
     this.lendingOptions = {};
     this.borrowType = null; // 'browsed'|'borrowed'
     this.browseTimer = undefined; // timeout
-    this.timerExecutionSeconds = 3;
+    this.timerExecutionSeconds = 5;
 
     /** @deprecated */
     this.toast = undefined;
@@ -283,6 +283,17 @@ export default class IABookActions extends LitElement {
         this.autoLoanRenewChecker(true);
       }
     });
+
+    /**
+     * auto-renew interval may stale when tab is in background,
+     * so [visibilitychange] event can trigger to check timer to show relavent messages
+     */
+    document.addEventListener("visibilitychange", () => {
+      log('visibilitychange');
+      if (!document.hidden) {
+        this.startTimerCountdown();
+      }
+    });
   }
 
   /**
@@ -687,17 +698,21 @@ export default class IABookActions extends LitElement {
       // re-sync timer if gone off because of background window
       // side effect: updates this.lendingStatus & kicks off lifecycle,
       // if really updated, escape from here
-      const resync = await this.reSyncTimerIfGoneOff(secondsLeft);
+      const resyncd = this.reSyncTimerIfGoneOff(secondsLeft);
+
+      if (resyncd.hasSynced) {
+        secondsLeft = resyncd.whatShouldLeft;
 
-      if (resync.resyncd) {
-        secondsLeft = resync.whatShouldLeft;
+        log('startTimerCountdown --- stale, timer has resyncd', {
+          secondsLeft,
+        });
       }
 
       log('startTimerCountdown --- countdown still valid. continue...', {
-        resync,
+        resyncd,
         secondsLeft,
         loanRenewAtLast: this.loanRenewTimeConfig.loanRenewAtLast,
-      });
+      }, new Date().getMinutes(), new Date().getSeconds());
 
       /**
        * execute from last 10th minute to 0th minute
@@ -739,26 +754,28 @@ export default class IABookActions extends LitElement {
     const whatShouldLeft = Math.round(secondsShouldLeft);
     const timerElSeconds = this.timerCountdownEl.secondsLeftOnLoan || 0;
 
-    if (whatIsleft !== whatShouldLeft) {
+    log(`reSyncTimerIfGoneOff?`, {
+      whatIsleft,
+      whatShouldLeft,
+      timerElSeconds,
+      timeLeftInMin: Math.ceil(timerSecondsLeft / 60),
+    });
+
+    if (timerElSeconds !== whatShouldLeft || whatIsleft !== whatShouldLeft) {
       // set lending status with new time to update decrementor
       const currStatus = {
         ...this.lendingStatus,
         secondsLeftOnLoan: whatShouldLeft,
       };
       this.lendingStatus = currStatus;
+    }
 
-      log(`reSyncTimerIfGoneOff,\nlet's re-sync --- `, {
-        whatIsleft,
-        whatShouldLeft,
-        timerElSeconds,
-        timeLeftInMin: Math.ceil(timerSecondsLeft / 60),
-      }, '\ntimer resyncd --- ', {
-        whatShouldLeft,
-      });
+    if (whatIsleft !== whatShouldLeft) {
+      log(`reSyncTimerIfGoneOff --- let's re-sync.`);
 
-      return { resyncd: true, whatShouldLeft };
+      return { hasSynced: true, whatShouldLeft };
     }
-    return { resyncd: false, whatShouldLeft };
+    return { hasSynced: false, whatShouldLeft };
   }
 
   /**