Merge branch 'dev' into 'master'

Dev

See merge request !2

bin/game-cli-mock.js

@@ -5,6 +5,7 @@ const jsonServer = require('./json-server');
 program
 	.option('-h, --host [string]', 'server host', 'localhost')
 	.option('-p, --port [number]', 'server port', 3000)
+	.option('--proxy [string]', 'server proxy address')
 	.option('-f, --folder [string]', 'folder of json files', './')
 	.option('-k, --key-file [string]', 'ssl key file')
 	.option('-c, --cert-file [string]', 'ssl cert file')
@@ -16,6 +17,7 @@ async function execute() {
 	jsonServer.start({
 		host: program.host,
 		port: program.port,
+		proxy: program.proxy,
 		folder: program.folder,
 		keyFile: program.keyFile,
 		certFile: program.certFile,

bin/json-server/index.js

@@ -8,10 +8,11 @@ const path = require('path');
 const fs = require('fs');
 const http = require('http');
 const https = require('https');
+const httpProxy = require('http-proxy');
+const proxyServer = httpProxy.createProxyServer({});
 
-let jsonPath;
-
-function handler(request, response) {
+function handler(jsonPath, proxy) {
+	return function (request, response) {
 		const {url} = request;
 
 		if (url === '/favicon.ico') {
@@ -20,9 +21,25 @@ function handler(request, response) {
 			return;
 		}
 
+		const headers = {
+			'Content-Type': 'application/json',
+			'Access-Control-Allow-Origin': '*',
+			'Access-Control-Allow-Methods': 'POST,GET,PUT,OPTIONS',
+			'Access-Control-Allow-Headers': 'Content-Type,Access-Token',
+		};
+
+		if (proxy) {
+			const target = proxy.startsWith('http') ? proxy : `http://${proxy}`;
+			console.log(`proxy: ${target}${url}`)
+			Object.entries(headers).forEach(([key, val]) => response.setHeader(key, val));
+			return proxyServer.web(request, response, { target }, err => {
+				console.log(err);
+			})
+		}
+		
 		const pos = url.indexOf('?');
 		const fileUri = pos < 0 ? url : url.substring(0, pos);
-	console.log(request.method, fileUri);
+		console.log('mook: ', request.method, fileUri);
 	
 		const filePath = path.join(jsonPath, fileUri);
 		let content, targetFile;
@@ -31,7 +48,7 @@ function handler(request, response) {
 			content = fs.readFileSync(targetFile, 'utf-8');
 		} else if (fs.existsSync(targetFile = filePath + '/index.js')) {
 			try {
-			const jsonObject = require(targetFile);
+				const jsonObject = require(targetFile)();
 				content = JSON.stringify(jsonObject);
 			} catch (e) {
 				console.log(e);
@@ -39,12 +56,6 @@ function handler(request, response) {
 			}
 		}
 
-	const headers = {
-		'Content-Type': 'application/json',
-		'Access-Control-Allow-Origin': '*',
-		'Access-Control-Allow-Methods': 'POST,GET,PUT,OPTIONS',
-		'Access-Control-Allow-Headers': 'Content-Type,Access-Token',
-	};
 	
 		if (content) {
 			response.writeHead(200, headers);
@@ -56,13 +67,13 @@ function handler(request, response) {
 			}))
 		}
 		response.end();
+	}
 }
 
 exports.start = function (options) {
 	return new Promise((resolve, reject) => {
-		const {port, host, folder, keyFile, certFile} = options;
-
-		jsonPath = path.resolve(folder);
+		const {port, host, proxy, folder, keyFile, certFile} = options;
+		const jsonPath = path.resolve(folder);
 		if (fs.existsSync(jsonPath)) {
 			let sslOpts;
 			if(keyFile && certFile){
@@ -77,7 +88,7 @@ exports.start = function (options) {
 				}
 			}
 
-			const server = sslOpts ? https.createServer(sslOpts, handler) : http.createServer(handler);
+			const server = sslOpts ? https.createServer(sslOpts, handler(jsonPath, proxy)) : http.createServer(handler(jsonPath, proxy));
 
 			server.on('error', (err) => {
 				reject(err.message);

game-cli.iml

@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
\ No newline at end of file

package.json

@@ -15,6 +15,7 @@
     "commander": "^2.18.0",
     "fs-extra": "^6.0.1",
     "global-modules": "^2.0.0",
+    "http-proxy": "^1.17.0",
     "progress": "^2.0.0",
     "serve-handler": "^5.0.5",
     "yarn-config-directory": "^1.0.2"