@nuskin/ns-shop 7.0.5-cx1-13272.8 → 7.0.5-cx1-13272.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/ns-shop",
-  "version": "7.0.5-cx1-13272.8",
+  "version": "7.0.5-cx1-13272.10",
   "description": "The description that will amaze and astound your audience when they read it",
   "main": "src/shop.js",
   "scripts": {

package/src/salesEventService.js

@@ -162,59 +162,9 @@ async function getEventStatus(eventsToCheck = []) {
         eventStatus[eventName] = activeStatus;
     });
 
-    // responses.forEach((response) => {
-    //     let activeStatus = false;
-    //     if (response.status === 'fulfilled' && response.value) {
-    //         const status = _decodeStatus(response.value.status);
-    //         if ((status.eventStatus === PRE_EVENT && status.preWaitTime <= 30000) ||
-    //             status.eventStatus === IN_EVENT) {
-    //             activeStatus = true;
-    //         }
-    //         eventStatus[response.value.eventName] = activeStatus;
-    //     }
-    // });
-
     return eventStatus;
 }
 
-/**
- * Either requests a new ticket or an updated event ticket from the AWS service
- *
- * @param eventTicketInfo - contains informatino about the ticket.
- *
- * @returns {Promise<*>} a new or updated ticket for the specified event
- * @private
- */
-// async function _getTempTicket(eventName, externalId) {
-//     let ticket;
-
-//     try {
-//         let method = 'POST',
-//             seParams = _getSeParams(eventName, false),
-//             response = await axios({
-//                 method: method,
-//                 url: `${_getAwsUrl(eventName, null)}?orderEventCheck=${externalId}${seParams}`,
-//                 headers: _getHeaders(),
-//                 timeout: 7000
-//             });
-
-//         ticket = response.data.salesEventResponse;
-//     } catch (err) {
-//         if (err.response && err.response.data.status === 404) {
-//             console.error(`getTempTicket - unable to get a temporary ticket for ${eventName}`);
-//             throw err;
-//         } else {
-//             console.error(`getTempTicket error or timeout - waiting to try again for ${eventName}`);
-//             // Timed out or some other error
-//             // Wait and then call again.
-//             await _wait(3000);
-//             ticket = await _getTempTicket(eventName);
-//         }
-//     }
-
-//     return ticket;
-// }
-
 function logAnalyticInfo(tag, eventName, data = {}) {
     const user = UserService.getUser();
     const eventTicketInfo = eventTicketInfoMap[eventName];
@@ -255,6 +205,8 @@ function logAnalyticInfo(tag, eventName, data = {}) {
  */
 let initEventTicketCallMap = {};
 async function _initEventTicketInfo(eventName, refreshTicket = false) {
+    myAlert(`_initEventTicketInfo, ${eventName}`);
+
     let initInfo = initEventTicketCallMap[eventName];
     if (!initInfo) {
         initInfo = {initialized: false, refreshTime: 0};
@@ -832,12 +784,20 @@ async function _checkForMissingTicket(eventName) {
     }
 }
 
+function myAlert(msg) {
+    if (window.ReactNativeWebView) {
+        alert(msg);
+    }
+}
+
 /**
  * This initializes an interval timer which checks to see if the browser (computer)
  *  went to sleep.  It's intention is to update the wait timer if it has.
  */
 async function _initializePolling() {
+    myAlert('_initializePolling');
     if (!intervalId) {
+        myAlert('_initializePolling - no intervalId');
         const TIMEOUT = 10000;
         let lastTime = Date.now(),
             intervalCnt = 1;
@@ -846,6 +806,8 @@ async function _initializePolling() {
             const now = Date.now();
             const slept = now > (lastTime + TIMEOUT + 3000)
 
+            myAlert('polling triggered');
+
             // if polling market config, only reload it every 30 seconds
             if (slept || pollMarketConfig && intervalCnt % 6 === 0) {
                 await _loadMarketEventConfig(true);
@@ -867,10 +829,12 @@ async function _initializePolling() {
                 _checkStatus(eventTicketInfo, false);
             });
 
-            // check for missing tickets
-            const activeEvents = await _getActiveEvents();
-            for (const eventInfo of activeEvents) {
-                await _checkForMissingTicket(eventInfo.eventName);
+            if (window.location.pathname === '/static/checkout/checkout.html') {
+                // check for missing tickets. Only perform on checkout s
+                const activeEvents = await _getActiveEvents();
+                for (const eventInfo of activeEvents) {
+                    await _checkForMissingTicket(eventInfo.eventName);
+                }
             }
 
             lastTime = now;
@@ -1066,12 +1030,15 @@ async function initActiveEvents(country = undefined) {
     }
 
     return Promise.all(promises).then(async () => {
+        myAlert(`Initial Events, ${[Object.keys(activeEventMap)]}`);
+
         events.setValue(events.salesevent.INITIAL_ACTIVE_EVENTS, [Object.keys(activeEventMap)]);
 
         // If there are event tickets then initialize polling
-        if (Object.keys(eventTicketInfoMap).length > 0 && !country) {
-            await _initializePolling();
-        }
+        // if (Object.keys(eventTicketInfoMap).length > 0 && !country) {
+        // Test
+        await _initializePolling();
+        // }
         _removeWaitCheck(INITIALIZING);
     });
 }
@@ -1127,13 +1094,13 @@ async function _init(force = true) {
  *  If there are, make sure polling is happening, otherwise, stop polling.
  */
 events.subscribe(events.salesevent.ACTIVE_EVENTS, (/*activeEvents*/) => {
-    if (eventTicketInfoMap) {
-        if (Object.keys(eventTicketInfoMap).length > 0) {
-            _initializePolling().then(() => console.log('Polling initialized'));
-        } else {
-            _clearPollingInterval();
-        }
-    }
+    // if (eventTicketInfoMap) {
+    //     if (Object.keys(eventTicketInfoMap).length > 0) {
+    _initializePolling().then(() => console.log('Polling initialized'));
+    //     } else {
+    //         _clearPollingInterval();
+    //     }
+    // }
 });
 
 // persistentCartService needs to wait until the following configMaps are loaded