feat(schedules): dedicated Schedules page with multi-schedule support (#26)

Author: dbfx

src/main/index.ts

@@ -7,7 +7,7 @@ const execFileAsync = promisify(execFile)
 import { IPC } from '../shared/channels'
 import { registerCleanerIpc } from './ipc'
 import { getSettings } from './services/settings-store'
-import { startScheduler, stopScheduler, getNextScanTime, notifyScheduledScanComplete } from './services/scheduler'
+import { startScheduler, stopScheduler, getNextScanTime, notifyScheduledScanComplete, completeScheduleRun } from './services/scheduler'
 import { initAutoUpdater } from './services/auto-updater'
 import { cloudAgent } from './services/cloud-agent'
 import { runCli } from './cli'
@@ -339,8 +339,8 @@ app.whenReady().then(() => {
     console.error('Failed to configure auto-launch:', err)
   })
 
-  // Create tray if minimize-to-tray is enabled or scheduled scans are on
-  if (settings.minimizeToTray || settings.schedule.enabled) {
+  // Create tray if minimize-to-tray is enabled or any schedule is active
+  if (settings.minimizeToTray || settings.schedules.some((s) => s.enabled)) {
     createTray()
   }
 
@@ -365,7 +365,7 @@ app.whenReady().then(() => {
   ipcMain.on(IPC.SETTINGS_APPLY_TRAY, (_event, enabled: boolean) => {
     if (enabled) {
       createTray()
-    } else if (!getSettings().schedule.enabled) {
+    } else if (!getSettings().schedules.some((s) => s.enabled)) {
       destroyTray()
     }
   })
@@ -382,6 +382,14 @@ app.whenReady().then(() => {
     notifyScheduledScanComplete(totalSize, itemCount)
   })
 
+  // Handle multi-schedule run completion
+  const VALID_RUN_STATUSES = new Set(['success', 'partial', 'failed', 'never'])
+  ipcMain.on(IPC.SCHEDULE_RUN_COMPLETE, (_event, scheduleId: unknown, status: unknown) => {
+    if (typeof scheduleId !== 'string' || typeof status !== 'string') return
+    if (!VALID_RUN_STATUSES.has(status)) return
+    completeScheduleRun(scheduleId, status as 'success' | 'partial' | 'failed' | 'never')
+  })
+
   app.on('activate', () => {
     if (mainWindow && !mainWindow.isDestroyed()) {
       // Window exists but may be hidden (minimize-to-tray) — restore it
@@ -395,8 +403,8 @@ app.whenReady().then(() => {
 
 app.on('window-all-closed', () => {
   const settings = getSettings()
-  // Don't quit if minimize-to-tray or scheduled scans are enabled
-  if (settings.minimizeToTray || settings.schedule.enabled) {
+  // Don't quit if minimize-to-tray or any schedule is enabled
+  if (settings.minimizeToTray || settings.schedules.some((s) => s.enabled)) {
     // Stay alive in tray
     return
   }

src/main/services/ipc-validation.test.ts

@@ -102,6 +102,52 @@ describe('validateSettingsPartial', () => {
   it('accepts empty object', () => {
     expect(validateSettingsPartial({})).toEqual({})
   })
+
+  it('accepts valid schedules array', () => {
+    const input = {
+      schedules: [{
+        id: 'abc-123',
+        name: 'Weekly Clean',
+        enabled: true,
+        frequency: 'weekly',
+        day: 1,
+        hour: 9,
+        tasks: ['cleaner:system', 'cleaner:browsers'],
+        autoApply: false,
+        lastRunAt: null,
+        lastRunStatus: 'never',
+        createdAt: '2025-01-01T00:00:00Z'
+      }]
+    }
+    expect(validateSettingsPartial(input)).toEqual(input)
+  })
+
+  it('rejects schedules with invalid task types', () => {
+    expect(validateSettingsPartial({
+      schedules: [{
+        id: 'x', name: 'X', enabled: true, frequency: 'daily', day: 0, hour: 9,
+        tasks: ['badtask'], autoApply: false, lastRunAt: null, lastRunStatus: 'never', createdAt: '2025-01-01T00:00:00Z'
+      }]
+    })).toBeNull()
+  })
+
+  it('rejects non-array schedules', () => {
+    expect(validateSettingsPartial({ schedules: 'not-array' })).toBeNull()
+  })
+
+  it('rejects too many schedules', () => {
+    const schedules = Array.from({ length: 11 }, (_, i) => ({
+      id: `id-${i}`, name: `S${i}`, enabled: true, frequency: 'daily', day: 0, hour: 9,
+      tasks: ['cleaner:system'], autoApply: false, lastRunAt: null, lastRunStatus: 'never', createdAt: '2025-01-01T00:00:00Z'
+    }))
+    expect(validateSettingsPartial({ schedules })).toBeNull()
+  })
+
+  it('rejects schedule entry with missing fields', () => {
+    expect(validateSettingsPartial({
+      schedules: [{ id: 'x', name: 'X' }]
+    })).toBeNull()
+  })
 })
 
 describe('validateHistoryEntry', () => {

src/main/services/ipc-validation.ts

@@ -14,7 +14,7 @@ export function validateSettingsPartial(input: unknown): Record<string, unknown>
   const allowedTopKeys = new Set([
     'minimizeToTray', 'showNotificationOnComplete', 'showThreatNotifications',
     'runAtStartup', 'autoUpdate', 'autoRestart', 'updateCheckIntervalHours',
-    'cleaner', 'exclusions', 'schedule', 'cloud'
+    'cleaner', 'exclusions', 'schedule', 'schedules', 'cloud'
   ])
 
   for (const key of Object.keys(obj)) {
@@ -57,6 +57,34 @@ export function validateSettingsPartial(input: unknown): Record<string, unknown>
     if ('frequency' in s && !['daily', 'weekly', 'monthly'].includes(s.frequency as string)) return null
   }
 
+  // Validate schedules array if present
+  if ('schedules' in obj && obj.schedules !== undefined) {
+    if (!Array.isArray(obj.schedules)) return null
+    if (obj.schedules.length > 10) return null
+    const validTaskTypes = new Set([
+      'cleaner:system', 'cleaner:browsers', 'cleaner:apps', 'cleaner:gaming',
+      'cleaner:recycleBin', 'cleaner:databases', 'registry', 'drivers', 'software-update'
+    ])
+    const validFrequencies = new Set(['daily', 'weekly', 'monthly'])
+    const validStatuses = new Set(['success', 'partial', 'failed', 'never'])
+    for (const entry of obj.schedules) {
+      if (entry === null || typeof entry !== 'object' || Array.isArray(entry)) return null
+      const e = entry as Record<string, unknown>
+      if (typeof e.id !== 'string' || e.id.length > 100) return null
+      if (typeof e.name !== 'string' || e.name.length > 100) return null
+      if (typeof e.enabled !== 'boolean') return null
+      if (!validFrequencies.has(e.frequency as string)) return null
+      if (typeof e.day !== 'number' || e.day < 0 || e.day > 31) return null
+      if (typeof e.hour !== 'number' || e.hour < 0 || e.hour > 23) return null
+      if (!Array.isArray(e.tasks) || e.tasks.length > 20) return null
+      if (!e.tasks.every((t: unknown) => typeof t === 'string' && validTaskTypes.has(t as string))) return null
+      if (typeof e.autoApply !== 'boolean') return null
+      if (e.lastRunAt !== null && (typeof e.lastRunAt !== 'string' || e.lastRunAt.length > 50)) return null
+      if (!validStatuses.has(e.lastRunStatus as string)) return null
+      if (typeof e.createdAt !== 'string' || e.createdAt.length > 50) return null
+    }
+  }
+
   // Validate cleaner has expected shape if present
   if ('cleaner' in obj && obj.cleaner !== undefined) {
     const c = obj.cleaner as Record<string, unknown>

src/main/services/scheduler.test.ts

@@ -5,12 +5,12 @@ vi.mock('electron', () => ({
   BrowserWindow: class {},
   Notification: { isSupported: () => false },
 }))
-vi.mock('./settings-store', () => ({ getSettings: () => ({}) }))
+vi.mock('./settings-store', () => ({ getSettings: () => ({}), setSettings: () => {} }))
 vi.mock('./history-store', () => ({ getHistory: () => [] }))
 vi.mock('./logger', () => ({ logInfo: () => {}, logError: () => {} }))
 
-import { getNextScanTime, isSameDay } from './scheduler'
-import type { KuduSettings } from '../../shared/types'
+import { getNextScanTime, getNextRunTime, isSameDay } from './scheduler'
+import type { KuduSettings, ScheduleEntry } from '../../shared/types'
 
 function makeSettings(
   overrides: Partial<KuduSettings['schedule']> & { enabled?: boolean } = {}
@@ -36,6 +36,7 @@ function makeSettings(
       day: overrides.day ?? 1,
       hour: overrides.hour ?? 9,
     },
+    schedules: [],
     cloud: {
       apiKey: '',
       serverUrl: '',
@@ -177,4 +178,75 @@ describe('getNextScanTime', () => {
     const result = getNextScanTime(settings)!
     expect(result.getTime()).toBeGreaterThan(new Date('2025-06-15T12:00:00').getTime())
   })
+
+  it('returns soonest schedule when multiple schedules exist', () => {
+    vi.setSystemTime(new Date('2025-06-15T07:00:00')) // Sunday
+    const settings = makeSettings({ enabled: false })
+    settings.schedules = [
+      makeEntry({ frequency: 'daily', hour: 20 }),    // today at 20:00
+      makeEntry({ frequency: 'daily', hour: 10 }),    // today at 10:00 (soonest)
+      makeEntry({ frequency: 'weekly', day: 3, hour: 9 }),  // Wed at 9:00
+    ]
+    const result = getNextScanTime(settings)!
+    expect(result.getHours()).toBe(10)
+    expect(result.getDate()).toBe(15) // today
+  })
+})
+
+// ─── getNextRunTime (per-entry) ───────────────────────────
+
+function makeEntry(overrides: Partial<ScheduleEntry> = {}): ScheduleEntry {
+  return {
+    id: 'test-' + Math.random(),
+    name: 'Test Schedule',
+    enabled: true,
+    frequency: 'daily',
+    day: 1,
+    hour: 9,
+    tasks: ['cleaner:system'],
+    autoApply: false,
+    lastRunAt: null,
+    lastRunStatus: 'never',
+    createdAt: new Date().toISOString(),
+    ...overrides,
+  }
+}
+
+describe('getNextRunTime', () => {
+  beforeEach(() => {
+    vi.useFakeTimers()
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  it('returns null when entry is disabled', () => {
+    expect(getNextRunTime(makeEntry({ enabled: false }))).toBeNull()
+  })
+
+  it('returns today for daily schedule if hour has not passed', () => {
+    vi.setSystemTime(new Date('2025-06-15T07:00:00'))
+    const result = getNextRunTime(makeEntry({ frequency: 'daily', hour: 9 }))!
+    expect(result.getDate()).toBe(15)
+    expect(result.getHours()).toBe(9)
+  })
+
+  it('returns tomorrow for daily schedule if hour has passed', () => {
+    vi.setSystemTime(new Date('2025-06-15T10:00:00'))
+    const result = getNextRunTime(makeEntry({ frequency: 'daily', hour: 9 }))!
+    expect(result.getDate()).toBe(16)
+  })
+
+  it('returns correct day of week for weekly schedule', () => {
+    vi.setSystemTime(new Date('2025-06-15T07:00:00')) // Sunday
+    const result = getNextRunTime(makeEntry({ frequency: 'weekly', day: 3, hour: 9 }))!
+    expect(result.getDay()).toBe(3) // Wednesday
+  })
+
+  it('clamps day for monthly schedule in short months', () => {
+    vi.setSystemTime(new Date('2025-02-01T07:00:00'))
+    const result = getNextRunTime(makeEntry({ frequency: 'monthly', day: 31, hour: 9 }))!
+    expect(result.getDate()).toBeLessThanOrEqual(28)
+  })
 })