Add server initialisation options

Author: gfwilliams

electron-app.js

@@ -4,6 +4,26 @@
 
 var DEV = false; // are we developing? Adds frame and dev tools
 
+// ----------------------------------------------------
+function help() {
+  console.log("Espruino Web IDE");
+  console.log("   USAGE:");
+  console.log("      --help        This help screen");
+  console.log("      --dev         Enable developer tools");
+  process.exit(0);
+}
+// ---------------------------------------------------- arg parsing
+for (var i=2;i<process.argv.length;i++) {
+  var arg = process.argv[i];
+  if (arg=="--dev") {
+    DEV = true;
+  } else {
+    if (arg!="--help") console.log("Unknown argument "+arg);
+    help();
+  }
+}
+// ----------------------------------------------------
+
 try {
   global.electron = require('electron');
 } catch (e) {

package.json

@@ -4,7 +4,8 @@
   "description": "A Terminal and Graphical code Editor for Espruino JavaScript Microcontrollers",
   "main": "index.js",
   "bin": {
-    "espruino-web-ide": "./electron-loader.js"
+    "espruino-web-ide": "./electron-loader.js",
+    "espruino-server": "./server.js"
   },
   "scripts": {
     "start": "electron ./electron-app.js"

server.js

@@ -7,14 +7,39 @@ Just start with `node server.js`, then navigate to `localhost:8080` in a web bro
 The Web IDE should start up over the network and work like normal.
 
 */
+var Espruino = { Config : {}, Core : {}, Plugins : {} };
+var SERVER_PORT = 8080;
+Espruino.Config.BLUETOOTH_LOW_ENERGY = true;
+
+// ----------------------------------------------------
+function help() {
+  console.log("Espruino Web IDE Server");
+  console.log("   USAGE:");
+  console.log("      --help        This help screen");
+  console.log("      --port ###    Listen on the given port (default 8080)");
+  process.exit(0);
+}
+// ---------------------------------------------------- arg parsing
+for (var i=2;i<process.argv.length;i++) {
+  var arg = process.argv[i];
+  if (arg=="--port") {
+    SERVER_PORT = parseInt(process.argv[++i]);
+    if (!(SERVER_PORT>0 && SERVER_PORT<65536)) {
+      console.log("Invalid port "+JSON.stringify(process.argv[i])); 
+      help();
+    }
+  } else {
+    if (arg!="--help") console.log("Unknown argument "+arg);
+    help();
+  }
+}
+// ----------------------------------------------------
+
+
 var WebSocketServer = require('websocket').server;
 var http = require('http');
-
 var connection;
 
-var Espruino = { Config : {}, Core : {}, Plugins : {} };
-Espruino.Config.BLUETOOTH_LOW_ENERGY = true;
-
 Espruino.callProcessor = function(a,b,cb) { cb(); }
 Espruino.Core.Status = {
  setStatus : function(t,l) { console.log(":"+t); },
@@ -43,7 +68,7 @@ Espruino.Core.Serial.startListening(function(data) {
 });
 
 var server = http.createServer(function(request, response) {
-    console.log((new Date()) + ' Received request for ' + request.url);
+    console.log((new Date()) + ' HTTP '+request.method+' ' + request.url);
     var url = request.url.toString();
     if (url == "/") url = "/main.html";
     if (url == "/serial/ports") {
@@ -63,7 +88,7 @@ var server = http.createServer(function(request, response) {
     }
 
     if (require("fs").existsSync(path)) {
-      console.log("Serving file ",path);
+      //console.log("Serving file ",path);
       require("fs").readFile(path, function(err, blob) {
         var mime;
         if (path.substr(-4)==".css") mime = "text/css";
@@ -89,8 +114,9 @@ var server = http.createServer(function(request, response) {
     response.writeHead(404);
     response.end();
 });
-server.listen(8080, function() {
-    console.log((new Date()) + ' Server is listening on port 8080');
+
+server.listen(SERVER_PORT, function() {
+    console.log((new Date()) + ' Server is listening on port '+SERVER_PORT);
 });
 
 wsServer = new WebSocketServer({
@@ -105,7 +131,6 @@ function originIsAllowed(origin) {
 
 wsServer.on('request', function(request) {
     if (!originIsAllowed(request.origin)) {
-      // Make sure we only accept requests from an allowed origin
       request.reject();
       console.log((new Date()) + ' Connection from origin ' + request.origin + ' rejected.');
       return;