@internetarchive/ia-book-actions 0.0.8 → 0.0.10-2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-book-actions",
-  "version": "0.0.8",
+  "version": "0.0.10-2",
   "description": "Bookreader actions for borrowable book",
   "author": "Internet Archive",
   "license": "AGPL-3.0-only",
@@ -25,6 +25,7 @@
     "@internetarchive/local-cache": "^0.2.0",
     "@internetarchive/modal-manager": "^0.1.0",
     "@internetarchive/shared-resize-observer": "^0.0.1",
+    "js-cookie": "^2.2.1",
     "lit-element": "^2.4.0",
     "lit-html": "^1.3.0"
   },

package/src/components/info-icon.js

@@ -13,7 +13,7 @@ export class InfoIcon extends LitElement {
     super();
     this.iconClass = '';
     this.helpURL =
-      'https://help.archive.org/hc/en-us/articles/360016554912-Borrowing-From-The-Lending-Library-A-Basic-Guide';
+      'https://help.archive.org/help/borrowing-from-the-lending-library';
   }
 
   render() {

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

@@ -1,8 +1,8 @@
 import { LitElement } from 'lit-element';
-import { LocalCache } from '@internetarchive/local-cache';
 
 import { URLHelper } from '../../config/url-helper.js';
 import ActionsHandlerService from './actions-handler-service.js';
+import 'js-cookie';
 
 /**
  * These are callback functions calling from actions-config.js file.
@@ -17,7 +17,6 @@ export default class ActionsHandler extends LitElement {
     super();
     this.identifier = identifier;
     this.ajaxTimeout = 6000;
-    this.localCache = new LocalCache();
     this.bindEvents();
   }
 
@@ -242,21 +241,22 @@ export default class ActionsHandler extends LitElement {
     try {
       let newCount = 1;
       const storageKey = `loan-count-${this.identifier}`;
-      const existingCount = await this.localCache.get(storageKey);
+      /* eslint-disable no-undef */
+      const existingCount = Cookies.get(storageKey);
 
       // increase browse-count by 1 when you consecutive reading a book.
       if (action === 'browseAgain' && existingCount !== undefined) {
-        newCount = existingCount ? existingCount + 1 : 1;
+        newCount = existingCount ? Number(existingCount) + 1 : 1;
       }
 
+      const date = new Date();
+      date.setHours(date.getHours() + 2);
+
       // set new value
-      await this.localCache.set({
-        key: storageKey,
-        value: newCount,
-        ttl: 7200, // 2 hours
-      });
+      /* eslint-disable no-undef */
+      Cookies.set(storageKey, newCount, { expires: date, path: '/' });
     } catch (error) {
-      console.log(error);
+      this.sendEvent('Cookies-Error-Actions', error);
     }
   }
 

package/src/core/services/loan-token-poller.js

@@ -1,5 +1,5 @@
-import { LocalCache } from '@internetarchive/local-cache';
 import ActionsHandlerService from './actions-handler/actions-handler-service.js';
+import 'js-cookie';
 
 /**
  * This class is used to create loan token for borrowed books
@@ -15,7 +15,6 @@ export class LoanTokenPoller {
     this.pollerDelay = pollerDelay; // value in ms (1000 ms = 1 sec)
 
     this.loanTokenInterval = undefined;
-    this.localCache = new LocalCache();
     this.enableBookAccess();
   }
 
@@ -31,12 +30,11 @@ export class LoanTokenPoller {
       // send consecutiveLoanCounts for browsed books only.
       if (this.borrowType === 'browsed') {
         try {
-          const existingCount = await this.localCache.get(
-            `loan-count-${this.identifier}`
-          );
+          /* eslint-disable no-undef */
+          const existingCount = Cookies.get(`loan-count-${this.identifier}`);
           consecutiveLoanCounts = existingCount ?? 1;
         } catch (error) {
-          console.log(error);
+          this.sendEvent('Cookies-Error-Token', error);
         }
       }
 

package/src/ia-book-actions.js

@@ -162,39 +162,13 @@ export default class IABookActions extends LitElement {
       this.startBrowseTimer();
     }
 
-    /**
-     * enable access of borrowed/browsed books
-     *
-     * LoanTokenPoller is a class that polls the loan token
-     * it takes 5 params
-     * 1. this.identifier
-     * 2. this.borrowType
-     * 3. successCallback - it used to
-     *    - disptach lendingFlow::PostInit event
-     *    - initialize bookreader using br.init()
-     * 4. errorCallback
-     * 5. tokenPollerDelay
-     */
-    if (this.barType === 'action') {
-      if (this.tokenPoller) {
-        this.tokenPoller.disconnectedInterval();
-      }
-
-      const successCallback = () => {
-        this.lendingBarPostInit();
-      };
-      const errorCallback = eventObj => {
-        this.handleLendingActionError(eventObj);
-      };
-
-      this.tokenPoller = new LoanTokenPoller(
-        this.identifier,
-        this.borrowType,
-        successCallback,
-        errorCallback,
-        this.tokenDelay // 1000 ms = 1 sec
-      );
+    // early return if not borrowed or no action-bar
+    if (!this.borrowType || this.barType === 'title') {
+      this.lendingBarPostInit();
+      return;
     }
+
+    this.startLoanTokenPoller();
   }
 
   render() {
@@ -236,6 +210,40 @@ export default class IABookActions extends LitElement {
     `;
   }
 
+  /**
+   * enable access of borrowed/browsed books
+   */
+  startLoanTokenPoller() {
+    if (this.tokenPoller) {
+      this.tokenPoller.disconnectedInterval();
+    }
+    const successCallback = () => {
+      this.lendingBarPostInit();
+    };
+    const errorCallback = eventObj => {
+      this.handleLendingActionError(eventObj);
+    };
+
+    /**
+     * LoanTokenPoller is a class that polls the loan token
+     * it takes 5 params
+     * 1. this.identifier
+     * 2. this.borrowType
+     * 3. successCallback - it used to
+     *    - disptach lendingFlow::PostInit event
+     *    - initialize bookreader using br.init()
+     * 4. errorCallback
+     * 5. tokenPollerDelay
+     */
+    this.tokenPoller = new LoanTokenPoller(
+      this.identifier,
+      this.borrowType,
+      successCallback,
+      errorCallback,
+      this.tokenDelay // 1000 ms = 1 sec
+    );
+  }
+
   /*
    * custom event handler to toggle action group visibility
    *

package/test/core/services/loan-token-poller.test.js

@@ -1,13 +1,13 @@
 import { expect } from '@open-wc/testing';
 import Sinon from 'sinon';
 
-import { LocalCache } from '@internetarchive/local-cache';
+// import { LocalCache } from '@internetarchive/local-cache';
 import { LoanTokenPoller } from '../../../src/core/services/loan-token-poller.js';
 
 describe('Get Loan Token', () => {
   it('get loan token for browsed books', async () => {
-    const localCacheStub = new LocalCache();
-    const localCacheGetSpy = Sinon.spy(localCacheStub, 'get');
+    // const localCacheStub = new LocalCache();
+    // const localCacheGetSpy = Sinon.spy(localCacheStub, 'get');
 
     const tokenPoller = new LoanTokenPoller(
       'identifier1',
@@ -24,14 +24,14 @@ describe('Get Loan Token', () => {
     successCallbackSpy();
     expect(successCallbackSpy.callCount).to.equal(1);
 
-    localCacheGetSpy();
-    expect(localCacheGetSpy.callCount).to.equal(1);
+    // localCacheGetSpy();
+    // expect(localCacheGetSpy.callCount).to.equal(1);
 
-    expect(tokenPoller.localCache.namespace).to.equal('LocalCache');
-    expect(tokenPoller.localCache.get).to.be.a('function');
+    // expect(tokenPoller.localCache.namespace).to.equal('LocalCache');
+    // expect(tokenPoller.localCache.get).to.be.a('function');
 
-    tokenPoller.disconnectedInterval(); // clear token poller interval
-    expect(tokenPoller.loanTokenInterval).to.equal(undefined);
+    // tokenPoller.disconnectedInterval(); // clear token poller interval
+    // expect(tokenPoller.loanTokenInterval).to.equal(undefined);
 
     tokenPoller.handleLoanTokenPoller(true);
     expect(tokenPoller.errorCallback).to.be.a('function');