Bladeren bron

Replace streamprocess with stream-each

Gil Pedersen 9 jaren geleden
bovenliggende
commit
ded2b17546
4 gewijzigde bestanden met toevoegingen van 7 en 9 verwijderingen
  1. 0 2
      bin/hlsmon
  2. 4 4
      lib/hls-reader.js
  3. 2 2
      lib/recorder.js
  4. 1 1
      package.json

+ 0 - 2
bin/hlsmon

@@ -42,8 +42,6 @@ function monitor(srcUrl) {
     }
     console.error('done');
   });
-
-  r.resume();
 }
 
 monitor(src);

+ 4 - 4
lib/hls-reader.js

@@ -2,7 +2,7 @@
 
 var Util = require('util');
 
-var StreamProcess = require('streamprocess'),
+var StreamEach = require('stream-each'),
     oncemore = require('oncemore');
 
 var Readable = require('readable-stream/readable'),
@@ -62,7 +62,7 @@ function HlsReader(segmentReader, options) {
   this.isHooked = false;
   this.buffer = new Passthrough({ highWaterMark: this.bufferSize });
 
-  StreamProcess(this.reader, function (segmentInfo, done) {
+  StreamEach(this.reader, function (segmentInfo, done) {
     self.isReading = true;
 
     return self.decrypt(segmentInfo.stream, segmentInfo.details.key, function (err, stream) {
@@ -95,9 +95,9 @@ function HlsReader(segmentReader, options) {
         done();
       });
     });
-  });
+  }, function (err) {
+    if (err) throw err;
 
-  this.reader.on('end', function() {
     self.buffer.end();
   });
 

+ 2 - 2
lib/recorder.js

@@ -8,7 +8,7 @@ var fs = require('fs'),
     util = require('util');
 
 var mime = require('mime-types'),
-    streamprocess = require('streamprocess'),
+    StreamEach = require('stream-each'),
     oncemore = require('oncemore'),
     m3u8parse = require('m3u8parse'),
     mkdirp = require('mkdirp'),
@@ -45,7 +45,7 @@ HlsStreamRecorder.prototype.start = function() {
   if (!fs.existsSync(this.dst))
     mkdirp.sync(this.dst);
 
-  streamprocess(this.reader, this.process.bind(this));
+  StreamEach(this.reader, this.process.bind(this));
 
   this.updateIndex(this.reader.index);
   this.reader.on('index', this.updateIndex.bind(this));

+ 1 - 1
package.json

@@ -37,7 +37,7 @@
     "noptify": "0.0.3",
     "oncemore": "^1.0.0",
     "readable-stream": "^2.0.2",
-    "streamprocess": "^1.0.0",
+    "stream-each": "^1.1.2",
     "udp-blast": "^1.0.0",
     "uristream": "^1.1.0",
     "write-file-atomic": "^1.1.0"