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

package/package.json

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

package/src/assets/data/info.js

@@ -4,9 +4,14 @@ export const infoIcon = html`<svg
   height="20"
   width="20"
   viewBox="0 0 100 100"
-  xmlns="http://www.w3.org/2000/svg">
-    <g fill="none" fill-rule="evenodd"><path d="m0 0h100v100h-100z" fill="#fff"/>
-    <path d="m49.8315487 0h.1702245c6.7356878 0 13.1853038 1.31117332 19.3488483 3.93351997 6.1635444 2.62234664 11.4854233 6.15778963 15.9656369 10.60632903 4.4802135 4.4485394 8.0478347 9.7522946 10.7028636 15.9112655 2.655029 6.1589709 3.980878 12.6038012 3.9789971 19.3344909.0567419 6.6716279-1.1702933 13.0585776-3.6811042 19.1608491-2.510811 6.1022715-6.106803 11.5206067-10.7879759 16.2550055-9.7027949 9.7522946-21.4884754 14.6851412-35.3570414 14.79854h-.1702244c-6.7333236 0-13.1829397-1.3111733-19.3488483-3.93352-6.1659087-2.6223466-11.4877876-6.1577896-15.9656369-10.606329s-8.04547055-9.7522946-10.7028637-15.9112655c-2.65739314-6.1589709-3.9844243-12.6038012-3.98254337-19.3344909-.05674149-6.6716279 1.17029325-13.0585776 3.68110421-19.1608491 2.51081095-6.1022715 6.10680292-11.5206067 10.78797586-16.2550055 9.7027949-9.75229456 21.4884754-14.68514123 35.3570414-14.79854zm12.6566146 26.4757998c1.6745578-1.6828001 2.5118367-3.6747334 2.5118367-5.9757998 0-2.4126333-.8095238-4.4324583-2.4285714-6.059475s-3.6289796-2.440525-6.0297959-2.440525c-2.4008164 0-4.4107483.8135083-6.029796 2.440525-1.6745578 1.6270167-2.5118367 3.6468417-2.5118367 6.059475 0 2.1871753.8372789 4.1791086 2.5118367 5.9757998 1.6745579 1.6828001 3.6844898 2.5242002 6.029796 2.5242002 2.3453061 0 4.3274829-.8414001 5.9465306-2.5242002zm-12.1370589 52.7776981-1.2815282-.9486968c0-.4588935.398855-1.8938272 1.196565-4.3048011l12.7338588-39-23.0745876 3.6164609.2548896 3.873251c0-.1141289.4554971-.1997256 1.3664914-.2567901.9109942 0 1.623741.1723823 2.1382404.5171468.5121392.2306356.7965299.6039323.8531721 1.1198902 0 .8607225-.6549247 3.2134431-1.9647739 7.0581619l-8.1175252 24.1061729c-1.0242785 3.2716963-1.5080967 5.5388203-1.4514546 6.8013717.0566421 1.6643804.8826732 2.9839963 2.4780932 3.9588477 1.2532071.803658 2.8769482 1.205487 4.8712231 1.205487h.5982825c1.7653464-.0570645 3.8445846-.3875629 6.2377146-.9914952 2.3931299-.6039323 4.3590839-1.3933242 5.8978617-2.3681756 1.3098493-.803658 2.3919499-1.5359853 3.2463021-2.1969821.8543521-.6609968 1.3959925-1.1341564 1.6249211-1.4194788l.3433929-.3459533-2.8214861-3.3596708-2.9914125 2.0650205c-.79771.4588935-1.5104568.7454047-2.1382404.8595337z" fill="#000" fill-rule="nonzero"/>
+  xmlns="http://www.w3.org/2000/svg"
+>
+  <g fill="none" fill-rule="evenodd">
+    <path d="m0 0h100v100h-100z" fill="#fff" />
+    <path
+      d="m49.8315487 0h.1702245c6.7356878 0 13.1853038 1.31117332 19.3488483 3.93351997 6.1635444 2.62234664 11.4854233 6.15778963 15.9656369 10.60632903 4.4802135 4.4485394 8.0478347 9.7522946 10.7028636 15.9112655 2.655029 6.1589709 3.980878 12.6038012 3.9789971 19.3344909.0567419 6.6716279-1.1702933 13.0585776-3.6811042 19.1608491-2.510811 6.1022715-6.106803 11.5206067-10.7879759 16.2550055-9.7027949 9.7522946-21.4884754 14.6851412-35.3570414 14.79854h-.1702244c-6.7333236 0-13.1829397-1.3111733-19.3488483-3.93352-6.1659087-2.6223466-11.4877876-6.1577896-15.9656369-10.606329s-8.04547055-9.7522946-10.7028637-15.9112655c-2.65739314-6.1589709-3.9844243-12.6038012-3.98254337-19.3344909-.05674149-6.6716279 1.17029325-13.0585776 3.68110421-19.1608491 2.51081095-6.1022715 6.10680292-11.5206067 10.78797586-16.2550055 9.7027949-9.75229456 21.4884754-14.68514123 35.3570414-14.79854zm12.6566146 26.4757998c1.6745578-1.6828001 2.5118367-3.6747334 2.5118367-5.9757998 0-2.4126333-.8095238-4.4324583-2.4285714-6.059475s-3.6289796-2.440525-6.0297959-2.440525c-2.4008164 0-4.4107483.8135083-6.029796 2.440525-1.6745578 1.6270167-2.5118367 3.6468417-2.5118367 6.059475 0 2.1871753.8372789 4.1791086 2.5118367 5.9757998 1.6745579 1.6828001 3.6844898 2.5242002 6.029796 2.5242002 2.3453061 0 4.3274829-.8414001 5.9465306-2.5242002zm-12.1370589 52.7776981-1.2815282-.9486968c0-.4588935.398855-1.8938272 1.196565-4.3048011l12.7338588-39-23.0745876 3.6164609.2548896 3.873251c0-.1141289.4554971-.1997256 1.3664914-.2567901.9109942 0 1.623741.1723823 2.1382404.5171468.5121392.2306356.7965299.6039323.8531721 1.1198902 0 .8607225-.6549247 3.2134431-1.9647739 7.0581619l-8.1175252 24.1061729c-1.0242785 3.2716963-1.5080967 5.5388203-1.4514546 6.8013717.0566421 1.6643804.8826732 2.9839963 2.4780932 3.9588477 1.2532071.803658 2.8769482 1.205487 4.8712231 1.205487h.5982825c1.7653464-.0570645 3.8445846-.3875629 6.2377146-.9914952 2.3931299-.6039323 4.3590839-1.3933242 5.8978617-2.3681756 1.3098493-.803658 2.3919499-1.5359853 3.2463021-2.1969821.8543521-.6609968 1.3959925-1.1341564 1.6249211-1.4194788l.3433929-.3459533-2.8214861-3.3596708-2.9914125 2.0650205c-.79771.4588935-1.5104568.7454047-2.1382404.8595337z"
+      fill="#000"
+      fill-rule="nonzero"
+    />
   </g>
-</svg>
-`;
+</svg> `;

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

@@ -95,5 +95,22 @@ export default async function ActionsHandlerService(options) {
     window?.Sentry?.captureException(
       `${sentryLogs.actionsHandlerService} - Error: ${error}`
     );
+
+    /**
+     * Report it, don't just swallow it. A rejected fetch (offline, dropped
+     * connection) or a non-JSON body (a 405 returning HTML, which QA has
+     * been seeing) lands here, and calling neither `success` nor `error`
+     * leaves every caller waiting on a callback that never comes.
+     *
+     * For renew_loan that's not merely a missing modal: IABookActions
+     * clears its loanRenewInProgress guard from these callbacks, so a
+     * silent failure latched it on for good and every later renewal
+     * attempt became a no-op. Backgrounding a tab on a flaky mobile
+     * connection is exactly when this fires.
+     */
+    log(`[IABookActions] ✗ ${option.action} threw`, error);
+    option?.error({
+      error: `Could not reach the lending service. Please check your connection and try again. (${error})`,
+    });
   }
 }

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

@@ -6,7 +6,11 @@ import log from '../log.js';
 
 import ActionsHandlerService from './actions-handler-service.js';
 import LoanAnanlytics from '../loan-analytics.js';
-import { analyticsCategories, analyticsActions, analyticsLabels } from '../../config/analytics-event-and-category.js';
+import {
+  analyticsCategories,
+  analyticsActions,
+  analyticsLabels,
+} from '../../config/analytics-event-and-category.js';
 import * as Cookies from '../doc-cookies.js';
 
 /**
@@ -172,32 +176,53 @@ export default class ActionsHandler extends LitElement {
       action,
       identifier: this.identifier,
       success: async data => {
-        log('RENEW_LOAN --- ', data, this.identifier);
-        const activeLoan = data.loan ? data.loan : undefined;
-        const isRenewal = activeLoan.renewal;
-
-        if (activeLoan && isRenewal) {
-          // Await — loanAutoRenewed listeners read this same cache key
-          // immediately; dispatching before the write lands was a race.
-          await this.setBrowseTimeSession();
-
-          // Only record the renew analytics event once the renewal has
-          // actually succeeded — not merely attempted.
-          await this.loanAnanlytics?.storeLoanStatsCount(
-            this.identifier,
-            'autorenew'
-          );
-          const analyticsLabel =
-            renewType === 'auto'
-              ? analyticsLabels.browseAutoRenew
-              : analyticsLabels.browseManualRenew;
-          this.loanAnanlytics?.sendEvent(
-            analyticsCategories.browse,
-            analyticsActions.browseRenew,
-            analyticsLabel,
-            this.identifier
-          );
-        } else {
+        // Anything thrown in here is an unhandled rejection that dispatches
+        // NOTHING — and IABookActions only clears loanRenewInProgress when
+        // one of these two events arrives, so a throw here latches it on
+        // permanently (dead countdown, loan stuck "active"). Always exit
+        // through exactly one of the two dispatches below.
+        try {
+          log('RENEW_LOAN --- ', data, this.identifier);
+          const activeLoan = data.loan ? data.loan : undefined;
+          // Optional chaining: `data.loan` is genuinely absent on some
+          // failures, and reading `.renewal` off undefined threw here.
+          const isRenewal = activeLoan?.renewal;
+
+          if (activeLoan && isRenewal) {
+            // Await — loanAutoRenewed listeners read this same cache key
+            // immediately; dispatching before the write lands was a race.
+            await this.setBrowseTimeSession();
+
+            // Only record the renew analytics event once the renewal has
+            // actually succeeded — not merely attempted.
+            await this.loanAnanlytics?.storeLoanStatsCount(
+              this.identifier,
+              'autorenew'
+            );
+            const analyticsLabel =
+              renewType === 'auto'
+                ? analyticsLabels.browseAutoRenew
+                : analyticsLabels.browseManualRenew;
+            this.loanAnanlytics?.sendEvent(
+              analyticsCategories.browse,
+              analyticsActions.browseRenew,
+              analyticsLabel,
+              this.identifier
+            );
+
+            // Dispatch the success outcome ONLY for a confirmed renewal.
+            // This used to fire on the failure path too, so a
+            // `{loan: {renewal: false}}` response reported an error AND a
+            // success: the error modal went up while handleLoanAutoRenewed
+            // simultaneously put a fresh countdown back on the bar.
+            this.dispatchEvent(
+              new CustomEvent('loanAutoRenewed', {
+                detail: { action, data: { ...data, loan: activeLoan } },
+              })
+            );
+            return;
+          }
+
           log('RENEW_LOAN ERROR --- ', {
             action,
             isRenewal,
@@ -213,14 +238,17 @@ export default class ActionsHandler extends LitElement {
             error: true,
             message: 'Loan renewal failed: no loan active.',
           });
+        } catch (error) {
+          log('RENEW_LOAN THREW --- ', error);
+          window?.Sentry?.captureException(
+            `${sentryLogs.bookRenewFailed} - Exception: ${error}`
+          );
+          this.dispatchActionError(action, {
+            data,
+            error: true,
+            message: `Loan renewal failed: ${error}`,
+          });
         }
-
-        // dispatch outcome of loan renewal
-        this.dispatchEvent(
-          new CustomEvent('loanAutoRenewed', {
-            detail: { action, data: { ...data, loan: activeLoan } },
-          })
-        );
       },
       error: data => {
         this.dispatchActionError(action, data);
@@ -428,7 +456,8 @@ export default class ActionsHandler extends LitElement {
    * @returns {void}
    */
   setStickyAdminAccess(value) {
-    const domain = window.location.hostname === 'localhost' ? 'localhost' : '.archive.org';
+    const domain =
+      window.location.hostname === 'localhost' ? 'localhost' : '.archive.org';
     const expires = new Date(Date.now() + 30 * 24 * 60 * 60 * 1000); // 30 days from now
     Cookies.setItem('sticky-admin-access', value, expires, '/', domain);
   }

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

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

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

@@ -26,7 +26,7 @@ export class LoanRenewHelper {
     };
   }
 
-  async handleLoanRenew() {
+  handleLoanRenew() {
     try {
       if (this.hasPageChanged) {
         return this.pageChanged(); // user clicked on page
@@ -99,7 +99,7 @@ export class LoanRenewHelper {
     } else if (pageChangedTime >= pageChangeTimeFrame) {
       this.result = {
         texts: '',
-        renewNow: true,  // viewed in last time frame
+        renewNow: true, // viewed in last time frame
         renewType: 'auto',
       };
     }

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

@@ -28,8 +28,16 @@ export class LoanTokenPoller {
      * the loan is genuinely valid. Retry a few times with backoff instead
      * of giving up on the first attempt.
      */
-    this.maxInitialTokenRetries = 3;
-    this.initialTokenRetryDelay = 1000; // ms, multiplied by attempt number
+    this.maxTokenRetries = 3;
+    this.tokenRetryDelay = 1000; // ms, multiplied by attempt number
+
+    /**
+     * Handle for a pending retry, so teardown can cancel it. It's a bare
+     * setTimeout rather than an IALendingIntervals entry, so without this
+     * a retry scheduled just before the loan is returned would still fire
+     * its create_token afterwards.
+     */
+    this.retryTimeout = undefined;
 
     /**
      * loan analytics instance
@@ -42,6 +50,8 @@ export class LoanTokenPoller {
 
   disconnectedCallback() {
     window?.IALendingIntervals?.clearTokenPoller();
+    clearTimeout(this.retryTimeout);
+    this.retryTimeout = undefined;
   }
 
   async bookAccessed() {
@@ -123,19 +133,24 @@ export class LoanTokenPoller {
       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);
+    // The renewal write can be mid-propagation for an interval refresh too,
+    // not just the initial call — a routine tick landing moments after a
+    // renewal hits the same race. Retry both; isInitial only decides how a
+    // final failure is reported, not whether it's worth retrying.
+    if (isStaleLoanReadError && retryCount < this.maxTokenRetries) {
+      const delay = this.tokenRetryDelay * (retryCount + 1);
+      log(
+        '[LoanTokenPoller] retrying create_token after stale-loan-read error',
+        {
+          identifier: this.identifier,
+          nextRetryCount: retryCount + 1,
+          delay,
+        }
+      );
+      clearTimeout(this.retryTimeout);
+      this.retryTimeout = setTimeout(() => {
+        this.retryTimeout = undefined;
+        this.handleLoanTokenPoller(isInitial, retryCount + 1);
       }, delay);
       return;
     }
@@ -146,7 +161,10 @@ export class LoanTokenPoller {
       retryCount,
     });
 
-    this.errorCallback({ detail: { action, data } });
+    // isInitial rides along so the consumer can distinguish "the book won't
+    // open at all" from "a mid-read refresh blipped" — see
+    // IABookActions.handleLendingActionError.
+    this.errorCallback({ detail: { action, data, isInitial } });
 
     // send error to Sentry
     window?.Sentry?.captureMessage(