Merge pull request #23 from akashic-games/support-local-game.json

Support to run local game.json

packages/headless-driver-runner-v1/package.json

@@ -7,7 +7,7 @@
     "prepublish": "npm run build",
     "build": "rimraf ./lib && tsc -p ./tsconfig.json && npm run formatter",
     "formatter": "prettier --write \"src/**/*.ts\" --config ../prettier.config.js",
-    "test": "npm run build && npm run lint",
+    "test": "npm run lint",
     "lint": "tslint -c ../tslint.json src/**/*.ts -p tsconfig.json -e \"**/node_modules/**\""
   },
   "publishConfig": {
@@ -22,13 +22,11 @@
   "typings": "lib/index.d.ts",
   "dependencies": {
     "@akashic/engine-files": "1.1.9",
-    "@akashic/headless-driver-runner": "0.4.0",
-    "node-fetch": "2.3.0"
+    "@akashic/headless-driver-runner": "0.4.0"
   },
   "devDependencies": {
-    "@types/node-fetch": "2.1.2",
     "prettier": "^1.17.0",
-    "rimraf": "2.6.3",
+    "rimraf": "^2.6.3",
     "tslint": "^5.16.0",
     "typescript": "^3.4.5"
   }

packages/headless-driver-runner-v1/src/platform/assets/NodeScriptAsset.ts

@@ -1,5 +1,5 @@
 import { akashicEngine as g } from "@akashic/engine-files";
-import fetch from "node-fetch";
+import { loadFile } from "@akashic/headless-driver-runner";
 
 export class NodeScriptAsset extends g.ScriptAsset {
 	static PRE_SCRIPT: string = "(function(exports, require, module, __filename, __dirname) {\n";
@@ -12,8 +12,7 @@ export class NodeScriptAsset extends g.ScriptAsset {
 	}
 
 	_load(loader: g.AssetLoadHandler): void {
-		fetch(this.path, { method: "GET" })
-			.then(res => res.text())
+		loadFile<string>(this.path, { json: false })
 			.then(text => {
 				this.script = text;
 				return loader._onAssetLoad(this);

packages/headless-driver-runner-v1/src/platform/assets/NodeTextAsset.ts

@@ -1,10 +1,9 @@
 import { akashicEngine as g } from "@akashic/engine-files";
-import fetch from "node-fetch";
+import { loadFile } from "@akashic/headless-driver-runner";
 
 export class NodeTextAsset extends g.TextAsset {
 	_load(loader: g.AssetLoadHandler): void {
-		fetch(this.path, { method: "GET" })
-			.then(res => res.text())
+		loadFile<string>(this.path, { json: false })
 			.then(text => {
 				this.data = text;
 				return loader._onAssetLoad(this);

packages/headless-driver-runner-v2/package.json

@@ -7,7 +7,7 @@
     "prepublish": "npm run build",
     "build": "rimraf ./lib && tsc -p ./tsconfig.json && npm run formatter",
     "formatter": "prettier --write \"src/**/*.ts\" --config ../prettier.config.js",
-    "test": "npm run build && npm run lint",
+    "test": "npm run lint",
     "lint": "tslint -c ../tslint.json src/**/*.ts -p tsconfig.json -e \"**/node_modules/**\""
   },
   "publishConfig": {
@@ -22,13 +22,11 @@
   "typings": "lib/index.d.ts",
   "dependencies": {
     "@akashic/engine-files": "2.1.16",
-    "@akashic/headless-driver-runner": "0.4.0",
-    "node-fetch": "2.3.0"
+    "@akashic/headless-driver-runner": "0.4.0"
   },
   "devDependencies": {
-    "@types/node-fetch": "2.1.2",
     "prettier": "^1.17.0",
-    "rimraf": "2.6.3",
+    "rimraf": "^2.6.3",
     "tslint": "^5.16.0",
     "typescript": "^3.4.5"
   }

packages/headless-driver-runner-v2/src/platform/assets/NodeScriptAsset.ts

@@ -1,5 +1,5 @@
 import { akashicEngine as g } from "@akashic/engine-files";
-import fetch from "node-fetch";
+import { loadFile } from "@akashic/headless-driver-runner";
 
 export class NodeScriptAsset extends g.ScriptAsset {
 	static PRE_SCRIPT: string = "(function(exports, require, module, __filename, __dirname) {\n";
@@ -12,13 +12,14 @@ export class NodeScriptAsset extends g.ScriptAsset {
 	}
 
 	_load(loader: g.AssetLoadHandler): void {
-		fetch(this.path, { method: "GET" })
-			.then(res => res.text())
+		loadFile<string>(this.path, { json: false })
 			.then(text => {
 				this.script = text;
 				return loader._onAssetLoad(this);
 			})
-			.catch(e => loader._onAssetError(this, e));
+			.catch(e => {
+				loader._onAssetError(this, e);
+			});
 	}
 
 	execute(execEnv: g.ScriptAssetExecuteEnvironment): any {

packages/headless-driver-runner-v2/src/platform/assets/NodeTextAsset.ts

@@ -1,10 +1,9 @@
 import { akashicEngine as g } from "@akashic/engine-files";
-import fetch from "node-fetch";
+import { loadFile } from "@akashic/headless-driver-runner";
 
 export class NodeTextAsset extends g.TextAsset {
 	_load(loader: g.AssetLoadHandler): void {
-		fetch(this.path, { method: "GET" })
-			.then(res => res.text())
+		loadFile<string>(this.path, { json: false })
 			.then(text => {
 				this.data = text;
 				return loader._onAssetLoad(this);

packages/headless-driver-runner/package.json

@@ -7,7 +7,7 @@
     "prepublish": "npm run build",
     "build": "rimraf ./lib && tsc -p ./tsconfig.json && npm run formatter",
     "formatter": "prettier --write \"src/**/*.ts\" --config ../prettier.config.js",
-    "test": "npm run build && npm run lint",
+    "test": "npm run lint",
     "lint": "tslint -c ../tslint.json src/**/*.ts -p tsconfig.json -e \"**/node_modules/**\""
   },
   "publishConfig": {
@@ -23,12 +23,12 @@
   "dependencies": {
     "@akashic/amflow": "0.2.2",
     "@akashic/trigger": "0.1.5",
-    "node-fetch": "2.3.0"
+    "node-fetch": "2.5.0"
   },
   "devDependencies": {
-    "@types/node-fetch": "2.1.2",
+    "@types/node-fetch": "2.3.3",
     "prettier": "^1.16.0",
-    "rimraf": "2.6.3",
+    "rimraf": "^2.6.3",
     "tslint": "^5.16.0",
     "typescript": "^3.4.5"
   }

packages/headless-driver-runner/src/Platform.ts

@@ -1,5 +1,5 @@
 import { AMFlow } from "@akashic/amflow";
-import fetch from "node-fetch";
+import { loadFile } from "./utils";
 
 export interface PlatformParameters {
 	assetBaseUrl: string;
@@ -30,13 +30,8 @@ export abstract class Platform {
 	}
 
 	loadGameConfiguration(url: string, callback: (err: Error, data?: object) => void): void {
-		fetch(url, { method: "GET" })
-			.then(res => res.json())
-			.then(data => {
-				callback(null, data);
-			})
-			.catch(e => {
-				callback(e);
-			});
+		loadFile<any>(url, { json: true })
+			.then(json => callback(null, json))
+			.catch(e => callback(e));
 	}
 }

packages/headless-driver-runner/src/Runner.ts

@@ -11,6 +11,7 @@ export interface RunnerParameters {
 	runnerId: string;
 	amflow: AMFlow;
 	executionMode: RunnerExecutionMode;
+	external?: { [key: string]: string };
 	gameArgs?: any;
 	player?: RunnerPlayer;
 }
@@ -73,6 +74,10 @@ export abstract class Runner {
 		return this.params.player;
 	}
 
+	get external(): { [key: string]: string } | undefined {
+		return this.params.external;
+	}
+
 	constructor(params: RunnerParameters) {
 		this.params = params;
 	}

packages/headless-driver-runner/src/index.ts

@@ -1,3 +1,4 @@
 export * from "./Runner";
 export * from "./Platform";
 export * from "./Looper";
+export * from "./utils";

packages/headless-driver-runner/src/utils.ts

@@ -0,0 +1,36 @@
+import { readFileSync } from "fs";
+import fetch from "node-fetch";
+
+export interface ReadFileOption {
+	encoding?: string;
+	json?: boolean;
+}
+
+/**
+ * テキストファイルの読み込みを行う。
+ *
+ * @param url url または path
+ */
+export async function loadFile(url: string): Promise<string>;
+
+/**
+ * ファイルの読み込みを行う。
+ *
+ * @param url url または path
+ * @param opt オプション
+ */
+export async function loadFile<T>(url: string, opt?: ReadFileOption): Promise<T>;
+
+export async function loadFile<T>(url: string, opt?: ReadFileOption): Promise<T> {
+	if (isHttpProtocol(url)) {
+		const res = await fetch(url, { method: "GET" });
+		return opt.json ? res.json() : res.text();
+	} else {
+		const str = readFileSync(url, { encoding: opt.encoding ? opt.encoding : "utf8" });
+		return opt.json ? JSON.parse(str) : str;
+	}
+}
+
+export function isHttpProtocol(url: string): boolean {
+	return /^(http|https)\:\/\//.test(url);
+}

packages/headless-driver/package.json

@@ -10,7 +10,7 @@
     "prepublish": "npm run build",
     "build": "rimraf ./lib && tsc -p ./tsconfig.json && npm run formatter",
     "formatter": "prettier --write \"src/**/*.ts\" --config ../prettier.config.js",
-    "test": "npm run build && npm run run:jest && npm run lint",
+    "test": "npm run run:jest && npm run lint",
     "run:jest": "jest",
     "lint": "tslint -c ../tslint.json -p tsconfig.json -e \"**/node_modules/**\""
   },
@@ -29,14 +29,12 @@
     "@akashic/playlog": "1.3.1",
     "@akashic/trigger": "0.1.5",
     "js-sha256": "0.9.0",
-    "lodash.clonedeep": "4.5.0",
-    "node-fetch": "2.3.0"
+    "lodash.clonedeep": "4.5.0"
   },
   "devDependencies": {
     "@types/get-port": "4.0.0",
     "@types/jest": "24.0.12",
     "@types/lodash.clonedeep": "4.5.4",
-    "@types/node-fetch": "2.1.2",
     "get-port": "^5.0.0",
     "jest": "^24.8.0",
     "prettier": "^1.17.0",