feat: add options.ctx for every request params (#144)

* refactor: make new OssClient() faster

Author: fengmk2

.travis.yml

@@ -2,7 +2,6 @@ sudo: false
 language: node_js
 node_js:
   - '6'
-  - '5'
   - '4'
 env:
   global:
@@ -16,4 +15,4 @@ env:
     - secure: Og1xl8+NoUfc3ZlWT/yVOPy/8YhRHVNT2M+LVZ81iRwJNBxwm1cj40cck41Py2eG3AwH0yCj0K3u+o74fOHbTuYLzNskB1gYbA8m6v2vuMnGRblb6+UYEm3yUcYHJ4VXFMmFTMKyNoe/iqEpetgoKffbCAk3Xa7kZbbQR7T03tI=
 script: npm run test-cov
 after_script:
-  - npm i codecov.io && cat ./coverage/coverage.json | ./node_modules/codecov.io/bin/codecov.io.js
+  - npm i codecov && codecov

lib/bucket.js

@@ -1,29 +1,18 @@
-/**!
- * Copyright(c) ali-sdk and other contributors.
- * MIT Licensed
- *
- * Authors:
- *   fengmk2 <m@fengmk2.com> (http://fengmk2.com)
- */
-
 'use strict';
 
-/**
- * Module dependencies.
- */
-
 var proto = exports;
 
 /**
  * Bucket opertaions
  */
 
-proto.listBuckets = function* (query, options) {
+proto.listBuckets = function* listBuckets(query, options) {
   // prefix, marker, max-keys
-  var result = yield* this.request({
+  var result = yield this.request({
     method: 'GET',
     query: query,
-    timeout: options && options.timeout
+    timeout: options && options.timeout,
+    ctx: options && options.ctx,
   });
 
   if (result.status === 200) {
@@ -56,15 +45,15 @@ proto.listBuckets = function* (query, options) {
     };
   }
 
-  throw yield* this.requestError(result);
+  throw yield this.requestError(result);
 };
 
-proto.useBucket = function (name, region) {
+proto.useBucket = function useBucket(name, region) {
   this.options.bucket = name;
   return this;
 };
 
-proto.putBucket = function* (name, region, options) {
+proto.putBucket = function* putBucket(name, region, options) {
   var params = this._bucketRequestParams('PUT', name, '', options);
   if (region) {
     params.mime = 'xml';
@@ -80,20 +69,20 @@ proto.putBucket = function* (name, region, options) {
   };
 };
 
-proto.deleteBucket = function* (name, region, options) {
+proto.deleteBucket = function* deleteBucket(name, region, options) {
   var params = this._bucketRequestParams('DELETE', name, '', options);
-  var result = yield* this.request(params);
+  var result = yield this.request(params);
   if (result.status === 200 || result.status === 204) {
     return {
       res: result.res
     };
   }
-  throw yield* this.requestError(result);
+  throw yield this.requestError(result);
 };
 
 // acl
 
-proto.putBucketACL = function* (name, region, acl, options) {
+proto.putBucketACL = function* putBucketACL(name, region, acl, options) {
   var params = this._bucketRequestParams('PUT', name, 'acl', options);
   params.headers = {
     'x-oss-acl': acl
@@ -106,11 +95,11 @@ proto.putBucketACL = function* (name, region, acl, options) {
   };
 };
 
-proto.getBucketACL = function* (name, region, options) {
+proto.getBucketACL = function* getBucketACL(name, region, options) {
   var params = this._bucketRequestParams('GET', name, 'acl', options);
   params.successStatuses = [200];
   params.xmlResponse = true;
-  var result = yield* this.request(params);
+  var result = yield this.request(params);
   return {
     acl: result.data.AccessControlList.Grant,
     owner: {
@@ -123,7 +112,7 @@ proto.getBucketACL = function* (name, region, options) {
 
 // logging
 
-proto.putBucketLogging = function* (name, region, prefix, options) {
+proto.putBucketLogging = function* putBucketLogging(name, region, prefix, options) {
   var params = this._bucketRequestParams('PUT', name, 'logging', options);
   var xml = '<?xml version="1.0" encoding="UTF-8"?>\n<BucketLoggingStatus>\n' +
     '<LoggingEnabled>\n<TargetBucket>' + name + '</TargetBucket>\n';
@@ -140,7 +129,7 @@ proto.putBucketLogging = function* (name, region, prefix, options) {
   };
 };
 
-proto.getBucketLogging = function* (name, region, options) {
+proto.getBucketLogging = function* getBucketLogging(name, region, options) {
   var params = this._bucketRequestParams('GET', name, 'logging', options);
   params.successStatuses = [200];
   params.xmlResponse = true;
@@ -153,7 +142,7 @@ proto.getBucketLogging = function* (name, region, options) {
   };
 };
 
-proto.deleteBucketLogging = function* (name, region, options) {
+proto.deleteBucketLogging = function* deleteBucketLogging(name, region, options) {
   var params = this._bucketRequestParams('DELETE', name, 'logging', options);
   params.successStatuses = [204, 200];
   var result = yield this.request(params);
@@ -164,7 +153,7 @@ proto.deleteBucketLogging = function* (name, region, options) {
 
 // website
 
-proto.putBucketWebsite = function* (name, region, config, options) {
+proto.putBucketWebsite = function* putBucketWebsite(name, region, config, options) {
   // config: index, [error]
   var params = this._bucketRequestParams('PUT', name, 'website', options);
   config = config || {};
@@ -184,30 +173,30 @@ proto.putBucketWebsite = function* (name, region, config, options) {
   };
 };
 
-proto.getBucketWebsite = function* (name, region, options) {
+proto.getBucketWebsite = function* getBucketWebsite(name, region, options) {
   var params = this._bucketRequestParams('GET', name, 'website', options);
   params.successStatuses = [200];
   params.xmlResponse = true;
-  var result = yield* this.request(params);
+  var result = yield this.request(params);
   return {
     index: result.data.IndexDocument.Suffix,
     error: result.data.ErrorDocument && result.data.ErrorDocument.Key || null,
     res: result.res
   };
 };
 
-proto.deleteBucketWebsite = function* (name, region, options) {
+proto.deleteBucketWebsite = function* deleteBucketWebsite(name, region, options) {
   var params = this._bucketRequestParams('DELETE', name, 'website', options);
   params.successStatuses = [204];
-  var result = yield* this.request(params);
+  var result = yield this.request(params);
   return {
     res: result.res
   };
 };
 
 // lifecycle
 
-proto.putBucketLifecycle = function* (name, region, rules, options) {
+proto.putBucketLifecycle = function* putBucketLifecycle(name, region, rules, options) {
   // rules: [rule, ...]
   // rule: [id], prefix, status, expiration, [days or date]
   // status: 'Enabled' or 'Disabled'
@@ -230,17 +219,17 @@ proto.putBucketLifecycle = function* (name, region, rules, options) {
   params.content = xml;
   params.mime = 'xml';
   params.successStatuses = [200];
-  var result = yield* this.request(params);
+  var result = yield this.request(params);
   return {
     res: result.res
   };
 };
 
-proto.getBucketLifecycle = function* (name, region, options) {
+proto.getBucketLifecycle = function* getBucketLifecycle(name, region, options) {
   var params = this._bucketRequestParams('GET', name, 'lifecycle', options);
   params.successStatuses = [200];
   params.xmlResponse = true;
-  var result = yield* this.request(params);
+  var result = yield this.request(params);
   var rules = result.data.Rule || null;
   if (rules) {
     if (!Array.isArray(rules)) {
@@ -266,18 +255,18 @@ proto.getBucketLifecycle = function* (name, region, options) {
   };
 };
 
-proto.deleteBucketLifecycle = function* (name, region, options) {
+proto.deleteBucketLifecycle = function* deleteBucketLifecycle(name, region, options) {
   var params = this._bucketRequestParams('DELETE', name, 'lifecycle', options);
   params.successStatuses = [204];
-  var result = yield* this.request(params);
+  var result = yield this.request(params);
   return {
     res: result.res
   };
 };
 
 // referer
 
-proto.putBucketReferer = function* (name, region, allowEmpty, referers, options) {
+proto.putBucketReferer = function* putBucketReferer(name, region, allowEmpty, referers, options) {
   var params = this._bucketRequestParams('PUT', name, 'referer', options);
   var xml = '<?xml version="1.0" encoding="UTF-8"?>\n<RefererConfiguration>\n';
   xml += '  <AllowEmptyReferer>' + (allowEmpty ? 'true' : 'false') + '</AllowEmptyReferer>\n';
@@ -294,17 +283,17 @@ proto.putBucketReferer = function* (name, region, allowEmpty, referers, options)
   params.content = xml;
   params.mime = 'xml';
   params.successStatuses = [200];
-  var result = yield* this.request(params);
+  var result = yield this.request(params);
   return {
-    res: result.res
+    res: result.res,
   };
 };
 
-proto.getBucketReferer = function* (name, region, options) {
+proto.getBucketReferer = function* getBucketReferer(name, region, options) {
   var params = this._bucketRequestParams('GET', name, 'referer', options);
   params.successStatuses = [200];
   params.xmlResponse = true;
-  var result = yield* this.request(params);
+  var result = yield this.request(params);
   var referers = result.data.RefererList.Referer || null;
   if (referers) {
     if (!Array.isArray(referers)) {
@@ -318,17 +307,18 @@ proto.getBucketReferer = function* (name, region, options) {
   };
 };
 
-proto.deleteBucketReferer = function* (name, region, options) {
-  return yield* this.putBucketReferer(name, region, true, null, options);
+proto.deleteBucketReferer = function* deleteBucketReferer(name, region, options) {
+  return yield this.putBucketReferer(name, region, true, null, options);
 };
 
 // private apis
 
-proto._bucketRequestParams = function (method, bucket, subres, options) {
+proto._bucketRequestParams = function _bucketRequestParams(method, bucket, subres, options) {
   return {
     method: method,
     bucket: bucket,
     subres: subres,
     timeout: options && options.timeout,
+    ctx: options && options.ctx,
   };
 };