@clappr/hlsjs-playback 2.0.0 → 2.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clappr/hlsjs-playback",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "HLS Playback based on hls.js",
   "main": "./dist/hlsjs-playback.js",
   "module": "./dist/hlsjs-playback.esm.js",
@@ -10,8 +10,9 @@
     "build": "rollup --config --bundleConfigAsCjs",
     "watch": "rollup --config --bundleConfigAsCjs --watch",
     "bundle-check": "ANALYZE_BUNDLE=true rollup --config --bundleConfigAsCjs",
-    "release": "MINIMIZE=true rollup --config --bundleConfigAsCjs",
-    "test": "jest ./src --testPathIgnorePatterns=dist.smoke --coverage --silent && yarn release && jest ./src/dist.smoke.test.js --silent",
+    "release": "rm -rf dist && MINIMIZE=true rollup --config --bundleConfigAsCjs",
+    "test": "jest ./src --coverage --silent",
+    "test:smoke": "jest ./src/dist.smoke.test.js --testPathIgnorePatterns=/node_modules/ --silent",
     "test:watch": "jest ./src --watch",
     "lint": "eslint *.js ./src",
     "lint:fix": "yarn lint -- --fix",
@@ -40,7 +41,7 @@
     "hls.js": "1.6.16"
   },
   "devDependencies": {
-    "@clappr/core": "^0.14.8",
+    "@clappr/core": "^0.15.0",
     "@rollup/plugin-replace": "^2.4.2",
     "hls.js": "1.6.16",
     "rollup-plugin-filesize": "^9.1.1",

package/src/dist.smoke.test.js

@@ -27,11 +27,15 @@ function loadArtifact(name) {
   return require(path.join(DIST, name))
 }
 
+function resolvePlayback(HlsjsPlaybackExport) {
+  return HlsjsPlaybackExport.default || HlsjsPlaybackExport
+}
+
 function assertPlaybackContract(HlsjsPlaybackExport) {
   // Must re-require after resetModules so the prototype identity matches the
   // @clappr/core instance the artifact just resolved.
   const { HTML5Video } = require('@clappr/core')
-  const Playback = HlsjsPlaybackExport.default || HlsjsPlaybackExport
+  const Playback = resolvePlayback(HlsjsPlaybackExport)
 
   expect(typeof Playback).toBe('function')
   expect(Object.getPrototypeOf(Playback.prototype)).toBe(HTML5Video.prototype)
@@ -54,31 +58,13 @@ function assertPlaybackContract(HlsjsPlaybackExport) {
   playback.destroy()
 }
 
-function assertDoesNotEmbedCore(source) {
-  // Same failure mode as the pre-fix min.js shipping a full Clappr + Zepto copy.
-  expect(source).not.toMatch(/\bZepto\b/)
-  expect(source).not.toContain('clappr-core')
-  expect(source).not.toContain('@clappr/zepto')
-}
-
-function assertDoesNotEmbedHls(source) {
-  expect(source).toMatch(/['"]hls\.js['"]/)
-  // External builds are ~14–31 KB; 100 KB leaves headroom without matching the
-  // ~500 KB+ hls.js-embedded family.
-  expect(source.length).toBeLessThan(100000)
+function assertSourceMappingURL(filename) {
+  expect(readArtifact(filename)).toContain(`sourceMappingURL=${filename}.map`)
 }
 
-function assertEmbedsHls(source) {
-  // Keep until #2538 inverts the default layout — flip deliberately then.
-  expect(source).not.toMatch(/require\(['"]hls\.js['"]\)/)
-  expect(source.length).toBeGreaterThan(100000)
-}
-
-function assertSourceMap(filename) {
-  const mapName = `${filename}.map`
-  expect(fs.existsSync(path.join(DIST, mapName))).toBe(true)
-  expect(readArtifact(filename)).toContain(`sourceMappingURL=${mapName}`)
-}
+const EXPECTED_SOURCEMAPS = Object.values(ARTIFACTS)
+  .map(filename => `${filename}.map`)
+  .sort()
 
 afterEach(() => {
   jest.restoreAllMocks()
@@ -95,21 +81,29 @@ describe.each([
     assertPlaybackContract(loadArtifact(filename))
   })
 
-  test('does not embed @clappr/core or Zepto', () => {
-    assertDoesNotEmbedCore(readArtifact(filename))
+  test('publishes a sourcemap comment', () => {
+    assertSourceMappingURL(filename)
   })
+})
 
-  test('publishes a sourcemap', () => {
-    assertSourceMap(filename)
+describe('dist sourcemap inventory', () => {
+  test('ships exactly the expected .map files', () => {
+    const maps = fs
+      .readdirSync(DIST)
+      .filter(f => f.endsWith('.map'))
+      .sort()
+    expect(maps).toEqual(EXPECTED_SOURCEMAPS)
   })
 })
 
-describe('hls.js embedding contract', () => {
-  test.each(EXTERNAL_HLS)('%s does not embed hls.js', filename => {
-    assertDoesNotEmbedHls(readArtifact(filename))
+describe('hls.js peer identity', () => {
+  test.each(EXTERNAL_HLS)('%s defers to the consumer hls.js', filename => {
+    const Playback = resolvePlayback(loadArtifact(filename))
+    expect(Playback.HLSJS).toBe(require('hls.js'))
   })
 
-  test.each(EMBEDS_HLS)('%s embeds hls.js', filename => {
-    assertEmbedsHls(readArtifact(filename))
+  test.each(EMBEDS_HLS)('%s embeds its own hls.js copy', filename => {
+    const Playback = resolvePlayback(loadArtifact(filename))
+    expect(Playback.HLSJS).not.toBe(require('hls.js'))
   })
 })

package/src/hls.js

@@ -213,7 +213,7 @@ export default class HlsjsPlayback extends HTML5Video {
     this._segmentTargetDuration = null
     // #EXT-X-PLAYLIST-TYPE
     this._playlistType = null
-    this._recoverAttemptsRemaining = this.options.hlsRecoverAttempts || DEFAULT_RECOVER_ATTEMPTS
+    this._recoverAttemptsRemaining = this.options.hlsRecoverAttempts ?? DEFAULT_RECOVER_ATTEMPTS
   }
 
   _setup() {
@@ -372,8 +372,7 @@ export default class HlsjsPlayback extends HTML5Video {
   }
 
   seekPercentage(percentage) {
-    const seekTo = percentage > 0 ? this._duration * (percentage / 100) : this._duration
-    this.seek(seekTo)
+    this.seek(this._duration * (percentage / 100))
   }
 
   seek(time) {