fix: trial fallbacks for local strategies

WatWowMap · Aug 17, 2024 · 0744d1c · 0744d1c
1 parent 1824f65
commit 0744d1c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/packages/types/lib/config.d.ts b/packages/types/lib/config.d.ts
@@ -5,7 +5,7 @@ import type { UiconsIndex } from 'uicons.js'
 import { Props as ImgProps } from '@components/Img'
 
 import type { CustomComponent } from './blocks'
-import config = require('server/src/configs/default.json')
+import config = require('../../../config/default.json')
 import example = require('../../../config/local.example.json')
 
 import type { Schema } from './server'
@@ -22,7 +22,7 @@ type BaseConfig = typeof config
 type ExampleConfig = typeof example
 
 export type ConfigAreas = Awaited<
-  ReturnType<typeof import('server/src/services/areas')['loadLatestAreas']>
+  ReturnType<(typeof import('server/src/services/areas'))['loadLatestAreas']>
 >
 
 export type Config<Client extends boolean = false> = DeepMerge<
@@ -33,7 +33,7 @@ export type Config<Client extends boolean = false> = DeepMerge<
           version: string
           locales: string[]
           localeStatus: ReturnType<
-            typeof import('@rm/locales/lib/utils')['getStatus']
+            (typeof import('@rm/locales/lib/utils'))['getStatus']
           >
           hasCustom: boolean
           title: string

diff --git a/server/src/services/EventManager.js b/server/src/services/EventManager.js
@@ -126,13 +126,13 @@ class EventManager extends Logger {
   async chatLog(channel, embed, strategy) {
     if (strategy) {
       if (strategy in this.authClients) {
-        return this.authClients[strategy].sendMessage(embed, channel)
+        return this.authClients[strategy]?.sendMessage(embed, channel)
       }
       this.log.warn(`Strategy ${strategy} not found in authClients`)
     } else {
       await Promise.allSettled(
         Object.values(this.authClients).map(async (client) =>
-          client.sendMessage(embed, channel),
+          client?.sendMessage(embed, channel),
         ),
       )
     }
@@ -152,15 +152,15 @@ class EventManager extends Logger {
   clearTrialTimers() {
     this.log.info('clearing trial timers')
     Object.values(this.authClients).forEach((client) =>
-      client.trialManager.end(),
+      client?.trialManager?.end(),
     )
   }
 
   async cleanupTrials() {
     this.log.info('cleaning up session for possibly expired trials')
     await Promise.allSettled(
       Object.values(this.authClients).map((client) =>
-        client.trialManager.cleanup(),
+        client?.trialManager?.cleanup(),
       ),
     )
   }

diff --git a/server/src/services/Trial.js b/server/src/services/Trial.js
@@ -1,5 +1,6 @@
 // @ts-check
 const { Logger, log } = require('@rm/logger')
+const config = require('@rm/config')
 
 const { Timer } = require('./Timer')
 const state = require('./state')
@@ -11,7 +12,16 @@ class Trial extends Logger {
 
     this._name = strategy.name
     this._type = strategy.type
-    this._trial = strategy.trialPeriod
+    /** @type {import("@rm/types").StrategyConfig['trialPeriod']} */
+    this._trial = config.util.extendDeep(
+      {
+        start: null,
+        end: null,
+        intervalHours: 0,
+        roles: [],
+      },
+      strategy.trialPeriod,
+    )
 
     this._forceActive = false
 

diff --git a/server/src/services/state.js b/server/src/services/state.js
@@ -36,7 +36,7 @@ const serverState = {
           try {
             if (this.event.authClients[name]) {
               // Clear any existing trials before we reinitialize
-              this.event.authClients[name].trialManager.end()
+              this.event.authClients[name]?.trialManager?.end()
             }
             const buildStrategy = fs.existsSync(
               path.resolve(__dirname, `../strategies/${name}.js`),
@@ -62,14 +62,14 @@ const serverState = {
   getTrialStatus(strategy) {
     if (strategy) {
       if (strategy in this.event.authClients) {
-        return this.event.authClients[strategy].trialManager.status()
+        return this.event.authClients[strategy]?.trialManager?.status() ?? null
       }
       throw new Error(`Strategy ${strategy} not found`)
     } else {
       return Object.fromEntries(
         Object.entries(this.event.authClients).map(([k, v]) => [
           k,
-          v.trialManager.status(),
+          v.trialManager?.status() ?? null,
         ]),
       )
     }
@@ -81,13 +81,13 @@ const serverState = {
   setTrials(active, strategy) {
     if (strategy) {
       if (strategy in this.event.authClients) {
-        this.event.authClients[strategy].trialManager.setActive(active)
+        this.event.authClients[strategy]?.trialManager?.setActive(active)
       } else {
         throw new Error(`Strategy ${strategy} not found`)
       }
     } else {
       Object.values(this.event.authClients).forEach((client) => {
-        client.trialManager.setActive(active)
+        client?.trialManager?.setActive(active)
       })
     }
   },