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

package/demo/index.html

@@ -15,7 +15,7 @@
       font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
     }
     #demo {
-      height: 50px;
+      height: 100px;
     }
     ia-book-actions {
       --white: #fff;
@@ -87,6 +87,7 @@
 
   <script type="module">
     /* eslint-disable */
+
     import '../src/ia-book-actions.js';
     import {
       defaultLendingStatus,
@@ -96,7 +97,7 @@
     import { LocalCache } from '@internetarchive/local-cache';
 
     const localCache = new LocalCache({
-      namespace: '1HourLoanStorage',
+      namespace: 'loanRenew',
       defaultTTL: 1 * 60,  // 1 minute
     });
 
@@ -104,10 +105,6 @@
     const identifier = 'naturalhistoryof00unse_4111';
     let bwbPurchaseUrl = 'https://www.betterworldbooks.com/product/detail/cambridge-ancient-hist-v04-0521044863';
 
-    let iaBookActions = document.querySelector('ia-book-actions');
-
-    // for debugging
-    window.iaBookActions = iaBookActions;
 
     const modalConfig = new ModalConfig();
     modalConfig.headerColor = '#d9534f';
@@ -117,6 +114,8 @@
     }
 
     // set defaultLendingStatus for unavailable (without borrowables) book
+    let iaBookActions = document.querySelector('ia-book-actions');
+
     iaBookActions.userid = userid;
     iaBookActions.identifier = identifier;
     iaBookActions.bookTitle = 'Contemporary Black biography. Volume 39 : profiles from the interContemporary Black biography. Volume 39';
@@ -127,14 +126,14 @@
     iaBookActions.tokenDelay = 2000; // 2 seconds
     iaBookActions.returnUrl = 'https://openlibrary.org';
     iaBookActions.localCache = localCache;
-    iaBookActions.autoRenewTimeConfig = {
-      totalTime: 60, // 60 second = 1 min
-      autoCheckAt: 55, // totalTime - 10th minute
-      FlippedInLast: 15, // within last 15 second/minute 
+    iaBookActions.loanRenewConfig = {
+      totalTime: 40, // 60 second = 1 min
+      autoCheckAt: 35, // totalTime - 10th minute
+      pageChangedInLast: 5, // within last 15 second/minute 
     };
 
     let lendingStatus1 = iaBookActions.lendingStatus;
-    let secondsLeftOnLoan = 60;
+    let secondsLeftOnLoan = iaBookActions.loanRenewConfig.totalTime;
 
     document.querySelectorAll('.titleBar input[type=checkbox]').forEach((item) => {
       item.addEventListener('click', (e) => {
@@ -146,21 +145,6 @@
       });
     });
 
-    document.querySelectorAll('.autoRenew input[type=checkbox]').forEach((item) => {
-      item.addEventListener('click', (e) => {
-        if (e.target.checked) {
-          iaBookActions.autoRenew = true;
-          iaBookActions.resetTimerCountdown = true;
-          lendingStatus1.secondsLeftOnLoan = secondsLeftOnLoan;
-        } else {
-          iaBookActions.autoRenew = false;
-        }
-
-        let lending = {...defaultLendingStatus, ...lendingStatus1};
-        iaBookActions.lendingStatus = lending;
-      });
-    });
-
     document.querySelectorAll('.errorEnable input[type=checkbox]').forEach((item) => {
       if (window.location.href.indexOf('?error=true') !== -1) {
         item.checked = true;
@@ -226,10 +210,10 @@
             await localCache.set({
               key: `${identifier}-loanTime`,
               value: new Date(), // current time
-              ttl: parseInt(iaBookActions.autoRenewTimeConfig.totalTime),
-            })
+              ttl: Number(iaBookActions.loanRenewConfig.totalTime),
+            });
 
-            await localCache.delete(`${identifier}-pageFlipTime`);
+            await localCache.delete(`${identifier}-pageChangedTime`);
           } catch (error) {}
           
         } else if(e.target.value === 'browsingExpired') {
@@ -292,6 +276,17 @@
         iaBookActions.bwbPurchaseUrl = bwbPurchaseUrl;
       })
     });
+
+    document.querySelector('.pageChangedEvent').addEventListener('click', () => {
+      // dispatch event to say book page has flipped
+      document.querySelector('ia-book-actions').dispatchEvent(
+        new CustomEvent('BookReader:pageChanged', {
+          detail: { isPageChanged: true },
+          bubbles: true,
+          composed: true,
+        })
+      );
+    })
 </script>
 
   <div>
@@ -302,6 +297,9 @@
             <td class="titleBar">
               <label><input type="checkbox" name="title" value="title" />Title Bar</label>
             </td>
+            <td>
+              <button class="pageChangedEvent">Page Change Event</button>
+            </td>
           </tr>
         </table>
     </fieldset>
@@ -311,7 +309,6 @@
         <table class="initial">
           <tr colspan='5'>
             <td class="errorEnable"><label><input type="checkbox" name="errorEnable" value="errorEnable" />Do you want to see error response?</label></td>
-            <td class="autoRenew"><label><input type="checkbox" name="autoRenew" value="autoRenew" />Do you want to auto-renew 1 hour</label></td>
           </tr>
           <tr>
             <td class="userState">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-book-actions",
-  "version": "0.0.29-alpha2",
+  "version": "0.0.29-alpha20",
   "description": "Bookreader actions for borrowable book",
   "author": "Internet Archive",
   "license": "AGPL-3.0-only",
@@ -11,8 +11,8 @@
   },
   "scripts": {
     "start": "web-dev-server",
-    "lint": "eslint --ext .js",
-    "format": "eslint --ext .js,",
+    "lint": "eslint --ext .js,.html . --ignore-path .gitignore && prettier \"**/*.js\" --check --ignore-path .gitignore",
+    "format": "eslint --ext .js,.html . --fix --ignore-path .gitignore && prettier \"**/*.js\" --write --ignore-path .gitignore",
     "test": "yarn run lint && yarn test:fast",
     "test:fast": "web-test-runner --coverage --playwright --browsers chromium firefox webkit",
     "test:watch": "web-test-runner --watch --playwright --browsers chromium firefox webkit"
@@ -22,6 +22,7 @@
     "@internetarchive/local-cache": "^0.2.0",
     "@internetarchive/modal-manager": "^0.2.1",
     "@internetarchive/shared-resize-observer": "^0.2.0",
+    "@internetarchive/toast-manager": "0.0.1-alpha5",
     "lit": "^2.2.1"
   },
   "devDependencies": {
@@ -43,6 +44,12 @@
     "sinon": "^13.0.2"
   },
   "eslintConfig": {
+    "rules": {
+      "no-console": "off",
+      "no-unused-expressions": "off",
+      "class-methods-use-this": "off",
+      "lit-a11y/click-events-have-key-events": "off"
+    },
     "extends": [
       "@open-wc/eslint-config",
       "eslint-config-prettier"
@@ -53,8 +60,7 @@
     "arrowParens": "avoid"
   },
   "husky": {
-    "hooks": {
-    }
+    "hooks": {}
   },
   "lint-staged": {
     "*.js": [

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/components/collapsible-action-group.js

@@ -9,6 +9,10 @@ import CollapsibleActionGroupStyle from '../assets/styles/collapsible-action-gro
 
 import { tabletContainerWidth } from '../core/config/constants.js';
 import { purchaseIcon } from '../assets/data/purchase.js';
+import {
+  analyticsCategories,
+  analyticsActions,
+} from '../core/config/analytics-event-and-category.js';
 import {
   dropdownOpened,
   dropdownClosed,
@@ -28,8 +32,7 @@ export class CollapsibleActionGroup extends ActionsHandler {
       dropdownArrow: { type: String },
       disabled: { type: Boolean },
       returnUrl: { type: String },
-      browseAgainNow: { type: Boolean },
-      autoRenewTimeConfig: { type: Object },
+      renewNow: { type: Boolean },
     };
   }
 
@@ -49,8 +52,7 @@ export class CollapsibleActionGroup extends ActionsHandler {
     this.loaderIcon = 'https://archive.org/upload/images/tree/loading.gif';
     this.disabled = false;
     this.returnUrl = '';
-    this.browseAgainNow = false;
-    this.autoRenewTimeConfig = {};
+    this.renewNow = false;
   }
 
   updated(changed) {
@@ -61,17 +63,28 @@ export class CollapsibleActionGroup extends ActionsHandler {
       this.resetActions();
     }
 
-    if (this.browseAgainNow === true) {
-      this.dispatchEvent(
-        new CustomEvent('autoBrowseBook', {
-          detail: {
-            event: { 'autoRenewed1Hour': 'browseBook' },
-          },
-        })
-      );
+    if (changed.has('renewNow') && this.renewNow === true) {
+      this.dispatchLoanRenewEvent();
     }
   }
 
+  // dispatch this event to loan renew handler
+  dispatchLoanRenewEvent() {
+    const { category, action } = {
+      category: analyticsCategories.browse,
+      action: analyticsActions.browseLoanRenew,
+    };
+
+    // listen in action-handler.js to execute ajax call on petabox.
+    this.dispatchEvent(
+      new CustomEvent('loanRenew', {
+        detail: {
+          event: { category, action },
+        },
+      })
+    );
+  }
+
   /**
    * merge primaryActions and secondaryActions into dropdown
    */

package/src/components/timer-countdown.js

@@ -5,44 +5,39 @@ export default class TimerCountdown extends LitElement {
     return {
       time: { type: Number },
       autoCheckAt: { type: Number },
-      resetTimerCountdown: { type: Boolean },
     };
   }
 
   constructor() {
     super();
-    this.time = 60;
+    this.time = 0;
     this.autoCheckAt = 0;
+
+    // private props
     this.timerInterval = undefined;
-    this.resetTimerCountdown = false;
   }
 
   disconnectedCallback() {
-    clearInterval(this.timerInterval)
-  }
-
-  firstUpdated() {
-    this.timerCountdown();
+    clearInterval(this.timerInterval);
   }
 
   updated(changed) {
-    if (changed.has('resetTimerCountdown')) {
+    if (changed.has('time') && this.time > 0) {
       clearInterval(this.timerInterval);
-      this.timerCountdown()
+      this.timerCountdown();
     }
   }
-  
+
   timerCountdown() {
     this.timerInterval = setInterval(() => {
       this.time -= 1;
 
       // execute 50th minute check
-      if (this.time === this.autoCheckAt) {
+      if (Math.round(this.time) === this.autoCheckAt) {
         this.dispatchEvent(
-          new CustomEvent('autoRenewAttempt', {
+          new CustomEvent('IABookActions:loanRenew', {
             detail: {
-              remainingT: this.time,
-              bookPageChange: false,
+              isPageChanged: false,
             },
             bubbles: true,
             composed: true,
@@ -51,18 +46,16 @@ export default class TimerCountdown extends LitElement {
       }
 
       if (this.time === 0) clearInterval(this.timerInterval);
-
     }, 1000);
   }
 
-
   render() {
     return html`<div id="countdown">
-    <div id="countdown-number">${this.time}</div>
-    <svg>
-      <circle r="18" cx="20" cy="20"></circle>
-    </svg>
-  </div>`
+      <div id="countdown-number">${Math.round(this.time)}</div>
+      <svg>
+        <circle r="18" cx="20" cy="20"></circle>
+      </svg>
+    </div>`;
   }
 
   static get styles() {
@@ -72,22 +65,14 @@ export default class TimerCountdown extends LitElement {
         font-size: 14px;
         position: absolute;
       }
-      #countdown1 {
-        position: relative;
-        margin: auto;
-        margin-top: 100px;
-        height: 40px;
-        width: 40px;
-        text-align: center;
-      }
-      
+
       #countdown-number {
         color: white;
         display: inline-block;
         line-height: 40px;
         margin-right: 12px;
       }
-      
+
       svg {
         position: absolute;
         top: 0;
@@ -96,7 +81,7 @@ export default class TimerCountdown extends LitElement {
         height: 40px;
         transform: rotateY(-180deg) rotateZ(-90deg);
       }
-      
+
       svg circle {
         stroke-dasharray: 113px;
         stroke-dashoffset: 0px;
@@ -106,7 +91,7 @@ export default class TimerCountdown extends LitElement {
         fill: none;
         animation: countdown 60s linear infinite forwards;
       }
-      
+
       @keyframes countdown {
         from {
           stroke-dashoffset: 0px;
@@ -115,6 +100,7 @@ export default class TimerCountdown extends LitElement {
           stroke-dashoffset: 113px;
         }
       }
+
       .hidden {
         display: none;
       }

package/src/core/config/analytics-event-and-category.js

@@ -13,6 +13,7 @@ export const analyticsCategories = {
 export const analyticsActions = {
   browse: 'Borrow-1Hour',
   browseAgain: 'Borrow-Again',
+  browseLoanRenew: 'Borrow-Loan-Renew',
   borrow: 'Borrow-14Days',
   waitlistJoin: 'JoinWaitlist',
   waitlistLeave: 'LeaveWaitlist',

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

@@ -1,6 +1,5 @@
 import { LitElement } from 'lit';
 
-import { LocalCache } from '@internetarchive/local-cache';
 import { URLHelper } from '../../config/url-helper.js';
 import ActionsHandlerService from './actions-handler-service.js';
 import * as Cookies from '../doc-cookies.js';
@@ -16,14 +15,7 @@ import * as Cookies from '../doc-cookies.js';
 export default class ActionsHandler extends LitElement {
   constructor() {
     super();
-    this.identifier = '';
     this.ajaxTimeout = 6000;
-    this.returnUrl = '';
-    this.autoRenewTimeConfig = {};
-
-    this.localCache = new LocalCache({
-      namespace: '1HourLoanStorage',
-    });
 
     this.bindEvents();
   }
@@ -36,7 +28,7 @@ export default class ActionsHandler extends LitElement {
     );
   }
 
-  async bindEvents() {
+  bindEvents() {
     this.addEventListener('browseBook', ({ detail }) => {
       this.handleBrowseIt();
       this.setConsecutiveLoanCounts();
@@ -51,9 +43,8 @@ export default class ActionsHandler extends LitElement {
       this.sendEvent(category, action);
     });
 
-    this.addEventListener('autoBrowseBook', ({ detail }) => {
-      console.log('auto renew handlerExecuted!!');
-      this.handleAutoBrowseIt();
+    this.addEventListener('loanRenew', ({ detail }) => {
+      this.handleLoanRenew();
       const { category, action } = detail.event;
       this.sendEvent(category, action);
     });
@@ -112,7 +103,7 @@ export default class ActionsHandler extends LitElement {
   handleBrowseIt() {
     const action = 'browse_book';
     this.dispatchToggleActionGroup();
-    this.setBrowseTimeSession()
+    this.setBrowseTimeSession();
 
     ActionsHandlerService({
       action,
@@ -126,9 +117,9 @@ export default class ActionsHandler extends LitElement {
     });
   }
 
-  handleAutoBrowseIt() {
-    const action = 'auto_browse';
-    this.setBrowseTimeSession()
+  handleLoanRenew() {
+    const action = 'renew_loan';
+    this.setBrowseTimeSession();
 
     ActionsHandlerService({
       action,
@@ -140,7 +131,6 @@ export default class ActionsHandler extends LitElement {
     });
   }
 
-  
   handleReturnIt() {
     const action = 'return_loan';
     this.dispatchToggleActionGroup();
@@ -291,6 +281,24 @@ export default class ActionsHandler extends LitElement {
     }
   }
 
+  /**
+   * set browse time in indexedDB
+   */
+  async setBrowseTimeSession() {
+    try {
+      await this.localCache.set({
+        key: `${this.identifier}-loanTime`,
+        value: new Date(), // current time
+        ttl: Number(this.loanRenewConfig.totalTime),
+      });
+
+      // delete flip time
+      await this.localCache.delete(`${this.identifier}-pageChangedTime`);
+    } catch (error) {
+      console.log(error);
+    }
+  }
+
   deleteLoanCookies() {
     const date = new Date();
     date.setTime(date.getTime() - 24 * 60 * 60 * 1000); // one day ago
@@ -310,17 +318,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.autoRenewTimeConfig.totalTime),
-      })
-
-      await this.localCache.delete(`${this.identifier}-pageFlipTime`);
-    } catch (error) {}
-  }
 }

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

@@ -0,0 +1,148 @@
+import { nothing } from 'lit';
+
+/**
+ * This class is used to determine if use is eligible for auto renew loan.
+ *
+ */
+export class OneHourLoanRenew {
+  constructor(isPageChanged, identifier, localCache, loanRenewConfig) {
+    this.isPageChanged = isPageChanged;
+    this.identifier = identifier;
+    this.localCache = localCache;
+    this.loanRenewConfig = loanRenewConfig;
+
+    // messages for auto return machenism
+    this.loanRenewMessage = 'This book has been renewed for another hour.';
+    this.loanReturnMessage =
+      'This book has been auto-returned due to inactivity.';
+    this.loanReturnWarning =
+      'This book will be auto-returned in 10 minutes unless you turn a page.';
+
+    // private props
+    this.loanRenewResult = {
+      texts: null,
+      renewNow: false,
+    };
+
+    return this.handleLoanRenew();
+  }
+
+  handleLoanRenew() {
+    try {
+      // when user click/flip on book page
+      if (this.isPageChanged) {
+        console.log('page changed!!');
+        return this.pageChanged(); // user clicked on page
+      }
+
+      return this.autoChecker(); // auto checker at 50th minute
+    } catch (error) {
+      console.log(error);
+    }
+
+    return nothing;
+  }
+
+  async pageChanged() {
+    const {
+      totalTime, // 60
+      autoCheckAt, // 50
+    } = this.loanRenewConfig;
+    const currentTime = new Date();
+    const loanTime = await this.localCache.get(`${this.identifier}-loanTime`);
+
+    const lastTimeFrame = this.changeTime(
+      loanTime,
+      totalTime - autoCheckAt,
+      'add'
+    );
+
+    // if user viewed new page in last 10 minutes, renew immediately
+    if (currentTime >= lastTimeFrame) {
+      console.log('Yes, borrow it again now!');
+      this.loanRenewResult.texts = this.loanRenewMessage;
+      this.loanRenewResult.renewNow = true;
+
+      this.setLoanRenewedTime();
+    }
+
+    this.setPageChangedTime();
+    return this.loanRenewResult;
+  }
+
+  async autoChecker() {
+    const currentTime = new Date();
+    const { pageChangedInLast } = this.loanRenewConfig;
+    const lastPageFlipTime = await this.localCache.get(
+      `${this.identifier}-pageChangedTime`
+    );
+
+    // last 15 min if used flipped a page.
+    const lastFlipTimeFrame = this.changeTime(
+      currentTime,
+      pageChangedInLast,
+      'sub'
+    ); // 15 seconds
+
+    if (
+      lastPageFlipTime === undefined ||
+      lastPageFlipTime <= lastFlipTimeFrame
+    ) {
+      // not viewed
+      console.log("Not viewed, don't borrow it!");
+      this.loanRenewResult.texts = this.loanReturnWarning;
+      this.loanRenewResult.renewNow = false;
+    } else if (lastPageFlipTime >= lastFlipTimeFrame) {
+      // viewed in last time frame
+      console.log('Yes viewed, borrow it again!');
+      this.loanRenewResult.texts = this.loanRenewMessage;
+      this.loanRenewResult.renewNow = true;
+
+      this.setLoanRenewedTime();
+    }
+
+    return this.loanRenewResult;
+  }
+
+  // save page changed time in indexedDB
+  async setPageChangedTime() {
+    await this.localCache.set({
+      key: `${this.identifier}-pageChangedTime`,
+      value: new Date(), // current time
+      ttl: Number(this.loanRenewConfig.totalTime),
+    });
+  }
+
+  async setLoanRenewedTime() {
+    try {
+      // last 15 min if used flipped a page.
+      const expireDate = this.changeTime(
+        new Date(),
+        this.loanRenewConfig.totalTime,
+        'add'
+      ); // 15 seconds
+
+      // set a value
+      await this.localCache.set({
+        key: `${this.identifier}-loanTime`,
+        value: expireDate, // expireDate time
+        ttl: Number(this.loanRenewConfig.totalTime),
+      });
+
+      // delete pageChangedTime when book is auto renew at nth minute
+      await this.localCache.delete(`${this.identifier}-pageChangedTime`);
+    } catch (error) {
+      console.log(error);
+    }
+  }
+
+  changeTime(date, minutes, op) {
+    if (date === undefined) return nothing;
+
+    if (op === 'sub') {
+      return new Date(date.getTime() - minutes * 1000);
+    }
+
+    return new Date(date.getTime() + minutes * 1000);
+  }
+}

package/src/ia-book-actions.js

@@ -3,6 +3,8 @@ import { html, css, LitElement, nothing } from 'lit';
 
 import { SharedResizeObserver } from '@internetarchive/shared-resize-observer';
 import { ModalConfig } from '@internetarchive/modal-manager';
+import '@internetarchive/toast-manager';
+import { ToastConfig } from '@internetarchive/toast-manager';
 import { LocalCache } from '@internetarchive/local-cache';
 
 import './components/collapsible-action-group.js';
@@ -10,12 +12,11 @@ import './components/book-title-bar.js';
 import './components/text-group.js';
 import './components/info-icon.js';
 import './components/timer-countdown.js';
-import './components/toast-message.js';
 
-import { GetLendingActions } from './core/services/get-lending-actions.js';
 import { mobileContainerWidth } from './core/config/constants.js';
+import { GetLendingActions } from './core/services/get-lending-actions.js';
 import { LoanTokenPoller } from './core/services/loan-token-poller.js';
-import { OneHourAutoRenew } from './core/services/one-hour-auto-renew.js';
+import { OneHourLoanRenew } from './core/services/one-hour-loan-renew.js';
 
 export const events = {
   browseExpired: 'IABookReader:BrowsingHasExpired',
@@ -36,17 +37,13 @@ export default class IABookActions extends LitElement {
         attribute: false,
       },
       barType: { type: String },
-      autoRenew: { type: Boolean },
       sharedObserver: { attribute: false },
       disableActionGroup: { type: Boolean },
       modal: { Object },
       tokenDelay: { type: Number },
-      toastTexts: { type: String },
-      remainingTime: { type: Number },
-      resetTimerCountdown: { type: Boolean },
       localCache: { type: Object },
-      autoRenewTimeConfig: { type: Object },
-      browseAgainNow: { type: Boolean },
+      loanRenewConfig: { type: Object },
+      loanRenewResult: { type: Object },
     };
   }
 
@@ -61,15 +58,21 @@ export default class IABookActions extends LitElement {
     this.bwbPurchaseUrl = '';
     this.lendingBarPostInit = () => {};
     this.barType = 'action'; // 'title'|'action'
-    this.autoRenew = false;
     this.sharedObserver = undefined;
     this.disableActionGroup = false;
     this.modal = undefined;
     this.tokenDelay = 120000; // 2 minutes
     this.localCache = new LocalCache({
-      namespace: '1HourLoanStorage'
-    }),
-    this.autoRenewTimeConfig = {},
+      namespace: 'loanRenew',
+    });
+
+    // loan auto renew
+    this.isPageChanged = false;
+    this.loanRenewConfig = {};
+    this.loanRenewResult = {
+      texts: null,
+      renewNow: false,
+    };
 
     // private props
     this.primaryActions = [];
@@ -79,12 +82,10 @@ export default class IABookActions extends LitElement {
     this.lendingOptions = {};
     this.borrowType = ''; // (browsed|borrowed)
     this.consecutiveLoanCounts = 1; // consecutive loan count
-    this.browseAgainNow = false;
     this.browserTimer = undefined;
-    this.hideToast = true;
 
-    this.bindAutoRenewEvent();
-    this.resetTimerCountdown = false;
+    this._shadowRoot = this.attachShadow({ mode: "open" });
+    this.bindLoanRenewEvents();
   }
 
   disconnectedCallback() {
@@ -106,35 +107,66 @@ export default class IABookActions extends LitElement {
       this.update();
     }
 
-    if (changed.has('autoRenew')) {
-      this.resetTimerCountdown = true;
-    }
     if (changed.has('sharedObserver')) {
       this.disconnectResizeObserver();
       this.setupResizeObserver();
     }
   }
 
-  bindAutoRenewEvent() {
-    // dispatched this event from timer-countdown 
-    this.addEventListener('autoRenewAttempt', async event => {
-      const isPageFlipped = event.detail.bookPageChange;
-
-      const dd = await new OneHourAutoRenew(
-        isPageFlipped,
-        this.identifier,
-        this.localCache,
-        this.autoRenewTimeConfig,
-        this.lendingStatus.user_has_browsed && !this.lendingStatus.browsingExpired
-      );
-
-      this.toastTexts = dd.toastTexts;
-      this.hideToast = dd.hideToast;
-      this.browseAgainNow = dd.renewNow;
-      if (this.browseAgainNow) {
-        await this.browseHasRenew();
+  bindLoanRenewEvents() {
+    // dispatched this event from bookreader page changed
+    window.addEventListener('BookReader:pageChanged', () => {
+      // early return if book is not browsed (1 hour borrow)
+      if (this.borrowType === 'browsed') {
+        this.isPageChanged = true;
+        this.executeLoanRenew();
       }
-      // this.handleBookAutoRenew(event);
+
+      return nothing;
+    });
+
+    // dispatched this event from timer-countdown
+    this.addEventListener('IABookActions:loanRenew', () => {
+      this.isPageChanged = false;
+      this.executeLoanRenew();
+    });
+  }
+
+  async executeLoanRenew() {
+    this.loanRenewResult = await new OneHourLoanRenew(
+      this.isPageChanged,
+      this.identifier,
+      this.localCache,
+      this.loanRenewConfig
+    );
+
+    console.log(this.loanRenewResult);
+
+    this.showToastMessage();
+
+    if (this.loanRenewResult.renewNow) {
+      this.tokenPoller.disconnectedInterval();
+      await this.browseHasRenew();
+    }
+
+    return nothing;
+  }
+
+  async showToastMessage() {
+    let toastTemplate = this.shadowRoot.querySelector('toast-template');
+    if (!toastTemplate) {
+      toastTemplate = document.createElement('toast-template');
+    }
+
+    await this.shadowRoot.appendChild(toastTemplate)
+    // await document.body.appendChild(toastTemplate);
+
+    const config = new ToastConfig();
+    config.texts = this.loanRenewResult?.texts;
+    config.dismisOnClick = true;
+
+    toastTemplate.showToast({
+      config
     });
   }
 
@@ -144,18 +176,25 @@ export default class IABookActions extends LitElement {
 
     // remove respected key:value
     await this.localCache.delete(`${this.identifier}-loanTime`);
-    await this.localCache.delete(`${this.identifier}-pageFlipTime`);
+    await this.localCache.delete(`${this.identifier}-pageChangedTime`);
 
     // show message after browsed book is expired.
-    this.toastTexts = this.autoReturnMessage;
+    this.loanRenewResult.renewNow = false;
+    this.loanRenewResult.texts =
+      'This book has been auto-returned due to inactivity.';
+
+    this.showToastMessage();
   }
 
   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: 61
+      secondsLeftOnLoan: secondsLeft,
     };
     this.lendingStatus = currStatus;
 
@@ -174,7 +213,6 @@ export default class IABookActions extends LitElement {
       return;
     }
 
-    // expired book and show browse again button
     const timeLeft = secondsLeftOnLoan * 1000;
     this.browserTimer = setTimeout(() => {
       this.browseHasExpired();
@@ -234,13 +272,16 @@ export default class IABookActions extends LitElement {
     });
 
     this.borrowType = actions.borrowType;
-    this.remainingTime = this.lendingStatus.secondsLeftOnLoan;
 
     const hasExpired =
       'browsingExpired' in this.lendingStatus &&
       this.lendingStatus?.browsingExpired;
     if (hasExpired) {
-      window?.Sentry?.captureMessage('setupLendingToolbarActions hasExpired');
+      if (!this.tokenPoller.disconnectedInterval) {
+        window?.Sentry?.captureMessage(
+          'setupLendingToolbarActions hasExpired - no tokenPoller'
+        );
+      }
       this.tokenPoller?.disconnectedInterval();
       /** Global event - always fire */
       this.dispatchEvent(
@@ -265,7 +306,16 @@ export default class IABookActions extends LitElement {
       return;
     }
 
-    this.startLoanTokenPoller();
+    // if (book is about to renew)
+    // - start token to poller around this.tokenDelay time until renew is completed
+    // else
+    // - start token poller immediately
+    setTimeout(
+      () => {
+        this.startLoanTokenPoller();
+      },
+      this.loanRenewResult.renewNow ? this.tokenDelay : 100
+    );
   }
 
   render() {
@@ -290,26 +340,14 @@ export default class IABookActions extends LitElement {
   get timerCountdownTemplate() {
     return this.borrowType === 'browsed'
       ? html`<timer-countdown
-          time=${Number(this.remainingTime)}
-          .autoCheckAt=${this.autoRenewTimeConfig.autoCheckAt}
-          ?resetTimerCountdown=${this.resetTimerCountdown}
+          time=${Number(this.lendingStatus.secondsLeftOnLoan)}
+          .autoCheckAt=${this.loanRenewConfig.autoCheckAt}
         ></timer-countdown>`
       : nothing;
   }
 
-  get toastMessageTemplate() {
-    return html`
-      <toast-message
-        .texts=${this.toastTexts}
-        .dismisOnClick="1"
-        ?hideToast=${this.hideToast}
-      ></toast-message>
-    `;
-  }
-
   get bookActionBar() {
     return html`
-      <button @click=${() => this.pageFlipEvent()}>Page Flip</button>
       <collapsible-action-group
         .userid=${this.userid}
         .identifier=${this.identifier}
@@ -319,32 +357,20 @@ export default class IABookActions extends LitElement {
         .width=${this.width}
         .borrowType=${this.borrowType}
         .returnUrl=${this.returnUrl}
-        .autoRenew=${this.autoRenew}
-        .autoRenewTimeConfig=${this.autoRenewTimeConfig}
+        .localCache=${this.localCache}
+        .loanRenewConfig=${this.loanRenewConfig}
         ?hasAdminAccess=${this.hasAdminAccess}
         ?disabled=${this.disableActionGroup}
-        ?browseAgainNow=${this.browseAgainNow}
+        ?renewNow=${this.loanRenewResult.renewNow}
         @lendingActionError=${this.handleLendingActionError}
         @toggleActionGroup=${this.handleToggleActionGroup}
       >
       </collapsible-action-group>
       ${this.textGroupTemplate} ${this.infoIconTemplate}
-      ${this.timerCountdownTemplate} ${this.toastMessageTemplate}
+      ${this.timerCountdownTemplate}
     `;
   }
 
-  // will move this function to bookreader...
-  async pageFlipEvent() {
-    try {
-      // dispatch event to say book page has flipped
-      document.querySelector("ia-book-actions").dispatchEvent(
-        new CustomEvent("autoRenewAttempt", {
-          detail: { bookPageChange: true },
-        })
-      );
-    } catch (error) { console.log(error) }
-  }
-
   /**
    * enable access of borrowed/browsed books
    */
@@ -485,7 +511,7 @@ export default class IABookActions extends LitElement {
   get textGroupTemplate() {
     return html`<text-group
       textClass=${this.textClass}
-      texts=${this.primaryTitle}
+      .texts=${this.primaryTitle}
     >
     </text-group>`;
   }
@@ -498,20 +524,23 @@ export default class IABookActions extends LitElement {
     return css`
       :host {
         display: block;
-        background: var(--primaryBGColor, #000);
-        color: var(--primaryTextColor, #fff);
       }
+
       .lending-wrapper {
         width: 100%;
         margin: 0 auto;
+        background: var(--primaryBGColor, #000);
+        color: var(--primaryTextColor, #fff);
         display: inline-flex;
         align-items: center;
         justify-content: center;
         flex-wrap: wrap;
       }
 
-      toast-message {
-        --messageHeightFromTop: 18%;
+      toast-template {
+        --toastTopMargin: 80px;
+        --toastBGColor: #333;
+        --toastFontColor: #fff;
       }
     `;
   }

package/src/assets/styles/timer-countdown.js

@@ -1,58 +0,0 @@
-import { css } from 'lit';
-
-export default timerCountDownStyle = css`
-  :host {
-    right: 5px;
-    font-size: 14px;
-    position: absolute;
-  }
-  #countdown1 {
-    position: relative;
-    margin: auto;
-    margin-top: 100px;
-    height: 40px;
-    width: 40px;
-    text-align: center;
-  }
-  
-  #countdown-number {
-    color: white;
-    display: inline-block;
-    line-height: 40px;
-    margin-right: 12px;
-  }
-  
-  svg {
-    position: absolute;
-    top: 0;
-    right: 0;
-    width: 40px;
-    height: 40px;
-    transform: rotateY(-180deg) rotateZ(-90deg);
-  }
-  
-  svg circle {
-    stroke-dasharray: 113px;
-    stroke-dashoffset: 0px;
-    stroke-linecap: round;
-    stroke-width: 3px;
-    stroke: white;
-    fill: none;
-    animation: countdown 60s linear infinite forwards;
-  }
-  
-  @keyframes countdown {
-    from {
-      stroke-dashoffset: 0px;
-    }
-    to {
-      stroke-dashoffset: 113px;
-    }
-  }
-  .hidden {
-    display: none;
-  }
-  .visible {
-    display: inline-block;
-  }
-`;

package/src/components/toast-message.js

@@ -1,60 +0,0 @@
-import { html, css, LitElement, nothing } from 'lit';
-
-export class ToastMessage extends LitElement {
-  static get properties() {
-    return {
-      texts: { type: String },
-      dismisOnClick: { type: Function },
-      hideToast: { type: Boolean },
-    };
-  }
-
-  constructor() {
-    super();
-    this.texts = '';
-    this.textClass = '';
-    this.hideToast = false;
-  }
-
-  render() {
-    return !this.hideToast
-      ? html`
-          <span class="toast-message ${this.textClass}">${this.texts}</span>
-        `
-      : nothing;
-  }
-
-  static get styles() {
-    const heightFromTop = css`var(--messageHeightFromTop, 15%)`;
-
-    return css`
-      :host {
-        display: inline-block;
-      }
-      .toast-message {
-        z-index: 2;
-        position: absolute;
-        top: ${heightFromTop};
-        font-size: 1.4rem;
-        color: #fff;
-        left: 50%;
-        right: 50%;
-        background: #333;
-        border: 1px solid #fff;
-        border-radius: 5px;
-        box-shadow: 1px 1px 2px;
-        padding: 10px;
-        width: fit-content;
-        transform: translate(-50%, -50%);
-      }
-      .hidden {
-        display: none;
-      }
-      .visible {
-        display: inline-block;
-      }
-    `;
-  }
-}
-
-window.customElements.define('toast-message', ToastMessage);

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

@@ -1,148 +0,0 @@
-import ActionsHandlerService from './actions-handler/actions-handler-service.js';
-
-/**
- * This class is used to determine if use is eligible for auto renew loan.
- *
- * ActionsHandlerService is a function being used to execute
- */
-export class OneHourAutoRenew {
-  constructor(pageClick, identifier, localCache, autoRenewTimeConfig, userHasBrowsed) {
-    this.pageClick = pageClick;
-    this.identifier = identifier;
-    this.localCache = localCache;
-    this.autoRenewTimeConfig = autoRenewTimeConfig;
-    this.userHasBrowsed = userHasBrowsed;
-
-    // private props
-    this.resultRes = {
-      toastTexts: null,
-      hideToast: true,
-      renewNow: false,
-    };
-
-    // messages for auto return machenism
-    this.autoRenewMessage = 'This book has been renewed for another hour.';
-    this.autoReturnMessage = 'This book has been auto-returned due to inactivity.';
-    this.autoReturnWarning = 'This book will be auto-returned in 10 minutes unless you turn a page.';
-
-    return this.handleBookAutoRenew();
-  }
-
-  async handleBookAutoRenew() {
-    try {
-      // if page is not flipped in last 15 minutes,
-      // instantaly renew it if user viewed new page in last 10 minutes
-      if (this.pageClick) {
-        console.log('page flipped!')
-        this.setPageFlippedTime();
-        return this.userFlippedBookPage(); // user clicked on page
-      } else {
-        console.log('auto checker!')
-        return this.autoCheckerTimer(); // auto checker at 50th minute
-      }
-
-    } catch (error) {
-      console.log(error)
-    }
-  }
-
-  async setPageFlippedTime() {
-    // set pageFlipTime time in localStorage
-    await this.localCache.set({
-      key: `${this.identifier}-pageFlipTime`,
-      value: new Date(), // current time
-      ttl: parseInt(this.autoRenewTimeConfig.totalTime),
-    })
-  }
-
-  async userFlippedBookPage() {
-    const {
-      totalTime, // 60
-      autoCheckAt, // 50
-    } = this.autoRenewTimeConfig;
-    const currentDate = new Date();
-    const loanTime = await this.localCache.get(`${this.identifier}-loanTime`);
-
-    const lastTimeFrame = await this.changeTime(
-      loanTime,
-      totalTime - autoCheckAt,
-      'add'
-    ); // 50 seconds
-
-    if (currentDate >= lastTimeFrame) {
-      console.log('1 YES NOW BORROW IT AGAIN NOW!');
-      this.resultRes.toastTexts = this.autoRenewMessage;
-      this.resultRes.browseAgainNow = true;
-      this.resultRes.hideToast = false;
-      this.resultRes.renewNow = true;
-    }
-
-    return this.resultRes;
-  }
-
-  async autoCheckerTimer() {
-    const currentDate = new Date();
-    const { FlippedInLast } = this.autoRenewTimeConfig;
-    const lastPageFlipTime = await this.localCache.get(`${this.identifier}-pageFlipTime`);
-
-    // last 15 min if used flipped a page.
-    const lastFlipTimeFrame = await this.changeTime(
-      currentDate,
-      FlippedInLast,
-      'sub'
-    ); // 15 seconds
-
-    if (lastPageFlipTime === undefined || lastPageFlipTime <= lastFlipTimeFrame) { // not viewed
-      console.log('2');
-      this.resultRes.toastTexts = this.autoReturnWarning;
-      this.resultRes.hideToast = false;
-    } else if (lastPageFlipTime >= lastFlipTimeFrame) { // viewed in last time frame
-      console.log('3');
-      this.resultRes.toastTexts = this.autoRenewMessage;
-      this.resultRes.browseAgainNow = true;
-      this.resultRes.hideToast = false;
-      this.resultRes.renewNow = true;
-    }
-
-    return this.resultRes;
-  }
-
-  async changeTime(date, minutes, op) {
-    if (date === undefined) return undefined;
-    
-    if (op === 'sub') {
-      return new Date(date.getTime() - minutes * 1000);
-    }
-
-    return new Date(date.getTime() + minutes * 1000);
-  }
-
-
-  sendEvent(eventCategory, eventAction) {
-    window?.archive_analytics?.send_event(
-      eventCategory,
-      eventAction,
-      `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: () => {
-        return 'success';
-      },
-    });
-  }
-}