@internetarchive/ia-book-actions 0.0.7-4 → 0.0.7-7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-book-actions",
-  "version": "0.0.7-4",
+  "version": "0.0.7-7",
   "description": "Bookreader actions for borrowable book",
   "author": "Internet Archive",
   "license": "AGPL-3.0-only",
@@ -22,9 +22,9 @@
     "@internetarchive/icon-bookmark": "^1.1.3",
     "@internetarchive/icon-close": "^1.1.3",
     "@internetarchive/icon-info": "^1.2.6",
+    "@internetarchive/local-cache": "^0.1.1",
     "@internetarchive/modal-manager": "^0.1.0",
     "@internetarchive/shared-resize-observer": "^0.0.1",
-    "idb-keyval": "^6.0.3",
     "lit-element": "^2.4.0",
     "lit-html": "^1.3.0"
   },

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

@@ -2,7 +2,6 @@ import { html } from 'lit-element';
 import { nothing } from 'lit-html';
 import { classMap } from 'lit-html/directives/class-map';
 
-import { get as indexedDBGet } from 'idb-keyval';
 import ActionsHandler from '../core/services/actions-handler/actions-handler.js';
 
 import buttonBaseStyle from '../assets/styles/ia-button.js';
@@ -51,19 +50,19 @@ export class CollapsibleActionGroup extends ActionsHandler {
     this.consecutiveLoanCounts = 1; // consecutive loan count
   }
 
-  updated(changed) {
-    if (changed.has('width')) {
-      if (this.isBelowTabletContainer) {
-        this.resetActions();
-      }
-    }
-
+  firstUpdated() {
     // this is execute to fetch loan token
-    if (changed.has('borrowType')) {
+    if (this.borrowType) {
       this.emitEnableBookAccess();
     }
   }
 
+  updated(changed) {
+    if (changed.has('width') && this.isBelowTabletContainer) {
+      this.resetActions();
+    }
+  }
+
   /**
    * Dispatches event when patron is borrowing book.
    * Notes borrow type, and consecutive borrow counts
@@ -74,7 +73,9 @@ export class CollapsibleActionGroup extends ActionsHandler {
     // send consecutiveLoanCounts for browsed books only.
     if (this.borrowType === 'browsed') {
       try {
-        const existingCount = await indexedDBGet('consecutive-loan-count');
+        const existingCount = await this.localCache.get(
+          'consecutive-loan-count'
+        );
         if (existingCount !== undefined) {
           this.consecutiveLoanCounts = existingCount.value ?? 1;
         }

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

@@ -1,5 +1,5 @@
 import { LitElement } from 'lit-element';
-import { get as indexedDBGet, set as indexedDBSet } from 'idb-keyval';
+import { LocalCache } from '@internetarchive/local-cache';
 
 import { URLHelper } from '../../config/url-helper.js';
 import ActionsHandlerService from './actions-handler-service.js';
@@ -20,6 +20,7 @@ export default class ActionsHandler extends LitElement {
     this.loanTokenPollingDelay =
       window.location.pathname === '/demo/' ? 2000 : 120000; // 120000 ms = 2 min
     this.loanTokenInterval = undefined;
+    this.localCache = new LocalCache();
     this.bindEvents();
   }
 
@@ -107,6 +108,9 @@ export default class ActionsHandler extends LitElement {
 
       // fetch loan token for browsed/borrowed book and set an interval
       if (borrowType) {
+        // Do an initial token, then set an interval
+        this.handleLoanTokenPoller();
+
         this.loanTokenInterval = setInterval(() => {
           this.handleLoanTokenPoller();
         }, this.loanTokenPollingDelay);
@@ -277,21 +281,18 @@ export default class ActionsHandler extends LitElement {
     try {
       let newCount = 1;
       const storageKey = `consecutive-loan-count`;
-      const existingCount = await indexedDBGet(storageKey);
-
-      // expire indexDB key-value after 2 hours
-      const expireTime = new Date(
-        Date.now() + (1 / 12) * 24 * 60 * 60 * 1000
-      ).toString();
+      const existingCount = await this.localCache.get(storageKey);
 
       // increase browse-count by 1 when you consecutive reading a book.
       if (action === 'browseAgain' && existingCount !== undefined) {
-        newCount = existingCount.value ? existingCount.value + 1 : 1;
+        newCount = existingCount ? existingCount + 1 : 1;
       }
 
-      await indexedDBSet(storageKey, {
+      // set new value
+      await this.localCache.set({
+        key: storageKey,
         value: newCount,
-        expire: expireTime,
+        ttl: 7200, // 2 hours
       });
     } catch (error) {
       console.log(error);