Skip to content

Commit 56c9899

Browse files
livehighlivehigh
authored
fix 1.4.2 (#75)
Co-authored-by: chrisftian <[email protected]>
1 parent e391a17 commit 56c9899

File tree

7 files changed

+42
-56
lines changed

7 files changed

+42
-56
lines changed

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

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6450,7 +6450,7 @@ module.exports = function(module) {
64506450
/*! exports provided: name, version, description, main, scripts, repository, author, license, dependencies, devDependencies, default */
64516451
/***/ (function(module) {
64526452

6453-
module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.4.1\",\"description\":\"小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)\",\"main\":\"demo/lib/cos-wx-sdk-v5.min.js\",\"scripts\":{\"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\"},\"repository\":{\"type\":\"git\",\"url\":\"http://github.com/tencentyun/cos-wx-sdk-v5.git\"},\"author\":\"carsonxu\",\"license\":\"ISC\",\"dependencies\":{\"mime\":\"^2.4.6\",\"@xmldom/xmldom\":\"^0.8.2\"},\"devDependencies\":{\"babel-core\":\"6.26.3\",\"babel-loader\":\"8.2.5\",\"@babel/preset-env\":\"7.16.11\",\"body-parser\":\"^1.18.3\",\"cross-env\":\"^7.0.3\",\"express\":\"^4.17.1\",\"qcloud-cos-sts\":\"^3.0.2\",\"terser-webpack-plugin\":\"4.2.3\",\"webpack\":\"4.46.0\",\"webpack-cli\":\"4.10.0\"}}");
6453+
module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.4.2\",\"description\":\"小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)\",\"main\":\"demo/lib/cos-wx-sdk-v5.min.js\",\"scripts\":{\"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\"},\"repository\":{\"type\":\"git\",\"url\":\"http://github.com/tencentyun/cos-wx-sdk-v5.git\"},\"author\":\"carsonxu\",\"license\":\"ISC\",\"dependencies\":{\"mime\":\"^2.4.6\",\"@xmldom/xmldom\":\"^0.8.2\"},\"devDependencies\":{\"babel-core\":\"6.26.3\",\"babel-loader\":\"8.2.5\",\"@babel/preset-env\":\"7.16.11\",\"body-parser\":\"^1.18.3\",\"cross-env\":\"^7.0.3\",\"express\":\"^4.17.1\",\"qcloud-cos-sts\":\"^3.0.2\",\"terser-webpack-plugin\":\"4.2.3\",\"webpack\":\"4.46.0\",\"webpack-cli\":\"4.10.0\"}}");
64546454

64556455
/***/ }),
64566456

@@ -7395,7 +7395,7 @@ function uploadFile(params, callback) {
73957395
}; // 上传链路
73967396

73977397
if (self.options.EnableTracker) {
7398-
var accelerate = self.options.UseAccelerate || self.options.Domain.includes('accelerate.');
7398+
var accelerate = self.options.UseAccelerate || typeof self.options.Domain === 'string' && self.options.Domain.includes('accelerate.');
73997399
params.tracker = new Tracker({
74007400
bucket: params.Bucket,
74017401
region: params.Region,
@@ -7487,7 +7487,7 @@ function uploadFiles(params, callback) {
74877487
TotalSize += FileSize; // 单个文件上传链路
74887488

74897489
if (self.options.EnableTracker) {
7490-
var accelerate = self.options.UseAccelerate || self.options.Domain.includes('accelerate.');
7490+
var accelerate = self.options.UseAccelerate || typeof self.options.Domain === 'string' && self.options.Domain.includes('accelerate.');
74917491
fileParams.tracker = new Tracker({
74927492
bucket: fileParams.Bucket,
74937493
region: fileParams.Region,
@@ -12731,7 +12731,8 @@ var Tracker = /*#__PURE__*/function () {
1273112731
deepTracker = opt.deepTracker;
1273212732
var appid = bucket && bucket.substr(bucket.lastIndexOf('-') + 1) || '';
1273312733
this.parent = parent;
12734-
this.deepTracker = deepTracker; // 上报用到的字段
12734+
this.deepTracker = deepTracker;
12735+
this.delay = delay; // 上报用到的字段
1273512736

1273612737
this.params = {
1273712738
// 通用字段
@@ -12888,19 +12889,19 @@ var Tracker = /*#__PURE__*/function () {
1288812889
}
1288912890

1289012891
var eventCode = getEventCode(this.params.name);
12891-
var formattedParams = formatParams(this.params);
12892-
console.log(eventCode, formattedParams);
12892+
var formattedParams = formatParams(this.params); // 兜底处理
12893+
12894+
if (!this.beacon) {
12895+
this.beacon = getBeacon(this.delay || 5000);
12896+
}
1289312897

1289412898
if (this.params.delay === 0) {
1289512899
// 实时上报
12896-
this.beacon.onDirectUserAction(eventCode, formattedParams);
12900+
this.beacon && this.beacon.onDirectUserAction(eventCode, formattedParams);
1289712901
} else {
1289812902
// 周期性上报
12899-
this.beacon.onUserAction(eventCode, formattedParams);
12900-
} // 上报结束即销毁
12901-
12902-
12903-
this.destroy();
12903+
this.beacon && this.beacon.onUserAction(eventCode, formattedParams);
12904+
}
1290412905
} // 生成子实例，与父所属一个链路，可用于分块上传内部流程上报单个分块操作
1290512906

1290612907
}, {
@@ -12917,13 +12918,6 @@ var Tracker = /*#__PURE__*/function () {
1291712918
delay: this.params.delay
1291812919
});
1291912920
return new Tracker(subParams);
12920-
} // 链路结束后销毁实例
12921-
12922-
}, {
12923-
key: "destroy",
12924-
value: function destroy() {
12925-
this.beacon = null;
12926-
this.params = {};
1292712921
}
1292812922
}]);
1292912923

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

Lines changed: 2 additions & 2 deletions
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: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6450,7 +6450,7 @@ module.exports = function(module) {
64506450
/*! exports provided: name, version, description, main, scripts, repository, author, license, dependencies, devDependencies, default */
64516451
/***/ (function(module) {
64526452

6453-
module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.4.1\",\"description\":\"小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)\",\"main\":\"demo/lib/cos-wx-sdk-v5.min.js\",\"scripts\":{\"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\"},\"repository\":{\"type\":\"git\",\"url\":\"http://github.com/tencentyun/cos-wx-sdk-v5.git\"},\"author\":\"carsonxu\",\"license\":\"ISC\",\"dependencies\":{\"mime\":\"^2.4.6\",\"@xmldom/xmldom\":\"^0.8.2\"},\"devDependencies\":{\"babel-core\":\"6.26.3\",\"babel-loader\":\"8.2.5\",\"@babel/preset-env\":\"7.16.11\",\"body-parser\":\"^1.18.3\",\"cross-env\":\"^7.0.3\",\"express\":\"^4.17.1\",\"qcloud-cos-sts\":\"^3.0.2\",\"terser-webpack-plugin\":\"4.2.3\",\"webpack\":\"4.46.0\",\"webpack-cli\":\"4.10.0\"}}");
6453+
module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.4.2\",\"description\":\"小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)\",\"main\":\"demo/lib/cos-wx-sdk-v5.min.js\",\"scripts\":{\"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\"},\"repository\":{\"type\":\"git\",\"url\":\"http://github.com/tencentyun/cos-wx-sdk-v5.git\"},\"author\":\"carsonxu\",\"license\":\"ISC\",\"dependencies\":{\"mime\":\"^2.4.6\",\"@xmldom/xmldom\":\"^0.8.2\"},\"devDependencies\":{\"babel-core\":\"6.26.3\",\"babel-loader\":\"8.2.5\",\"@babel/preset-env\":\"7.16.11\",\"body-parser\":\"^1.18.3\",\"cross-env\":\"^7.0.3\",\"express\":\"^4.17.1\",\"qcloud-cos-sts\":\"^3.0.2\",\"terser-webpack-plugin\":\"4.2.3\",\"webpack\":\"4.46.0\",\"webpack-cli\":\"4.10.0\"}}");
64546454

64556455
/***/ }),
64566456

@@ -7395,7 +7395,7 @@ function uploadFile(params, callback) {
73957395
}; // 上传链路
73967396

73977397
if (self.options.EnableTracker) {
7398-
var accelerate = self.options.UseAccelerate || self.options.Domain.includes('accelerate.');
7398+
var accelerate = self.options.UseAccelerate || typeof self.options.Domain === 'string' && self.options.Domain.includes('accelerate.');
73997399
params.tracker = new Tracker({
74007400
bucket: params.Bucket,
74017401
region: params.Region,
@@ -7487,7 +7487,7 @@ function uploadFiles(params, callback) {
74877487
TotalSize += FileSize; // 单个文件上传链路
74887488

74897489
if (self.options.EnableTracker) {
7490-
var accelerate = self.options.UseAccelerate || self.options.Domain.includes('accelerate.');
7490+
var accelerate = self.options.UseAccelerate || typeof self.options.Domain === 'string' && self.options.Domain.includes('accelerate.');
74917491
fileParams.tracker = new Tracker({
74927492
bucket: fileParams.Bucket,
74937493
region: fileParams.Region,
@@ -12731,7 +12731,8 @@ var Tracker = /*#__PURE__*/function () {
1273112731
deepTracker = opt.deepTracker;
1273212732
var appid = bucket && bucket.substr(bucket.lastIndexOf('-') + 1) || '';
1273312733
this.parent = parent;
12734-
this.deepTracker = deepTracker; // 上报用到的字段
12734+
this.deepTracker = deepTracker;
12735+
this.delay = delay; // 上报用到的字段
1273512736

1273612737
this.params = {
1273712738
// 通用字段
@@ -12888,19 +12889,19 @@ var Tracker = /*#__PURE__*/function () {
1288812889
}
1288912890

1289012891
var eventCode = getEventCode(this.params.name);
12891-
var formattedParams = formatParams(this.params);
12892-
console.log(eventCode, formattedParams);
12892+
var formattedParams = formatParams(this.params); // 兜底处理
12893+
12894+
if (!this.beacon) {
12895+
this.beacon = getBeacon(this.delay || 5000);
12896+
}
1289312897

1289412898
if (this.params.delay === 0) {
1289512899
// 实时上报
12896-
this.beacon.onDirectUserAction(eventCode, formattedParams);
12900+
this.beacon && this.beacon.onDirectUserAction(eventCode, formattedParams);
1289712901
} else {
1289812902
// 周期性上报
12899-
this.beacon.onUserAction(eventCode, formattedParams);
12900-
} // 上报结束即销毁
12901-
12902-
12903-
this.destroy();
12903+
this.beacon && this.beacon.onUserAction(eventCode, formattedParams);
12904+
}
1290412905
} // 生成子实例，与父所属一个链路，可用于分块上传内部流程上报单个分块操作
1290512906

1290612907
}, {
@@ -12917,13 +12918,6 @@ var Tracker = /*#__PURE__*/function () {
1291712918
delay: this.params.delay
1291812919
});
1291912920
return new Tracker(subParams);
12920-
} // 链路结束后销毁实例
12921-
12922-
}, {
12923-
key: "destroy",
12924-
value: function destroy() {
12925-
this.beacon = null;
12926-
this.params = {};
1292712921
}
1292812922
}]);
1292912923

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

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cos-wx-sdk-v5",
3-
"version": "1.4.1",
3+
"version": "1.4.2",
44
"description": "小程序 SDK for [腾讯云对象存储服务](https://cloud.tencent.com/product/cos)",
55
"main": "demo/lib/cos-wx-sdk-v5.min.js",
66
"scripts": {

‎src/advance.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ function uploadFile(params, callback) {
855855

856856
// 上传链路
857857
if (self.options.EnableTracker) {
858-
const accelerate = self.options.UseAccelerate || self.options.Domain.includes('accelerate.');
858+
const accelerate = self.options.UseAccelerate || (typeof self.options.Domain === 'string' && self.options.Domain.includes('accelerate.'))
859859
params.tracker = new Tracker({
860860
bucket: params.Bucket,
861861
region: params.Region,
@@ -945,7 +945,7 @@ function uploadFiles(params, callback) {
945945

946946
// 单个文件上传链路
947947
if (self.options.EnableTracker) {
948-
const accelerate = self.options.UseAccelerate || self.options.Domain.includes('accelerate.');
948+
const accelerate = self.options.UseAccelerate || (typeof self.options.Domain === 'string' && self.options.Domain.includes('accelerate.'));
949949
fileParams.tracker = new Tracker({
950950
bucket: fileParams.Bucket,
951951
region: fileParams.Region,

‎src/tracker.js‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ class Tracker {
147147
const appid = bucket && bucket.substr(bucket.lastIndexOf('-') + 1) || '';
148148
this.parent = parent;
149149
this.deepTracker = deepTracker;
150+
this.delay = delay;
150151
// 上报用到的字段
151152
this.params = {
152153
// 通用字段
@@ -252,16 +253,19 @@ class Tracker {
252253
}
253254
const eventCode = getEventCode(this.params.name);
254255
const formattedParams = formatParams(this.params);
255-
console.log(eventCode, formattedParams);
256+
257+
// 兜底处理
258+
if (!this.beacon) {
259+
this.beacon = getBeacon(this.delay || 5000);
260+
}
261+
256262
if (this.params.delay === 0) {
257263
// 实时上报
258-
this.beacon.onDirectUserAction(eventCode, formattedParams);
264+
this.beacon && this.beacon.onDirectUserAction(eventCode, formattedParams);
259265
} else {
260266
// 周期性上报
261-
this.beacon.onUserAction(eventCode, formattedParams);
267+
this.beacon && this.beacon.onUserAction(eventCode, formattedParams);
262268
}
263-
// 上报结束即销毁
264-
this.destroy();
265269
}
266270

267271
// 生成子实例，与父所属一个链路，可用于分块上传内部流程上报单个分块操作
@@ -278,12 +282,6 @@ class Tracker {
278282
});
279283
return new Tracker(subParams);
280284
}
281-
282-
// 链路结束后销毁实例
283-
destroy() {
284-
this.beacon = null;
285-
this.params = {};
286-
}
287285
}
288286

289287
module.exports = Tracker;

0 commit comments

Comments
 (0)