@internetarchive/ia-book-actions 0.1.11-b32 → 0.1.11-b33

package/package.json

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

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

@@ -2,6 +2,7 @@ import { LitElement } from 'lit';
 
 import { URLHelper } from '../../config/url-helper.js';
 import { sentryLogs } from '../../config/sentry-events.js';
+import log from '../log.js';
 
 import ActionsHandlerService from './actions-handler-service.js';
 import LoanAnanlytics from '../loan-analytics.js';
@@ -142,13 +143,7 @@ export default class ActionsHandler extends LitElement {
       action,
       identifier: this.identifier,
       success: data => {
-        console.log(
-          'RENEW_LOAN --- ',
-          data,
-          action,
-          data.loan,
-          this.identifier
-        );
+        log('RENEW_LOAN --- ', data, action, data.loan, this.identifier);
         if (data?.success === true && data?.loan?.renewal === true) {
           this.setBrowseTimeSession();
           this.dispatchEvent(
@@ -322,7 +317,7 @@ export default class ActionsHandler extends LitElement {
       // delete pageChangedTime when book is auto renew at nth minute
       await this.localCache.delete(`${this.identifier}-pageChangedTime`);
     } catch (error) {
-      console.log(error);
+      log(error);
     }
   }
 

package/src/core/services/loan-analytics.js

@@ -2,6 +2,7 @@
 
 import { analyticsCategories } from '../config/analytics-event-and-category.js';
 import * as Cookies from './doc-cookies.js';
+import log from './log.js';
 
 /**
  * This class is used to send different GA events for loan system.
@@ -45,7 +46,7 @@ export default class LoanAnanlytics {
         '/'
       );
     } catch (error) {
-      console.log(error);
+      log(error);
       this.sendEvent('Cookies-Error-Actions', error, this.identifier);
     }
   }
@@ -144,7 +145,7 @@ export default class LoanAnanlytics {
    * @memberof LoanAnanlytics
    */
   sendEvent(eventCategory, eventAction, label, extraParams) {
-    // console.log(
+    // log(
     //   'eventCategory:-',
     //   eventCategory,
     //   '\t||\teventAction:-',

package/src/core/services/loan-renew-helper.js

@@ -1,6 +1,7 @@
 /* eslint-disable class-methods-use-this */
 
 import { nothing } from 'lit';
+import log from './log.js';
 
 /**
  * This class is used to determine if use is eligible for auto renew loan.
@@ -32,7 +33,7 @@ export class LoanRenewHelper {
       }
       return this.autoChecker(); // auto checker at last 10th minute
     } catch (error) {
-      console.log(error);
+      log(error);
     }
 
     return nothing;

package/src/core/services/log.js

@@ -0,0 +1,16 @@
+/* eslint-disable no-restricted-globals */
+/* eslint-disable semi */
+/**
+ * log() utility -- production ignores 'log()' JS calls; dev invokes 'log()'
+ */
+const log =
+  location.hostname === 'localhost' ||
+  location.host.match(/^(www|cat)-[a-z0-9]+\.archive\.org$/) ||
+  location.host.match(/\.code\.archive\.org$/) ||
+  location.host.match(/\.dev\.archive\.org$/) ||
+  location.host.match(/^ia-petabox-/)
+    ? // eslint-disable-next-line no-console
+      console.log.bind(console) // convenient, no?  Stateless function
+    : () => {};
+
+export { log as default };

package/src/ia-book-actions.js

@@ -19,6 +19,7 @@ import { mobileContainerWidth } from './core/config/constants.js';
 import { sentryLogs } from './core/config/sentry-events.js';
 import { LoanTokenPoller } from './core/services/loan-token-poller.js';
 import { LoanRenewHelper } from './core/services/loan-renew-helper.js';
+import log from './core/services/log.js';
 
 export const events = {
   browseExpired: 'IABookReader:BrowsingHasExpired',
@@ -256,7 +257,7 @@ export default class IABookActions extends LitElement {
     // initial timer state for 1-hour loan
     if (this.borrowType === 'browsed' && !this.loanRenewResult.renewNow) {
       setTimeout(() => {
-        console.log(
+        log(
           'IN TIMEOUT OF --- setupLendingToolbarActions, firing resetTimerCountState'
         );
         this.resetTimerCountState();
@@ -287,6 +288,13 @@ export default class IABookActions extends LitElement {
         this.autoLoanRenewChecker(true);
       }
     });
+
+    window.focus(() => {
+      log('WINDOW FOCUS', this.borrowType);
+      if (this.borrowType === 'browsed') {
+        this.autoLoanRenewChecker(true);
+      }
+    });
   }
 
   /**
@@ -319,11 +327,11 @@ export default class IABookActions extends LitElement {
    * Show the waring modal to ask user if they are still reading
    */
   async showWarningModal() {
-    console.log('****** showWarningModal ******');
+    log('****** showWarningModal ******');
     // clear modal
     this.modal.customModalContent = nothing;
     this.modal?.closeModal();
-    console.log('MODAL CLOSED ___ ', this.modal.customModalContent);
+    log('MODAL CLOSED ___ ', this.modal.customModalContent);
     this.loanRenewResult = { texts: '', renewNow: false };
 
     // if secondsLeft < 60, consider it 1 minute
@@ -366,11 +374,12 @@ export default class IABookActions extends LitElement {
         </button>
       </div> `;
 
+    this.modal.setAttribute('aria-live', 'assertive');
     await this.modal?.showModal({ config, customModalContent });
   }
 
   async showWarningDisabledModal() {
-    console.log('****** showWarningDisabledModal ******');
+    log('****** showWarningDisabledModal ******');
 
     // if secondsLeft < 60, consider it 1 minute
     let { secondsLeft } = this.loanRenewResult;
@@ -390,21 +399,6 @@ export default class IABookActions extends LitElement {
       ),
     });
 
-    // this doesn't really work? shows empty button
-
-    // if (event.target === undefined) return;
-
-    // const button = event.target;
-    // button.disabled = true;
-    // button.innerHTML = `<ia-activity-indicator
-    //   mode="processing"
-    //   style=${modalButtonStyle.loaderIcon}
-    // ></ia-activity-indicator>`;
-
-    // const parentElement = event.target.parentNode;
-    // parentElement.style.pointerEvents = 'none';
-    // parentElement.style.opacity = 0.8;
-
     const customModalContent = html`<br />
       <div
         id="disabled-book-action-bar-custom-buttons"
@@ -419,6 +413,7 @@ export default class IABookActions extends LitElement {
             style=${modalButtonStyle.loaderIcon}
           ></ia-activity-indicator>
         </button>
+        <span style="visibility: none; height: 1px; width: 1px;">Renewing loan, one moment please.</span>
         <button
           disabled
           style="${modalButtonStyle.iaButton} ${modalButtonStyle.return}"
@@ -440,7 +435,7 @@ export default class IABookActions extends LitElement {
    * Show modal when book is auto returned
    */
   async showExpiredModal() {
-    console.log('showExpiredModal()');
+    log('showExpiredModal()');
 
     const config = new ModalConfig({
       headline: '',
@@ -544,7 +539,7 @@ export default class IABookActions extends LitElement {
 
   async startBrowseTimer() {
     clearTimeout(this.browseTimer);
-    console.log(
+    log(
       'startBrowseTimerstartBrowseTimer just cleared timer',
       this.browseTimer,
       this.lendingStatus
@@ -556,12 +551,12 @@ export default class IABookActions extends LitElement {
       secondsLeftOnLoan,
     } = this.lendingStatus;
     if (!user_has_browsed || browsingExpired) {
-      console.log('user not browsed', this.lendingStatus);
+      log('user not browsed', this.lendingStatus);
       return;
     }
 
     this.browseTimer = setTimeout(() => {
-      console.log(
+      log(
         'start `this.browseTimer will fire his.browseHasExpired() - secondsLeftOnLoan',
         secondsLeftOnLoan
       );
@@ -587,7 +582,7 @@ export default class IABookActions extends LitElement {
     const actualStrokeDashOffset =
       firstStrokeDashOffset > 315 ? 315 : firstStrokeDashOffset;
 
-    console.log('resetTimerCountState === ', {
+    log('resetTimerCountState === ', {
       secondsLeft,
       firstStrokeDashOffset,
       actualStrokeDashOffset,
@@ -671,7 +666,7 @@ export default class IABookActions extends LitElement {
       window?.IALendingIntervals?.clearAll();
 
       // testing console....
-      console.log('IABookActions: AutoRenewed:- ', {
+      log('IABookActions: AutoRenewed:- ', {
         ajaxResponse: event?.detail?.data,
         loanRenewResult: this.loanRenewResult,
         secondsLeftOnLoan: Math.round(this.lendingStatus.secondsLeftOnLoan), // stale? how to fix
@@ -689,25 +684,17 @@ export default class IABookActions extends LitElement {
       };
       this.lendingStatus = currStatus;
 
-      console.log('~~~ handleLoanAutoRenewed - new this.lendingStatus', {
+      log('~~~ handleLoanAutoRenewed - new this.lendingStatus', {
         secondsLeftOnLoan: this.lendingStatus.secondsLeftOnLoan,
       });
 
-      /**
-       * reset timer countdown states
-       */
+      /** reset timer */
       await this.resetTimerCountState();
 
       // close the modal
+      this.modal?.closeModal();
       this.modal.removeAttribute('id');
-      // const editedActionButtons = this.modal.shadowRoot.querySelector('#book-action-bar-custom-buttons');
-      // if (editedActionButtons) {
-      //   editedActionButtons.parentElement.removeChild(editedActionButtons);
-      // }
       this.modal.customModalContent = nothing;
-      this.modal?.closeModal();
-      console.log('MODAL CLOSED ___ ', this.modal.customModalContent);
-
       window?.Sentry?.captureMessage(sentryLogs.bookHasRenewed);
     }
   }
@@ -718,7 +705,7 @@ export default class IABookActions extends LitElement {
    * @memberof IABookActions
    */
   startTimerCountdown() {
-    console.log('startTimerCountdown()');
+    log('startTimerCountdown()');
     window?.IALendingIntervals?.clearTimerCountdown();
 
     let secondsLeft = Number(this.lendingStatus.secondsLeftOnLoan);
@@ -733,17 +720,17 @@ export default class IABookActions extends LitElement {
       // if really updated, escape from here
       const resync = await this.reSyncTimerIfGoneOff(secondsLeft);
 
-      console.log('*** startTimerCountdown = reSyncTimerIfGoneOff ***', {
+      log('*** startTimerCountdown = reSyncTimerIfGoneOff ***', {
         secondsLeft,
         resync,
       });
 
       if (resync) {
-        console.log('have resyncd, will end startTimerCountdown here - ');
+        log('have resyncd, will end startTimerCountdown here - ');
         return;
       }
 
-      console.log('startTimerCountdown - NO RESYNC');
+      log('startTimerCountdown - NO RESYNC');
 
       /**
        * execute from last 10th minute to 0th minute
@@ -772,7 +759,7 @@ export default class IABookActions extends LitElement {
    */
   async reSyncTimerIfGoneOff(timerSecondsLeft) {
     // debug info
-    console.log(
+    log(
       new Date().toLocaleTimeString(),
       'timeLeftInSec',
       timerSecondsLeft,
@@ -795,7 +782,7 @@ export default class IABookActions extends LitElement {
 
     if (whatIsleft !== whatShouldLeft) {
       // debug info
-      console.log(
+      log(
         `timer is gone off, let's re-sync, whatIsleft -> ${whatIsleft}, whatShouldLeft -> ${whatShouldLeft}`
       );
 
@@ -819,7 +806,7 @@ export default class IABookActions extends LitElement {
    * @memberof IABookActions
    */
   async loanRenewAttempt(secondsLeft) {
-    console.log('loanRenewAttempt()', secondsLeft, this.loanRenewResult);
+    log('loanRenewAttempt()', secondsLeft, this.loanRenewResult);
     let loanSecondsLeft = secondsLeft;
     /**
      * auto-renew is not possible in last seconds (let say 50 second) because,
@@ -829,7 +816,7 @@ export default class IABookActions extends LitElement {
      * so if seconds left is < 50, just expire the loan
      */
     if (loanSecondsLeft < 50) {
-      console.log('if (loanSecondsLeft < 50) {');
+      log('if (loanSecondsLeft < 50) {');
       await this.browseHasExpired();
       return;
     }