Skip to content

Commit cd27e23

Browse files
committed
Merge branch 'master' of https://github.com/tencentyun/cos-nodejs-sdk-v5 into feat/getObjectUrl-headers
2 parents 9404c69 + 709c2bc commit cd27e23

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

CHANGELOG.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
99

10-
## [v2.9.18](https://github.com/tencentyun/cos-nodejs-sdk-v5/compare/v2.9.17...v2.9.18) - 2021-06-03
10+
## [v2.9.19](https://github.com/tencentyun/cos-nodejs-sdk-v5/compare/v2.9.18...v2.9.19) - 2021-06-11
11+
12+
- 新增高级上传接口
13+
14+
### Merged
15+
16+
- feat:新增高级上传接口 [`#107`](https://github.com/tencentyun/cos-nodejs-sdk-v5/pull/107)
17+
18+
### Commits
19+
20+
- Updated CHANGELOG.md [`9c7a452`](https://github.com/tencentyun/cos-nodejs-sdk-v5/commit/9c7a45254c9f9594fcf25f1d64cf78c9085180c2)
21+
- add crc64 demo [`091cc91`](https://github.com/tencentyun/cos-nodejs-sdk-v5/commit/091cc915087d48f803f4c709da710735275512df)
22+
23+
## [v2.9.18](https://github.com/tencentyun/cos-nodejs-sdk-v5/compare/v2.9.17...v2.9.18) - 2021-06-04
1124

1225
-demo新增简单上传base64内容文件
1326
-sliceUploadFile方法新增返回值UploadId

index.d.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ declare namespace COS {
178178
FollowRedirect?: boolean,
179179
/** 是否使用全球加速域名。开启该配置后仅以下接口支持操作:putObject、getObject、headObject、optionsObject、multipartInit、multipartListPart、multipartUpload、multipartAbort、multipartComplete、multipartList、sliceUploadFile、uploadFiles */
180180
UseAccelerate?: boolean,
181+
/** 是否开启长链接,默认开启 */
182+
KeepAlive?: boolean,
181183
/** 获取签名的回调方法,如果没有 SecretId、SecretKey 时,必选 */
182184
getAuthorization?: (
183185
options: GetAuthorizationOptions,
@@ -751,7 +753,7 @@ declare namespace COS {
751753
/** 指定通用错误文档的对象键,当发生错误且未命中重定向规则中的错误码重定向时,将返回该对象键的内容 */
752754
Key: Key,
753755
/** 用于配置命中错误文档的 HTTP 状态码,可选值为 Enabled 或 Disabled,默认为 Enabled */
754-
OriginalHttpStatus?: 'Enabled' | 'Disabled,默认为'
756+
OriginalHttpStatus?: 'Enabled' | 'Disabled'
755757
},
756758
/** 重定向规则配置,最多设置100条 RoutingRule */
757759
RoutingRules?: {

sdk/base.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3452,6 +3452,8 @@ function allowRetry(err) {
34523452
}
34533453
} else if (Math.floor(err.statusCode / 100) === 5) {
34543454
allowRetry = true;
3455+
} else if (err.code === 'ECONNRESET') {
3456+
allowRetry = true;
34553457
}
34563458
}
34573459
return allowRetry;

0 commit comments

Comments
 (0)