scheduler

Author: linyuan.yang

packages/sbot/src/Scheduler/SchedulerService.ts

@@ -146,16 +146,35 @@ class SchedulerService {
         this.executor.stopAll();
     }
 
+    /** 列出 scheduler，附 nextRun。disabled 默认排除 */
+    async list(opts?: { includeDisabled?: boolean }): Promise<(SchedulerRow & { nextRun: number | null })[]> {
+        const where = opts?.includeDisabled ? {} : { disabled: false };
+        const rows = await database.findAll<SchedulerRow>(database.scheduler, { where });
+        return rows.map(r => ({ ...(r as any), nextRun: this.nextDate(r.id) }));
+    }
+
     async delete(schedulerId: number): Promise<void> {
         this.executor.cancel(schedulerId);
         await database.update(database.scheduler, { disabled: true }, { where: { id: schedulerId } });
     }
 
+    /** 删除 profile 名下所有 scheduler（cancel cron + 硬删行）—— profile/session 删除时调用 */
+    async cascadeDeleteByProfile(profileId: number): Promise<void> {
+        const rows = await database.findAll<SchedulerRow>(database.scheduler, { where: { profileId } });
+        for (const r of rows) this.executor.cancel(r.id);
+        await database.destroy(database.scheduler, { where: { profileId } });
+    }
+
     async update(schedulerId: number, patch: Partial<Pick<SchedulerRow, "message" | "channelSessionId" | "aiProcess">>): Promise<SchedulerRow | null> {
         const fields: Partial<SchedulerRow> = {};
-        if (patch.message != null)          fields.message          = patch.message;
-        if (patch.channelSessionId != null) fields.channelSessionId = patch.channelSessionId;
-        if (patch.aiProcess != null)        fields.aiProcess        = patch.aiProcess;
+        if (patch.message != null)   fields.message   = patch.message;
+        if (patch.aiProcess != null) fields.aiProcess = patch.aiProcess;
+        if (patch.channelSessionId != null) {
+            // 改投递目标时 profileId 必须同步到新 session 的 profile，否则 list/delete 工具按 profileId 过滤会失配
+            const session = await getChannelSession(patch.channelSessionId, true);
+            fields.channelSessionId = patch.channelSessionId;
+            fields.profileId = session!.profileId;
+        }
         if (Object.keys(fields).length === 0) return database.findByPk<SchedulerRow>(database.scheduler, schedulerId);
         await database.update(database.scheduler, fields, { where: { id: schedulerId } });
         return database.findByPk<SchedulerRow>(database.scheduler, schedulerId);

packages/sbot/src/Server/routes/schedulers.ts

@@ -1,17 +1,13 @@
 import express from 'express';
-import { database, type SchedulerRow } from '../../Core/Database';
 import { schedulerService } from '../../Scheduler/SchedulerService';
 import { api, throwBad, toPlain } from '../utils';
 import type { RouteContext } from './types';
 
 export class SchedulerRoutes {
     register(app: express.Application, _ctx: RouteContext): void {
         app.get('/api/schedulers', api(async () => {
-            const schedulers = await database.findAll<SchedulerRow>(database.scheduler, { where: { disabled: false } });
-            return schedulers.map(s => ({
-                ...toPlain(s),
-                nextRun: schedulerService.nextDate(s.id),
-            }));
+            const rows = await schedulerService.list();
+            return rows.map(r => ({ ...toPlain(r), nextRun: r.nextRun }));
         }));
 
         app.put('/api/schedulers/:id', api(async req => {

packages/sbot/src/Server/routes/users.ts

@@ -161,11 +161,7 @@ export class UserRoutes {
             if (isNaN(id)) throwBad('Invalid id');
             // auto profile 会被级联删 —— 上面挂的 scheduler 也跟着销毁
             const auto = await database.findOne<SessionProfileRow>(database.sessionProfile, { where: { autoForSessionId: id } });
-            if (auto) {
-                const rows = await database.findAll<{ id: number }>(database.scheduler, { where: { profileId: auto.id } });
-                for (const r of rows) await schedulerService.delete(r.id);
-                await database.destroy(database.scheduler, { where: { profileId: auto.id } });
-            }
+            if (auto) await schedulerService.cascadeDeleteByProfile(auto.id);
             // 级联删除该 session 的 auto profile（visible profile 不删）
             await database.destroy(database.sessionProfile, { where: { autoForSessionId: id } });
             await database.destroy(database.channelSession, { where: { id } });
@@ -238,10 +234,7 @@ export class UserRoutes {
             if (profile!.autoForSessionId != null) throwBad('Cannot delete an auto profile directly');
             const refCount = await database.count(database.channelSession, { where: { profileId: id } });
             if (refCount > 0) throwBad(`Profile id=${id} is still referenced by ${refCount} session(s)`);
-            // 级联删除 profile 名下的 scheduler（取消 cron + 删行）
-            const schedRows = await database.findAll<{ id: number }>(database.scheduler, { where: { profileId: id } });
-            for (const r of schedRows) await schedulerService.delete(r.id);
-            await database.destroy(database.scheduler, { where: { profileId: id } });
+            await schedulerService.cascadeDeleteByProfile(id);
             await database.destroy(database.sessionProfile, { where: { id } });
         }));