@morscherlab/mint-sdk 1.4.6 → 1.4.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morscherlab/mint-sdk",
-  "version": "1.4.6",
+  "version": "1.4.7",
   "description": "MINT Platform SDK — Vue 3 components, composables, and types for plugin development. MINT = Mass-spec Infrastructure for Next-generation Toolkits.",
   "type": "module",
   "main": "./dist/index.js",

package/src/__tests__/composables/useJobsEndpoint.test.ts

@@ -1595,6 +1595,56 @@ describe('useJobsEndpoint', () => {
     }
   })
 
+  it.each([
+    { name: 'resolves when the server still has the job', answers: [() => response(completedJob('submitted-job'))], outcome: 'completed' },
+    { name: 'rejects when the server no longer has the job', answers: [() => response({ detail: 'Job not found' }, 404)], outcome: 'Job submitted-job is no longer available' },
+    { name: 'checks again on the next snapshot after a retryable error', answers: [() => response({ detail: 'Busy' }, 503), () => response(completedJob('submitted-job'))], outcome: 'completed' },
+  ])('should check a waited job that a stale stream snapshot omits and $name', async ({ answers, outcome }) => {
+    const encoder = new TextEncoder()
+    let pushFrame!: (frame: string) => void
+    const stream = new ReadableStream<Uint8Array>({
+      start(controller) { pushFrame = frame => controller.enqueue(encoder.encode(frame)) },
+    })
+    let lookups = 0
+    const transport = vi.fn<GeneratedAnalysisTransport>(async (input, init) => {
+      const url = String(input)
+      if (url.endsWith('/jobs/sessions') && init?.method === 'GET') return response({ sessions: [] })
+      if (url.endsWith('/jobs/sessions')) {
+        return response({ id: 'session-1', tab_id: 'tab-1', created_at: '', last_seen_at: '', active_job_ids: [] })
+      }
+      if (url.endsWith('/jobs/events')) return new Response(stream, { headers: { 'Content-Type': 'text/event-stream' } })
+      if (url.endsWith('/jobs') && init?.method === 'POST') return response(activeJob('submitted-job'))
+      if (url.endsWith('/jobs')) return response({ jobs: [] })
+      if (url.endsWith('/jobs/submitted-job')) {
+        lookups += 1
+        return lookups === 1 ? response(activeJob('submitted-job', 'running')) : answers[lookups - 2]!()
+      }
+      throw new Error(`Unexpected request: ${url}`)
+    })
+    const scope = effectScope()
+    const generated = scope.run(() => useJobsEndpoint({
+      baseUrl: '/api/demo',
+      transport,
+      storage: memoryStorage(),
+      createId: () => 'tab-1',
+      streamReconnectDelay: 60_000,
+    }))!
+
+    try {
+      const waiting = generated.wait(await generated.submit('run', {}))
+        .then(job => job.status, (cause: Error) => cause.message)
+      // Each snapshot was built before the submit reached the server.
+      for (const [index] of answers.entries()) {
+        await vi.waitFor(() => expect(lookups).toBe(index + 1))
+        pushFrame(`event: snapshot\ndata: ${JSON.stringify({ jobs: [] })}\n\n`)
+      }
+
+      expect(await waiting).toBe(outcome)
+    } finally {
+      scope.stop()
+    }
+  })
+
   it('rejects pending waiters when their job is deleted or the runtime is disposed', async () => {
     const queued = activeJob('delete-wait-job')
     const disposeJobRequest = deferred<Response>()

package/src/composables/useJobsEndpoint.ts

@@ -677,16 +677,27 @@ export function useJobsEndpoint(
     ]))
     jobs.value = nextJobs
     for (const job of nextJobs) settleJobWaiters(job)
-    for (const jobId of previousJobIds) {
-      if (!nextJobIds.has(jobId)) {
-        rejectJobWaiters(jobId, new Error(`Job ${jobId} is no longer available`))
-      }
+    for (const jobId of [...jobWaiters.keys()]) {
+      if (!nextJobIds.has(jobId)) void confirmMissingJob(jobId)
     }
     pruneResultState()
     pruneJobRevisions()
     return nextJobs
   }
 
+  /**
+   * A stream snapshot built before a submit can arrive after the submit reply,
+   * so a waited job missing from it is gone only once the server says so.
+   */
+  async function confirmMissingJob(jobId: string): Promise<void> {
+    try {
+      await getJob(jobId)
+    } catch (cause) {
+      if (isRetryableJobLookupError(cause)) return
+      rejectJobWaiters(jobId, new Error(`Job ${jobId} is no longer available`))
+    }
+  }
+
   function upsertJob(
     input: GeneratedAnalysisJobInput,
     fallbackDefinitionId?: string,