fix villadora#10;

Author: villadora

index.js

@@ -40,7 +40,7 @@ module.exports = function proxy(host, options) {
   var limit = options.limit || '1mb';
 
   return function handleProxy(req, res, next) {
-    if (filter && !filter(req, res)) next();
+    if (filter && !filter(req, res)) return next();
 
     var headers = options.headers || {};
     var path;
@@ -93,26 +93,42 @@ module.exports = function proxy(host, options) {
           var rspData = Buffer.concat(chunks, totalLength);
 
           if (intercept) {
-            intercept(rspData, req, res, function(err, rsp, sent) {
+            intercept(rspData, req, res, function(err, rspd, sent) {
               if (err) {
                 return next(err);
               }
+
+	      var encode = 'utf8';
+              if (rsp.headers && rsp.headers['content-type']) {
+                var contentType = rsp.headers['content-type'];
+                if (/charset=/.test(contentType)) {
+                  var attrs = contentType.split(';').map(function(str) { return str.trim(); });
+                  for(var i = 0, len = attrs.length; i < len; i++) {
+                      var attr = attrs[i];
+                    if (/charset=/.test(attr)) {
+		      // encode = attr.split('=')[1];
+                      break;
+                    }
+                  }
+                }
+              }
+
+              if (typeof rspd == 'string') 
+                rspd = new Buffer(rspd, encode);
 
-              if (typeof rsp == 'string') 
-                rsp = new Buffer(rsp, 'utf8');
-              
-              if (!Buffer.isBuffer(rsp)) {
+              if (!Buffer.isBuffer(rspd)) {
                 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) {
+                res.set('content-length', rspd.length);
+              else if (rspd.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);
+              if (!sent) {
+                res.send(rspd);
+              }
             });
           } else {
             res.send(rspData);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-http-proxy",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "http proxy middleware for express",
   "main": "index.js",
   "scripts": {
@@ -27,27 +27,34 @@
   },
   "devDependencies": {
     "express": "^4.3.1",
+    "iconv": "^2.1.4",
     "jshint": "^2.5.5",
-    "mocha": "^1.19.0",
+    "mocha": "^2.1.0",
     "supertest": "^0.13.0"
   },
   "dependencies": {
     "type-is": "^1.2.0",
     "raw-body": "^1.1.6"
   },
-  "contributors": [{
+  "contributors": [
+    {
       "name": "Liam Bennett"
-    }, {
+    },
+    {
       "name": "eldereal",
       "url": "https://github.com/eldereal"
-    }, {
+    },
+    {
       "name": "Saulius Menkevičius",
       "url": "https://github.com/razzmatazz"
-    }, {
+    },
+    {
       "name": "Jérémy Lal",
       "email": "kapouer@melix.org"
-    }, {
+    },
+    {
       "name": "Wei Gao",
       "email": "jky239@gmail.com"
-    }]
+    }
+  ]
 }

test/test.js

@@ -65,7 +65,43 @@ describe('http-proxy', function() {
         });
     });
 
+    it('test intercept on html response',function(done) {
+      var app = express();
+      app.use(proxy('httpbin.org', {
+        intercept: function(data, req, res, cb) {
+          data = data.toString().replace('Oh','<strong>Hey</strong>');
+          assert(data !== "");
+          cb(null, data);
+        }
+      }));
+      
+      request(app)
+        .get('/html')
+        .end(function(err, res) {
+          if (err) return done(err);
+          assert(res.text.indexOf('<strong>Hey</strong>') > -1);
+          done();
+        });
+    });
 
+    it('test github api', function(done) {
+      var app = express();
+      app.use(proxy('https://api.github.com',  {
+        intercept: function(data, req, res, cb) {
+          var Iconv = require('iconv').Iconv;
+          var iconv = new Iconv('UTF-8', 'utf8');
+          cb(null, data);
+        }
+      }));
+
+      request(app)
+        .get('/')
+        .end(function(err, res) {
+          if (err) return done(err);
+          done();
+        });
+
+    });
   });