Support proxy other servers

* lint code
* fix some uint tests

Author: WhatAKitty

.eslintrc.json

@@ -1,7 +1,8 @@
 {
     "parser": "babel-eslint",
     "env": {
-        "browser": true
+        "browser": true,
+        "es6": true
     },
     "extends": "eslint:recommended",
     "rules": {

.gitignore

@@ -36,8 +36,5 @@ jspm_packages
 # Optional REPL history
 .node_repl_history
 
-# outpu
-dist/
-
 # MACOS
 .DS_Store

.npmignore

@@ -2,6 +2,5 @@
 logs
 *.log
 __mocks__
-dist
 node_modules
 example

README.md

@@ -13,7 +13,7 @@ So, I create one by myself.
 ## Roadmap
 - [x] Combined with Mock.js
 - [x] Support exclude for some other path
-- [ ] Proxy for other api server
+- [x] Proxy for other api server
 - [ ] Support RAP system
 
 ## Usage
@@ -64,8 +64,15 @@ if (__dev__) {
     fetch: global.fetch,
     exclude: [
       'http://www.google.com',
-      /^foo(bar)?$/i,
+      '/foo(.*)',
     ],
+    proxy: [{
+      path: '/path/for/proxy(.*)',
+      target: 'http://other.proxy.server',
+      process: (proxied, matches) => {
+        return `${proxied.target}${matches[1]}`,
+      },
+    }],
   }).fetch;
 }
 

__mocks__/index.js

@@ -1,4 +1,4 @@
-import { Mock } from '../';
+import { Mock } from '../src';
 
 export default {
   '/api/users': ({ params }) => {

dist/index.js

@@ -0,0 +1,145 @@
+Object.defineProperty(exports,"__esModule",{value:true});exports.Mock=undefined;var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _mockjs=require('mockjs');Object.defineProperty(exports,'Mock',{enumerable:true,get:function get(){return _interopRequireDefault(_mockjs).
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+default;}});var _pathToRegexp=require('path-to-regexp');var _pathToRegexp2=_interopRequireDefault(_pathToRegexp);var _util=require('./util');var _response=require('./response');var _response2=_interopRequireDefault(_response);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}var FetchMock=function(){function FetchMock(required){var options=arguments.length>1&&arguments[1]!==undefined?arguments[1]:{fetch:function fetch(){},exclude:[],proxy:[]};_classCallCheck(this,FetchMock);if('object'!==typeof required){throw new Error('There is no required defined.');}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);}_createClass(FetchMock,[{key:'loadMocks',value:function loadMocks(required){var _this=this;var __mocks__=required.default||required;var mocks=Object.keys(__mocks__);mocks.forEach(function(key){_this.loadMock(key,__mocks__[key]);});}},{key:'loadMock',value:function loadMock(key,mock){var _this2=this;if('object'!==typeof mock){if('function'===typeof mock){var items=key.split(' ');var method=items.length===2?items[0]:'GET';var url=items.length===2?items[1]:key;this.urls.push({method:method,url:url,func:mock});}return;}var keys=Object.keys(mock);keys.map(function(key){_this2.loadMock(key,mock[key]);});}},{key:'matchReqUrl',value:function matchReqUrl(request){var insideParams=void 0;var filters=this.urls.filter(function(uri){var obj=(0,_util.matchUrl)(uri.url,request.url);if(obj.result&&uri.method.toUpperCase()===request.method.toUpperCase()){insideParams=obj.params;return true;}return false;});if(!filters||filters.length==0)throw new Error('No url '+request.url+' is defined.');request.urlparams=insideParams;return{request:request,mock:filters[0]};}},{key:'isExclude',value:function isExclude(url){for(var i=0;i<this.exclude.length;i++){var excludeUrl=this.exclude[i];if(excludeUrl===url||(0,_pathToRegexp2.default)(''+excludeUrl).exec(url)!==null){return true;}}return false;}},{key:'isProxied',value:function isProxied(url){if(this.proxy.length===0)return false;var proxied=this.proxy.filter(function(item){return(0,_pathToRegexp2.default)(''+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];}},{key:'proxied',value:function proxied(url){var matches=void 0,proxied=void 0;this.proxy.forEach(function(item){var tmp=(0,_pathToRegexp2.default)(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];}},{key:'fetch',value:function fetch(url,options){if(this.isProxied(url)){url=this.proxied(url);}if(this.isExclude(url)){return this.raw(url,options);}var _matchReqUrl=this.matchReqUrl((0,_util.parseRequest)(url,options)),request=_matchReqUrl.request,mock=_matchReqUrl.mock;if('function'!==typeof mock.func){throw new Error('There is no url defined in __mocks__');}var obj=mock.func(request);if((0,_util.isNull)(obj)){throw'response data should not be undefined or null, it will be an object or an array at least';}if((0,_util.isNull)(obj.status)){obj={status:200,data:obj};}var response=new _response2.default(obj);return Promise.resolve(response);}}]);return FetchMock;}();exports.default=FetchMock;

dist/response.js

@@ -0,0 +1,39 @@
+Object.defineProperty(exports,"__esModule",{value:true});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}
+var _status=Symbol('status');
+var _data=Symbol('data');
+var _statusText=Symbol('statusText');var
+
+Response=function(){
+function Response(_ref)
+
+
+
+{var status=_ref.status,_ref$data=_ref.data,data=_ref$data===undefined?{}:_ref$data,_ref$statusText=_ref.statusText,statusText=_ref$statusText===undefined?'':_ref$statusText;_classCallCheck(this,Response);
+this[_status]=status;
+this[_data]=data;
+this[_statusText]=statusText;
+}_createClass(Response,[{key:'text',value:function text()
+
+
+
+
+
+
+
+
+
+{
+try{
+return Promise.resolve(JSON.stringify(this[_data]));
+}catch(err){
+return Promise.reject(new Error('failed text invoke.'));
+}
+}},{key:'json',value:function json()
+
+{
+return this[_data];
+}},{key:'status',get:function get(){return this[_status];}},{key:'statusText',get:function get(){return this[_statusText];}}]);return Response;}();exports.default=
+
+
+
+Response;

dist/util.js

@@ -0,0 +1,131 @@
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};
+var isNull=function isNull(obj){
+if('undefined'===typeof obj||obj===null){
+return true;
+}
+
+return false;
+};
+
+var removeProctol=function removeProctol(url){
+var index=-1;
+if((index=url.indexOf('://'))>-1){
+
+return url.substring(index);
+}
+return url;
+};
+
+var parseParamStr=function parseParamStr(paramStr,isGet){
+var params={};
+var paramPairs=paramStr.split('&');
+for(var i=0;i<paramPairs.length;i++){
+var paramPair=paramPairs[i];
+if(paramPair.indexOf('=')===-1){
+continue;
+}
+var paramPairArray=paramPair.split('=');
+
+var paramValue=isGet?decodeURI(paramPairArray[1]):paramPairArray[1];
+params[paramPairArray[0]]=paramPairArray.length===2?paramValue:null;
+}
+return params;
+};
+
+var parseBody=function parseBody(body){
+if('object'===typeof body){
+return body;
+}
+try{
+return JSON.parse(body);
+}catch(e){
+return parseParamStr(body);
+}
+};
+
+var parseUrl=function parseUrl(url){
+var index=url.indexOf('?');
+var items=index>-1?url.split('?'):[url];
+if(items.length===1){
+return{
+url:items[0],
+params:{}};
+
+}
+
+return{
+url:items[0],
+params:parseParamStr(items[1],true)};
+
+};
+
+var parseRequest=function parseRequest(url){var options=arguments.length>1&&arguments[1]!==undefined?arguments[1]:{};
+var urlObj=parseUrl(url);
+var data=parseBody(options.body||{});
+return{
+method:options.method||'GET',
+url:urlObj.url,
+headers:options.headers,
+params:_extends({},urlObj.params,data)};
+
+};
+
+var prueUrl=function prueUrl(url){
+var index=url.indexOf('?');
+var result=index>-1?url.substring(0,index):url;
+return result;
+};
+
+var matchUrl=function matchUrl(sourceUrl,targetUrl){
+if(sourceUrl===targetUrl){
+return{
+result:true,
+params:{}};
+
+}
+var sourceUrlWithoutProctol=removeProctol(sourceUrl);
+var targetUrlWithoutProctol=removeProctol(targetUrl);
+var sourceUrlSplits=sourceUrlWithoutProctol.split('/');
+var targetUrlSplits=targetUrlWithoutProctol.split('/');
+
+if(sourceUrlSplits.length!==targetUrlSplits.length){
+return{
+result:false};
+
+}
+
+var params={};
+for(var i=0;i<sourceUrlSplits.length;i++){
+var sourceUrlSplit=sourceUrlSplits[i];
+var targetUrlSplit=targetUrlSplits[i];
+if(sourceUrlSplit===targetUrlSplit){
+continue;
+}
+
+if(sourceUrlSplit.startsWith('{')&&sourceUrlSplit.endsWith('}')){
+if(sourceUrlSplit.replace(/[^{]/g,'').length>1||sourceUrlSplit.replace(/[^}]/g,'').length>1){
+return{
+result:false};
+
+}
+
+params[sourceUrlSplit.substring(1,sourceUrlSplit.length-1)]=targetUrlSplit;
+continue;
+}
+return{
+result:false};
+
+}
+
+return{
+result:true,
+params:params};
+
+};exports.
+
+
+isNull=isNull;exports.
+prueUrl=prueUrl;exports.
+parseUrl=parseUrl;exports.
+parseRequest=parseRequest;exports.
+matchUrl=matchUrl;

index.js

@@ -1 +1 @@
-module.exports = require('./src');
+module.exports = require('./dist');