@internetarchive/ia-book-actions 1.4.4-alpha11 → 1.4.4-alpha12

package/package.json

@@ -7,7 +7,7 @@
   },
   "author": "Internet Archive",
   "license": "AGPL-3.0-only",
-  "version": "1.4.4-alpha11",
+  "version": "1.4.4-alpha12",
   "main": "index.js",
   "module": "index.js",
   "publishConfig": {

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

@@ -372,6 +372,12 @@ export default class ActionsHandler extends LitElement {
         new Date().getTime() + this.loanTotalTime * 1000
       );
 
+      log('[ActionsHandler] setBrowseTimeSession: resetting loanTime', {
+        identifier: this.identifier,
+        expireDate,
+        loanTotalTime: this.loanTotalTime,
+      });
+
       // set a value
       await this.localCache.set({
         key: `${this.identifier}-loanTime`,
@@ -381,12 +387,20 @@ export default class ActionsHandler extends LitElement {
 
       // delete pageChangedTime when book is auto renew at nth minute
       await this.localCache.delete(`${this.identifier}-pageChangedTime`);
+
+      log('[ActionsHandler] setBrowseTimeSession: loanTime reset complete', {
+        identifier: this.identifier,
+      });
     } catch (error) {
-      log(error);
+      log('[ActionsHandler] setBrowseTimeSession failed', error);
     }
   }
 
   deleteLoanCookies() {
+    log('[ActionsHandler] deleteLoanCookies: expiring loan cookies', {
+      identifier: this.identifier,
+    });
+
     const date = new Date();
     date.setTime(date.getTime() - 24 * 60 * 60 * 1000); // one day ago
 

package/src/core/services/loan-analytics.js

@@ -159,16 +159,16 @@ export default class LoanAnanlytics {
    * @memberof LoanAnanlytics
    */
   sendEvent(eventCategory, eventAction, label, extraParams) {
-    log(
-      'eventCategory:-',
-      eventCategory,
-      '||\teventAction:-',
-      eventAction,
-      '||\tlabel:-',
-      label,
-      '||\textraParams:-',
-      extraParams,
-    );
+    // log(
+    //   'eventCategory:-',
+    //   eventCategory,
+    //   '||\teventAction:-',
+    //   eventAction,
+    //   '||\tlabel:-',
+    //   label,
+    //   '||\textraParams:-',
+    //   extraParams,
+    // );
 
     window?.archive_analytics?.send_event_no_sampling(
       eventCategory,

package/src/core/services/loan-token-poller.js

@@ -2,6 +2,7 @@
 import ActionsHandlerService from './actions-handler/actions-handler-service.js';
 import LoanAnanlytics from './loan-analytics.js';
 import { sentryLogs } from '../config/sentry-events.js';
+import log from './log.js';
 
 /**
  * This class is used to create loan token for borrowed books
@@ -77,11 +78,21 @@ export class LoanTokenPoller {
    */
   async handleLoanTokenPoller(isInitial = false, retryCount = 0) {
     const action = 'create_token';
+    log('[LoanTokenPoller] create_token requested', {
+      identifier: this.identifier,
+      isInitial,
+      retryCount,
+    });
     ActionsHandlerService({
       identifier: this.identifier,
       action,
       error: data => this.handleTokenError(data, isInitial, retryCount),
       success: () => {
+        log('[LoanTokenPoller] create_token succeeded', {
+          identifier: this.identifier,
+          isInitial,
+          retryCount,
+        });
         if (isInitial) this.successCallback();
       },
     });
@@ -104,18 +115,37 @@ export class LoanTokenPoller {
       typeof data?.error === 'string' &&
       /do not currently have this book borrowed/i.test(data.error);
 
+    log('[LoanTokenPoller] create_token failed', {
+      identifier: this.identifier,
+      isInitial,
+      retryCount,
+      isStaleLoanReadError,
+      error: data?.error,
+    });
+
     if (
       isInitial &&
       isStaleLoanReadError &&
       retryCount < this.maxInitialTokenRetries
     ) {
       const delay = this.initialTokenRetryDelay * (retryCount + 1);
+      log('[LoanTokenPoller] retrying create_token after stale-loan-read error', {
+        identifier: this.identifier,
+        nextRetryCount: retryCount + 1,
+        delay,
+      });
       setTimeout(() => {
         this.handleLoanTokenPoller(true, retryCount + 1);
       }, delay);
       return;
     }
 
+    log('[LoanTokenPoller] giving up on create_token, reporting error', {
+      identifier: this.identifier,
+      isInitial,
+      retryCount,
+    });
+
     this.errorCallback({ detail: { action, data } });
 
     // send error to Sentry

package/src/ia-book-actions.js

@@ -465,7 +465,15 @@ export default class IABookActions extends LitElement {
    * On error: handleLendingActionError() shows showLoanUnavailableModal().
    */
   autoRenewExpiredLoan() {
-    if (this.loanRenewInProgress) return;
+    if (this.loanRenewInProgress) {
+      log('[IABookActions] autoRenewExpiredLoan: skipped, renewal already in progress', {
+        identifier: this.identifier,
+      });
+      return;
+    }
+    log('[IABookActions] autoRenewExpiredLoan: starting silent renewal', {
+      identifier: this.identifier,
+    });
     this.loanRenewInProgress = true;
     this.recoveringFromLoanExpiry = true;
 
@@ -578,7 +586,10 @@ export default class IABookActions extends LitElement {
    * Execute when loan is expired
    */
   async browseHasExpired() {
-    log('[IABookActions] browseHasExpired');
+    log('[IABookActions] browseHasExpired', {
+      identifier: this.identifier,
+      loanRenewInProgress: this.loanRenewInProgress,
+    });
     window?.IALendingIntervals?.clearAll();
 
     const currStatus = {
@@ -591,6 +602,9 @@ export default class IABookActions extends LitElement {
     // remove respected key:value for loan-renew
     await this.localCache.delete(`${this.identifier}-loanTime`);
     await this.localCache.delete(`${this.identifier}-pageChangedTime`);
+    log('[IABookActions] browseHasExpired: cleared loanTime/pageChangedTime cache', {
+      identifier: this.identifier,
+    });
 
     // show message after browsed book is expired.
     this.loanRenewResult.renewNow = false;
@@ -817,9 +831,8 @@ export default class IABookActions extends LitElement {
     }
 
     log('[IABookActions] timer', {
-      secondsLeft,
-      loanRenewAtLast: this.loanRenewTimeConfig.loanRenewAtLast,
-      pageChangedInLast: this.loanRenewTimeConfig.pageChangedInLast,
+      whatShouldLeft: resyncd.whatShouldLeft,
+      whatIsleft: secondsLeft,
     });
 
     /**
@@ -978,6 +991,14 @@ export default class IABookActions extends LitElement {
     const action = event?.detail?.action;
     const errorMsg = event?.detail?.data?.error;
 
+    log('[IABookActions] handleLendingActionError', {
+      identifier: this.identifier,
+      action,
+      errorMsg,
+      loanRenewInProgress: this.loanRenewInProgress,
+      recoveringFromLoanExpiry: this.recoveringFromLoanExpiry,
+    });
+
     if (action === 'create_token') {
       // A create_token hiccup only affects BookReader's page-image access
       // token — it says nothing about how much time is left on the loan