rx-player 3.26.3-dev.2022021400 → 3.27.0-dev.20220317
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.
- package/CHANGELOG.md +15 -1
- package/FILES.md +5 -4
- package/VERSION +1 -1
- package/dist/_esm5.processed/compat/browser_detection.d.ts +4 -2
- package/dist/_esm5.processed/compat/browser_detection.js +4 -2
- package/dist/_esm5.processed/compat/eme/close_session.d.ts +11 -5
- package/dist/_esm5.processed/compat/eme/close_session.js +144 -36
- package/dist/_esm5.processed/compat/eme/custom_media_keys/index.d.ts +3 -5
- package/dist/_esm5.processed/compat/eme/custom_media_keys/index.js +21 -22
- package/dist/_esm5.processed/compat/eme/custom_media_keys/old_webkit_media_keys.js +53 -34
- package/dist/_esm5.processed/compat/eme/custom_media_keys/webkit_media_keys.js +43 -41
- package/dist/_esm5.processed/compat/eme/generate_key_request.d.ts +2 -3
- package/dist/_esm5.processed/compat/eme/generate_key_request.js +22 -26
- package/dist/_esm5.processed/compat/eme/load_session.d.ts +1 -2
- package/dist/_esm5.processed/compat/eme/load_session.js +68 -17
- package/dist/_esm5.processed/compat/event_listeners.js +2 -1
- package/dist/_esm5.processed/compat/should_favour_custom_safari_EME.js +2 -2
- package/dist/_esm5.processed/config.d.ts +166 -1080
- package/dist/_esm5.processed/config.js +17 -1119
- package/dist/_esm5.processed/core/abr/bandwidth_estimator.js +4 -1
- package/dist/_esm5.processed/core/abr/network_analyzer.js +2 -1
- package/dist/_esm5.processed/core/api/get_player_state.js +1 -1
- package/dist/_esm5.processed/core/api/index.d.ts +2 -1
- package/dist/_esm5.processed/core/api/media_element_track_choice_manager.js +2 -1
- package/dist/_esm5.processed/core/api/option_utils.d.ts +3 -1
- package/dist/_esm5.processed/core/api/option_utils.js +19 -6
- package/dist/_esm5.processed/core/api/playback_observer.js +5 -1
- package/dist/_esm5.processed/core/api/public_api.d.ts +82 -71
- package/dist/_esm5.processed/core/api/public_api.js +72 -33
- package/dist/_esm5.processed/core/{eme → decrypt}/__tests__/__global__/utils.d.ts +7 -49
- package/dist/_esm5.processed/core/{eme → decrypt}/__tests__/__global__/utils.js +25 -65
- package/dist/_esm5.processed/core/{eme → decrypt}/attach_media_keys.d.ts +12 -12
- package/dist/_esm5.processed/core/decrypt/attach_media_keys.js +104 -0
- package/dist/_esm5.processed/core/{eme/clear_eme_session.d.ts → decrypt/clear_on_stop.d.ts} +3 -4
- package/dist/_esm5.processed/core/decrypt/clear_on_stop.js +41 -0
- package/dist/_esm5.processed/core/decrypt/content_decryptor.d.ts +216 -0
- package/dist/_esm5.processed/core/decrypt/content_decryptor.js +866 -0
- package/dist/_esm5.processed/core/{eme/get_session.d.ts → decrypt/create_or_load_session.d.ts} +28 -26
- package/dist/_esm5.processed/core/decrypt/create_or_load_session.js +124 -0
- package/dist/_esm5.processed/core/{eme → decrypt}/create_session.d.ts +22 -19
- package/dist/_esm5.processed/core/decrypt/create_session.js +174 -0
- package/dist/_esm5.processed/core/decrypt/dispose_decryption_resources.d.ts +21 -0
- package/dist/_esm5.processed/core/decrypt/dispose_decryption_resources.js +81 -0
- package/dist/_esm5.processed/core/{eme → decrypt}/find_key_system.d.ts +11 -14
- package/dist/_esm5.processed/core/decrypt/find_key_system.js +300 -0
- package/dist/_esm5.processed/core/{eme → decrypt}/get_current_key_system.d.ts +0 -0
- package/dist/_esm5.processed/core/{eme → decrypt}/get_current_key_system.js +1 -1
- package/dist/_esm5.processed/core/{eme → decrypt}/get_media_keys.d.ts +13 -5
- package/dist/_esm5.processed/core/decrypt/get_media_keys.js +153 -0
- package/dist/_esm5.processed/core/{eme → decrypt}/index.d.ts +5 -6
- package/dist/_esm5.processed/core/{eme → decrypt}/index.js +5 -5
- package/dist/_esm5.processed/core/{eme → decrypt}/init_media_keys.d.ts +6 -4
- package/dist/_esm5.processed/core/decrypt/init_media_keys.js +82 -0
- package/dist/_esm5.processed/core/decrypt/session_events_listener.d.ts +77 -0
- package/dist/_esm5.processed/core/{eme → decrypt}/session_events_listener.js +25 -24
- package/dist/_esm5.processed/core/{eme → decrypt}/set_server_certificate.d.ts +15 -6
- package/dist/_esm5.processed/core/decrypt/set_server_certificate.js +141 -0
- package/dist/_esm5.processed/core/{eme → decrypt}/types.d.ts +119 -241
- package/dist/_esm5.processed/core/{eme → decrypt}/types.js +0 -0
- package/dist/_esm5.processed/core/{eme → decrypt}/utils/are_init_values_compatible.d.ts +3 -3
- package/dist/_esm5.processed/core/{eme → decrypt}/utils/are_init_values_compatible.js +5 -5
- package/dist/_esm5.processed/core/{eme → decrypt/utils}/check_key_statuses.d.ts +2 -2
- package/dist/_esm5.processed/core/{eme → decrypt/utils}/check_key_statuses.js +4 -3
- package/dist/_esm5.processed/core/{eme/utils/close_session.d.ts → decrypt/utils/clean_old_loaded_sessions.d.ts} +8 -7
- package/dist/_esm5.processed/core/decrypt/utils/clean_old_loaded_sessions.js +85 -0
- package/dist/_esm5.processed/core/{eme → decrypt/utils}/clean_old_stored_persistent_info.d.ts +1 -1
- package/dist/_esm5.processed/core/{eme → decrypt/utils}/clean_old_stored_persistent_info.js +2 -2
- package/dist/_esm5.processed/core/{eme → decrypt/utils}/get_drm_system_id.d.ts +0 -0
- package/dist/_esm5.processed/core/{eme → decrypt/utils}/get_drm_system_id.js +1 -1
- package/dist/_esm5.processed/core/decrypt/utils/init_data_values_container.d.ts +69 -0
- package/dist/_esm5.processed/core/decrypt/utils/init_data_values_container.js +99 -0
- package/dist/_esm5.processed/core/{eme → decrypt}/utils/is_session_usable.d.ts +0 -1
- package/dist/_esm5.processed/core/{eme → decrypt}/utils/is_session_usable.js +4 -5
- package/dist/_esm5.processed/core/decrypt/utils/key_id_comparison.d.ts +44 -0
- package/dist/_esm5.processed/core/decrypt/utils/key_id_comparison.js +77 -0
- package/dist/_esm5.processed/core/decrypt/utils/key_session_record.d.ts +104 -0
- package/dist/_esm5.processed/core/decrypt/utils/key_session_record.js +155 -0
- package/dist/_esm5.processed/core/decrypt/utils/loaded_sessions_store.d.ts +108 -0
- package/dist/_esm5.processed/core/decrypt/utils/loaded_sessions_store.js +303 -0
- package/dist/_esm5.processed/core/{eme → decrypt/utils}/media_keys_infos_store.d.ts +4 -4
- package/dist/_esm5.processed/core/{eme → decrypt/utils}/media_keys_infos_store.js +0 -0
- package/dist/_esm5.processed/core/{eme → decrypt}/utils/persistent_sessions_store.d.ts +8 -18
- package/dist/_esm5.processed/core/{eme → decrypt}/utils/persistent_sessions_store.js +119 -97
- package/dist/_esm5.processed/core/{eme/utils/init_data_container.d.ts → decrypt/utils/serializable_bytes.d.ts} +8 -5
- package/dist/_esm5.processed/core/{eme/utils/init_data_container.js → decrypt/utils/serializable_bytes.js} +9 -9
- package/dist/_esm5.processed/core/{eme → decrypt/utils}/server_certificate_store.d.ts +1 -1
- package/dist/_esm5.processed/core/{eme → decrypt/utils}/server_certificate_store.js +1 -1
- package/dist/_esm5.processed/core/fetchers/manifest/manifest_fetcher.js +2 -2
- package/dist/_esm5.processed/core/fetchers/segment/segment_fetcher.js +1 -1
- package/dist/_esm5.processed/core/fetchers/segment/segment_fetcher_creator.js +1 -1
- package/dist/_esm5.processed/core/init/get_initial_time.js +1 -1
- package/dist/_esm5.processed/core/init/initialize_directfile.d.ts +1 -1
- package/dist/_esm5.processed/core/init/initialize_directfile.js +11 -17
- package/dist/_esm5.processed/core/init/initialize_media_source.d.ts +4 -2
- package/dist/_esm5.processed/core/init/initialize_media_source.js +18 -69
- package/dist/_esm5.processed/core/init/link_drm_and_content.d.ts +61 -0
- package/dist/_esm5.processed/core/init/link_drm_and_content.js +94 -0
- package/dist/_esm5.processed/core/init/manifest_update_scheduler.js +2 -1
- package/dist/_esm5.processed/core/init/stall_avoider.js +1 -1
- package/dist/_esm5.processed/core/init/stream_events_emitter/stream_events_emitter.js +1 -1
- package/dist/_esm5.processed/core/init/types.d.ts +2 -4
- package/dist/_esm5.processed/core/segment_buffers/implementations/audio_video/audio_video_segment_buffer.js +1 -1
- package/dist/_esm5.processed/core/segment_buffers/implementations/text/html/html_text_segment_buffer.js +3 -1
- package/dist/_esm5.processed/core/segment_buffers/inventory/segment_inventory.d.ts +17 -1
- package/dist/_esm5.processed/core/segment_buffers/inventory/segment_inventory.js +22 -5
- package/dist/_esm5.processed/core/stream/adaptation/adaptation_stream.d.ts +2 -1
- package/dist/_esm5.processed/core/stream/adaptation/adaptation_stream.js +6 -3
- package/dist/_esm5.processed/core/stream/events_generators.d.ts +8 -3
- package/dist/_esm5.processed/core/stream/events_generators.js +3 -2
- package/dist/_esm5.processed/core/stream/orchestrator/stream_orchestrator.d.ts +1 -0
- package/dist/_esm5.processed/core/stream/orchestrator/stream_orchestrator.js +3 -3
- package/dist/_esm5.processed/core/stream/period/create_empty_adaptation_stream.js +2 -1
- package/dist/_esm5.processed/core/stream/period/get_adaptation_switch_strategy.js +1 -1
- package/dist/_esm5.processed/core/stream/period/period_stream.d.ts +2 -1
- package/dist/_esm5.processed/core/stream/period/period_stream.js +3 -3
- package/dist/_esm5.processed/core/stream/representation/force_garbage_collection.js +2 -2
- package/dist/_esm5.processed/core/stream/representation/get_buffer_status.d.ts +6 -1
- package/dist/_esm5.processed/core/stream/representation/get_buffer_status.js +12 -9
- package/dist/_esm5.processed/core/stream/representation/get_needed_segments.d.ts +19 -14
- package/dist/_esm5.processed/core/stream/representation/get_needed_segments.js +86 -10
- package/dist/_esm5.processed/core/stream/representation/get_segment_priority.js +1 -1
- package/dist/_esm5.processed/core/stream/representation/push_media_segment.js +3 -3
- package/dist/_esm5.processed/core/stream/representation/representation_stream.d.ts +6 -0
- package/dist/_esm5.processed/core/stream/representation/representation_stream.js +19 -8
- package/dist/_esm5.processed/core/stream/types.d.ts +1 -1
- package/dist/_esm5.processed/default_config.d.ts +1114 -0
- package/dist/_esm5.processed/default_config.js +1145 -0
- package/dist/_esm5.processed/experimental/index.d.ts +2 -0
- package/dist/_esm5.processed/experimental/index.js +2 -0
- package/dist/_esm5.processed/experimental/tools/VideoThumbnailLoader/push_data.d.ts +1 -0
- package/dist/_esm5.processed/experimental/tools/VideoThumbnailLoader/thumbnail_loader.js +1 -1
- package/dist/_esm5.processed/experimental/tools/mediaCapabilitiesProber/probers/DRMInfos.js +1 -2
- package/dist/_esm5.processed/experimental/tools/mediaCapabilitiesProber/probers/HDCPPolicy.js +1 -2
- package/dist/_esm5.processed/features/features_object.js +1 -1
- package/dist/_esm5.processed/features/initialize_features.js +1 -1
- package/dist/_esm5.processed/features/list/eme.d.ts +3 -3
- package/dist/_esm5.processed/features/list/eme.js +5 -5
- package/dist/_esm5.processed/features/types.d.ts +3 -3
- package/dist/_esm5.processed/manifest/manifest.d.ts +1 -14
- package/dist/_esm5.processed/manifest/manifest.js +10 -74
- package/dist/_esm5.processed/manifest/representation.d.ts +35 -3
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/is_period_fulfilled.js +1 -2
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/template.js +1 -2
- package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/timeline/timeline_representation_index.js +1 -1
- package/dist/_esm5.processed/parsers/manifest/dash/common/parse_adaptation_sets.js +87 -75
- package/dist/_esm5.processed/parsers/manifest/dash/common/parse_mpd.js +1 -2
- package/dist/_esm5.processed/parsers/manifest/smooth/create_parser.js +1 -0
- package/dist/_esm5.processed/public_types.d.ts +2 -2
- package/dist/_esm5.processed/transports/dash/image_pipelines.js +3 -0
- package/dist/_esm5.processed/transports/dash/segment_parser.js +6 -3
- package/dist/_esm5.processed/transports/dash/text_parser.js +8 -2
- package/dist/_esm5.processed/transports/local/segment_parser.js +4 -1
- package/dist/_esm5.processed/transports/local/text_parser.js +8 -2
- package/dist/_esm5.processed/transports/smooth/pipelines.js +68 -10
- package/dist/_esm5.processed/transports/types.d.ts +22 -0
- package/dist/_esm5.processed/utils/deep_merge.d.ts +12 -0
- package/dist/_esm5.processed/utils/deep_merge.js +53 -0
- package/dist/_esm5.processed/utils/reference.d.ts +29 -0
- package/dist/_esm5.processed/utils/reference.js +72 -24
- package/dist/_esm5.processed/utils/request/fetch.js +1 -2
- package/dist/_esm5.processed/utils/request/xhr.js +1 -1
- package/dist/_esm5.processed/utils/rx-from_cancellable_promise.js +7 -2
- package/dist/_esm5.processed/utils/task_canceller.d.ts +5 -3
- package/dist/_esm5.processed/utils/task_canceller.js +3 -3
- package/dist/rx-player.js +5002 -3033
- package/dist/rx-player.min.js +1 -1
- package/dummy +1 -0
- package/{dist/_esm5.processed/core/eme/dispose_eme.d.ts → experimental/index.d.ts} +1 -4
- package/{dist/_esm5.processed/core/eme/dispose_media_keys.d.ts → experimental/index.js} +1 -6
- package/package.json +32 -34
- package/scripts/build/templates/experimental/index.d.ts +16 -0
- package/scripts/build/templates/experimental/index.js +16 -0
- package/sonar-project.properties +1 -1
- package/src/README.md +6 -6
- package/src/compat/__tests__/should_favour_custom_safari_EME.test.ts +45 -5
- package/src/compat/browser_detection.ts +4 -2
- package/src/compat/eme/close_session.ts +90 -56
- package/src/compat/eme/custom_media_keys/index.ts +21 -38
- package/src/compat/eme/custom_media_keys/old_webkit_media_keys.ts +63 -46
- package/src/compat/eme/custom_media_keys/webkit_media_keys.ts +51 -49
- package/src/compat/eme/generate_key_request.ts +25 -33
- package/src/compat/eme/load_session.ts +29 -31
- package/src/compat/event_listeners.ts +2 -1
- package/src/compat/should_favour_custom_safari_EME.ts +5 -2
- package/src/config.ts +17 -1210
- package/src/core/README.md +1 -1
- package/src/core/abr/bandwidth_estimator.ts +4 -4
- package/src/core/abr/network_analyzer.ts +5 -6
- package/src/core/api/__tests__/get_player_state.test.ts +3 -3
- package/src/core/api/__tests__/option_utils.test.ts +17 -17
- package/src/core/api/get_player_state.ts +1 -1
- package/src/core/api/index.ts +3 -0
- package/src/core/api/option_utils.ts +37 -20
- package/src/core/api/playback_observer.ts +12 -8
- package/src/core/api/public_api.ts +151 -111
- package/src/core/decrypt/README.md +22 -0
- package/src/core/decrypt/__tests__/__global__/get_license.test.ts +418 -0
- package/src/core/decrypt/__tests__/__global__/init_data.test.ts +675 -0
- package/src/core/{eme → decrypt}/__tests__/__global__/media_key_system_access.test.ts +99 -92
- package/src/core/decrypt/__tests__/__global__/media_keys.test.ts +156 -0
- package/src/core/decrypt/__tests__/__global__/server_certificate.test.ts +262 -0
- package/src/core/{eme → decrypt}/__tests__/__global__/utils.ts +31 -93
- package/src/core/{eme → decrypt}/attach_media_keys.ts +49 -56
- package/src/core/decrypt/clear_on_stop.ts +48 -0
- package/src/core/decrypt/content_decryptor.ts +1158 -0
- package/src/core/decrypt/create_or_load_session.ts +130 -0
- package/src/core/decrypt/create_session.ts +175 -0
- package/src/core/decrypt/dispose_decryption_resources.ts +39 -0
- package/src/core/{eme → decrypt}/find_key_system.ts +112 -122
- package/src/core/{eme → decrypt}/get_current_key_system.ts +1 -1
- package/src/core/decrypt/get_media_keys.ts +145 -0
- package/src/core/{eme → decrypt}/index.ts +11 -8
- package/src/core/decrypt/init_media_keys.ts +51 -0
- package/src/core/{eme → decrypt}/session_events_listener.ts +93 -55
- package/src/core/decrypt/set_server_certificate.ts +104 -0
- package/src/core/{eme → decrypt}/types.ts +128 -258
- package/src/core/{eme → decrypt}/utils/__tests__/are_init_values_compatible.test.ts +1 -1
- package/src/core/{eme → decrypt/utils}/__tests__/clean_old_loaded_sessions.test.ts +29 -71
- package/src/core/{eme → decrypt/utils}/__tests__/clean_old_stored_persistent_info.test.ts +6 -6
- package/src/core/{eme → decrypt}/utils/are_init_values_compatible.ts +9 -9
- package/src/core/{eme → decrypt/utils}/check_key_statuses.ts +6 -5
- package/{dist/_esm5.processed/core/eme/clean_old_loaded_sessions.js → src/core/decrypt/utils/clean_old_loaded_sessions.ts} +20 -20
- package/src/core/{eme → decrypt/utils}/clean_old_stored_persistent_info.ts +3 -3
- package/src/core/{eme → decrypt/utils}/get_drm_system_id.ts +1 -1
- package/src/core/decrypt/utils/init_data_values_container.ts +119 -0
- package/src/core/{eme → decrypt}/utils/is_session_usable.ts +4 -5
- package/src/core/decrypt/utils/key_id_comparison.ts +82 -0
- package/src/core/decrypt/utils/key_session_record.ts +175 -0
- package/src/core/decrypt/utils/loaded_sessions_store.ts +318 -0
- package/src/core/{eme → decrypt/utils}/media_keys_infos_store.ts +4 -4
- package/src/core/{eme → decrypt}/utils/persistent_sessions_store.ts +122 -104
- package/src/core/{eme/utils/init_data_container.ts → decrypt/utils/serializable_bytes.ts} +8 -5
- package/src/core/{eme → decrypt/utils}/server_certificate_store.ts +2 -2
- package/src/core/fetchers/manifest/manifest_fetcher.ts +4 -4
- package/src/core/fetchers/segment/segment_fetcher.ts +4 -4
- package/src/core/fetchers/segment/segment_fetcher_creator.ts +2 -2
- package/src/core/init/.initialize_media_source.ts.un~ +0 -0
- package/src/core/init/get_initial_time.ts +2 -1
- package/src/core/init/initialize_directfile.ts +17 -20
- package/src/core/init/initialize_media_source.ts +42 -105
- package/src/core/init/link_drm_and_content.ts +176 -0
- package/src/core/init/manifest_update_scheduler.ts +5 -3
- package/src/core/init/stall_avoider.ts +6 -5
- package/src/core/init/stream_events_emitter/stream_events_emitter.ts +2 -1
- package/src/core/init/types.ts +1 -39
- package/src/core/segment_buffers/implementations/audio_video/audio_video_segment_buffer.ts +2 -1
- package/src/core/segment_buffers/implementations/text/html/html_text_segment_buffer.ts +3 -4
- package/src/core/segment_buffers/inventory/segment_inventory.ts +42 -8
- package/src/core/stream/adaptation/adaptation_stream.ts +7 -1
- package/src/core/stream/events_generators.ts +9 -4
- package/src/core/stream/orchestrator/stream_orchestrator.ts +9 -4
- package/src/core/stream/period/create_empty_adaptation_stream.ts +2 -1
- package/src/core/stream/period/get_adaptation_switch_strategy.ts +1 -1
- package/src/core/stream/period/period_stream.ts +5 -2
- package/src/core/stream/representation/force_garbage_collection.ts +2 -2
- package/src/core/stream/representation/get_buffer_status.ts +28 -16
- package/src/core/stream/representation/get_needed_segments.ts +124 -28
- package/src/core/stream/representation/get_segment_priority.ts +1 -2
- package/src/core/stream/representation/push_media_segment.ts +3 -2
- package/src/core/stream/representation/representation_stream.ts +30 -7
- package/src/core/stream/types.ts +1 -1
- package/src/default_config.ts +1241 -0
- package/src/experimental/index.ts +5 -0
- package/src/experimental/tools/VideoThumbnailLoader/push_data.ts +1 -0
- package/src/experimental/tools/VideoThumbnailLoader/thumbnail_loader.ts +2 -1
- package/src/experimental/tools/mediaCapabilitiesProber/__tests__/probers/DRMInfos.test.ts +3 -10
- package/src/experimental/tools/mediaCapabilitiesProber/__tests__/probers/HDCPPolicy.test.ts +4 -4
- package/src/experimental/tools/mediaCapabilitiesProber/probers/DRMInfos.ts +1 -2
- package/src/experimental/tools/mediaCapabilitiesProber/probers/HDCPPolicy.ts +1 -2
- package/src/features/__tests__/initialize_features.test.ts +2 -2
- package/src/features/features_object.ts +1 -1
- package/src/features/initialize_features.ts +1 -1
- package/src/features/list/__tests__/eme.test.ts +5 -5
- package/src/features/list/eme.ts +5 -5
- package/src/features/types.ts +3 -10
- package/src/manifest/manifest.ts +6 -76
- package/src/manifest/representation.ts +36 -3
- package/src/parsers/manifest/dash/common/indexes/is_period_fulfilled.ts +1 -2
- package/src/parsers/manifest/dash/common/indexes/template.ts +1 -2
- package/src/parsers/manifest/dash/common/indexes/timeline/timeline_representation_index.ts +1 -1
- package/src/parsers/manifest/dash/common/parse_adaptation_sets.ts +109 -64
- package/src/parsers/manifest/dash/common/parse_mpd.ts +1 -2
- package/src/parsers/manifest/smooth/create_parser.ts +1 -0
- package/src/parsers/texttracks/webvtt/html/__tests__/create_styled_element.test.ts +1 -0
- package/src/public_types.ts +5 -1
- package/src/transports/dash/image_pipelines.ts +3 -0
- package/src/transports/dash/segment_parser.ts +5 -0
- package/src/transports/dash/text_parser.ts +8 -0
- package/src/transports/local/segment_parser.ts +4 -0
- package/src/transports/local/text_parser.ts +8 -0
- package/src/transports/smooth/pipelines.ts +22 -9
- package/src/transports/types.ts +22 -0
- package/src/utils/__tests__/deep_merge.test.ts +48 -0
- package/src/utils/deep_merge.ts +46 -0
- package/src/utils/reference.ts +116 -23
- package/src/utils/request/fetch.ts +1 -2
- package/src/utils/request/xhr.ts +2 -1
- package/src/utils/rx-from_cancellable_promise.ts +7 -2
- package/src/utils/task_canceller.ts +6 -4
- package/dist/_esm5.processed/core/eme/attach_media_keys.js +0 -57
- package/dist/_esm5.processed/core/eme/clean_old_loaded_sessions.d.ts +0 -59
- package/dist/_esm5.processed/core/eme/clear_eme_session.js +0 -50
- package/dist/_esm5.processed/core/eme/create_session.js +0 -126
- package/dist/_esm5.processed/core/eme/dispose_eme.js +0 -23
- package/dist/_esm5.processed/core/eme/dispose_media_keys.js +0 -36
- package/dist/_esm5.processed/core/eme/eme_manager.d.ts +0 -31
- package/dist/_esm5.processed/core/eme/eme_manager.js +0 -278
- package/dist/_esm5.processed/core/eme/find_key_system.js +0 -253
- package/dist/_esm5.processed/core/eme/get_media_keys.js +0 -85
- package/dist/_esm5.processed/core/eme/get_session.js +0 -68
- package/dist/_esm5.processed/core/eme/init_media_keys.js +0 -66
- package/dist/_esm5.processed/core/eme/session_events_listener.d.ts +0 -41
- package/dist/_esm5.processed/core/eme/set_server_certificate.js +0 -85
- package/dist/_esm5.processed/core/eme/utils/close_session.js +0 -81
- package/dist/_esm5.processed/core/eme/utils/init_data_store.d.ts +0 -115
- package/dist/_esm5.processed/core/eme/utils/init_data_store.js +0 -181
- package/dist/_esm5.processed/core/eme/utils/loaded_sessions_store.d.ts +0 -123
- package/dist/_esm5.processed/core/eme/utils/loaded_sessions_store.js +0 -173
- package/dist/_esm5.processed/core/init/create_eme_manager.d.ts +0 -34
- package/dist/_esm5.processed/core/init/create_eme_manager.js +0 -52
- package/src/core/eme/README.md +0 -26
- package/src/core/eme/__tests__/__global__/get_license.test.ts +0 -414
- package/src/core/eme/__tests__/__global__/init_data.test.ts +0 -908
- package/src/core/eme/__tests__/__global__/media_keys.test.ts +0 -266
- package/src/core/eme/__tests__/__global__/server_certificate.test.ts +0 -364
- package/src/core/eme/__tests__/init_media_keys.test.ts +0 -182
- package/src/core/eme/clean_old_loaded_sessions.ts +0 -96
- package/src/core/eme/clear_eme_session.ts +0 -62
- package/src/core/eme/create_session.ts +0 -187
- package/src/core/eme/dispose_eme.ts +0 -25
- package/src/core/eme/dispose_media_keys.ts +0 -46
- package/src/core/eme/eme_manager.ts +0 -387
- package/src/core/eme/get_media_keys.ts +0 -141
- package/src/core/eme/get_session.ts +0 -135
- package/src/core/eme/init_media_keys.ts +0 -106
- package/src/core/eme/set_server_certificate.ts +0 -115
- package/src/core/eme/utils/close_session.ts +0 -113
- package/src/core/eme/utils/init_data_store.ts +0 -234
- package/src/core/eme/utils/loaded_sessions_store.ts +0 -235
- package/src/core/init/create_eme_manager.ts +0 -95
|
@@ -14,16 +14,11 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
|
-
import {
|
|
18
|
-
merge as observableMerge,
|
|
19
|
-
Subject,
|
|
20
|
-
takeUntil,
|
|
21
|
-
} from "rxjs";
|
|
22
17
|
import { base64ToBytes } from "../../../utils/base64";
|
|
23
18
|
import EventEmitter from "../../../utils/event_emitter";
|
|
19
|
+
import noop from "../../../utils/noop";
|
|
24
20
|
import PPromise from "../../../utils/promise";
|
|
25
21
|
import { utf8ToStr } from "../../../utils/string_parsing";
|
|
26
|
-
import * as events from "../../event_listeners";
|
|
27
22
|
import {
|
|
28
23
|
ICustomMediaKeys,
|
|
29
24
|
ICustomMediaKeySession,
|
|
@@ -54,11 +49,16 @@ export function isOldWebkitMediaElement(
|
|
|
54
49
|
.webkitGenerateKeyRequest === "function";
|
|
55
50
|
}
|
|
56
51
|
|
|
52
|
+
/**
|
|
53
|
+
* MediaKeySession implementation for older versions of WebKit relying on APIs
|
|
54
|
+
* such as `webkitGenerateKeyRequest` `webkitAddKey` to be called on the
|
|
55
|
+
* HTMLMediaElement.
|
|
56
|
+
* @class OldWebkitMediaKeySession
|
|
57
|
+
*/
|
|
57
58
|
class OldWebkitMediaKeySession
|
|
58
59
|
extends EventEmitter<IMediaKeySessionEvents>
|
|
59
60
|
implements ICustomMediaKeySession
|
|
60
61
|
{
|
|
61
|
-
public readonly update: (license: Uint8Array) => Promise<void>;
|
|
62
62
|
public readonly closed: Promise<void>;
|
|
63
63
|
public expiration: number;
|
|
64
64
|
public keyStatuses: ICustomMediaKeyStatusMap;
|
|
@@ -66,76 +66,93 @@ class OldWebkitMediaKeySession
|
|
|
66
66
|
|
|
67
67
|
private readonly _vid: IOldWebkitHTMLMediaElement;
|
|
68
68
|
private readonly _key: string;
|
|
69
|
-
|
|
69
|
+
|
|
70
|
+
private readonly _onSessionRelatedEvent : (evt : Event) => void;
|
|
71
|
+
private _closeSession : () => void;
|
|
70
72
|
|
|
71
73
|
constructor(mediaElement: IOldWebkitHTMLMediaElement, keySystem: string) {
|
|
72
74
|
super();
|
|
73
|
-
this._closeSession$ = new Subject();
|
|
74
75
|
this._vid = mediaElement;
|
|
75
76
|
this._key = keySystem;
|
|
76
77
|
|
|
77
78
|
this.sessionId = "";
|
|
79
|
+
this._closeSession = noop; // Just here to make TypeScript happy
|
|
78
80
|
this.closed = new PPromise((resolve) => {
|
|
79
|
-
this._closeSession
|
|
81
|
+
this._closeSession = resolve;
|
|
80
82
|
});
|
|
81
83
|
this.keyStatuses = new Map();
|
|
82
84
|
this.expiration = NaN;
|
|
83
85
|
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
events.onKeyError$(mediaElement))
|
|
87
|
-
.pipe(takeUntil(this._closeSession$))
|
|
88
|
-
.subscribe((evt: Event) => this.trigger(evt.type, evt));
|
|
89
|
-
|
|
90
|
-
this.update = (license: Uint8Array) => {
|
|
91
|
-
return new PPromise((resolve, reject) => {
|
|
92
|
-
try {
|
|
93
|
-
if (this._key.indexOf("clearkey") >= 0) {
|
|
94
|
-
const licenseTypedArray =
|
|
95
|
-
license instanceof ArrayBuffer ? new Uint8Array(license) :
|
|
96
|
-
license;
|
|
97
|
-
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
|
|
98
|
-
/* eslint-disable @typescript-eslint/no-unsafe-argument */
|
|
99
|
-
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
|
100
|
-
const json = JSON.parse(utf8ToStr(licenseTypedArray));
|
|
101
|
-
const key = base64ToBytes(json.keys[0].k);
|
|
102
|
-
const kid = base64ToBytes(json.keys[0].kid);
|
|
103
|
-
/* eslint-enable @typescript-eslint/no-unsafe-member-access */
|
|
104
|
-
/* eslint-enable @typescript-eslint/no-unsafe-argument */
|
|
105
|
-
/* eslint-enable @typescript-eslint/no-unsafe-assignment */
|
|
106
|
-
resolve(this._vid.webkitAddKey(this._key, key, kid, /* sessionId */ ""));
|
|
107
|
-
} else {
|
|
108
|
-
resolve(this._vid.webkitAddKey(this._key, license, null, /* sessionId */ ""));
|
|
109
|
-
}
|
|
110
|
-
} catch (err) {
|
|
111
|
-
reject(err);
|
|
112
|
-
}
|
|
113
|
-
});
|
|
86
|
+
this._onSessionRelatedEvent = (evt : Event) => {
|
|
87
|
+
this.trigger(evt.type, evt);
|
|
114
88
|
};
|
|
89
|
+
|
|
90
|
+
["keymessage", "message", "keyadded", "ready", "keyerror", "error"]
|
|
91
|
+
.forEach(evt => mediaElement.addEventListener(evt, this._onSessionRelatedEvent));
|
|
115
92
|
}
|
|
116
93
|
|
|
117
|
-
|
|
94
|
+
public update(license: Uint8Array) : Promise<void> {
|
|
95
|
+
return new PPromise((resolve, reject) => {
|
|
96
|
+
try {
|
|
97
|
+
if (this._key.indexOf("clearkey") >= 0) {
|
|
98
|
+
const licenseTypedArray =
|
|
99
|
+
license instanceof ArrayBuffer ? new Uint8Array(license) :
|
|
100
|
+
license;
|
|
101
|
+
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
|
|
102
|
+
/* eslint-disable @typescript-eslint/no-unsafe-argument */
|
|
103
|
+
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
|
|
104
|
+
const json = JSON.parse(utf8ToStr(licenseTypedArray));
|
|
105
|
+
const key = base64ToBytes(json.keys[0].k);
|
|
106
|
+
const kid = base64ToBytes(json.keys[0].kid);
|
|
107
|
+
/* eslint-enable @typescript-eslint/no-unsafe-member-access */
|
|
108
|
+
/* eslint-enable @typescript-eslint/no-unsafe-argument */
|
|
109
|
+
/* eslint-enable @typescript-eslint/no-unsafe-assignment */
|
|
110
|
+
resolve(this._vid.webkitAddKey(this._key, key, kid, /* sessionId */ ""));
|
|
111
|
+
} else {
|
|
112
|
+
resolve(this._vid.webkitAddKey(this._key, license, null, /* sessionId */ ""));
|
|
113
|
+
}
|
|
114
|
+
} catch (err) {
|
|
115
|
+
reject(err);
|
|
116
|
+
}
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
public generateRequest(
|
|
121
|
+
_initDataType: string,
|
|
122
|
+
initData: ArrayBuffer
|
|
123
|
+
): Promise<void> {
|
|
118
124
|
return new PPromise((resolve) => {
|
|
119
125
|
this._vid.webkitGenerateKeyRequest(this._key, initData);
|
|
120
126
|
resolve();
|
|
121
127
|
});
|
|
122
128
|
}
|
|
123
129
|
|
|
124
|
-
close(): Promise<void> {
|
|
130
|
+
public close(): Promise<void> {
|
|
125
131
|
return new PPromise((resolve) => {
|
|
126
|
-
this.
|
|
127
|
-
this._closeSession
|
|
132
|
+
this._unbindSession();
|
|
133
|
+
this._closeSession();
|
|
128
134
|
resolve();
|
|
129
135
|
});
|
|
130
136
|
}
|
|
131
137
|
|
|
132
|
-
|
|
138
|
+
/**
|
|
139
|
+
* Load a Persistent MediaKeySession.
|
|
140
|
+
* Do nothing here because this implementation doesn't handle them.
|
|
141
|
+
* @returns {Promise.<boolean>}
|
|
142
|
+
*/
|
|
143
|
+
public load(): Promise<boolean> {
|
|
144
|
+
// Not implemented. Always return false as in "no session with that id".
|
|
133
145
|
return PPromise.resolve(false);
|
|
134
146
|
}
|
|
135
147
|
|
|
136
|
-
remove(): Promise<void> {
|
|
148
|
+
public remove(): Promise<void> {
|
|
137
149
|
return PPromise.resolve();
|
|
138
150
|
}
|
|
151
|
+
|
|
152
|
+
private _unbindSession() {
|
|
153
|
+
["keymessage", "message", "keyadded", "ready", "keyerror", "error"]
|
|
154
|
+
.forEach(evt => this._vid.removeEventListener(evt, this._onSessionRelatedEvent));
|
|
155
|
+
}
|
|
139
156
|
}
|
|
140
157
|
|
|
141
158
|
class OldWebKitCustomMediaKeys implements ICustomMediaKeys {
|
|
@@ -14,15 +14,10 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
|
-
import {
|
|
18
|
-
merge as observableMerge,
|
|
19
|
-
Subject,
|
|
20
|
-
takeUntil,
|
|
21
|
-
} from "rxjs";
|
|
22
17
|
import EventEmitter from "../../../utils/event_emitter";
|
|
18
|
+
import noop from "../../../utils/noop";
|
|
23
19
|
import PPromise from "../../../utils/promise";
|
|
24
20
|
import { ICompatHTMLMediaElement } from "../../browser_compatibility_types";
|
|
25
|
-
import * as events from "../../event_listeners";
|
|
26
21
|
import getWebKitFairplayInitData from "../get_webkit_fairplay_initdata";
|
|
27
22
|
import {
|
|
28
23
|
ICustomMediaKeys,
|
|
@@ -80,17 +75,19 @@ class WebkitMediaKeySession
|
|
|
80
75
|
extends EventEmitter<IMediaKeySessionEvents>
|
|
81
76
|
implements ICustomMediaKeySession
|
|
82
77
|
{
|
|
83
|
-
public readonly update: (license: Uint8Array) => Promise<void>;
|
|
84
78
|
public readonly closed: Promise<void>;
|
|
85
79
|
public expiration: number;
|
|
86
80
|
public keyStatuses: ICustomMediaKeyStatusMap;
|
|
87
81
|
|
|
88
82
|
private readonly _videoElement: HTMLMediaElement;
|
|
89
|
-
private readonly _closeSession$: Subject<void>;
|
|
90
83
|
private readonly _keyType: string;
|
|
91
84
|
private _nativeSession: undefined | MediaKeySession;
|
|
92
85
|
private _serverCertificate: Uint8Array | undefined;
|
|
93
86
|
|
|
87
|
+
private readonly _onEvent : (evt : Event) => void;
|
|
88
|
+
private _closeSession : () => void;
|
|
89
|
+
private _unbindSession : () => void;
|
|
90
|
+
|
|
94
91
|
/**
|
|
95
92
|
* @param {HTMLMediaElement} mediaElement
|
|
96
93
|
* @param {string} keyType
|
|
@@ -103,56 +100,43 @@ class WebkitMediaKeySession
|
|
|
103
100
|
) {
|
|
104
101
|
super();
|
|
105
102
|
this._serverCertificate = serverCertificate;
|
|
106
|
-
this._closeSession$ = new Subject();
|
|
107
103
|
this._videoElement = mediaElement;
|
|
108
104
|
this._keyType = keyType;
|
|
109
105
|
|
|
106
|
+
this._unbindSession = noop;
|
|
107
|
+
this._closeSession = noop; // Just here to make TypeScript happy
|
|
110
108
|
this.closed = new PPromise((resolve) => {
|
|
111
|
-
this._closeSession
|
|
109
|
+
this._closeSession = resolve;
|
|
112
110
|
});
|
|
113
111
|
this.keyStatuses = new Map();
|
|
114
112
|
this.expiration = NaN;
|
|
115
113
|
|
|
116
|
-
this.
|
|
117
|
-
|
|
118
|
-
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
|
|
119
|
-
if (this._nativeSession === undefined ||
|
|
120
|
-
this._nativeSession.update === undefined ||
|
|
121
|
-
typeof this._nativeSession.update !== "function") {
|
|
122
|
-
return reject("Unavailable WebKit key session.");
|
|
123
|
-
}
|
|
124
|
-
try {
|
|
125
|
-
let uInt8Arraylicense: Uint8Array;
|
|
126
|
-
if (license instanceof ArrayBuffer) {
|
|
127
|
-
uInt8Arraylicense = new Uint8Array(license);
|
|
128
|
-
} else if (license instanceof Uint8Array) {
|
|
129
|
-
uInt8Arraylicense = license;
|
|
130
|
-
} else {
|
|
131
|
-
uInt8Arraylicense = new Uint8Array(license.buffer);
|
|
132
|
-
}
|
|
133
|
-
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
|
|
134
|
-
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
|
135
|
-
resolve(this._nativeSession.update(uInt8Arraylicense));
|
|
136
|
-
/* eslint-enable @typescript-eslint/no-unsafe-member-access */
|
|
137
|
-
} catch (err) {
|
|
138
|
-
reject(err);
|
|
139
|
-
}
|
|
140
|
-
/* eslint-enable @typescript-eslint/no-unsafe-member-access */
|
|
141
|
-
});
|
|
114
|
+
this._onEvent = (evt : Event) => {
|
|
115
|
+
this.trigger(evt.type, evt);
|
|
142
116
|
};
|
|
143
117
|
}
|
|
144
118
|
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
}
|
|
119
|
+
public update(license: BufferSource) : Promise<void> {
|
|
120
|
+
return new PPromise((resolve, reject) => {
|
|
121
|
+
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
|
|
122
|
+
if (this._nativeSession === undefined ||
|
|
123
|
+
this._nativeSession.update === undefined ||
|
|
124
|
+
typeof this._nativeSession.update !== "function") {
|
|
125
|
+
return reject("Unavailable WebKit key session.");
|
|
126
|
+
}
|
|
127
|
+
try {
|
|
128
|
+
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
|
|
129
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
|
130
|
+
resolve(this._nativeSession.update(license));
|
|
131
|
+
/* eslint-enable @typescript-eslint/no-unsafe-member-access */
|
|
132
|
+
} catch (err) {
|
|
133
|
+
reject(err);
|
|
134
|
+
}
|
|
135
|
+
/* eslint-enable @typescript-eslint/no-unsafe-member-access */
|
|
136
|
+
});
|
|
153
137
|
}
|
|
154
138
|
|
|
155
|
-
generateRequest(
|
|
139
|
+
public generateRequest(
|
|
156
140
|
_initDataType: string,
|
|
157
141
|
initData: ArrayBuffer
|
|
158
142
|
): Promise<void> {
|
|
@@ -178,17 +162,17 @@ class WebkitMediaKeySession
|
|
|
178
162
|
if (keySession === undefined || keySession === null) {
|
|
179
163
|
throw new Error("Impossible to get the key sessions");
|
|
180
164
|
}
|
|
181
|
-
this.
|
|
165
|
+
this._listenEvent(keySession);
|
|
182
166
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
183
167
|
this._nativeSession = keySession;
|
|
184
168
|
resolve();
|
|
185
169
|
});
|
|
186
170
|
}
|
|
187
171
|
|
|
188
|
-
close(): Promise<void> {
|
|
172
|
+
public close(): Promise<void> {
|
|
189
173
|
return new PPromise((resolve, reject) => {
|
|
190
|
-
this.
|
|
191
|
-
this._closeSession
|
|
174
|
+
this._unbindSession();
|
|
175
|
+
this._closeSession();
|
|
192
176
|
if (this._nativeSession === undefined) {
|
|
193
177
|
reject("No session to close.");
|
|
194
178
|
return;
|
|
@@ -215,6 +199,24 @@ class WebkitMediaKeySession
|
|
|
215
199
|
/* eslint-enable @typescript-eslint/no-unsafe-member-access */
|
|
216
200
|
/* eslint-enable @typescript-eslint/no-unsafe-return */
|
|
217
201
|
}
|
|
202
|
+
|
|
203
|
+
private _listenEvent(session: MediaKeySession) : void {
|
|
204
|
+
this._unbindSession(); // If previous session was linked
|
|
205
|
+
|
|
206
|
+
/* eslint-disable @typescript-eslint/no-unsafe-call */
|
|
207
|
+
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
|
|
208
|
+
/* eslint-disable @typescript-eslint/no-unsafe-return */
|
|
209
|
+
["keymessage", "message", "keyadded", "ready", "keyerror", "error"]
|
|
210
|
+
.forEach(evt => session.addEventListener(evt, this._onEvent));
|
|
211
|
+
|
|
212
|
+
this._unbindSession = () => {
|
|
213
|
+
["keymessage", "message", "keyadded", "ready", "keyerror", "error"]
|
|
214
|
+
.forEach(evt => session.removeEventListener(evt, this._onEvent));
|
|
215
|
+
};
|
|
216
|
+
/* eslint-disable @typescript-eslint/no-unsafe-return */
|
|
217
|
+
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
|
|
218
|
+
/* eslint-enable @typescript-eslint/no-unsafe-call */
|
|
219
|
+
}
|
|
218
220
|
}
|
|
219
221
|
|
|
220
222
|
class WebKitCustomMediaKeys implements ICustomWebKitMediaKeys {
|
|
@@ -14,18 +14,12 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
|
-
import {
|
|
18
|
-
catchError,
|
|
19
|
-
defer as observableDefer,
|
|
20
|
-
Observable,
|
|
21
|
-
} from "rxjs";
|
|
22
17
|
import log from "../../log";
|
|
23
18
|
import { getNextBoxOffsets } from "../../parsers/containers/isobmff";
|
|
24
19
|
import {
|
|
25
20
|
be4toi,
|
|
26
21
|
concat,
|
|
27
22
|
} from "../../utils/byte_parsing";
|
|
28
|
-
import castToObservable from "../../utils/cast_to_observable";
|
|
29
23
|
import { PSSH_TO_INTEGER } from "./constants";
|
|
30
24
|
import { ICustomMediaKeySession } from "./custom_media_keys";
|
|
31
25
|
|
|
@@ -136,37 +130,35 @@ export function patchInitData(initData : Uint8Array) : Uint8Array {
|
|
|
136
130
|
* "encrypted" event for the corresponding request.
|
|
137
131
|
* @param {string} sessionType - Type of session you want to generate. Consult
|
|
138
132
|
* EME Specification for more information on session types.
|
|
139
|
-
* @returns {
|
|
133
|
+
* @returns {Promise} - Emit when done. Errors if fails.
|
|
140
134
|
*/
|
|
141
135
|
export default function generateKeyRequest(
|
|
142
136
|
session: MediaKeySession|ICustomMediaKeySession,
|
|
143
137
|
initializationDataType : string | undefined,
|
|
144
138
|
initializationData : Uint8Array
|
|
145
|
-
) :
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
}
|
|
139
|
+
) : Promise<unknown> {
|
|
140
|
+
log.debug("Compat: Calling generateRequest on the MediaKeySession");
|
|
141
|
+
let patchedInit : Uint8Array;
|
|
142
|
+
try {
|
|
143
|
+
patchedInit = patchInitData(initializationData);
|
|
144
|
+
} catch (_e) {
|
|
145
|
+
patchedInit = initializationData;
|
|
146
|
+
}
|
|
147
|
+
const initDataType = initializationDataType ?? "";
|
|
148
|
+
return session.generateRequest(initDataType, patchedInit)
|
|
149
|
+
.catch((error) => {
|
|
150
|
+
if (initDataType !== "" || !(error instanceof TypeError)) {
|
|
151
|
+
throw error;
|
|
152
|
+
}
|
|
160
153
|
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
});
|
|
154
|
+
// On newer EME versions of the specification, the initialization data
|
|
155
|
+
// type given to generateRequest cannot be an empty string (it returns
|
|
156
|
+
// a rejected promise with a TypeError in that case).
|
|
157
|
+
// Retry with a default "cenc" value for initialization data type if
|
|
158
|
+
// we're in that condition.
|
|
159
|
+
log.warn("Compat: error while calling `generateRequest` with an empty " +
|
|
160
|
+
"initialization data type. Retrying with a default \"cenc\" value.",
|
|
161
|
+
error);
|
|
162
|
+
return session.generateRequest("cenc", patchedInit);
|
|
163
|
+
});
|
|
172
164
|
}
|
|
@@ -14,20 +14,8 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
|
-
import
|
|
18
|
-
defer as observableDefer,
|
|
19
|
-
map,
|
|
20
|
-
mergeMap,
|
|
21
|
-
Observable,
|
|
22
|
-
of as observableOf,
|
|
23
|
-
race as observableRace,
|
|
24
|
-
take,
|
|
25
|
-
timer as observableTimer,
|
|
26
|
-
} from "rxjs";
|
|
17
|
+
import PPromise from "pinkie";
|
|
27
18
|
import log from "../../log";
|
|
28
|
-
import castToObservable from "../../utils/cast_to_observable";
|
|
29
|
-
import tryCatch from "../../utils/rx-try_catch";
|
|
30
|
-
import { onKeyStatusesChange$ } from "../event_listeners";
|
|
31
19
|
import { ICustomMediaKeySession } from "./custom_media_keys";
|
|
32
20
|
|
|
33
21
|
const EME_WAITING_DELAY_LOADED_SESSION_EMPTY_KEYSTATUSES = 100;
|
|
@@ -46,26 +34,36 @@ const EME_WAITING_DELAY_LOADED_SESSION_EMPTY_KEYSTATUSES = 100;
|
|
|
46
34
|
* @param {string} sessionId
|
|
47
35
|
* @returns {Observable}
|
|
48
36
|
*/
|
|
49
|
-
export default function loadSession(
|
|
37
|
+
export default async function loadSession(
|
|
50
38
|
session : MediaKeySession | ICustomMediaKeySession,
|
|
51
39
|
sessionId : string
|
|
52
|
-
) :
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
40
|
+
) : Promise<boolean> {
|
|
41
|
+
log.info("Compat/DRM: Load persisted session", sessionId);
|
|
42
|
+
const isLoaded = await session.load(sessionId);
|
|
43
|
+
|
|
44
|
+
if (!isLoaded || session.keyStatuses.size > 0) {
|
|
45
|
+
return isLoaded;
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
// A browser race condition can exist, seen for example in some
|
|
49
|
+
// Chromium/Chrome versions where the `keyStatuses` property from a loaded
|
|
50
|
+
// MediaKeySession would not be populated directly as the load answer but
|
|
51
|
+
// asynchronously after.
|
|
52
|
+
return new PPromise((resolve) => {
|
|
53
|
+
(session as MediaKeySession).addEventListener("keystatuseschange",
|
|
54
|
+
resolveWithLoadedStatus);
|
|
55
|
+
const timeout = setTimeout(resolveWithLoadedStatus,
|
|
56
|
+
EME_WAITING_DELAY_LOADED_SESSION_EMPTY_KEYSTATUSES);
|
|
57
|
+
|
|
58
|
+
function resolveWithLoadedStatus() {
|
|
59
|
+
cleanUp();
|
|
60
|
+
resolve(isLoaded);
|
|
60
61
|
}
|
|
61
62
|
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
onKeyStatusesChange$(session)
|
|
69
|
-
).pipe(take(1), map(() => isLoaded));
|
|
70
|
-
}));
|
|
63
|
+
function cleanUp() {
|
|
64
|
+
clearTimeout(timeout);
|
|
65
|
+
(session as MediaKeySession).removeEventListener("keystatuseschange",
|
|
66
|
+
resolveWithLoadedStatus);
|
|
67
|
+
}
|
|
68
|
+
});
|
|
71
69
|
}
|
|
@@ -49,7 +49,6 @@ import shouldFavourCustomSafariEME from "./should_favour_custom_safari_EME";
|
|
|
49
49
|
|
|
50
50
|
const BROWSER_PREFIXES = ["", "webkit", "moz", "ms"];
|
|
51
51
|
|
|
52
|
-
const INACTIVITY_DELAY = config.INACTIVITY_DELAY;
|
|
53
52
|
const pixelRatio = isNode ||
|
|
54
53
|
window.devicePixelRatio == null ||
|
|
55
54
|
window.devicePixelRatio === 0 ? 1 :
|
|
@@ -192,6 +191,7 @@ function visibilityChange() : Observable<boolean> {
|
|
|
192
191
|
* @returns {Observable}
|
|
193
192
|
*/
|
|
194
193
|
function isPageActive() : Observable<boolean> {
|
|
194
|
+
const { INACTIVITY_DELAY } = config.getCurrent();
|
|
195
195
|
return visibilityChange().pipe(
|
|
196
196
|
switchMap((x) => {
|
|
197
197
|
if (!x) {
|
|
@@ -275,6 +275,7 @@ function onPictureInPictureEvent$(
|
|
|
275
275
|
function isVideoVisible(
|
|
276
276
|
pip$ : Observable<IPictureInPictureEvent>
|
|
277
277
|
) : Observable<boolean> {
|
|
278
|
+
const { INACTIVITY_DELAY } = config.getCurrent();
|
|
278
279
|
return observableCombineLatest([visibilityChange(), pip$]).pipe(
|
|
279
280
|
switchMap(([ isVisible, pip ]) => {
|
|
280
281
|
if (pip.isEnabled || isVisible) {
|
|
@@ -14,7 +14,10 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
|
|
17
|
-
import {
|
|
17
|
+
import {
|
|
18
|
+
isSafariDesktop,
|
|
19
|
+
isSafariMobile,
|
|
20
|
+
} from "./browser_detection";
|
|
18
21
|
import {
|
|
19
22
|
WebKitMediaKeysConstructor,
|
|
20
23
|
} from "./eme/custom_media_keys/webkit_media_keys_constructor";
|
|
@@ -27,5 +30,5 @@ import {
|
|
|
27
30
|
* @returns {boolean}
|
|
28
31
|
*/
|
|
29
32
|
export default function shouldFavourCustomSafariEME() : boolean {
|
|
30
|
-
return
|
|
33
|
+
return (isSafariDesktop || isSafariMobile) && WebKitMediaKeysConstructor !== undefined;
|
|
31
34
|
}
|