@internetarchive/ia-book-actions 0.1.11-b2 → 0.1.11-b4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-book-actions",
-  "version": "0.1.11-b2",
+  "version": "0.1.11-b4",
   "description": "Bookreader actions for borrowable book",
   "author": "Internet Archive",
   "license": "AGPL-3.0-only",

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

@@ -300,6 +300,7 @@ export default class ActionsHandler extends LitElement {
    * set browse time in indexedDB
    */
   async setBrowseTimeSession() {
+    // TODO: USE loan info to determine what we have left
     try {
       const expireDate = new Date(
         new Date().getTime() + this.loanTotalTime * 1000

package/src/ia-book-actions.js

@@ -100,13 +100,17 @@ export default class IABookActions extends LitElement {
 
     /**
      * contains one hour auto-loan-renew time configuration
-     *
-     * @type {object} loanRenewTimeConfig
-     * @property {number} loanTotalTime - total seconds a loan does have
-     * @property {number} loanRenewAtLast - check for loan renew at last
-     * @property {number} pageChangedInLast - consider loan renew eligible if viewed new page
-     */
-    this.loanRenewTimeConfig = {};
+     * defaults to 1 hour config
+     * @type {{
+     *  loanTotalTime: number, - total seconds a loan does have
+     *  loanRenewAtLast: number, - check for loan renew at last
+     *  pageChangedInLast: number, - consider loan renew eligible if viewed new page
+    */
+    this.loanRenewTimeConfig = {
+      loanTotalTime: 3600, // 1 hour
+      loanRenewAtLast: 660, // 11 minutes
+      pageChangedInLast: 900, // 15 minutes
+    };
 
     /**
      * contains one hour auto-loan-renew response
@@ -253,6 +257,7 @@ export default class IABookActions extends LitElement {
     // initial timer state for 1-hour loan
     if (this.borrowType === 'browsed' && !this.loanRenewResult.renewNow) {
       setTimeout(() => {
+        console.log('IN TIMEOUT OF --- setupLendingToolbarActions, firing resetTimerCountState');
         this.resetTimerCountState();
       }, 100);
     }
@@ -478,21 +483,6 @@ export default class IABookActions extends LitElement {
     });
   }
 
-  async browseHasRenew() {
-    window?.IALendingIntervals?.clearAll();
-
-    const loanTime = await this.localCache.get(`${this.identifier}-loanTime`);
-    const secondsLeft = (loanTime - new Date()) / 1000; // different in seconds
-
-    const currStatus = {
-      ...this.lendingStatus,
-      user_has_browsed: true,
-      browsingExpired: false,
-      secondsLeftOnLoan: secondsLeft,
-    };
-    this.lendingStatus = currStatus;
-  }
-
   /**
    * Execute when loan is expired
    */
@@ -543,11 +533,11 @@ export default class IABookActions extends LitElement {
     const timerCountdown = this._shadowRoot.querySelector('timer-countdown');
     if (!timerCountdown) return;
 
-    const secondsLeft = Number(this.lendingStatus.secondsLeftOnLoan);
-    const strokeDashOffset =
-      (secondsLeft / this.loanRenewTimeConfig.loanTotalTime) * 315;
+    const secondsLeft = Number.parseInt((Number(this.lendingStatus.secondsLeftOnLoan)), 10);
+    const strokeDashOffset = Number.parseInt(((secondsLeft / this.loanRenewTimeConfig.loanTotalTime) * 315) * 1.5, 10);
+
 
-      console.log('resetTimerCountState === ', secondsLeft);
+    console.log('resetTimerCountState === ', { secondsLeft, strokeDashOffset });
 
     // set seconds left in loan expire
     timerCountdown.style?.setProperty('--secondsLeftOnLoan', `${secondsLeft}s`);
@@ -555,7 +545,7 @@ export default class IABookActions extends LitElement {
     // set circle stroke offset left in loan expire
     timerCountdown.style?.setProperty(
       '--strokeLeftOnLoan',
-      `${Number(strokeDashOffset)}` // the perimeter of the circle = (π * 2 * radius)
+      `${strokeDashOffset}` // the perimeter of the circle = (π * 2 * radius)
     );
 
     const animationCircle = timerCountdown.shadowRoot.querySelector('.circle');
@@ -584,14 +574,6 @@ export default class IABookActions extends LitElement {
     ></book-title-bar>`;
   }
 
-  get timerCountdownTemplate() {
-    return this.borrowType === 'browsed'
-      ? html`<timer-countdown
-          .secondsLeftOnLoan=${Number(this.lendingStatus.secondsLeftOnLoan)}
-        ></timer-countdown>`
-      : nothing;
-  }
-
   get bookActionBar() {
     return html`
       <collapsible-action-group
@@ -616,7 +598,10 @@ export default class IABookActions extends LitElement {
       >
       </collapsible-action-group>
       ${this.textGroupTemplate} ${this.infoIconTemplate}
-      ${this.timerCountdownTemplate}
+      <timer-countdown
+        .secondsLeftOnLoan=${Number(this.lendingStatus.secondsLeftOnLoan)}
+        class=${this.borrowType === 'browsed' ? '' : 'hide'}
+      ></timer-countdown>
     `;
   }
 
@@ -635,14 +620,26 @@ export default class IABookActions extends LitElement {
       console.log('IABookActions: AutoRenewed:- ', {
         ajaxResponse: event?.detail?.data,
         loanRenewResult: this.loanRenewResult,
-        secondsLeftOnLoan: Math.round(this.lendingStatus.secondsLeftOnLoan),
+        secondsLeftOnLoan: Math.round(this.lendingStatus.secondsLeftOnLoan), // stale? how to fix
       });
 
-      /**
-       * update the lendingStatus property
-       */
-      await this.browseHasRenew();
 
+      // Now, let's reset loan duration & this.lendingStatus
+      const loanTime = await this.localCache.get(`${this.identifier}-loanTime`);
+      const secondsLeft = (loanTime - new Date()) / 1000; // different in seconds
+  
+      const currStatus = {
+        ...this.lendingStatus,
+        user_has_browsed: true,
+        browsingExpired: false,
+        secondsLeftOnLoan: secondsLeft,
+      };
+      this.lendingStatus = currStatus;
+
+      console.log('~~~ handleLoanAutoRenewed - new this.lendingStatus', {
+        secondsLeftOnLoan: this.lendingStatus.secondsLeftOnLoan
+      });
+  
       /**
        * reset timer countdown states
        */
@@ -673,9 +670,11 @@ export default class IABookActions extends LitElement {
       secondsLeft = Math.round(secondsLeft); // round number
 
       // 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);
 
-      console.log("*** startTimerCountdown ***", secondsLeft, resync);
+      console.log("*** startTimerCountdown = reSyncTimerIfGoneOff ***", { secondsLeft, resync });
 
       if (resync) {
         console.log('have resyncd, will end startTimerCountdown here - ');
@@ -948,6 +947,10 @@ export default class IABookActions extends LitElement {
         display: block;
       }
 
+      .hide {
+        display: none;
+      }
+
       .lending-wrapper {
         width: 100%;
         margin: 0 auto;