From 500e848eb8f95d9b757d36ee867d36426275455b Mon Sep 17 00:00:00 2001 From: prakash Date: Thu, 25 Jun 2026 19:59:31 +0530 Subject: [PATCH 1/5] #6287 fix squash all commits --- packages/@uppy/tus/package.json | 1 + packages/@uppy/tus/src/index.test.ts | 62 +++++++++++++++++++++++++++- packages/@uppy/tus/src/index.ts | 57 ++++++++++++++++++++++--- packages/@uppy/tus/vitest.config.ts | 25 +++++++++++ yarn.lock | 1 + 5 files changed, 138 insertions(+), 8 deletions(-) create mode 100644 packages/@uppy/tus/vitest.config.ts diff --git a/packages/@uppy/tus/package.json b/packages/@uppy/tus/package.json index 3b9ebfa24..ee84ecf11 100644 --- a/packages/@uppy/tus/package.json +++ b/packages/@uppy/tus/package.json @@ -44,6 +44,7 @@ "devDependencies": { "@uppy/core": "workspace:^", "jsdom": "^29.1.1", + "nock": "^13.1.0", "typescript": "^5.8.3", "vitest": "^4.1.6" }, diff --git a/packages/@uppy/tus/src/index.test.ts b/packages/@uppy/tus/src/index.test.ts index 206dffefd..3fc062f79 100644 --- a/packages/@uppy/tus/src/index.test.ts +++ b/packages/@uppy/tus/src/index.test.ts @@ -1,5 +1,6 @@ -import Core from '@uppy/core' -import { describe, expect, expectTypeOf, it } from 'vitest' +import Core, { type UppyEventMap } from '@uppy/core' +import nock from 'nock' +import { afterEach, describe, expect, expectTypeOf, it } from 'vitest' import Tus, { type TusBody } from './index.js' describe('Tus', () => { @@ -44,4 +45,61 @@ describe('Tus', () => { { xhr: XMLHttpRequest } | undefined >() }) + + describe('upload-error response', () => { + afterEach(() => { + nock.cleanAll() + }) + + it('sends the server response over the upload-error event', async () => { + nock('https://fake-endpoint.uppy.io') + .post('/files/') + .reply( + 403, + JSON.stringify({ + message: + 'File cannot be uploaded as the BIN content type is disallowed!', + status_code: 403, + }), + { 'Content-Type': 'application/json' }, + ) + + const core = new Core() + core.use(Tus, { + endpoint: 'https://fake-endpoint.uppy.io/files/', + // Avoid retrying so the failure surfaces immediately. + retryDelays: [], + }) + const id = core.addFile({ + type: 'application/octet-stream', + source: 'test', + name: 'test.bin', + data: new Blob([new Uint8Array(1024)]), + }) + + const event = new Promise< + Parameters['upload-error']> + >((resolve) => { + core.once('upload-error', (...args) => resolve(args)) + }) + + await Promise.all([ + core.upload().catch(() => { + // Core rejects the upload; we assert on the event/state instead. + }), + event.then(([, , response]) => { + expect(response?.status).toBe(403) + const { xhr } = response!.body! + expect(xhr).toBeInstanceOf(XMLHttpRequest) + expect(JSON.parse(xhr.responseText).message).toBe( + 'File cannot be uploaded as the BIN content type is disallowed!', + ) + }), + ]) + + // The response is also persisted on the file so it is available on the + // `complete` result and via `getFile`. + expect(core.getFile(id).response?.status).toBe(403) + }) + }) }) diff --git a/packages/@uppy/tus/src/index.ts b/packages/@uppy/tus/src/index.ts index 7eb00ebe7..fbbadd1a8 100644 --- a/packages/@uppy/tus/src/index.ts +++ b/packages/@uppy/tus/src/index.ts @@ -164,13 +164,28 @@ export default class Tus extends BasePlugin< * Clean up all references for a file's upload: the tus.Upload instance, * any events related to the file, and the Companion WebSocket connection. */ - resetUploaderReferences(fileID: string, opts?: { abort: boolean }): void { + resetUploaderReferences( + fileID: string, + opts?: { + /** Terminate the upload on the server (sends a `DELETE` request). */ + abort?: boolean + /** + * Abort the underlying request. Defaults to `true`. Set to `false` when + * the request has already completed (e.g. in the error handler), so the + * underlying `xhr` — and thus the server response — is preserved instead + * of being reset by `abort()`. + */ + abortRequest?: boolean + }, + ): void { const uploader = this.uploaders[fileID] if (uploader) { - uploader.abort() + if (opts?.abortRequest !== false) { + uploader.abort() - if (opts?.abort) { - uploader.abort(true) + if (opts?.abort) { + uploader.abort(true) + } } this.uploaders[fileID] = null @@ -219,6 +234,12 @@ export default class Tus extends BasePlugin< ): Promise { this.resetUploaderReferences(file.id) + // Captured in `onError` and forwarded to the `upload-error` event in the + // `.catch` below, so consumers can read the failing server response. + let errorResponse: + | Omit['response']>, 'uploadURL'> + | undefined + // Create a new tus upload return new Promise((resolve, reject) => { let queuedRequest: ReturnType @@ -291,6 +312,23 @@ export default class Tus extends BasePlugin< uploadOptions.onError = (err) => { this.uppy.log(err) + // tus-js-client only calls `onError` once it has given up retrying, so + // the request has already completed. Capture the server response (status + // + body) and forward it to the `upload-error` event and `file.response`, + // mirroring the shape emitted by `onSuccess`. + const originalResponse = (err as tus.DetailedError).originalResponse + if (originalResponse != null) { + errorResponse = { + status: originalResponse.getStatus(), + body: { + // We have to put `as XMLHttpRequest` because tus-js-client + // returns `any`, as the type differs in Node.js and the browser. + // In the browser it's always `XMLHttpRequest`. + xhr: originalResponse.getUnderlyingObject() as XMLHttpRequest, + } as unknown as B, + } + } + const xhr = (err as tus.DetailedError).originalRequest != null ? (err as tus.DetailedError).originalRequest.getUnderlyingObject() @@ -299,7 +337,11 @@ export default class Tus extends BasePlugin< err = new NetworkError(err, xhr) } - this.resetUploaderReferences(file.id) + // Do not abort the request here: it has already completed, and aborting + // it would reset the underlying `xhr` (status `0`, empty body) and + // discard the response we just captured. We still drop our references + // and remove the event listeners. + this.resetUploaderReferences(file.id, { abortRequest: false }) queuedRequest?.abort() if (typeof opts.onError === 'function') { @@ -516,7 +558,10 @@ export default class Tus extends BasePlugin< queuedRequest = this.requests.run(qRequest) }) }).catch((err) => { - this.uppy.emit('upload-error', file, err) + // `errorResponse` is captured in the `onError` handler above (the request + // is intentionally not aborted there), so the server response is still + // available here to forward to the `upload-error` event. + this.uppy.emit('upload-error', file, err, errorResponse) throw err }) } diff --git a/packages/@uppy/tus/vitest.config.ts b/packages/@uppy/tus/vitest.config.ts new file mode 100644 index 000000000..a4df19185 --- /dev/null +++ b/packages/@uppy/tus/vitest.config.ts @@ -0,0 +1,25 @@ +import { defineConfig } from 'vitest/config' + +// In the browser (where Uppy runs) tus-js-client uses its browser build, which +// accepts `Blob`/`File` and `XMLHttpRequest`. Under the default Node resolution +// Vitest would load the Node build, which only accepts `Buffer`/`Readable`. +// Alias to the browser build so jsdom tests exercise the same code path as +// production. +export default defineConfig({ + resolve: { + alias: { + 'tus-js-client': 'tus-js-client/lib.esm/browser/index.js', + }, + }, + test: { + environment: 'jsdom', + // Run with the document origin set to the upload endpoint so requests in + // tests are same-origin. Otherwise jsdom treats them as cross-origin and + // hides the response status (`xhr.status === 0`). + environmentOptions: { + jsdom: { + url: 'https://fake-endpoint.uppy.io', + }, + }, + }, +}) diff --git a/yarn.lock b/yarn.lock index cdb4fe9f2..09d2eb466 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9696,6 +9696,7 @@ __metadata: "@uppy/core": "workspace:^" "@uppy/utils": "workspace:^" jsdom: "npm:^29.1.1" + nock: "npm:^13.1.0" tus-js-client: "npm:^4.3.1" typescript: "npm:^5.8.3" vitest: "npm:^4.1.6" From a05035f70fadae2d5f323251cd0b7f3af0f88b5a Mon Sep 17 00:00:00 2001 From: prakash Date: Thu, 25 Jun 2026 20:34:11 +0530 Subject: [PATCH 2/5] remove stale config and fix failing test --- packages/@uppy/tus/src/index.test.ts | 71 ++++++++++++++++++---------- packages/@uppy/tus/vitest.config.ts | 25 ---------- 2 files changed, 47 insertions(+), 49 deletions(-) delete mode 100644 packages/@uppy/tus/vitest.config.ts diff --git a/packages/@uppy/tus/src/index.test.ts b/packages/@uppy/tus/src/index.test.ts index 3fc062f79..413bf64da 100644 --- a/packages/@uppy/tus/src/index.test.ts +++ b/packages/@uppy/tus/src/index.test.ts @@ -1,8 +1,52 @@ import Core, { type UppyEventMap } from '@uppy/core' -import nock from 'nock' -import { afterEach, describe, expect, expectTypeOf, it } from 'vitest' +import { describe, expect, expectTypeOf, it, vi } from 'vitest' import Tus, { type TusBody } from './index.js' +// Shared fake XHR object — must be declared via vi.hoisted so it's available +// inside the vi.mock factory (which is hoisted before imports). +const { fakeXhr } = vi.hoisted(() => ({ + fakeXhr: { + status: 403, + responseText: JSON.stringify({ + message: + 'File cannot be uploaded as the BIN content type is disallowed!', + status_code: 403, + }), + }, +})) + +// Mock tus-js-client so the upload-error test never touches the network. +// The mock Upload fires onError immediately with a fake DetailedError. +vi.mock('tus-js-client', async (importOriginal) => { + const actual = await importOriginal() + class MockUpload { + private options: Record + + constructor(_file: any, options: Record) { + this.options = options + } + + start() { + const err = Object.assign(new Error('tus: server responded with 403'), { + originalResponse: { + getStatus: () => 403, + getUnderlyingObject: () => fakeXhr, + }, + originalRequest: null, + }) + setTimeout(() => this.options.onError(err), 0) + } + + abort() {} + + // ponytail: tus calls this before start(); return empty so no resume logic runs + findPreviousUploads() { + return Promise.resolve([]) + } + } + return { ...actual, Upload: MockUpload } +}) + describe('Tus', () => { it('Throws errors if autoRetry option is true', () => { const uppy = new Core() @@ -47,27 +91,10 @@ describe('Tus', () => { }) describe('upload-error response', () => { - afterEach(() => { - nock.cleanAll() - }) - it('sends the server response over the upload-error event', async () => { - nock('https://fake-endpoint.uppy.io') - .post('/files/') - .reply( - 403, - JSON.stringify({ - message: - 'File cannot be uploaded as the BIN content type is disallowed!', - status_code: 403, - }), - { 'Content-Type': 'application/json' }, - ) - const core = new Core() core.use(Tus, { endpoint: 'https://fake-endpoint.uppy.io/files/', - // Avoid retrying so the failure surfaces immediately. retryDelays: [], }) const id = core.addFile({ @@ -89,16 +116,12 @@ describe('Tus', () => { }), event.then(([, , response]) => { expect(response?.status).toBe(403) - const { xhr } = response!.body! - expect(xhr).toBeInstanceOf(XMLHttpRequest) - expect(JSON.parse(xhr.responseText).message).toBe( + expect(JSON.parse(response!.body!.xhr.responseText).message).toBe( 'File cannot be uploaded as the BIN content type is disallowed!', ) }), ]) - // The response is also persisted on the file so it is available on the - // `complete` result and via `getFile`. expect(core.getFile(id).response?.status).toBe(403) }) }) diff --git a/packages/@uppy/tus/vitest.config.ts b/packages/@uppy/tus/vitest.config.ts deleted file mode 100644 index a4df19185..000000000 --- a/packages/@uppy/tus/vitest.config.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { defineConfig } from 'vitest/config' - -// In the browser (where Uppy runs) tus-js-client uses its browser build, which -// accepts `Blob`/`File` and `XMLHttpRequest`. Under the default Node resolution -// Vitest would load the Node build, which only accepts `Buffer`/`Readable`. -// Alias to the browser build so jsdom tests exercise the same code path as -// production. -export default defineConfig({ - resolve: { - alias: { - 'tus-js-client': 'tus-js-client/lib.esm/browser/index.js', - }, - }, - test: { - environment: 'jsdom', - // Run with the document origin set to the upload endpoint so requests in - // tests are same-origin. Otherwise jsdom treats them as cross-origin and - // hides the response status (`xhr.status === 0`). - environmentOptions: { - jsdom: { - url: 'https://fake-endpoint.uppy.io', - }, - }, - }, -}) From 4c30023e35dff0e4fc5763428f7217639fb537d3 Mon Sep 17 00:00:00 2001 From: prakash Date: Thu, 25 Jun 2026 20:35:45 +0530 Subject: [PATCH 3/5] yarn check --- packages/@uppy/tus/src/index.test.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/@uppy/tus/src/index.test.ts b/packages/@uppy/tus/src/index.test.ts index 413bf64da..1a46170e4 100644 --- a/packages/@uppy/tus/src/index.test.ts +++ b/packages/@uppy/tus/src/index.test.ts @@ -8,8 +8,7 @@ const { fakeXhr } = vi.hoisted(() => ({ fakeXhr: { status: 403, responseText: JSON.stringify({ - message: - 'File cannot be uploaded as the BIN content type is disallowed!', + message: 'File cannot be uploaded as the BIN content type is disallowed!', status_code: 403, }), }, From ad84895e08d86f30be8987bfedaa39ed42f86bf5 Mon Sep 17 00:00:00 2001 From: prakash Date: Tue, 30 Jun 2026 21:15:28 +0530 Subject: [PATCH 4/5] remove unused dep nock --- packages/@uppy/tus/package.json | 1 - yarn.lock | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/@uppy/tus/package.json b/packages/@uppy/tus/package.json index ee84ecf11..3b9ebfa24 100644 --- a/packages/@uppy/tus/package.json +++ b/packages/@uppy/tus/package.json @@ -44,7 +44,6 @@ "devDependencies": { "@uppy/core": "workspace:^", "jsdom": "^29.1.1", - "nock": "^13.1.0", "typescript": "^5.8.3", "vitest": "^4.1.6" }, diff --git a/yarn.lock b/yarn.lock index 72d061b3a..ea441ab93 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9696,7 +9696,6 @@ __metadata: "@uppy/core": "workspace:^" "@uppy/utils": "workspace:^" jsdom: "npm:^29.1.1" - nock: "npm:^13.1.0" tus-js-client: "npm:^4.3.1" typescript: "npm:^5.8.3" vitest: "npm:^4.1.6" From 942db4723426048f52a0f3585156234c9c8621e8 Mon Sep 17 00:00:00 2001 From: prakash Date: Tue, 30 Jun 2026 21:15:42 +0530 Subject: [PATCH 5/5] add changeset --- .changeset/little-clouds-call.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/little-clouds-call.md diff --git a/.changeset/little-clouds-call.md b/.changeset/little-clouds-call.md new file mode 100644 index 000000000..833cf647a --- /dev/null +++ b/.changeset/little-clouds-call.md @@ -0,0 +1,5 @@ +--- +"@uppy/tus": major +--- + +@uppy/tus: don't abort the request on error, so the server response (status + body) is forwarded to the `upload-error` event and `file.response` instead of being reset to status `0`.