Added linting, cleaned up code

Author: fraguada

.editorconfig

@@ -0,0 +1,24 @@
+
+
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{js}]
+charset = utf-8
+
+indent_style = space
+
+# Indentation override for all JS and JSON
+[*.{js, json}]
+indent_style = space
+indent_size = 2
+

.env-sample

@@ -0,0 +1,10 @@
+NODE_ENV=development
+
+# Address to the compute server:
+COMPUTE_URL=http://localhost:8082/
+
+# Address of this application
+APP_URL=http://localhost:3000/
+
+# If you are targetting https://compute.rhino3d.com, you need a token from https://rhino3d.com/compute/login
+COMPUTE_TOKEN=

.eslintrc.json

@@ -0,0 +1,38 @@
+{
+    "env": {
+        "browser": true,
+        "commonjs": true,
+        "es6": true,
+        "node": true
+    },
+    "extends": "eslint:recommended",
+    "globals": {
+        "Atomics": "readonly",
+        "SharedArrayBuffer": "readonly"
+    },
+    "parserOptions": {
+        "ecmaVersion": 2018
+    },
+    "rules": {
+        "indent": [
+            "error",
+            2
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "quotes": [
+            "error",
+            "single"
+        ],
+        "semi": [
+            "error",
+            "never"
+        ],
+        "no-unused-vars": [
+            "error", 
+            { "argsIgnorePattern": "next" }
+        ]
+    }
+}

app.js

@@ -1,119 +1,121 @@
-const createError = require('http-errors');
-const express = require('express');
-const path = require('path');
-const compression = require('compression');
-const cookieParser = require('cookie-parser');
-const logger = require('morgan');
-const cors = require('cors');
-const fs = require('fs');
-const { v4: uuidv4 } = require('uuid');
-const compute = require('compute-rhino3d');
-require('dotenv').config();
+const createError = require('http-errors')
+const express = require('express')
+const path = require('path')
+const compression = require('compression')
+const cookieParser = require('cookie-parser')
+const logger = require('morgan')
+const cors = require('cors')
+const fs = require('fs')
+const { v4: uuidv4 } = require('uuid')
+const compute = require('compute-rhino3d')
+
+// dotenv only required for development. 
+// Heroku adds config vars in production. 
+// If not running on Heroku, you might want to add this back in with your own .env file.
+// require('dotenv').config()
 
 // routers
-const indexRouter = require('./routes/index');
-const definitionRouter = require('./routes/definition');
+const indexRouter = require('./routes/index')
+const definitionRouter = require('./routes/definition')
 
-console.log('appserver version: ' + process.env.npm_package_version);
-
-const app = express();
+const app = express()
 
 // get cmd line args
 // get arguments after first two elements in process.argv
-let args = process.argv.splice(2);
+let args = process.argv.splice(2)
 
-let defArgId = args.indexOf('--definitions');
-let urlArgId = args.indexOf('--computeUrl');
+let defArgId = args.indexOf('--definitions')
+let urlArgId = args.indexOf('--computeUrl')
 
 // set arguments or accept defaults
 if(defArgId > -1)
-  app.set('definitionsDir', path.normalize(args[defArgId+1]));
+  app.set('definitionsDir', path.normalize(args[defArgId+1]))
 else
-  app.set(app.set('definitionsDir', path.join(__dirname, 'files/')));
+  app.set(app.set('definitionsDir', path.join(__dirname, 'files/')))
 
 if(urlArgId > -1)
-  app.set('computeUrl', args[urlArgId+1]);
+  app.set('computeUrl', args[urlArgId+1])
 else 
-  app.set('computeUrl', process.env.COMPUTE_URL); // set to a geometry server running on the same machine. NOTE: Port 8082 is when Geometry Server is running debug
+  app.set('computeUrl', process.env.COMPUTE_URL) // set to a geometry server running on the same machine. NOTE: Port 8082 is when Geometry Server is running debug
 
-compute.url = app.get('computeUrl');
+compute.url = app.get('computeUrl')
 
 if(process.env.COMPUTE_TOKEN !== undefined)
   compute.authToken = process.env.COMPUTE_TOKEN
 
 if(process.env.APP_URL !== undefined)
-  app.set('appUrl', process.env.APP_URL);
+  app.set('appUrl', process.env.APP_URL)
 else
-  app.set('appUrl', 'http://localhost' + process.env.PORT || '3000' + '/');
-
-console.log( app.set('computeUrl'));
-console.log(require('os').hostname());
-console.log(process.env.NODE_ENV);
-
-app.use(logger('dev'));
-app.use(express.json());
-app.use(express.urlencoded({ extended: false }));
-app.use(cookieParser());
-app.use(cors());
-app.use(compression());
+  app.set('appUrl', 'http://localhost' + process.env.PORT || '3000' + '/')
+
+console.log('VERSION: ' + process.env.npm_package_version)
+console.log('COMPUTE_URL: ' + app.get('computeUrl'))
+console.log('NODE_ENV: ' + process.env.NODE_ENV)
+
+app.use(logger('dev'))
+app.use(express.json())
+app.use(express.urlencoded({ extended: false }))
+app.use(cookieParser())
+app.use(cors())
+app.use(compression())
 app.use('/example', express.static('example'))
 
-app.use('/', indexRouter);
-app.use('/definition', definitionRouter);
+app.use('/', indexRouter)
+app.use('/definition', definitionRouter)
 
 function getFiles(dir) {
   return new Promise ( (resolve, reject) => {
     fs.readdir(dir, (err, files) => {
-      if(err) reject(err);
-      else resolve(files);
-    });
-  } );
-};
+      if(err) reject(err)
+      else resolve(files)
+    })
+  } )
+}
 
 getFiles( app.get('definitionsDir') )
-.then( (files) => {
+  .then( (files) => {
 
-  if(files.length === 0)
-    throw new Error('No definitions found on server'); 
+    if(files.length === 0)
+      throw new Error('No definitions found on server') 
 
-  app.set('definitions', []);
-  console.log(files);
+    app.set('definitions', [])
+    console.log(files)
 
-  let fullUrl = app.get('appUrl'); // watch this.
+    let fullUrl = app.get('appUrl') // watch this.
 
-  files.forEach(file => {
+    files.forEach(file => {
 
-    if(file.includes('.gh') || file.includes('.ghx')) {
-      let id =  uuidv4();
-      app.get('definitions').push({name: file, id:id});
+      if(file.includes('.gh') || file.includes('.ghx')) {
+        let id =  uuidv4()
+        app.get('definitions').push({name: file, id:id})
 
-      compute.computeFetch('io', {'requestedFile':fullUrl + 'definition/'+ id}).then(result => {
-        app.get('definitions').find(d => d.id === id).inputs = result.Inputs === undefined ? result.InputNames : result.Inputs;
-        app.get('definitions').find(d => d.id === id).outputs = result.Outputs === undefined ? result.OutputNames: result.Outputs;
-      }).catch( (error) => console.log(error));
+        compute.computeFetch('io', {'requestedFile':fullUrl + 'definition/'+ id}).then(result => {
+          app.get('definitions').find(d => d.id === id).inputs = result.Inputs === undefined ? result.InputNames : result.Inputs
+          app.get('definitions').find(d => d.id === id).outputs = result.Outputs === undefined ? result.OutputNames: result.Outputs
+        }).catch( (error) => console.log(error))
 
-    }
-  });
+      }
+    })
 
-})
-.catch( (error)=>{ console.log(error) });
+  })
+  .catch( (error)=>{ console.log(error) })
 
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {
-  next(createError(404));
-});
+  next(createError(404))
+})
 
 // error handler
 app.use(function(err, req, res, next) {
 
   // set locals, only providing error in development
-  res.locals.message = err.message;
-  console.log(err.message);
-  res.locals.error = req.app.get('env') === 'development' ? err : {};
+  res.locals.message = err.message
+  console.log(err.message)
+  res.locals.error = req.app.get('env') === 'development' ? err : {}
 
   // send the error
-  res.status(err.status || 500);
-  res.send(err.message);
-});
+  res.status(err.status || 500)
+  res.send(err.message)
+})
 
-module.exports = app;
+module.exports = app

bin/www

@@ -4,49 +4,49 @@
  * Module dependencies.
  */
 
-var app = require('../app');
-var debug = require('debug')('compute.appserver:server');
-var http = require('http');
+var app = require('../app')
+var debug = require('debug')('compute.appserver:server')
+var http = require('http')
 
 /**
  * Get port from environment and store in Express.
  */
 
-var port = normalizePort(process.env.PORT || '3000');
-app.set('port', port);
+var port = normalizePort(process.env.PORT || '3000')
+app.set('port', port)
 
 /**
  * Create HTTP server.
  */
 
-var server = http.createServer(app);
+var server = http.createServer(app)
 
 /**
  * Listen on provided port, on all network interfaces.
  */
 
-server.listen(port);
-server.on('error', onError);
-server.on('listening', onListening);
+server.listen(port)
+server.on('error', onError)
+server.on('listening', onListening)
 
 /**
  * Normalize a port into a number, string, or false.
  */
 
 function normalizePort(val) {
-  var port = parseInt(val, 10);
+  var port = parseInt(val, 10)
 
   if (isNaN(port)) {
     // named pipe
-    return val;
+    return val
   }
 
   if (port >= 0) {
     // port number
-    return port;
+    return port
   }
 
-  return false;
+  return false
 }
 
 /**
@@ -55,25 +55,25 @@ function normalizePort(val) {
 
 function onError(error) {
   if (error.syscall !== 'listen') {
-    throw error;
+    throw error
   }
 
   var bind = typeof port === 'string'
     ? 'Pipe ' + port
-    : 'Port ' + port;
+    : 'Port ' + port
 
   // handle specific listen errors with friendly messages
   switch (error.code) {
-    case 'EACCES':
-      console.error(bind + ' requires elevated privileges');
-      process.exit(1);
-      break;
-    case 'EADDRINUSE':
-      console.error(bind + ' is already in use');
-      process.exit(1);
-      break;
-    default:
-      throw error;
+  case 'EACCES':
+    console.error(bind + ' requires elevated privileges')
+    process.exit(1)
+    break
+  case 'EADDRINUSE':
+    console.error(bind + ' is already in use')
+    process.exit(1)
+    break
+  default:
+    throw error
   }
 }
 
@@ -82,11 +82,11 @@ function onError(error) {
  */
 
 function onListening() {
-  var addr = server.address();
+  var addr = server.address()
   var bind = typeof addr === 'string'
     ? 'pipe ' + addr
-    : 'port ' + addr.port;
-  debug('Listening on ' + bind);
-  console.log('Listening on ' + bind);
+    : 'port ' + addr.port
+  debug('Listening on ' + bind)
+  console.log('Listening on ' + bind)
   console.log('Server address: '+ addr.address)
 }