Mirrors/uppy
1
0
Fork 0
mirror of https://github.com/transloadit/uppy.git synced 2026-01-23 02:25:07 +00:00
Code Issues Projects Releases Wiki Activity

fix: hanging URL upload

Browse source
This commit is contained in:
Ifedapo Olarewaju 2018-06-13 14:52:24 +01:00
parent ba487a78e7
commit 8e13f416f7
3 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/plugins/AwsS3/Multipart.js
View file

@ -42,7 +42,7 @@ module.exports = class AwsS3Multipart extends Plugin {
this.type = 'uploader'
this.id = 'AwsS3Multipart'
this.title = 'AWS S3 Multipart'
this.server = new RequestClient(uppy, opts)
this.client = new RequestClient(uppy, opts)
const defaultOptions = {
timeout: 30 * 1000,
@ -97,7 +97,7 @@ module.exports = class AwsS3Multipart extends Plugin {
createMultipartUpload (file) {
this.assertHost()
return this.server.post('s3/multipart', {
return this.client.post('s3/multipart', {
filename: file.name,
type: file.type
}).then(assertServerError)
@ -107,7 +107,7 @@ module.exports = class AwsS3Multipart extends Plugin {
this.assertHost()
const filename = encodeURIComponent(key)
return this.server.get(`s3/multipart/${uploadId}?key=${filename}`)
return this.client.get(`s3/multipart/${uploadId}?key=${filename}`)
.then(assertServerError)
}
@ -115,7 +115,7 @@ module.exports = class AwsS3Multipart extends Plugin {
this.assertHost()
const filename = encodeURIComponent(key)
return this.server.get(`s3/multipart/${uploadId}/${number}?key=${filename}`)
return this.client.get(`s3/multipart/${uploadId}/${number}?key=${filename}`)
.then(assertServerError)
}
@ -124,7 +124,7 @@ module.exports = class AwsS3Multipart extends Plugin {
const filename = encodeURIComponent(key)
const uploadIdEnc = encodeURIComponent(uploadId)
return this.server.post(`s3/multipart/${uploadIdEnc}/complete?key=${filename}`, { parts })
return this.client.post(`s3/multipart/${uploadIdEnc}/complete?key=${filename}`, { parts })
.then(assertServerError)
}
@ -133,7 +133,7 @@ module.exports = class AwsS3Multipart extends Plugin {
const filename = encodeURIComponent(key)
const uploadIdEnc = encodeURIComponent(uploadId)
return this.server.delete(`s3/multipart/${uploadIdEnc}?key=${filename}`)
return this.client.delete(`s3/multipart/${uploadIdEnc}?key=${filename}`)
.then(assertServerError)
}

7
src/plugins/Tus.js
View file

@ -1,7 +1,7 @@
const Plugin = require('../core/Plugin')
const tus = require('tus-js-client')
const UppySocket = require('../core/UppySocket')
const Provider = require('../server/Provider')
const { Provider, RequestClient } = require('../server')
const {
emitSocketProgress,
getSocketHost,
@ -240,8 +240,9 @@ module.exports = class Tus extends Plugin {
}
this.uppy.emit('upload-started', file)
const provider = new Provider(this.uppy, file.remote.providerOptions)
provider.post(
const Client = file.remote.providerOptions.provider ? Provider : RequestClient
const client = new Client(this.uppy, file.remote.providerOptions)
client.post(
file.remote.url,
Object.assign({}, file.remote.body, {
endpoint: opts.endpoint,

7
src/plugins/Url/index.js
View file

@ -60,7 +60,7 @@ module.exports = class Url extends Plugin {
this.handlePaste = this.handlePaste.bind(this)
this.server = new RequestClient(uppy, {host: this.opts.host})
this.client = new RequestClient(uppy, {host: this.opts.host})
}
getFileNameFromUrl (url) {
@ -89,7 +89,7 @@ module.exports = class Url extends Plugin {
}
getMeta (url) {
return this.server.post('url/meta', { url })
return this.client.post('url/meta', { url })
.then((res) => {
if (res.error) {
this.uppy.log('[URL] Error:')
@ -127,7 +127,8 @@ module.exports = class Url extends Plugin {
body: {
fileId: url,
url: url
}
},
providerOptions: this.client.opts
}
}
return tagFile