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

package/demo/index.html

@@ -128,13 +128,13 @@
     iaBookActions.returnUrl = 'https://openlibrary.org';
     iaBookActions.localCache = localCache;
     iaBookActions.autoRenewConfig = {
-      totalTime: 60, // 60 second = 1 min
-      autoCheckAt: 55, // totalTime - 10th minute
+      totalTime: 20, // 60 second = 1 min
+      autoCheckAt: 15, // totalTime - 10th minute
       FlippedInLast: 15, // within last 15 second/minute 
     };
 
     let lendingStatus1 = iaBookActions.lendingStatus;
-    let secondsLeftOnLoan = 60;
+    let secondsLeftOnLoan = iaBookActions.autoRenewConfig.totalTime;
 
     document.querySelectorAll('.titleBar input[type=checkbox]').forEach((item) => {
       item.addEventListener('click', (e) => {
@@ -226,7 +226,7 @@
             await localCache.set({
               key: `${identifier}-loanTime`,
               value: new Date(), // current time
-              ttl: parseInt(iaBookActions.autoRenewConfig.totalTime),
+              ttl: Number(iaBookActions.autoRenewConfig.totalTime),
             })
 
             await localCache.delete(`${identifier}-pageFlipTime`);

package/package.json

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

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/toast-message.js

@@ -4,7 +4,7 @@ export class ToastMessage extends LitElement {
   static get properties() {
     return {
       texts: { type: String },
-      dismisOnClick: { type: Function },
+      dismisOnClick: { type: Boolean },
       hideToast: { type: Boolean },
     };
   }
@@ -19,7 +19,11 @@ export class ToastMessage extends LitElement {
   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;
   }
@@ -30,15 +34,16 @@ export class ToastMessage extends LitElement {
     return css`
       :host {
         display: inline-block;
+        
       }
       .toast-message {
         z-index: 2;
         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 +51,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

@@ -127,14 +127,17 @@ export default class ActionsHandler extends LitElement {
   }
 
   handleAutoBrowseIt() {
-    const action = 'auto_browse';
-    this.setBrowseTimeSession()
+    const action = 'renew_loan';
 
     ActionsHandlerService({
       action,
       identifier: this.identifier,
-      success: () => {},
+      success: () => {
+        console.log('success!');
+      },
       error: data => {
+        console.log(data);
+        console.log('error!');
         this.dispatchActionError(action, data);
       },
     });
@@ -291,6 +294,19 @@ export default class ActionsHandler extends LitElement {
     }
   }
 
+  async setBrowseTimeSession(_date = '') {
+    try {
+      // set a value
+      await this.localCache.set({
+        key: `${this.identifier}-loanTime`,
+        value: new Date(), // current time
+        ttl: Number(this.autoRenewConfig.totalTime),
+      })
+
+      await this.localCache.delete(`${this.identifier}-pageFlipTime`);
+    } catch (error) {}
+  }
+
   deleteLoanCookies() {
     const date = new Date();
     date.setTime(date.getTime() - 24 * 60 * 60 * 1000); // one day ago
@@ -310,17 +326,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.autoRenewConfig.totalTime),
-      })
-
-      await this.localCache.delete(`${this.identifier}-pageFlipTime`);
-    } catch (error) {}
-  }
 }

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

@@ -13,18 +13,18 @@ export class OneHourAutoRenew {
     this.autoRenewConfig = autoRenewConfig;
     this.userHasBrowsed = userHasBrowsed;
 
+    // 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.';
+    
     // private props
     this.resultRes = {
-      toastTexts: null,
+      toastTexts: this.autoReturnMessage,
       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();
   }
 
@@ -51,7 +51,7 @@ export class OneHourAutoRenew {
     await this.localCache.set({
       key: `${this.identifier}-pageFlipTime`,
       value: new Date(), // current time
-      ttl: parseInt(this.autoRenewConfig.totalTime),
+      ttl: Number(this.autoRenewConfig.totalTime),
     })
   }
 
@@ -75,6 +75,8 @@ export class OneHourAutoRenew {
       this.resultRes.browseAgainNow = true;
       this.resultRes.hideToast = false;
       this.resultRes.renewNow = true;
+
+      this.setNewBrowseTime();
     }
 
     return this.resultRes;
@@ -105,11 +107,32 @@ export class OneHourAutoRenew {
 
       // delete pageFlipTime when book is auto renew at nth minute
       await this.localCache.delete(`${this.identifier}-pageFlipTime`);
+      this.setNewBrowseTime();
     }
 
     return this.resultRes;
   }
 
+  async setNewBrowseTime() {
+    try {
+      // last 15 min if used flipped a page.
+      const expireDate = await 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),
+      })
+
+      await this.localCache.delete(`${this.identifier}-pageFlipTime`);
+    } catch (error) {}
+  }
+
   async changeTime(date, minutes, op) {
     if (date === undefined) return undefined;
     
@@ -128,24 +151,4 @@ export class OneHourAutoRenew {
       `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

@@ -70,6 +70,7 @@ export default class IABookActions extends LitElement {
       namespace: '1HourLoanStorage'
     }),
     this.autoRenewConfig = {},
+    this.autoRenewObj = undefined;
 
     // private props
     this.primaryActions = [];
@@ -101,6 +102,7 @@ export default class IABookActions extends LitElement {
   }
 
   updated(changed) {
+    // console.log(changed)
     if (changed.has('lendingStatus') || changed.has('bwbPurchaseUrl')) {
       this.setupLendingToolbarActions();
       this.update();
@@ -120,7 +122,7 @@ export default class IABookActions extends LitElement {
     this.addEventListener('autoRenewAttempt', async event => {
       const isPageFlipped = event.detail.bookPageChange;
 
-      const dd = await new OneHourAutoRenew(
+      this.autoRenewObj = await new OneHourAutoRenew(
         isPageFlipped,
         this.identifier,
         this.localCache,
@@ -128,34 +130,37 @@ export default class IABookActions extends LitElement {
         this.lendingStatus.user_has_browsed && !this.lendingStatus.browsingExpired
       );
 
-      this.toastTexts = dd.toastTexts;
-      this.hideToast = dd.hideToast;
-      this.browseAgainNow = dd.renewNow;
+      this.toastTexts = this.autoRenewObj.toastTexts;
+      this.hideToast = this.autoRenewObj.hideToast;
+      this.browseAgainNow = this.autoRenewObj.renewNow;
       if (this.browseAgainNow) {
         await this.browseHasRenew();
       }
-      // this.handleBookAutoRenew(event);
     });
   }
 
   async browseHasExpired() {
     const currStatus = { ...this.lendingStatus, browsingExpired: true };
     this.lendingStatus = currStatus;
+    this.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.autoReturnMessage;
+    this.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: Math.abs(Math.round(secondsLeft)),
     };
     this.lendingStatus = currStatus;
 
@@ -301,7 +306,7 @@ export default class IABookActions extends LitElement {
     return html`
       <toast-message
         .texts=${this.toastTexts}
-        .dismisOnClick="1"
+        ?dismisOnClick=${true}
         ?hideToast=${this.hideToast}
       ></toast-message>
     `;