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

package/package.json

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

package/src/salesEventService.js

@@ -139,28 +139,41 @@ function getActiveTicketEvents() {
     return events;
 }
 
-async function getEventStatus(eventsToCheck = [], externalId = 'none') {
+async function getEventStatus(eventsToCheck = []) {
     const eventStatus = {};
     const promises = [];
 
     eventsToCheck.forEach((toCheck) => {
-        promises.push(_getTempTicket(toCheck, externalId));
+        promises.push(_checkForMissingTicket(toCheck));
     });
 
-    const responses = await Promise.allSettled(promises);
+    await Promise.allSettled(promises);
 
-    responses.forEach((response) => {
+    eventsToCheck.forEach((eventName) => {
         let activeStatus = false;
-        if (response.status === 'fulfilled' && response.value) {
-            const status = _decodeStatus(response.value.status);
+        const ticketInfo = eventTicketInfoMap[eventName];
+        if (ticketInfo.ticket) {
+            const status = _decodeStatus(ticketInfo.ticket.status);
             if ((status.eventStatus === PRE_EVENT && status.preWaitTime <= 30000) ||
                 status.eventStatus === IN_EVENT) {
                 activeStatus = true;
             }
-            eventStatus[response.value.eventName] = activeStatus;
         }
+        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;
 }
 
@@ -172,35 +185,35 @@ async function getEventStatus(eventsToCheck = [], externalId = 'none') {
  * @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;
-}
+// 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();
@@ -813,6 +826,12 @@ function getStorageItem(key) {
     return item;
 }
 
+async function _checkForMissingTicket(eventName) {
+    if (mktEventConfigMap[eventName] && !eventTicketInfoMap[eventName]) {
+        await _initEventTicketInfo(eventName);
+    }
+}
+
 /**
  * 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.
@@ -828,7 +847,7 @@ async function _initializePolling() {
             const slept = now > (lastTime + TIMEOUT + 3000)
 
             // if polling market config, only reload it every 30 seconds
-            if (slept || pollMarketConfig && intervalCnt % 3 === 0) {
+            if (slept || pollMarketConfig && intervalCnt % 6 === 0) {
                 await _loadMarketEventConfig(true);
                 _marketStatusCheck();
             }
@@ -849,16 +868,12 @@ async function _initializePolling() {
             });
 
             // check for missing tickets
-            if (slept) {
-                const activeEvents = await _getActiveEvents();
-                for (const eventInfo of activeEvents) {
-                    if (mktEventConfigMap[eventInfo.eventName] && !eventTicketInfoMap[eventInfo.eventName]) {
-                        await _initEventTicketInfo(eventInfo.eventName);
-                    }
-                }
+            const activeEvents = await _getActiveEvents();
+            for (const eventInfo of activeEvents) {
+                await _checkForMissingTicket(eventInfo.eventName);
             }
 
-            lastTime = Date.now();
+            lastTime = now;
         }, TIMEOUT);
     }
 }