|
|
@@ -4,8 +4,9 @@ import { join } from 'node:path'
|
|
|
import { describe, expect, it, vi } from 'vitest'
|
|
|
import { AttachmentId, ImageVariantId } from '@deepseek-ai/dsh-attachment'
|
|
|
import type { ImageAttachmentRef, RequestImageAttachment } from '@deepseek-ai/dsh-attachment'
|
|
|
-import { DeepSeekFileStore } from '../src/file-store.ts'
|
|
|
-import { DeepSeekUploadIndex } from '../src/upload-index.ts'
|
|
|
+import { DeepSeekFileStore, MAX_CHAT_IMAGE_BYTES } from '../src/file-store.ts'
|
|
|
+import { DeepSeekFileId } from '../src/file-id.ts'
|
|
|
+import { deepSeekFileScope, DeepSeekUploadIndex } from '../src/upload-index.ts'
|
|
|
|
|
|
const REF: ImageAttachmentRef = {
|
|
|
attachmentId: AttachmentId(`sha256:${'a'.repeat(64)}`),
|
|
|
@@ -90,7 +91,9 @@ describe('DeepSeekFileStore', () => {
|
|
|
uploadSignal = init?.signal ?? undefined
|
|
|
return new Promise<Response>((resolve, reject) => {
|
|
|
complete = resolve
|
|
|
- uploadSignal?.addEventListener('abort', () => reject(uploadSignal?.reason), { once: true })
|
|
|
+ uploadSignal?.addEventListener('abort', () => {
|
|
|
+ reject(new Error('upload aborted', { cause: uploadSignal?.reason }))
|
|
|
+ }, { once: true })
|
|
|
})
|
|
|
}) as typeof fetch
|
|
|
const store = new DeepSeekFileStore({ index, now: () => NOW, fetch: fetchImpl })
|
|
|
@@ -98,7 +101,9 @@ describe('DeepSeekFileStore', () => {
|
|
|
|
|
|
const cancelled = store.ensureUploaded(VERSION, CONNECTION, POLICY, controller.signal)
|
|
|
const completed = store.ensureUploaded(VERSION, CONNECTION, POLICY)
|
|
|
- await vi.waitFor(() => expect(fetchImpl).toHaveBeenCalledTimes(1))
|
|
|
+ await vi.waitFor(() => {
|
|
|
+ expect(fetchImpl).toHaveBeenCalledTimes(1)
|
|
|
+ })
|
|
|
const reason = new Error('cancel one upload waiter')
|
|
|
controller.abort(reason)
|
|
|
|
|
|
@@ -123,13 +128,17 @@ describe('DeepSeekFileStore', () => {
|
|
|
const fetchImpl = vi.fn((_url: string | URL | Request, init?: RequestInit) => {
|
|
|
uploadSignal = init?.signal ?? undefined
|
|
|
return new Promise<Response>((_resolve, reject) => {
|
|
|
- uploadSignal?.addEventListener('abort', () => reject(uploadSignal?.reason), { once: true })
|
|
|
+ uploadSignal?.addEventListener('abort', () => {
|
|
|
+ reject(new Error('upload aborted', { cause: uploadSignal?.reason }))
|
|
|
+ }, { once: true })
|
|
|
})
|
|
|
}) as typeof fetch
|
|
|
const store = new DeepSeekFileStore({ index, now: () => NOW, fetch: fetchImpl })
|
|
|
const controller = new AbortController()
|
|
|
const upload = store.ensureUploaded(VERSION, CONNECTION, POLICY, controller.signal)
|
|
|
- await vi.waitFor(() => expect(fetchImpl).toHaveBeenCalledTimes(1))
|
|
|
+ await vi.waitFor(() => {
|
|
|
+ expect(fetchImpl).toHaveBeenCalledTimes(1)
|
|
|
+ })
|
|
|
|
|
|
const reason = new Error('cancel only upload waiter')
|
|
|
controller.abort(reason)
|
|
|
@@ -138,6 +147,79 @@ describe('DeepSeekFileStore', () => {
|
|
|
expect(uploadSignal?.reason).toBe(reason)
|
|
|
})
|
|
|
|
|
|
+ it('normalizes a non-Error cancellation reason', async () => {
|
|
|
+ const dir = await mkdtemp(join(tmpdir(), 'dsh-file-store-'))
|
|
|
+ const fetchImpl = vi.fn((_url: string | URL | Request, init?: RequestInit) => (
|
|
|
+ new Promise<Response>((_resolve, reject) => {
|
|
|
+ init?.signal?.addEventListener('abort', () => {
|
|
|
+ reject(new Error('upload aborted', { cause: init.signal?.reason }))
|
|
|
+ }, { once: true })
|
|
|
+ })
|
|
|
+ )) as typeof fetch
|
|
|
+ const store = new DeepSeekFileStore({
|
|
|
+ index: new DeepSeekUploadIndex(join(dir, 'index.json')),
|
|
|
+ now: () => NOW,
|
|
|
+ fetch: fetchImpl,
|
|
|
+ })
|
|
|
+ const controller = new AbortController()
|
|
|
+ const upload = store.ensureUploaded(VERSION, CONNECTION, POLICY, controller.signal)
|
|
|
+ await vi.waitFor(() => {
|
|
|
+ expect(fetchImpl).toHaveBeenCalledOnce()
|
|
|
+ })
|
|
|
+ controller.abort('cancelled')
|
|
|
+
|
|
|
+ await expect(upload).rejects.toMatchObject({
|
|
|
+ message: 'DeepSeek file upload cancelled with a non-Error reason.',
|
|
|
+ cause: 'cancelled',
|
|
|
+ })
|
|
|
+ })
|
|
|
+
|
|
|
+ it('starts a fresh upload while the cancelled transport is settling', async () => {
|
|
|
+ const dir = await mkdtemp(join(tmpdir(), 'dsh-file-store-'))
|
|
|
+ let requests = 0
|
|
|
+ const fetchImpl = vi.fn((_url: string | URL | Request, init?: RequestInit) => {
|
|
|
+ requests += 1
|
|
|
+ if (requests === 1) {
|
|
|
+ return new Promise<Response>((_resolve, reject) => {
|
|
|
+ init?.signal?.addEventListener('abort', () => {
|
|
|
+ queueMicrotask(() => {
|
|
|
+ reject(new Error('upload aborted', { cause: init.signal?.reason }))
|
|
|
+ })
|
|
|
+ }, { once: true })
|
|
|
+ })
|
|
|
+ }
|
|
|
+ return Promise.resolve(new Response(JSON.stringify({
|
|
|
+ id: 'file-api-retry', object: 'file', bytes: 3, created_at: NOW / 1_000,
|
|
|
+ filename: 'dsh-retry.png', purpose: 'user_data',
|
|
|
+ expires_at: NOW / 1_000 + POLICY.expiresAfterSeconds,
|
|
|
+ }), { status: 200 }))
|
|
|
+ }) as typeof fetch
|
|
|
+ const store = new DeepSeekFileStore({
|
|
|
+ index: new DeepSeekUploadIndex(join(dir, 'index.json')),
|
|
|
+ now: () => NOW,
|
|
|
+ fetch: fetchImpl,
|
|
|
+ })
|
|
|
+ const controller = new AbortController()
|
|
|
+ const cancelled = store.ensureUploaded(VERSION, CONNECTION, POLICY, controller.signal)
|
|
|
+ await vi.waitFor(() => {
|
|
|
+ expect(fetchImpl).toHaveBeenCalledOnce()
|
|
|
+ })
|
|
|
+ controller.abort(new Error('cancel first'))
|
|
|
+ const retried = store.ensureUploaded(VERSION, CONNECTION, POLICY)
|
|
|
+
|
|
|
+ await expect(cancelled).rejects.toThrow('cancel first')
|
|
|
+ await expect(retried).resolves.toMatchObject({ record: { fileId: 'file-api-retry' } })
|
|
|
+ })
|
|
|
+
|
|
|
+ it('rejects a request version above the chat per-image limit before transport', async () => {
|
|
|
+ const fetchImpl = vi.fn() as typeof fetch
|
|
|
+ const store = new DeepSeekFileStore({ now: () => NOW, fetch: fetchImpl })
|
|
|
+ const oversized = { ...VERSION, bytes: MAX_CHAT_IMAGE_BYTES + 1 }
|
|
|
+ await expect(store.ensureUploaded(oversized, CONNECTION, POLICY))
|
|
|
+ .rejects.toMatchObject({ code: 'INVALID_REQUEST' })
|
|
|
+ expect(fetchImpl).not.toHaveBeenCalled()
|
|
|
+ })
|
|
|
+
|
|
|
it('does not persist an upload whose response is missing and retries on the next request', async () => {
|
|
|
const dir = await mkdtemp(join(tmpdir(), 'dsh-file-store-'))
|
|
|
const index = new DeepSeekUploadIndex(join(dir, 'index.json'))
|
|
|
@@ -158,6 +240,55 @@ describe('DeepSeekFileStore', () => {
|
|
|
.resolves.toMatchObject({ record: { fileId: 'file-api-1' }, uploaded: true })
|
|
|
})
|
|
|
|
|
|
+ it('rejects an upload response whose byte count differs from the request version', async () => {
|
|
|
+ const dir = await mkdtemp(join(tmpdir(), 'dsh-file-store-'))
|
|
|
+ const fetchImpl = vi.fn(() => Promise.resolve(new Response(JSON.stringify({
|
|
|
+ id: 'file-api-wrong-size', object: 'file', bytes: 2, created_at: NOW / 1_000,
|
|
|
+ filename: 'dsh-wrong.png', purpose: 'user_data',
|
|
|
+ expires_at: NOW / 1_000 + POLICY.expiresAfterSeconds,
|
|
|
+ }), { status: 200 }))) as typeof fetch
|
|
|
+ const store = new DeepSeekFileStore({
|
|
|
+ index: new DeepSeekUploadIndex(join(dir, 'index.json')),
|
|
|
+ now: () => NOW,
|
|
|
+ fetch: fetchImpl,
|
|
|
+ })
|
|
|
+ await expect(store.ensureUploaded(VERSION, CONNECTION, POLICY))
|
|
|
+ .rejects.toMatchObject({ code: 'INVALID_RESPONSE' })
|
|
|
+ })
|
|
|
+
|
|
|
+ it.each([
|
|
|
+ ['image/jpeg', 'jpeg'],
|
|
|
+ ['image/webp', 'webp'],
|
|
|
+ ['image/gif', 'gif'],
|
|
|
+ ] as const)('uses the %s filename extension for uploads', async (mediaType, extension) => {
|
|
|
+ const dir = await mkdtemp(join(tmpdir(), 'dsh-file-store-'))
|
|
|
+ const remote = uploadFetch()
|
|
|
+ const store = new DeepSeekFileStore({
|
|
|
+ index: new DeepSeekUploadIndex(join(dir, `${extension}.json`)),
|
|
|
+ now: () => NOW,
|
|
|
+ fetch: remote.fetchImpl,
|
|
|
+ })
|
|
|
+ await store.ensureUploaded({ ...VERSION, mediaType }, CONNECTION, POLICY)
|
|
|
+ const form = vi.mocked(remote.fetchImpl).mock.calls[0]?.[1]?.body
|
|
|
+ expect(form).toBeInstanceOf(FormData)
|
|
|
+ const file = (form as FormData).get('file')
|
|
|
+ expect(file).toBeInstanceOf(File)
|
|
|
+ if (!(file instanceof File)) throw new Error('expected multipart file')
|
|
|
+ expect(file.name).toMatch(new RegExp(`\\.${extension}$`, 'u'))
|
|
|
+ })
|
|
|
+
|
|
|
+ it('normalizes a non-Error failure from the durable upload index', async () => {
|
|
|
+ const dir = await mkdtemp(join(tmpdir(), 'dsh-file-store-'))
|
|
|
+ const index = new DeepSeekUploadIndex(join(dir, 'index.json'))
|
|
|
+ vi.spyOn(index, 'get').mockRejectedValue('index unavailable')
|
|
|
+ const store = new DeepSeekFileStore({ index, now: () => NOW, fetch: vi.fn() as typeof fetch })
|
|
|
+
|
|
|
+ await expect(store.ensureUploaded(VERSION, CONNECTION, POLICY)).rejects.toMatchObject({
|
|
|
+ message: 'DeepSeek file upload failed with a non-Error reason.',
|
|
|
+ cause: 'index unavailable',
|
|
|
+ })
|
|
|
+ })
|
|
|
+
|
|
|
it('reuses local expires_at above the refresh margin and uploads again at the margin', async () => {
|
|
|
const dir = await mkdtemp(join(tmpdir(), 'dsh-file-store-'))
|
|
|
const index = new DeepSeekUploadIndex(join(dir, 'index.json'))
|
|
|
@@ -190,6 +321,101 @@ describe('DeepSeekFileStore', () => {
|
|
|
expect(remote.fetchImpl).toHaveBeenCalledTimes(2)
|
|
|
})
|
|
|
|
|
|
+ it('removes a losing upload and keeps the winning durable mapping when duplicate cleanup fails', async () => {
|
|
|
+ const dir = await mkdtemp(join(tmpdir(), 'dsh-file-store-'))
|
|
|
+ const index = new DeepSeekUploadIndex(join(dir, 'index.json'))
|
|
|
+ vi.spyOn(index, 'commit').mockResolvedValue({
|
|
|
+ accepted: false,
|
|
|
+ record: {
|
|
|
+ scope: deepSeekFileScope(CONNECTION.baseURL, CONNECTION.apiKey),
|
|
|
+ masterAttachmentId: VERSION.master.attachmentId,
|
|
|
+ variantId: VERSION.variantId,
|
|
|
+ fileId: DeepSeekFileId('file-api-winner'),
|
|
|
+ bytes: 3,
|
|
|
+ createdAt: NOW,
|
|
|
+ expiresAt: NOW + POLICY.expiresAfterSeconds * 1_000,
|
|
|
+ },
|
|
|
+ })
|
|
|
+ const remote = uploadFetch()
|
|
|
+ const fetchImpl = vi.fn((url: string | URL | Request, init?: RequestInit) => {
|
|
|
+ if (init?.method === 'DELETE') return Promise.resolve(new Response('failed', { status: 500 }))
|
|
|
+ return remote.fetchImpl(url, init)
|
|
|
+ }) as typeof fetch
|
|
|
+ const store = new DeepSeekFileStore({ index, now: () => NOW, fetch: fetchImpl })
|
|
|
+
|
|
|
+ await expect(store.ensureUploaded(VERSION, CONNECTION, POLICY)).resolves.toMatchObject({
|
|
|
+ record: { fileId: 'file-api-winner' },
|
|
|
+ uploaded: false,
|
|
|
+ })
|
|
|
+ expect(fetchImpl).toHaveBeenCalledTimes(2)
|
|
|
+ })
|
|
|
+
|
|
|
+ it('reclaims one owned file after quota rejection and retries the upload once', async () => {
|
|
|
+ const dir = await mkdtemp(join(tmpdir(), 'dsh-file-store-'))
|
|
|
+ let uploads = 0
|
|
|
+ const fetchImpl = vi.fn((input: string | URL | Request, init?: RequestInit) => {
|
|
|
+ if (init?.method === 'POST') {
|
|
|
+ uploads += 1
|
|
|
+ if (uploads === 1) return Promise.resolve(new Response(JSON.stringify({
|
|
|
+ error: { message: 'stored file quota exceeded', code: 'file_quota' },
|
|
|
+ }), { status: 400 }))
|
|
|
+ return Promise.resolve(new Response(JSON.stringify({
|
|
|
+ id: 'file-api-recovered', object: 'file', bytes: 3, created_at: NOW / 1_000,
|
|
|
+ filename: 'dsh-recovered.png', purpose: 'user_data',
|
|
|
+ expires_at: NOW / 1_000 + POLICY.expiresAfterSeconds,
|
|
|
+ }), { status: 200 }))
|
|
|
+ }
|
|
|
+ if (init?.method === 'DELETE') {
|
|
|
+ return Promise.resolve(new Response(JSON.stringify({
|
|
|
+ id: 'file-api-old', object: 'file', deleted: true,
|
|
|
+ }), { status: 200 }))
|
|
|
+ }
|
|
|
+ expect(new URL(requestUrl(input)).pathname).toBe('/files')
|
|
|
+ return Promise.resolve(new Response(JSON.stringify({
|
|
|
+ object: 'list',
|
|
|
+ data: [{
|
|
|
+ id: 'file-api-old', object: 'file', bytes: 3, created_at: NOW / 1_000,
|
|
|
+ filename: 'dsh-old.png', purpose: 'user_data',
|
|
|
+ }],
|
|
|
+ first_id: 'file-api-old', last_id: 'file-api-old', has_more: false,
|
|
|
+ }), { status: 200 }))
|
|
|
+ }) as typeof fetch
|
|
|
+ const store = new DeepSeekFileStore({
|
|
|
+ index: new DeepSeekUploadIndex(join(dir, 'index.json')),
|
|
|
+ now: () => NOW,
|
|
|
+ fetch: fetchImpl,
|
|
|
+ })
|
|
|
+
|
|
|
+ await expect(store.ensureUploaded(VERSION, CONNECTION, POLICY)).resolves.toMatchObject({
|
|
|
+ record: { fileId: 'file-api-recovered' }, uploaded: true,
|
|
|
+ })
|
|
|
+ expect(uploads).toBe(2)
|
|
|
+ })
|
|
|
+
|
|
|
+ it('preserves a quota error when no harness-owned file can be reclaimed', async () => {
|
|
|
+ const dir = await mkdtemp(join(tmpdir(), 'dsh-file-store-'))
|
|
|
+ const fetchImpl = vi.fn((_input: string | URL | Request, init?: RequestInit) => {
|
|
|
+ if (init?.method === 'POST') return Promise.resolve(new Response(JSON.stringify({
|
|
|
+ error: { message: 'file count quota exceeded', code: 'file_quota' },
|
|
|
+ }), { status: 400 }))
|
|
|
+ return Promise.resolve(new Response(JSON.stringify({
|
|
|
+ object: 'list',
|
|
|
+ data: [{
|
|
|
+ id: 'file-api-foreign', object: 'file', bytes: 3, created_at: NOW / 1_000,
|
|
|
+ filename: 'foreign.png', purpose: 'user_data',
|
|
|
+ }],
|
|
|
+ has_more: false,
|
|
|
+ }), { status: 200 }))
|
|
|
+ }) as typeof fetch
|
|
|
+ const store = new DeepSeekFileStore({
|
|
|
+ index: new DeepSeekUploadIndex(join(dir, 'index.json')),
|
|
|
+ now: () => NOW,
|
|
|
+ fetch: fetchImpl,
|
|
|
+ })
|
|
|
+
|
|
|
+ await expect(store.ensureUploaded(VERSION, CONNECTION, POLICY)).rejects.toMatchObject({ code: 'FILES_API' })
|
|
|
+ })
|
|
|
+
|
|
|
it('finishes pagination before deleting cursor files during quota recovery', async () => {
|
|
|
const dir = await mkdtemp(join(tmpdir(), 'dsh-file-store-'))
|
|
|
const deleted = new Set<string>()
|
|
|
@@ -227,4 +453,44 @@ describe('DeepSeekFileStore', () => {
|
|
|
await expect(store.reclaimOldestOwned(CONNECTION, 2)).resolves.toBe(2)
|
|
|
expect([...deleted]).toEqual(['file-api-oldest', 'file-api-next'])
|
|
|
})
|
|
|
+
|
|
|
+ it('stops pagination when a page omits or repeats its cursor', async () => {
|
|
|
+ const dir = await mkdtemp(join(tmpdir(), 'dsh-file-store-'))
|
|
|
+ for (const mode of ['missing', 'repeated'] as const) {
|
|
|
+ let page = 0
|
|
|
+ const fetchImpl = vi.fn((input: string | URL | Request, init?: RequestInit) => {
|
|
|
+ if (init?.method === 'DELETE') {
|
|
|
+ const id = requestUrl(input).split('/').at(-1)
|
|
|
+ return Promise.resolve(new Response(JSON.stringify({ id, object: 'file', deleted: true }), { status: 200 }))
|
|
|
+ }
|
|
|
+ page += 1
|
|
|
+ const lastId = mode === 'missing' ? undefined : 'file-api-same'
|
|
|
+ return Promise.resolve(new Response(JSON.stringify({
|
|
|
+ object: 'list', data: [], has_more: true,
|
|
|
+ ...lastId === undefined ? {} : { last_id: lastId },
|
|
|
+ }), { status: 200 }))
|
|
|
+ }) as typeof fetch
|
|
|
+ const store = new DeepSeekFileStore({
|
|
|
+ index: new DeepSeekUploadIndex(join(dir, `${mode}.json`)),
|
|
|
+ now: () => NOW,
|
|
|
+ fetch: fetchImpl,
|
|
|
+ })
|
|
|
+ await expect(store.reclaimOldestOwned(CONNECTION, 1)).resolves.toBe(0)
|
|
|
+ expect(page).toBe(mode === 'missing' ? 1 : 2)
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
+ it('releases every batch and clears the scoped upload index', async () => {
|
|
|
+ const dir = await mkdtemp(join(tmpdir(), 'dsh-file-store-'))
|
|
|
+ const index = new DeepSeekUploadIndex(join(dir, 'index.json'))
|
|
|
+ const store = new DeepSeekFileStore({ index, now: () => NOW, fetch: vi.fn() as typeof fetch })
|
|
|
+ const reclaim = vi.spyOn(store, 'reclaimOldestOwned')
|
|
|
+ .mockResolvedValueOnce(1_000)
|
|
|
+ .mockResolvedValueOnce(2)
|
|
|
+ const clear = vi.spyOn(index, 'clear')
|
|
|
+
|
|
|
+ await expect(store.releaseAll(CONNECTION)).resolves.toBe(1_002)
|
|
|
+ expect(reclaim).toHaveBeenCalledTimes(2)
|
|
|
+ expect(clear).toHaveBeenCalledOnce()
|
|
|
+ })
|
|
|
})
|
creatixchu