ms2/scheduler for db cleanup

src/management-system-v2/app/admin/ms-config/ms-config-form.tsx

@@ -107,7 +107,7 @@ export default function MSConfigForm({
             // Get context for the setting
             const overridden = overwrittenByEnv.includes(configKey);
             const envOnly = mSConfigEnvironmentOnlyKeys.includes(configKey as any);
-            const disabled = pathParts.find((part) => disabledGroups.get(part));
+            const disabledKey = pathParts.find((part) => disabledGroups.get(part));
 
             // This is needed, for when a key that can disable a group, is part of a group that is
             // disabled
@@ -127,7 +127,7 @@ export default function MSConfigForm({
               !envOnly &&
               !overridden &&
               !parentGroupDisabled &&
-              (!disabled || disablers.length > 0)
+              (!disabledKey || disablers.length > 0)
             )
               return;
 
@@ -150,7 +150,7 @@ export default function MSConfigForm({
               tooltipMessage = 'This config was overridden by an environment variable';
             else if (envOnly)
               tooltipMessage = 'This setting can only be changed through environment variables';
-            else if (disabled) tooltipMessage = `Disabled by ${disabled}`;
+            else if (disabledKey) tooltipMessage = `Disabled by ${disabledGroups.get(disabledKey)}`;
 
             return {
               input: <Tooltip title={tooltipMessage}>{input}</Tooltip>,

src/management-system-v2/app/admin/ms-config/page.tsx

@@ -7,11 +7,17 @@ import { getMSConfig, updateMSConfig, writeDefaultMSConfig } from '@/lib/ms-conf
 import MSConfigForm from './ms-config-form';
 import { userError } from '@/lib/user-error';
 import { SettingGroup } from '@/app/(dashboard)/[environmentId]/settings/type-util';
+import { ConfigurableMSConfig } from '@/lib/ms-config/config-schema';
+import { restartInternalSchedulerWithCurrentConfigs } from '@/lib/scheduler';
 
-async function saveConfig(newConfig: Record<string, string>) {
+async function saveConfig(changedValues: Record<keyof ConfigurableMSConfig, string>) {
   'use server';
   try {
-    await updateMSConfig(newConfig);
+    await updateMSConfig(changedValues);
+
+    if ('SCHEDULER_INTERNAL_ACTIVE' in changedValues || 'SCHEDULER_INTERVAL' in changedValues) {
+      await restartInternalSchedulerWithCurrentConfigs();
+    }
   } catch (e) {
     return userError('Error saving config');
   }
@@ -289,15 +295,47 @@ async function ConfigPage() {
         },
         {
           type: 'boolean',
-          name: 'SCHEDULER_JOB_DELETE_INACTIVE_GUESTS',
-          key: 'SCHEDULER_JOB_DELETE_INACTIVE_GUESTS',
-          value: msConfig.SCHEDULER_JOB_DELETE_INACTIVE_GUESTS,
+          name: 'SCHEDULER_INTERNAL_ACTIVE',
+          key: 'SCHEDULER_INTERNAL_ACTIVE',
+          value: msConfig.SCHEDULER_INTERNAL_ACTIVE,
         },
         {
-          type: 'boolean',
-          name: 'SCHEDULER_JOB_DELETE_OLD_ARTIFACTS',
-          key: 'SCHEDULER_JOB_DELETE_OLD_ARTIFACTS',
-          value: msConfig.SCHEDULER_JOB_DELETE_OLD_ARTIFACTS,
+          type: 'number',
+          name: 'SCHEDULER_TASK_DELETE_INACTIVE_GUESTS',
+          key: 'SCHEDULER_TASK_DELETE_INACTIVE_GUESTS',
+          value: msConfig.SCHEDULER_TASK_DELETE_INACTIVE_GUESTS,
+        },
+        {
+          type: 'number',
+          name: 'SCHEDULER_TASK_DELETE_OLD_ARTIFACTS',
+          key: 'SCHEDULER_TASK_DELETE_OLD_ARTIFACTS',
+          value: msConfig.SCHEDULER_TASK_DELETE_OLD_ARTIFACTS,
+        },
+        {
+          type: 'number',
+          name: 'SCHEDULER_TASK_DELETE_INACTIVE_SPACES',
+          key: 'SCHEDULER_TASK_DELETE_INACTIVE_SPACES',
+          value: msConfig.SCHEDULER_TASK_DELETE_INACTIVE_SPACES,
+        },
+        {
+          type: 'number',
+          name: 'SCHEDULING_TASK_EXPIRATION_TIME_EMAIL_REGISTRATION_TOKENS',
+          key: 'SCHEDULING_TASK_EXPIRATION_TIME_EMAIL_REGISTRATION_TOKENS',
+          value: msConfig.SCHEDULING_TASK_EXPIRATION_TIME_EMAIL_REGISTRATION_TOKENS,
+        },
+        {
+          type: 'number',
+          name: 'SCHEDULING_TASK_EXPIRATION_TIME_EMAIL_CHANGE_TOKENS',
+          key: 'SCHEDULING_TASK_EXPIRATION_TIME_EMAIL_CHANGE_TOKENS',
+          value: msConfig.SCHEDULING_TASK_EXPIRATION_TIME_EMAIL_CHANGE_TOKENS,
+        },
+        {
+          type: 'number',
+          name: 'SCHEDULING_TASK_EXPIRATION_TIME_EMAIL_VERIFICATION_TOKENS',
+          key: 'SCHEDULING_TASK_EXPIRATION_TIME_EMAIL_VERIFICATION_TOKENS',
+          value: msConfig.SCHEDULING_TASK_EXPIRATION_TIME_EMAIL_VERIFICATION_TOKENS,
+          // NOTE: eventually remove this description
+          description: 'This value will only take effect after restarting the system',
         },
       ],
     },

src/management-system-v2/app/api/scheduler/tasks/[task]/route.ts

@@ -0,0 +1,33 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { getMSConfig } from '@/lib/ms-config/ms-config';
+import { allSchedulerTasks } from '@/lib/scheduler';
+
+export async function POST(request: NextRequest, { params }: { params: { task: string } }) {
+  if (params.task !== 'all') {
+    return new Response('Not implemented', {
+      status: 501,
+    });
+  }
+
+  try {
+    const msConfig = await getMSConfig();
+
+    // Extract and validate the Bearer token
+    const authHeader = request.headers.get('Authorization');
+    if (!authHeader || !authHeader.startsWith('Bearer ')) {
+      return NextResponse.json({ error: 'Unauthorized: Missing Bearer token' }, { status: 401 });
+    }
+
+    const token = authHeader.replace('Bearer ', '').trim();
+    if (token !== msConfig.SCHEDULER_TOKEN) {
+      return NextResponse.json({ error: 'Unauthorized: Invalid Bearer token' }, { status: 403 });
+    }
+
+    const message = allSchedulerTasks();
+
+    return NextResponse.json({ message }, { status: 200 });
+  } catch (error) {
+    console.error('Error cleaning up DB:', error);
+    return NextResponse.json({ error: 'Failed to clean up DB' }, { status: 500 });
+  }
+}

src/management-system-v2/instrumentation.ts

@@ -1,5 +1,7 @@
 export async function register() {
   if (process.env.NEXT_RUNTIME === 'nodejs') {
+    // Importing env and using it here will ensure that env variables (msconfig) are verified at
+    // startup
     const { env } = await import('./lib/ms-config/env-vars');
 
     const { getMSConfigDBValuesAndEnsureDefaults } = await import('./lib/ms-config/ms-config');
@@ -53,5 +55,9 @@ export async function register() {
         process.exit(1);
       }
     }
+
+    // Start scheduler if necessary
+    const { restartInternalSchedulerWithCurrentConfigs } = await import('./lib/scheduler');
+    await restartInternalSchedulerWithCurrentConfigs();
   }
 }