add rinkterm

Author: anuejn

README.md

@@ -18,7 +18,7 @@ of the rinklink bridge
 For staying inside the midi spec, only valid midi messages are sent.
 Comunication is done through `Note-on`, `Note-off` and `Poly-KeyPress` messages.
 Each of those messages has their very own meaning: 
-
+x
 | purpose          | midi message type | raw payload               | midi messge (3 bytes)                  |
 | ---------------- | ----------------- | ------------------------- | -------------------------------------- |
 | transfer 1 byte  | `Note-on`         | `0bABCDEFGH`              | `0b1000xxAx` `0b0BCDEFGH` `0bxxxxxxxx` |

index.js

@@ -5,23 +5,22 @@ module.exports = class RinkLink {
         this.input = JZZ().openMidiIn(/ice(skate|link|rink).*/gi);
         this.output = JZZ().openMidiIn(/ice(skate|link|rink).*/gi);
 
-        if((this.input._err || this.output._err) && !mock) {
+        if((this.input._err.length > 0 || this.output._err > 0) && !mock) {
             throw new Error("could not open midi device!");
         }
 
         this.subscribers = [];
         this.message_buffer = [];
 
-        this.input.connect(this._onMidiMessage);
+        this.input.connect(message => this._onMidiMessage(message));
     }
 
     close() {
         this.input.close();
         this.output.close();
     }
 
-    _onMidiMessage(message) {
-        const d = message.data;
+    _onMidiMessage(d) {
         if (d[0] >> 4 == 0xA) { // end of packet
             this._flush_buffer();
         } else if (d[0] >> 4 == 0x8) { // single byte
@@ -80,9 +79,9 @@ module.exports = class RinkLink {
 
         grouped_data.forEach(b => {
             if (typeof(b) != "number") {
-                this.output.send(new Uint8Array([0x90 | b[0] >> 7 | (b[1] >> 7) << 1, b[0] & 0b01111111, b[1] & 0b01111111]))
+                this.output.send(new JZZ.MIDI([0x90 | b[0] >> 7 | (b[1] >> 7) << 1, b[0] & 0b01111111, b[1] & 0b01111111]))
             } else {
-                this.output.send(new Uint8Array([0x80 | b >> 7, b & 0b01111111, 0x00]))
+                this.output.send(new JZZ.MIDI([0x80 | b >> 7, b & 0b01111111, 0x00]))
             }
         })
         this.output.send(new JZZ.MIDI([0xA0, 0x00, 0x00])); // flush the line

package.json

@@ -27,6 +27,7 @@
     "mocha": "^5.2.0"
   },
   "bin": {
-    "rinkflash": "./flasher.js"
+    "rinkflash": "./tools/flasher.js",
+    "rinkterm": "./tools/terminal.js"
   }
 }

test/test.js

@@ -18,7 +18,7 @@ describe('RinkLink', function() {
                 if(!data.every((b, i) => b >= 0 && b <= i == 0 ? 255 : 127)) {
                     done(new Error("value out of bounds: " + JSON.stringify(Array.from(data))))
                 }
-                link._onMidiMessage({data});
+                link._onMidiMessage(data);
             };
             link.subscribe(data => {
                 const to_compare = Array.from(test_payload).map(b => typeof(b) === "string" ? b.charCodeAt(0) : b)
@@ -36,7 +36,7 @@ describe('RinkLink', function() {
             const link = new RinkLink(true);
 
             // loopback the output
-            link.output.send = data => setTimeout(() => link._onMidiMessage({data}), 10);
+            link.output.send = data => setTimeout(() => link._onMidiMessage(data), 10);
 
             test_payload = 42;
 

flasher.js tools/flasher.js

@@ -5,7 +5,7 @@
  */
 
 const fs = require('fs');
-const RinkLink = require('./index');
+const RinkLink = require('../index');
 
 if (process.argv.length !== 3) {
     console.error("filename missing!")

tools/terminal.js

@@ -0,0 +1,41 @@
+#!/usr/bin/node
+
+/**
+ * A cli tool to comunicate over a line based software serial interface
+ */
+
+const readline = require('readline');
+const RinkLink = require('../index');
+
+
+const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+    prompt: "> ",
+});
+
+try {
+    const link = new RinkLink();
+
+    rl.prompt();
+    rl.on('line', l => {
+        link.send(l);
+        rl.prompt(true);
+    })
+
+    rl.on('close', () => {
+        rl.setPrompt('');
+        rl.clearLine();
+        rl.write("bye.\n");
+        process.exit(0);
+    });
+
+    link.subscribe(message => {
+        rl.pause();
+        rl.clearLine();
+        rl.write(`< ${message.map(b => String.fromCharCode(b)).reduce((c, a) => c + a)}\n`);
+    })
+} catch (e) {
+    console.error(e.message);
+    process.exit(-1);
+}