feat: 2.15.0

Author: livehigh

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cos-nodejs-sdk-v5",
-  "version": "2.15.0-beta.1",
+  "version": "2.15.0",
   "description": "cos nodejs sdk v5",
   "main": "index.js",
   "types": "index.d.ts",
@@ -32,9 +32,9 @@
   "homepage": "https://github.com/tencentyun/cos-nodejs-sdk-v5#readme",
   "dependencies": {
     "conf": "^9.0.0",
-    "cos-request": "^1.0.0",
     "fast-xml-parser": "4.2.5",
-    "mime-types": "^2.1.24"
+    "mime-types": "^2.1.24",
+    "request": "^2.88.2"
   },
   "devDependencies": {
     "@types/node": "^14.14.20",
@@ -45,6 +45,6 @@
     "qcloud-cos-sts": "^3.1.1"
   },
   "engines": {
-    "node": ">= 9"
+    "node": ">= 6"
   }
 }

sdk/base.js

@@ -1,5 +1,5 @@
 var pkg = require('../package.json');
-var REQUEST = require('cos-request');
+var REQUEST = require('request');
 var mime = require('mime-types');
 var Stream = require('stream');
 var util = require('./util');
@@ -3672,9 +3672,7 @@ function getAuthorizationAsync(params, callback) {
   var headers = util.clone(params.Headers);
   var headerHost = '';
   util.each(headers, function (v, k) {
-    if (v === '') {
-      delete headers[k];
-    }
+    (v === '' || ['content-type', 'cache-control'].indexOf(k.toLowerCase()) > -1) && delete headers[k];
     if (k.toLowerCase() === 'host') headerHost = v;
   });
 
@@ -3993,47 +3991,6 @@ function submitRequest(params, callback) {
   var Query = util.clone(params.qs);
   params.action && (Query[params.action] = '');
 
-  var contentType;
-  var contentLength = 0;
-  util.each(params.headers, function (value, key) {
-    if (key.toLowerCase() === 'content-type') {
-      contentType = value;
-    }
-    if (key.toLowerCase() === 'content-length') {
-      contentLength = value;
-    }
-  });
-
-  var method = params.method.toLowerCase();
-  var body = params.body;
-  if (body) {
-    var isStringOrBuffer = typeof body === 'string' || Buffer.isBuffer(body);
-    if (!contentLength && isStringOrBuffer) {
-      // 传了请求体需补充 content-length
-      const buffer = Buffer.from(body, 'utf-8');
-      const contentLength = buffer.length;
-      params.headers['Content-Length'] = contentLength;
-    }
-  } else {
-    // 非 get 请求的空请求体需补充 content-length = 0
-    var noContentLengthMethods = ['get'].includes(method);
-    if (!noContentLengthMethods) {
-      params.headers['Content-Length'] = 0;
-    }
-  }
-  // 上传接口补充默认 content-type
-  if (contentType === undefined && body) {
-    var defaultContentType = 'application/octet-stream';
-    if (body.type) {
-      params.headers['Content-Type'] = body.type;
-    } else if (typeof body.pipe === 'function') {
-      var isReadStream = body && body.readable && body.path && body.mode;
-      params.headers['Content-Type'] = isReadStream ? (mime.lookup(body.path) || defaultContentType) : defaultContentType;
-    }  else  {
-      // params.headers['Content-Type'] = defaultContentType;
-    }
-  }
-
   var SignHost =
     params.SignHost || getSignHost.call(this, { Bucket: params.Bucket, Region: params.Region, Url: params.url });
   var next = function (tryTimes) {
@@ -4086,7 +4043,7 @@ function submitRequest(params, callback) {
               networkError,
             });
             params.SwitchHost = switchHost;
-            // 重试时增加请求体
+            // 重试时增加请求头
             params.headers['x-cos-sdk-retry'] = true;
             next(tryTimes + 1);
           } else {

sdk/util.js

@@ -56,12 +56,10 @@ var obj2str = function (obj, lowerCaseKey) {
 
 // 可以签入签名的headers
 var signHeaders = [
-  'cache-control',
   'content-disposition',
   'content-encoding',
   'content-length',
   'content-md5',
-  'content-type',
   'expect',
   'expires',
   'host',

test/test.js

@@ -1,7 +1,7 @@
 var fs = require('fs');
 var path = require('path');
 var COS = require('../index');
-var request = require('cos-request');
+var request = require('request');
 var util = require('../demo/util');
 var Stream = require('stream');