@internetarchive/ia-book-actions 0.0.29-alpha1 → 0.0.29-alpha10

package/demo/index.html

@@ -127,32 +127,15 @@
     iaBookActions.lendingBarPostInit = lendingBarPostInit;
     iaBookActions.tokenDelay = 2000; // 2 seconds
     iaBookActions.returnUrl = 'https://openlibrary.org';
-    // iaBookActions.localCache = localCache;
-    iaBookActions.autoRenewTimeConfig = {
+    iaBookActions.localCache = localCache;
+    iaBookActions.autoRenewConfig = {
       totalTime: 60, // 60 second = 1 min
-      autoRenewCheckerAtLast: 10, // totalTime - 10th minute
-      autoRenewVisitedInLast: 15, // within last 15 second/minute 
+      autoCheckAt: 55, // totalTime - 10th minute
+      FlippedInLast: 15, // within last 15 second/minute 
     };
 
     let lendingStatus1 = iaBookActions.lendingStatus;
-    let secondsLeftOnLoan = 60;
-
-    document.querySelector('#flip-page').addEventListener('click', async (e) => {
-      try {
-        // set pageFlipTime time in localStorage
-        await localCache.set({
-          key: `${identifier}-pageFlipTime`,
-          value: new Date(), // current time
-        })
-
-        // dispatch event to say book page has flipped
-        document.querySelector("ia-book-actions").dispatchEvent(
-          new CustomEvent("bookPageFlip", {
-            detail: { bookPageChange: true },
-          })
-        );
-      } catch (error) {}
-    });
+    let secondsLeftOnLoan = iaBookActions.autoRenewConfig.totalTime;
 
     document.querySelectorAll('.titleBar input[type=checkbox]').forEach((item) => {
       item.addEventListener('click', (e) => {
@@ -164,21 +147,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;
@@ -244,6 +212,7 @@
             await localCache.set({
               key: `${identifier}-loanTime`,
               value: new Date(), // current time
+              ttl: Number(iaBookActions.autoRenewConfig.totalTime),
             })
 
             await localCache.delete(`${identifier}-pageFlipTime`);
@@ -328,10 +297,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><button id="flip-page">Flip page</button></td>
           </tr>
           <tr>
             <td class="userState">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-book-actions",
-  "version": "0.0.29-alpha1",
+  "version": "0.0.29-alpha10",
   "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"
@@ -43,6 +43,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"

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

@@ -59,17 +59,22 @@ export class CollapsibleActionGroup extends ActionsHandler {
       this.resetActions();
     }
 
-    if (this.browseAgainNow === true) {
-      this.dispatchEvent(
-        new CustomEvent('autoBrowseBook', {
-          detail: {
-            event: { 'autoRenewed1Hour': 'browseBook' },
-          },
-        })
-      );
+    if (changed.has('browseAgainNow') && this.browseAgainNow === true) {
+      this.dispatchAutoRenewBookEvent();
     }
   }
 
+  // dispatch this event to loan renew handler
+  dispatchAutoRenewBookEvent() {
+    this.dispatchEvent(
+      new CustomEvent('autoRenewLoan', {
+        detail: {
+          event: { autoRenewed1Hour: 'browseBook' },
+        },
+      })
+    );
+  }
+
   /**
    * merge primaryActions and secondaryActions into dropdown
    */

package/src/components/timer-countdown.js

@@ -4,44 +4,40 @@ export default class TimerCountdown extends LitElement {
   static get properties() {
     return {
       time: { type: Number },
-      autoRenewCheckerAtLast: { type: Number },
-      resetTimerCountdown: { type: Boolean },
+      autoCheckAt: { type: Number },
     };
   }
 
   constructor() {
     super();
-    this.time = 60;
-    this.autoRenewCheckerAtLast = 0;
+    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.autoRenewCheckerAtLast) {
+      if (Math.round(this.time) === this.autoCheckAt) {
         this.dispatchEvent(
-          new CustomEvent('autoReturnWarning', {
+          new CustomEvent('autoRenewAttempt', {
             detail: {
-              remainingT: this.time
+              bookPageChange: false,
             },
             bubbles: true,
             composed: true,
@@ -50,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() {
@@ -71,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;
@@ -95,7 +81,7 @@ export default class TimerCountdown extends LitElement {
         height: 40px;
         transform: rotateY(-180deg) rotateZ(-90deg);
       }
-      
+
       svg circle {
         stroke-dasharray: 113px;
         stroke-dashoffset: 0px;
@@ -105,7 +91,7 @@ export default class TimerCountdown extends LitElement {
         fill: none;
         animation: countdown 60s linear infinite forwards;
       }
-      
+
       @keyframes countdown {
         from {
           stroke-dashoffset: 0px;
@@ -114,6 +100,7 @@ export default class TimerCountdown extends LitElement {
           stroke-dashoffset: 113px;
         }
       }
+
       .hidden {
         display: none;
       }

package/src/components/toast-message.js

@@ -4,8 +4,9 @@ export class ToastMessage extends LitElement {
   static get properties() {
     return {
       texts: { type: String },
-      dismisOnClick: { type: Function },
+      dismisOnClick: { type: Boolean },
       hideToast: { type: Boolean },
+      clostAfter: { type: Number },
     };
   }
 
@@ -14,12 +15,20 @@ export class ToastMessage extends LitElement {
     this.texts = '';
     this.textClass = '';
     this.hideToast = false;
+    this.clostAfter = 0;
   }
 
   render() {
     return !this.hideToast
       ? html`
-          <span class="toast-message ${this.textClass}">${this.texts}</span>
+          <span
+            class="toast-message fade-in ${this.textClass}"
+            title="Click/tap to close"
+            @click=${() => {
+              this.dismisOnClick ? (this.hideToast = true) : nothing;
+            }}
+            >${this.texts}</span
+          >
         `
       : nothing;
   }
@@ -36,9 +45,9 @@ export class ToastMessage extends LitElement {
         position: absolute;
         top: ${heightFromTop};
         font-size: 1.4rem;
+        font-family: 'Helvetica Neue';
         color: #fff;
         left: 50%;
-        right: 50%;
         background: #333;
         border: 1px solid #fff;
         border-radius: 5px;
@@ -46,7 +55,18 @@ export class ToastMessage extends LitElement {
         padding: 10px;
         width: fit-content;
         transform: translate(-50%, -50%);
+        cursor: pointer;
+        animation: fadeIn 5s;
+        @keyframes fadeIn {
+          0% {
+            opacity: 0;
+          }
+          100% {
+            opacity: 1;
+          }
+        }
       }
+
       .hidden {
         display: none;
       }

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.localCache = new LocalCache({
-      namespace: '1HourLoanStorage',
-      defaultTTL: 1 * 30,  // 0.5 minute
-    });
 
     this.bindEvents();
   }
@@ -36,9 +28,7 @@ export default class ActionsHandler extends LitElement {
     );
   }
 
-  async bindEvents() {
-    // console.log(await this.localCache.get('loanTime'));
-
+  bindEvents() {
     this.addEventListener('browseBook', ({ detail }) => {
       this.handleBrowseIt();
       this.setConsecutiveLoanCounts();
@@ -53,10 +43,8 @@ export default class ActionsHandler extends LitElement {
       this.sendEvent(category, action);
     });
 
-    this.addEventListener('autoBrowseBook', ({ detail }) => {
-      console.log('book has be renewed for you. thank you!!!');
-      this.handleAutoBrowseIt();
-      // this.setConsecutiveLoanCounts();
+    this.addEventListener('autoRenewLoan', ({ detail }) => {
+      this.handleAutoRenewLoan();
       const { category, action } = detail.event;
       this.sendEvent(category, action);
     });
@@ -115,7 +103,7 @@ export default class ActionsHandler extends LitElement {
   handleBrowseIt() {
     const action = 'browse_book';
     this.dispatchToggleActionGroup();
-    this.setBrowseTimeSession()
+    this.setBrowseTimeSession();
 
     ActionsHandlerService({
       action,
@@ -129,9 +117,9 @@ export default class ActionsHandler extends LitElement {
     });
   }
 
-  handleAutoBrowseIt() {
-    const action = 'auto_browse';
-    this.setBrowseTimeSession()
+  handleAutoRenewLoan() {
+    const action = 'renew_loan';
+    this.setBrowseTimeSession();
 
     ActionsHandlerService({
       action,
@@ -143,7 +131,6 @@ export default class ActionsHandler extends LitElement {
     });
   }
 
-  
   handleReturnIt() {
     const action = 'return_loan';
     this.dispatchToggleActionGroup();
@@ -294,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.autoRenewConfig.totalTime),
+      });
+
+      // delete flip time
+      await this.localCache.delete(`${this.identifier}-pageFlipTime`);
+    } catch (error) {
+      console.log(error);
+    }
+  }
+
   deleteLoanCookies() {
     const date = new Date();
     date.setTime(date.getTime() - 24 * 60 * 60 * 1000); // one day ago
@@ -313,16 +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
-      })
-
-      await this.localCache.delete(`${this.identifier}-pageFlipTime`);
-    } catch (error) {}
-  }
 }

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

@@ -1,134 +1,157 @@
 import { nothing } from 'lit';
 
-import ActionsHandlerService from './actions-handler/actions-handler-service.js';
-import * as Cookies from './doc-cookies.js';
-
 /**
- * This class is used to create loan token for borrowed books
+ * 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) {
-    this.pageClick = pageClick;
+  constructor(
+    isPageClick,
+    identifier,
+    localCache,
+    autoRenewConfig
+  ) {
+    this.isPageClick = isPageClick;
     this.identifier = identifier;
     this.localCache = localCache;
-    this.autoRenewTimeConfig = autoRenewTimeConfig; // callback function to be called after loan token is created
+    this.autoRenewConfig = autoRenewConfig;
 
-    this.autoReturnMessage = 'This book will be automatically returned in 15 seconds unless you turn a page.';
+    // 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.';
 
-
-    this.resultRes = {
+    // private props
+    this.autoRenewResult = {
       toastTexts: '',
       hideToast: true,
+      browseAgainNow: false,
     };
 
-    return this.dd();
+    return this.handleBookAutoRenew();
   }
 
-  async dd() {
+  handleBookAutoRenew() {
     try {
-      const currentDate = new Date();
+      // when user click/flip on book page
+      if (this.isPageClick) {
+        console.log('page flipped!!');
+        return this.userFlippedBookPage(); // user clicked on page
+      }
 
-      const {
-        totalTime, // 60
-        autoRenewCheckerAtLast, // 50
-        autoRenewVisitedInLast, // 15
-      } = this.autoRenewTimeConfig;
+      return this.autoCheckerTimer(); // auto checker at 50th minute
+    } catch (error) {
+      console.log(error);
+    }
 
-      const loanTime = await this.localCache.get(`${this.identifier}-loanTime`);
-      const lastPageFlipTime = await this.localCache.get(`${this.identifier}-pageFlipTime`);
+    return nothing;
+  }
 
-      const lastFlipTimeFrame = await this.changeTime(
-        currentDate,
-        autoRenewVisitedInLast,
-        'sub'
-      ); // 15 seconds
+  // set new pageFlipTime in indexedDB 
+  async setPageFlippedTime() {
+    await this.localCache.set({
+      key: `${this.identifier}-pageFlipTime`,
+      value: new Date(), // current time
+      ttl: Number(this.autoRenewConfig.totalTime),
+    });
+  }
 
-      console.log(lastPageFlipTime, lastFlipTimeFrame)
-
-      // if page is not flipped in last 15 minutes,
-      // instantaly renew it if user viewed new page in last 10 minutes
-      if (this.pageClick === true) {
-        const lastTimeFrame = await this.changeTime(
-          loanTime,
-          totalTime - autoRenewCheckerAtLast,
-          'add'
-        ); // 50 seconds
-        console.log('page flipped!')
-
-        if (currentDate >= lastTimeFrame) {
-          console.log('1 YES NOW BORROW IT AGAIN NOW!');
-          this.toastTexts = this.autoRenewMessage;
-          this.hideToast = false;
-        }
-
-        return nothing // early return
-      }
+  async userFlippedBookPage() {
+    const {
+      totalTime, // 60
+      autoCheckAt, // 50
+    } = this.autoRenewConfig;
+    const currentTime = new Date();
+    const loanTime = await this.localCache.get(`${this.identifier}-loanTime`);
+
+    const lastTimeFrame = this.changeTime(
+      loanTime,
+      totalTime - autoCheckAt,
+      'add'
+    ); // 50 seconds
+
+    // if user viewed new page in last 10 minutes, renew immediately
+    if (currentTime >= lastTimeFrame) {
+      console.log('1 YES NOW BORROW IT AGAIN NOW!');
+      this.autoRenewResult.toastTexts = this.autoRenewMessage;
+      this.autoRenewResult.hideToast = false;
+      this.autoRenewResult.browseAgainNow = true;
+
+      this.setNewBrowseTime();
+    }
 
-      console.log(lastPageFlipTime, lastFlipTimeFrame)
-      if (lastPageFlipTime === undefined) { // not viewed
-        console.log('2 DON\'T BORROW IT!');
-        this.resultRes.toastTexts = this.autoReturnMessage;
-        this.resultRes.hideToast = false;
-      } else if (lastPageFlipTime >= lastFlipTimeFrame) { // viewed in last time frame
-        console.log('3 YES BORROW IT AGAIN!');
-        this.resultRes.toastTexts = this.autoRenewMessage;
-        this.resultRes.hideToast = false;
-        this.toastTexts = this.autoRenewMessage;
-        // this.browseAgainNow = true;
-        this.hideToast = false;
-        // await this.browseHasRenew();
-      } else if (lastPageFlipTime <= lastFlipTimeFrame) { // viewed but not in last time frame
-        console.log('4 DON\'T BORROW IT!');
-        this.resultRes.toastTexts = this.autoReturnMessage;
-        this.resultRes.hideToast = false;
-      }
+    this.setPageFlippedTime();
+    return this.autoRenewResult;
+  }
 
-      // console.log(this.resultRes)
-      return this.resultRes;
+  async autoCheckerTimer() {
+    const currentTime = new Date();
+    const { FlippedInLast } = this.autoRenewConfig;
+    const lastPageFlipTime = await this.localCache.get(
+      `${this.identifier}-pageFlipTime`
+    );
 
+    // last 15 min if used flipped a page.
+    const lastFlipTimeFrame = this.changeTime(
+      currentTime,
+      FlippedInLast,
+      'sub'
+    ); // 15 seconds
+
+    if (
+      lastPageFlipTime === undefined ||
+      lastPageFlipTime <= lastFlipTimeFrame
+    ) {
+      // not viewed
+      console.log('Not viewed, warning message!');
+      this.autoRenewResult.toastTexts = this.autoReturnWarning;
+      this.autoRenewResult.browseAgainNow = false;
+      this.autoRenewResult.hideToast = false;
+    } else if (lastPageFlipTime >= lastFlipTimeFrame) {
+      // viewed in last time frame
+      console.log('Viewed, auto renew and message!');
+      this.autoRenewResult.toastTexts = this.autoRenewMessage;
+      this.autoRenewResult.browseAgainNow = true;
+      this.autoRenewResult.hideToast = false;
+
+      this.setNewBrowseTime();
+    }
+
+    return this.autoRenewResult;
+  }
+
+  async setNewBrowseTime() {
+    try {
+      // last 15 min if used flipped a page.
+      const expireDate = 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),
+      });
+
+      // delete pageFlipTime when book is auto renew at nth minute
+      await this.localCache.delete(`${this.identifier}-pageFlipTime`);
     } catch (error) {
-      console.log(error)
+      console.log(error);
     }
   }
 
-  async changeTime(date, minutes, op) {
-    if (date === undefined) return undefined;
-    
+  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);
   }
-
-  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';
-      },
-    });
-  }
 }

package/src/ia-book-actions.js

@@ -12,8 +12,8 @@ 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';
 
@@ -36,17 +36,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 },
+      autoRenewConfig: { type: Object },
+      autoRenewResult: { type: Object },
     };
   }
 
@@ -61,16 +57,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',
-      defaultTTL: 1 * 60,  // 1 minute
-    }),
-    this.autoRenewTimeConfig = {},
+    });
+
+    // loan auto renew
+    this.autoRenewConfig = {};
+    this.autoRenewResult = {
+      toastTexts: '',
+      hideToast: true,
+      browseAgainNow: false,
+    };
 
     // private props
     this.primaryActions = [];
@@ -80,44 +81,9 @@ export default class IABookActions extends LitElement {
     this.lendingOptions = {};
     this.borrowType = ''; // (browsed|borrowed)
     this.consecutiveLoanCounts = 1; // consecutive loan count
-    this.browseAgainNow = false;
     this.browserTimer = undefined;
 
-    // show toast-message for auto return message
-    this.hideToast = true;
-    this.autoReturnMessage = 'This book will be automatically returned in 15 seconds unless you turn a page.';
-    this.autoRenewMessage = 'This book has been renewed for another hour.';
-
-    // dispatched this event from timer-countdown 
-    this.addEventListener('autoReturnWarning', event => {
-      // const dd = this.autoRenew1 = new OneHourAutoRenew(
-      //   event.detail.bookPageChange,
-      //   this.identifier,
-      //   this.localCache,
-      //   this.autoRenewTimeConfig,
-      // );
-      // this.toastTexts = dd.resultRes.toastTexts;
-      // this.hideToast = dd.resultRes.hideToast;
-      this.handleBookAutoRenew(event);
-    });
-
-    // dispatched this event from bookreader side 
-    this.addEventListener('bookPageFlip', event => {
-      // console.log(e)
-      // const dd = this.autoRenew1 = new OneHourAutoRenew(
-      //   event.detail.bookPageChange,
-      //   this.identifier,
-      //   this.localCache,
-      //   this.autoRenewTimeConfig,
-      // );
-      // this.toastTexts = dd.resultRes.toastTexts;
-      // this.hideToast = dd.resultRes.hideToast;
-      // console.log(dd.resultRes)
-      this.handleBookAutoRenew(event);
-      // this.browseAgainNow = true;
-    });
-
-    this.resetTimerCountdown = false;
+    this.bindAutoRenewEvent();
   }
 
   disconnectedCallback() {
@@ -139,33 +105,62 @@ 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 isPageClick = event.detail.bookPageChange;
+
+      // early return if user is not browsed book
+      if (isPageClick && this.borrowType !== 'browsed') return nothing;
+
+      this.autoRenewResult = await new OneHourAutoRenew(
+        isPageClick,
+        this.identifier,
+        this.localCache,
+        this.autoRenewConfig
+      );
+
+      this.toastTexts = this.autoRenewResult.toastTexts;
+      this.hideToast = this.autoRenewResult.hideToast;
+      this.browseAgainNow = this.autoRenewResult.browseAgainNow;
+
+      if (this.autoRenewResult.browseAgainNow) {
+        this.tokenPoller.disconnectedInterval();
+        await this.browseHasRenew();
+      }
+
+      return nothing;
+    });
+  }
+
   async browseHasExpired() {
     const currStatus = { ...this.lendingStatus, browsingExpired: true };
     this.lendingStatus = currStatus;
+    this.autoRenewResult.browseAgainNow = false;
 
     // remove respected key:value
     await this.localCache.delete(`${this.identifier}-loanTime`);
     await this.localCache.delete(`${this.identifier}-pageFlipTime`);
 
     // show message after browsed book is expired.
-    this.toastTexts = 'This book has been automatically returned due to inactivity.';
+    this.autoRenewResult.toastTexts = 'This book has been auto-returned due to inactivity.';
   }
 
   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,101 +169,22 @@ export default class IABookActions extends LitElement {
 
   startBrowseTimer() {
     clearTimeout(this.browserTimer);
+
     const {
       browsingExpired,
       user_has_browsed,
       secondsLeftOnLoan,
     } = this.lendingStatus;
-    console.log(this.lendingStatus);
     if (!user_has_browsed || browsingExpired) {
-      console.log('attempted renew');
       return;
     }
 
-    // expired book and show browse again button
     const timeLeft = secondsLeftOnLoan * 1000;
     this.browserTimer = setTimeout(() => {
       this.browseHasExpired();
     }, timeLeft);
   }
 
-  async handleBookAutoRenew(event) {
-    try {
-      const bookPageChange = event.detail.bookPageChange;
-      const currentDate = new Date();
-
-      const {
-        totalTime, // 60
-        autoRenewCheckerAtLast, // 50
-        autoRenewVisitedInLast, // 15
-      } = this.autoRenewTimeConfig;
-
-      const loanTime = await this.localCache.get(`${this.identifier}-loanTime`);
-      const lastPageFlipTime = await this.localCache.get(`${this.identifier}-pageFlipTime`);
-
-      const lastFlipTimeFrame = await this.changeTime(
-        currentDate,
-        autoRenewVisitedInLast,
-        'sub'
-      ); // 15 seconds
-
-      console.log(lastPageFlipTime, lastFlipTimeFrame)
-
-      // if page is not flipped in last 15 minutes,
-      // instantaly renew it if user viewed new page in last 10 minutes
-      if (bookPageChange === true) {
-        const lastTimeFrame = await this.changeTime(
-          loanTime,
-          totalTime - autoRenewCheckerAtLast,
-          'add'
-        ); // 50 seconds
-        console.log('page flipped!')
-
-        if (currentDate >= lastTimeFrame) {
-          console.log('1 YES NOW BORROW IT AGAIN NOW!');
-          this.toastTexts = this.autoRenewMessage;
-          this.browseAgainNow = true;
-          this.hideToast = false;
-          await this.browseHasRenew();
-        }
-
-        return nothing // early return
-      }
-
-      console.log(lastPageFlipTime, lastFlipTimeFrame)
-      if (lastPageFlipTime === undefined) { // not viewed
-        console.log('2 DON\'T BORROW IT!');
-        this.toastTexts = this.autoReturnMessage;
-        this.hideToast = false;
-      } else if (lastPageFlipTime >= lastFlipTimeFrame) { // viewed in last time frame
-        console.log('3 YES BORROW IT AGAIN!');
-        this.toastTexts = this.autoRenewMessage;
-        this.browseAgainNow = true;
-        this.hideToast = false;
-        await this.browseHasRenew();
-      } else if (lastPageFlipTime <= lastFlipTimeFrame) { // viewed but not in last time frame
-        console.log('4 DON\'T BORROW IT!');
-        this.toastTexts = this.autoReturnMessage;
-        this.hideToast = false;
-      } else {
-        this.browseAgainNow = true;
-        console.log('5 YES NOW BORROW IT AGAIN NOW!');
-      }
-    } catch (error) {
-      console.log(error)
-    }
-  }
-
-  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);
-  }
-
   /** SharedObserver resize handler */
   handleResize(entry) {
     // if you are observing multiple targets,
@@ -322,13 +238,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(
@@ -353,7 +272,13 @@ 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.autoRenewResult.browseAgainNow ? this.tokenDelay : 100);
   }
 
   render() {
@@ -378,9 +303,8 @@ export default class IABookActions extends LitElement {
   get timerCountdownTemplate() {
     return this.borrowType === 'browsed'
       ? html`<timer-countdown
-          time=${Number(this.remainingTime)}
-          .autoRenewCheckerAtLast=${this.autoRenewTimeConfig.autoRenewCheckerAtLast}
-          ?resetTimerCountdown=${this.resetTimerCountdown}
+          time=${Number(this.lendingStatus.secondsLeftOnLoan)}
+          .autoCheckAt=${this.autoRenewConfig.autoCheckAt}
         ></timer-countdown>`
       : nothing;
   }
@@ -388,15 +312,16 @@ export default class IABookActions extends LitElement {
   get toastMessageTemplate() {
     return html`
       <toast-message
-        .texts=${this.toastTexts}
-        .dismisOnClick="1"
-        ?hideToast=${this.hideToast}
+        .texts=${this.autoRenewResult.toastTexts}
+        ?dismisOnClick=${Boolean(true)}
+        ?hideToast=${this.autoRenewResult.hideToast}
       ></toast-message>
     `;
   }
 
   get bookActionBar() {
     return html`
+      <button @click=${() => this.pageFlipEvent()}>Page Flip</button>
       <collapsible-action-group
         .userid=${this.userid}
         .identifier=${this.identifier}
@@ -406,10 +331,11 @@ export default class IABookActions extends LitElement {
         .width=${this.width}
         .borrowType=${this.borrowType}
         .returnUrl=${this.returnUrl}
-        .autoRenew=${this.autoRenew}
+        .localCache=${this.localCache}
+        .autoRenewConfig=${this.autoRenewConfig}
         ?hasAdminAccess=${this.hasAdminAccess}
         ?disabled=${this.disableActionGroup}
-        ?browseAgainNow=${this.browseAgainNow}
+        ?browseAgainNow=${this.autoRenewResult.browseAgainNow}
         @lendingActionError=${this.handleLendingActionError}
         @toggleActionGroup=${this.handleToggleActionGroup}
       >
@@ -419,6 +345,18 @@ export default class IABookActions extends LitElement {
     `;
   }
 
+  // will move this function to bookreader...
+  pageFlipEvent() {
+    // dispatch event to say book page has flipped
+    document.querySelector('ia-book-actions').dispatchEvent(
+      new CustomEvent('autoRenewAttempt', {
+        detail: { bookPageChange: true },
+        bubbles: true,
+        composed: true,
+      })
+    );
+  }
+
   /**
    * enable access of borrowed/browsed books
    */
@@ -585,7 +523,7 @@ export default class IABookActions extends LitElement {
       }
 
       toast-message {
-        --messageHeightFromTop: 18%;
+        --messageHeightFromTop: 17%;
       }
     `;
   }

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;
-  }
-`;