@internetarchive/ia-book-actions 0.0.29-alpha2 → 0.0.29-alpha3

package/demo/index.html

@@ -127,7 +127,7 @@
     iaBookActions.tokenDelay = 2000; // 2 seconds
     iaBookActions.returnUrl = 'https://openlibrary.org';
     iaBookActions.localCache = localCache;
-    iaBookActions.autoRenewTimeConfig = {
+    iaBookActions.autoRenewConfig = {
       totalTime: 60, // 60 second = 1 min
       autoCheckAt: 55, // 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.autoRenewTimeConfig.totalTime),
+              ttl: parseInt(iaBookActions.autoRenewConfig.totalTime),
             })
 
             await localCache.delete(`${identifier}-pageFlipTime`);

package/package.json

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

package/src/components/collapsible-action-group.js

@@ -29,7 +29,7 @@ export class CollapsibleActionGroup extends ActionsHandler {
       disabled: { type: Boolean },
       returnUrl: { type: String },
       browseAgainNow: { type: Boolean },
-      autoRenewTimeConfig: { type: Object },
+      autoRenewConfig: { type: Object },
     };
   }
 
@@ -50,7 +50,7 @@ export class CollapsibleActionGroup extends ActionsHandler {
     this.disabled = false;
     this.returnUrl = '';
     this.browseAgainNow = false;
-    this.autoRenewTimeConfig = {};
+    this.autoRenewConfig = {};
   }
 
   updated(changed) {

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

@@ -19,7 +19,7 @@ export default class ActionsHandler extends LitElement {
     this.identifier = '';
     this.ajaxTimeout = 6000;
     this.returnUrl = '';
-    this.autoRenewTimeConfig = {};
+    this.autoRenewConfig = {};
 
     this.localCache = new LocalCache({
       namespace: '1HourLoanStorage',
@@ -317,7 +317,7 @@ export default class ActionsHandler extends LitElement {
       await this.localCache.set({
         key: `${this.identifier}-loanTime`,
         value: new Date(), // current time
-        ttl: parseInt(this.autoRenewTimeConfig.totalTime),
+        ttl: parseInt(this.autoRenewConfig.totalTime),
       })
 
       await this.localCache.delete(`${this.identifier}-pageFlipTime`);

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

@@ -6,11 +6,11 @@ import ActionsHandlerService from './actions-handler/actions-handler-service.js'
  * ActionsHandlerService is a function being used to execute
  */
 export class OneHourAutoRenew {
-  constructor(pageClick, identifier, localCache, autoRenewTimeConfig, userHasBrowsed) {
+  constructor(pageClick, identifier, localCache, autoRenewConfig, userHasBrowsed) {
     this.pageClick = pageClick;
     this.identifier = identifier;
     this.localCache = localCache;
-    this.autoRenewTimeConfig = autoRenewTimeConfig;
+    this.autoRenewConfig = autoRenewConfig;
     this.userHasBrowsed = userHasBrowsed;
 
     // private props
@@ -51,7 +51,7 @@ export class OneHourAutoRenew {
     await this.localCache.set({
       key: `${this.identifier}-pageFlipTime`,
       value: new Date(), // current time
-      ttl: parseInt(this.autoRenewTimeConfig.totalTime),
+      ttl: parseInt(this.autoRenewConfig.totalTime),
     })
   }
 
@@ -59,7 +59,7 @@ export class OneHourAutoRenew {
     const {
       totalTime, // 60
       autoCheckAt, // 50
-    } = this.autoRenewTimeConfig;
+    } = this.autoRenewConfig;
     const currentDate = new Date();
     const loanTime = await this.localCache.get(`${this.identifier}-loanTime`);
 
@@ -82,7 +82,7 @@ export class OneHourAutoRenew {
 
   async autoCheckerTimer() {
     const currentDate = new Date();
-    const { FlippedInLast } = this.autoRenewTimeConfig;
+    const { FlippedInLast } = this.autoRenewConfig;
     const lastPageFlipTime = await this.localCache.get(`${this.identifier}-pageFlipTime`);
 
     // last 15 min if used flipped a page.
@@ -93,15 +93,18 @@ export class OneHourAutoRenew {
     ); // 15 seconds
 
     if (lastPageFlipTime === undefined || lastPageFlipTime <= lastFlipTimeFrame) { // not viewed
-      console.log('2');
+      console.log('2 not viewed, warning message!');
       this.resultRes.toastTexts = this.autoReturnWarning;
       this.resultRes.hideToast = false;
     } else if (lastPageFlipTime >= lastFlipTimeFrame) { // viewed in last time frame
-      console.log('3');
+      console.log('3 viewed, auto renew and message!');
       this.resultRes.toastTexts = this.autoRenewMessage;
       this.resultRes.browseAgainNow = true;
       this.resultRes.hideToast = false;
       this.resultRes.renewNow = true;
+
+      // delete pageFlipTime when book is auto renew at nth minute
+      await this.localCache.delete(`${this.identifier}-pageFlipTime`);
     }
 
     return this.resultRes;

package/src/ia-book-actions.js

@@ -45,7 +45,7 @@ export default class IABookActions extends LitElement {
       remainingTime: { type: Number },
       resetTimerCountdown: { type: Boolean },
       localCache: { type: Object },
-      autoRenewTimeConfig: { type: Object },
+      autoRenewConfig: { type: Object },
       browseAgainNow: { type: Boolean },
     };
   }
@@ -69,7 +69,7 @@ export default class IABookActions extends LitElement {
     this.localCache = new LocalCache({
       namespace: '1HourLoanStorage'
     }),
-    this.autoRenewTimeConfig = {},
+    this.autoRenewConfig = {},
 
     // private props
     this.primaryActions = [];
@@ -124,7 +124,7 @@ export default class IABookActions extends LitElement {
         isPageFlipped,
         this.identifier,
         this.localCache,
-        this.autoRenewTimeConfig,
+        this.autoRenewConfig,
         this.lendingStatus.user_has_browsed && !this.lendingStatus.browsingExpired
       );
 
@@ -291,7 +291,7 @@ export default class IABookActions extends LitElement {
     return this.borrowType === 'browsed'
       ? html`<timer-countdown
           time=${Number(this.remainingTime)}
-          .autoCheckAt=${this.autoRenewTimeConfig.autoCheckAt}
+          .autoCheckAt=${this.autoRenewConfig.autoCheckAt}
           ?resetTimerCountdown=${this.resetTimerCountdown}
         ></timer-countdown>`
       : nothing;
@@ -320,7 +320,7 @@ export default class IABookActions extends LitElement {
         .borrowType=${this.borrowType}
         .returnUrl=${this.returnUrl}
         .autoRenew=${this.autoRenew}
-        .autoRenewTimeConfig=${this.autoRenewTimeConfig}
+        .autoRenewConfig=${this.autoRenewConfig}
         ?hasAdminAccess=${this.hasAdminAccess}
         ?disabled=${this.disableActionGroup}
         ?browseAgainNow=${this.browseAgainNow}