Wait for login and event processing on loading

src/Event.ts

@@ -73,6 +73,8 @@ let nowEvent: EventData | null = null
 
 export const getEvent = () => nowEvent
 
+let cacheEvents: EventData[] | null = null
+
 export const eventCheck = async () => {
   if (!player.dayCheck) {
     return
@@ -98,14 +100,27 @@ export const eventCheck = async () => {
     }
   })
 
+  cacheEvents = events
+
+  eventUpdate()
+}
+
+export const eventUpdate = async () => {
+  if (cacheEvents === null) {
+    await eventCheck()
+  }
+  if (cacheEvents === null) {
+    return
+  }
+
   const activeEvents: EventData[] = []
   nowEvent = null
 
   const now = new Date(getTimePinnedToLoadDate())
   let start: Date
   let end: Date
 
-  for (const event of events) {
+  for (const event of cacheEvents) {
     // TODO: use setDate instead to set the correct day.
     start = new Date(event.start)
     end = new Date(event.end)

src/Synergism.ts

@@ -142,7 +142,10 @@ import { DOMCacheGetOrSet } from './Cache/DOM'
 import { checkVariablesOnLoad } from './CheckVariables'
 import { lastUpdated, prod, testing, version } from './Config'
 import { WowCubes, WowHypercubes, WowPlatonicCubes, WowTesseracts } from './CubeExperimental'
-import { eventCheck } from './Event'
+import { 
+  eventCheck, 
+  eventUpdate
+} from './Event'
 import {
   AbyssHepteract,
   AcceleratorBoostHepteract,
@@ -6355,6 +6358,28 @@ export const reloadShit = async (reset = false) => {
     await loadSynergy()
   }
 
+  // wait for login and event acquisition on loading
+  // export or singularity won't update them
+  if (saveCheck.canSave) {
+    await Promise.allSettled([
+      handleLogin().catch(console.error),
+      eventCheck()
+        .finally(() => {
+          setInterval(
+            () =>
+              eventCheck().catch((error: Error) => {
+                console.error(error)
+              }),
+            15_000
+          )
+        })
+    ])
+  } else {
+    eventUpdate()
+  }
+  cacheReinitialize()
+  dailyResetCheck()
+
   if (!reset) {
     await calculateOffline()
   } else {
@@ -6392,23 +6417,11 @@ export const reloadShit = async (reset = false) => {
   changeSubTab(Tabs.Singularity, { page: 0 }) // set 'singularity main'
   changeSubTab(Tabs.Settings, { page: 0 }) // set 'statistics main'
 
-  dailyResetCheck()
   setInterval(dailyResetCheck, 30000)
 
   constantIntervals()
   changeTabColor()
 
-  eventCheck()
-    .catch(() => {})
-    .finally(() => {
-      setInterval(
-        () =>
-          eventCheck().catch((error: Error) => {
-            console.error(error)
-          }),
-        15_000
-      )
-    })
   showExitOffline()
   clearTimeout(preloadDeleteGame)
 
@@ -6478,8 +6491,6 @@ window.addEventListener('load', async () => {
 
   corruptionButtonsAdd()
   corruptionLoadoutTableCreate()
-
-  handleLogin().catch(console.error)
 })
 
 window.addEventListener('unload', () => {