tone-stream 1.9.0 → 1.11.0

package/README.md

@@ -12,6 +12,7 @@ or DTMF tones:
 ```
   [NUMBER_OF_SAMPLES, 'DTMF:ID']
 ```
+You can add multiple of such tones and they will be enequeued and played in order.
 
 ## Installation
 ```
@@ -117,6 +118,11 @@ console.log("Starting playing tones")
 ts.pipe(s)
 
 ```
+## Events
+
+The stream emits:
+  - 'empty': when there are no more tones to be played in the queue (it happens when the queue of tones is found empty)
+  - 'ended': when all tones in the queue were generated (it happens when the consumer tries to read data from the stream and there are no more tones to be generated)
 
 ## More examples
 

package/index.js

@@ -4,8 +4,10 @@ const SpecReadStream = require("spec-read-stream");
 
 const DTMF = require("./lib/dtmf");
 
+const EventEmitter = require('events');
+
 class ToneStream extends Readable {
-  constructor(format, opts) {
+  constructor(format) {
     super();
 
     if (format) {
@@ -19,23 +21,32 @@ class ToneStream extends Readable {
       this.channels = 1;
     }
 
-    this.opts = opts;
-
     this.amplitude = 2 ** this.bitDepth / 2 - 1;
 
     this.specReadStream = new SpecReadStream();
 
     this.currentSample = 0;
+
+    this.pending_ended = false;
+
+    this.eventEmitter = new EventEmitter();
   }
 
   add(spec) {
     this.specReadStream.add(spec);
+    this.pending_ended = true
+    var num_samples = spec[0]
+    return num_samples
   }
 
   concat(specs) {
+    var num_samples = 0
     specs.forEach((spec) => {
       this.specReadStream.add(spec);
+      num_samples += spec[0]
     });
+    this.pending_ended = true
+    return num_samples
   }
 
   on(evt, cb) {
@@ -43,6 +54,8 @@ class ToneStream extends Readable {
 
     if (evt == "empty") {
       this.specReadStream.on(evt, cb);
+    } else if (evt == "ended") {
+      this.eventEmitter.on(evt, cb);
     }
   }
 
@@ -66,17 +79,18 @@ class ToneStream extends Readable {
     var buf_idx = 0;
 
     if (!specs) {
-      if (this.opts && this.opts.stay_alive) {
-        for (var j = 0; j < numSamples * this.channels; j++) {
-          let offset = j * sampleSize * this.channels;
-          setter(0, offset);
-        }
+      if(this.pending_ended) {
+        this.pending_ended = false
+        this.eventEmitter.emit("ended")
+      }
 
-        this.push(buf);
-        return;
-      } else {
-        return null;
+      for (var j = 0; j < numSamples * this.channels; j++) {
+        let offset = j * sampleSize * this.channels;
+        setter(0, offset);
       }
+
+      this.push(buf);
+      return;
     }
 
     let actualSamples = specs.reduce((total, spec) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tone-stream",
-  "version": "1.9.0",
+  "version": "1.11.0",
   "description": "A simple audio tone stream library",
   "main": "index.js",
   "repository": {