Merge remote-tracking branch 'origin/master' into feat/ci-demo

Author: carsonxu

CHANGELOG.md

@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+## [v2.10.7](https://github.com/tencentyun/cos-nodejs-sdk-v5/compare/v2.10.6...v2.10.7) - 2021-11-09
+
+fix：高级上传增加容错处理
+
+### Merged
+
+- fix：uploadFIle容错处理 [`#114`](https://github.com/tencentyun/cos-nodejs-sdk-v5/pull/114)
+- Fix：修复类型定义中getObject方法的options不包含Range选项的问题 [`#99`](https://github.com/tencentyun/cos-nodejs-sdk-v5/pull/99)
+
+### Commits
+
+- fix：优化uploadFile、uploadFIles文件路径不正确场景 [`96f810b`](https://github.com/tencentyun/cos-nodejs-sdk-v5/commit/96f810b47d73b37202ab118003356851eda17ef5)
+- Updated CHANGELOG.md [`02916b0`](https://github.com/tencentyun/cos-nodejs-sdk-v5/commit/02916b086bcd7406505bb0d67e0caecdbfb8e406)
+- fix：优化uploadFile、uploadFIles文件路径不正确场景 [`d8663a2`](https://github.com/tencentyun/cos-nodejs-sdk-v5/commit/d8663a20f6f99b28d306dd7f6718d54d1c907ecb)
+- bug fix：修复类型定义中getObject方法的options不包含Range选项的问题 [`37bda63`](https://github.com/tencentyun/cos-nodejs-sdk-v5/commit/37bda632c74f2e8a6bc044498a3a87d725268e2a)
+
 ## [v2.10.6](https://github.com/tencentyun/cos-nodejs-sdk-v5/compare/v2.10.5...v2.10.6) - 2021-10-22
 
 fix:修复COS.Util类型

index.d.ts

@@ -68,6 +68,8 @@ declare namespace COS {
   type Initiator = Owner;
   /** 单个授权信息 */
   type Grant = string;
+  /** RFC 2616 中定义的字节范围。 @see https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35 */
+  type Range = string;
   /** 被授权者信息与权限信息 */
   interface Grants {
     /** 所有者的信息 */
@@ -1150,6 +1152,8 @@ declare namespace COS {
   /** getObject 接口参数 */
   interface GetObjectParams extends ObjectParams {
     BodyType?: 'text' | 'blob' | 'arraybuffer',
+    /** 下载对象的指定范围字节。参见 RFC 2616 中定义的字节范围，see https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35。范围值必须使用 bytes=first-last 格式且仅支持单一范围，不支持多重范围。first 和 last 都是基于0开始的偏移量。例如 bytes=0-9 表示下载对象的开头10个字节的数据 ，如果不指定，则表示下载整个对象 */
+    Range?: Range;
     /** 写入流，可以传本地文件写入流 */
     Output?: Stream,
     /** 请求里的 Url Query 参数，传入该值中的 key/value 将会被 URLEncode */

sdk/advance.js

@@ -795,6 +795,9 @@ function uploadFile(params, callback) {
   var taskList = [];
 
   fs.stat(params.FilePath, function (err, stat) {
+      if (err) {
+          return callback(err);
+      }
 
       var isDir = stat.isDirectory();
       var FileSize = params.ContentLength = stat.size || 0;
@@ -871,9 +874,8 @@ function uploadFiles(params, callback) {
     var count = params.files.length;
     util.each(params.files, function (fileParams, index) {
         fs.stat(fileParams.FilePath, function (err, stat) {
-
-            var isDir = stat.isDirectory();
-            var FileSize = fileParams.ContentLength = stat.size || 0;
+            var isDir = stat ? stat.isDirectory() : false;
+            var FileSize = fileParams.ContentLength = stat ? stat.size : 0;
             var fileInfo = {Index: index, TaskId: ''};
 
             // 更新文件总大小

sdk/util.js

@@ -176,9 +176,12 @@ var md5 = function (str, encoding) {
 // 获取文件分片
 var fileSlice = function (FilePath, start, end, callback) {
     if (FilePath) {
-        var readStream = fs.createReadStream(FilePath, {start: start, end: end - 1});
-        readStream.isSdkCreated = true;
-        callback(readStream);
+        try {
+            var readStream = fs.createReadStream(FilePath, {start: start, end: end - 1});
+            readStream.isSdkCreated = true;
+            callback(readStream);
+        } catch(e) {
+        }
     } else {
         callback(null);
     }