Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Companion: make emitSuccess and emitError private #3832

Merged
merged 3 commits into from Jun 27, 2022
Merged

Companion: make emitSuccess and emitError private #3832

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51b21a9
remove redundant extraData from error
mifi Jun 15, 2022
1c6a906
revert breaking change
mifi Jun 16, 2022
e1aa263
Update Uploader.js
mifi Jun 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 6 additions & 8 deletions packages/@uppy/companion/src/server/Uploader.js
View file
Open in desktop
Expand Up @@ -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}`)
Expand Down Expand Up @@ -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 },
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion packages/@uppy/companion/test/__tests__/uploader.js
View file
Open in desktop
Expand Up @@ -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)
Expand Down