Load via PINF JS Loader & minor changes

.gitignore

@@ -20,6 +20,7 @@
 /extension/build/
 /extension/release/
 *.graphml
+/webapp-build/
 
 # Files from NPM
 /extension/node_modules/

README.md

@@ -36,7 +36,17 @@ Testing
 
 Development
 -----------
-* To start the build, go to the webapp/scripts directory and execute the following command:
-
-`..\..\requirejs\build\build.bat app.build.js`
-
+* Run from source on NodeJS using RequireJS or PINF JavaScript module loader:
+````
+    cd dev
+    npm install
+    npm start
+    open http://localhost:8080
+````
+* Run from source (PHP) using RequireJS module loader:
+  * Build client to `./webapp-build`: `ant`
+  * Mount document root: `./webapp`
+  * Open in web browser
+* Build and publish to github pages:
+  * Run: `ant publish-to-github`
+  * Open: http://fireconsole.github.io/harviewer/

build.xml

@@ -74,8 +74,21 @@
         </exec>
     </target>
 
+    <!-- Run PINF build tools -->
+    <target name="pinf-bundle">
+        <exec dir="${app.dir}/../fireconsole" executable="npm" resolveexecutable="true">
+            <arg value="run-script"/>
+            <arg value="build"/>
+        </exec>
+    </target>
+
+    <target name="publish-to-github" depends="pinf-bundle">
+        <exec dir="${app.dir}/.." executable="./dev/node_modules/.bin/pinf-publish" resolveexecutable="true">
+        </exec>
+    </target>
+
     <!-- Build HAR Viewer package (the result is within build.dir) -->
-    <target name="build" depends="clean, requirejs-mac, requirejs-win, requirejs-unix">
+    <target name="build" depends="clean, requirejs-mac, requirejs-win, requirejs-unix, pinf-bundle">
 
         <!-- Log info about the current OS -->
         <echo message="Building HAR Viewer on:" />

dev/.gitignore

@@ -0,0 +1,3 @@
+/client/.rt/
+/node_modules/
+/npm-debug.log

dev/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "dev",
+  "version": "0.0.0",
+  "private": true,
+  "main": "./server.js",
+  "dependencies": {
+    "express": "^4.7.2",
+    "pinf-for-nodejs": "0.1.x",
+    "send": "^0.7.3",
+    "pinf-to-github-pages": "0.1.x",
+    "rework": "^1.0.1",
+    "rework-import": "^2.0.0",
+    "rework-plugin-inline": "^1.0.1"
+  },
+  "scripts": {
+    "start": "rm -Rf client/.rt ../fireconsole/.rt ; node server.js"
+  }
+}

dev/server.js

@@ -0,0 +1,81 @@
+
+const PATH = require("path");
+const FS = require("fs");
+const PINF = require("pinf-for-nodejs");
+const EXPRESS = require("express");
+const SEND = require("send");
+const HTTP = require("http");
+const REWORK = require("rework");
+const REWORK_IMPORT = require("rework-import");
+const REWORK_INLINE = require("rework-plugin-inline");
+
+
+const PORT = process.env.PORT || 8080;
+
+return PINF.main(function(options, callback) {
+
+	var app = EXPRESS();
+
+	app.get(/^\/scripts\/css\/(.+\.css)$/, function (req, res, next) {
+		var basePath = PATH.join(__dirname, "../webapp/scripts/css");
+
+		var source = FS.readFileSync(PATH.join(basePath, req.params[0]), "utf8");
+
+		source = REWORK(source)
+		    .use(REWORK_IMPORT({
+		    	path: basePath
+		   	}))
+		    .toString();
+
+		source = source.replace(/(background[\s\w-]*:[\s#\w]*]*)url(\('?"?images\/)/g, "$1inline$2");
+
+		source = res.end(REWORK(source)
+		   	.use(REWORK_INLINE(basePath))
+		    .toString());
+
+		return res.end(source);
+	});
+
+	// For RequireJS loader.
+	app.get(/^\/scripts\/(.+)$/, function (req, res, next) {
+		return SEND(req, req.params[0], {
+			root: PATH.join(__dirname, "../webapp/scripts")
+		}).on("error", next).pipe(res);
+	});
+	app.get(/^\/examples\/(.+)$/, function (req, res, next) {
+		return SEND(req, req.params[0], {
+			root: PATH.join(__dirname, "../webapp/scripts/examples")
+		}).on("error", next).pipe(res);
+	});
+
+	// For PINF loader.
+	app.get(/^\/lib\/pinf-loader-js\/(.+)$/, function (req, res, next) {
+		return SEND(req, req.params[0], {
+			root: PATH.join(__dirname, "node_modules/pinf-for-nodejs/node_modules/pinf-loader-js")
+		}).on("error", next).pipe(res);
+	});
+	app.get(/^\/(plugin.+)$/, PINF.hoist(PATH.join(__dirname, "../fireconsole/program.json"), options.$pinf.makeOptions({
+		debug: true,
+		verbose: true,
+		PINF_RUNTIME: "",
+        $pinf: options.$pinf
+    })));
+
+	// For both loaders and dev helper files.
+	app.get(/^(\/.*)$/, function (req, res, next) {
+		var path = req.params[0];		
+		if (path === "/") path = "/index.html";
+		return SEND(req, path, {
+			root: PATH.join(__dirname, "www")
+		}).on("error", next).pipe(res);
+	});
+
+	HTTP.createServer(app).listen(PORT)
+
+	// Wait for debug output from `PINF.hoist()` to finish.
+	setTimeout(function() {
+		console.log("Open browser to: http://localhost:" + PORT + "/");
+	}, 2 * 1000);
+
+}, module);
+

dev/www/index.html

@@ -0,0 +1,6 @@
+<body>
+<ul>
+	<li><a href="requirejs.htm">RequireJS-based loader development</a></li>
+	<li><a href="pinf.htm">PINF-based loader development</a></li>
+</ul>
+</body>

dev/www/pinf.htm

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <title>HTTP Archive Viewer @VERSION@</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<script src="/lib/pinf-loader-js/loader.js"></script>
+</head>
+<body class="harBody">
+    <div id="content" version="@VERSION@"></div>
+    <!--[if IE]><script type="text/javascript" src="scripts/excanvas/excanvas.js"></script><![endif]-->
+	<script>
+		PINF.sandbox("/plugin.js", function (sandbox) {
+			sandbox.main();
+		}, function (err) {
+			console.error("Error while loading bundle '/plugin.js':", err.stack);
+		});
+	</script>
+</body>
+</html>

dev/www/requirejs.htm

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <title>HTTP Archive Viewer @VERSION@</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body class="harBody">
+    <div id="content" version="@VERSION@"></div>
+    <!--[if IE]><script type="text/javascript" src="scripts/excanvas/excanvas.js"></script><![endif]-->
+    <script>
+    	window.harviewerInitOnLoad = true;
+    </script>
+    <script data-main="scripts/harViewer" src="scripts/require.js"></script>
+</body>
+</html>

fireconsole/.gitignore

@@ -0,0 +1 @@
+/.rt/

fireconsole/README.md

@@ -0,0 +1,4 @@
+FireConsole Plugin
+==================
+
+Everything needed to use the harviewer as a [FireConsole](http://fireconsole.org) plugin.