Skip to content

Commit

Permalink
Companion: make emitSuccess and emitError private (transloadit#3832)
Browse files Browse the repository at this point in the history
* remove redundant extraData from error

also make method private

* revert breaking change

* Update Uploader.js
  • Loading branch information
mifi committed Jun 27, 2022
1 parent 4c9d4ce commit 14dc9c6
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/server/Uploader.js
Expand Up @@ -293,15 +293,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}`)
Expand Down Expand Up @@ -458,7 +458,7 @@ class Uploader {
* @param {string} url
* @param {object} extraData
*/
emitSuccess (url, extraData) {
#emitSuccess (url, extraData) {
const emitData = {
action: 'success',
payload: { ...extraData, complete: true, url },
Expand All @@ -471,9 +471,10 @@ 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
// 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',
Expand Down

0 comments on commit 14dc9c6

Please sign in to comment.