scheduler

Author: linyuan.yang

packages/admin/src/components/modals/SchedulerListModal.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, computed } from 'vue'
+import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { apiFetch } from '@/shared/api'
 import { useToast, useConfirm, SModal, SButton, SBadge } from 'sbot-ui'
@@ -9,47 +9,23 @@ const { t, locale } = useI18n()
 const { show } = useToast()
 const { confirm } = useConfirm()
 
-interface ChannelSessionRow {
-  id: number
-  profileId: number
-}
-
 const visible      = ref(false)
-const dbSessionId  = ref<number | null>(null)
 const profileIdRef = ref<string | null>(null)
 const sessionLabel = ref('')
 const loading      = ref(false)
-const all          = ref<SchedulerRow[]>([])
-
-const filtered = computed(() => {
-  // scheduler 按 profileId 绑（同 profile 的所有 session 共享视图）
-  const pid = profileIdRef.value ? Number(profileIdRef.value) : null
-  if (!pid) return []
-  return all.value.filter(r => r.profileId === pid)
-})
+const rows         = ref<SchedulerRow[]>([])
 
 function formatTime(ts: number | null): string {
   if (!ts) return '-'
   return new Date(ts).toLocaleString(locale.value === 'zh' ? 'zh-CN' : undefined)
 }
 
 async function load() {
+  if (!profileIdRef.value) return
   loading.value = true
   try {
-    const [timersRes, sessionsRes] = await Promise.all([
-      apiFetch('/api/schedulers'),
-      apiFetch('/api/channel-sessions'),
-    ])
-    all.value = timersRes.data || []
-    const sessions: ChannelSessionRow[] = sessionsRes.data || []
-    // 任一入口都最终归位到 profileId 上做过滤
-    if (profileIdRef.value == null && dbSessionId.value != null) {
-      const row = sessions.find(s => s.id === dbSessionId.value)
-      profileIdRef.value = row ? String(row.profileId) : null
-    } else if (dbSessionId.value == null && profileIdRef.value) {
-      const row = sessions.find(s => String(s.profileId) === profileIdRef.value)
-      dbSessionId.value = row?.id ?? null
-    }
+    const res = await apiFetch(`/api/schedulers?profileId=${encodeURIComponent(profileIdRef.value)}`)
+    rows.value = res.data || []
   } catch (e: any) {
     show(e?.message || String(e), 'error')
   } finally {
@@ -68,25 +44,15 @@ async function remove(row: SchedulerRow) {
   }
 }
 
-function open(id: number, label: string) {
-  dbSessionId.value  = id
-  profileIdRef.value = null
-  sessionLabel.value = label
-  all.value          = []
-  visible.value      = true
-  load()
-}
-
 function openByProfileId(profileId: string, label: string) {
-  dbSessionId.value  = null
   profileIdRef.value = profileId
   sessionLabel.value = label
-  all.value          = []
+  rows.value         = []
   visible.value      = true
   load()
 }
 
-defineExpose({ open, openByProfileId })
+defineExpose({ openByProfileId })
 </script>
 
 <template>
@@ -105,9 +71,9 @@ defineExpose({ open, openByProfileId })
     </template>
 
     <div v-if="loading" class="modal-loading">{{ t('common.loading') }}</div>
-    <div v-else-if="filtered.length === 0" class="modal-empty">{{ t('scheduler.empty') }}</div>
+    <div v-else-if="rows.length === 0" class="modal-empty">{{ t('scheduler.empty') }}</div>
     <ul v-else class="sched-list">
-      <li v-for="row in filtered" :key="row.id" class="sched-row">
+      <li v-for="row in rows" :key="row.id" class="sched-row">
         <div class="sched-row-main">
           <span class="sched-row-id">#{{ row.id }}</span>
           <SBadge :variant="TYPE_VARIANT[detectUIType(row.expr)]" size="sm" pill>

packages/admin/src/views/chat/ChannelsView.vue

@@ -684,7 +684,7 @@ async function refresh() {
                         <div class="ops-cell">
                           <SButton v-if="s.saver || c.saver" type="outline" size="sm" @click="saverViewModal?.openByDbId(s.id, saverOptions.find(o => o.id === (s.saver || c.saver))?.label || (s.saver || c.saver))">{{ t('channels.history') }}</SButton>
                           <SButton type="outline" size="sm" @click="todoListModal?.openByProfileId(String(s.profileId), s.sessionName || s.autoSessionName || s.sessionId)">{{ t('todo.title') }}</SButton>
-                          <SButton type="outline" size="sm" @click="schedulerListModal?.open(s.id, s.sessionName || s.autoSessionName || s.sessionId)">{{ t('scheduler.title') }}</SButton>
+                          <SButton type="outline" size="sm" @click="schedulerListModal?.openByProfileId(String(s.profileId), s.sessionName || s.autoSessionName || s.sessionId)">{{ t('scheduler.title') }}</SButton>
                           <SButton type="outline" size="sm" @click="openEditSession(s)">{{ t('common.edit') }}</SButton>
                           <SButton type="danger" size="sm" @click="removeSession(id as string, s)">{{ t('common.delete') }}</SButton>
                         </div>
@@ -768,7 +768,7 @@ async function refresh() {
                 </div>
                 <div class="mobile-card-ops">
                   <SButton type="outline" size="sm" @click="todoListModal?.openByProfileId(String(s.profileId), s.sessionName || s.autoSessionName || s.sessionId)">{{ t('todo.title') }}</SButton>
-                  <SButton type="outline" size="sm" @click="schedulerListModal?.open(s.id, s.sessionName || s.autoSessionName || s.sessionId)">{{ t('scheduler.title') }}</SButton>
+                  <SButton type="outline" size="sm" @click="schedulerListModal?.openByProfileId(String(s.profileId), s.sessionName || s.autoSessionName || s.sessionId)">{{ t('scheduler.title') }}</SButton>
                   <SButton type="outline" size="sm" @click="openEditSession(s)">{{ t('common.edit') }}</SButton>
                   <SButton type="danger" size="sm" @click="removeSession(id as string, s)">{{ t('common.delete') }}</SButton>
                 </div>

packages/sbot/src/Scheduler/SchedulerService.ts

@@ -146,11 +146,10 @@ class SchedulerService {
         this.executor.stopAll();
     }
 
-    /** 列出 scheduler，附 nextRun。disabled 默认排除；可按 profileId 过滤 */
-    async list(opts?: { profileId?: number; includeDisabled?: boolean }): Promise<(SchedulerRow & { nextRun: number | null })[]> {
-        const where: Record<string, any> = {};
-        if (opts?.profileId != null) where.profileId = opts.profileId;
-        if (!opts?.includeDisabled) where.disabled = false;
+    /** 列出未禁用 scheduler，附 nextRun。可按 profileId 过滤 */
+    async list(profileId?: number): Promise<(SchedulerRow & { nextRun: number | null })[]> {
+        const where: Record<string, any> = { disabled: false };
+        if (profileId != null) where.profileId = profileId;
         const rows = await database.findAll<SchedulerRow>(database.scheduler, { where });
         return rows.map(r => ({ ...(r as any), nextRun: this.nextDate(r.id) }));
     }

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

@@ -5,8 +5,10 @@ import type { RouteContext } from './types';
 
 export class SchedulerRoutes {
     register(app: express.Application, _ctx: RouteContext): void {
-        app.get('/api/schedulers', api(async () => {
-            const rows = await schedulerService.list();
+        app.get('/api/schedulers', api(async req => {
+            const profileId = req.query.profileId != null ? Number(req.query.profileId) : undefined;
+            if (profileId != null && !Number.isInteger(profileId)) throwBad('Invalid profileId');
+            const rows = await schedulerService.list(profileId);
             return rows.map(r => ({ ...toPlain(r), nextRun: r.nextRun }));
         }));
 

packages/sbot/src/Tools/Scheduler/list.ts

@@ -15,7 +15,7 @@ export function createSchedulerListTool(profileId: number): StructuredToolInterf
         schema: z.object({}) as any,
         func: async (_args: any): Promise<MCPToolResult> => {
             try {
-                const timers = await schedulerService.list({ profileId });
+                const timers = await schedulerService.list(profileId);
 
                 if (timers.length === 0) {
                     return createSuccessResult(createTextContent('No scheduled tasks'));