Merge pull request #101 from parallaxinc/logging

Updated terminal logging to use new events, Improved console buffer.

Author: phated

package.json

@@ -7,7 +7,7 @@
     "test": "test"
   },
   "dependencies": {
-    "bs2-serial": "^0.6.0",
+    "bs2-serial": "^0.7.1",
     "codemirror": "^4.13.0",
     "frylord": "^0.5.0",
     "holovisor": "^0.2.0",

plugins/editor/console-buffer.js

@@ -0,0 +1,39 @@
+'use strict';
+
+function ConsoleBuffer(options){
+  var opts = options || {};
+  this._length = 0;
+  this._text = '';
+  this._bufferSize = opts.bufferSize || 2048;
+  this._trimOffset = opts.trimOffset || 256;
+
+  if(this._bufferSize < 1){
+    throw new Error('Invalid buffer length!');
+  }
+  if(this._trimOffset < 0 || this._trimOffset >= this._bufferSize){
+    throw new Error('Invalid trim offset length!');
+  }
+}
+
+ConsoleBuffer.prototype.update = function(evt){
+  //assume text events for now
+  var text = evt.data || '';
+  this._text += text;
+
+  if(this._text.length > this._bufferSize){
+    this._text = this._text.substr(this._text.length - (this._bufferSize - this._trimOffset));
+  }
+  this._length = this._text.length;
+};
+
+ConsoleBuffer.prototype.clear = function(){
+  this._length = 0;
+  this._text = '';
+};
+
+ConsoleBuffer.prototype.getConsoleHTML = function(){
+  return this._text;
+};
+
+
+module.exports = ConsoleBuffer;

plugins/editor/index.js

@@ -10,27 +10,32 @@ require('codemirror/lib/codemirror.css');
 require('../../assets/theme/parallax.css');
 
 var CodeMirror = require('codemirror');
+
 var keyExtension = require('./key-extension');
+var ConsoleBuffer = require('./console-buffer');
 
 require('./pbasic')(CodeMirror);
 
 function editor(app, opts, done){
 
   var codeEditor;
   var outputConsole;
+  var buffer = new ConsoleBuffer();
 
   var space = app.workspace;
 
-  function output(text){
+  function output(evt){
+    buffer.update(evt);
     if(outputConsole){
-      outputConsole.innerHTML += text;
+      outputConsole.innerHTML = buffer.getConsoleHTML();
       outputConsole.scrollTop = outputConsole.scrollHeight;
     }
   }
 
   function clearOutput(){
+    buffer.clear();
     if(outputConsole){
-      outputConsole.innerHTML = '';
+      outputConsole.innerHTML = buffer.getConsoleHTML();
     }
   }
 

plugins/sidebar/overlays/download.js

@@ -59,17 +59,14 @@ class DownloadOverlay extends React.Component {
 
     const board = irken.getBoard(device);
 
-    board.on('progress', this.updateProgress);
+    board.removeListener('terminal', logger);
 
-    const log = through(function(chunk, enc, cb){
-      logger(chunk.toString());
-      cb(null, chunk);
-    });
+    board.on('progress', this.updateProgress);
 
     board.compile(source)
       .tap(() => logger.clear())
       .then((memory) => board.bootload(memory))
-      .then(() => board.read().pipe(log))
+      .then(() => board.on('terminal', logger))
       .tap(() => toast.clear())
       .tap(() => handleSuccess(`'${name}' downloaded successfully`))
       .catch(handleError)