@internetarchive/ia-book-actions 1.1.0-alpha6 → 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 };
 
@@ -390,7 +390,6 @@
               </div>
               <div>
                 <button id="show_expired_modal">While Browsing (`user_has_browsed`), Expire book & show its modal</button>
-                how_expired_modal
               </div>
             </td>
             <td class="availableToBorrow">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-book-actions",
-  "version": "1.1.0-alpha6",
+  "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 = 30;
+    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();
+      }
+    });
   }
 
   /**
@@ -315,7 +326,7 @@ export default class IABookActions extends LitElement {
   }
 
   /**
-   * Show the warning modal to ask user if they are still reading
+   * Show the waring modal to ask user if they are still reading
    */
   async showWarningModal() {
     log('****** showWarningModal ******');
@@ -494,29 +505,28 @@ export default class IABookActions extends LitElement {
    * - show message when book is expired
    * - show message having remaining time when book is about to auto returned
    */
-  async showToastMessage() {
-    await this.useToastManager();
-
-    // if secondsLeft < 60, consider it 1 minute
-    let { secondsLeft } = this.loanRenewResult;
-    if (secondsLeft === undefined) {
-      secondsLeft = this.lendingStatus.secondsLeftOnLoan;
-    } else {
-      secondsLeft = secondsLeft > 60 ? secondsLeft : 60;
-    }
-
-    // eslint-disable-next-line no-undef
-    const config = new ToastConfig();
-    config.dismissOnClick = true;
-    config.texts = this.loanRenewHelper?.getMessageTexts(
-      this.loanRenewResult.texts,
-      secondsLeft
-    );
-
-    this.toast?.showToast({
-      config,
-    });
-  }
+  // async showToastMessage() {
+  //   await this.useToastManager();
+
+  //   // if secondsLeft < 60, consider it 1 minute
+  //   let { secondsLeft } = this.loanRenewResult;
+  //   if (secondsLeft === undefined) {
+  //     secondsLeft = this.lendingStatus.secondsLeftOnLoan;
+  //   } else {
+  //     secondsLeft = secondsLeft > 60 ? secondsLeft : 60;
+  //   }
+
+  //   const config = new ToastConfig();
+  //   config.dismisOnClick = true;
+  //   config.texts = this.loanRenewHelper?.getMessageTexts(
+  //     this.loanRenewResult.texts,
+  //     secondsLeft
+  //   );
+
+  //   this.toast?.showToast({
+  //     config,
+  //   });
+  // }
 
   /**
    * Execute when loan is expired
@@ -688,20 +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) {
         log('startTimerCountdown --- stale, timer has resyncd', {
           secondsLeft,
         });
-        return;
       }
 
       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
@@ -762,9 +773,9 @@ export default class IABookActions extends LitElement {
     if (whatIsleft !== whatShouldLeft) {
       log(`reSyncTimerIfGoneOff --- let's re-sync.`);
 
-      return true;
+      return { hasSynced: true, whatShouldLeft };
     }
-    return false;
+    return { hasSynced: false, whatShouldLeft };
   }
 
   /**