[fix] fix kernel error do not stop kernel switch bug

Chimeejs · Nov 28, 2017 · fe841a9 · fe841a9
1 parent 9bc39b3
commit fe841a9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 22 deletions.
diff --git a/__tests__/silentload.js b/__tests__/silentload.js
@@ -64,6 +64,8 @@ describe('$silentLoad', () => {
   //   oldVideo.dispatchEvent(new Event('timeupdate'));
   //   await expect(result).resolves.toBe();
   // });
+
+
   test('normal run', async () => {
     const result = player.$silentLoad('http://cdn.toxicjohann.com/%E4%BA%8E%E6%98%AF.mp4');
     await Promise.resolve();
@@ -228,23 +230,20 @@ describe('$silentLoad', () => {
     expect(player.src).toBe('http://cdn.toxicjohann.com/lostStar.mp4');
     expect(Log.data.error).toEqual([[ "chimee's silentload", 'MEDIA_ELEMENT_ERROR: Format error' ]]);
   });
-  // test('kernel error', async () => {
-  //   const result = player.$silentLoad('http://cdn.toxicjohann.com/%E4%BA%8E%E6%98%AF.mp4');
-  //   await Promise.resolve();
-  //   // simulate video error
-  //   player.__dispatcher._silentLoadTempKernel.emit('error', {
-  //     errmsg: 'test error',
-  //     errno: 500,
-  //   });
-  //   await expect(result).rejects.toEqual({
-  //     message: 'test error',
-  //     code: 500,
-  //   });
-  //   expect(player.__dispatcher.kernel).toBe(oldKernel);
-  //   expect(player.__dispatcher.dom.videoElement).toBe(oldVideo);
-  //   expect(player.src).toBe('http://cdn.toxicjohann.com/lostStar.mp4');
-  //   expect(Log.data.error).toEqual([[ "chimee's silentload", 'MEDIA_ELEMENT_ERROR: Format error' ]]);
-  // });
+  test('kernel error', async () => {
+    const result = player.$silentLoad('http://cdn.toxicjohann.com/%E4%BA%8E%E6%98%AF.mp4');
+    await Promise.resolve();
+    // simulate video error
+    player.__dispatcher._silentLoadTempKernel.emit('error', {
+      errmsg: 'test error',
+      errno: 500,
+    });
+    await expect(result).rejects.toEqual(new Error('test error'));
+    expect(player.__dispatcher.kernel).toBe(oldKernel);
+    expect(player.__dispatcher.dom.videoElement).toBe(oldVideo);
+    expect(player.src).toBe('http://cdn.toxicjohann.com/lostStar.mp4');
+    expect(Log.data.error).toEqual([[ "chimee's silent bump into a kernel error", 'test error' ]]);
+  });
   test('error in repeat times', async () => {
     const result = player.$silentLoad('http://cdn.toxicjohann.com/%E4%BA%8E%E6%98%AF.mp4', { repeatTimes: 1 });
     await Promise.resolve();

diff --git a/src/dispatcher/index.js b/src/dispatcher/index.js
@@ -301,13 +301,9 @@ export default class Dispatcher {
             if (evt.target === kernel) {
               const {
                 errmsg: message,
-                errno: code,
               } = evt.data;
               Log.error("chimee's silent bump into a kernel error", message);
-              error = {
-                message,
-                code,
-              };
+              error = new Error(message);
             } else {
               error = !isEmpty(video.error)
                 ? new Error(video.error.message)