implement a serial component is optional in electron version

Author: akaJes

app/server.js

@@ -10,14 +10,19 @@ var fs = require('fs');
 var formidable = require('formidable');
 var pjson = require('../package.json');
 var pio = require('./pio');
-var serial = require('./console');
 var http = require('http');
 var ua = require('universal-analytics');
 var promisify = require('./helpers').promisify;
 
 var port = 3000;
 var server = http.Server(app);
 var visitor = ua('UA-99239389-1');
+var isElectron=module.parent&&module.parent.filename.indexOf('index.js')>=0;
+
+var serial;
+var serial_enabled = !isElectron||process.platform=='linux';
+if (serial_enabled)
+  serial = require('./console');
 
 app.use('/', express.static(path.join(__dirname,'..', 'static')));
 app.use('/libs', express.static(path.join(__dirname,'..', 'node_modules')));
@@ -52,7 +57,9 @@ function serial_init(){
     })
   }).catch(a=>console.error(a));
 }
-app.get('/ports', function (req, res,next) {
+app.get('/ports', function (req, res) {
+  if(!serial_enabled)
+    return res.status(403).end()
   req.socket.setTimeout(Number.MAX_SAFE_INTEGER);
   console.log('SSE conected');
   res.writeHead(200, {
@@ -72,13 +79,17 @@ app.get('/ports', function (req, res,next) {
 });
 
 app.get('/port/:port/:speed', function (req, res) {
+  if(!serial_enabled)
+    return res.status(404)
   serial.init(server,req.params.port,req.params.speed)
   .then(data=>{
     res.send(data);
   })
   .catch(a=>res.status(403).send(a))
 });
 app.get('/port-close/:port', function (req, res) {
+  if(!serial_enabled)
+    return res.status(404)
   serial.close(req.params.port)
   .then(data=>{
     res.send(data);
@@ -163,7 +174,7 @@ app.get('/pio-flash/:port', function (req, res) {
     params.push(port)
     close=true;
   }
-  (close?serial.close(port):Promise.resolve(true))
+  (close&&serial_enabled?serial.close(port):Promise.resolve(true))
   .then(a=>git.root())
   .then(root=>{
     console.log(root);
@@ -268,7 +279,7 @@ function main(noOpn){
     console.error(e);
     throw e;
   })
-  .then(serial_init)
+  .then(serial_enabled?serial_init:a=>a)
 //  .catch(a=>console.error('serial failed'))
   .then(()=>getPort(3000))
   .then(port =>new Promise((done,fail)=>{

bin/mctd

@@ -8,7 +8,7 @@ nodemon({
   script: path.resolve(__dirname, '..','app','server.js'),
   watch: path.resolve(__dirname, '..'),
   ext: 'js json',
-  ignore: ['tools.js'],
+  ignore: ['tools.js','dist','build'],
 });
 
 nodemon.on('start', function () {

package.json

@@ -1,34 +1,34 @@
 {
   "name": "marlin-conf",
-  "version": "2.6.0",
+  "version": "2.6.1",
   "description": "configuration tool for Marlin project",
   "main": "./index.js",
   "scripts": {
     "start": "electron . -G ~/TEST",
     "build": "build --dir",
     "dist": "build -wl --x64 --ia32",
-    "distt": "build -l --x64",
+    "distt": "build -w --x64",
     "distm": "build -m --x64",
     "test": "echo \"Error: no test specified\" && exit 1",
     "postinstall-": "bower install",
     "lint": "eslint .",
-    "coveralls": "nyc report --reporter=text-lcov",
     "rebuild": "npm rebuild serialport --update-binary",
     "prepublish": "./node_modules/.bin/json -I -f package.json -e 'if(this.devDependencies)this.devDependenciesOff=this.devDependencies;this.devDependencies=undefined'",
     "postpublish": "./node_modules/.bin/json -I -f package.json -e 'if(this.devDependenciesOff)this.devDependencies=this.devDependenciesOff;this.devDependenciesOff=undefined'",
     "prebuild-": "sudo apt install icnsutils graphicsmagick"
   },
-  "config": {
-    "production": true
-  },
   "build": {
     "appId": "com.akajes.marlin.conf",
     "linux": {
       "target": [
+        "deb",
         "AppImage"
       ]
     },
     "win": {
+      "target": [
+        "nsis"
+      ],
       "icon": "build/icons/icon_256x256.png"
     },
     "nsis": {},
@@ -75,12 +75,10 @@
     "which": "^1.2.14"
   },
   "devDependencies": {
-    "coveralls": "^2.13.1",
     "electron": "^1.6.10",
     "electron-builder": "^18.1.0",
     "eslint": "^3.19.0",
     "json": "^9.0.6",
-    "nodemon": "^1.11.0",
-    "nyc": "^10.3.2"
+    "nodemon": "^1.11.0"
   }
 }

static/main.js

@@ -578,6 +578,14 @@ $(function(){
           createPort(p)
         });
       });
+      source.addEventListener('error', function(event) {
+        $('.mct-consoles').attr('disabled','')
+        $('.mct-ports a').addClass('disabled')
+      });
+      source.addEventListener('open', function(event) {
+        $('.mct-consoles').removeAttr('disabled')
+        $('.mct-ports a').removeClass('disabled')
+      });
       source.addEventListener('created', function(event) {
         var port= JSON.parse(event.data);
         createPort(port);