Merge pull request #135 from chris-rudmin/error-callback

Improve error handling. Fixes #134
chris-rudmin · Jan 29, 2018 · 6c39cf1 · 6c39cf1
2 parents 72ed289 + 221f1cf
commit 6c39cf1
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -143,12 +143,6 @@ rec.onstop()
 
 A callback which occurs when media recording ends.
 
-```js
-rec.onstreamerror( error )
-```
-
-A callback which occurs when a stream error occurs.
-
 
 ---------
 ### Gotchas

diff --git a/dist-unminified/recorder.js b/dist-unminified/recorder.js
@@ -237,11 +237,11 @@ Recorder.prototype.setMonitorGain = function( gain ){
 Recorder.prototype.start = function( sourceNode ){
   if ( this.state === "inactive" ) {
     var self = this;
-    this.state = "recording";
     this.initAudioContext( sourceNode );
     this.initAudioGraph();
 
     return this.initSourceNode( sourceNode ).then( function( sourceNode ){
+      self.state = "recording";
       self.encoder.postMessage( Object.assign({
         command: 'init',
         originalSampleRate: self.audioContext.sampleRate,
@@ -251,9 +251,6 @@ Recorder.prototype.start = function( sourceNode ){
       self.sourceNode.connect( self.monitorNode );
       self.sourceNode.connect( self.scriptProcessorNode );
       self.onstart();
-    }, function( error ){
-      self.onstreamerror( error );
-      throw error;
     });
   }
 };
@@ -310,7 +307,6 @@ Recorder.prototype.onpause = function(){};
 Recorder.prototype.onresume = function(){};
 Recorder.prototype.onstart = function(){};
 Recorder.prototype.onstop = function(){};
-Recorder.prototype.onstreamerror = function(){};
 
 
 module.exports = Recorder;

diff --git a/dist/recorder.min.js b/dist/recorder.min.js
diff --git a/example/encoder.html b/example/encoder.html
@@ -56,11 +56,6 @@ <h2>Log</h2>
       log.innerHTML += "\n" + text + " " + (data || '');
     }
 
-    start.addEventListener( "click", function(){ recorder.start(); });
-    pause.addEventListener( "click", function(){ recorder.pause(); });
-    resume.addEventListener( "click", function(){ recorder.resume(); });
-    stopButton.addEventListener( "click", function(){ recorder.stop(); });
-
     if (!Recorder.isRecordingSupported()) {
       screenLogger("Recording features are not supported in your browser.");
     }
@@ -74,6 +69,15 @@ <h2>Log</h2>
         encoderPath: "../dist/encoderWorker.min.js"
       });
 
+      pause.addEventListener( "click", function(){ recorder.pause(); });
+      resume.addEventListener( "click", function(){ recorder.resume(); });
+      stopButton.addEventListener( "click", function(){ recorder.stop(); });
+      start.addEventListener( "click", function(){ 
+        recorder.start().catch(function(e){
+          screenLogger('Error encountered: ' + e.message );
+        });
+      });
+
       recorder.onstart = function(e){
         screenLogger('Recorder is started');
         start.disabled = resume.disabled = true;
@@ -98,10 +102,6 @@ <h2>Log</h2>
         pause.disabled = stopButton.disabled = false;
       };
 
-      recorder.onstreamerror = function(e){
-        screenLogger('Error encountered: ' + e.message );
-      };
-
       recorder.ondataavailable = function( typedArray ){
         var dataBlob = new Blob( [typedArray], { type: 'audio/ogg' } );
         var fileName = new Date().toISOString() + ".opus";

diff --git a/example/waveRecorder.html b/example/waveRecorder.html
@@ -51,11 +51,6 @@ <h2>Log</h2>
       log.innerHTML += "\n" + text + " " + (data || '');
     }
 
-    start.addEventListener( "click", function(){ recorder.start(); });
-    pause.addEventListener( "click", function(){ recorder.pause(); });
-    resume.addEventListener( "click", function(){ recorder.resume(); });
-    stopButton.addEventListener( "click", function(){ recorder.stop(); });
-
     if (!Recorder.isRecordingSupported()) {
       screenLogger("Recording features are not supported in your browser.");
     }
@@ -68,6 +63,15 @@ <h2>Log</h2>
         encoderPath: "../dist-unminified/waveWorker.js"
       });
 
+      pause.addEventListener( "click", function(){ recorder.pause(); });
+      resume.addEventListener( "click", function(){ recorder.resume(); });
+      stopButton.addEventListener( "click", function(){ recorder.stop(); });
+      start.addEventListener( "click", function(){ 
+        recorder.start().catch(function(e){
+          screenLogger('Error encountered: ' + e.message );
+        });
+      });
+
       recorder.onstart = function(){
         screenLogger('Recorder is started');
         start.disabled = resume.disabled = true;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opus-recorder",
-  "version": "3.0.1",
+  "version": "4.0.0",
   "description": "A library for recording opus encoded audio",
   "homepage": "https://github.com/chris-rudmin/opus-recorder",
   "author": "Chris Rudmin",

diff --git a/src/recorder.js b/src/recorder.js
@@ -157,11 +157,11 @@ Recorder.prototype.setMonitorGain = function( gain ){
 Recorder.prototype.start = function( sourceNode ){
   if ( this.state === "inactive" ) {
     var self = this;
-    this.state = "recording";
     this.initAudioContext( sourceNode );
     this.initAudioGraph();
 
     return this.initSourceNode( sourceNode ).then( function( sourceNode ){
+      self.state = "recording";
       self.encoder.postMessage( Object.assign({
         command: 'init',
         originalSampleRate: self.audioContext.sampleRate,
@@ -171,9 +171,6 @@ Recorder.prototype.start = function( sourceNode ){
       self.sourceNode.connect( self.monitorNode );
       self.sourceNode.connect( self.scriptProcessorNode );
       self.onstart();
-    }, function( error ){
-      self.onstreamerror( error );
-      throw error;
     });
   }
 };
@@ -230,7 +227,6 @@ Recorder.prototype.onpause = function(){};
 Recorder.prototype.onresume = function(){};
 Recorder.prototype.onstart = function(){};
 Recorder.prototype.onstop = function(){};
-Recorder.prototype.onstreamerror = function(){};
 
 
 module.exports = Recorder;
diff --git a/test/recorder.js b/test/recorder.js
@@ -35,7 +35,6 @@ describe('Recorder', function(){
     sinon.spy(Recorder.prototype, 'onstop');
     sinon.spy(Recorder.prototype, 'onpause');
     sinon.spy(Recorder.prototype, 'onresume');
-    sinon.spy(Recorder.prototype, 'onstreamerror');
   };
 
   beforeEach(function(){
@@ -303,9 +302,9 @@ describe('Recorder', function(){
     return rec.start().then( function(){ 
       throw new Error('Unexpected promise resolving.');
     }, function( ev ){
+      expect(rec.state).to.equal('inactive');
       expect(ev).instanceof(Error);
       expect(ev.message).to.equal('PermissionDeniedError')
-      expect(rec.onstreamerror).to.have.been.calledOnce;
     });
   });