fix loading peaks data from JSON files

collab-project · Oct 11, 2019 · a3c6154 · a3c6154
1 parent 3c86b8b
commit a3c6154
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,9 +4,11 @@ videojs-wavesurfer changelog
 2.11.0 - unreleased
 -------------------
 
+- Fix loading peaks data from JSON files (#90)
 - Add `style` and `sass` entries to `package.json`
 - Specify non-minified videojs-wavesurfer in `main` entry of `package.json`
 
+
 2.10.0 - 2019/09/30
 -------------------
 

diff --git a/src/js/videojs.wavesurfer.js b/src/js/videojs.wavesurfer.js
@@ -319,7 +319,14 @@ class Wavesurfer extends Plugin {
 
                     request.once('success', data => {
                         this.log('Loaded Peak Data URL: ' + peaks);
-                        this.surfer.load(url, data);
+                        // check for data property containing peaks
+                        if (data && data.data) {
+                            this.surfer.load(url, data.data);
+                        } else {
+                            this.player.trigger(Event.ERROR,
+                                'Could not load peaks data from ' + peaks);
+                            this.log(err, 'error');
+                        }
                     });
                     request.on('error', e => {
                         this.log('Unable to retrieve peak data from ' + peaks +

diff --git a/test/test-helpers.js b/test/test-helpers.js
@@ -17,6 +17,9 @@ const TestHelpers = {
     /** Peaks data for example audio clip */
     EXAMPLE_AUDIO_PEAKS_FILE: '/base/test/support/demo-peaks.json',
 
+    /** File with invalid peaks data */
+    EXAMPLE_AUDIO_PEAKS_INVALID_FILE: '/base/test/support/demo-peaks-invalid.json',
+
     /** Example VTT clip */
     EXAMPLE_VTT_FILE: '/base/test/support/demo.vtt',
 

diff --git a/test/videojs.wavesurfer.spec.js b/test/videojs.wavesurfer.spec.js
@@ -321,6 +321,22 @@ describe('Wavesurfer', () => {
         });
     });
 
+    /** @test {Wavesurfer#load} */
+    it('throws error if peaks data cannot be found in file', (done) => {
+        player.one(Event.ERROR, (e) => {
+            expect(e).toEqual('data:image/jpeg;base64,');
+            done();
+        });
+
+        player.one(Event.WAVE_READY, () => {
+            // try loading from peaks file without a data property
+            player.wavesurfer().load(
+                TestHelpers.EXAMPLE_AUDIO_FILE,
+                TestHelpers.EXAMPLE_AUDIO_PEAKS_INVALID_FILE
+            );
+        });
+    });
+
     /** @test {Wavesurfer#setAudioOutput} */
     it('throws error for non-existing device', (done) => {