cos-wx-sdk-v5 1.4.4 → 1.4.5

package/CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+## [v1.4.4](https://github.com/tencentyun/cos-wx-sdk-v5/compare/v1.4.3...v1.4.4) - 2022-10-20
+
+-  分块复制支持续传
+-  合法域名校验支持内网域名和.cn域名
+
+### Merged
+
+- feat1.4.4 [`#77`](https://github.com/tencentyun/cos-wx-sdk-v5/pull/77)
+
+### Commits
+
+- Updated CHANGELOG.md [`cdf8af6`](https://github.com/tencentyun/cos-wx-sdk-v5/commit/cdf8af65f6b44ae1ed8244655073b6e3003535a0)
+
 ## [v1.4.3](https://github.com/tencentyun/cos-wx-sdk-v5/compare/v1.4.2...v1.4.3) - 2022-09-22
 
 feat

package/demo/config.js

@@ -1,5 +1,5 @@
 module.exports = {
-    stsUrl: 'https://example.com/sts.php',
-    Bucket: 'test-1250000000',
-    Region: 'ap-guangzhou',
+  stsUrl: 'http://127.0.0.1:3000/sts',
+  Bucket: 'test-1300555317',
+  Region: 'ap-beijing',
 };

package/demo/demo-no-sdk.js

@@ -1,10 +1,15 @@
 var CosAuth = require('./lib/cos-auth');
 var config = require('./config');
 
+var ForcePathStyle = true;
 var uploadFile = function () {
     // 请求用到的参数
     // var prefix = 'https://cos.' + config.Region + '.myqcloud.com/' + config.Bucket + '/'; // 这个是后缀式，签名也要指定 Pathname: '/' + config.Bucket + '/'
     var prefix = 'https://' + config.Bucket + '.cos.' + config.Region + '.myqcloud.com/';
+    if (ForcePathStyle) {
+      // 后缀式请求在签名时域名使用地域域名，而不是存储桶域名，具体说明见本文上述“3.后缀式请求”
+          prefix = 'https://cos.' + config.Region + '.myqcloud.com/' + config.Bucket + '/'; 
+      }
 
     // 对更多字符编码的 url encode 格式
     var camSafeUrlEncode = function (str) {
@@ -93,13 +98,56 @@ var uploadFile = function () {
         });
     };
 
+    var putFile = function (filePath) {
+      var Key = filePath.substr(filePath.lastIndexOf('/') + 1); // 这里指定上传的文件名
+      var signPathname = '/' + Key; // PutObject 接口 Key 是放在 url 传输，所以请求路径和签名路径是 /Key
+        if (ForcePathStyle) {
+			  // 后缀式请求在签名时用的路径，要包含存储桶名称，具体说明见本文上述“3.后缀式请求”
+            signPathname = '/' + config.Bucket + '/' + Key;  
+        }
+      getAuthorization({Method: 'PUT', Pathname: signPathname}, function (AuthData) {
+        // 需要从文件临时路径读取出文件内容
+        var wxfs = wx.getFileSystemManager();
+        wxfs.readFile({
+          filePath: filePath,
+          success: function (fileRes) {
+            var requestTask = wx.request({
+              url: prefix + signPathname.substr(signPathname.lastIndexOf('/') + 1),
+              method: 'PUT',
+              header: {
+                'Authorization': AuthData.Authorization,
+                'x-cos-security-token': AuthData.XCosSecurityToken,
+              },
+              data: fileRes.data,
+              success: function success(res) {
+                var url = prefix + camSafeUrlEncode(Key).replace(/%2F/g, '/');
+                if (res.statusCode === 200) {
+                    wx.showModal({title: '上传成功', content: url, showCancel: false});
+                } else {
+                    wx.showModal({title: '上传失败', content: JSON.stringify(response), showCancel: false});
+                }
+                console.log(res.statusCode);
+                console.log(url);
+              },
+              fail: function fail(response) {
+                wx.showModal({title: '上传失败', content: JSON.stringify(response), showCancel: false});
+              },
+            });
+            requestTask.onProgressUpdate(function (res) {
+                console.log('正在进度:', res);
+            });
+          },
+        });
+      });
+  };
+
     // 选择文件
     wx.chooseImage({
         count: 1, // 默认9
         sizeType: ['original'], // 可以指定是原图还是压缩图，这里默认用原图
         sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
         success: function (res) {
-            uploadFile(res.tempFiles[0].path);
+          putFile(res.tempFiles[0].path);
         }
     })
 };

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

@@ -6450,7 +6450,7 @@ module.exports = function(module) {
 /*! exports provided: name, version, description, main, scripts, repository, author, license, dependencies, devDependencies, default */
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.4.4\",\"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\"}}");
+module.exports = JSON.parse("{\"name\":\"cos-wx-sdk-v5\",\"version\":\"1.4.5\",\"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\"}}");
 
 /***/ }),
 
@@ -13649,7 +13649,7 @@ var apiWrapper = function apiWrapper(apiName, apiFn) {
     };
 
     var errMsg = checkParams();
-    var isSync = apiName === 'getAuth';
+    var isSync = ['getAuth', 'getObjectUrl'].includes(apiName);
     var Promise = global.Promise;
 
     if (!isSync && Promise && !callback) {