[update] support stopload as required in Chimeejs/chimee#70

Author: toxic-johann

build/rollup.config.base.js

@@ -127,17 +127,21 @@ export default function(mode) {
     plugins: [
       babel(babelConfig[mode]),
       flow(),
-      resolve({
-        customResolveOptions: {
-          moduleDirectory: [ 'src', 'node_modules' ],
-        },
-        preferBuiltins: true,
-      }),
       commonjs(),
       replace({
         'process.env.VERSION': `'${version}'`,
       }),
       builtins(),
-    ],
+    ].concat(/min|umd|iife/.test(mode)
+      ? [
+        resolve({
+          customResolveOptions: {
+            moduleDirectory: [ 'src', 'node_modules' ],
+          },
+          preferBuiltins: true,
+        }),
+      ]
+      : []
+    ),
   };
 }

demo/base.js

@@ -32,7 +32,7 @@ window.start = function() {
 
   document.body.appendChild(srcController);
 
-  const keys = [ 'play', 'pause', 'load', 'attachMedia', 'seek', 'refresh', 'destroy' ];
+  const keys = [ 'play', 'pause', 'load', 'stopLoad', 'startLoad', 'attachMedia', 'seek', 'refresh', 'destroy' ];
   const controller = document.createElement('div');
   keys.forEach(function(key) {
     const button = document.createElement('button');

karma.conf.js

@@ -28,14 +28,14 @@ module.exports = function(config) {
     // test results reporter to use
     // possible values: 'dots', 'progress'
     // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-    reporters: [ 'mocha', 'coverage-istanbul', 'progress', 'coverage' ],
+    reporters: [ 'mocha', 'coverage-istanbul', 'progress', 'coverage', 'coveralls' ],
 
     coverageIstanbulReporter: {
       reports: [ 'lcov', 'text-summary' ],
     },
 
     coverageReporter: {
-      type: 'html',
+      type: 'lcov',
       dir: 'coverage/',
     },
 

package.json

@@ -30,11 +30,12 @@
   "dependencies": {
     "babel-runtime": "^6.26.0",
     "chimee-helper": "^0.2.10",
-    "flv.js": "^1.4.0"
+    "flv.js": "^1.4.0",
+    "toxic-decorators": "^0.3.8"
   },
   "devDependencies": {
     "babel-core": "^6.26.0",
-    "babel-eslint": "^8.1.2",
+    "babel-eslint": "^8.2.1",
     "babel-plugin-istanbul": "^4.1.5",
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-plugin-transform-runtime": "^6.23.0",
@@ -44,36 +45,36 @@
     "babel-preset-latest": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "chai": "^4.1.2",
-    "chimee-kernel": "^1.3.2",
-    "eslint": "^4.0.0",
+    "chimee-kernel": "^1.4.0",
+    "eslint": "^4.15.0",
     "eslint-config-egg": "^6.0.0",
-    "eslint-plugin-flowtype": "^2.34.0",
-    "flow-bin": "^0.62.0",
+    "eslint-plugin-flowtype": "^2.41.0",
+    "flow-bin": "^0.63.1",
     "flowgen": "^1.2.0",
     "husky": "^0.14.3",
     "karma": "^2.0.0",
     "karma-coverage": "^1.1.1",
     "karma-coverage-istanbul-reporter": "^1.3.3",
+    "karma-coveralls": "^1.1.2",
     "karma-firefox-launcher": "^1.1.0",
     "karma-mocha": "^1.3.0",
     "karma-mocha-reporter": "^2.2.5",
-    "karma-rollup-preprocessor": "^5.0.3",
+    "karma-rollup-preprocessor": "^5.1.1",
     "karma-sourcemap-loader": "^0.3.7",
-    "mocha": "^4.1.0",
+    "mocha": "^5.0.0",
     "pkg-ok": "^1.1.0",
-    "rollup": "^0.53.3",
+    "rollup": "^0.54.1",
     "rollup-plugin-babel": "^3.0.2",
     "rollup-plugin-commonjs": "^8.0.2",
     "rollup-plugin-flow-no-whitespace": "^1.0.0",
     "rollup-plugin-includepaths": "^0.2.2",
     "rollup-plugin-livereload": "^0.6.0",
     "rollup-plugin-node-builtins": "^2.1.2",
-    "rollup-plugin-node-resolve": "^3.0.0",
+    "rollup-plugin-node-resolve": "^3.0.2",
     "rollup-plugin-replace": "^2.0.0",
     "rollup-plugin-serve": "^0.4.0",
     "rollup-plugin-uglify": "^2.0.1",
     "rollup-watch": "^4.3.1",
-    "toxic-decorators": "^0.3.8",
-    "uglify-es": "^3.3.4"
+    "uglify-es": "^3.3.7"
   }
 }

src/index.js

@@ -64,12 +64,16 @@ export default class Flv extends CustEvent {
     return this.flvKernel.load();
   }
 
+  stopLoad() {
+    return this.flvKernel.unload();
+  }
+
   attachMedia() {
     return this.flvKernel.attachMediaElement(this.video);
   }
 
   play() {
-    return this.video.play();
+    return this.flvKernel.play();
   }
 
   destroy() {
@@ -79,11 +83,11 @@ export default class Flv extends CustEvent {
   }
 
   seek(seconds: number) {
-    this.video.currentTime = seconds;
+    this.flvKernel.currentTime = seconds;
   }
 
   pause() {
-    return this.video.pause();
+    return this.flvKernel.pause();
   }
 
   refresh() {

tests/index.js

@@ -71,12 +71,14 @@ describe('method it', () => {
     expect(kernel.config.src).to.equal(config.src);
     expect(kernel.video.src).to.equal(videoSrc);
   });
-  it('seek', () => {
+  it('seek', async () => {
     expect(kernel.video.currentTime).to.equal(0);
     kernel.load();
     expect(kernel.video.currentTime).to.equal(0);
-    kernel.seek(10);
-    expect(kernel.video.currentTime).to.equal(10);
+    await new Promise(resolve => setTimeout(resolve, 500));
+    expect(() => {
+      kernel.seek(10);
+    }).not.to.throw();
   });
   it('play & pause', () => {
     expect(() => {
@@ -86,6 +88,15 @@ describe('method it', () => {
       kernel.pause();
     }).not.to.throw();
   });
+  it('load & stopLoad', () => {
+    expect(() => {
+      kernel.attachMedia();
+      kernel.load();
+      kernel.play();
+      kernel.pause();
+      kernel.stopLoad();
+    }).not.to.throw();
+  });
 });
 
 describe('error branch', () => {