rx-player 4.5.0-dev.2026031700 → 4.5.0-dev.2026033100
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 +3 -1
- package/VERSION +1 -1
- package/dist/commonjs/__GENERATED_CODE/embedded_worker.d.ts.map +1 -1
- package/dist/commonjs/__GENERATED_CODE/embedded_worker.js +1 -1
- package/dist/commonjs/compat/browser_compatibility_types.d.ts +16 -14
- package/dist/commonjs/compat/browser_compatibility_types.d.ts.map +1 -1
- package/dist/commonjs/compat/browser_compatibility_types.js +7 -4
- package/dist/commonjs/compat/browser_version.d.ts +2 -1
- package/dist/commonjs/compat/browser_version.d.ts.map +1 -1
- package/dist/commonjs/compat/browser_version.js +13 -0
- package/dist/commonjs/compat/disable_remote_playback_on_managed_media_source.d.ts.map +1 -1
- package/dist/commonjs/compat/disable_remote_playback_on_managed_media_source.js +1 -1
- package/dist/commonjs/compat/is_codec_supported.d.ts.map +1 -1
- package/dist/commonjs/compat/is_codec_supported.js +4 -3
- package/dist/commonjs/compat/should_patch_out_dolby_vision_config_data_from_mp4.d.ts +26 -0
- package/dist/commonjs/compat/should_patch_out_dolby_vision_config_data_from_mp4.d.ts.map +1 -0
- package/dist/commonjs/compat/should_patch_out_dolby_vision_config_data_from_mp4.js +45 -0
- package/dist/commonjs/core/entry/utils.js +3 -3
- package/dist/commonjs/core/fetchers/segment/segment_fetcher.d.ts.map +1 -1
- package/dist/commonjs/core/fetchers/segment/segment_fetcher.js +2 -1
- package/dist/commonjs/experimental/tools/VideoThumbnailLoader/prepare_source_buffer.d.ts.map +1 -1
- package/dist/commonjs/experimental/tools/VideoThumbnailLoader/prepare_source_buffer.js +2 -1
- package/dist/commonjs/experimental/tools/mediaCapabilitiesProber/probers/defaultCodecsFinder.d.ts.map +1 -1
- package/dist/commonjs/experimental/tools/mediaCapabilitiesProber/probers/defaultCodecsFinder.js +8 -6
- package/dist/commonjs/experimental/tools/mediaCapabilitiesProber/probers/mediaContentType.d.ts.map +1 -1
- package/dist/commonjs/experimental/tools/mediaCapabilitiesProber/probers/mediaContentType.js +4 -3
- package/dist/commonjs/initialize_worker.js +1 -1
- package/dist/commonjs/main_thread/api/debug/modules/segment_buffer_content.js +3 -3
- package/dist/commonjs/main_thread/api/public_api.js +2 -2
- package/dist/commonjs/main_thread/init/utils/update_manifest_codec_support.d.ts.map +1 -1
- package/dist/commonjs/main_thread/init/utils/update_manifest_codec_support.js +24 -12
- package/dist/commonjs/manifest/classes/adaptation.d.ts.map +1 -1
- package/dist/commonjs/manifest/classes/adaptation.js +3 -1
- package/dist/commonjs/manifest/classes/representation.d.ts +6 -2
- package/dist/commonjs/manifest/classes/representation.d.ts.map +1 -1
- package/dist/commonjs/manifest/classes/representation.js +45 -23
- package/dist/commonjs/manifest/types.d.ts +14 -6
- package/dist/commonjs/manifest/types.d.ts.map +1 -1
- package/dist/commonjs/manifest/utils.js +4 -4
- package/dist/commonjs/mse/main_media_source_interface.d.ts.map +1 -1
- package/dist/commonjs/mse/main_media_source_interface.js +3 -2
- package/dist/commonjs/mse/worker_media_source_interface.d.ts.map +1 -1
- package/dist/commonjs/parsers/containers/isobmff/get_box.d.ts +12 -1
- package/dist/commonjs/parsers/containers/isobmff/get_box.d.ts.map +1 -1
- package/dist/commonjs/parsers/containers/isobmff/get_box.js +16 -0
- package/dist/commonjs/parsers/containers/isobmff/index.d.ts +2 -1
- package/dist/commonjs/parsers/containers/isobmff/index.d.ts.map +1 -1
- package/dist/commonjs/parsers/containers/isobmff/index.js +3 -1
- package/dist/commonjs/parsers/containers/isobmff/remove_dolby_vision_config_data.d.ts +13 -0
- package/dist/commonjs/parsers/containers/isobmff/remove_dolby_vision_config_data.d.ts.map +1 -0
- package/dist/commonjs/parsers/containers/isobmff/remove_dolby_vision_config_data.js +180 -0
- package/dist/commonjs/parsers/manifest/metaplaylist/metaplaylist_parser.js +4 -4
- package/dist/commonjs/transports/dash/segment_parser.d.ts.map +1 -1
- package/dist/commonjs/transports/dash/segment_parser.js +6 -0
- package/dist/commonjs/transports/dash/text_parser.d.ts.map +1 -1
- package/dist/commonjs/transports/dash/text_parser.js +5 -1
- package/dist/commonjs/transports/local/text_parser.d.ts.map +1 -1
- package/dist/commonjs/transports/local/text_parser.js +5 -1
- package/dist/commonjs/transports/metaplaylist/pipelines.d.ts.map +1 -1
- package/dist/commonjs/transports/metaplaylist/pipelines.js +2 -1
- package/dist/commonjs/transports/smooth/pipelines.js +3 -3
- package/dist/commonjs/transports/types.d.ts +28 -2
- package/dist/commonjs/transports/types.d.ts.map +1 -1
- package/dist/commonjs/transports/utils/parse_text_track.d.ts +9 -2
- package/dist/commonjs/transports/utils/parse_text_track.d.ts.map +1 -1
- package/dist/commonjs/transports/utils/parse_text_track.js +1 -1
- package/dist/es2017/__GENERATED_CODE/embedded_worker.d.ts.map +1 -1
- package/dist/es2017/__GENERATED_CODE/embedded_worker.js +1 -1
- package/dist/es2017/compat/browser_compatibility_types.d.ts +16 -14
- package/dist/es2017/compat/browser_compatibility_types.d.ts.map +1 -1
- package/dist/es2017/compat/browser_compatibility_types.js +7 -1
- package/dist/es2017/compat/browser_version.d.ts +2 -1
- package/dist/es2017/compat/browser_version.d.ts.map +1 -1
- package/dist/es2017/compat/browser_version.js +13 -1
- package/dist/es2017/compat/disable_remote_playback_on_managed_media_source.d.ts.map +1 -1
- package/dist/es2017/compat/disable_remote_playback_on_managed_media_source.js +2 -2
- package/dist/es2017/compat/is_codec_supported.d.ts.map +1 -1
- package/dist/es2017/compat/is_codec_supported.js +2 -1
- package/dist/es2017/compat/should_patch_out_dolby_vision_config_data_from_mp4.d.ts +26 -0
- package/dist/es2017/compat/should_patch_out_dolby_vision_config_data_from_mp4.d.ts.map +1 -0
- package/dist/es2017/compat/should_patch_out_dolby_vision_config_data_from_mp4.js +42 -0
- package/dist/es2017/core/entry/utils.js +4 -4
- package/dist/es2017/core/fetchers/segment/segment_fetcher.d.ts.map +1 -1
- package/dist/es2017/core/fetchers/segment/segment_fetcher.js +2 -1
- package/dist/es2017/experimental/tools/VideoThumbnailLoader/prepare_source_buffer.d.ts.map +1 -1
- package/dist/es2017/experimental/tools/VideoThumbnailLoader/prepare_source_buffer.js +2 -1
- package/dist/es2017/experimental/tools/mediaCapabilitiesProber/probers/defaultCodecsFinder.d.ts.map +1 -1
- package/dist/es2017/experimental/tools/mediaCapabilitiesProber/probers/defaultCodecsFinder.js +3 -1
- package/dist/es2017/experimental/tools/mediaCapabilitiesProber/probers/mediaContentType.d.ts.map +1 -1
- package/dist/es2017/experimental/tools/mediaCapabilitiesProber/probers/mediaContentType.js +2 -1
- package/dist/es2017/initialize_worker.js +1 -1
- package/dist/es2017/main_thread/api/debug/modules/segment_buffer_content.js +3 -3
- package/dist/es2017/main_thread/api/public_api.js +2 -2
- package/dist/es2017/main_thread/init/utils/update_manifest_codec_support.d.ts.map +1 -1
- package/dist/es2017/main_thread/init/utils/update_manifest_codec_support.js +9 -7
- package/dist/es2017/manifest/classes/adaptation.d.ts.map +1 -1
- package/dist/es2017/manifest/classes/adaptation.js +3 -1
- package/dist/es2017/manifest/classes/representation.d.ts +6 -2
- package/dist/es2017/manifest/classes/representation.d.ts.map +1 -1
- package/dist/es2017/manifest/classes/representation.js +45 -23
- package/dist/es2017/manifest/types.d.ts +14 -6
- package/dist/es2017/manifest/types.d.ts.map +1 -1
- package/dist/es2017/manifest/utils.js +4 -4
- package/dist/es2017/mse/main_media_source_interface.d.ts.map +1 -1
- package/dist/es2017/mse/main_media_source_interface.js +2 -1
- package/dist/es2017/mse/worker_media_source_interface.d.ts.map +1 -1
- package/dist/es2017/parsers/containers/isobmff/get_box.d.ts +12 -1
- package/dist/es2017/parsers/containers/isobmff/get_box.d.ts.map +1 -1
- package/dist/es2017/parsers/containers/isobmff/get_box.js +16 -1
- package/dist/es2017/parsers/containers/isobmff/index.d.ts +2 -1
- package/dist/es2017/parsers/containers/isobmff/index.d.ts.map +1 -1
- package/dist/es2017/parsers/containers/isobmff/index.js +2 -1
- package/dist/es2017/parsers/containers/isobmff/remove_dolby_vision_config_data.d.ts +13 -0
- package/dist/es2017/parsers/containers/isobmff/remove_dolby_vision_config_data.d.ts.map +1 -0
- package/dist/es2017/parsers/containers/isobmff/remove_dolby_vision_config_data.js +155 -0
- package/dist/es2017/parsers/manifest/metaplaylist/metaplaylist_parser.js +4 -4
- package/dist/es2017/transports/dash/segment_parser.d.ts.map +1 -1
- package/dist/es2017/transports/dash/segment_parser.js +7 -1
- package/dist/es2017/transports/dash/text_parser.d.ts.map +1 -1
- package/dist/es2017/transports/dash/text_parser.js +5 -1
- package/dist/es2017/transports/local/text_parser.d.ts.map +1 -1
- package/dist/es2017/transports/local/text_parser.js +5 -1
- package/dist/es2017/transports/metaplaylist/pipelines.d.ts.map +1 -1
- package/dist/es2017/transports/metaplaylist/pipelines.js +2 -1
- package/dist/es2017/transports/smooth/pipelines.js +3 -3
- package/dist/es2017/transports/types.d.ts +28 -2
- package/dist/es2017/transports/types.d.ts.map +1 -1
- package/dist/es2017/transports/utils/parse_text_track.d.ts +9 -2
- package/dist/es2017/transports/utils/parse_text_track.d.ts.map +1 -1
- package/dist/es2017/transports/utils/parse_text_track.js +1 -1
- package/dist/worker.js +6 -6
- package/eslint.config.mjs +1 -14
- package/package.json +1 -1
- package/src/__GENERATED_CODE/embedded_worker.ts +1 -1
- package/src/compat/__tests__/browser_compatibility_types.test.ts +15 -26
- package/src/compat/__tests__/browser_version.test.ts +57 -18
- package/src/compat/__tests__/clear_element_src.test.ts +20 -40
- package/src/compat/__tests__/is_codec_supported.test.ts +39 -44
- package/src/compat/__tests__/is_vtt_cue.test.ts +5 -8
- package/src/compat/__tests__/make_vtt_cue.test.ts +20 -31
- package/src/compat/__tests__/remove_cue.test.ts +8 -20
- package/src/compat/__tests__/should_patch_out_dolby_vision_config_data_from_mp4.test.ts +78 -0
- package/src/compat/browser_compatibility_types.ts +8 -1
- package/src/compat/browser_version.ts +17 -1
- package/src/compat/disable_remote_playback_on_managed_media_source.ts +2 -2
- package/src/compat/is_codec_supported.ts +2 -1
- package/src/compat/should_patch_out_dolby_vision_config_data_from_mp4.ts +50 -0
- package/src/core/adaptive/__tests__/adaptive_representation_selector.test.ts +68 -28
- package/src/core/adaptive/__tests__/buffer_based_chooser.test.ts +26 -84
- package/src/core/entry/__tests__/utils.test.ts +7 -1
- package/src/core/entry/utils.ts +4 -4
- package/src/core/fetchers/segment/segment_fetcher.ts +2 -1
- package/src/errors/__tests__/format_error.test.ts +23 -24
- package/src/experimental/tools/VideoThumbnailLoader/prepare_source_buffer.ts +2 -1
- package/src/experimental/tools/mediaCapabilitiesProber/__tests__/probers/mediaDisplayInfos.test.ts +106 -0
- package/src/experimental/tools/mediaCapabilitiesProber/probers/__tests__/HDCPPolicy.test.ts +19 -42
- package/src/experimental/tools/mediaCapabilitiesProber/probers/__tests__/decodingInfo.test.ts +33 -40
- package/src/experimental/tools/mediaCapabilitiesProber/probers/__tests__/defaultCodecsFinder.test.ts +44 -68
- package/src/experimental/tools/mediaCapabilitiesProber/probers/__tests__/mediaContentType.test.ts +45 -80
- package/src/experimental/tools/mediaCapabilitiesProber/probers/defaultCodecsFinder.ts +3 -1
- package/src/experimental/tools/mediaCapabilitiesProber/probers/mediaContentType.ts +2 -1
- package/src/features/__tests__/add_features.test.ts +12 -27
- package/src/initialize_worker.ts +1 -1
- package/src/main_thread/api/__tests__/option_utils.test.ts +38 -67
- package/src/main_thread/api/__tests__/public_api.test.ts +56 -138
- package/src/main_thread/api/debug/modules/segment_buffer_content.ts +3 -3
- package/src/main_thread/api/public_api.ts +2 -2
- package/src/main_thread/decrypt/__tests__/__global__/find_key_system.test.ts +46 -28
- package/src/main_thread/decrypt/__tests__/__global__/get_license.test.ts +40 -10
- package/src/main_thread/decrypt/__tests__/__global__/init_data.test.ts +112 -129
- package/src/main_thread/decrypt/__tests__/__global__/media_key_system_access.test.ts +282 -377
- package/src/main_thread/decrypt/__tests__/__global__/media_keys.test.ts +70 -63
- package/src/main_thread/decrypt/__tests__/__global__/server_certificate.test.ts +73 -54
- package/src/main_thread/decrypt/__tests__/__global__/utils.ts +43 -83
- package/src/main_thread/decrypt/__tests__/find_key_system.test.ts +36 -17
- package/src/main_thread/decrypt/utils/__tests__/clean_old_stored_persistent_info.test.ts +44 -48
- package/src/main_thread/init/utils/__tests__/are_same_stream_events.test.ts +7 -22
- package/src/main_thread/init/utils/__tests__/refresh_scheduled_events_list.test.ts +3 -6
- package/src/main_thread/init/utils/__tests__/update_manifest_codec_support.test.ts +42 -19
- package/src/main_thread/init/utils/update_manifest_codec_support.ts +8 -6
- package/src/manifest/classes/__tests__/adaptation.test.ts +69 -125
- package/src/manifest/classes/__tests__/manifest.test.ts +88 -95
- package/src/manifest/classes/__tests__/period.test.ts +167 -117
- package/src/manifest/classes/__tests__/representation.test.ts +84 -25
- package/src/manifest/classes/__tests__/update_periods.test.ts +96 -225
- package/src/manifest/classes/adaptation.ts +4 -1
- package/src/manifest/classes/representation.ts +59 -27
- package/src/manifest/types.ts +14 -6
- package/src/manifest/utils.ts +4 -4
- package/src/mse/__tests__/main_media_source_interface.test.ts +3 -1
- package/src/mse/__tests__/worker_media_source_interface.test.ts +608 -0
- package/src/mse/main_media_source_interface.ts +2 -1
- package/src/mse/worker_media_source_interface.ts +2 -2
- package/src/parsers/containers/isobmff/__tests__/get_box.test.ts +449 -0
- package/src/parsers/containers/isobmff/__tests__/remove_dolby_vision_config_data.test.ts +282 -0
- package/src/parsers/containers/isobmff/get_box.ts +17 -0
- package/src/parsers/containers/isobmff/index.ts +8 -1
- package/src/parsers/containers/isobmff/remove_dolby_vision_config_data.ts +179 -0
- package/src/parsers/manifest/dash/common/__tests__/get_clock_offset.test.ts +19 -25
- package/src/parsers/manifest/dash/common/__tests__/get_http_utc-timing_url.test.ts +7 -19
- package/src/parsers/manifest/dash/js-parser/node_parsers/__tests__/ContentProtection.test.ts +26 -37
- package/src/parsers/manifest/dash/js-parser/node_parsers/__tests__/Initialization.test.ts +24 -53
- package/src/parsers/manifest/dash/js-parser/node_parsers/__tests__/SegmentURL.test.ts +31 -78
- package/src/parsers/manifest/metaplaylist/metaplaylist_parser.ts +6 -4
- package/src/parsers/manifest/utils/__tests__/update_segment_timeline.test.ts +79 -87
- package/src/parsers/texttracks/ttml/__tests__/resolve_styles_inheritance.test.ts +20 -26
- package/src/parsers/texttracks/ttml/html/__tests__/__global__/html_ttml_parser.test.ts +2 -7
- package/src/parsers/texttracks/webvtt/__tests__/parse_cue_block.test.ts +33 -30
- package/src/parsers/texttracks/webvtt/__tests__/parse_style_block.test.ts +33 -100
- package/src/parsers/texttracks/webvtt/html/__tests__/convert_payload_to_html.test.ts +16 -18
- package/src/parsers/texttracks/webvtt/html/__tests__/parse_webvtt_to_div.test.ts +73 -78
- package/src/parsers/texttracks/webvtt/html/__tests__/to_html.test.ts +36 -37
- package/src/transports/dash/segment_parser.ts +13 -0
- package/src/transports/dash/text_parser.ts +5 -1
- package/src/transports/local/text_parser.ts +5 -1
- package/src/transports/metaplaylist/pipelines.ts +2 -1
- package/src/transports/smooth/isobmff/__tests__/create_boxes.test.ts +150 -127
- package/src/transports/smooth/pipelines.ts +3 -3
- package/src/transports/types.ts +28 -2
- package/src/transports/utils/__tests__/check_isobmff_integrity.test.ts +49 -75
- package/src/transports/utils/parse_text_track.ts +10 -3
- package/src/utils/__tests__/object_assign.test.ts +2 -2
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { describe, afterEach, it, expect, vi } from "vitest";
|
|
2
|
+
import getEmeApiImplementation from "../../../../compat/eme";
|
|
2
3
|
import type { IKeySystemOption, IPlayerError } from "../../../../public_types";
|
|
3
4
|
import assert from "../../../../utils/assert";
|
|
4
5
|
import { concat } from "../../../../utils/byte_parsing";
|
|
5
|
-
import
|
|
6
|
-
import
|
|
6
|
+
import ContentDecryptor from "../../content_decryptor";
|
|
7
|
+
import { ContentDecryptorState } from "../../types";
|
|
7
8
|
import {
|
|
8
9
|
formatFakeChallengeFromInitData,
|
|
9
10
|
MediaKeySessionImpl,
|
|
@@ -11,13 +12,46 @@ import {
|
|
|
11
12
|
mockCompat,
|
|
12
13
|
} from "./utils";
|
|
13
14
|
|
|
14
|
-
|
|
15
|
-
|
|
15
|
+
const mocks = vi.hoisted(() => {
|
|
16
|
+
return {
|
|
17
|
+
shouldRenewMediaKeySystemAccess: vi.fn(() => false),
|
|
18
|
+
canReuseMediaKeys: vi.fn(() => true),
|
|
19
|
+
onEncrypted: vi.fn(),
|
|
20
|
+
requestMediaKeySystemAccess: vi.fn(),
|
|
21
|
+
setMediaKeys: vi.fn(),
|
|
22
|
+
getInitData: vi.fn(),
|
|
23
|
+
generateKeyRequest: vi.fn(),
|
|
24
|
+
};
|
|
25
|
+
});
|
|
26
|
+
vi.mock("../../../../compat/should_renew_media_key_system_access", () => ({
|
|
27
|
+
default: mocks.shouldRenewMediaKeySystemAccess,
|
|
28
|
+
}));
|
|
29
|
+
vi.mock("../../../../compat/can_reuse_media_keys", () => ({
|
|
30
|
+
default: mocks.canReuseMediaKeys,
|
|
31
|
+
}));
|
|
32
|
+
vi.mock("../../../../compat/eme", () => ({
|
|
33
|
+
default: () => ({
|
|
34
|
+
onEncrypted: mocks.onEncrypted,
|
|
35
|
+
requestMediaKeySystemAccess: mocks.requestMediaKeySystemAccess,
|
|
36
|
+
setMediaKeys: mocks.setMediaKeys,
|
|
37
|
+
}),
|
|
38
|
+
getInitData: mocks.getInitData,
|
|
39
|
+
generateKeyRequest: mocks.generateKeyRequest,
|
|
40
|
+
closeSession: vi.fn(),
|
|
41
|
+
loadSession: vi.fn(),
|
|
42
|
+
}));
|
|
16
43
|
|
|
17
44
|
describe("decrypt - global tests - getLicense", () => {
|
|
18
45
|
afterEach(() => {
|
|
19
46
|
vi.resetModules();
|
|
20
47
|
vi.restoreAllMocks();
|
|
48
|
+
mocks.shouldRenewMediaKeySystemAccess.mockReset();
|
|
49
|
+
mocks.canReuseMediaKeys.mockReset();
|
|
50
|
+
mocks.onEncrypted.mockReset();
|
|
51
|
+
mocks.requestMediaKeySystemAccess.mockReset();
|
|
52
|
+
mocks.setMediaKeys.mockReset();
|
|
53
|
+
mocks.getInitData.mockReset();
|
|
54
|
+
mocks.generateKeyRequest.mockReset();
|
|
21
55
|
});
|
|
22
56
|
|
|
23
57
|
it("should update the session after getLicense resolves with a license", async () => {
|
|
@@ -335,12 +369,8 @@ async function checkGetLicense({
|
|
|
335
369
|
}
|
|
336
370
|
return Promise.reject(new Error("AAAA"));
|
|
337
371
|
});
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
.ContentDecryptorState as typeof IContentDecryptorState;
|
|
341
|
-
const ContentDecryptor = (await vi.importActual("../../content_decryptor"))
|
|
342
|
-
.default as typeof IContentDecryptor;
|
|
343
|
-
const getEmeApiImplementation = (await import("../../../../compat/eme")).default;
|
|
372
|
+
const videoElt = document.createElement("video");
|
|
373
|
+
mockCompat(mocks);
|
|
344
374
|
return new Promise((res, rej) => {
|
|
345
375
|
// == vars ==
|
|
346
376
|
/** Default keySystems configuration used in our tests. */
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { describe, afterEach, it, expect, vi } from "vitest";
|
|
2
|
+
import getEmeApiImplementation from "../../../../compat/eme";
|
|
2
3
|
import assert from "../../../../utils/assert";
|
|
3
|
-
import
|
|
4
|
-
import
|
|
4
|
+
import ContentDecryptor from "../../content_decryptor";
|
|
5
|
+
import { ContentDecryptorState } from "../../types";
|
|
5
6
|
import {
|
|
6
7
|
formatFakeChallengeFromInitData,
|
|
7
8
|
MediaKeySessionImpl,
|
|
@@ -9,6 +10,35 @@ import {
|
|
|
9
10
|
mockCompat,
|
|
10
11
|
} from "./utils";
|
|
11
12
|
|
|
13
|
+
const mocks = vi.hoisted(() => {
|
|
14
|
+
return {
|
|
15
|
+
shouldRenewMediaKeySystemAccess: vi.fn(() => false),
|
|
16
|
+
canReuseMediaKeys: vi.fn(() => true),
|
|
17
|
+
onEncrypted: vi.fn(),
|
|
18
|
+
requestMediaKeySystemAccess: vi.fn(),
|
|
19
|
+
setMediaKeys: vi.fn(),
|
|
20
|
+
getInitData: vi.fn(),
|
|
21
|
+
generateKeyRequest: vi.fn(),
|
|
22
|
+
};
|
|
23
|
+
});
|
|
24
|
+
vi.mock("../../../../compat/should_renew_media_key_system_access", () => ({
|
|
25
|
+
default: mocks.shouldRenewMediaKeySystemAccess,
|
|
26
|
+
}));
|
|
27
|
+
vi.mock("../../../../compat/can_reuse_media_keys", () => ({
|
|
28
|
+
default: mocks.canReuseMediaKeys,
|
|
29
|
+
}));
|
|
30
|
+
vi.mock("../../../../compat/eme", () => ({
|
|
31
|
+
default: () => ({
|
|
32
|
+
onEncrypted: mocks.onEncrypted,
|
|
33
|
+
requestMediaKeySystemAccess: mocks.requestMediaKeySystemAccess,
|
|
34
|
+
setMediaKeys: mocks.setMediaKeys,
|
|
35
|
+
}),
|
|
36
|
+
getInitData: mocks.getInitData,
|
|
37
|
+
generateKeyRequest: mocks.generateKeyRequest,
|
|
38
|
+
closeSession: vi.fn(),
|
|
39
|
+
loadSession: vi.fn(),
|
|
40
|
+
}));
|
|
41
|
+
|
|
12
42
|
describe("decrypt - global tests - init data", () => {
|
|
13
43
|
/** Default video element used in our tests. */
|
|
14
44
|
const videoElt = document.createElement("video");
|
|
@@ -25,20 +55,21 @@ describe("decrypt - global tests - init data", () => {
|
|
|
25
55
|
afterEach(() => {
|
|
26
56
|
vi.resetAllMocks();
|
|
27
57
|
vi.resetModules();
|
|
58
|
+
mocks.shouldRenewMediaKeySystemAccess.mockReset();
|
|
59
|
+
mocks.canReuseMediaKeys.mockReset();
|
|
60
|
+
mocks.onEncrypted.mockReset();
|
|
61
|
+
mocks.requestMediaKeySystemAccess.mockReset();
|
|
62
|
+
mocks.setMediaKeys.mockReset();
|
|
63
|
+
mocks.getInitData.mockReset();
|
|
64
|
+
mocks.generateKeyRequest.mockReset();
|
|
28
65
|
});
|
|
29
66
|
|
|
30
|
-
it("should create a session and generate a request when init data is sent through the arguments",
|
|
31
|
-
|
|
32
|
-
const { mockGenerateKeyRequest } = mockCompat();
|
|
67
|
+
it("should create a session and generate a request when init data is sent through the arguments", () => {
|
|
68
|
+
mockCompat(mocks);
|
|
33
69
|
const mediaKeySession = new MediaKeySessionImpl();
|
|
34
70
|
const mockCreateSession = vi
|
|
35
71
|
.spyOn(MediaKeysImpl.prototype, "createSession")
|
|
36
72
|
.mockReturnValue(mediaKeySession);
|
|
37
|
-
const ContentDecryptorState = (await vi.importActual("../../types"))
|
|
38
|
-
.ContentDecryptorState as typeof IContentDecryptorState;
|
|
39
|
-
const ContentDecryptor = (await vi.importActual("../../content_decryptor"))
|
|
40
|
-
.default as typeof IContentDecryptor;
|
|
41
|
-
const getEmeApiImplementation = (await import("../../../../compat/eme")).default;
|
|
42
73
|
return new Promise<void>((res, rej) => {
|
|
43
74
|
// == vars ==
|
|
44
75
|
const initData = new Uint8Array([54, 55, 75]);
|
|
@@ -49,7 +80,7 @@ describe("decrypt - global tests - init data", () => {
|
|
|
49
80
|
const contentDecryptor = new ContentDecryptor(eme, videoElt, ksConfig);
|
|
50
81
|
contentDecryptor.addEventListener(
|
|
51
82
|
"stateChange",
|
|
52
|
-
(newState:
|
|
83
|
+
(newState: ContentDecryptorState) => {
|
|
53
84
|
if (newState !== ContentDecryptorState.WaitingForAttachment) {
|
|
54
85
|
rej(new Error(`Unexpected state: ${newState}`));
|
|
55
86
|
}
|
|
@@ -65,8 +96,8 @@ describe("decrypt - global tests - init data", () => {
|
|
|
65
96
|
try {
|
|
66
97
|
expect(mockCreateSession).toHaveBeenCalledTimes(1);
|
|
67
98
|
expect(mockCreateSession).toHaveBeenCalledWith("temporary");
|
|
68
|
-
expect(
|
|
69
|
-
expect(
|
|
99
|
+
expect(mocks.generateKeyRequest).toHaveBeenCalledTimes(1);
|
|
100
|
+
expect(mocks.generateKeyRequest).toHaveBeenCalledWith(
|
|
70
101
|
mediaKeySession,
|
|
71
102
|
"cenc",
|
|
72
103
|
initData,
|
|
@@ -86,18 +117,12 @@ describe("decrypt - global tests - init data", () => {
|
|
|
86
117
|
});
|
|
87
118
|
});
|
|
88
119
|
|
|
89
|
-
it("should ignore init data already sent through the argument",
|
|
90
|
-
|
|
91
|
-
const { mockGenerateKeyRequest } = mockCompat();
|
|
120
|
+
it("should ignore init data already sent through the argument", () => {
|
|
121
|
+
mockCompat(mocks);
|
|
92
122
|
const mediaKeySession = new MediaKeySessionImpl();
|
|
93
123
|
const mockCreateSession = vi
|
|
94
124
|
.spyOn(MediaKeysImpl.prototype, "createSession")
|
|
95
125
|
.mockReturnValue(mediaKeySession);
|
|
96
|
-
const ContentDecryptorState = (await vi.importActual("../../types"))
|
|
97
|
-
.ContentDecryptorState as typeof IContentDecryptorState;
|
|
98
|
-
const ContentDecryptor = (await vi.importActual("../../content_decryptor"))
|
|
99
|
-
.default as typeof IContentDecryptor;
|
|
100
|
-
const getEmeApiImplementation = (await import("../../../../compat/eme")).default;
|
|
101
126
|
return new Promise<void>((res, rej) => {
|
|
102
127
|
// == vars ==
|
|
103
128
|
const initData = new Uint8Array([54, 55, 75]);
|
|
@@ -108,7 +133,7 @@ describe("decrypt - global tests - init data", () => {
|
|
|
108
133
|
const contentDecryptor = new ContentDecryptor(eme, videoElt, ksConfig);
|
|
109
134
|
contentDecryptor.addEventListener(
|
|
110
135
|
"stateChange",
|
|
111
|
-
(newState:
|
|
136
|
+
(newState: ContentDecryptorState) => {
|
|
112
137
|
if (newState !== ContentDecryptorState.WaitingForAttachment) {
|
|
113
138
|
rej(new Error(`Unexpected state: ${newState}`));
|
|
114
139
|
}
|
|
@@ -134,8 +159,8 @@ describe("decrypt - global tests - init data", () => {
|
|
|
134
159
|
try {
|
|
135
160
|
expect(mockCreateSession).toHaveBeenCalledTimes(1);
|
|
136
161
|
expect(mockCreateSession).toHaveBeenCalledWith("temporary");
|
|
137
|
-
expect(
|
|
138
|
-
expect(
|
|
162
|
+
expect(mocks.generateKeyRequest).toHaveBeenCalledTimes(1);
|
|
163
|
+
expect(mocks.generateKeyRequest).toHaveBeenCalledWith(
|
|
139
164
|
mediaKeySession,
|
|
140
165
|
"cenc",
|
|
141
166
|
initData,
|
|
@@ -155,9 +180,8 @@ describe("decrypt - global tests - init data", () => {
|
|
|
155
180
|
});
|
|
156
181
|
});
|
|
157
182
|
|
|
158
|
-
it("should create multiple sessions for multiple sent init data when unknown",
|
|
159
|
-
|
|
160
|
-
const { mockGenerateKeyRequest } = mockCompat();
|
|
183
|
+
it("should create multiple sessions for multiple sent init data when unknown", () => {
|
|
184
|
+
mockCompat(mocks);
|
|
161
185
|
const mediaKeySessions = [
|
|
162
186
|
new MediaKeySessionImpl(),
|
|
163
187
|
new MediaKeySessionImpl(),
|
|
@@ -168,11 +192,6 @@ describe("decrypt - global tests - init data", () => {
|
|
|
168
192
|
.spyOn(MediaKeysImpl.prototype, "createSession")
|
|
169
193
|
.mockImplementation(() => mediaKeySessions[createSessionCallIdx++]);
|
|
170
194
|
|
|
171
|
-
const ContentDecryptorState = (await vi.importActual("../../types"))
|
|
172
|
-
.ContentDecryptorState as typeof IContentDecryptorState;
|
|
173
|
-
const ContentDecryptor = (await vi.importActual("../../content_decryptor"))
|
|
174
|
-
.default as typeof IContentDecryptor;
|
|
175
|
-
const getEmeApiImplementation = (await import("../../../../compat/eme")).default;
|
|
176
195
|
return new Promise<void>((res, rej) => {
|
|
177
196
|
// == vars ==
|
|
178
197
|
const initDatas = [
|
|
@@ -187,7 +206,7 @@ describe("decrypt - global tests - init data", () => {
|
|
|
187
206
|
const contentDecryptor = new ContentDecryptor(eme, videoElt, ksConfig);
|
|
188
207
|
contentDecryptor.addEventListener(
|
|
189
208
|
"stateChange",
|
|
190
|
-
(newState:
|
|
209
|
+
(newState: ContentDecryptorState) => {
|
|
191
210
|
if (newState !== ContentDecryptorState.WaitingForAttachment) {
|
|
192
211
|
rej(new Error(`Unexpected state: ${newState}`));
|
|
193
212
|
}
|
|
@@ -225,20 +244,20 @@ describe("decrypt - global tests - init data", () => {
|
|
|
225
244
|
expect(mockCreateSession).toHaveBeenNthCalledWith(1, "temporary");
|
|
226
245
|
expect(mockCreateSession).toHaveBeenNthCalledWith(2, "temporary");
|
|
227
246
|
expect(mockCreateSession).toHaveBeenNthCalledWith(3, "temporary");
|
|
228
|
-
expect(
|
|
229
|
-
expect(
|
|
247
|
+
expect(mocks.generateKeyRequest).toHaveBeenCalledTimes(3);
|
|
248
|
+
expect(mocks.generateKeyRequest).toHaveBeenNthCalledWith(
|
|
230
249
|
1,
|
|
231
250
|
mediaKeySessions[0],
|
|
232
251
|
"cenc",
|
|
233
252
|
initDatas[0],
|
|
234
253
|
);
|
|
235
|
-
expect(
|
|
254
|
+
expect(mocks.generateKeyRequest).toHaveBeenNthCalledWith(
|
|
236
255
|
2,
|
|
237
256
|
mediaKeySessions[1],
|
|
238
257
|
"cenc",
|
|
239
258
|
initDatas[1],
|
|
240
259
|
);
|
|
241
|
-
expect(
|
|
260
|
+
expect(mocks.generateKeyRequest).toHaveBeenNthCalledWith(
|
|
242
261
|
3,
|
|
243
262
|
mediaKeySessions[2],
|
|
244
263
|
"cenc",
|
|
@@ -270,20 +289,14 @@ describe("decrypt - global tests - init data", () => {
|
|
|
270
289
|
});
|
|
271
290
|
});
|
|
272
291
|
|
|
273
|
-
it("should create multiple sessions for multiple sent init data types",
|
|
274
|
-
|
|
275
|
-
const { mockGenerateKeyRequest } = mockCompat();
|
|
292
|
+
it("should create multiple sessions for multiple sent init data types", () => {
|
|
293
|
+
mockCompat(mocks);
|
|
276
294
|
const mediaKeySessions = [new MediaKeySessionImpl(), new MediaKeySessionImpl()];
|
|
277
295
|
let createSessionCallIdx = 0;
|
|
278
296
|
const mockCreateSession = vi
|
|
279
297
|
.spyOn(MediaKeysImpl.prototype, "createSession")
|
|
280
298
|
.mockImplementation(() => mediaKeySessions[createSessionCallIdx++]);
|
|
281
299
|
|
|
282
|
-
const ContentDecryptorState = (await vi.importActual("../../types"))
|
|
283
|
-
.ContentDecryptorState as typeof IContentDecryptorState;
|
|
284
|
-
const ContentDecryptor = (await vi.importActual("../../content_decryptor"))
|
|
285
|
-
.default as typeof IContentDecryptor;
|
|
286
|
-
const getEmeApiImplementation = (await import("../../../../compat/eme")).default;
|
|
287
300
|
return new Promise<void>((res, rej) => {
|
|
288
301
|
// == vars ==
|
|
289
302
|
const initData = new Uint8Array([54, 55, 75]);
|
|
@@ -294,7 +307,7 @@ describe("decrypt - global tests - init data", () => {
|
|
|
294
307
|
const contentDecryptor = new ContentDecryptor(eme, videoElt, ksConfig);
|
|
295
308
|
contentDecryptor.addEventListener(
|
|
296
309
|
"stateChange",
|
|
297
|
-
(newState:
|
|
310
|
+
(newState: ContentDecryptorState) => {
|
|
298
311
|
if (newState !== ContentDecryptorState.WaitingForAttachment) {
|
|
299
312
|
rej(new Error(`Unexpected state: ${newState}`));
|
|
300
313
|
}
|
|
@@ -315,14 +328,14 @@ describe("decrypt - global tests - init data", () => {
|
|
|
315
328
|
expect(mockCreateSession).toHaveBeenCalledTimes(2);
|
|
316
329
|
expect(mockCreateSession).toHaveBeenNthCalledWith(1, "temporary");
|
|
317
330
|
expect(mockCreateSession).toHaveBeenNthCalledWith(2, "temporary");
|
|
318
|
-
expect(
|
|
319
|
-
expect(
|
|
331
|
+
expect(mocks.generateKeyRequest).toHaveBeenCalledTimes(2);
|
|
332
|
+
expect(mocks.generateKeyRequest).toHaveBeenNthCalledWith(
|
|
320
333
|
1,
|
|
321
334
|
mediaKeySessions[0],
|
|
322
335
|
"cenc",
|
|
323
336
|
initData,
|
|
324
337
|
);
|
|
325
|
-
expect(
|
|
338
|
+
expect(mocks.generateKeyRequest).toHaveBeenNthCalledWith(
|
|
326
339
|
2,
|
|
327
340
|
mediaKeySessions[1],
|
|
328
341
|
"cenc2",
|
|
@@ -349,19 +362,13 @@ describe("decrypt - global tests - init data", () => {
|
|
|
349
362
|
});
|
|
350
363
|
});
|
|
351
364
|
|
|
352
|
-
it("should create a session and generate a request when init data is received from the browser",
|
|
353
|
-
|
|
354
|
-
const { mockGenerateKeyRequest, eventTriggers, mockGetInitData } = mockCompat();
|
|
365
|
+
it("should create a session and generate a request when init data is received from the browser", () => {
|
|
366
|
+
const { eventTriggers } = mockCompat(mocks);
|
|
355
367
|
const mediaKeySession = new MediaKeySessionImpl();
|
|
356
368
|
const mockCreateSession = vi
|
|
357
369
|
.spyOn(MediaKeysImpl.prototype, "createSession")
|
|
358
370
|
.mockReturnValue(mediaKeySession);
|
|
359
371
|
|
|
360
|
-
const ContentDecryptorState = (await vi.importActual("../../types"))
|
|
361
|
-
.ContentDecryptorState as typeof IContentDecryptorState;
|
|
362
|
-
const ContentDecryptor = (await vi.importActual("../../content_decryptor"))
|
|
363
|
-
.default as typeof IContentDecryptor;
|
|
364
|
-
const getEmeApiImplementation = (await import("../../../../compat/eme")).default;
|
|
365
372
|
return new Promise<void>((res, rej) => {
|
|
366
373
|
// == vars ==
|
|
367
374
|
const initData = new Uint8Array([54, 55, 75]);
|
|
@@ -372,7 +379,7 @@ describe("decrypt - global tests - init data", () => {
|
|
|
372
379
|
const contentDecryptor = new ContentDecryptor(eme, videoElt, ksConfig);
|
|
373
380
|
contentDecryptor.addEventListener(
|
|
374
381
|
"stateChange",
|
|
375
|
-
(newState:
|
|
382
|
+
(newState: ContentDecryptorState) => {
|
|
376
383
|
if (newState !== ContentDecryptorState.WaitingForAttachment) {
|
|
377
384
|
rej(new Error(`Unexpected state: ${newState}`));
|
|
378
385
|
}
|
|
@@ -387,12 +394,12 @@ describe("decrypt - global tests - init data", () => {
|
|
|
387
394
|
eventTriggers.triggerEncrypted(videoElt, initDataEvent);
|
|
388
395
|
setTimeout(() => {
|
|
389
396
|
try {
|
|
390
|
-
expect(
|
|
391
|
-
expect(
|
|
397
|
+
expect(mocks.getInitData).toHaveBeenCalledTimes(1);
|
|
398
|
+
expect(mocks.getInitData).toHaveBeenCalledWith(initDataEvent);
|
|
392
399
|
expect(mockCreateSession).toHaveBeenCalledTimes(1);
|
|
393
400
|
expect(mockCreateSession).toHaveBeenCalledWith("temporary");
|
|
394
|
-
expect(
|
|
395
|
-
expect(
|
|
401
|
+
expect(mocks.generateKeyRequest).toHaveBeenCalledTimes(1);
|
|
402
|
+
expect(mocks.generateKeyRequest).toHaveBeenCalledWith(
|
|
396
403
|
mediaKeySession,
|
|
397
404
|
"cenc",
|
|
398
405
|
initData,
|
|
@@ -412,19 +419,13 @@ describe("decrypt - global tests - init data", () => {
|
|
|
412
419
|
});
|
|
413
420
|
});
|
|
414
421
|
|
|
415
|
-
it("should ignore init data already received through the browser",
|
|
416
|
-
|
|
417
|
-
const { mockGenerateKeyRequest, eventTriggers, mockGetInitData } = mockCompat();
|
|
422
|
+
it("should ignore init data already received through the browser", () => {
|
|
423
|
+
const { eventTriggers } = mockCompat(mocks);
|
|
418
424
|
const mediaKeySession = new MediaKeySessionImpl();
|
|
419
425
|
const mockCreateSession = vi
|
|
420
426
|
.spyOn(MediaKeysImpl.prototype, "createSession")
|
|
421
427
|
.mockReturnValue(mediaKeySession);
|
|
422
428
|
|
|
423
|
-
const ContentDecryptorState = (await vi.importActual("../../types"))
|
|
424
|
-
.ContentDecryptorState as typeof IContentDecryptorState;
|
|
425
|
-
const ContentDecryptor = (await vi.importActual("../../content_decryptor"))
|
|
426
|
-
.default as typeof IContentDecryptor;
|
|
427
|
-
const getEmeApiImplementation = (await import("../../../../compat/eme")).default;
|
|
428
429
|
return new Promise<void>((res, rej) => {
|
|
429
430
|
// == vars ==
|
|
430
431
|
const initData = new Uint8Array([54, 55, 75]);
|
|
@@ -435,7 +436,7 @@ describe("decrypt - global tests - init data", () => {
|
|
|
435
436
|
const contentDecryptor = new ContentDecryptor(eme, videoElt, ksConfig);
|
|
436
437
|
contentDecryptor.addEventListener(
|
|
437
438
|
"stateChange",
|
|
438
|
-
(newState:
|
|
439
|
+
(newState: ContentDecryptorState) => {
|
|
439
440
|
if (newState !== ContentDecryptorState.WaitingForAttachment) {
|
|
440
441
|
rej(new Error(`Unexpected state: ${newState}`));
|
|
441
442
|
}
|
|
@@ -454,14 +455,14 @@ describe("decrypt - global tests - init data", () => {
|
|
|
454
455
|
}, 5);
|
|
455
456
|
setTimeout(() => {
|
|
456
457
|
try {
|
|
457
|
-
expect(
|
|
458
|
-
expect(
|
|
459
|
-
expect(
|
|
460
|
-
expect(
|
|
458
|
+
expect(mocks.getInitData).toHaveBeenCalledTimes(3);
|
|
459
|
+
expect(mocks.getInitData).toHaveBeenNthCalledWith(1, initDataEvent);
|
|
460
|
+
expect(mocks.getInitData).toHaveBeenNthCalledWith(2, initDataEvent);
|
|
461
|
+
expect(mocks.getInitData).toHaveBeenNthCalledWith(3, initDataEvent);
|
|
461
462
|
expect(mockCreateSession).toHaveBeenCalledTimes(1);
|
|
462
463
|
expect(mockCreateSession).toHaveBeenCalledWith("temporary");
|
|
463
|
-
expect(
|
|
464
|
-
expect(
|
|
464
|
+
expect(mocks.generateKeyRequest).toHaveBeenCalledTimes(1);
|
|
465
|
+
expect(mocks.generateKeyRequest).toHaveBeenCalledWith(
|
|
465
466
|
mediaKeySession,
|
|
466
467
|
"cenc",
|
|
467
468
|
initData,
|
|
@@ -481,9 +482,8 @@ describe("decrypt - global tests - init data", () => {
|
|
|
481
482
|
});
|
|
482
483
|
});
|
|
483
484
|
|
|
484
|
-
it("should create multiple sessions for multiple received init data when unknown",
|
|
485
|
-
|
|
486
|
-
const { mockGenerateKeyRequest, eventTriggers, mockGetInitData } = mockCompat();
|
|
485
|
+
it("should create multiple sessions for multiple received init data when unknown", () => {
|
|
486
|
+
const { eventTriggers } = mockCompat(mocks);
|
|
487
487
|
const mediaKeySessions = [
|
|
488
488
|
new MediaKeySessionImpl(),
|
|
489
489
|
new MediaKeySessionImpl(),
|
|
@@ -494,11 +494,6 @@ describe("decrypt - global tests - init data", () => {
|
|
|
494
494
|
.spyOn(MediaKeysImpl.prototype, "createSession")
|
|
495
495
|
.mockImplementation(() => mediaKeySessions[createSessionCallIdx++]);
|
|
496
496
|
|
|
497
|
-
const ContentDecryptorState = (await vi.importActual("../../types"))
|
|
498
|
-
.ContentDecryptorState as typeof IContentDecryptorState;
|
|
499
|
-
const ContentDecryptor = (await vi.importActual("../../content_decryptor"))
|
|
500
|
-
.default as typeof IContentDecryptor;
|
|
501
|
-
const getEmeApiImplementation = (await import("../../../../compat/eme")).default;
|
|
502
497
|
return new Promise<void>((res, rej) => {
|
|
503
498
|
// == vars ==
|
|
504
499
|
const initDatas = [
|
|
@@ -520,7 +515,7 @@ describe("decrypt - global tests - init data", () => {
|
|
|
520
515
|
const contentDecryptor = new ContentDecryptor(eme, videoElt, ksConfig);
|
|
521
516
|
contentDecryptor.addEventListener(
|
|
522
517
|
"stateChange",
|
|
523
|
-
(newState:
|
|
518
|
+
(newState: ContentDecryptorState) => {
|
|
524
519
|
if (newState !== ContentDecryptorState.WaitingForAttachment) {
|
|
525
520
|
rej(new Error(`Unexpected state: ${newState}`));
|
|
526
521
|
}
|
|
@@ -539,30 +534,30 @@ describe("decrypt - global tests - init data", () => {
|
|
|
539
534
|
}, 5);
|
|
540
535
|
setTimeout(() => {
|
|
541
536
|
try {
|
|
542
|
-
expect(
|
|
543
|
-
expect(
|
|
544
|
-
expect(
|
|
545
|
-
expect(
|
|
546
|
-
expect(
|
|
547
|
-
expect(
|
|
537
|
+
expect(mocks.getInitData).toHaveBeenCalledTimes(5);
|
|
538
|
+
expect(mocks.getInitData).toHaveBeenNthCalledWith(1, initDataEvents[0]);
|
|
539
|
+
expect(mocks.getInitData).toHaveBeenNthCalledWith(2, initDataEvents[1]);
|
|
540
|
+
expect(mocks.getInitData).toHaveBeenNthCalledWith(3, initDataEvents[0]);
|
|
541
|
+
expect(mocks.getInitData).toHaveBeenNthCalledWith(4, initDataEvents[2]);
|
|
542
|
+
expect(mocks.getInitData).toHaveBeenNthCalledWith(5, initDataEvents[1]);
|
|
548
543
|
expect(mockCreateSession).toHaveBeenCalledTimes(3);
|
|
549
544
|
expect(mockCreateSession).toHaveBeenNthCalledWith(1, "temporary");
|
|
550
545
|
expect(mockCreateSession).toHaveBeenNthCalledWith(2, "temporary");
|
|
551
546
|
expect(mockCreateSession).toHaveBeenNthCalledWith(3, "temporary");
|
|
552
|
-
expect(
|
|
553
|
-
expect(
|
|
547
|
+
expect(mocks.generateKeyRequest).toHaveBeenCalledTimes(3);
|
|
548
|
+
expect(mocks.generateKeyRequest).toHaveBeenNthCalledWith(
|
|
554
549
|
1,
|
|
555
550
|
mediaKeySessions[0],
|
|
556
551
|
"cenc",
|
|
557
552
|
initDatas[0],
|
|
558
553
|
);
|
|
559
|
-
expect(
|
|
554
|
+
expect(mocks.generateKeyRequest).toHaveBeenNthCalledWith(
|
|
560
555
|
2,
|
|
561
556
|
mediaKeySessions[1],
|
|
562
557
|
"cenc",
|
|
563
558
|
initDatas[1],
|
|
564
559
|
);
|
|
565
|
-
expect(
|
|
560
|
+
expect(mocks.generateKeyRequest).toHaveBeenNthCalledWith(
|
|
566
561
|
3,
|
|
567
562
|
mediaKeySessions[2],
|
|
568
563
|
"cenc",
|
|
@@ -594,20 +589,14 @@ describe("decrypt - global tests - init data", () => {
|
|
|
594
589
|
});
|
|
595
590
|
});
|
|
596
591
|
|
|
597
|
-
it("should create multiple sessions for multiple received init data types",
|
|
598
|
-
|
|
599
|
-
const { mockGenerateKeyRequest, eventTriggers, mockGetInitData } = mockCompat();
|
|
592
|
+
it("should create multiple sessions for multiple received init data types", () => {
|
|
593
|
+
const { eventTriggers } = mockCompat(mocks);
|
|
600
594
|
const mediaKeySessions = [new MediaKeySessionImpl(), new MediaKeySessionImpl()];
|
|
601
595
|
let createSessionCallIdx = 0;
|
|
602
596
|
const mockCreateSession = vi
|
|
603
597
|
.spyOn(MediaKeysImpl.prototype, "createSession")
|
|
604
598
|
.mockImplementation(() => mediaKeySessions[createSessionCallIdx++]);
|
|
605
599
|
|
|
606
|
-
const ContentDecryptorState = (await vi.importActual("../../types"))
|
|
607
|
-
.ContentDecryptorState as typeof IContentDecryptorState;
|
|
608
|
-
const ContentDecryptor = (await vi.importActual("../../content_decryptor"))
|
|
609
|
-
.default as typeof IContentDecryptor;
|
|
610
|
-
const getEmeApiImplementation = (await import("../../../../compat/eme")).default;
|
|
611
600
|
return new Promise<void>((res, rej) => {
|
|
612
601
|
// == vars ==
|
|
613
602
|
const initData = new Uint8Array([54, 55, 75]);
|
|
@@ -623,7 +612,7 @@ describe("decrypt - global tests - init data", () => {
|
|
|
623
612
|
const contentDecryptor = new ContentDecryptor(eme, videoElt, ksConfig);
|
|
624
613
|
contentDecryptor.addEventListener(
|
|
625
614
|
"stateChange",
|
|
626
|
-
(newState:
|
|
615
|
+
(newState: ContentDecryptorState) => {
|
|
627
616
|
if (newState !== ContentDecryptorState.WaitingForAttachment) {
|
|
628
617
|
rej(new Error(`Unexpected state: ${newState}`));
|
|
629
618
|
}
|
|
@@ -635,20 +624,20 @@ describe("decrypt - global tests - init data", () => {
|
|
|
635
624
|
eventTriggers.triggerEncrypted(videoElt, initDataEvents[1]);
|
|
636
625
|
setTimeout(() => {
|
|
637
626
|
try {
|
|
638
|
-
expect(
|
|
639
|
-
expect(
|
|
640
|
-
expect(
|
|
627
|
+
expect(mocks.getInitData).toHaveBeenCalledTimes(2);
|
|
628
|
+
expect(mocks.getInitData).toHaveBeenNthCalledWith(1, initDataEvents[0]);
|
|
629
|
+
expect(mocks.getInitData).toHaveBeenNthCalledWith(2, initDataEvents[1]);
|
|
641
630
|
expect(mockCreateSession).toHaveBeenCalledTimes(2);
|
|
642
631
|
expect(mockCreateSession).toHaveBeenNthCalledWith(1, "temporary");
|
|
643
632
|
expect(mockCreateSession).toHaveBeenNthCalledWith(2, "temporary");
|
|
644
|
-
expect(
|
|
645
|
-
expect(
|
|
633
|
+
expect(mocks.generateKeyRequest).toHaveBeenCalledTimes(2);
|
|
634
|
+
expect(mocks.generateKeyRequest).toHaveBeenNthCalledWith(
|
|
646
635
|
1,
|
|
647
636
|
mediaKeySessions[0],
|
|
648
637
|
"cenc",
|
|
649
638
|
initData,
|
|
650
639
|
);
|
|
651
|
-
expect(
|
|
640
|
+
expect(mocks.generateKeyRequest).toHaveBeenNthCalledWith(
|
|
652
641
|
2,
|
|
653
642
|
mediaKeySessions[1],
|
|
654
643
|
"cenc2",
|
|
@@ -675,9 +664,8 @@ describe("decrypt - global tests - init data", () => {
|
|
|
675
664
|
});
|
|
676
665
|
});
|
|
677
666
|
|
|
678
|
-
it("should consider sent event through arguments and received events through the browser the same way",
|
|
679
|
-
|
|
680
|
-
const { mockGenerateKeyRequest, eventTriggers, mockGetInitData } = mockCompat();
|
|
667
|
+
it("should consider sent event through arguments and received events through the browser the same way", () => {
|
|
668
|
+
const { eventTriggers } = mockCompat(mocks);
|
|
681
669
|
const mediaKeySessions = [
|
|
682
670
|
new MediaKeySessionImpl(),
|
|
683
671
|
new MediaKeySessionImpl(),
|
|
@@ -688,11 +676,6 @@ describe("decrypt - global tests - init data", () => {
|
|
|
688
676
|
.spyOn(MediaKeysImpl.prototype, "createSession")
|
|
689
677
|
.mockImplementation(() => mediaKeySessions[createSessionCallIdx++]);
|
|
690
678
|
|
|
691
|
-
const ContentDecryptorState = (await vi.importActual("../../types"))
|
|
692
|
-
.ContentDecryptorState as typeof IContentDecryptorState;
|
|
693
|
-
const ContentDecryptor = (await vi.importActual("../../content_decryptor"))
|
|
694
|
-
.default as typeof IContentDecryptor;
|
|
695
|
-
const getEmeApiImplementation = (await import("../../../../compat/eme")).default;
|
|
696
679
|
return new Promise<void>((res, rej) => {
|
|
697
680
|
// == vars ==
|
|
698
681
|
const initDatas = [
|
|
@@ -714,7 +697,7 @@ describe("decrypt - global tests - init data", () => {
|
|
|
714
697
|
const contentDecryptor = new ContentDecryptor(eme, videoElt, ksConfig);
|
|
715
698
|
contentDecryptor.addEventListener(
|
|
716
699
|
"stateChange",
|
|
717
|
-
(newState:
|
|
700
|
+
(newState: ContentDecryptorState) => {
|
|
718
701
|
if (newState !== ContentDecryptorState.WaitingForAttachment) {
|
|
719
702
|
rej(new Error(`Unexpected state: ${newState}`));
|
|
720
703
|
}
|
|
@@ -732,29 +715,29 @@ describe("decrypt - global tests - init data", () => {
|
|
|
732
715
|
});
|
|
733
716
|
setTimeout(() => {
|
|
734
717
|
try {
|
|
735
|
-
expect(
|
|
736
|
-
expect(
|
|
737
|
-
expect(
|
|
738
|
-
expect(
|
|
739
|
-
expect(
|
|
718
|
+
expect(mocks.getInitData).toHaveBeenCalledTimes(4);
|
|
719
|
+
expect(mocks.getInitData).toHaveBeenNthCalledWith(1, initDataEvents[0]);
|
|
720
|
+
expect(mocks.getInitData).toHaveBeenNthCalledWith(2, initDataEvents[1]);
|
|
721
|
+
expect(mocks.getInitData).toHaveBeenNthCalledWith(3, initDataEvents[0]);
|
|
722
|
+
expect(mocks.getInitData).toHaveBeenNthCalledWith(4, initDataEvents[2]);
|
|
740
723
|
expect(mockCreateSession).toHaveBeenCalledTimes(3);
|
|
741
724
|
expect(mockCreateSession).toHaveBeenNthCalledWith(1, "temporary");
|
|
742
725
|
expect(mockCreateSession).toHaveBeenNthCalledWith(2, "temporary");
|
|
743
726
|
expect(mockCreateSession).toHaveBeenNthCalledWith(3, "temporary");
|
|
744
|
-
expect(
|
|
745
|
-
expect(
|
|
727
|
+
expect(mocks.generateKeyRequest).toHaveBeenCalledTimes(3);
|
|
728
|
+
expect(mocks.generateKeyRequest).toHaveBeenNthCalledWith(
|
|
746
729
|
1,
|
|
747
730
|
mediaKeySessions[0],
|
|
748
731
|
"cenc",
|
|
749
732
|
initDatas[0],
|
|
750
733
|
);
|
|
751
|
-
expect(
|
|
734
|
+
expect(mocks.generateKeyRequest).toHaveBeenNthCalledWith(
|
|
752
735
|
2,
|
|
753
736
|
mediaKeySessions[1],
|
|
754
737
|
"cenc",
|
|
755
738
|
initDatas[1],
|
|
756
739
|
);
|
|
757
|
-
expect(
|
|
740
|
+
expect(mocks.generateKeyRequest).toHaveBeenNthCalledWith(
|
|
758
741
|
3,
|
|
759
742
|
mediaKeySessions[2],
|
|
760
743
|
"cenc",
|