hello-lights 0.3.9 → 0.3.10

package/README.md

@@ -109,10 +109,10 @@ The `serve` command starts an HTTP server that exposes the Commander interface a
 
 | Endpoint | Method | Body | Response |
 |---|---|---|---|
-| `/run` | POST | Command string (plain text) | 202 Accepted |
-| `/run?reset=true` | POST | Command string (plain text) | 202 Accepted (resets lights first) |
+| `/run` | POST | Command string (plain text) | 202 Accepted, or 400 if malformed |
+| `/run?reset=true` | POST | Command string (plain text) | 202 Accepted (resets lights first), or 400 if malformed |
 | `/cancel` | POST | — | 200 OK |
-| `/definitions` | POST | Definition string (plain text) | 202 Accepted |
+| `/definitions` | POST | Definition string (plain text) | 202 Accepted, or 400 if malformed |
 | `/commands` | GET | — | 200 + JSON array of command names |
 | `/commands/:name` | GET | — | 200 + help text (`text/x-ansi`) or 404 |
 | `/info` | GET | — | 200 + JSON array of `{ serialNum, status }` |

package/lib/cli/serve/index.js

@@ -1,11 +1,23 @@
 /////////////////////////////////////////////////////////////////
 
 const path = require('path');
+const chalk = require('chalk');
 const commanderOptions = require('../commander-options');
 
 /////////////////////////////////////////////////////////////////
 
-function createApp(commander) {
+const now = () => chalk.gray(`[${new Date().toISOString()}]`);
+
+const logger = {
+  log: (...args) =>
+    console.log(now(), '[INFO]', ...args),
+  error: (...args) =>
+    console.error(now(), chalk.red('[ERROR]'), chalk.red(...args))
+};
+
+/////////////////////////////////////////////////////////////////
+
+function createApp(commander, {logger: log = logger} = {}) {
   const express = require('express');
   const app = express();
 
@@ -13,8 +25,17 @@ function createApp(commander) {
   app.use(express.text({type: '*/*'}));
 
   app.post('/run', (req, res) => {
+    let body = req.body || '';
+    log.log('POST /run:', body);
+    try {
+      commander.interpreter.process(body);
+    } catch (e) {
+      log.error('POST /run: malformed:', e.message);
+      res.status(400).send(e.message);
+      return;
+    }
     let reset = req.query.reset === 'true';
-    commander.run(req.body || '', reset);
+    commander.run(body, reset);
     res.sendStatus(202);
   });
 
@@ -24,7 +45,16 @@ function createApp(commander) {
   });
 
   app.post('/definitions', (req, res) => {
-    commander.runDefinitions(req.body || '');
+    let body = req.body || '';
+    log.log('POST /definitions:', body);
+    try {
+      commander.interpreter.process(body);
+    } catch (e) {
+      log.error('POST /definitions: malformed:', e.message);
+      res.status(400).send(e.message);
+      return;
+    }
+    commander.runDefinitions(body);
     res.sendStatus(202);
   });
 
@@ -56,12 +86,12 @@ function createApp(commander) {
 function serve(options) {
   const commander = commanderOptions.resolveCommander(options);
   const app = createApp(commander);
-  const server = app.listen(options.port, () => console.log(`Server listening on port ${options.port}`));
+  const server = app.listen(options.port, () => logger.log(`Server listening on port ${options.port}`));
   server.on('error', err => {
     if (err.code === 'EADDRINUSE') {
-      console.error(`Error: port ${options.port} is already in use`);
+      logger.error(`port ${options.port} is already in use`);
     } else {
-      console.error(`Error: ${err.message}`);
+      logger.error(err.message);
     }
     process.exit(1);
   });

package/lib/rest-commander.js

@@ -57,7 +57,10 @@ class RestCommander {
    */
   async run(command, reset = false) {
     let path = reset ? '/run?reset=true' : '/run';
-    await request(this.host, 'POST', path, command);
+    let res = await request(this.host, 'POST', path, command);
+    if (res.statusCode === 400) {
+      this.logger.error(res.body);
+    }
   }
 
   /**
@@ -72,7 +75,10 @@ class RestCommander {
    * @param {string} command - Command with definitions to execute.
    */
   async runDefinitions(command) {
-    await request(this.host, 'POST', '/definitions', command);
+    let res = await request(this.host, 'POST', '/definitions', command);
+    if (res.statusCode === 400) {
+      this.logger.error(res.body);
+    }
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hello-lights",
-  "version": "0.3.9",
+  "version": "0.3.10",
   "description": "Commands to control a traffic light",
   "main": "index.js",
   "bin": {