remove redundant extraData from error

also make method private
transloadit · Jun 15, 2022 · 51b21a9 · 51b21a9
1 parent f80f437
commit 51b21a9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/packages/@uppy/companion/src/server/Uploader.js b/packages/@uppy/companion/src/server/Uploader.js
@@ -295,15 +295,15 @@ 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)
         return
       }
       // 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
@@ -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)