Merge pull request #7 from vagusX/dev

support express-styles route

Author: vagusX

examples/server.js

@@ -12,15 +12,25 @@ const proxyTable = {
   '/octocat': 'https://api.github.com/users',
   '/api': {
     target: 'http://localhost:8111',
+    logs: true,
     headers: {
       'X_HOST_S': 'google.com'
     }
   },
-  '/users': {
+  '/tenant/:id': params => {
+    return {
+      target: 'http://localhost:8111',
+      logs: true,
+      headers: {
+        'X_HOST_S': 'google.com'
+      }
+    }
+  },
+  '/users/:id': {
     target: 'https://api.github.com',
     changeOrigin: true,
     logs: true,
-    agent: proxy ? new HttpsProxyAgent(agentUrl) : null,
+    agent: agentUrl ? new HttpsProxyAgent(agentUrl) : null,
     headers: {
       'XHostS': 'google.com'
     },
@@ -38,12 +48,11 @@ const proxyTable = {
 
 const app = new Koa()
 
-app.use((ctx, next) => {
-  return next()
-  .then(() => {
-    ctx.request.headers['X-Request-Header'] = 'test'
-    ctx.response.headers['X-Response-Header'] = 'test'
-  })
+app.use(async (ctx, next) => {
+  // console.log('-----------------')
+  // console.log(ctx.request.headers)
+  // console.log('-----------------')
+  await next()
 })
 
 Object.keys(proxyTable).forEach(context => {

index.js

@@ -3,34 +3,45 @@
  */
 
 const HttpProxy = require('http-proxy')
+const pathMatch = require('path-match')
 
 /**
  * Constants
  */
 
 const proxy = HttpProxy.createProxyServer()
+const route = pathMatch({
+  // path-to-regexp options
+  sensitive: false,
+  strict: false,
+  end: false
+})
 
 /**
  * Koa Http Proxy Middleware
  */
-
 module.exports = (context, options) => (ctx, next) => {
-  if (!ctx.req.url.startsWith(context)) return next()
+  // create a match function
+  const match = route(context)
+  if (!match(ctx.req.url)) return next()
 
   let opts = options
   if (typeof options === 'function') {
-    opts = options.call(options)
+    const params = match(ctx.req.url)
+    opts = options.call(options, params)
   }
 
   const { logs, rewrite, events } = opts
 
   return new Promise((resolve, reject) => {
-    if (logs) logger(ctx)
+    ctx.req.oldPath = ctx.req.url
 
     if (typeof rewrite === 'function') {
       ctx.req.url = rewrite(ctx.req.url)
     }
 
+    if (logs) logger(ctx)
+
     if (events && typeof events === 'object') {
       Object.entries(events).forEach(([event, handler]) => {
         proxy.on(event, handler)
@@ -53,5 +64,5 @@ module.exports = (context, options) => (ctx, next) => {
 }
 
 function logger (ctx) {
-  console.log('%s - %s %s', new Date().toISOString(), ctx.req.method, ctx.req.url)
+  console.log('%s - %s %s proxy to -> %s', new Date().toISOString(), ctx.req.method, ctx.req.oldPath, ctx.req.url)
 }

package-lock.json

@@ -32,6 +32,7 @@
     "validate-commit-message": "^3.0.1"
   },
   "dependencies": {
-    "http-proxy": "^1.16.2"
+    "http-proxy": "^1.16.2",
+    "path-match": "^1.2.4"
   }
 }