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

package/package.json

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

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

@@ -172,7 +172,7 @@ export default class ActionsHandler extends LitElement {
       action,
       identifier: this.identifier,
       success: async data => {
-        log('RENEW_LOAN --- ', data, action, data.loan, this.identifier);
+        log('RENEW_LOAN --- ', data, this.identifier);
         const activeLoan = data.loan ? data.loan : undefined;
         const isRenewal = activeLoan.renewal;
 

package/src/ia-book-actions.js

@@ -60,6 +60,7 @@ export default class IABookActions extends LitElement {
       disableActionGroup: { type: Boolean },
       modal: { Object },
       tokenDelay: { type: Number },
+      tokenPollerRenewalDelay: { type: Number },
       timerExecutionSeconds: { type: Number },
       localCache: { type: Object },
       loanRenewTimeConfig: { type: Object },
@@ -105,6 +106,16 @@ export default class IABookActions extends LitElement {
      */
     this.recoveringFromLoanExpiry = false;
 
+    /**
+     * Buffer (ms) before the first create_token call that follows a
+     * confirmed recovery renewal — Lending::do_renew() (backend) deletes
+     * the old loan and writes a brand-new one to the datanode storage, so
+     * create_token's lookup can otherwise race that write's propagation.
+     * Exposed as a property (rather than a hardcoded constant) so it's
+     * configurable per-deployment and overridable to 0 in tests.
+     */
+    this.tokenPollerRenewalDelay = 2000;
+
     this.warningModalOpen = false;
 
     /**
@@ -311,8 +322,23 @@ export default class IABookActions extends LitElement {
         !hasExpired &&
         !this.loanRenewInProgress &&
         !window.IALendingIntervals.tokenPoller
-      )
-        this.startLoanTokenPoller();
+      ) {
+        // Lending::do_renew() (backend) doesn't extend the existing loan —
+        // it DELETES it and writes a brand-new loan record to the datanode
+        // storage. create_token's lookup for that record can race the
+        // write's propagation and come back empty ("you do not currently
+        // have this book borrowed"), even though the renewal that was just
+        // confirmed genuinely succeeded moments earlier. Give the write a
+        // moment to settle before the first create_token call that follows
+        // a real recovery — same underlying datanode-propagation concern
+        // the existing 50-second buffer in loanRenewAttempt() guards
+        // against for the routine renewal path.
+        const tokenPollerDelay = this.recoveringFromLoanExpiry
+          ? this.tokenPollerRenewalDelay
+          : 0;
+        this.recoveringFromLoanExpiry = false;
+        setTimeout(() => this.startLoanTokenPoller(), tokenPollerDelay);
+      }
     }, 100);
 
     this.requestUpdate();
@@ -717,8 +743,10 @@ export default class IABookActions extends LitElement {
         // the still-expired record). loanRenewInProgress already kept the
         // token poller from restarting early, so it'll pick up fresh here
         // once lendingStatus below re-triggers setupLendingToolbarActions().
+        // NOTE: recoveringFromLoanExpiry itself is consumed/reset there,
+        // not here — it decides whether that restart needs a datanode
+        // propagation buffer (see setupLendingToolbarActions).
         this.postInitComplete = false;
-        this.recoveringFromLoanExpiry = false;
       }
 
       const currStatus = {

package/test/ia-book-actions.test.js

@@ -660,6 +660,9 @@ describe('autoRenewExpiredLoan', () => {
       })
     );
     await el.updateComplete;
+    // Not testing the post-confirmation token-poller delay here — avoid
+    // leaving a real multi-second timer dangling past this test.
+    el.tokenPollerRenewalDelay = 0;
 
     await el.localCache.set({
       key: 'foobar-loanTime',
@@ -709,6 +712,9 @@ describe('autoRenewExpiredLoan', () => {
     await el.updateComplete;
     el.postInitComplete = true;
     el.lendingBarPostInit = Sinon.spy();
+    // Use a small but non-zero delay to keep this test fast while still
+    // exercising the same "wait, then restart the poller" code path.
+    el.tokenPollerRenewalDelay = 50;
 
     await el.localCache.set({
       key: 'foobar-loanTime',
@@ -734,7 +740,10 @@ describe('autoRenewExpiredLoan', () => {
       })
     );
 
-    await aTimeout(100);
+    // The post-confirmation token-poller restart is deliberately delayed
+    // (datanode write-propagation buffer — see setupLendingToolbarActions)
+    // before the recovery case's first create_token call.
+    await aTimeout(250);
     await el.updateComplete;
 
     // The confirmed renewal must have forced a fresh create_token cycle
@@ -772,6 +781,10 @@ describe('autoRenewExpiredLoan', () => {
       ttl: 3600,
     });
 
+    // Use a small but non-zero delay to keep this test fast while still
+    // exercising the same "wait, then restart the poller" code path.
+    el.tokenPollerRenewalDelay = 50;
+
     const startTokenPollerSpy = Sinon.spy(el, 'startLoanTokenPoller');
 
     el.autoRenewExpiredLoan();
@@ -790,7 +803,9 @@ describe('autoRenewExpiredLoan', () => {
       })
     );
 
-    await aTimeout(200);
+    // The post-confirmation restart is deliberately delayed (datanode
+    // write-propagation buffer — see setupLendingToolbarActions).
+    await aTimeout(250);
     await el.updateComplete;
 
     expect(startTokenPollerSpy.calledOnce).to.be.true;