remove hook and add event 'before-send'

tencentyun · Jul 30, 2018 · c560069 · c560069
1 parent d74dc7b
commit c560069
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 54 deletions.
diff --git a/dist/cos-js-sdk-v5.js b/dist/cos-js-sdk-v5.js
@@ -1917,7 +1917,7 @@ util.extend(COS.prototype, base);
 util.extend(COS.prototype, advance);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '0.4.10';
+COS.version = '0.4.11';
 
 module.exports = COS;
 
@@ -5751,6 +5751,7 @@ function _submitRequest(params, callback) {
         };
     }
 
+    cos.emit('before-send', opt);
     var sender = REQUEST(opt, function (err, response, body) {
 
         // 返回内容添加 状态码 和 headers

diff --git a/dist/cos-js-sdk-v5.min.js b/dist/cos-js-sdk-v5.min.js
diff --git a/src/base.js b/src/base.js
@@ -1905,24 +1905,6 @@ function submitRequest(params, callback) {
     });
 }
 
-
-// 请求前后增加钩子处理
-_request = function (opt, callback) {
-    var self = this;
-    self._runRegister('before-send', opt, function () {
-        REQUEST(opt, function (err, response, body) {
-            var data = {
-                error: err,
-                response: response,
-                body: body,
-            };
-            self._runRegister('after-send', data, function () {
-                callback(err, response, body);
-            });
-        });
-    });
-};
-
 // 发起请求
 function _submitRequest(params, callback) {
     var self = this;
@@ -1980,7 +1962,8 @@ function _submitRequest(params, callback) {
         };
     }
 
-    var sender = _request.call(self, opt, function (err, response, body) {
+    cos.emit('before-send', opt);
+    var sender = REQUEST(opt, function (err, response, body) {
 
         // 返回内容添加 状态码 和 headers
         var hasReturned;

diff --git a/src/cos.js b/src/cos.js
@@ -3,7 +3,6 @@
 var util = require('./util');
 var event = require('./event');
 var task = require('./task');
-var hook = require('./hook');
 var base = require('./base');
 var advance = require('./advance');
 
@@ -39,13 +38,12 @@ var COS = function (options) {
     }
     event.init(this);
     task.init(this);
-    hook.init(this);
 };
 
 util.extend(COS.prototype, base);
 util.extend(COS.prototype, advance);
 
 COS.getAuthorization = util.getAuth;
-COS.version = '0.4.10';
+COS.version = '0.4.11';
 
 module.exports = COS;
diff --git a/src/hook.js b/src/hook.js