Pass input stream errors through with error (also includes test)

Author: rhodgkins

lib/processor.js

@@ -444,7 +444,9 @@ module.exports = function(proto) {
           // Pipe input stream if any
           if (inputStream) {
             inputStream.source.on('error', function(err) {
-              emitEnd(new Error('Input stream error: ' + err.message));
+              var reportingErr = new Error('Input stream error: ' + err.message);
+              reportingErr.inputStreamError = err;
+              emitEnd(reportingErr);
               ffmpegProc.kill();
             });
 

test/processor.test.js

@@ -770,6 +770,48 @@ describe('Processor', function() {
         })
         .saveToFile(testFile);
     });
+    
+    it('should pass input stream errors through to error handler', function(done) {
+      var testFile = path.join(__dirname, 'assets', 'testConvertFromStream.avi')
+
+		const readError = new Error('Read Error')
+      const instream = new (require('stream').Readable)({
+        read() {
+  		    process.nextTick(() => this.emit('error', readError))
+		  }
+      })
+      
+      const command = this.getCommand({ source: instream, logger: testhelper.logger })
+
+      let startCalled = false
+      const self = this
+      
+      command
+          .usingPreset('divx')
+          .on('start', function() {
+          	startCalled = true
+            command.ffmpegProc.on('exit', function() {
+            	fs.exists(testFile, (exists) => {
+            		exists.should.be.false()
+						done()
+            	})
+            })
+          })
+          .on('error', function(err, stdout, stderr) {
+            self.saveOutput(stdout, stderr)
+            startCalled.should.be.true()
+            assert.ok(err)
+            err.message.indexOf('Input stream error: ').should.equal(0)
+			   assert.strictEqual(err.inputStreamError, readError)
+          })
+          .on('end', function(stdout, stderr) {
+            testhelper.logOutput(stdout, stderr)
+            console.log('end was called, expected a error')
+            assert.ok(false)
+            done()
+          })
+          .saveToFile(testFile)
+    })
   });
 
   describe('mergeToFile', function() {