fix travis test

Author: villadora

.travis.yml

@@ -1,6 +1,4 @@
 language: node_js
 node_js:
-  - 0.10
-  - 0.11
-
-script: make test
+  - "0.10"
+  - "0.11"

Makefile

@@ -40,7 +40,7 @@ app.use('/proxy', proxy('www.google.com', {
 
 
 
-You can also intercept the response get by proxy before send it back to the client:
+You can also intercept the response get by proxy before send it back to the client, or change the request options before it get sent to target:
 
 ```js
 app.use('/proxy', proxy('www.google.com', {
@@ -49,7 +49,13 @@ app.use('/proxy', proxy('www.google.com', {
   },
   intercept: function(data, req, res, callback) {
        data = JSON.parse(data.toString('utf8'));
-       callback(null, JSON.stringify(data.obj));
+       callback(null, JSON.stringify(data));
+  },
+  decorateRequest: function(req) {
+       req.headers['Content-Type'] = '';
+       req.method = 'GET";
+       req.bodyContent = wrap(req.bodyContent);
+       return req;
   }
 }));
 
@@ -60,4 +66,4 @@ app.use('/proxy', proxy('www.google.com', {
 ## Licence
 
 MIT
-<!-- do not want to make nodeinit to complicated, you can edit this whenever you want. -->
+<!-- do not want to make nodeinit to complicated, you can edit this whenever you want. -->

README.md

@@ -32,7 +32,7 @@ module.exports = function proxy(host, options) {
    * intercept(data, res, req, function(err, json));
    */
   var intercept = options.intercept;
-  var decorateProxyRequest = options.decorateProxyRequest || function () { return arguments; };
+  var decorateRequest = options.decorateRequest;
   var forwardPath = options.forwardPath;
   var filter = options.filter;
 
@@ -50,28 +50,33 @@ module.exports = function proxy(host, options) {
     // var hasRequestBody = 'content-type' in req.headers || 'transfer-encoding' in req.headers;
     getRawBody(req, {
       length: req.headers['content-length'],
-      limit: '1mb', // let options do here?
+      limit: '1mb' // TODO let options do here?
     }, function(err, bodyContent) {
-      var decoratedRequest;
+      if (err) return next(err);
 
-      if (err) return next(err)
-
-      decoratedRequest = decorateProxyRequest(hds, bodyContent);
-      hds = decoratedRequest.headers;
-      bodyContent = decoratedRequest.body;
-
-      if (bodyContent.length)
-        hds['content-length'] = bodyContent.length
-
-      var chunks = [];
-      var realRequest = http.request({
+      var reqOpt = {
         hostname: (typeof host == 'function') ? host(req) : host.toString(),
         port: port,
         headers: hds,
         method: req.method,
-        path: path
-      }, function(rsp) {
+        path: path,
+        bodyContent: bodyContent
+      };
+
+
+      if (decorateRequest)
+        reqOpt = decorateRequest(reqOpt) || reqOpt;
+
+      bodyContent = reqOpt.bodyContent;
+      delete reqOpt.bodyContent;
 
+      if (typeof bodyContent == 'string')
+        reqOpt.headers['content-length'] = Buffer.byteLength(bodyContent);
+      else if (Buffer.isBuffer(bodyContent)) // Buffer
+        reqOpt.headers['content-length'] = bodyContent.length;
+
+      var chunks = [];
+      var realRequest = http.request(reqOpt, function(rsp) {
         var rspData = null;
         rsp.on('data', function(chunk) {
           chunks.push(chunk);
@@ -89,6 +94,20 @@ module.exports = function proxy(host, options) {
               if (err) {
                 return next(err);
               }
+              
+              if (typeof rsp == 'string') 
+                rsp = new Buffer(rsp, 'utf8');
+              
+              if (!Buffer.isBuffer(rsp)) {
+                next(new Error("intercept should return string or buffer as data"));
+              }
+              
+              if (!res.headersSent)
+                res.set('content-length', rsp.length);
+              else if (rsp.length != rspData.length) {
+                next(new Error("'Content-Length' is already sent, the length of response data can not be changed"));
+              }
+
               if (!sent)
                 res.send(rsp);
             });
@@ -107,6 +126,7 @@ module.exports = function proxy(host, options) {
             res.set(p, rsp.headers[p]);
           }
         }
+
       });
 
       realRequest.on('error', function(e) {
@@ -132,4 +152,4 @@ function extend(obj, source, skips) {
   }
 
   return obj;
-};
+}

index.js

@@ -1,10 +1,11 @@
 {
   "name": "express-http-proxy",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "http proxy middleware for express",
   "main": "index.js",
   "scripts": {
-    "test": "make test"
+    "test": "npm run lint && ./node_modules/.bin/mocha -R spec test/test.js",
+    "lint": "./node_modules/.bin/jshint index.js test/*.js"
   },
   "repository": {
     "type": "git",
@@ -25,12 +26,30 @@
     "url": "https://github.com/villadora/express-http-proxy/issues"
   },
   "devDependencies": {
-    "supertest": "^0.13.0",
     "express": "^4.3.1",
-    "mocha": "^1.19.0"
+    "jshint": "^2.5.5",
+    "mocha": "^1.19.0",
+    "supertest": "^0.13.0"
   },
   "dependencies": {
     "type-is": "^1.2.0",
     "raw-body": "^1.1.6"
-  }
+  },
+  "contributors": [
+    {
+      "name": "Wei Gao",
+      "email": "jky239@gmail.com",
+      "url": "https://github.com/villadora"
+    },
+    {
+      "name": "Jérémy Lal",
+      "email": "kapouer@melix.org",
+      "url": "https://github.com/kapouer"
+    },
+    {
+      "name": "Saulius Menkevičius",
+      "email": null,
+      "url": "https://github.com/razzmatazz"
+    }
+  ]
 }