@signalk/streams 5.0.5 → 5.1.0

package/canboatjs.js

@@ -56,9 +56,6 @@ CanboatJs.prototype._transform = function (chunk, encoding, done) {
     } else {
       this.app.emit('canboatjs:unparsed:object', chunk)
     }
-    if (chunk.fromFile) {
-      this.app.emit('canboatjs:rawoutput', chunk.data)
-    }
   } else {
     const pgnData = this.fromPgn.parse(chunk)
     if (pgnData) {
@@ -67,7 +64,6 @@ CanboatJs.prototype._transform = function (chunk, encoding, done) {
     } else {
       this.app.emit('canboatjs:unparsed:data', chunk)
     }
-    this.app.emit('canboatjs:rawoutput', chunk)
   }
   done()
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalk/streams",
-  "version": "5.0.5",
+  "version": "5.1.0",
   "description": "Utilities for handling streams of Signal K data",
   "main": "index.js",
   "scripts": {

package/serialport.js

@@ -148,34 +148,44 @@ SerialStream.prototype.start = function () {
   )
 
   let pendingWrites = 0
-  const stdOutEvent = this.options.toStdout
-  if (stdOutEvent) {
-    ;(isArray(stdOutEvent) ? stdOutEvent : [stdOutEvent]).forEach((event) => {
-      const onDrain = () => {
-        pendingWrites--
+  const stdOutEvents = isArray(this.options.toStdout)
+    ? this.options.toStdout
+    : [this.options.toStdout]
+  const standardOutEventName = `serial-${this.options.subOptions.providerId}-toStdout`
+  stdOutEvents.push(standardOutEventName)
+
+  stdOutEvents.forEach((event) => {
+    const onDrain = () => {
+      pendingWrites--
+    }
+
+    that.options.app.on(event, (d) => {
+      if (pendingWrites > that.maxPendingWrites) {
+        that.debug('Buffer overflow, not writing:' + d)
+        return
       }
-
-      that.options.app.on(event, (d) => {
-        if (pendingWrites > that.maxPendingWrites) {
-          that.debug('Buffer overflow, not writing:' + d)
-          return
-        }
-        that.debug('Writing:' + d)
-        if (isBuffer(d)) {
-          that.serial.write(d)
-        } else {
-          that.serial.write(d + '\r\n')
-        }
-        setImmediate(() => {
-          that.options.app.emit('connectionwrite', {
-            providerId: that.options.providerId
-          })
+      that.debug('Writing:' + d)
+      if (isBuffer(d)) {
+        that.serial.write(d)
+      } else {
+        that.serial.write(d + '\r\n')
+      }
+      setImmediate(() => {
+        that.options.app.emit('connectionwrite', {
+          providerId: that.options.providerId
         })
-        pendingWrites++
-        that.serial.drain(onDrain)
       })
+      pendingWrites++
+      that.serial.drain(onDrain)
     })
-  }
+  })
+
+  this.options.app.emitPropertyValue('serialport', {
+    id: this.options.providerId,
+    eventNames: {
+      toStdout: standardOutEventName
+    }
+  })
 }
 
 SerialStream.prototype.end = function () {

package/simple.js

@@ -93,6 +93,25 @@ function Simple(options) {
     getLogger(options.app, options.logging, discriminatorByDataType[dataType]),
     dataTypeMapping[mappingType](options)
   )
+
+  const dataReceivedEventName = `${options.subOptions.providerId}-received`
+
+  const spy = new Transform({
+    transform(chunk, encoding, callback) {
+      options.app.emit(dataReceivedEventName, chunk)
+      callback(null, chunk)
+    }
+  })
+  pipeline.splice(pipeline.length - 1, 0, spy)
+
+  options.subOptions.app.emitPropertyValue('pipedprovider', {
+    id: options.subOptions.providerId,
+    type: mappingType,
+    eventNames: {
+      received: dataReceivedEventName
+    }
+  })
+
   if (options.subOptions.overrideTimestamp) {
     pipeline.push(
       new Transform({
@@ -162,7 +181,8 @@ const dataTypeMapping = {
     if (options.type === 'FileStream') {
       result.unshift(
         new Throttle({
-          rate: options.subOptions.throttleRate || 1000
+          rate: options.subOptions.throttleRate || 1000,
+          chunksize: options.subOptions.throttleRate || 1000
         })
       )
     }