@internetarchive/ia-book-actions 0.0.29-alpha4 → 0.0.29-alpha5

package/demo/index.html

@@ -128,8 +128,8 @@
     iaBookActions.returnUrl = 'https://openlibrary.org';
     iaBookActions.localCache = localCache;
     iaBookActions.autoRenewConfig = {
-      totalTime: 10, // 60 second = 1 min
-      autoCheckAt: 8, // totalTime - 10th minute
+      totalTime: 20, // 60 second = 1 min
+      autoCheckAt: 15, // totalTime - 10th minute
       FlippedInLast: 15, // within last 15 second/minute 
     };
 
@@ -226,7 +226,7 @@
             await localCache.set({
               key: `${identifier}-loanTime`,
               value: new Date(), // current time
-              ttl: parseInt(iaBookActions.autoRenewConfig.totalTime),
+              ttl: Number(iaBookActions.autoRenewConfig.totalTime),
             })
 
             await localCache.delete(`${identifier}-pageFlipTime`);

package/package.json

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

package/src/assets/data/lending-get-status-service.js

@@ -100,7 +100,7 @@ export const canBrowseAndBorrow = {
   // userid: "",
   bookUrl: '/details/practicalorganic00plim',
   daysLeftOnLoan: 0,
-  isAdmin: true,
+  isAdmin: false,
   isArchiveOrgLending: true,
   isAvailable: false,
   isAvailableForBrowsing: false,

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

@@ -128,7 +128,6 @@ export default class ActionsHandler extends LitElement {
 
   handleAutoBrowseIt() {
     const action = 'renew_loan';
-    this.setBrowseTimeSession()
 
     ActionsHandlerService({
       action,
@@ -295,6 +294,19 @@ export default class ActionsHandler extends LitElement {
     }
   }
 
+  async setBrowseTimeSession(_date = '') {
+    try {
+      // set a value
+      await this.localCache.set({
+        key: `${this.identifier}-loanTime`,
+        value: new Date(), // current time
+        ttl: Number(this.autoRenewConfig.totalTime),
+      })
+
+      await this.localCache.delete(`${this.identifier}-pageFlipTime`);
+    } catch (error) {}
+  }
+
   deleteLoanCookies() {
     const date = new Date();
     date.setTime(date.getTime() - 24 * 60 * 60 * 1000); // one day ago
@@ -314,17 +326,4 @@ export default class ActionsHandler extends LitElement {
       '.archive.org'
     );
   }
-
-  async setBrowseTimeSession() {
-    try {
-      // set a value
-      await this.localCache.set({
-        key: `${this.identifier}-loanTime`,
-        value: new Date(), // current time
-        ttl: parseInt(this.autoRenewConfig.totalTime),
-      })
-
-      await this.localCache.delete(`${this.identifier}-pageFlipTime`);
-    } catch (error) {}
-  }
 }

package/src/core/services/one-hour-auto-renew.js

@@ -51,7 +51,7 @@ export class OneHourAutoRenew {
     await this.localCache.set({
       key: `${this.identifier}-pageFlipTime`,
       value: new Date(), // current time
-      ttl: parseInt(this.autoRenewConfig.totalTime),
+      ttl: Number(this.autoRenewConfig.totalTime),
     })
   }
 
@@ -75,6 +75,8 @@ export class OneHourAutoRenew {
       this.resultRes.browseAgainNow = true;
       this.resultRes.hideToast = false;
       this.resultRes.renewNow = true;
+
+      this.setNewBrowseTime();
     }
 
     return this.resultRes;
@@ -105,11 +107,32 @@ export class OneHourAutoRenew {
 
       // delete pageFlipTime when book is auto renew at nth minute
       await this.localCache.delete(`${this.identifier}-pageFlipTime`);
+      this.setNewBrowseTime();
     }
 
     return this.resultRes;
   }
 
+  async setNewBrowseTime() {
+    try {
+      // last 15 min if used flipped a page.
+      const expireDate = await this.changeTime(
+        new Date(),
+        this.autoRenewConfig.totalTime,
+        'add'
+      ); // 15 seconds
+
+      // set a value
+      await this.localCache.set({
+        key: `${this.identifier}-loanTime`,
+        value: expireDate, // expireDate time
+        ttl: Number(this.autoRenewConfig.totalTime),
+      })
+
+      await this.localCache.delete(`${this.identifier}-pageFlipTime`);
+    } catch (error) {}
+  }
+
   async changeTime(date, minutes, op) {
     if (date === undefined) return undefined;
     
@@ -128,25 +151,4 @@ export class OneHourAutoRenew {
       `identifier=${this.identifier}`
     );
   }
-
-  async handleAutoRenew() {
-    const action = 'renew_loan';
-    ActionsHandlerService({
-      identifier: this.identifier,
-      action,
-      error: data => {
-        window?.Sentry?.captureMessage(
-          'handleAutoRenew error',
-          JSON.stringify(data)
-        );
-        // this.errorCallback({ detail: { action, data } });
-        // send LendingServiceError to GA
-        this.sendEvent('handleAutoRenew', action);
-      },
-      success: () => {
-        console.log('success!');
-        return 'success';
-      },
-    });
-  }
 }

package/src/ia-book-actions.js

@@ -102,7 +102,7 @@ export default class IABookActions extends LitElement {
   }
 
   updated(changed) {
-    console.log(changed)
+    // console.log(changed)
     if (changed.has('lendingStatus') || changed.has('bwbPurchaseUrl')) {
       this.setupLendingToolbarActions();
       this.update();
@@ -142,6 +142,7 @@ export default class IABookActions extends LitElement {
   async browseHasExpired() {
     const currStatus = { ...this.lendingStatus, browsingExpired: true };
     this.lendingStatus = currStatus;
+    this.browseAgainNow = false;
 
     // remove respected key:value
     await this.localCache.delete(`${this.identifier}-loanTime`);
@@ -152,11 +153,14 @@ export default class IABookActions extends LitElement {
   }
 
   async browseHasRenew() {
-    const currStatus = { 
+    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: this.autoRenewConfig.totalTime + 1,
+      secondsLeftOnLoan: Math.abs(Math.round(secondsLeft)),
     };
     this.lendingStatus = currStatus;