预处理signHeaders和headers

Author: JacksonTian

lib/base.js

@@ -3,6 +3,19 @@
 const parse = require('url').parse;
 const querystring = require('querystring');
 
+function loweredKeys(headers = {}) {
+  var lowered = {};
+
+  var keys = Object.keys(headers);
+  for (let i = 0; i < keys.length; i++) {
+    let key = keys[i];
+    lowered[key.toLowerCase()] = headers[key];
+  }
+
+  return lowered;
+}
+
+
 /**
  * API Gateway Client
  */
@@ -19,6 +32,11 @@ class Base {
       opts.data = null;
       opts.query = null;
     }
+
+    // lowerify the header key
+    opts.headers = loweredKeys(opts.headers);
+    opts.signHeaders = loweredKeys(opts.signHeaders);
+
     return yield* this.request('GET', parsed, opts);
   }
 
@@ -32,7 +50,11 @@ class Base {
       opts.query = null;
     }
 
-    var headers = opts.headers || {};
+    // lowerify the header key
+    opts.headers = loweredKeys(opts.headers);
+    opts.signHeaders = loweredKeys(opts.signHeaders);
+
+    var headers = opts.headers;
     var type = headers['content-type'] || headers['Content-Type'];
     if (!type) {
       headers['content-type'] = 'application/json';
@@ -62,6 +84,11 @@ class Base {
       opts.data = null;
       opts.query = null;
     }
+
+    // lowerify the header key
+    opts.headers = loweredKeys(opts.headers);
+    opts.signHeaders = loweredKeys(opts.signHeaders);
+
     return yield* this.request('DELETE', parsed, opts);
   }
 }

lib/client.js

@@ -11,6 +11,9 @@ const ua = require('./ua');
 const Base = require('./base');
 
 const form = 'application/x-www-form-urlencoded';
+const hasOwnProperty = function (obj, key) {
+  Object.prototype.hasOwnProperty.call(obj, key);
+};
 
 /**
  * API Gateway Client
@@ -83,7 +86,7 @@ class Client extends Base {
     for (var i = 0; i < keys.length; i++) {
       var key = keys[i];
       // x-ca- 开头的header或者指定的header
-      if (key.startsWith('x-ca-') || signHeaders.hasOwnProperty(key)) {
+      if (key.startsWith('x-ca-') || hasOwnProperty(signHeaders, key)) {
         signKeys.push(key);
       }
     }
@@ -111,28 +114,14 @@ class Client extends Base {
     return result;
   }
 
-  loweredKeys(headers = {}) {
-    var lowered = {};
-
-    var keys = Object.keys(headers);
-    for (let i = 0; i < keys.length; i++) {
-      let key = keys[i];
-      lowered[key.toLowerCase()] = headers[key];
-    }
-
-    return lowered;
-  }
-
   buildHeaders(headers = {}, signHeaders) {
-    var now = new Date();
-
     return Object.assign({
-      'x-ca-timestamp': now.getTime(),
+      'x-ca-timestamp': Date.now(),
       'x-ca-key': this.appKey,
       'x-ca-nonce': uuid.v4(),
       'x-ca-stage': this.stage,
       'accept': 'application/json'
-    }, this.loweredKeys(headers), signHeaders);
+    }, headers, signHeaders);
   }
 
   getSignedHeadersString(signHeaders, headers) {
@@ -146,7 +135,7 @@ class Client extends Base {
   }
 
   * request(method, url, opts, originData) {
-    var signHeaders = this.loweredKeys(opts.signHeaders);
+    var signHeaders = opts.signHeaders;
     // 小写化，合并之后的headers
     var headers = this.buildHeaders(opts.headers, signHeaders);