Skip to content

Commit 57d011f

Browse files
livehighlivehigh
committed
Merge branch 'master' into dev/strictSign
2 parents 63216c1 + cd11a33 commit 57d011f

File tree

12 files changed

+94
-38
lines changed

12 files changed

+94
-38
lines changed

‎.npmignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
.vscode/
21
.idea/
2+
.vscode/
33
.github/
44
coverage/
55
demo/
66
demo-album/
77
server/
8+
patches/
89
.babelrc
910
.prettierrc
1011
build.js

‎CHANGELOG.md‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,28 @@ 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+
## [v1.7.2](https://github.com/tencentyun/cos-wx-sdk-v5/compare/v1.7.1...v1.7.2) - 2024-07-25
11+
12+
feat
13+
- 初始化支持传入临时密钥
14+
- 更换 xml 解析库
15+
- 新增重试请求头部
16+
17+
### Merged
18+
19+
- Dev/1.7.2 [`#105`](https://github.com/tencentyun/cos-wx-sdk-v5/pull/105)
20+
21+
### Commits
22+
23+
- fix: 优化 sts 指引 [`e184f75`](https://github.com/tencentyun/cos-wx-sdk-v5/commit/e184f7508085f692c75e3782cdf7dd91da029a2b)
24+
- fix: demo 优化 [`2ee89e3`](https://github.com/tencentyun/cos-wx-sdk-v5/commit/2ee89e38f36208ad1f439e14ba8cc4c45ed6dce3)
25+
- Updated CHANGELOG.md [`4d9c82a`](https://github.com/tencentyun/cos-wx-sdk-v5/commit/4d9c82ae2701336a95a8f30fe88ac56ff4010641)
26+
1027
## [v1.7.1](https://github.com/tencentyun/cos-wx-sdk-v5/compare/v1.7.0...v1.7.1) - 2024-06-12
1128

1229
feat
13-
- 支持万象智能检索接口
30+
- 支持万象智能检索接口
31+
- sliceUploadFile 支持上传时图片处理
1432

1533
### Merged
1634

@@ -412,8 +430,6 @@ feat
412430

413431
## [v1.1.1](https://github.com/tencentyun/cos-wx-sdk-v5/compare/v1.1.0...v1.1.1) - 2021-11-18
414432

415-
fix：CIHost兼容处理
416-
417433
## [v1.1.0](https://github.com/tencentyun/cos-wx-sdk-v5/compare/v1.0.13...v1.1.0) - 2021-11-17
418434

419435
### Merged

‎demo-album/lib/cos-wx-sdk-v5.js‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5909,7 +5909,7 @@ module.exports = function(module) {
59095909
/*! exports provided: name, version, description, main, scripts, repository, author, license, dependencies, devDependencies, default */
59105910
/***/ (function(module) {
59115911

5912-
module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.9.0-beta.0\",\"description\":\"小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)\",\"main\":\"dist/cos-wx-sdk-v5.min.js\",\"scripts\":{\"prettier\":\"prettier --write src demo/demo-sdk.js demo/test.js demo/ciDemo\",\"dev\":\"cross-env NODE_ENV=development node build.js --mode=development\",\"build\":\"cross-env NODE_ENV=production node build.js --mode=production\",\"sts.js\":\"node server/sts.js\",\"postinstall\":\"patch-package\"},\"repository\":{\"type\":\"git\",\"url\":\"http://github.com/tencentyun/cos-wx-sdk-v5.git\"},\"author\":\"carsonxu\",\"license\":\"ISC\",\"dependencies\":{\"fast-xml-parser\":\"4.5.0\",\"mime\":\"^2.4.6\"},\"devDependencies\":{\"@babel/core\":\"7.17.9\",\"@babel/preset-env\":\"7.16.11\",\"babel-loader\":\"8.2.5\",\"body-parser\":\"^1.18.3\",\"cross-env\":\"^7.0.3\",\"express\":\"^4.17.1\",\"patch-package\":\"^8.0.0\",\"prettier\":\"^3.0.1\",\"qcloud-cos-sts\":\"^3.0.2\",\"terser-webpack-plugin\":\"4.2.3\",\"webpack\":\"4.46.0\",\"webpack-cli\":\"4.10.0\"}}");
5912+
module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.9.0-beta.1\",\"description\":\"小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)\",\"main\":\"dist/cos-wx-sdk-v5.min.js\",\"scripts\":{\"prettier\":\"prettier --write src demo/demo-sdk.js demo/test.js demo/ciDemo\",\"dev\":\"cross-env NODE_ENV=development node build.js --mode=development\",\"build\":\"cross-env NODE_ENV=production node build.js --mode=production\",\"sts.js\":\"node server/sts.js\",\"postinstall\":\"node scripts/patch-check.js\"},\"repository\":{\"type\":\"git\",\"url\":\"http://github.com/tencentyun/cos-wx-sdk-v5.git\"},\"author\":\"carsonxu\",\"license\":\"ISC\",\"dependencies\":{\"fast-xml-parser\":\"4.5.0\",\"mime\":\"^2.4.6\"},\"devDependencies\":{\"@babel/core\":\"7.17.9\",\"@babel/preset-env\":\"7.16.11\",\"babel-loader\":\"8.2.5\",\"body-parser\":\"^1.18.3\",\"cross-env\":\"^7.0.3\",\"express\":\"^4.17.1\",\"patch-package\":\"^8.0.0\",\"prettier\":\"^3.0.1\",\"qcloud-cos-sts\":\"^3.0.2\",\"terser-webpack-plugin\":\"4.2.3\",\"webpack\":\"4.46.0\",\"webpack-cli\":\"4.10.0\"}}");
59135913

59145914
/***/ }),
59155915

@@ -10978,16 +10978,24 @@ function allowRetry(err) {
1097810978
canRetry = true;
1097910979
}
1098010980
} else if (Math.floor(err.statusCode / 100) === 5) {
10981-
canRetry = true;
10981+
return {
10982+
canRetry: true,
10983+
networkError: false
10984+
};
10985+
} else if (err.message === 'timeout') {
10986+
return {
10987+
canRetry: true,
10988+
networkError: self.options.AutoSwitchHost
10989+
};
1098210990
}
1098310991
/**
1098410992
* 归为网络错误
1098510993
* 1、no statusCode
1098610994
* 2、statusCode === 3xx || 4xx || 5xx && no requestId
1098710995
*/
1098810996
if (!err.statusCode) {
10989-
canRetry = self.options.AutoSwitchHost;
10990-
networkError = true;
10997+
canRetry = true;
10998+
networkError = self.options.AutoSwitchHost;
1099110999
} else {
1099211000
var statusCode = Math.floor(err.statusCode / 100);
1099311001
var requestId = (err === null || err === void 0 ? void 0 : err.headers) && (err === null || err === void 0 ? void 0 : err.headers['x-cos-request-id']);
@@ -11122,7 +11130,7 @@ function submitRequest(params, callback) {
1112211130
tracker && tracker.setParams({
1112311131
httpEndTime: new Date().getTime()
1112411132
});
11125-
if (err && tryTimes < 2 && canRetry) {
11133+
if (err && tryTimes < 4 && canRetry) {
1112611134
if (params.headers) {
1112711135
delete params.headers.Authorization;
1112811136
delete params.headers['token'];
@@ -11138,8 +11146,8 @@ function submitRequest(params, callback) {
1113811146
networkError: networkError
1113911147
});
1114011148
params.SwitchHost = switchHost;
11141-
// 重试时增加请求头
11142-
params.headers['x-cos-sdk-retry'] = true;
11149+
// 重试时增加请求头，小程序里传字符串类型
11150+
params.headers['x-cos-sdk-retry'] = 'true';
1114311151
next(tryTimes + 1);
1114411152
} else {
1114511153
callback(err, data);

‎demo-album/lib/cos-wx-sdk-v5.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/lib/cos-wx-sdk-v5.js‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5909,7 +5909,7 @@ module.exports = function(module) {
59095909
/*! exports provided: name, version, description, main, scripts, repository, author, license, dependencies, devDependencies, default */
59105910
/***/ (function(module) {
59115911

5912-
module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.9.0-beta.0\",\"description\":\"小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)\",\"main\":\"dist/cos-wx-sdk-v5.min.js\",\"scripts\":{\"prettier\":\"prettier --write src demo/demo-sdk.js demo/test.js demo/ciDemo\",\"dev\":\"cross-env NODE_ENV=development node build.js --mode=development\",\"build\":\"cross-env NODE_ENV=production node build.js --mode=production\",\"sts.js\":\"node server/sts.js\",\"postinstall\":\"patch-package\"},\"repository\":{\"type\":\"git\",\"url\":\"http://github.com/tencentyun/cos-wx-sdk-v5.git\"},\"author\":\"carsonxu\",\"license\":\"ISC\",\"dependencies\":{\"fast-xml-parser\":\"4.5.0\",\"mime\":\"^2.4.6\"},\"devDependencies\":{\"@babel/core\":\"7.17.9\",\"@babel/preset-env\":\"7.16.11\",\"babel-loader\":\"8.2.5\",\"body-parser\":\"^1.18.3\",\"cross-env\":\"^7.0.3\",\"express\":\"^4.17.1\",\"patch-package\":\"^8.0.0\",\"prettier\":\"^3.0.1\",\"qcloud-cos-sts\":\"^3.0.2\",\"terser-webpack-plugin\":\"4.2.3\",\"webpack\":\"4.46.0\",\"webpack-cli\":\"4.10.0\"}}");
5912+
module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.9.0-beta.1\",\"description\":\"小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)\",\"main\":\"dist/cos-wx-sdk-v5.min.js\",\"scripts\":{\"prettier\":\"prettier --write src demo/demo-sdk.js demo/test.js demo/ciDemo\",\"dev\":\"cross-env NODE_ENV=development node build.js --mode=development\",\"build\":\"cross-env NODE_ENV=production node build.js --mode=production\",\"sts.js\":\"node server/sts.js\",\"postinstall\":\"node scripts/patch-check.js\"},\"repository\":{\"type\":\"git\",\"url\":\"http://github.com/tencentyun/cos-wx-sdk-v5.git\"},\"author\":\"carsonxu\",\"license\":\"ISC\",\"dependencies\":{\"fast-xml-parser\":\"4.5.0\",\"mime\":\"^2.4.6\"},\"devDependencies\":{\"@babel/core\":\"7.17.9\",\"@babel/preset-env\":\"7.16.11\",\"babel-loader\":\"8.2.5\",\"body-parser\":\"^1.18.3\",\"cross-env\":\"^7.0.3\",\"express\":\"^4.17.1\",\"patch-package\":\"^8.0.0\",\"prettier\":\"^3.0.1\",\"qcloud-cos-sts\":\"^3.0.2\",\"terser-webpack-plugin\":\"4.2.3\",\"webpack\":\"4.46.0\",\"webpack-cli\":\"4.10.0\"}}");
59135913

59145914
/***/ }),
59155915

@@ -10978,16 +10978,24 @@ function allowRetry(err) {
1097810978
canRetry = true;
1097910979
}
1098010980
} else if (Math.floor(err.statusCode / 100) === 5) {
10981-
canRetry = true;
10981+
return {
10982+
canRetry: true,
10983+
networkError: false
10984+
};
10985+
} else if (err.message === 'timeout') {
10986+
return {
10987+
canRetry: true,
10988+
networkError: self.options.AutoSwitchHost
10989+
};
1098210990
}
1098310991
/**
1098410992
* 归为网络错误
1098510993
* 1、no statusCode
1098610994
* 2、statusCode === 3xx || 4xx || 5xx && no requestId
1098710995
*/
1098810996
if (!err.statusCode) {
10989-
canRetry = self.options.AutoSwitchHost;
10990-
networkError = true;
10997+
canRetry = true;
10998+
networkError = self.options.AutoSwitchHost;
1099110999
} else {
1099211000
var statusCode = Math.floor(err.statusCode / 100);
1099311001
var requestId = (err === null || err === void 0 ? void 0 : err.headers) && (err === null || err === void 0 ? void 0 : err.headers['x-cos-request-id']);
@@ -11122,7 +11130,7 @@ function submitRequest(params, callback) {
1112211130
tracker && tracker.setParams({
1112311131
httpEndTime: new Date().getTime()
1112411132
});
11125-
if (err && tryTimes < 2 && canRetry) {
11133+
if (err && tryTimes < 4 && canRetry) {
1112611134
if (params.headers) {
1112711135
delete params.headers.Authorization;
1112811136
delete params.headers['token'];
@@ -11138,8 +11146,8 @@ function submitRequest(params, callback) {
1113811146
networkError: networkError
1113911147
});
1114011148
params.SwitchHost = switchHost;
11141-
// 重试时增加请求头
11142-
params.headers['x-cos-sdk-retry'] = true;
11149+
// 重试时增加请求头，小程序里传字符串类型
11150+
params.headers['x-cos-sdk-retry'] = 'true';
1114311151
next(tryTimes + 1);
1114411152
} else {
1114511153
callback(err, data);

‎demo/lib/cos-wx-sdk-v5.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/cos-wx-sdk-v5.js‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5909,7 +5909,7 @@ module.exports = function(module) {
59095909
/*! exports provided: name, version, description, main, scripts, repository, author, license, dependencies, devDependencies, default */
59105910
/***/ (function(module) {
59115911

5912-
module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.9.0-beta.0\",\"description\":\"小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)\",\"main\":\"dist/cos-wx-sdk-v5.min.js\",\"scripts\":{\"prettier\":\"prettier --write src demo/demo-sdk.js demo/test.js demo/ciDemo\",\"dev\":\"cross-env NODE_ENV=development node build.js --mode=development\",\"build\":\"cross-env NODE_ENV=production node build.js --mode=production\",\"sts.js\":\"node server/sts.js\",\"postinstall\":\"patch-package\"},\"repository\":{\"type\":\"git\",\"url\":\"http://github.com/tencentyun/cos-wx-sdk-v5.git\"},\"author\":\"carsonxu\",\"license\":\"ISC\",\"dependencies\":{\"fast-xml-parser\":\"4.5.0\",\"mime\":\"^2.4.6\"},\"devDependencies\":{\"@babel/core\":\"7.17.9\",\"@babel/preset-env\":\"7.16.11\",\"babel-loader\":\"8.2.5\",\"body-parser\":\"^1.18.3\",\"cross-env\":\"^7.0.3\",\"express\":\"^4.17.1\",\"patch-package\":\"^8.0.0\",\"prettier\":\"^3.0.1\",\"qcloud-cos-sts\":\"^3.0.2\",\"terser-webpack-plugin\":\"4.2.3\",\"webpack\":\"4.46.0\",\"webpack-cli\":\"4.10.0\"}}");
5912+
module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.9.0-beta.1\",\"description\":\"小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)\",\"main\":\"dist/cos-wx-sdk-v5.min.js\",\"scripts\":{\"prettier\":\"prettier --write src demo/demo-sdk.js demo/test.js demo/ciDemo\",\"dev\":\"cross-env NODE_ENV=development node build.js --mode=development\",\"build\":\"cross-env NODE_ENV=production node build.js --mode=production\",\"sts.js\":\"node server/sts.js\",\"postinstall\":\"node scripts/patch-check.js\"},\"repository\":{\"type\":\"git\",\"url\":\"http://github.com/tencentyun/cos-wx-sdk-v5.git\"},\"author\":\"carsonxu\",\"license\":\"ISC\",\"dependencies\":{\"fast-xml-parser\":\"4.5.0\",\"mime\":\"^2.4.6\"},\"devDependencies\":{\"@babel/core\":\"7.17.9\",\"@babel/preset-env\":\"7.16.11\",\"babel-loader\":\"8.2.5\",\"body-parser\":\"^1.18.3\",\"cross-env\":\"^7.0.3\",\"express\":\"^4.17.1\",\"patch-package\":\"^8.0.0\",\"prettier\":\"^3.0.1\",\"qcloud-cos-sts\":\"^3.0.2\",\"terser-webpack-plugin\":\"4.2.3\",\"webpack\":\"4.46.0\",\"webpack-cli\":\"4.10.0\"}}");
59135913

59145914
/***/ }),
59155915

@@ -10978,16 +10978,24 @@ function allowRetry(err) {
1097810978
canRetry = true;
1097910979
}
1098010980
} else if (Math.floor(err.statusCode / 100) === 5) {
10981-
canRetry = true;
10981+
return {
10982+
canRetry: true,
10983+
networkError: false
10984+
};
10985+
} else if (err.message === 'timeout') {
10986+
return {
10987+
canRetry: true,
10988+
networkError: self.options.AutoSwitchHost
10989+
};
1098210990
}
1098310991
/**
1098410992
* 归为网络错误
1098510993
* 1、no statusCode
1098610994
* 2、statusCode === 3xx || 4xx || 5xx && no requestId
1098710995
*/
1098810996
if (!err.statusCode) {
10989-
canRetry = self.options.AutoSwitchHost;
10990-
networkError = true;
10997+
canRetry = true;
10998+
networkError = self.options.AutoSwitchHost;
1099110999
} else {
1099211000
var statusCode = Math.floor(err.statusCode / 100);
1099311001
var requestId = (err === null || err === void 0 ? void 0 : err.headers) && (err === null || err === void 0 ? void 0 : err.headers['x-cos-request-id']);
@@ -11122,7 +11130,7 @@ function submitRequest(params, callback) {
1112211130
tracker && tracker.setParams({
1112311131
httpEndTime: new Date().getTime()
1112411132
});
11125-
if (err && tryTimes < 2 && canRetry) {
11133+
if (err && tryTimes < 4 && canRetry) {
1112611134
if (params.headers) {
1112711135
delete params.headers.Authorization;
1112811136
delete params.headers['token'];
@@ -11138,8 +11146,8 @@ function submitRequest(params, callback) {
1113811146
networkError: networkError
1113911147
});
1114011148
params.SwitchHost = switchHost;
11141-
// 重试时增加请求头
11142-
params.headers['x-cos-sdk-retry'] = true;
11149+
// 重试时增加请求头，小程序里传字符串类型
11150+
params.headers['x-cos-sdk-retry'] = 'true';
1114311151
next(tryTimes + 1);
1114411152
} else {
1114511153
callback(err, data);

‎dist/cos-wx-sdk-v5.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "cos-wx-sdk-v5",
3-
"version": "1.9.0-beta.0",
3+
"version": "1.9.0-beta.1",
44
"description": "小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)",
55
"main": "dist/cos-wx-sdk-v5.min.js",
66
"scripts": {
77
"prettier": "prettier --write src demo/demo-sdk.js demo/test.js demo/ciDemo",
88
"dev": "cross-env NODE_ENV=development node build.js --mode=development",
99
"build": "cross-env NODE_ENV=production node build.js --mode=production",
1010
"sts.js": "node server/sts.js",
11-
"postinstall": "patch-package"
11+
"postinstall": "node scripts/patch-check.js"
1212
},
1313
"repository": {
1414
"type": "git",

‎scripts/patch-check.js‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
const fs = require('fs');
2+
const path = require('path');
3+
const exec = require('child_process').execSync;
4+
5+
const patchesDir = path.join(__dirname, '../patches');
6+
const hasPatches = fs.existsSync(patchesDir);
7+
8+
if (hasPatches) {
9+
// 执行补丁
10+
console.log('npx patch-package');
11+
exec('npx patch-package', { stdio: 'inherit' });
12+
} else {
13+
console.log('无补丁应用');
14+
}

0 commit comments

Comments
 (0)