@internetarchive/ia-book-actions 0.0.29-alpha34 → 0.0.29-alpha36

package/demo/index.html

@@ -129,10 +129,10 @@
 
     let isDevBox = true;
     iaBookActions.loanRenewConfig = {
-      totalTime: isDevBox ? 120 : 3600, // 60 second = 1 min
-      autoCheckAt: isDevBox ? 115 : 3540, // at last 10th minute
+      totalTime: isDevBox ? 20 : 3600, // 60 second = 1 min
+      autoCheckAt: isDevBox ? 15 : 3540, // at last 10th minute
       pageChangedInLast: isDevBox ? 80 : 900, // within last 15 second/minute
-      env: isDevBox ? 'dev' : 'prod',
+      isDevBox: isDevBox,
     };
 
     let lendingStatus1 = iaBookActions.lendingStatus;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-book-actions",
-  "version": "0.0.29-alpha34",
+  "version": "0.0.29-alpha36",
   "description": "Bookreader actions for borrowable book",
   "author": "Internet Archive",
   "license": "AGPL-3.0-only",
@@ -20,7 +20,7 @@
   "dependencies": {
     "@internetarchive/icon-info": "^1.2.6",
     "@internetarchive/local-cache": "^0.2.0",
-    "@internetarchive/modal-manager": "^0.2.1",
+    "@internetarchive/modal-manager": "^0.2.6",
     "@internetarchive/shared-resize-observer": "^0.2.0",
     "@internetarchive/toast-manager": "0.0.1-alpha9",
     "lit": "^2.5.0"

package/src/components/timer-countdown.js

@@ -32,19 +32,20 @@ export default class TimerCountdown extends LitElement {
     // execute interval in each second in-case of dev environment
     this.timerInterval = setInterval(
       () => {
-        this.timeLeftOnLoan -= this.loanRenewConfig.env === 'dev' ? 1 : 60;
+        this.timeLeftOnLoan -= this.loanRenewConfig.isDevBox ? 1 : 60;
+        const timeLeft = Math.round(this.timeLeftOnLoan);
 
         // execute from last 10th minute to 0th minute
         // - 10th - to check if user has viewed
         // - till 0th - to show warning msg with remaining time to auto returned
         if (
-          Math.round(this.timeLeftOnLoan) <= this.loanRenewConfig.autoCheckAt
+          timeLeft <= this.loanRenewConfig.autoCheckAt
         ) {
           this.dispatchEvent(
             new CustomEvent('IABookActions:loanRenew', {
               detail: {
                 hasPageChanged: false,
-                timeLeft: Math.round(this.timeLeftOnLoan),
+                timeLeft: timeLeft,
               },
               bubbles: true,
               composed: true,
@@ -52,12 +53,13 @@ export default class TimerCountdown extends LitElement {
           );
         }
 
-        // clear interval if timer is < this.loanRenewConfig.autoCheckAt
-        if (this.timeLeftOnLoan < this.loanRenewConfig.autoCheckAt) {
-          clearInterval(this.timerInterval);
+        // clear interval
+        if (timeLeft <= 1) {
+          // clearInterval(this.timerInterval);
+          console.log('cleared timer interval');
         }
       },
-      this.loanRenewConfig.env === 'dev' ? 1000 : 60000
+      this.loanRenewConfig.isDevBox ? 1000 : 60000
     );
   }
 

package/src/core/services/actions-handler/actions-handler.js

@@ -103,12 +103,12 @@ export default class ActionsHandler extends LitElement {
   handleBrowseIt() {
     const action = 'browse_book';
     this.dispatchToggleActionGroup();
-    this.setBrowseTimeSession();
 
     ActionsHandlerService({
       action,
       identifier: this.identifier,
       success: () => {
+        this.setBrowseTimeSession();
         this.handleReadItNow();
       },
       error: data => {

package/src/core/services/loan-renew-helper.js

@@ -26,8 +26,9 @@ export class LoanRenewHelper {
     try {
       if (this.hasPageChanged) {
         return this.pageChanged(); // user clicked on page
+      } else {
+        return this.autoChecker(); // auto checker at last 10th minute
       }
-      return this.autoChecker(); // auto checker at 50th minute
     } catch (error) {
       console.log(error);
     }
@@ -57,7 +58,7 @@ export class LoanRenewHelper {
     );
 
     // if user viewed new page in last 10 minutes, renew immediately
-    if (currentTime >= lastTimeFrame) {
+    if (lastTimeFrame !== null && currentTime >= lastTimeFrame) {
       this.result.texts = this.loanRenewMessage;
       this.result.renewNow = true;
       console.log('manually renewed by page click!');
@@ -68,33 +69,31 @@ export class LoanRenewHelper {
   }
 
   /**
-   * Trigger this function when countdown hits last 10 minutes
-   * - if user is open new page, just renew the loan at last 10th minute
+   * Trigger this function when countdown hits at last 10th minute
+   * - if user is active, just renew the loan at last 10th minute
    *
    * @returns {this.result}
    */
   async autoChecker() {
-    const currentTime = new Date();
     const { pageChangedInLast } = this.loanRenewConfig;
-    const lastPageFlipTime = await this.localCache.get(
+    const pageChangedTime = await this.localCache.get(
       `${this.identifier}-pageChangedTime`
     );
 
-    // last 15 min if used flipped a page.
-    const lastFlipTimeFrame = this.changeTime(
-      currentTime,
+    // in last 15 min if user make any activity.
+    const pageChangeTimeFrame = this.changeTime(
+      new Date(),
       pageChangedInLast,
       'sub'
     ); // 15 seconds
 
     if (
-      lastPageFlipTime === undefined ||
-      lastPageFlipTime <= lastFlipTimeFrame
+      pageChangedTime === undefined ||
+      pageChangedTime <= pageChangeTimeFrame
     ) {
       this.result.texts = this.loanReturnWarning;
       this.result.renewNow = false; // not viewed
-      // console.log('not viewed!');
-    } else if (lastPageFlipTime >= lastFlipTimeFrame) {
+    } else if (pageChangedTime >= pageChangeTimeFrame) {
       this.result.texts = '';
       this.result.renewNow = true; // viewed in last time frame
       console.log('silently renewed!');

package/src/ia-book-actions.js

@@ -253,7 +253,7 @@ export default class IABookActions extends LitElement {
      */
     document.addEventListener('click', () => {
       if (this.loanRenewHelper && this.loanRenewResult.timeLeft > 0) {
-        console.log('1');
+        console.log('clicked-outside');
         this.suppressToast = true;
       }
     });
@@ -283,7 +283,6 @@ export default class IABookActions extends LitElement {
     );
 
     await this.loanRenewHelper.handleLoanRenew();
-    // console.log(this.loanRenewResult.timeLeft);
     this.loanRenewResult = this.loanRenewHelper.result;
   }
 
@@ -350,6 +349,8 @@ export default class IABookActions extends LitElement {
    * Execute when loan is expired
    */
   async browseHasExpired() {
+    clearTimeout(this.browserTimer);
+
     const currStatus = { ...this.lendingStatus, browsingExpired: true };
     this.lendingStatus = currStatus;
 
@@ -461,7 +462,6 @@ export default class IABookActions extends LitElement {
       await this.showToastMessage();
       await this.browseHasRenew();
       await this.resetTimerCountState();
-      this.startLoanTokenPoller();
     }
   }
 
@@ -527,6 +527,20 @@ export default class IABookActions extends LitElement {
 
     if (errorMsg) this.showErrorModal(errorMsg, action);
 
+    // if error related to loan token
+    // - clear tokenPoller interval
+    // - set user_has_browsed to `false`
+    if (action === 'create_token') {
+      this.tokenPoller.disconnectedInterval();
+
+      const currStatus = {
+        ...this.lendingStatus,
+        user_has_browsed: false,
+        available_to_browse: true,
+      };
+      this.lendingStatus = currStatus;
+    }
+
     // update action bar state if book is not available to browse or borrow.
     if (errorMsg && errorMsg.match(/not available to borrow/gm)) {
       let currStatus = this.lendingStatus;
@@ -582,7 +596,8 @@ export default class IABookActions extends LitElement {
           href="mailto:info@archive.org?subject=Help: cannot access my borrowed book: ${this
             .identifier}"
           >info@archive.org</a
-        >`;
+        ><br /><br />
+        errorLog: ${errorMsg}`;
     }
 
     this.modal.showModal({