@morscherlab/mint-sdk 1.1.25 → 1.2.0-beta.2

package/src/composables/useGeneratedAnalysis.ts

@@ -8,10 +8,8 @@ import {
   type ShallowRef,
 } from 'vue'
 
-import type {
-  JobsStatusTrayAdapter,
-  PluginJobCenterSource,
-} from './useJobsStatusTray'
+import type { PluginJobCenterSource } from './useJobsStatusTray'
+import { useEventStream, type EventStreamMessage } from './useEventStream'
 import { normalizeJobState } from '../jobs'
 import type {
   GeneratedAnalysisJob,
@@ -104,8 +102,6 @@ export interface UsePluginJobsReturn extends PluginJobCenterSource {
   pause: () => void
   resume: () => void
   dispose: () => void
-  /** @deprecated Pass the runtime itself to SDK job UI as its source. */
-  jobsAdapter: JobsStatusTrayAdapter
 }
 
 export type UseGeneratedAnalysisReturn = UsePluginJobsReturn
@@ -125,6 +121,10 @@ interface PluginJobWaiter {
   abort?: () => void
 }
 
+type PluginJobStreamData = GeneratedAnalysisJobInput | {
+  jobs: GeneratedAnalysisJobInput[]
+}
+
 class GeneratedAnalysisRequestError extends Error {
   constructor(
     readonly status: number,
@@ -200,10 +200,6 @@ function createPluginJobs(
   const error = shallowRef<string | null>(null)
   const status = shallowRef<'idle' | 'initializing' | 'ready' | 'paused' | 'error' | 'disposed'>('idle')
   let pollTimer: ReturnType<typeof setTimeout> | undefined
-  let streamReconnectTimer: ReturnType<typeof setTimeout> | undefined
-  let streamController: AbortController | undefined
-  let streamConnected = false
-  let streamConnecting = false
   let disposed = false
   let paused = false
   let initialized = false
@@ -217,6 +213,17 @@ function createPluginJobs(
   const resultRetryAttempts = new Map<string, number>()
   const resultRetryTimers = new Map<string, ReturnType<typeof setTimeout>>()
   const downloadRefreshTimers = new Map<string, ReturnType<typeof setTimeout>>()
+  const jobStream = useEventStream<PluginJobStreamData>(`${baseUrl}/jobs/events`, {
+    transport,
+    immediate: false,
+    reconnectDelayMs: streamReconnectDelay,
+    parseJson: true,
+    errorLabel: 'Job stream',
+    onOpen: clearPoll,
+    onMessage: applyJobStreamMessage,
+    onError: schedulePollForActiveJobs,
+    onClose: schedulePollForActiveJobs,
+  })
 
   const latestResult = computed<GeneratedAnalysisResult | null>(() => {
     const job = currentCompletedJob()
@@ -242,7 +249,7 @@ function createPluginJobs(
       if (disposed) return
       initialized = true
       status.value = paused ? 'paused' : 'ready'
-      if (streamEnabled && !paused) void connectJobStream()
+      if (streamEnabled && !paused) jobStream.start()
     })().catch((cause: unknown) => {
       if (!disposed) {
         error.value = errorMessage(cause, 'Failed to initialize generated analysis')
@@ -303,7 +310,7 @@ function createPluginJobs(
         )
       }
       const job = upsertJob(jobInput, definitionId)
-      if (!streamConnected) schedulePoll()
+      if (!jobStream.isConnected.value) schedulePoll()
       return job
     } catch (cause) {
       error.value = errorMessage(cause, 'Failed to submit analysis')
@@ -466,7 +473,7 @@ function createPluginJobs(
         }
         replaceJobs(payload.jobs)
         error.value = null
-        if (!paused && !streamConnected && jobs.value.some(job => ACTIVE_STATUSES.has(job.status))) {
+        if (!paused && !jobStream.isConnected.value && jobs.value.some(job => ACTIVE_STATUSES.has(job.status))) {
           schedulePoll()
         }
         return jobs.value
@@ -540,12 +547,12 @@ function createPluginJobs(
       waiting.add(waiter)
       jobWaiters.set(jobId, waiting)
       if (!paused) {
-        if (streamEnabled) void connectJobStream()
-        if (!streamConnected) schedulePoll()
+        if (streamEnabled) jobStream.start()
+        if (!jobStream.isConnected.value) schedulePoll()
       }
       void getJob(jobId, { signal: options.signal }).catch((cause: unknown) => {
         if (current && isRetryableJobLookupError(cause)) {
-          if (!streamConnected) schedulePoll()
+          if (!jobStream.isConnected.value) schedulePoll()
           return
         }
         removeJobWaiter(jobId, waiter)
@@ -895,7 +902,7 @@ function createPluginJobs(
   }
 
   function schedulePoll(): void {
-    if (disposed || paused || streamConnected || pollTimer !== undefined) return
+    if (disposed || paused || jobStream.isConnected.value || pollTimer !== undefined) return
     pollTimer = setTimeout(async () => {
       pollTimer = undefined
       if (disposed) return
@@ -908,85 +915,26 @@ function createPluginJobs(
     }, pollInterval)
   }
 
-  async function connectJobStream(): Promise<void> {
-    if (disposed || paused || streamConnecting || streamConnected) return
-    streamConnecting = true
-    streamController = new AbortController()
-    try {
-      const response = await transport(`${baseUrl}/jobs/events`, {
-        method: 'GET',
-        headers: { Accept: 'text/event-stream' },
-        signal: streamController.signal,
-      })
-      if (!response.ok) throw new Error(`Job stream failed (${response.status})`)
-      if (!response.body) throw new Error('Job stream response has no readable body')
-      streamConnected = true
-      if (pollTimer !== undefined) {
-        clearTimeout(pollTimer)
-        pollTimer = undefined
-      }
-      await consumeJobStream(response.body)
-    } catch (cause) {
-      if (!isAbortError(cause) && !disposed) {
-        if (jobs.value.some(job => ACTIVE_STATUSES.has(job.status))) schedulePoll()
-      }
-    } finally {
-      streamConnected = false
-      streamConnecting = false
-      streamController = undefined
-      if (!disposed && !paused) scheduleStreamReconnect()
-    }
+  function clearPoll(): void {
+    if (pollTimer === undefined) return
+    clearTimeout(pollTimer)
+    pollTimer = undefined
   }
 
-  async function consumeJobStream(body: ReadableStream<Uint8Array>): Promise<void> {
-    const reader = body.getReader()
-    const decoder = new TextDecoder()
-    let buffer = ''
-    try {
-      while (!disposed) {
-        const { done, value } = await reader.read()
-        buffer += decoder.decode(value, { stream: !done })
-        const blocks = buffer.split(/\r?\n\r?\n/)
-        buffer = blocks.pop() ?? ''
-        for (const block of blocks) applyJobStreamEvent(block)
-        if (done) {
-          if (buffer.trim()) applyJobStreamEvent(buffer)
-          return
-        }
-      }
-    } finally {
-      reader.releaseLock()
-    }
+  function schedulePollForActiveJobs(): void {
+    if (jobs.value.some(job => ACTIVE_STATUSES.has(job.status))) schedulePoll()
   }
 
-  function applyJobStreamEvent(block: string): void {
-    let event = 'message'
-    const data: string[] = []
-    for (const line of block.split(/\r?\n/)) {
-      if (!line || line.startsWith(':')) continue
-      if (line.startsWith('event:')) event = line.slice('event:'.length).trim()
-      if (line.startsWith('data:')) data.push(line.slice('data:'.length).trimStart())
-    }
-    if (!data.length) return
-    const payload = JSON.parse(data.join('\n')) as (
-      GeneratedAnalysisJobInput | { jobs: GeneratedAnalysisJobInput[] }
-    )
-    if (event === 'snapshot' && 'jobs' in payload) {
+  function applyJobStreamMessage(message: EventStreamMessage<PluginJobStreamData>): void {
+    if (message.event === 'snapshot' && 'jobs' in message.data) {
+      const payload = message.data
       replaceJobs(payload.jobs)
-    } else if (event === 'job' || event === 'terminal') {
-      upsertJob(payload as GeneratedAnalysisJobInput)
+    } else if (message.event === 'job' || message.event === 'terminal') {
+      upsertJob(message.data as GeneratedAnalysisJobInput)
     }
     error.value = null
   }
 
-  function scheduleStreamReconnect(): void {
-    if (disposed || paused || streamReconnectTimer !== undefined) return
-    streamReconnectTimer = setTimeout(() => {
-      streamReconnectTimer = undefined
-      void connectJobStream()
-    }, streamReconnectDelay)
-  }
-
   async function cancelJob(job: GeneratedAnalysisJob | string): Promise<GeneratedAnalysisJob> {
     const jobId = typeof job === 'string' ? job : job.job_id
     const revision = beginJobOperation(jobId)
@@ -1024,25 +972,16 @@ function createPluginJobs(
     return payload.deleted
   }
 
-  const jobsAdapter: JobsStatusTrayAdapter = {
-    listJobs: async () => ({ jobs: await refreshJobs() }),
-    cancelJob: async job => cancelJob(job as GeneratedAnalysisJob),
-    deleteJob: async job => deleteJob(job as GeneratedAnalysisJob),
-    clearFinishedJobs: async () => clearFinishedJobs(),
-  }
   function pause(): void {
     if (disposed || paused) return
     paused = true
     status.value = 'paused'
-    if (pollTimer !== undefined) clearTimeout(pollTimer)
-    if (streamReconnectTimer !== undefined) clearTimeout(streamReconnectTimer)
-    pollTimer = undefined
-    streamReconnectTimer = undefined
+    clearPoll()
     for (const jobId of resultRetryTimers.keys()) clearResultRetry(jobId)
     for (const jobId of downloadRefreshTimers.keys()) {
       clearManagedDownloadRefresh(jobId)
     }
-    streamController?.abort()
+    jobStream.stop()
   }
 
   function resume(): void {
@@ -1053,7 +992,7 @@ function createPluginJobs(
     for (const [jobId, result] of Object.entries(resultCache.value)) {
       scheduleManagedDownloadRefresh(jobId, managedDownloadRefreshDelay(result))
     }
-    if (streamEnabled) void connectJobStream()
+    if (streamEnabled) jobStream.start()
     else if (jobs.value.some(job => ACTIVE_STATUSES.has(job.status))) schedulePoll()
   }
 
@@ -1062,10 +1001,7 @@ function createPluginJobs(
     disposed = true
     paused = true
     status.value = 'disposed'
-    if (pollTimer !== undefined) clearTimeout(pollTimer)
-    if (streamReconnectTimer !== undefined) clearTimeout(streamReconnectTimer)
-    pollTimer = undefined
-    streamReconnectTimer = undefined
+    clearPoll()
     for (const timer of resultRetryTimers.values()) clearTimeout(timer)
     resultRetryTimers.clear()
     resultRetryAttempts.clear()
@@ -1075,7 +1011,7 @@ function createPluginJobs(
     for (const jobId of jobWaiters.keys()) rejectJobWaiters(jobId, cause)
     jobRevisions.clear()
     pendingJobOperations.clear()
-    streamController?.abort()
+    jobStream.stop()
   }
 
   async function request<T>(path: string, init: RequestInit): Promise<T> {
@@ -1129,7 +1065,6 @@ function createPluginJobs(
     pause,
     resume,
     dispose,
-    jobsAdapter,
   }
 }
 
@@ -1229,10 +1164,6 @@ function createGeneratedSessionStorage(candidate?: Storage): GeneratedSessionSto
   }
 }
 
-function isAbortError(error: unknown): boolean {
-  return error instanceof DOMException && error.name === 'AbortError'
-}
-
 function isSessionNotFoundError(error: unknown): boolean {
   return error instanceof GeneratedAnalysisRequestError
     && error.status === 404

package/src/composables/useJobsStatusTray.ts

@@ -5,7 +5,6 @@ import {
   ref,
   shallowRef,
   toValue,
-  watch,
   type ComputedRef,
   type MaybeRefOrGetter,
   type Ref,
@@ -17,12 +16,7 @@ import type {
   JobListPayload,
   JobState,
   JobStateInput,
-  JobStreamData,
 } from '../types/jobs'
-import type {
-  PluginEventStreamMessage,
-  UsePluginEventStreamReturn,
-} from './usePluginClient'
 
 export type JobsStatusTrayTab = 'active' | 'history'
 
@@ -146,32 +140,11 @@ function duplicatePluginJobId(jobId: string): Error {
   return new Error(`Duplicate plugin job id across combined sources: ${jobId}`)
 }
 
-/** @deprecated Prefer a {@link PluginJobCenterSource}. */
-export interface JobsStatusTrayAdapter {
-  listJobs?: () => Promise<JobListPayload | readonly JobStateInput[]>
-  cancelJob?: (job: JobState) => Promise<JobStateInput | void>
-  deleteJob?: (job: JobState) => Promise<boolean | void>
-  clearFinishedJobs?: (jobs: readonly JobState[]) => Promise<number | void>
-}
-
 export interface UsePluginJobCenterOptions {
   source?: MaybeRefOrGetter<PluginJobCenterSource | undefined>
-  /** @deprecated Pass a source with its canonical jobs ref. */
-  jobs?: MaybeRefOrGetter<readonly JobStateInput[] | undefined>
-  /** @deprecated Pass source actions instead. */
-  adapter?: MaybeRefOrGetter<JobsStatusTrayAdapter | undefined>
-  /** @deprecated Event handling belongs to the source runtime. */
-  eventStream?: MaybeRefOrGetter<UsePluginEventStreamReturn<JobStreamData> | undefined>
   loadOnMount?: boolean
 }
 
-export interface UseJobsStatusTrayOptions extends UsePluginJobCenterOptions {}
-
-export interface JobStreamMessage {
-  event: string
-  data: JobStreamData
-}
-
 export interface UsePluginJobCenterReturn {
   jobs: ComputedRef<JobState[]>
   activeJobs: ComputedRef<JobState[]>
@@ -191,30 +164,12 @@ export interface UsePluginJobCenterReturn {
   close: () => void
   toggle: () => void
   refresh: () => Promise<boolean>
-  applyStreamMessage: (message: JobStreamMessage) => void
   cancelJob: (job: JobState) => Promise<boolean>
   deleteJob: (job: JobState) => Promise<boolean>
   clearFinished: () => Promise<boolean>
   isPending: (job: JobState) => boolean
 }
 
-export type UseJobsStatusTrayReturn = UsePluginJobCenterReturn
-
-interface LegacyJobsOverride {
-  readonly input: readonly JobStateInput[] | undefined
-  readonly jobs: JobState[]
-}
-
-function responseJobs(
-  response: JobListPayload | readonly JobStateInput[],
-): readonly JobStateInput[] {
-  return 'jobs' in response ? response.jobs : response
-}
-
-function isSnapshotPayload(data: JobStreamData): data is { jobs: JobStateInput[] } {
-  return 'jobs' in data && Array.isArray(data.jobs)
-}
-
 function errorMessage(error: unknown, fallback: string): string {
   return error instanceof Error ? error.message : fallback
 }
@@ -228,84 +183,30 @@ function errorMessage(error: unknown, fallback: string): string {
 export function usePluginJobCenter(
   options: UsePluginJobCenterOptions = {},
 ): UsePluginJobCenterReturn {
-  const legacyOverride = shallowRef<LegacyJobsOverride | null>(null)
   const isOpen = ref(false)
   const activeTab = ref<JobsStatusTrayTab>('active')
   const isLoading = ref(false)
   const error = shallowRef<string | null>(null)
   const pendingJobIds = ref(new Set<string>())
-  const jobRevisions = new Map<string, number>()
-  let stateRevision = 0
   let requestGeneration = 0
   let active = true
   const source = computed(() => toValue(options.source))
-  const adapter = computed(() => toValue(options.adapter))
 
-  const jobs = computed<JobState[]>(() => {
-    const currentSource = source.value
-    if (currentSource) {
-      return [...toValue(currentSource.jobs)].map(normalizeJobState)
-    }
-    const input = toValue(options.jobs)
-    const override = legacyOverride.value
-    if (override && override.input === input) return override.jobs
-    return input ? [...input].map(normalizeJobState) : []
-  })
+  const jobs = computed<JobState[]>(() => (
+    source.value ? [...toValue(source.value.jobs)].map(normalizeJobState) : []
+  ))
   const activeJobs = computed(() => jobs.value.filter(job => isActiveJobStatus(job.status)))
   const historyJobs = computed(() => jobs.value.filter(job => !isActiveJobStatus(job.status)))
   const deletableJobs = computed(() => historyJobs.value.filter(job => job.can_delete))
   const featuredJob = computed(() => activeJobs.value[0] ?? historyJobs.value[0] ?? null)
-  const canRefresh = computed(() => Boolean(source.value?.refreshJobs || adapter.value?.listJobs))
-  const canCancel = computed(() => Boolean(source.value?.cancelJob || adapter.value?.cancelJob))
-  const canDelete = computed(() => Boolean(source.value?.deleteJob || adapter.value?.deleteJob))
+  const canRefresh = computed(() => Boolean(source.value?.refreshJobs))
+  const canCancel = computed(() => Boolean(source.value?.cancelJob))
+  const canDelete = computed(() => Boolean(source.value?.deleteJob))
   const canClearFinished = computed(() => Boolean(
     source.value?.clearFinishedJobs
     || source.value?.deleteJob
-    || adapter.value?.clearFinishedJobs
-    || adapter.value?.deleteJob,
   ))
 
-  function bumpJobRevision(jobId: string): void {
-    jobRevisions.set(jobId, (jobRevisions.get(jobId) ?? 0) + 1)
-  }
-
-  function replaceLegacyJobs(nextJobs: readonly JobStateInput[]): void {
-    const normalized = nextJobs.map(normalizeJobState)
-    const touchedJobIds = new Set([
-      ...jobs.value.map(job => job.job_id),
-      ...normalized.map(job => job.job_id),
-    ])
-    touchedJobIds.forEach(bumpJobRevision)
-    legacyOverride.value = {
-      input: toValue(options.jobs),
-      jobs: normalized,
-    }
-    stateRevision += 1
-  }
-
-  function upsertLegacyJob(nextJob: JobStateInput): void {
-    const normalized = normalizeJobState(nextJob)
-    const existingIndex = jobs.value.findIndex(job => job.job_id === normalized.job_id)
-    const nextJobs = [...jobs.value]
-    if (existingIndex === -1) nextJobs.unshift(normalized)
-    else nextJobs[existingIndex] = normalized
-    legacyOverride.value = {
-      input: toValue(options.jobs),
-      jobs: nextJobs,
-    }
-    bumpJobRevision(normalized.job_id)
-    stateRevision += 1
-  }
-
-  function removeLegacyJobs(jobIds: Set<string>): void {
-    legacyOverride.value = {
-      input: toValue(options.jobs),
-      jobs: jobs.value.filter(job => !jobIds.has(job.job_id)),
-    }
-    jobIds.forEach(bumpJobRevision)
-    stateRevision += 1
-  }
-
   function setPending(jobId: string, pending: boolean): void {
     const next = new Set(pendingJobIds.value)
     if (pending) next.add(jobId)
@@ -313,35 +214,15 @@ export function usePluginJobCenter(
     pendingJobIds.value = next
   }
 
-  function applyStreamMessage(message: JobStreamMessage): void {
-    if (!active || source.value) return
-    if (message.event === 'snapshot' && isSnapshotPayload(message.data)) {
-      replaceLegacyJobs(message.data.jobs)
-      return
-    }
-    if (
-      (message.event === 'job' || message.event === 'terminal')
-      && !isSnapshotPayload(message.data)
-    ) {
-      upsertLegacyJob(message.data)
-    }
-  }
-
   async function refresh(): Promise<boolean> {
-    const currentSource = source.value
-    const listJobs = currentSource?.refreshJobs ?? adapter.value?.listJobs
-    if (!listJobs) return false
+    const refreshJobs = source.value?.refreshJobs
+    if (!refreshJobs) return false
     const generation = ++requestGeneration
-    const revision = stateRevision
     isLoading.value = true
     error.value = null
     try {
-      const response = await listJobs()
-      if (!active || generation !== requestGeneration || revision !== stateRevision) {
-        return false
-      }
-      if (!currentSource && response) replaceLegacyJobs(responseJobs(response))
-      return true
+      await refreshJobs()
+      return active && generation === requestGeneration
     } catch (cause) {
       if (active && generation === requestGeneration) {
         error.value = errorMessage(cause, 'Failed to load jobs')
@@ -354,23 +235,14 @@ export function usePluginJobCenter(
 
   async function cancelJob(job: JobState): Promise<boolean> {
     const sourceCancel = source.value?.cancelJob
-    const adapterCancel = adapter.value?.cancelJob
-    if (!job.can_cancel || (!sourceCancel && !adapterCancel) || pendingJobIds.value.has(job.job_id)) {
+    if (!job.can_cancel || !sourceCancel || pendingJobIds.value.has(job.job_id)) {
       return false
     }
-    const revision = jobRevisions.get(job.job_id) ?? 0
     setPending(job.job_id, true)
     error.value = null
     try {
-      const updated = sourceCancel
-        ? await sourceCancel(job.job_id)
-        : await adapterCancel!(job)
-      if (!active) return false
-      if (!sourceCancel && revision === (jobRevisions.get(job.job_id) ?? 0)) {
-        if (updated) upsertLegacyJob(updated)
-        else await refresh()
-      }
-      return true
+      await sourceCancel(job.job_id)
+      return active
     } catch (cause) {
       if (active) error.value = errorMessage(cause, 'Failed to cancel job')
       return false
@@ -381,22 +253,14 @@ export function usePluginJobCenter(
 
   async function deleteJob(job: JobState): Promise<boolean> {
     const sourceDelete = source.value?.deleteJob
-    const adapterDelete = adapter.value?.deleteJob
-    if (!job.can_delete || (!sourceDelete && !adapterDelete) || pendingJobIds.value.has(job.job_id)) {
+    if (!job.can_delete || !sourceDelete || pendingJobIds.value.has(job.job_id)) {
       return false
     }
     setPending(job.job_id, true)
     error.value = null
     try {
-      const deleted = sourceDelete
-        ? await sourceDelete(job.job_id)
-        : await adapterDelete!(job)
-      if (!active) return false
-      if (!sourceDelete) {
-        if (deleted === false) await refresh()
-        else removeLegacyJobs(new Set([job.job_id]))
-      }
-      return deleted !== false
+      const deleted = await sourceDelete(job.job_id)
+      return active && deleted !== false
     } catch (cause) {
       if (active) error.value = errorMessage(cause, 'Failed to delete job')
       return false
@@ -420,36 +284,13 @@ export function usePluginJobCenter(
         const results = await Promise.all(targets.map(job => deleteJob(job)))
         return results.every(Boolean)
       }
-      const currentAdapter = adapter.value
-      if (currentAdapter?.clearFinishedJobs) {
-        const deleted = await currentAdapter.clearFinishedJobs(targets)
-        if (!active) return false
-        if (typeof deleted === 'number' && deleted !== targets.length) {
-          await refresh()
-          return false
-        }
-        removeLegacyJobs(new Set(targets.map(job => job.job_id)))
-        return true
-      }
-      if (!currentAdapter?.deleteJob) return false
-      const results = await Promise.all(targets.map(job => deleteJob(job)))
-      return results.every(Boolean)
+      return false
     } catch (cause) {
       if (active) error.value = errorMessage(cause, 'Failed to clear jobs')
       return false
     }
   }
 
-  if (options.eventStream !== undefined) {
-    watch(
-      () => toValue(options.eventStream)?.lastMessage.value ?? null,
-      (message: PluginEventStreamMessage<JobStreamData> | null) => {
-        if (message) applyStreamMessage(message)
-      },
-      { immediate: true },
-    )
-  }
-
   onMounted(() => {
     if (options.loadOnMount !== false) void refresh()
   })
@@ -477,17 +318,9 @@ export function usePluginJobCenter(
     close: () => { isOpen.value = false },
     toggle: () => { isOpen.value = !isOpen.value },
     refresh,
-    applyStreamMessage,
     cancelJob,
     deleteJob,
     clearFinished,
     isPending: job => pendingJobIds.value.has(job.job_id),
   }
 }
-
-/** Backward-compatible name for the plugin job-center controller. */
-export function useJobsStatusTray(
-  options: UseJobsStatusTrayOptions = {},
-): UseJobsStatusTrayReturn {
-  return usePluginJobCenter(options)
-}