cos-nodejs-sdk-v5
Advanced tools
Comparing version 2.13.1 to 2.13.2
{ | ||
"name": "cos-nodejs-sdk-v5", | ||
"version": "2.13.1", | ||
"version": "2.13.2", | ||
"description": "cos nodejs sdk v5", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -974,56 +974,66 @@ var session = require('./session'); | ||
util.each(params.files, function (fileParams, index) { | ||
fs.stat(fileParams.FilePath, function (err, stat) { | ||
var isDir = stat ? stat.isDirectory() : false; | ||
var FileSize = (fileParams.ContentLength = stat ? stat.size : 0); | ||
var fileInfo = { Index: index, TaskId: '' }; | ||
var isDir = false; | ||
var FileSize = 0; | ||
if (fileParams.Body) { | ||
util.getFileSize('putObject', fileParams, function (err, size) { | ||
FileSize = fileParams.ContentLengt = size; | ||
}); | ||
} else if (fileParams.FilePath) { | ||
var stat; | ||
try { | ||
stat = fs.statSync(fileParams.FilePath); | ||
} catch (e) {} | ||
isDir = stat ? stat.isDirectory() : false; | ||
FileSize = fileParams.ContentLength = stat ? stat.size : 0; | ||
} | ||
var fileInfo = { Index: index, TaskId: '' }; | ||
// 更新文件总大小 | ||
TotalSize += FileSize; | ||
// 更新文件总大小 | ||
TotalSize += FileSize; | ||
// 整理 option,用于返回给回调 | ||
util.each(fileParams, function (v, k) { | ||
if (typeof v !== 'object' && typeof v !== 'function') { | ||
fileInfo[k] = v; | ||
} | ||
}); | ||
// 整理 option,用于返回给回调 | ||
util.each(fileParams, function (v, k) { | ||
if (typeof v !== 'object' && typeof v !== 'function') { | ||
fileInfo[k] = v; | ||
} | ||
}); | ||
// 处理单个文件 TaskReady | ||
var _onTaskReady = fileParams.onTaskReady; | ||
var onTaskReady = function (tid) { | ||
fileInfo.TaskId = tid; | ||
_onTaskReady && _onTaskReady(tid); | ||
}; | ||
fileParams.onTaskReady = onTaskReady; | ||
// 处理单个文件 TaskReady | ||
var _onTaskReady = fileParams.onTaskReady; | ||
var onTaskReady = function (tid) { | ||
fileInfo.TaskId = tid; | ||
_onTaskReady && _onTaskReady(tid); | ||
}; | ||
fileParams.onTaskReady = onTaskReady; | ||
// 处理单个文件进度 | ||
var PreAddSize = 0; | ||
var _onProgress = fileParams.onProgress; | ||
var onProgress = function (info) { | ||
TotalFinish = TotalFinish - PreAddSize + info.loaded; | ||
PreAddSize = info.loaded; | ||
_onProgress && _onProgress(info); | ||
onTotalProgress({ loaded: TotalFinish, total: TotalSize }); | ||
}; | ||
fileParams.onProgress = onProgress; | ||
// 处理单个文件进度 | ||
var PreAddSize = 0; | ||
var _onProgress = fileParams.onProgress; | ||
var onProgress = function (info) { | ||
TotalFinish = TotalFinish - PreAddSize + info.loaded; | ||
PreAddSize = info.loaded; | ||
_onProgress && _onProgress(info); | ||
onTotalProgress({ loaded: TotalFinish, total: TotalSize }); | ||
}; | ||
fileParams.onProgress = onProgress; | ||
// 处理单个文件完成 | ||
var _onFileFinish = fileParams.onFileFinish; | ||
var onFileFinish = function (err, data) { | ||
_onFileFinish && _onFileFinish(err, data); | ||
onTotalFileFinish && onTotalFileFinish(err, data, fileInfo); | ||
}; | ||
// 处理单个文件完成 | ||
var _onFileFinish = fileParams.onFileFinish; | ||
var onFileFinish = function (err, data) { | ||
_onFileFinish && _onFileFinish(err, data); | ||
onTotalFileFinish && onTotalFileFinish(err, data, fileInfo); | ||
}; | ||
// 添加上传任务 | ||
var api = FileSize <= SliceSize || isDir ? 'putObject' : 'sliceUploadFile'; | ||
if (api === 'putObject') { | ||
fileParams.Body = isDir ? '' : fs.createReadStream(fileParams.FilePath); | ||
fileParams.Body.isSdkCreated = true; | ||
} | ||
taskList.push({ | ||
api: api, | ||
params: fileParams, | ||
callback: onFileFinish, | ||
}); | ||
--count === 0 && self._addTasks(taskList); | ||
// 添加上传任务,传入 Body 则只支持简单上传 | ||
var api = FileSize <= SliceSize || isDir || fileParams.Body ? 'putObject' : 'sliceUploadFile'; | ||
if (api === 'putObject' && fileParams.FilePath && !fileParams.Body) { | ||
fileParams.Body = isDir ? '' : fs.createReadStream(fileParams.FilePath); | ||
fileParams.Body.isSdkCreated = true; | ||
} | ||
taskList.push({ | ||
api: api, | ||
params: fileParams, | ||
callback: onFileFinish, | ||
}); | ||
--count === 0 && self._addTasks(taskList); | ||
}); | ||
@@ -1030,0 +1040,0 @@ } |
@@ -48,2 +48,3 @@ 'use strict'; | ||
AutoSwitchHost: true, | ||
CopySourceParser: null, // 自定义拷贝源解析器 | ||
// 动态秘钥,优先级Credentials > SecretId/SecretKey。注意Cred内是小写的secretId、secretKey | ||
@@ -50,0 +51,0 @@ Credentials: { |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Deprecated
MaintenanceThe maintainer of the package marked it as deprecated. This could indicate that a single version should not be used, or that the package is no longer maintained and any new vulnerabilities will not be fixed.
Found 1 instance in 1 package
871184
21609
1