rx-player 4.5.0-dev.2026033100 → 4.5.0-dev.2026043000

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (272) hide show
  1. package/CHANGELOG.md +25 -5
  2. package/VERSION +1 -1
  3. package/dist/commonjs/__GENERATED_CODE/embedded_dash_wasm.d.ts.map +1 -1
  4. package/dist/commonjs/__GENERATED_CODE/embedded_dash_wasm.js +1 -1
  5. package/dist/commonjs/__GENERATED_CODE/embedded_worker.d.ts.map +1 -1
  6. package/dist/commonjs/__GENERATED_CODE/embedded_worker.js +1 -1
  7. package/dist/commonjs/compat/can_patch_out_pssh.d.ts +42 -0
  8. package/dist/commonjs/compat/can_patch_out_pssh.d.ts.map +1 -0
  9. package/dist/commonjs/compat/can_patch_out_pssh.js +53 -0
  10. package/dist/commonjs/compat/env_detector.d.ts +2 -0
  11. package/dist/commonjs/compat/env_detector.d.ts.map +1 -1
  12. package/dist/commonjs/compat/env_detector.js +5 -0
  13. package/dist/commonjs/core/adaptive/network_analyzer.d.ts +1 -2
  14. package/dist/commonjs/core/adaptive/network_analyzer.d.ts.map +1 -1
  15. package/dist/commonjs/core/adaptive/network_analyzer.js +3 -3
  16. package/dist/commonjs/core/adaptive/utils/representation_score_calculator.js +2 -2
  17. package/dist/commonjs/core/cmcd/cmcd_data_builder.d.ts.map +1 -1
  18. package/dist/commonjs/core/cmcd/cmcd_data_builder.js +9 -3
  19. package/dist/commonjs/core/entry/content_preparer.d.ts.map +1 -1
  20. package/dist/commonjs/core/entry/content_preparer.js +5 -7
  21. package/dist/commonjs/core/entry/content_time_boundaries_observer.d.ts.map +1 -1
  22. package/dist/commonjs/core/entry/content_time_boundaries_observer.js +18 -4
  23. package/dist/commonjs/core/entry/core_entry.d.ts.map +1 -1
  24. package/dist/commonjs/core/entry/core_entry.js +6 -2
  25. package/dist/commonjs/core/entry/core_text_displayer_interface.js +3 -3
  26. package/dist/commonjs/core/fetchers/manifest/manifest_fetcher.d.ts.map +1 -1
  27. package/dist/commonjs/core/fetchers/manifest/manifest_fetcher.js +12 -0
  28. package/dist/commonjs/core/fetchers/thumbnails/thumbnail_fetcher.js +1 -1
  29. package/dist/commonjs/core/fetchers/utils/schedule_request.d.ts.map +1 -1
  30. package/dist/commonjs/core/fetchers/utils/schedule_request.js +4 -3
  31. package/dist/commonjs/core/segment_sinks/garbage_collector.d.ts +0 -2
  32. package/dist/commonjs/core/segment_sinks/garbage_collector.d.ts.map +1 -1
  33. package/dist/commonjs/core/segment_sinks/garbage_collector.js +0 -3
  34. package/dist/commonjs/core/segment_sinks/implementations/text/text_segment_sink.d.ts +1 -1
  35. package/dist/commonjs/core/segment_sinks/implementations/text/text_segment_sink.d.ts.map +1 -1
  36. package/dist/commonjs/core/segment_sinks/implementations/text/text_segment_sink.js +2 -2
  37. package/dist/commonjs/core/stream/adaptation/adaptation_stream.d.ts.map +1 -1
  38. package/dist/commonjs/core/stream/adaptation/adaptation_stream.js +6 -6
  39. package/dist/commonjs/core/stream/orchestrator/stream_orchestrator.d.ts.map +1 -1
  40. package/dist/commonjs/core/stream/orchestrator/stream_orchestrator.js +37 -40
  41. package/dist/commonjs/default_config.d.ts +5 -0
  42. package/dist/commonjs/default_config.d.ts.map +1 -1
  43. package/dist/commonjs/default_config.js +5 -0
  44. package/dist/commonjs/errors/index.d.ts +2 -2
  45. package/dist/commonjs/errors/index.d.ts.map +1 -1
  46. package/dist/commonjs/errors/index.js +2 -1
  47. package/dist/commonjs/errors/media_error.d.ts +19 -4
  48. package/dist/commonjs/errors/media_error.d.ts.map +1 -1
  49. package/dist/commonjs/errors/media_error.js +29 -0
  50. package/dist/commonjs/main_thread/api/public_api.d.ts.map +1 -1
  51. package/dist/commonjs/main_thread/api/public_api.js +23 -16
  52. package/dist/commonjs/main_thread/decrypt/content_decryptor.d.ts.map +1 -1
  53. package/dist/commonjs/main_thread/decrypt/content_decryptor.js +4 -1
  54. package/dist/commonjs/main_thread/decrypt/session_events_listener.js +1 -1
  55. package/dist/commonjs/main_thread/decrypt/set_server_certificate.d.ts +2 -0
  56. package/dist/commonjs/main_thread/decrypt/set_server_certificate.d.ts.map +1 -1
  57. package/dist/commonjs/main_thread/decrypt/set_server_certificate.js +4 -0
  58. package/dist/commonjs/main_thread/init/media_source_content_initializer.d.ts +0 -8
  59. package/dist/commonjs/main_thread/init/media_source_content_initializer.d.ts.map +1 -1
  60. package/dist/commonjs/main_thread/init/media_source_content_initializer.js +59 -54
  61. package/dist/commonjs/main_thread/init/utils/stream_events_emitter/stream_events_emitter.d.ts +35 -5
  62. package/dist/commonjs/main_thread/init/utils/stream_events_emitter/stream_events_emitter.d.ts.map +1 -1
  63. package/dist/commonjs/main_thread/init/utils/stream_events_emitter/stream_events_emitter.js +60 -19
  64. package/dist/commonjs/main_thread/render_thumbnail.d.ts.map +1 -1
  65. package/dist/commonjs/main_thread/render_thumbnail.js +4 -0
  66. package/dist/commonjs/main_thread/tracks_store/media_element_tracks_store.d.ts.map +1 -1
  67. package/dist/commonjs/main_thread/tracks_store/media_element_tracks_store.js +1 -0
  68. package/dist/commonjs/main_thread/tracks_store/tracks_store.d.ts +1 -1
  69. package/dist/commonjs/main_thread/tracks_store/tracks_store.js +1 -1
  70. package/dist/{es2017/parsers/containers/isobmff/take_pssh_out.d.ts → commonjs/parsers/containers/isobmff/extract_pssh.d.ts} +6 -4
  71. package/dist/commonjs/parsers/containers/isobmff/extract_pssh.d.ts.map +1 -0
  72. package/dist/commonjs/parsers/containers/isobmff/{take_pssh_out.js → extract_pssh.js} +22 -17
  73. package/dist/commonjs/parsers/containers/isobmff/index.d.ts +2 -2
  74. package/dist/commonjs/parsers/containers/isobmff/index.d.ts.map +1 -1
  75. package/dist/commonjs/parsers/containers/isobmff/index.js +4 -4
  76. package/dist/commonjs/playback_observer/core_playback_observer.d.ts +4 -4
  77. package/dist/commonjs/playback_observer/core_playback_observer.d.ts.map +1 -1
  78. package/dist/commonjs/playback_observer/media_element_playback_observer.d.ts +1 -2
  79. package/dist/commonjs/playback_observer/media_element_playback_observer.d.ts.map +1 -1
  80. package/dist/commonjs/transports/dash/segment_parser.js +1 -1
  81. package/dist/commonjs/transports/local/segment_parser.js +1 -1
  82. package/dist/commonjs/utils/test-utils.d.ts +30 -0
  83. package/dist/commonjs/utils/test-utils.d.ts.map +1 -0
  84. package/dist/commonjs/utils/test-utils.js +79 -0
  85. package/dist/es2017/__GENERATED_CODE/embedded_dash_wasm.d.ts.map +1 -1
  86. package/dist/es2017/__GENERATED_CODE/embedded_dash_wasm.js +1 -1
  87. package/dist/es2017/__GENERATED_CODE/embedded_worker.d.ts.map +1 -1
  88. package/dist/es2017/__GENERATED_CODE/embedded_worker.js +1 -1
  89. package/dist/es2017/compat/can_patch_out_pssh.d.ts +42 -0
  90. package/dist/es2017/compat/can_patch_out_pssh.d.ts.map +1 -0
  91. package/dist/es2017/compat/can_patch_out_pssh.js +50 -0
  92. package/dist/es2017/compat/env_detector.d.ts +2 -0
  93. package/dist/es2017/compat/env_detector.d.ts.map +1 -1
  94. package/dist/es2017/compat/env_detector.js +5 -0
  95. package/dist/es2017/core/adaptive/network_analyzer.d.ts +1 -2
  96. package/dist/es2017/core/adaptive/network_analyzer.d.ts.map +1 -1
  97. package/dist/es2017/core/adaptive/network_analyzer.js +3 -3
  98. package/dist/es2017/core/adaptive/utils/representation_score_calculator.js +2 -2
  99. package/dist/es2017/core/cmcd/cmcd_data_builder.d.ts.map +1 -1
  100. package/dist/es2017/core/cmcd/cmcd_data_builder.js +9 -3
  101. package/dist/es2017/core/entry/content_preparer.d.ts.map +1 -1
  102. package/dist/es2017/core/entry/content_preparer.js +3 -5
  103. package/dist/es2017/core/entry/content_time_boundaries_observer.d.ts.map +1 -1
  104. package/dist/es2017/core/entry/content_time_boundaries_observer.js +18 -4
  105. package/dist/es2017/core/entry/core_entry.d.ts.map +1 -1
  106. package/dist/es2017/core/entry/core_entry.js +6 -2
  107. package/dist/es2017/core/entry/core_text_displayer_interface.js +3 -3
  108. package/dist/es2017/core/fetchers/manifest/manifest_fetcher.d.ts.map +1 -1
  109. package/dist/es2017/core/fetchers/manifest/manifest_fetcher.js +12 -0
  110. package/dist/es2017/core/fetchers/thumbnails/thumbnail_fetcher.js +1 -1
  111. package/dist/es2017/core/fetchers/utils/schedule_request.d.ts.map +1 -1
  112. package/dist/es2017/core/fetchers/utils/schedule_request.js +2 -3
  113. package/dist/es2017/core/segment_sinks/garbage_collector.d.ts +0 -2
  114. package/dist/es2017/core/segment_sinks/garbage_collector.d.ts.map +1 -1
  115. package/dist/es2017/core/segment_sinks/garbage_collector.js +0 -3
  116. package/dist/es2017/core/segment_sinks/implementations/text/text_segment_sink.d.ts +1 -1
  117. package/dist/es2017/core/segment_sinks/implementations/text/text_segment_sink.d.ts.map +1 -1
  118. package/dist/es2017/core/segment_sinks/implementations/text/text_segment_sink.js +2 -2
  119. package/dist/es2017/core/stream/adaptation/adaptation_stream.d.ts.map +1 -1
  120. package/dist/es2017/core/stream/adaptation/adaptation_stream.js +6 -6
  121. package/dist/es2017/core/stream/orchestrator/stream_orchestrator.d.ts.map +1 -1
  122. package/dist/es2017/core/stream/orchestrator/stream_orchestrator.js +40 -39
  123. package/dist/es2017/default_config.d.ts +5 -0
  124. package/dist/es2017/default_config.d.ts.map +1 -1
  125. package/dist/es2017/default_config.js +5 -0
  126. package/dist/es2017/errors/index.d.ts +2 -2
  127. package/dist/es2017/errors/index.d.ts.map +1 -1
  128. package/dist/es2017/errors/index.js +2 -2
  129. package/dist/es2017/errors/media_error.d.ts +19 -4
  130. package/dist/es2017/errors/media_error.d.ts.map +1 -1
  131. package/dist/es2017/errors/media_error.js +28 -0
  132. package/dist/es2017/main_thread/api/public_api.d.ts.map +1 -1
  133. package/dist/es2017/main_thread/api/public_api.js +20 -13
  134. package/dist/es2017/main_thread/decrypt/content_decryptor.d.ts.map +1 -1
  135. package/dist/es2017/main_thread/decrypt/content_decryptor.js +4 -1
  136. package/dist/es2017/main_thread/decrypt/session_events_listener.js +1 -1
  137. package/dist/es2017/main_thread/decrypt/set_server_certificate.d.ts +2 -0
  138. package/dist/es2017/main_thread/decrypt/set_server_certificate.d.ts.map +1 -1
  139. package/dist/es2017/main_thread/decrypt/set_server_certificate.js +4 -0
  140. package/dist/es2017/main_thread/init/media_source_content_initializer.d.ts +0 -8
  141. package/dist/es2017/main_thread/init/media_source_content_initializer.d.ts.map +1 -1
  142. package/dist/es2017/main_thread/init/media_source_content_initializer.js +60 -55
  143. package/dist/es2017/main_thread/init/utils/stream_events_emitter/stream_events_emitter.d.ts +35 -5
  144. package/dist/es2017/main_thread/init/utils/stream_events_emitter/stream_events_emitter.d.ts.map +1 -1
  145. package/dist/es2017/main_thread/init/utils/stream_events_emitter/stream_events_emitter.js +60 -19
  146. package/dist/es2017/main_thread/render_thumbnail.d.ts.map +1 -1
  147. package/dist/es2017/main_thread/render_thumbnail.js +4 -0
  148. package/dist/es2017/main_thread/tracks_store/media_element_tracks_store.d.ts.map +1 -1
  149. package/dist/es2017/main_thread/tracks_store/media_element_tracks_store.js +1 -0
  150. package/dist/es2017/main_thread/tracks_store/tracks_store.d.ts +1 -1
  151. package/dist/es2017/main_thread/tracks_store/tracks_store.js +1 -1
  152. package/dist/{commonjs/parsers/containers/isobmff/take_pssh_out.d.ts → es2017/parsers/containers/isobmff/extract_pssh.d.ts} +6 -4
  153. package/dist/es2017/parsers/containers/isobmff/extract_pssh.d.ts.map +1 -0
  154. package/dist/es2017/parsers/containers/isobmff/{take_pssh_out.js → extract_pssh.js} +21 -16
  155. package/dist/es2017/parsers/containers/isobmff/index.d.ts +2 -2
  156. package/dist/es2017/parsers/containers/isobmff/index.d.ts.map +1 -1
  157. package/dist/es2017/parsers/containers/isobmff/index.js +2 -2
  158. package/dist/es2017/playback_observer/core_playback_observer.d.ts +4 -4
  159. package/dist/es2017/playback_observer/core_playback_observer.d.ts.map +1 -1
  160. package/dist/es2017/playback_observer/media_element_playback_observer.d.ts +1 -2
  161. package/dist/es2017/playback_observer/media_element_playback_observer.d.ts.map +1 -1
  162. package/dist/es2017/transports/dash/segment_parser.js +2 -2
  163. package/dist/es2017/transports/local/segment_parser.js +2 -2
  164. package/dist/es2017/utils/test-utils.d.ts +30 -0
  165. package/dist/es2017/utils/test-utils.d.ts.map +1 -0
  166. package/dist/es2017/utils/test-utils.js +36 -0
  167. package/dist/mpd-parser.wasm +0 -0
  168. package/dist/worker.js +6 -6
  169. package/package.json +5 -3
  170. package/src/README.md +7 -7
  171. package/src/__GENERATED_CODE/embedded_dash_wasm.ts +1 -1
  172. package/src/__GENERATED_CODE/embedded_worker.ts +1 -1
  173. package/src/compat/__tests__/can_patch_out_pssh.test.ts +40 -0
  174. package/src/compat/can_patch_out_pssh.ts +53 -0
  175. package/src/compat/env_detector.ts +4 -0
  176. package/src/core/README.md +1 -1
  177. package/src/core/adaptive/README.md +3 -3
  178. package/src/core/adaptive/__tests__/adaptive_representation_selector.test.ts +181 -110
  179. package/src/core/adaptive/__tests__/guess_based_chooser.test.ts +229 -123
  180. package/src/core/adaptive/__tests__/mocks.ts +100 -0
  181. package/src/core/adaptive/__tests__/network_analyzer.test.ts +152 -59
  182. package/src/core/adaptive/network_analyzer.ts +4 -4
  183. package/src/core/adaptive/utils/__tests__/filter_by_bitrate.test.ts +11 -19
  184. package/src/core/adaptive/utils/__tests__/filter_by_resolution.test.ts +12 -12
  185. package/src/core/adaptive/utils/__tests__/last_estimate_storage.test.ts +25 -12
  186. package/src/core/adaptive/utils/__tests__/pending_requests_store.test.ts +13 -9
  187. package/src/core/adaptive/utils/__tests__/representation_score_calculator.test.ts +11 -11
  188. package/src/core/adaptive/utils/__tests__/select_optimal_representation.test.ts +13 -23
  189. package/src/core/adaptive/utils/representation_score_calculator.ts +2 -2
  190. package/src/core/cmcd/__tests__/cmcd_data_builder.test.ts +60 -15
  191. package/src/core/cmcd/cmcd_data_builder.ts +9 -3
  192. package/src/core/entry/README.md +2 -2
  193. package/src/core/entry/__tests__/content_time_boundaries_observer.test.ts +5 -0
  194. package/src/core/entry/__tests__/core_text_displayer_interface.test.ts +20 -0
  195. package/src/core/entry/content_preparer.ts +2 -5
  196. package/src/core/entry/content_time_boundaries_observer.ts +18 -4
  197. package/src/core/entry/core_entry.ts +6 -2
  198. package/src/core/entry/core_text_displayer_interface.ts +3 -3
  199. package/src/core/fetchers/manifest/__tests__/manifest_fetcher.test.ts +52 -3
  200. package/src/core/fetchers/manifest/manifest_fetcher.ts +12 -0
  201. package/src/core/fetchers/thumbnails/__tests__/thumbnail_fetcher.test.ts +70 -0
  202. package/src/core/fetchers/thumbnails/thumbnail_fetcher.ts +1 -1
  203. package/src/core/fetchers/utils/schedule_request.ts +5 -3
  204. package/src/core/segment_sinks/__tests__/garbage_collector.test.ts +434 -0
  205. package/src/core/segment_sinks/__tests__/mocks.ts +49 -0
  206. package/src/core/segment_sinks/garbage_collector.ts +0 -3
  207. package/src/core/segment_sinks/implementations/text/__tests__/text_segment_sink.test.ts +177 -0
  208. package/src/core/segment_sinks/implementations/text/text_segment_sink.ts +2 -2
  209. package/src/core/segment_sinks/inventory/__tests__/buffered_history.test.ts +215 -0
  210. package/src/core/segment_sinks/inventory/__tests__/segment_inventory.test.ts +448 -0
  211. package/src/core/stream/adaptation/__tests__/adaptation_stream.test.ts +973 -0
  212. package/src/core/stream/adaptation/__tests__/get_representations_switch_strategy.test.ts +283 -374
  213. package/src/core/stream/adaptation/adaptation_stream.ts +6 -8
  214. package/src/core/stream/orchestrator/README.md +4 -4
  215. package/src/core/stream/orchestrator/__tests__/stream_orchestrator.test.ts +707 -0
  216. package/src/core/stream/orchestrator/stream_orchestrator.ts +41 -46
  217. package/src/core/stream/period/utils/__tests__/get_adaptation_switch_strategy.test.ts +290 -220
  218. package/src/core/stream/representation/__tests__/encryption_data_notifier.test.ts +93 -63
  219. package/src/core/stream/representation/utils/__tests__/append_segment_to_buffer.test.ts +106 -63
  220. package/src/core/stream/representation/utils/__tests__/check_for_discontinuity.test.ts +179 -204
  221. package/src/core/stream/representation/utils/__tests__/get_segment_priority.test.ts +7 -7
  222. package/src/core/stream/representation/utils/__tests__/push_init_segment.test.ts +103 -60
  223. package/src/core/stream/representation/utils/__tests__/push_media_segment.test.ts +231 -165
  224. package/src/default_config.ts +6 -0
  225. package/src/errors/__tests__/media_error.test.ts +106 -3
  226. package/src/errors/index.ts +2 -1
  227. package/src/errors/media_error.ts +63 -7
  228. package/src/experimental/README.md +1 -1
  229. package/src/features/README.md +3 -3
  230. package/src/main_thread/api/README.md +6 -7
  231. package/src/main_thread/api/public_api.ts +16 -10
  232. package/src/main_thread/decrypt/README.md +4 -4
  233. package/src/main_thread/decrypt/__tests__/__global__/content_decryptor.test.ts +135 -0
  234. package/src/main_thread/decrypt/__tests__/__global__/get_license.test.ts +70 -0
  235. package/src/main_thread/decrypt/__tests__/__global__/server_certificate.test.ts +44 -0
  236. package/src/main_thread/decrypt/__tests__/__global__/utils.ts +2 -2
  237. package/src/main_thread/decrypt/content_decryptor.ts +6 -1
  238. package/src/main_thread/decrypt/session_events_listener.ts +1 -1
  239. package/src/main_thread/decrypt/set_server_certificate.ts +5 -0
  240. package/src/main_thread/init/media_source_content_initializer.ts +72 -60
  241. package/src/main_thread/init/utils/__tests__/stream_events_emitter.test.ts +175 -0
  242. package/src/main_thread/init/utils/stream_events_emitter/stream_events_emitter.ts +90 -26
  243. package/src/main_thread/render_thumbnail.ts +4 -0
  244. package/src/main_thread/tracks_store/README.md +12 -0
  245. package/src/main_thread/tracks_store/__tests__/media_element_tracks_store.test.ts +25 -18
  246. package/src/main_thread/tracks_store/media_element_tracks_store.ts +1 -0
  247. package/src/main_thread/tracks_store/tracks_store.ts +1 -1
  248. package/src/manifest/classes/__tests__/mocks.ts +202 -0
  249. package/src/parsers/containers/isobmff/__tests__/extract_pssh.test.ts +199 -0
  250. package/src/parsers/containers/isobmff/{take_pssh_out.ts → extract_pssh.ts} +21 -17
  251. package/src/parsers/containers/isobmff/index.ts +2 -2
  252. package/src/parsers/manifest/dash/wasm-parser/README.md +9 -9
  253. package/src/playback_observer/__tests__/mocks.ts +152 -0
  254. package/src/playback_observer/core_playback_observer.ts +4 -4
  255. package/src/playback_observer/media_element_playback_observer.ts +1 -1
  256. package/src/tools/README.md +2 -2
  257. package/src/transports/README.md +5 -5
  258. package/src/transports/dash/segment_parser.ts +2 -2
  259. package/src/transports/local/segment_parser.ts +2 -2
  260. package/src/transports/metaplaylist/README.md +4 -4
  261. package/src/utils/README.md +3 -3
  262. package/src/utils/test-utils.ts +50 -0
  263. package/dist/commonjs/core/entry/synchronize_sinks_on_observation.d.ts +0 -11
  264. package/dist/commonjs/core/entry/synchronize_sinks_on_observation.d.ts.map +0 -1
  265. package/dist/commonjs/core/entry/synchronize_sinks_on_observation.js +0 -20
  266. package/dist/commonjs/parsers/containers/isobmff/take_pssh_out.d.ts.map +0 -1
  267. package/dist/es2017/core/entry/synchronize_sinks_on_observation.d.ts +0 -11
  268. package/dist/es2017/core/entry/synchronize_sinks_on_observation.d.ts.map +0 -1
  269. package/dist/es2017/core/entry/synchronize_sinks_on_observation.js +0 -17
  270. package/dist/es2017/parsers/containers/isobmff/take_pssh_out.d.ts.map +0 -1
  271. package/src/core/adaptive/utils/__tests__/bandwith_estimator.test.ts +0 -117
  272. package/src/core/entry/synchronize_sinks_on_observation.ts +0 -22
@@ -291,4 +291,48 @@ describe("decrypt - global tests - server certificate", () => {
291
291
  }, 10);
292
292
  });
293
293
  });
294
+
295
+ it("should continue if setServerCertificate resolves to false and retry later", () => {
296
+ const videoElt = document.createElement("video");
297
+ mockCompat(mocks);
298
+ const mockSetServerCertificate = vi
299
+ .spyOn(MediaKeysImpl.prototype, "setServerCertificate")
300
+ .mockImplementationOnce((_serverCertificate: BufferSource): Promise<false> => {
301
+ return Promise.resolve(false);
302
+ })
303
+ .mockImplementationOnce((_serverCertificate: BufferSource): Promise<true> => {
304
+ return Promise.resolve(true);
305
+ });
306
+
307
+ const eme = getEmeApiImplementation("auto");
308
+ assert(eme !== null, "Expected to have an EME implementation");
309
+ const firstDecryptor = new ContentDecryptor(eme, videoElt, ksConfigCert);
310
+
311
+ return new Promise<void>((res) => {
312
+ firstDecryptor.addEventListener("stateChange", (state) => {
313
+ if (state === ContentDecryptorState.WaitingForAttachment) {
314
+ firstDecryptor.removeEventListener("stateChange");
315
+ firstDecryptor.attach();
316
+ }
317
+ });
318
+
319
+ setTimeout(() => {
320
+ firstDecryptor.dispose(undefined);
321
+
322
+ const secondDecryptor = new ContentDecryptor(eme, videoElt, ksConfigCert);
323
+ secondDecryptor.addEventListener("stateChange", (state) => {
324
+ if (state === ContentDecryptorState.WaitingForAttachment) {
325
+ secondDecryptor.removeEventListener("stateChange");
326
+ secondDecryptor.attach();
327
+ }
328
+ });
329
+
330
+ setTimeout(() => {
331
+ secondDecryptor.dispose(undefined);
332
+ expect(mockSetServerCertificate).toHaveBeenCalledTimes(2);
333
+ res();
334
+ }, 10);
335
+ }, 10);
336
+ });
337
+ });
294
338
  });
@@ -121,7 +121,7 @@ export class MediaKeyStatusMapImpl {
121
121
  ) => void,
122
122
  thisArg?: unknown,
123
123
  ): void {
124
- this._map.forEach((value, key) => callbackfn.bind(thisArg, value, key, this));
124
+ this._map.forEach((value, key) => callbackfn.call(thisArg, value, key, this));
125
125
  }
126
126
 
127
127
  public _setKeyStatus(keyId: BufferSource, value: MediaKeyStatus | undefined): void {
@@ -222,7 +222,7 @@ export class MediaKeysImpl {
222
222
  return new MediaKeySessionImpl();
223
223
  }
224
224
 
225
- setServerCertificate(_serverCertificate: BufferSource): Promise<true> {
225
+ setServerCertificate(_serverCertificate: BufferSource): Promise<boolean> {
226
226
  return Promise.resolve(true);
227
227
  }
228
228
  }
@@ -309,6 +309,11 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
309
309
  );
310
310
  if (resSsc.type === "error") {
311
311
  this.trigger("warning", resSsc.value);
312
+ } else if (resSsc.type === "not-supported") {
313
+ log.warn(
314
+ "DRM",
315
+ "Server certificate is not supported by the current MediaKeys.",
316
+ );
312
317
  }
313
318
  }
314
319
 
@@ -654,7 +659,7 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
654
659
  this._lockInitDataQueue();
655
660
  const indexOf = this._currentSessions.indexOf(sessionInfo);
656
661
  if (indexOf >= 0) {
657
- this._currentSessions.splice(indexOf);
662
+ this._currentSessions.splice(indexOf, 1);
658
663
  }
659
664
  if (initializationData.content !== undefined) {
660
665
  this.trigger("keyIdsCompatibilityUpdate", {
@@ -400,7 +400,7 @@ export class GetLicenseTimeoutError extends Error {
400
400
  constructor(message: string) {
401
401
  super(message);
402
402
  // @see https://stackoverflow.com/questions/41102060/typescript-extending-error-class
403
- Object.setPrototypeOf(this, BlacklistedSessionError.prototype);
403
+ Object.setPrototypeOf(this, GetLicenseTimeoutError.prototype);
404
404
  this.message = message;
405
405
  }
406
406
  }
@@ -84,6 +84,7 @@ export default async function trySettingServerCertificate(
84
84
  ): Promise<
85
85
  | { type: "success"; value: unknown }
86
86
  | { type: "already-has-one" }
87
+ | { type: "not-supported" }
87
88
  | { type: "method-not-implemented" }
88
89
  | { type: "error"; value: IPlayerError }
89
90
  > {
@@ -112,6 +113,10 @@ export default async function trySettingServerCertificate(
112
113
  serverCertificate,
113
114
  mediaKeySystemAccess,
114
115
  );
116
+ if (result === false) {
117
+ log.warn("DRM", "MediaKeys ignored the server certificate. Continuing without it.");
118
+ return { type: "not-supported" };
119
+ }
115
120
  ServerCertificateStore.set(mediaKeys, serverCertificate);
116
121
  return { type: "success", value: result };
117
122
  } catch (error) {
@@ -15,9 +15,10 @@ import type {
15
15
  ISentLogValue,
16
16
  } from "../../core/types";
17
17
  import { CoreMessageType } from "../../core/types";
18
+ import type { MediaError } from "../../errors";
18
19
  import {
20
+ deserializeMediaError,
19
21
  EncryptedMediaError,
20
- MediaError,
21
22
  NetworkError,
22
23
  OtherError,
23
24
  SourceBufferError,
@@ -190,7 +191,6 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
190
191
  manifest: null,
191
192
  mediaSourceInfo: null,
192
193
  rebufferingController: null,
193
- streamEventsEmitter: null,
194
194
  initialTime: undefined,
195
195
  autoPlay: undefined,
196
196
  initialPlayPerformed: null,
@@ -353,21 +353,30 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
353
353
  }
354
354
 
355
355
  let textDisplayer: ITextDisplayer | null = null;
356
- if (
357
- this._settings.textTrackOptions.textTrackMode === "html" &&
358
- features.htmlTextDisplayer !== null
359
- ) {
360
- assert(this._hasTextBufferFeature());
361
- textDisplayer = new features.htmlTextDisplayer(
362
- mediaElement,
363
- this._settings.textTrackOptions.textTrackElement,
356
+ try {
357
+ if (
358
+ this._settings.textTrackOptions.textTrackMode === "html" &&
359
+ features.htmlTextDisplayer !== null
360
+ ) {
361
+ assert(this._hasTextBufferFeature());
362
+ textDisplayer = new features.htmlTextDisplayer(
363
+ mediaElement,
364
+ this._settings.textTrackOptions.textTrackElement,
365
+ );
366
+ } else if (features.nativeTextDisplayer !== null) {
367
+ assert(this._hasTextBufferFeature());
368
+ textDisplayer = new features.nativeTextDisplayer(mediaElement);
369
+ } else {
370
+ assert(!this._hasTextBufferFeature());
371
+ }
372
+ } catch (err) {
373
+ log.error(
374
+ "Init",
375
+ "failed to initialize text displayer",
376
+ err instanceof Error ? err : "Unknown Error",
364
377
  );
365
- } else if (features.nativeTextDisplayer !== null) {
366
- assert(this._hasTextBufferFeature());
367
- textDisplayer = new features.nativeTextDisplayer(mediaElement);
368
- } else {
369
- assert(!this._hasTextBufferFeature());
370
378
  }
379
+
371
380
  this._initCanceller.signal.register((err) => {
372
381
  textDisplayer?.stop(err.reason);
373
382
  });
@@ -402,12 +411,32 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
402
411
  contentInfo.contentDecryptor = contentDecryptor;
403
412
  }
404
413
 
414
+ const streamEventsEmitter = new StreamEventsEmitter(playbackObserver);
415
+ streamEventsEmitter.addEventListener(
416
+ "event",
417
+ (payload) => {
418
+ this.trigger("streamEvent", payload);
419
+ },
420
+ this._initCanceller.signal,
421
+ );
422
+ streamEventsEmitter.addEventListener(
423
+ "eventSkip",
424
+ (payload) => {
425
+ this.trigger("streamEventSkip", payload);
426
+ },
427
+ this._initCanceller.signal,
428
+ );
429
+ this._initCanceller.signal.register((err) => {
430
+ streamEventsEmitter.stop(err.reason);
431
+ });
432
+
405
433
  const playbackStartParams = {
406
434
  mediaElement,
407
435
  textDisplayer,
408
436
  playbackObserver,
409
437
  drmInitializationStatus,
410
438
  mediaSourceStatus,
439
+ streamEventsEmitter,
411
440
  };
412
441
  mediaSourceStatus.onUpdate(
413
442
  (msInitStatus, stopListeningMSStatus) => {
@@ -510,6 +539,7 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
510
539
  textDisplayer,
511
540
  playbackObserver,
512
541
  mediaSourceStatus,
542
+ streamEventsEmitter,
513
543
  position,
514
544
  !isPaused,
515
545
  );
@@ -921,6 +951,7 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
921
951
  return;
922
952
  }
923
953
  const manifest = msgData.value.manifest;
954
+ streamEventsEmitter.start(manifest);
924
955
  this._currentContentInfo.manifest = manifest;
925
956
  this._updateCodecSupport(manifest, mediaElement);
926
957
  this._startPlaybackIfReady(playbackStartParams);
@@ -948,8 +979,7 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
948
979
  msgData.value.updates,
949
980
  );
950
981
  }
951
- this._currentContentInfo?.streamEventsEmitter?.onManifestUpdate(manifest);
952
-
982
+ streamEventsEmitter.onManifestUpdate(manifest);
953
983
  this._updateCodecSupport(manifest, mediaElement);
954
984
  this.trigger("manifestUpdate", msgData.value.updates);
955
985
  break;
@@ -1558,6 +1588,7 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
1558
1588
  textDisplayer: ITextDisplayer | null,
1559
1589
  playbackObserver: IMediaElementPlaybackObserver,
1560
1590
  mediaSourceStatus: SharedReference<MediaSourceInitializationStatus>,
1591
+ streamEventsEmitter: StreamEventsEmitter,
1561
1592
  position: number,
1562
1593
  autoPlay: boolean,
1563
1594
  ) {
@@ -1565,6 +1596,7 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
1565
1596
  this._currentMediaSourceCanceller = new TaskCanceller("Init MediaSource");
1566
1597
  this._currentMediaSourceCanceller.linkToSignal(this._initCanceller.signal);
1567
1598
  mediaSourceStatus.setValue(MediaSourceInitializationStatus.AttachNow);
1599
+ streamEventsEmitter.pause();
1568
1600
  this.trigger("reloadingMediaSource", { position, autoPlay });
1569
1601
 
1570
1602
  mediaSourceStatus.onUpdate(
@@ -1580,6 +1612,7 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
1580
1612
  mediaElement,
1581
1613
  textDisplayer,
1582
1614
  playbackObserver,
1615
+ streamEventsEmitter,
1583
1616
  },
1584
1617
  this._currentMediaSourceCanceller.signal,
1585
1618
  );
@@ -1635,6 +1668,7 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
1635
1668
  mediaElement: IMediaElement;
1636
1669
  textDisplayer: ITextDisplayer | null;
1637
1670
  playbackObserver: IMediaElementPlaybackObserver;
1671
+ streamEventsEmitter: StreamEventsEmitter;
1638
1672
  },
1639
1673
  cancelSignal: CancellationSignal,
1640
1674
  ): IReadOnlyPlaybackObserver<ICorePlaybackObservation> | null {
@@ -1652,10 +1686,17 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
1652
1686
 
1653
1687
  const { manifest, mediaSourceInfo } = this._currentContentInfo;
1654
1688
  const { speed } = this._settings;
1655
- const { initialTime, autoPlay, mediaElement, textDisplayer, playbackObserver } =
1656
- parameters;
1689
+ const {
1690
+ initialTime,
1691
+ autoPlay,
1692
+ mediaElement,
1693
+ textDisplayer,
1694
+ playbackObserver,
1695
+ streamEventsEmitter,
1696
+ } = parameters;
1657
1697
  this._currentContentInfo.initialTime = initialTime;
1658
1698
  this._currentContentInfo.autoPlay = autoPlay;
1699
+ streamEventsEmitter.pause(); // Only start polling events once ready to play
1659
1700
 
1660
1701
  const { autoPlayResult, initialPlayPerformed } = performInitialSeekAndPlay(
1661
1702
  {
@@ -1669,6 +1710,15 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
1669
1710
  cancelSignal,
1670
1711
  );
1671
1712
  this._currentContentInfo.initialPlayPerformed = initialPlayPerformed;
1713
+ initialPlayPerformed.onUpdate(
1714
+ (isPerformed, stopListening) => {
1715
+ if (isPerformed) {
1716
+ stopListening();
1717
+ streamEventsEmitter.resume(); // We can now start polling events
1718
+ }
1719
+ },
1720
+ { clearSignal: cancelSignal, emitCurrentValue: true },
1721
+ );
1672
1722
  const corePlaybackObserver = createCorePlaybackObserver(
1673
1723
  playbackObserver,
1674
1724
  {
@@ -1711,36 +1761,6 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
1711
1761
  rebufferingController.start();
1712
1762
  this._currentContentInfo.rebufferingController = rebufferingController;
1713
1763
 
1714
- const currentContentInfo = this._currentContentInfo;
1715
- initialPlayPerformed.onUpdate(
1716
- (isPerformed, stopListening) => {
1717
- if (isPerformed) {
1718
- stopListening();
1719
- const streamEventsEmitter = new StreamEventsEmitter(manifest, playbackObserver);
1720
- currentContentInfo.streamEventsEmitter = streamEventsEmitter;
1721
- streamEventsEmitter.addEventListener(
1722
- "event",
1723
- (payload) => {
1724
- this.trigger("streamEvent", payload);
1725
- },
1726
- cancelSignal,
1727
- );
1728
- streamEventsEmitter.addEventListener(
1729
- "eventSkip",
1730
- (payload) => {
1731
- this.trigger("streamEventSkip", payload);
1732
- },
1733
- cancelSignal,
1734
- );
1735
- streamEventsEmitter.start();
1736
- cancelSignal.register((err) => {
1737
- streamEventsEmitter.stop(err.reason);
1738
- });
1739
- }
1740
- },
1741
- { clearSignal: cancelSignal, emitCurrentValue: true },
1742
- );
1743
-
1744
1764
  const _getSegmentSinkMetrics = async (): Promise<ISegmentSinkMetrics | undefined> => {
1745
1765
  this._awaitingRequests.nextRequestId++;
1746
1766
  const requestId = this._awaitingRequests.nextRequestId;
@@ -1855,6 +1875,7 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
1855
1875
  playbackObserver: IMediaElementPlaybackObserver;
1856
1876
  drmInitializationStatus: IReadOnlySharedReference<IDrmInitializationStatus>;
1857
1877
  mediaSourceStatus: IReadOnlySharedReference<MediaSourceInitializationStatus>;
1878
+ streamEventsEmitter: StreamEventsEmitter;
1858
1879
  }): boolean {
1859
1880
  if (this._currentContentInfo === null || this._currentContentInfo.manifest === null) {
1860
1881
  return false;
@@ -1884,6 +1905,7 @@ export default class MediaSourceContentInitializer extends ContentInitializer {
1884
1905
  mediaElement: parameters.mediaElement,
1885
1906
  textDisplayer: parameters.textDisplayer,
1886
1907
  playbackObserver: parameters.playbackObserver,
1908
+ streamEventsEmitter: parameters.streamEventsEmitter,
1887
1909
  },
1888
1910
  this._currentMediaSourceCanceller.signal,
1889
1911
  );
@@ -2055,13 +2077,6 @@ export interface IMediaSourceContentInitializerContentInfos {
2055
2077
  * `null` if none is currently created for the content.
2056
2078
  */
2057
2079
  rebufferingController: RebufferingController | null;
2058
- /**
2059
- * Current `StreamEventsEmitter` linked to the content, allowing to
2060
- * send events found in the Manifest.
2061
- *
2062
- * `null` if none is currently created for the content.
2063
- */
2064
- streamEventsEmitter: StreamEventsEmitter | null;
2065
2080
  /**
2066
2081
  * The initial position to seek to in seconds once the content is loadeed.
2067
2082
  * `undefined` if unknown yet.
@@ -2278,10 +2293,7 @@ function formatCoreError(sentError: ISentError): IPlayerError {
2278
2293
  ),
2279
2294
  );
2280
2295
  case "MediaError":
2281
- // eslint-disable-next-line
2282
- return new MediaError(sentError.code as any, sentError.reason, {
2283
- tracks: sentError.tracks,
2284
- });
2296
+ return deserializeMediaError(sentError);
2285
2297
  case "EncryptedMediaError":
2286
2298
  // We assume that everything have already been checked Worker-side here
2287
2299
  // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
@@ -0,0 +1,175 @@
1
+ import { afterEach, describe, expect, it, vi } from "vitest";
2
+ import type { IManifestMetadata } from "../../../../manifest";
3
+ import type {
4
+ IPlaybackObservation,
5
+ IReadOnlyPlaybackObserver,
6
+ } from "../../../../playback_observer";
7
+ import { SeekingState } from "../../../../playback_observer";
8
+ import SharedReference from "../../../../utils/reference";
9
+ import type { CancellationSignal } from "../../../../utils/task_canceller";
10
+ import TaskCanceller from "../../../../utils/task_canceller";
11
+ import StreamEventsEmitter from "../stream_events_emitter/stream_events_emitter";
12
+
13
+ describe("init - StreamEventsEmitter", () => {
14
+ afterEach(() => {
15
+ vi.useRealTimers();
16
+ });
17
+
18
+ it("should not send skipped events for positions crossed while the media is not ready", () => {
19
+ vi.useFakeTimers();
20
+
21
+ const observationRef = new SharedReference(generateObservation(4));
22
+ const playbackObserver = createPlaybackObserver(observationRef);
23
+ const streamEventsEmitter = new StreamEventsEmitter(playbackObserver);
24
+ const skippedEvents: unknown[] = [];
25
+ const regularEvents: unknown[] = [];
26
+ const stopCanceller = new TaskCanceller("test");
27
+
28
+ streamEventsEmitter.addEventListener(
29
+ "event",
30
+ (evt) => {
31
+ regularEvents.push(evt);
32
+ },
33
+ stopCanceller.signal,
34
+ );
35
+ streamEventsEmitter.addEventListener(
36
+ "eventSkip",
37
+ (evt) => {
38
+ skippedEvents.push(evt);
39
+ },
40
+ stopCanceller.signal,
41
+ );
42
+
43
+ streamEventsEmitter.start(generateManifest());
44
+ streamEventsEmitter.pause();
45
+
46
+ observationRef.setValue(generateObservation(9));
47
+ vi.advanceTimersByTime(200);
48
+
49
+ streamEventsEmitter.resume();
50
+ observationRef.setValue(generateObservation(9.1));
51
+ vi.advanceTimersByTime(200);
52
+
53
+ expect(regularEvents).toHaveLength(0);
54
+ expect(skippedEvents).toHaveLength(0);
55
+
56
+ streamEventsEmitter.stop("test end");
57
+ stopCanceller.cancel("test end");
58
+ });
59
+
60
+ it("should compare from the current position immediately after resuming", () => {
61
+ vi.useFakeTimers();
62
+
63
+ const observationRef = new SharedReference(generateObservation(4));
64
+ const playbackObserver = createPlaybackObserver(observationRef);
65
+ const streamEventsEmitter = new StreamEventsEmitter(playbackObserver);
66
+ const regularEvents: unknown[] = [];
67
+ const stopCanceller = new TaskCanceller("test");
68
+
69
+ streamEventsEmitter.addEventListener(
70
+ "event",
71
+ (evt) => {
72
+ regularEvents.push(evt);
73
+ },
74
+ stopCanceller.signal,
75
+ );
76
+
77
+ streamEventsEmitter.start(generateManifest());
78
+ streamEventsEmitter.pause();
79
+
80
+ observationRef.setValue(generateObservation(4.5));
81
+ streamEventsEmitter.resume();
82
+ observationRef.setValue(generateObservation(8.5));
83
+ vi.advanceTimersByTime(200);
84
+
85
+ expect(regularEvents).toHaveLength(1);
86
+
87
+ streamEventsEmitter.stop("test end");
88
+ stopCanceller.cancel("test end");
89
+ });
90
+ });
91
+
92
+ function createPlaybackObserver(
93
+ observationRef: SharedReference<IPlaybackObservation>,
94
+ ): IReadOnlyPlaybackObserver<IPlaybackObservation> {
95
+ return {
96
+ getCurrentTime() {
97
+ return observationRef.getValue().position.getPolled();
98
+ },
99
+ getPlaybackRate() {
100
+ return 1;
101
+ },
102
+ getReadyState() {
103
+ return 4;
104
+ },
105
+ getIsPaused() {
106
+ return false;
107
+ },
108
+ getReference() {
109
+ return observationRef;
110
+ },
111
+ listen(
112
+ cb: (observation: IPlaybackObservation, stopListening: () => void) => void,
113
+ options: {
114
+ includeLastObservation?: boolean | undefined;
115
+ clearSignal: CancellationSignal;
116
+ },
117
+ ) {
118
+ observationRef.onUpdate(cb, {
119
+ clearSignal: options.clearSignal,
120
+ emitCurrentValue: options.includeLastObservation,
121
+ });
122
+ },
123
+ deriveReadOnlyObserver() {
124
+ throw new Error("unused in this test");
125
+ },
126
+ } as unknown as IReadOnlyPlaybackObserver<IPlaybackObservation>;
127
+ }
128
+
129
+ function generateManifest(): IManifestMetadata {
130
+ return {
131
+ periods: [
132
+ {
133
+ start: 0,
134
+ streamEvents: [
135
+ {
136
+ start: 5,
137
+ end: 8,
138
+ id: "evt",
139
+ data: {
140
+ type: "dash-event-stream",
141
+ value: {
142
+ schemeIdUri: "urn:test",
143
+ timescale: 1,
144
+ xmlData: { data: "<Event />", namespaces: [] },
145
+ },
146
+ },
147
+ },
148
+ ],
149
+ },
150
+ ],
151
+ } as unknown as IManifestMetadata;
152
+ }
153
+
154
+ function generateObservation(currentTime: number): IPlaybackObservation {
155
+ return {
156
+ event: "timeupdate",
157
+ seeking: SeekingState.None,
158
+ rebuffering: null,
159
+ freezing: null,
160
+ duration: 100,
161
+ ended: false,
162
+ paused: false,
163
+ playbackRate: 1,
164
+ readyState: 4,
165
+ bufferGap: 10,
166
+ fullyLoaded: false,
167
+ currentRange: { start: 0, end: 20 },
168
+ buffered: {} as TimeRanges,
169
+ position: {
170
+ getPolled() {
171
+ return currentTime;
172
+ },
173
+ } as IPlaybackObservation["position"],
174
+ };
175
+ }