Support proxy other server

* Using pathToRgexp instead pure regexp

Author: WhatAKitty

package.json

@@ -43,6 +43,7 @@
     "mocha": "^4.0.1"
   },
   "dependencies": {
-    "mockjs": "^1.0.1-beta3"
+    "mockjs": "^1.0.1-beta3",
+    "path-to-regexp": "^2.1.0"
   }
 }

src/index.js

@@ -1,10 +1,12 @@
+import pathToRegexp from 'path-to-regexp';
 import { parseRequest, matchUrl, isNull } from './util';
 import Response from './response';
 
 class FetchMock {
   constructor(required, options = {
     fetch: () => {},
     exclude: [],
+    proxy: [],
   }) {
     if ('object' !== typeof required) {
       throw new Error('There is no required defined.');
@@ -13,10 +15,13 @@ class FetchMock {
     this.urls = [];
     this.raw = options.fetch;
     this.exclude = options.exclude;
+    this.proxy = options.proxy;
 
     this.loadMocks = this.loadMocks.bind(this);
     this.loadMock = this.loadMock.bind(this);
     this.matchReqUrl = this.matchReqUrl.bind(this);
+    this.isExclude = this.isExclude.bind(this);
+    this.isProxied = this.isProxied.bind(this);
     this.fetch = this.fetch.bind(this);
 
     this.loadMocks(required);
@@ -60,7 +65,7 @@ class FetchMock {
       }
       return false;
     });
-    if (!filters || filters.length == 0) throw new Error(`No url ${url} is defined.`);
+    if (!filters || filters.length == 0) throw new Error(`No url ${request.url} is defined.`);
     request.urlparams = insideParams;
     return {
       request,
@@ -71,14 +76,42 @@ class FetchMock {
   isExclude(url) {
     for (let i = 0; i < this.exclude.length; i++) {
       const excludeUrl = this.exclude[i];
-      if (excludeUrl === url || (excludeUrl instanceof RegExp && excludeUrl.exec(url) !== null)) {
+      if (excludeUrl === url || pathToRegexp(`${excludeUrl}`).exec(url) !== null) {
         return true;
       }
     }
     return false;
   }
 
+  isProxied(url) {
+    if (this.proxy.length === 0) return false;
+    const proxied = this.proxy.filter(item => pathToRegexp(`${item.path}`).exec(url) !== null);
+    if (proxied.length > 1) throw new Error(`${url} proxied has two proxies, you should specific only one`);
+
+    return proxied[0];
+  }
+
+  proxied(url) {
+    // get proxied info
+    let matches, proxied;
+    this.proxy.forEach(item => {
+      const tmp = pathToRegexp(item.path).exec(url);
+      if (tmp.length > 1) {
+        matches = tmp;
+        proxied = item;
+        return false;
+      }
+    });
+
+    return proxied.process ? proxied.process(proxied, matches) : `${proxied.target}/${matches[1]}`;
+  }
+
   fetch(url, options) {
+    // using proxy
+    if (this.isProxied(url)) {
+      url = this.proxied(url);
+    }
+
     // using raw fetch while match exclude
     if (this.isExclude(url)) {
       // using raw fetch

test/index.test.js

@@ -5,9 +5,17 @@ import FetchMock, { Mock } from '../';
 const fetch = new FetchMock(require('../__mocks__'), {
   fetch: require('isomorphic-fetch'),
   exclude: [
-    /^foo(bar)?$/i,
-    /http:\/\/www.baidu.com/,
+    '/foo/boo/:foo*',
+    'http://:foo*',
+    'https://:foo*',
   ],
+  proxy: [{
+    path: '/taobao/search(.*)',
+    target: 'https://suggest.taobao.com/sug',
+    process: ({ target }, matches) => {
+      return `${target}${matches[1]}`
+    }
+  }],
 }).fetch;
 describe('test fetch mock', () => {
   it('fetch /api/users data', async () => {
@@ -146,4 +154,15 @@ describe('test fetch mock', () => {
     expect(data).to.be.an('object');
     expect(data.userId).to.be.eql(123);
   });
+
+  it('proxy other api server', async () => {
+    const response = await fetch('/taobao/search?code=utf-8&q=dongxi');
+    const { status } = response;
+    const data = await response.json();
+    expect(status).to.be.eql(200);
+    expect(data).not.to.be(undefined);
+    expect(data).not.to.be.empty();
+    expect(data).to.be.an('object');
+    expect(data.result).to.be.an('array');
+  });
 });

yarn.lock

@@ -2003,6 +2003,10 @@ path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "http://registry.npm.taobao.org/path-is-inside/download/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
 
+path-to-regexp@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-2.1.0.tgz#7e30f9f5b134bd6a28ffc2e3ef1e47075ac5259b"
+
 performance-now@^0.2.0:
   version "0.2.0"
   resolved "http://registry.npm.taobao.org/performance-now/download/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"