Merge pull request #2 from oxygens/master

oxygen · web-flow · commit 011e410040ad · 2017-04-19T17:27:12.000+03:00
Minor changes.
diff --git a/.babelrc b/.babelrc
diff --git a/builds/browser/es5/jsonrpc.js b/builds/browser/es5/jsonrpc.js
diff --git a/builds/browser/es5/jsonrpc.js.map b/builds/browser/es5/jsonrpc.js.map
diff --git a/index.js b/index.js
@@ -1,4 +1,5 @@
-const objExports = {};
+// Do not use const here, webpack/babel issues.
+var objExports = {};
 
 objExports.Client = require("./src/Client");
 objExports.ClientPluginBase = require("./src/ClientPluginBase");
diff --git a/index_webpack.js b/index_webpack.js
@@ -1,4 +1,5 @@
-const objExports = {
+// Do not use const here, webpack/babel issues.
+var objExports = {
 	JSONRPC: require("./index")
 };
 
diff --git a/package.json b/package.json
@@ -37,8 +37,8 @@
   },
   "dependencies": {
     "crypto-js": "^3.1.9-1",
+    "jssha": "^2.2.0",
     "node-fetch": "^1.6.3",
-    "sleep-promise": "2.0.0",
     "ws": "^2.2.3"
   },
   "devDependencies": {
@@ -47,14 +47,15 @@
     "babel-eslint": "*",
     "babel-loader": "*",
     "babel-plugin-async-to-promises": "*",
-    "babel-plugin-transform-runtime": "*",
+    "babel-plugin-remove-comments": "*",
     "babel-polyfill": "*",
     "babel-preset-es2015": "*",
     "babel-preset-stage-3": "*",
     "babel-runtime": "*",
     "eslint": "*",
     "eslint-plugin-jsdoc": "*",
     "phantom": "^4.0.2",
-    "webpack": "*"
+    "webpack": "*",
+    "sleep-promise": "*"
   }
 }
diff --git a/src/Plugins/Client/SignatureAdd.js b/src/Plugins/Client/SignatureAdd.js
@@ -1,9 +1,9 @@
 const JSONRPC = {};
 JSONRPC.ClientPluginBase = require("../../ClientPluginBase");
 
+// const JSSHA = require("jssha");
 const HMAC_SHA256 = require("crypto-js/hmac-sha256");
 
-
 /**
  * This has purpose at Bigstep (the company which originally created this project).
  * It is intended to be used only together with Bigstep extending API clients.
@@ -58,6 +58,10 @@ class SignatureAdd extends JSONRPC.ClientPluginBase
 	 */
 	async afterJSONEncode(outgoingRequest)
 	{
+		/*const sha = new JSSHA("SHA-256", "TEXT");
+		sha.setHMACKey(this.strAPIKey, "TEXT");
+		sha.update(outgoingRequest.requestBody);
+		let strVerifyHash = sha.getHMAC("HEX");*/
 		let strVerifyHash = HMAC_SHA256(outgoingRequest.requestBody, this.strAPIKey);
 
 		if(this.strKeyMetaData !== null)
diff --git a/src/Plugins/Client/index.js b/src/Plugins/Client/index.js
@@ -1,4 +1,5 @@
-const objExports = {};
+// Do not use const here, webpack/babel issues.
+var objExports = {};
 
 objExports.DebugLogger = require("./DebugLogger");
 objExports.PrettyBrowserConsoleErrors = require("./PrettyBrowserConsoleErrors");
diff --git a/src/Plugins/Server/index.js b/src/Plugins/Server/index.js
@@ -1,4 +1,5 @@
-const objExports = {};
+// Do not use const here, webpack/babel issues.
+var objExports = {};
 
 objExports.DebugLogger = require("./DebugLogger");
 objExports.AuthenticationSkip = require("./AuthenticationSkip");
diff --git a/tests/AllTests.js b/tests/AllTests.js
@@ -5,7 +5,7 @@ const url = require("url");
 const path = require("path");
 const fs = require("fs");
 
-const sleep = require("sleep-promise");
+//const sleep = require("sleep-promise");
 
 const Phantom = require("phantom");
 
@@ -222,6 +222,7 @@ class AllTests
 					(
 						objParsedURL.pathname.substr(0, "/tests/".length) === "/tests/"
 						|| objParsedURL.pathname.substr(0, "/builds/".length) === "/builds/"
+						|| objParsedURL.pathname.substr(0, "/node_modules/".length) === "/node_modules/"
 					)
 					&& incomingRequest.method === "GET"
 					&& !objParsedURL.pathname.includes("..")
@@ -236,6 +237,8 @@ class AllTests
 				}
 				else if(url.parse(incomingRequest.url).pathname.substr(0, 4) !== "/api")
 				{
+					console.error("[" + process.pid + "] Could not find static HTTP file: " + strFilePath);
+
 					serverResponse.statusCode = 404;
 					serverResponse.end();
 				}
@@ -901,7 +904,7 @@ class AllTests
 
 					console.log(
 						await phantomPage.evaluate(
-							function () {
+							function() {
 								return window.arrErrors;
 							}
 						)
@@ -923,7 +926,7 @@ class AllTests
 		//phantom.process.stdout.pipe(process.stdout);
 		//phantom.process.stderr.pipe(process.stderr);
 
-		const strContent = await phantomPage.property("content");
+		//const strContent = await phantomPage.property("content");
 		//console.log(strContent);
 
 
diff --git a/tests/Browser/index.html b/tests/Browser/index.html
@@ -20,7 +20,7 @@
 
 					client.rpc("ping", ["Calling from html es5 client."])
 						.then(function(result){arrErrors.push(result)})
-						.catch(function(error){arrErrors.psuh(error)})
+						.catch(function(error){arrErrors.push(error)})
 					;
 				}
 			);
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,41 +1,102 @@
 const path = require("path");
+const fs = require("fs");
 const webpack = require("webpack");
 
-module.exports = {
-	entry: [
-		"babel-polyfill",
-		"./index_webpack"
-	],
-	output: {
-		path: path.join(__dirname, "builds", "browser", "es5"),
-		filename: "jsonrpc.js",
-		libraryTarget: "umd"
-	},
-	devtool: "source-map",
-	module: {
-		loaders: [
-			{
-				test: /\.js$/,
-				include: [
-					path.resolve(__dirname, "src")
-				],
-				exclude: [
-					path.resolve(__dirname, "node_modules"),
-					path.resolve(__dirname, "tests")
-				],
-				loader: "babel-loader",
-				options: {
-					presets: ["es2015", "stage-3"],
-					plugins: ["async-to-promises"]
+const objPackageJSON = JSON.parse(fs.readFileSync("package.json"));
+
+module.exports = [
+	{
+		target: "web", 
+		externals: {
+			// Map require("something) to global variable Something.
+			// "something": "Something"
+			//"node-fetch": "fetch",
+			//"es6-promise": "Promise"
+		}, 
+		entry: [
+			"babel-polyfill",
+			"./index_webpack"
+		],
+		output: {
+			path: path.join(__dirname, "builds", "browser", "es5"),
+			filename: "jsonrpc.js",
+			libraryTarget: "umd"
+		},
+		devtool: "source-map",
+		module: {
+			loaders: [
+				{
+					test: /\.js$/,
+					include: [
+						path.resolve(__dirname, "src")
+					],
+					exclude: [
+						path.resolve(__dirname, "node_modules"),
+						path.resolve(__dirname, "tests")
+					],
+					loader: "babel-loader",
+					options: {
+						presets: ["es2015", "stage-3"],
+						plugins: [
+							"async-to-promises", 
+							"remove-comments"
+						],
+						babelrc: false
+					}
+				}
+			]
+		},
+		plugins: [
+			new webpack.optimize.UglifyJsPlugin({
+				minimize: true,
+				sourceMap: true,
+				compress: { screw_ie8: true },
+				mangle: { screw_ie8: true },
+				output: { 
+					screw_ie8: true, 
+					comments: false,
+					preamble: `/**
+						${objPackageJSON.name} v${objPackageJSON.version}
+						${objPackageJSON.description}
+						${objPackageJSON.homepage}
+						${objPackageJSON.homepage}/blob/master/LICENSE
+					*/`.replace(/\t+/g, "\t")
 				}
-			}
+			})
 		]
-	},
-	plugins: [
-		new webpack.optimize.UglifyJsPlugin({
-			minimize: true,
-			sourceMap: true
-		})
-	]
-};
-//test
+	}/*,
+	{
+		target: "web", 
+		entry: [
+			"./index_webpack"
+		],
+		output: {
+			path: path.join(__dirname, "builds", "browser", "es7"),
+			filename: "jsonrpc.js",
+			libraryTarget: "umd"
+		},
+		devtool: "source-map",
+		module: {
+			loaders: [
+				{
+					test: /\.js$/,
+					include: [
+						path.resolve(__dirname, "src")
+					],
+					exclude: [
+						path.resolve(__dirname, "node_modules") + "/",
+						path.resolve(__dirname, "tests")
+					],
+					loader: "babel-loader",
+					options: {
+						plugins: ["remove-comments"],
+						babelrc: false
+					}
+				}
+			]
+		},
+		plugins: [
+		]
+	}*/
+];
+

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ const url = require("url");`
`5`	`5`	`const path = require("path");`
`6`	`6`	`const fs = require("fs");`
`7`	`7`
`8`		`-const sleep = require("sleep-promise");`
	`8`	`+//const sleep = require("sleep-promise");`
`9`	`9`
`10`	`10`	`const Phantom = require("phantom");`
`11`	`11`
`@@ -222,6 +222,7 @@ class AllTests`
`222`	`222`	`(`
`223`	`223`	`objParsedURL.pathname.substr(0, "/tests/".length) === "/tests/"`
`224`	`224`	`\|\| objParsedURL.pathname.substr(0, "/builds/".length) === "/builds/"`
	`225`	`+ \|\| objParsedURL.pathname.substr(0, "/node_modules/".length) === "/node_modules/"`
`225`	`226`	`)`
`226`	`227`	`&& incomingRequest.method === "GET"`
`227`	`228`	`&& !objParsedURL.pathname.includes("..")`
`@@ -236,6 +237,8 @@ class AllTests`
`236`	`237`	`}`
`237`	`238`	`else if(url.parse(incomingRequest.url).pathname.substr(0, 4) !== "/api")`
`238`	`239`	`{`
	`240`	`+ console.error("[" + process.pid + "] Could not find static HTTP file: " + strFilePath);`
	`241`	`+`
`239`	`242`	`serverResponse.statusCode = 404;`
`240`	`243`	`serverResponse.end();`
`241`	`244`	`}`
`@@ -901,7 +904,7 @@ class AllTests`
`901`	`904`
`902`	`905`	`console.log(`
`903`	`906`	`await phantomPage.evaluate(`
`904`		`- function () {`
	`907`	`+ function() {`
`905`	`908`	`return window.arrErrors;`
`906`	`909`	`}`
`907`	`910`	`)`
`@@ -923,7 +926,7 @@ class AllTests`
`923`	`926`	`//phantom.process.stdout.pipe(process.stdout);`
`924`	`927`	`//phantom.process.stderr.pipe(process.stderr);`
`925`	`928`
`926`		`- const strContent = await phantomPage.property("content");`
	`929`	`+ //const strContent = await phantomPage.property("content");`
`927`	`930`	`//console.log(strContent);`
`928`	`931`
`929`	`932`