:update:

Author: zyao89

index.js

@@ -29,16 +29,9 @@ const PROXY = require('./lib/Proxy');
  * @param {*} opts
  */
 
-const middleware = function(context, opts) {
-    const proxy = new PROXY(context, opts);
-    return proxy;
+module.exports = function(context, opts) {
+    return new PROXY(context, opts);
 };
-middleware.upgrade = function(context, opts) {
-    const proxy = new PROXY(context, opts);
-    return proxy.upgrade;
-};
-
-module.exports = middleware
 
 /*
 

lib/Proxy.js

@@ -12,15 +12,17 @@ const contextMatcher = require('./context-matcher');
 const Router = require('./router');
 
 function PROXY(context, opts) {
-    let _wsInitialized = false;
+    // https://github.com/chimurai/http-proxy-middleware/issues/57
+    const wsUpgradeDebounced = utility.debounce(_handleUpgrade);
+    let wsInitialized = false;
     const config = createConfig(context, opts);
     const proxyOptions = config.options;
+
     // create proxy
     const proxy = httpProxy.createProxyServer({});
-    // ws
-    const upgrade = _initUpgrade();
 
     const pathRewriter = PathRewriter.create(proxyOptions.pathRewrite); // returns undefined when "pathRewrite" is not provided
+
     // attach handler to http-proxy events
     handlers.init(proxy, proxyOptions);
 
@@ -30,12 +32,10 @@ function PROXY(context, opts) {
     // 新增加的功能
     proxy.on('proxyRes', _handleProxyResBody);
 
-    // server.on('upgrade', proxy.upgrade);  // <-- directly subscribe to server's upgrade event.
-    function _initUpgrade() {
-        // https://github.com/chimurai/http-proxy-middleware/issues/57
-        const wsUpgradeDebounced = utility.debounce(_handleUpgrade);
-        return wsUpgradeDebounced;
-    }
+
+    // https://github.com/chimurai/http-proxy-middleware/issues/19
+    // expose function to upgrade externally
+    middleware.upgrade = wsUpgradeDebounced;
 
     function _handleLogError(err, req /* res */) {
         const hostname = (req.headers && req.headers.host) || (req.hostname || req.host); // (websocket) || (node0.10 || node 4/5)
@@ -101,7 +101,7 @@ function PROXY(context, opts) {
         // subscribe once; don't subscribe on every request...
         // https://github.com/chimurai/http-proxy-middleware/issues/113
         if (!_wsInitialized) {
-            server.on('upgrade', upgrade);
+            server.on('upgrade', wsUpgradeDebounced);
             _wsInitialized = true;
         }
     }
@@ -123,6 +123,12 @@ function PROXY(context, opts) {
         return newProxyOptions;
     }
 
+    middleware.upgrade = wsUpgradeDebounced;
+
+    logger.system('inited...');
+
+    return middleware;
+
     async function middleware(ctx, next) {
         const req = ctx.req;
         const res = ctx.res;
@@ -153,12 +159,6 @@ function PROXY(context, opts) {
 
         await next();
     }
-
-    middleware.upgrade = upgrade;
-
-    logger.system('inited...');
-
-    return middleware;
 }
 
 // Modify option.target when router present.

package.json

@@ -1,50 +1,52 @@
 {
-  "name": "@2o3t/koa2-proxy-middleware",
-  "version": "0.0.1",
-  "description": "http proxy middleware for koa2",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "files": [
-      "lib"
-  ],
-  "keywords": [
-    "http-proxy-middleware",
-    "koa-proxy-middleware",
-    "koa2-proxy-middleware",
-    "middleware",
-    "proxy",
-    "koa2",
-    "reverse",
-    "http",
-    "https",
-    "connect",
-    "websocket",
-    "ws",
-    "cors"
-  ],
-  "author": "Zyao89 <[email protected]>",
-  "license": "MIT",
-  "dependencies": {
-    "2o3t-logger": "^0.3.9",
-    "2o3t-utility": "^0.1.2",
-    "http-proxy": "^1.17.0",
-    "lodash": "^4.17.11"
-  },
-  "devDependencies": {
-    "eslint-config-2o3t": "^1.1.4",
-    "koa": "^2.7.0"
-  },
-  "engines": {
-      "node": ">= 8.0.0"
-  },
-  "bugs": {
-    "url": "https://github.com/2o3t/koa2-proxy-middleware/issues"
-  },
-  "homepage": "https://github.com/2o3t/koa2-proxy-middleware",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/2o3t/koa2-proxy-middleware.git"
-  }
+    "name": "@2o3t/koa2-proxy-middleware",
+    "version": "0.0.3",
+    "description": "http proxy middleware for koa2",
+    "main": "index.js",
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1"
+    },
+    "files": [
+        "lib"
+    ],
+    "keywords": [
+        "koa-proxy",
+        "koa2-proxy",
+        "http-proxy-middleware",
+        "koa-proxy-middleware",
+        "koa2-proxy-middleware",
+        "middleware",
+        "proxy",
+        "koa2",
+        "reverse",
+        "http",
+        "https",
+        "connect",
+        "websocket",
+        "ws",
+        "cors"
+    ],
+    "author": "Zyao89 <[email protected]>",
+    "license": "MIT",
+    "dependencies": {
+        "2o3t-logger": "^0.3.9",
+        "2o3t-utility": "^0.1.2",
+        "http-proxy": "^1.17.0",
+        "lodash": "^4.17.11"
+    },
+    "devDependencies": {
+        "eslint-config-2o3t": "^1.1.4",
+        "koa": "^2.7.0"
+    },
+    "engines": {
+        "node": ">= 8.0.0"
+    },
+    "bugs": {
+        "url": "https://github.com/2o3t/koa2-proxy-middleware/issues"
+    },
+    "homepage": "https://github.com/2o3t/koa2-proxy-middleware",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/2o3t/koa2-proxy-middleware.git"
+    }
 }