[merge]

__tests__/kernel-event.js

@@ -0,0 +1,30 @@
+import Chimee from 'index';
+describe('kernel-events', () => {
+  let chimee;
+  beforeEach(() => {
+    chimee = new Chimee({
+      wrapper: document.createElement('div'),
+    });
+  });
+  afterEach(() => {
+    chimee.destroy();
+  });
+  test('heartbeat check', () => {
+    const fn = jest.fn();
+    chimee.on('heartbeat', fn);
+    chimee.__dispatcher.kernel.emit('heartbeat');
+    expect(fn).toHaveBeenCalledTimes(1);
+  });
+  test('mediaInfo check', () => {
+    const fn = jest.fn();
+    chimee.on('mediaInfo', fn);
+    chimee.__dispatcher.kernel.emit('mediaInfo');
+    expect(fn).toHaveBeenCalledTimes(1);
+  });
+  test('error check', () => {
+    const fn = jest.fn();
+    chimee.on('error', fn);
+    expect(() => chimee.__dispatcher.kernel.emit('error')).toThrow();
+    expect(fn).toHaveBeenCalledTimes(1);
+  });
+});

__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,6 +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(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();

demo/flv/index.js

@@ -73,6 +73,9 @@ window.player = new Chimee({
 this.player.on('error', error => {
   console.log(error);
 });
+this.player.on('heartbeat', evt => {
+  console.warn(evt, 'heartbeat');
+});
 // window.player = new window.Chimee({
 //   src: 'http://yunxianchang.live.ujne7.com/vod-system-bj/TL1ce1196bce348070bfeef2116efbdea6.flv',
 //   // src: 'http://1253804432.vod2.myqcloud.com/3712977fvodgzp1253804432/f3f31e5f9031868223411915443/f0.flv',

demo/silentload/index.js

@@ -22,7 +22,7 @@ const flvSwitch = {
   el: '<button>flv switch</button>',
   create() {
     this.$dom.addEventListener('click', () => {
-      this.$silentLoad('http://yunxianchang.live.ujne7.com/vod-system-bj/TL1ce1196bce348070bfeef2116efbdea6.flv', { repeatTimes: 5, increment: 2 });
+      this.$silentLoad('http://yunxianchang.live.ujne7.com/vod-system-bj/TL1ce1196bce348070bfeef2116efbdea6.flv', { repeatTimes: 5, increment: 10, duration: 5 });
     });
   },
 };
@@ -53,3 +53,9 @@ const player = new Chimee({
   controls: true,
 });
 window.player = player;
+player.on('heartbeat', evt => {
+  console.log(evt);
+});
+player.on('error', evt => {
+  console.error(evt);
+});

doc/zh-cn/README.md

@@ -159,9 +159,7 @@ const chimee = new ChimeePlayer({
 2. [为什么要将 Chimee 设计成一个组件化框架？](https://github.com/Chimeejs/chimee/blob/master/doc/zh-cn/why-chimee-is-a-frame.md)
 3. [Chimee 插件 API 介绍](https://github.com/Chimeejs/chimee/blob/master/doc/zh-cn/plugin-api.md)
 4. [如何编写一个插件?](https://github.com/Chimeejs/chimee/blob/master/doc/zh-cn/how-to-write-a-plugin.md)
-5. [如何编写一个广告插件](https://github.com/Chimeejs/chimee/blob/master/doc/zh-cn/how-to-write-an-ad-plugin.md)
-6. [如何编写一个UI插件](https://github.com/Chimeejs/chimee/blob/master/doc/zh-cn/how-to-write-a-ui-plugin.md)
-7. [如何编写一个弹窗插件](https://github.com/Chimeejs/chimee/blob/master/doc/zh-cn/how-to-write-a-popup-plugin.md)
+5. [如何编写一个弹窗插件](https://github.com/Chimeejs/chimee/blob/master/doc/zh-cn/how-to-write-a-popup-plugin.md)
 
 ## 不同的构建版本