From 51b21a9f358162035a5d445d783313ad5999e418 Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Wed, 15 Jun 2022 13:13:48 -0700 Subject: [PATCH 1/3] remove redundant extraData from error also make method private --- packages/@uppy/companion/src/server/Uploader.js | 14 ++++++-------- .../@uppy/companion/test/__tests__/uploader.js | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/packages/@uppy/companion/src/server/Uploader.js b/packages/@uppy/companion/src/server/Uploader.js index d1099eb41c..4fd499fedc 100644 --- a/packages/@uppy/companion/src/server/Uploader.js +++ b/packages/@uppy/companion/src/server/Uploader.js @@ -295,7 +295,7 @@ class Uploader { const ret = await this.uploadStream(stream) if (!ret) return const { url, extraData } = ret - this.emitSuccess(url, extraData) + this.#emitSuccess(url, extraData) } catch (err) { if (err instanceof AbortError) { logger.error('Aborted upload', 'uploader.aborted', this.shortToken) @@ -303,7 +303,7 @@ class Uploader { } // console.log(err) logger.error(err, 'uploader.error', this.shortToken) - this.emitError(err) + this.#emitError(err) } finally { emitter().removeAllListeners(`pause:${this.token}`) emitter().removeAllListeners(`resume:${this.token}`) @@ -460,7 +460,7 @@ class Uploader { * @param {string} url * @param {object} extraData */ - emitSuccess (url, extraData) { + #emitSuccess (url, extraData) { const emitData = { action: 'success', payload: { ...extraData, complete: true, url }, @@ -473,14 +473,12 @@ class Uploader { * * @param {Error} err */ - emitError (err) { + #emitError (err) { // delete stack to avoid sending server info to client - // todo remove also extraData from serializedErr in next major - const { stack, ...serializedErr } = serializeError(err) + const { stack, ...payload } = serializeError(err) const dataToEmit = { action: 'error', - // @ts-ignore - payload: { ...err.extraData, error: serializedErr }, + payload, } this.saveState(dataToEmit) emitter().emit(this.token, dataToEmit) diff --git a/packages/@uppy/companion/test/__tests__/uploader.js b/packages/@uppy/companion/test/__tests__/uploader.js index fcb3640aff..b50453013c 100644 --- a/packages/@uppy/companion/test/__tests__/uploader.js +++ b/packages/@uppy/companion/test/__tests__/uploader.js @@ -276,7 +276,7 @@ describe('uploader with tus protocol', () => { return new Promise((resolve, reject) => { socketClient.onUploadError(uploadToken, (message) => { try { - expect(message).toMatchObject({ payload: { error: { message: 'maxFileSize exceeded' } } }) + expect(message).toMatchObject({ payload: { message: 'maxFileSize exceeded' } }) resolve() } catch (err) { reject(err) From 1c6a906b3ff9f4bccb3eedbc1982e224ba4b415c Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Thu, 16 Jun 2022 13:10:54 -0700 Subject: [PATCH 2/3] revert breaking change --- packages/@uppy/companion/src/server/Uploader.js | 5 +++-- packages/@uppy/companion/test/__tests__/uploader.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/@uppy/companion/src/server/Uploader.js b/packages/@uppy/companion/src/server/Uploader.js index 4fd499fedc..aba66f68be 100644 --- a/packages/@uppy/companion/src/server/Uploader.js +++ b/packages/@uppy/companion/src/server/Uploader.js @@ -475,10 +475,11 @@ class Uploader { */ #emitError (err) { // delete stack to avoid sending server info to client - const { stack, ...payload } = serializeError(err) + const { stack, ...serializedErr } = serializeError(err) const dataToEmit = { action: 'error', - payload, + // @ts-ignore + payload: { ...err.extraData, error: serializedErr }, } this.saveState(dataToEmit) emitter().emit(this.token, dataToEmit) diff --git a/packages/@uppy/companion/test/__tests__/uploader.js b/packages/@uppy/companion/test/__tests__/uploader.js index b50453013c..fcb3640aff 100644 --- a/packages/@uppy/companion/test/__tests__/uploader.js +++ b/packages/@uppy/companion/test/__tests__/uploader.js @@ -276,7 +276,7 @@ describe('uploader with tus protocol', () => { return new Promise((resolve, reject) => { socketClient.onUploadError(uploadToken, (message) => { try { - expect(message).toMatchObject({ payload: { message: 'maxFileSize exceeded' } }) + expect(message).toMatchObject({ payload: { error: { message: 'maxFileSize exceeded' } } }) resolve() } catch (err) { reject(err) From e1aa2632791d3db06b5b87c1728d32148247fc59 Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Mon, 27 Jun 2022 11:56:49 +0700 Subject: [PATCH 3/3] Update Uploader.js --- packages/@uppy/companion/src/server/Uploader.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/@uppy/companion/src/server/Uploader.js b/packages/@uppy/companion/src/server/Uploader.js index aba66f68be..c4651f039c 100644 --- a/packages/@uppy/companion/src/server/Uploader.js +++ b/packages/@uppy/companion/src/server/Uploader.js @@ -475,6 +475,8 @@ class Uploader { */ #emitError (err) { // delete stack to avoid sending server info to client + // todo remove also extraData from serializedErr in next major, + // see PR discussion https://github.com/transloadit/uppy/pull/3832 const { stack, ...serializedErr } = serializeError(err) const dataToEmit = { action: 'error',