Comparing version 6.15.2-parallel.1 to 6.15.2-parallel.2
@@ -198,37 +198,26 @@ const fs = require('fs'); | ||
const defaultParallel = 5; | ||
const defaultParallel = 50; | ||
const parallel = options.parallel || defaultParallel; | ||
if (this.checkBrowserAndVersion('Internet Explorer', '10') || parallel === 1) { | ||
for (let i = 0; i < todo.length; i++) { | ||
if (this.isCancel()) { | ||
throw this._makeCancelEvent(); | ||
} | ||
/* eslint no-await-in-loop: [0] */ | ||
await uploadPartJob(this, todo[i]); | ||
} | ||
} else { | ||
// upload in parallel | ||
const jobErr = await this._parallel(todo, parallel, | ||
value => new Promise((resolve, reject) => { | ||
uploadPartJob(that, value).then(res => { | ||
console.log(res, 'res'); | ||
resolve(); | ||
}).catch(reject); | ||
})); | ||
// upload in parallel | ||
const jobErr = await this._parallel(todo, parallel, | ||
value => new Promise((resolve, reject) => { | ||
uploadPartJob(that, value).then(() => { | ||
resolve(); | ||
}).catch(reject); | ||
})); | ||
const abortEvent = jobErr.find(err => err.name === 'abort'); | ||
if (abortEvent) throw abortEvent; | ||
const abortEvent = jobErr.find(err => err.name === 'abort'); | ||
if (abortEvent) throw abortEvent; | ||
if (this.isCancel()) { | ||
uploadPartJob = null; | ||
throw this._makeCancelEvent(); | ||
} | ||
if (this.isCancel()) { | ||
uploadPartJob = null; | ||
throw this._makeCancelEvent(); | ||
} | ||
if (jobErr && jobErr.length > 0) { | ||
jobErr[0].message = `Failed to upload some parts with error: ${jobErr[0].toString()} part_num: ${ | ||
jobErr[0].partNum | ||
}`; | ||
throw jobErr[0]; | ||
} | ||
if (jobErr && jobErr.length > 0) { | ||
jobErr[0].message = `Failed to upload some parts with error: ${jobErr[0].toString()} part_num: ${ | ||
jobErr[0].partNum | ||
}`; | ||
throw jobErr[0]; | ||
} | ||
@@ -235,0 +224,0 @@ |
{ | ||
"name": "ali-oss", | ||
"version": "6.15.2-parallel.1", | ||
"version": "6.15.2-parallel.2", | ||
"description": "aliyun oss(object storage service) node client", | ||
@@ -5,0 +5,0 @@ "main": "lib/client.js", |
2313255
43818