@nuskin/ns-shop 7.0.5-cx1-13272.2 → 7.0.5-cx1-13272.3

package/package.json

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

package/src/salesEventService.js

@@ -686,6 +686,15 @@ function _getHeaders() {
     };
 }
 
+async function _getActiveEvents() {
+    let response = await axios({
+        method: 'GET',
+        url: `${_getAwsUrl()}?activeWithin=${ACTIVE_EVENT_WITHIN}`,
+        headers: _getHeaders()
+    });
+    return response.data.salesEventResponse
+}
+
 //=========================================================================================================//
 //
 //  Misc functions
@@ -828,7 +837,6 @@ async function _initializePolling() {
             // if been to sleep for more then 3 seconds then check all ticket statuses.
             if (slept) {
                 // Went to sleep for 3 seconds or more
-
                 Object.values(eventTicketInfoMap).forEach(eventTicketInfo => {
                     // A new timer needs to be set, clear current one if exists
                     eventTicketInfo.needsStatusCheck = true;
@@ -841,13 +849,16 @@ async function _initializePolling() {
             });
 
             // check for missing tickets
-            for (const eventName in Object.keys(mktEventConfigMap)) {
-                if (!eventTicketInfoMap[eventName]) {
-                    await _initEventTicketInfo(eventName);
+            if (slept) {
+                const activeEvents = await _getActiveEvents();
+                for (const eventInfo of activeEvents) {
+                    if (mktEventConfigMap[eventInfo.eventName] && !eventTicketInfoMap[eventInfo.eventName]) {
+                        await _initEventTicketInfo(eventInfo.eventName);
+                    }
                 }
             }
 
-            lastTime = now;
+            lastTime = Date.now();
         }, TIMEOUT);
     }
 }
@@ -998,12 +1009,7 @@ async function _loadAwsActiveEvents(country) {
         storageObj = {events: []};
         storage.setItem(activeEventsName, storageObj, {ttl: 250}); // to prevent multiple calls.
         try {
-            let response = await axios({
-                method: 'GET',
-                url: `${_getAwsUrl()}?activeWithin=${ACTIVE_EVENT_WITHIN}`,
-                headers: _getHeaders()
-            });
-            addEvents(response.data.salesEventResponse);
+            addEvents(await _getActiveEvents());
         } catch (e) {
             // an error occurred with the call, clear active events
             //  so it won't wait 30 minutes to try again