cos-wx-sdk-v5 1.1.8 → 1.3.0

package/.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": ["@babel/preset-env"]
+}

package/CHANGELOG.md

@@ -7,6 +7,66 @@ 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.2.1](https://github.com/tencentyun/cos-wx-sdk-v5/compare/v1.2.0...v1.2.1) - 2022-07-21
+
+feat
+- 初始化支持HttpDNSServiceId参数，填写后代表开启 HttpDNS 服务。HttpDNS 用法详见https://developers.weixin.qq.com/miniprogram/dev/framework/ability/HTTPDNS.html
+
+### Merged
+
+- feat: 1.2.1 [`#70`](https://github.com/tencentyun/cos-wx-sdk-v5/pull/70)
+- Feat/1.2.0 [`#69`](https://github.com/tencentyun/cos-wx-sdk-v5/pull/69)
+
+### Commits
+
+- Merge https://github.com/livehigh/cos-wx-sdk-v5 into feat/1.2.1 [`982305a`](https://github.com/tencentyun/cos-wx-sdk-v5/commit/982305a2f4ce6b5d6e55e8dc96f1b14eedcc9297)
+- upd 去掉ForcePathStyle处理 [`6ed7dcc`](https://github.com/tencentyun/cos-wx-sdk-v5/commit/6ed7dccc092cde1e43c54101870191fce7eaba49)
+- upd 补充HttpDNS使用说明 [`c80f440`](https://github.com/tencentyun/cos-wx-sdk-v5/commit/c80f440d2d75be962433250e824a331c7142979c)
+
+## [v1.2.0](https://github.com/tencentyun/cos-wx-sdk-v5/compare/v1.1.8...v1.2.0) - 2022-06-30
+
+fix
+- 修复使用postObject不能正确的pauseTask，cancelTask问题
+- 签名回调里使用SecurityToken代替并兼容XCosSecurityToken
+
+### Merged
+
+- 完善内容审核demo [`#68`](https://github.com/tencentyun/cos-wx-sdk-v5/pull/68)
+- Feat/1.1.8 [`#67`](https://github.com/tencentyun/cos-wx-sdk-v5/pull/67)
+
+### Commits
+
+- feat 1.2.0 [`0fc7281`](https://github.com/tencentyun/cos-wx-sdk-v5/commit/0fc7281a43a6d9f3bf1f125c04fabdf63bcc9f4c)
+- upd demo [`8e198e3`](https://github.com/tencentyun/cos-wx-sdk-v5/commit/8e198e3742c778844e82ebc8c6bca777d0ae58e6)
+- upd [`8f6170f`](https://github.com/tencentyun/cos-wx-sdk-v5/commit/8f6170f15972c479963c1b78816d4a8a13dd8fd8)
+- del [`c12abe9`](https://github.com/tencentyun/cos-wx-sdk-v5/commit/c12abe9e93dd07607d46f2e61286a16dfb17721e)
+- upd [`2035c54`](https://github.com/tencentyun/cos-wx-sdk-v5/commit/2035c54193d7c96030bc5b364c100b952f62d627)
+- upd [`a8142cc`](https://github.com/tencentyun/cos-wx-sdk-v5/commit/a8142cca3aa5e822b2509bf2c3a2a96402a343d8)
+
+## [v1.1.8](https://github.com/tencentyun/cos-wx-sdk-v5/compare/v1.1.7...v1.1.8) - 2022-06-23
+
+feat
+- putBucketCors支持ResponseVary
+- 提高签名时Expires参数的优先级
+
+### Merged
+
+- feat：更换依赖xmldom->@xmldom/xmldom [`#66`](https://github.com/tencentyun/cos-wx-sdk-v5/pull/66)
+
+### Commits
+
+- feat 1.1.8 [`aad1bad`](https://github.com/tencentyun/cos-wx-sdk-v5/commit/aad1badffefc14d06a1d7f0851bc7aeec09bcd51)
+- upd [`42134c3`](https://github.com/tencentyun/cos-wx-sdk-v5/commit/42134c36def10a6a84d9b9c45dc56fe5e67e880a)
+
+## [v1.1.7](https://github.com/tencentyun/cos-wx-sdk-v5/compare/v1.1.6...v1.1.7) - 2022-04-26
+
+feat：更换依赖xmldom->@xmldom/xmldom
+
+### Commits
+
+- feat：更换依赖xmldom->@xmldom/xmldom [`ca08986`](https://github.com/tencentyun/cos-wx-sdk-v5/commit/ca08986fb0577e96fa2a924aa8ddd9e13bb5a82a)
+- Updated CHANGELOG.md [`3c2359a`](https://github.com/tencentyun/cos-wx-sdk-v5/commit/3c2359a2f95df088fec2ae221f43be6c58b27537)
+
 ## [v1.1.6](https://github.com/tencentyun/cos-wx-sdk-v5/compare/v1.1.5...v1.1.6) - 2022-04-25
 
 feat：getObjectUrl支持全球加速参数

package/build.js

@@ -2,6 +2,7 @@ var webpack = require('webpack');
 var path = require('path');
 var fs = require('fs');
 var pkg = require('./package.json');
+const TerserPlugin = require('terser-webpack-plugin');
 
 var replaceVersion = function () {
     var filePath = path.resolve(__dirname, 'src/cos.js');
@@ -32,6 +33,8 @@ var replaceDevCode = function (list) {
 replaceVersion();
 
 var config = {
+    mode: process.env.NODE_ENV,
+    devtool: "none",
     watch: true,
     entry: path.resolve(__dirname, './index.js'),
     output: {
@@ -46,11 +49,20 @@ var config = {
             {
                 test: /\.m?js$/,
                 loader: 'babel-loader',
-                options: {
-                  presets: ['es2015']
-               }
+                exclude: /node_modules/,
             }
-        ]
+        ],
+    },
+    optimization: {
+        minimize: false,
+        minimizer: [
+          new TerserPlugin({
+            cache: true,
+            parallel: true,
+            sourceMap: true,
+            extractComments: false,
+          }),
+        ],
     },
     devServer: {
         historyApiFallback: true,
@@ -70,24 +82,29 @@ if (process.env.NODE_ENV === 'production') {
     ]);
     config.watch = false;
     config.output.filename = 'cos-wx-sdk-v5.min.js';
+    config.optimization = {
+      minimize: true,
+      minimizer: [
+        new TerserPlugin({
+          cache: true,
+          parallel: true,
+          sourceMap: true,
+          extractComments: false,
+          terserOptions: {
+            compress: {
+              drop_debugger: true,
+              drop_console: true,
+            }
+          },
+        }),
+      ],
+    };
     config.plugins = (config.plugins || []).concat([
         new webpack.DefinePlugin({
             'process.env': {
                 NODE_ENV: '"production"'
             }
         }),
-        new webpack.optimize.UglifyJsPlugin({
-            sourceMap: true,
-            output: {
-                ascii_only: true,
-            },
-            compress: {
-                warnings: false,
-            },
-        }),
-        new webpack.LoaderOptionsPlugin({
-            minimize: true
-        }),
     ]);
 }
 
@@ -95,10 +112,12 @@ webpack(config, function (err, stats) {
     // 每次运行 npm run build，将 sourcePath 代码复制一份放入 targetPath
     var sourcePath = path.resolve(__dirname, './demo/lib/cos-wx-sdk-v5.js');
     var targetPath = path.resolve(__dirname, './demo-album/lib/cos-wx-sdk-v5.js');
-    var minSourcePath = path.resolve(__dirname, './demo/lib/cos-wx-sdk-v5.min.js');
-    var mintTargetPath = path.resolve(__dirname, './demo-album/lib/cos-wx-sdk-v5.min.js');
     fs.createReadStream(sourcePath).pipe(fs.createWriteStream(targetPath));
-    fs.createReadStream(minSourcePath).pipe(fs.createWriteStream(mintTargetPath));
+    if (process.env.NODE_ENV === 'production') {
+      var minSourcePath = path.resolve(__dirname, './demo/lib/cos-wx-sdk-v5.min.js');
+      var mintTargetPath = path.resolve(__dirname, './demo-album/lib/cos-wx-sdk-v5.min.js');
+      fs.createReadStream(minSourcePath).pipe(fs.createWriteStream(mintTargetPath));
+    }
     if (err) throw err
     process.stdout.write(stats.toString({
         colors: true,

package/demo/demo-sdk.js

@@ -22,7 +22,7 @@ var getAuthorization = function(options, callback) {
             callback({
                 TmpSecretId: credentials.tmpSecretId,
                 TmpSecretKey: credentials.tmpSecretKey,
-                XCosSecurityToken: credentials.sessionToken,
+                SecurityToken: credentials.sessionToken,
                 StartTime: data.startTime, // 时间戳，单位秒，如：1580000000，建议返回服务器时间作为签名的开始时间，避免用户浏览器本地时间偏差过大导致签名错误
                 ExpiredTime: data.expiredTime, // 时间戳，单位秒，如：1580000900
             });
@@ -159,7 +159,11 @@ var toolsDao = {
                 Region: config.Region,
                 Key: file.name,
                 FilePath: file.path,
+                FileSize: file.size,
                 SliceSize: 1024 * 1024 * 5, // 文件大于5mb自动使用分块上传
+                onTaskReady: function(taskId) {
+                  TaskId = taskId
+                },
                 onProgress: function (info) {
                     var percent = parseInt(info.percent * 10000) / 100;
                     var speed = parseInt(info.speed / 1024 / 1024 * 100) / 100;
@@ -681,7 +685,7 @@ var objectDao = {
             Position: 0,
         },
         function(err, data) {
-            logger.log('putObject:', err || data);
+            console.log('putObject:', err || data);
         })
     },
     'appendObject_continue 继续追加上传': function() {
@@ -704,7 +708,7 @@ var objectDao = {
             function(err, data) {
                 // 也可以取到下一次上传的position继续追加上传
                 // var nextPosition = data.headers['x-cos-next-append-position'];
-                logger.log('putObject:', err || data);
+                console.log('putObject:', err || data);
             })
         });
     },
@@ -947,6 +951,285 @@ var ciObjectDao = {
             console.log(err || data);
         });
     },
+    '图片同步审核 getImageAuditing': function () {
+        cos.request({
+            Bucket: config.Bucket,
+            Region: config.Region,
+            Method: 'GET',
+            Key: '1.png',
+            Query: {
+                'ci-process': 'sensitive-content-recognition', /** 固定值，必须 */
+                'biz-type': '', /** 审核类型，非必须 */
+                'detect-type': 'porn,ads', /** 审核策略，不填写则使用默认策略，非必须 */
+                'detect-url': '', /** 审核任意公网可访问的图片链接，非必须 */
+                'interval': 5, /** 审核 GIF 动图时，每隔interval帧截取一帧，非必须 */
+                'max-frames': 5,  /** 审核 GIF 动图时，最大截帧数，非必须 */
+                'large-image-detect': '0', /** 是否需要压缩图片后再审核，非必须 */
+            },
+        },
+        function(err, data){
+            console.log(err || data);
+        });
+      },
+    '图片批量审核 postImagesAuditing': function () {
+        var host = config.Bucket + '.ci.' + config.Region + '.myqcloud.com';
+        var url = 'https://' + host + '/image/auditing';
+        var body = COS.util.json2xml({
+          Request: {
+            Input: [{
+              Object: '1.png',
+            }, {
+              Object: '6.png',
+            }],
+            Conf: {
+              BizType: '',
+              DetectType: 'Porn'
+            }
+          }
+        });
+        cos.request({
+            Bucket: config.Bucket,
+            Region: config.Region,
+            Method: 'POST',
+            Url: url,
+            Key: '/image/auditing',
+            ContentType: 'application/xml',
+            Body: body
+        },
+        function(err, data){
+            console.log(err || data);
+        });
+    },
+    '查询图片审核任务结果 getImageAuditingResult': function () {
+        var jobId = 'si8263213daf3711eca0d1525400d88xxx'; // jobId可以通过图片批量审核返回
+        var host = config.Bucket + '.ci.' + config.Region + '.myqcloud.com';
+        var url = 'https://' + host + '/image/auditing/' + jobId;
+        cos.request({
+            Bucket: config.Bucket,
+            Region: config.Region,
+            Method: 'GET',
+            Key: '/image/auditing/' + jobId,
+            Url: url,
+        },
+        function(err, data){
+            console.log(err || data);
+        });
+    },
+    '提交视频审核任务 postVideoAuditing': function() {
+        var host = config.Bucket + '.ci.' + config.Region + '.myqcloud.com';
+        var url = 'https://' + host + '/video/auditing';
+        var body = COS.util.json2xml({
+          Request: {
+            Input: {
+              Object: '1.mp4',
+            },
+            Conf: {
+              BizType: '',
+              DetectType: 'Porn',
+              Snapshot: {
+                Count: 1000, // 视频截帧数量
+              },
+              DetectContent: 1, // 是否审核视频声音,0-只审核视频不审核声音；1-审核视频+声音
+            }
+          }
+        });
+        cos.request({
+            Bucket: config.Bucket,
+            Region: config.Region,
+            Method: 'POST',
+            Url: url,
+            Key: '/video/auditing',
+            ContentType: 'application/xml',
+            Body: body
+        },
+        function(err, data){
+            console.log(err || data);
+        });
+    },
+    '查询视频审核任务结果 getVideoAuditingResult': function () {
+        var jobId = 'av5bd873d9f39011ecb6c95254009a49da'; // jobId可以通过提交视频审核任务返回
+        var host = config.Bucket + '.ci.' + config.Region + '.myqcloud.com';
+        var url = 'https://' + host + '/video/auditing/' + jobId;
+        cos.request({
+            Bucket: config.Bucket,
+            Region: config.Region,
+            Method: 'GET',
+            Key: '/video/auditing/' + jobId,
+            Url: url,
+        },
+        function(err, data){
+            console.log(err || data);
+        });
+    },
+    '提交音频审核任务 postAudioAuditing': function () {
+        var host = config.Bucket + '.ci.' + config.Region + '.myqcloud.com';
+        var url = 'https://' + host + '/audio/auditing';
+        var body = COS.util.json2xml({
+          Request: {
+            Input: {
+              Object: '1.mp3',
+            },
+            Conf: {
+              BizType: '',
+              DetectType: 'Porn',
+            }
+          }
+        });
+        cos.request({
+            Bucket: config.Bucket,
+            Region: config.Region,
+            Method: 'POST',
+            Url: url,
+            Key: '/audio/auditing',
+            ContentType: 'application/xml',
+            Body: body
+        },
+        function(err, data){
+            console.log(err || data);
+        });
+    },
+    '查询音频审核任务结果 getAudioAuditingResult': function () {
+        var jobId = 'sa0c28d41daff411ecb23352540078cxxx'; // jobId可以通过提交音频审核任务返回
+        var host = config.Bucket + '.ci.' + config.Region + '.myqcloud.com';
+        var url = 'https://' + host + '/audio/auditing/' + jobId;
+        cos.request({
+            Bucket: config.Bucket,
+            Region: config.Region,
+            Method: 'GET',
+            Key: '/audio/auditing/' + jobId,
+            Url: url,
+        },
+        function(err, data){
+            console.log(err || data);
+        });
+    },
+    '提交文本审核任务 postTextAuditing': function () {
+        var host = config.Bucket + '.ci.' + config.Region + '.myqcloud.com';
+        var url = 'https://' + host + '/text/auditing';
+        var body = COS.util.json2xml({
+          Request: {
+            Input: {
+              // Object: 'hello.txt', // 存在cos里的资源，审核结果异步返回，可以调用查询文本审核结果api查询
+              Content: '5Lmz5rKf', // 经过base64编码过的文本”乳沟“，查询结果同步返回
+            },
+            Conf: {
+              BizType: '',
+              DetectType: 'Porn',
+            }
+          }
+        });
+        cos.request({
+            Bucket: config.Bucket,
+            Region: config.Region,
+            Method: 'POST',
+            Url: url,
+            Key: '/text/auditing',
+            ContentType: 'application/xml',
+            Body: body
+        },
+        function(err, data){
+            console.log(err || data);
+        });
+    },
+    '查询文本审核任务结果 getTextAuditingResult': function () {
+        var jobId = 'st8d88c664aff511ecb23352540078cxxx'; // jobId可以通过提交文本审核任务返回（Input传入Object）
+        var host = config.Bucket + '.ci.' + config.Region + '.myqcloud.com';
+        var url = 'https://' + host + '/text/auditing/' + jobId;
+        cos.request({
+            Bucket: config.Bucket,
+            Region: config.Region,
+            Method: 'GET',
+            Key: '/text/auditing/' + jobId,
+            Url: url,
+        },
+        function(err, data){
+            console.log(err || data);
+        });
+    },
+    '提交文档审核任务 postDocumentAuditing': function () {
+        var host = config.Bucket + '.ci.' + config.Region + '.myqcloud.com';
+        var url = 'https://' + host + '/document/auditing';
+        var body = COS.util.json2xml({
+          Request: {
+            Input: {
+              Object: 'test.xlsx', // 存在cos里的资源，审核结果异步返回，可以调用查询文本审核结果api查询
+            },
+            Conf: {
+              BizType: '',
+              DetectType: 'Porn',
+            }
+          }
+        });
+        cos.request({
+            Bucket: config.Bucket,
+            Region: config.Region,
+            Method: 'POST',
+            Url: url,
+            Key: '/document/auditing',
+            ContentType: 'application/xml',
+            Body: body
+        },
+        function(err, data){
+            console.log(err || data);
+        });
+    },
+    '查询文档审核任务结果 getDocumentAuditingResult': function () {
+        var jobId = 'sd7815c21caff611eca12f525400d88560'; // jobId可以通过提交文档审核任务返回
+        var host = config.Bucket + '.ci.' + config.Region + '.myqcloud.com';
+        var url = 'https://' + host + '/document/auditing/' + jobId;
+        cos.request({
+            Bucket: config.Bucket,
+            Region: config.Region,
+            Method: 'GET',
+            Key: '/document/auditing/' + jobId,
+            Url: url,
+        },
+        function(err, data){
+            console.log(err || data);
+        });
+    },
+    '提交网页审核任务 postWebpageAuditing': function () {
+        var host = config.Bucket + '.ci.' + config.Region + '.myqcloud.com';
+        var url = 'https://' + host + '/webpage/auditing';
+        var body = COS.util.json2xml({
+          Request: {
+            Input: {
+              Url: 'https://cloud.tencent.com/', // 存在cos里的资源，审核结果异步返回，可以调用查询文本审核结果api查询
+            },
+            Conf: {
+              BizType: '',
+              DetectType: 'Porn,Ads',
+            }
+          }
+        });
+        cos.request({
+            Bucket: config.Bucket,
+            Region: config.Region,
+            Method: 'POST',
+            Url: url,
+            Key: '/webpage/auditing',
+            ContentType: 'application/xml',
+            Body: body
+        },
+        function(err, data){
+            console.log(err || data);
+        });
+    },
+    '查询网页审核任务结果 getWebpageAuditingResult': function () {
+        var jobId = 'shce868019aff611ecb1155254009a4xxx'; // jobId可以通过提交网页审核任务返回
+        var host = config.Bucket + '.ci.' + config.Region + '.myqcloud.com';
+        var url = 'https://' + host + '/webpage/auditing/' + jobId;
+        cos.request({
+            Bucket: config.Bucket,
+            Region: config.Region,
+            Method: 'GET',
+            Key: '/webpage/auditing/' + jobId,
+            Url: url,
+        },
+        function(err, data){
+            console.log(err || data);
+        });
+    },
 }
 
 // require('./test');