perf(cli): isolate leaderboard calculation

apps/api/src/cache/leaderboard.ts

@@ -3,7 +3,7 @@ import type { DatabaseClient } from '@rctf/db'
 import { challenges, scoreEvents, users } from '@rctf/db'
 import { and, asc, eq, gte, inArray, sql } from 'drizzle-orm'
 import { inJsonbArray } from '../lib/db-bulk'
-import { challengeIsPublicSql } from '../services/challenges'
+import { challengeIsPublicSql } from '../services/challenge-queries'
 import { getCompetitionTiming } from '../services/settings'
 import type { TypedRedis } from './scripts'
 

apps/api/src/index.ts

@@ -9,11 +9,9 @@ import type { AppEnv } from './lib/app-env'
 import { runMigrationsOnStartup } from './lib/migrations'
 import { appEnvMiddleware } from './middlewares/app-env'
 import { dynamicChallengeAuthMiddleware } from './middlewares/dynamic-challenge-auth'
-import {
-  adminBotProvider,
-  analyticsProvider,
-  uploadProvider,
-} from './providers'
+import { adminBotProvider } from './providers/instances/admin-bot'
+import { analyticsProvider } from './providers/instances/analytics'
+import { uploadProvider } from './providers/instances/uploads'
 import { routeModules } from './routes'
 import { analyticsScriptHandler } from './routes/v2/integrations/routes/get-analytics-script'
 import { startLeaderboardWorker, stopWorkers } from './workers'

apps/api/src/providers/instances/admin-bot.ts

@@ -0,0 +1,9 @@
+import { config } from '@rctf/config'
+import { adminBotProviders } from '../admin-bot'
+import { loadProvider } from './load'
+
+export const adminBotProvider = loadProvider(
+  adminBotProviders,
+  config.adminBot?.provider
+)
+export const adminBotEnabled = adminBotProvider !== undefined

apps/api/src/providers/instances/analytics.ts

@@ -0,0 +1,19 @@
+import { config } from '@rctf/config'
+import { analyticsProviders } from '../analytics'
+import { loadProvider } from './load'
+
+export const analyticsProvider = (() => {
+  if (config.analytics?.provider) {
+    return loadProvider(analyticsProviders, config.analytics.provider)
+  }
+
+  // NOTE(es3n1n): backporting v1 google analytics config
+  if (config.globalSiteTag) {
+    return loadProvider(analyticsProviders, {
+      name: 'analytics/google',
+      options: { siteTag: config.globalSiteTag },
+    })
+  }
+
+  return undefined
+})()

apps/api/src/providers/instances/captcha.ts

@@ -0,0 +1,28 @@
+import { config } from '@rctf/config'
+import { captchaProviders } from '../captcha'
+import { loadProvider } from './load'
+
+export const captchaProvider = (() => {
+  if (config.captcha?.provider) {
+    return loadProvider(captchaProviders, config.captcha.provider)
+  }
+
+  // NOTE(es3n1n): backporting v1 google captcha config
+  if (config.recaptcha) {
+    const provider = {
+      name: 'captcha/recaptcha' as const,
+      options: {
+        secretKey: config.recaptcha.secretKey,
+        siteKey: config.recaptcha.siteKey,
+      },
+    }
+    config.captcha = {
+      provider,
+      protectedEndpoints: config.recaptcha.protectedActions ?? [],
+    }
+
+    return loadProvider(captchaProviders, provider)
+  }
+
+  return undefined
+})()

apps/api/src/providers/instances/emails.ts

@@ -0,0 +1,8 @@
+import { config } from '@rctf/config'
+import { emailProviders } from '../emails'
+import { loadProvider } from './load'
+
+export const emailProvider = loadProvider(
+  emailProviders,
+  config.email?.provider
+)

apps/api/src/providers/instances/instancer.ts

@@ -0,0 +1,15 @@
+import { config } from '@rctf/config'
+import { instancerProviders } from '../instancer'
+import type { InstancerProvider } from '../instancer/base'
+import { resolveInstancerConfigs } from '../instancer/resolve'
+import { loadProvider } from './load'
+
+const resolvedInstancers = resolveInstancerConfigs(config)
+export const instancers: Record<string, InstancerProvider> = Object.fromEntries(
+  Object.entries(resolvedInstancers.configs).map(([name, providerConfig]) => [
+    name,
+    loadProvider(instancerProviders, providerConfig)!,
+  ])
+)
+export const defaultInstancerName = resolvedInstancers.defaultName
+export const instancerEnabled = Object.keys(instancers).length > 0

apps/api/src/providers/instances/load.ts

@@ -0,0 +1,21 @@
+import type { ProviderConfig } from '@rctf/config'
+
+export const loadProvider = <Base>(
+  providers: Record<string, (options: any) => Base>,
+  providerConfig: ProviderConfig | undefined
+): Base | undefined => {
+  if (!providerConfig) {
+    return undefined
+  }
+
+  const provider = providers[providerConfig.name]
+  if (!provider) {
+    throw new Error(
+      `Unsupported provider: ${providerConfig.name}. Available: ${Object.keys(
+        providers
+      ).join(', ')}`
+    )
+  }
+
+  return provider(providerConfig.options)
+}

apps/api/src/providers/instances/messages.ts

@@ -0,0 +1,7 @@
+import { config } from '@rctf/config'
+import { messagesProviders } from '../messages'
+import { loadProvider } from './load'
+
+export const bloodBotProviders = config.bloodBot?.destinations.map(
+  ({ provider }) => loadProvider(messagesProviders, provider)!
+)

apps/api/src/providers/instances/moderation.ts

@@ -0,0 +1,8 @@
+import { config } from '@rctf/config'
+import { moderationProviders } from '../moderation'
+import { loadProvider } from './load'
+
+export const avatarModerationProvider = loadProvider(
+  moderationProviders,
+  config.avatarsModeration?.provider
+)

apps/api/src/providers/instances/score.ts

@@ -0,0 +1,8 @@
+import { config } from '@rctf/config'
+import { scoreProviders, type ScoreProvider } from '@rctf/scoring'
+import { loadProvider } from './load'
+
+export const scoreProvider = loadProvider<ScoreProvider>(
+  scoreProviders,
+  config.scoreProvider
+)!

apps/api/src/providers/instances/uploads.ts

@@ -0,0 +1,8 @@
+import { config } from '@rctf/config'
+import { uploadProviders } from '../uploads'
+import { loadProvider } from './load'
+
+export const uploadProvider = loadProvider(
+  uploadProviders,
+  config.uploadProvider
+)!

apps/api/src/routes/v1/admin/routes/query-uploads.ts

@@ -1,5 +1,5 @@
 import { QueryUploadsRoute } from '@rctf/types'
-import { uploadProvider } from '../../../../providers'
+import { uploadProvider } from '../../../../providers/instances/uploads'
 import adminGroup from '../group'
 
 adminGroup.route(QueryUploadsRoute, async ({ body, res }) => {

apps/api/src/routes/v1/admin/routes/upload-files.ts

@@ -1,6 +1,6 @@
 import { UploadFilesRoute } from '@rctf/types'
 import { dataUriToBuffer } from 'data-uri-to-buffer'
-import { uploadProvider } from '../../../../providers'
+import { uploadProvider } from '../../../../providers/instances/uploads'
 import adminGroup from '../group'
 
 adminGroup.route(UploadFilesRoute, async ({ res, body }) => {

apps/api/src/routes/v1/leaderboard/routes/get-leaderboard.ts

@@ -1,6 +1,6 @@
 import { config } from '@rctf/config'
 import { GetLeaderboardRoute } from '@rctf/types'
-import { getLeaderboardWithTotal } from '../../../../services/leaderboard'
+import { getLeaderboardWithTotal } from '../../../../services/leaderboard-queries'
 import leaderboardGroup from '../group'
 
 leaderboardGroup.route(

apps/api/src/routes/v2/admin/routes/get-admin-bot-status.ts

@@ -1,5 +1,5 @@
 import { GetAdminBotStatusRouteV2 } from '@rctf/types'
-import { adminBotProvider } from '../../../../providers'
+import { adminBotProvider } from '../../../../providers/instances/admin-bot'
 import adminGroup from '../group'
 
 adminGroup.route(GetAdminBotStatusRouteV2, async ({ res }) => {

apps/api/src/routes/v2/admin/routes/get-instancer-schema.ts

@@ -4,7 +4,7 @@ import {
   defaultInstancerName,
   instancerEnabled,
   instancers,
-} from '../../../../providers'
+} from '../../../../providers/instances/instancer'
 import adminGroup from '../group'
 
 adminGroup.route(GetInstancerSchemaRouteV2, async ({ res }) => {

apps/api/src/routes/v2/admin/routes/query-uploads.ts

@@ -1,5 +1,5 @@
 import { QueryUploadsRouteV2 } from '@rctf/types'
-import { uploadProvider } from '../../../../providers'
+import { uploadProvider } from '../../../../providers/instances/uploads'
 import adminGroup from '../group'
 
 adminGroup.route(QueryUploadsRouteV2, async ({ body, res }) => {

apps/api/src/routes/v2/admin/routes/update-challenge.ts

@@ -1,6 +1,7 @@
 import type { AdminBotConfig } from '@rctf/db'
 import { UpdateChallengeRouteV2 } from '@rctf/types'
-import { adminBotProvider, instancerEnabled } from '../../../../providers'
+import { adminBotProvider } from '../../../../providers/instances/admin-bot'
+import { instancerEnabled } from '../../../../providers/instances/instancer'
 import { createDefaultFlag, getFlagProvider } from '../../../../providers/flags'
 import {
   ChallengeKindChangeBlockedError,

apps/api/src/routes/v2/admin/routes/upload-files.ts

@@ -1,5 +1,5 @@
 import { UploadFilesRouteV2 } from '@rctf/types'
-import { uploadProvider } from '../../../../providers'
+import { uploadProvider } from '../../../../providers/instances/uploads'
 import adminGroup from '../group'
 
 adminGroup.route(UploadFilesRouteV2, async ({ res, body }) => {

apps/api/src/routes/v2/challs/routes/get-challenges.ts

@@ -1,5 +1,6 @@
 import { ChallengeScoringKind, GetChallengesRouteV2 } from '@rctf/types'
-import { adminBotEnabled, instancerEnabled } from '../../../../providers'
+import { adminBotEnabled } from '../../../../providers/instances/admin-bot'
+import { instancerEnabled } from '../../../../providers/instances/instancer'
 import { getChallenges } from '../../../../services/challenges'
 import {
   resolveInstancerActions,

apps/api/src/routes/v2/integrations/routes/get-admin-bot-config.ts

@@ -1,5 +1,5 @@
 import { GetAdminBotConfigRouteV2 } from '@rctf/types'
-import { adminBotProvider } from '../../../../providers'
+import { adminBotProvider } from '../../../../providers/instances/admin-bot'
 import { getChallenge } from '../../../../services/challenges'
 import integrationsGroup from '../group'
 

apps/api/src/routes/v2/integrations/routes/get-admin-bot-job-history.ts

@@ -1,5 +1,5 @@
 import { AdminBotJobStatus, GetAdminBotJobHistoryRouteV2 } from '@rctf/types'
-import { adminBotProvider } from '../../../../providers'
+import { adminBotProvider } from '../../../../providers/instances/admin-bot'
 import { getJobHistory } from '../../../../services/admin-bot-jobs'
 import { getChallenge } from '../../../../services/challenges'
 import integrationsGroup from '../group'

apps/api/src/routes/v2/integrations/routes/get-admin-bot-job-logs.ts

@@ -1,5 +1,5 @@
 import { GetAdminBotJobLogsRouteV2 } from '@rctf/types'
-import { adminBotProvider } from '../../../../providers'
+import { adminBotProvider } from '../../../../providers/instances/admin-bot'
 import { getJobLogs } from '../../../../services/admin-bot-jobs'
 import { getChallenge } from '../../../../services/challenges'
 import integrationsGroup from '../group'

apps/api/src/routes/v2/integrations/routes/get-admin-bot-job-status.ts

@@ -1,5 +1,5 @@
 import { AdminBotJobStatus, GetAdminBotJobStatusRouteV2 } from '@rctf/types'
-import { adminBotProvider } from '../../../../providers'
+import { adminBotProvider } from '../../../../providers/instances/admin-bot'
 import { getLatestJob } from '../../../../services/admin-bot-jobs'
 import { getChallenge } from '../../../../services/challenges'
 import integrationsGroup from '../group'

apps/api/src/routes/v2/integrations/routes/get-analytics-script.ts

@@ -1,6 +1,6 @@
 import type { Context } from 'hono'
 import type { AppEnv } from '../../../../lib/app-env'
-import { analyticsProvider } from '../../../../providers'
+import { analyticsProvider } from '../../../../providers/instances/analytics'
 
 let cachedScript: { content: string; fetchedAt: number } | null = null
 const CACHE_TTL_MS = 60 * 60 * 1000 // 1 hour

apps/api/src/routes/v2/integrations/routes/get-client-config.ts

@@ -1,6 +1,7 @@
 import { config } from '@rctf/config'
 import { GetClientConfigRouteV2, ProtectedAction } from '@rctf/types'
-import { captchaProvider, instancerEnabled } from '../../../../providers'
+import { captchaProvider } from '../../../../providers/instances/captcha'
+import { instancerEnabled } from '../../../../providers/instances/instancer'
 import { getResolvedSettings } from '../../../../services/settings'
 import integrationsGroup from '../group'