dynamic reload of components working!

Author: cadorn

README.md

@@ -17,8 +17,10 @@ Development
 
 This project is being developed within the [github.com/firebug/dev-system](https://github.com/firebug/dev-system). Once installed you can run:
 
-    pio publish --local firephp-for-firebug.next
-    pio run firephp-for-firebug.next --open
+    pio bundle --local firephp-for-firebug.next
+    pio run --local --dev firephp-for-firebug.next --open
+    pio run --local --dev firephp-for-firebug.next -- components
+    pio run --local --dev firephp-for-firebug.next -- server
     profile run fbn-firephp
     profile run fbn-firephp-test
 

client/data/bundle-server-monitor.js

@@ -0,0 +1,56 @@
+
+
+// Connect to server, on error reconnect and once reconnected
+// signal reconnect. Client can this determine when server is rebooted and comes back.
+// TODO: Include an instance ID in websocket condition so we can distinguish
+//       between network issues and server restarts.
+
+
+function connectAndWaitForError (first, _onError) {
+
+	var onError = function (err) {
+		if (!_onError) return;
+		_onError(err);
+		_onError = null;
+	}
+
+	var ws = new WebSocket("ws://localhost:8080");
+	ws.onopen = function (event) {
+		if (first) {
+			self.port.emit("opened");
+		} else {
+			self.port.emit("reopened");
+		}
+//		ws.send("Send test message from client to server!");
+	};
+
+	ws.onerror = function (err) {
+		onError(err);
+	};
+
+	/*
+	ws.onmessage = function (message) {
+		self.port.emit("message", "got message: " + message);
+	}
+	*/
+
+	ws.onclose = function () {
+		onError(new Error("closed"));
+	}
+}
+
+
+function reconnect (first) {
+	return setTimeout(function () {
+		return connectAndWaitForError(first, function (err) {
+			if (first) {
+				self.port.emit("closed");
+			}
+			return reconnect(false);
+		});
+	}, 500);
+}
+
+
+reconnect(true);
+

client/lib/main.js

@@ -23,7 +23,11 @@ function main(options, callbacks) {
   GDEVTOOLS.on("webconsole-init", onConsoleInit);
 
 
-  SANDBOX(DATA.url("bundles/components/main.js"), function(sandbox) {
+  var uri = DATA.url("bundles/components/main.js");
+// TODO: Get URI from mappings.
+  uri = "http://localhost:8080/bundles/main.js";
+
+  SANDBOX(uri, function(sandbox) {
 
     sandbox.main({
       CC: CC,
@@ -35,7 +39,13 @@ function main(options, callbacks) {
       CLASS: require("sdk/core/heritage").Class,
       DEV_PANEL: require("dev/panel.js").Panel,
       DEV_TOOL: require("dev/toolbox").Tool,
-      PANEL: require("sdk/panel")
+      PANEL: require("sdk/panel"),
+      PAGE_WORKER: require("sdk/page-worker"),
+      ADDON_INSTALLER: require("sdk/addon/installer"),
+      TABS: require("sdk/tabs"),
+      getBootOptions: function () {
+        return options;
+      }
     });
   });
 

components/adapters/addon.js

@@ -0,0 +1,21 @@
+
+// @see https://github.com/Gozala/jpm-addon/blob/master/core.js
+
+exports.for = function (API) {
+
+    return {
+        reload: function () {
+
+            var addonId = API.SELF.id;
+
+            return API.ADDON_INSTALLER.disable(addonId).then(function () {
+
+                API.CC["@mozilla.org/observer-service;1"].
+                    getService(API.CI.nsIObserverService).
+                    notifyObservers({}, "startupcache-invalidate", null);
+
+                return API.ADDON_INSTALLER.enable(addonId);
+            });
+        }
+    };
+}

components/main.js

@@ -21,8 +21,28 @@ exports.main = function (API) {
 
 	try {
 
+		const ADDON_API = makeAPI(API, {
+			name: "adapters/addon"
+		});
+		const ADDON_EXPORTS = require("./adapters/addon").for(ADDON_API);
+
+
+
+		const MONITORS_BUNDLE_SERVER_API = makeAPI(API, {
+			name: "monitors/bundle-server"
+		});
+		const MONITORS_BUNDLE_SERVER_EXPORTS = require("./monitors/bundle-server").for(MONITORS_BUNDLE_SERVER_API);
+
+		MONITORS_BUNDLE_SERVER_API.once("restarted", function () {
+
+			ADDON_EXPORTS.reload();
+
+		});
+
+
+
 		const HTTP_RESPONSE_OBSERVER_API = makeAPI(API, {
-			name: "http-response-observer"
+			name: "adapters/http-response-observer"
 		});
 		const HTTP_RESPONSE_OBSERVER_EXPORTS = require("./adapters/http-response-observer").for(HTTP_RESPONSE_OBSERVER_API);
 
@@ -33,11 +53,19 @@ exports.main = function (API) {
 		});
 
 
+
 		const UI_DEVTOOLS_PANEL_API = makeAPI(API, {
-			name: "devtools-panel"
+			name: "ui/devtools-panel"
 		});
 		const UI_DEVTOOLS_PANEL_EXPORTS = require("./ui/devtools-panel").for(UI_DEVTOOLS_PANEL_API);
 
+
+
+API.console.log("Open tab!");
+API.TABS.open("http://localhost:49084/");
+
+
+
 	} catch (err) {
 		console.error(err.stack);
 		throw err;

components/monitors/bundle-server.js

@@ -0,0 +1,27 @@
+
+exports.for = function (API) {
+
+	var pageWorker = API.PAGE_WORKER.Page({
+		contentScriptFile: "./bundle-server-monitor.js"
+	});
+
+/*
+	pageWorker.port.on("message", function (msg) {
+API.console.log("monitor worker LOADED: " + msg);
+	});
+*/
+
+	pageWorker.port.on("opened", function () {
+//API.console.log("SERVER OPENED");
+	});
+
+	pageWorker.port.on("closed", function () {
+//API.console.log("SERVER CLOSED: trigger reload!");
+	});
+
+	pageWorker.port.on("reopened", function () {
+//API.console.log("SERVER RE-OPENED!");
+		API.emit("restarted");
+	});
+
+}

components/package.json

@@ -14,8 +14,7 @@
     },
     "scripts": {
         "install": "../node_modules/.bin/smi install",
-        "build": "rm -Rf .rt ; ../node_modules/to.pinf.lib/bin/pinf-bundle ; ../node_modules/pinf-to-browser/bin/pinf-publish",
-        "run": "../node_modules/pinf-to-browser/bin/pinf-run",
-        "start": "../node_modules/pinf-to-browser/bin/pinf-start"
+        "bundle": "rm -Rf .rt ; ../node_modules/to.pinf.lib/bin/pinf-bundle ; ../node_modules/pinf-to-browser/bin/pinf-publish",
+        "run": "../node_modules/pinf-to-browser/bin/pinf-run"
     }
 }

package.json

@@ -19,9 +19,8 @@
     },
     "scripts": {
 	    "install": "./node_modules/.bin/smi install ; cd components ; npm install --unsafe-perm ; cd .. ; cd ./server; npm install --unsafe-perm",
-		"publish": "cd components ; npm run-script build ; cd .. ; cd ./server; npm run-script publish",
-		"run": "./node_modules/to.pinf.lib/bin/pinf-run",
-		"start": "./node_modules/to.pinf.lib/bin/pinf-start"
+		"bundle": "cd components ; npm run-script bundle ; cd .. ; cd ./server; npm run-script bundle",
+		"run": "./node_modules/to.pinf.lib/bin/pinf-run"
     },
     "config": {
     	"smi.cli": {

server/package.json

@@ -15,9 +15,8 @@
     },
     "scripts": {
 	    "install": "../node_modules/.bin/smi install ; ./node_modules/pinf-to-docker/bin/pinf-publish --ignore-dirty",
-		"publish": "./node_modules/pinf-to-docker/bin/pinf-publish",
-		"run": "./node_modules/pinf-to-docker/bin/pinf-run",
-		"start": "./node_modules/pinf-to-docker/bin/pinf-start"
+		"bundle": "./node_modules/pinf-to-docker/bin/pinf-publish",
+		"run": "./node_modules/pinf-to-docker/bin/pinf-run"
     },
     "config": {
 	    "smi.cli": {