prismcast 1.9.0 → 1.10.0
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/dist/app.d.ts +1 -1
- package/dist/app.js +27 -9
- package/dist/app.js.map +1 -1
- package/dist/browser/cdp.js +7 -7
- package/dist/browser/cdp.js.map +1 -1
- package/dist/browser/channelSelection.d.ts +41 -11
- package/dist/browser/channelSelection.js +75 -24
- package/dist/browser/channelSelection.js.map +1 -1
- package/dist/browser/display.d.ts +1 -1
- package/dist/browser/index.d.ts +8 -8
- package/dist/browser/index.js +42 -43
- package/dist/browser/index.js.map +1 -1
- package/dist/browser/login.d.ts +2 -2
- package/dist/browser/login.js +1 -1
- package/dist/browser/manifestInterceptor.d.ts +77 -0
- package/dist/browser/manifestInterceptor.js +323 -0
- package/dist/browser/manifestInterceptor.js.map +1 -0
- package/dist/browser/precaching.js +4 -4
- package/dist/browser/tuning/comcastPolymer.d.ts +1 -1
- package/dist/browser/tuning/cox.d.ts +1 -1
- package/dist/browser/tuning/directv.d.ts +1 -1
- package/dist/browser/tuning/directv.js +61 -62
- package/dist/browser/tuning/directv.js.map +1 -1
- package/dist/browser/tuning/fox.d.ts +1 -1
- package/dist/browser/tuning/fox.js +171 -14
- package/dist/browser/tuning/fox.js.map +1 -1
- package/dist/browser/tuning/hbo.d.ts +1 -1
- package/dist/browser/tuning/hbo.js +6 -6
- package/dist/browser/tuning/hbo.js.map +1 -1
- package/dist/browser/tuning/hulu.d.ts +1 -1
- package/dist/browser/tuning/hulu.js +117 -110
- package/dist/browser/tuning/hulu.js.map +1 -1
- package/dist/browser/tuning/shared.d.ts +3 -3
- package/dist/browser/tuning/shared.js +5 -5
- package/dist/browser/tuning/sling.d.ts +1 -1
- package/dist/browser/tuning/sling.js +28 -28
- package/dist/browser/tuning/sling.js.map +1 -1
- package/dist/browser/tuning/spectrum.d.ts +1 -1
- package/dist/browser/tuning/spectrum.js +21 -22
- package/dist/browser/tuning/spectrum.js.map +1 -1
- package/dist/browser/tuning/thumbnailRow.d.ts +1 -1
- package/dist/browser/tuning/thumbnailRow.js +1 -1
- package/dist/browser/tuning/tileClick.d.ts +1 -1
- package/dist/browser/tuning/tileClick.js +5 -5
- package/dist/browser/tuning/xfinity.d.ts +1 -1
- package/dist/browser/tuning/youtubeTv.d.ts +1 -1
- package/dist/browser/tuning/youtubeTv.js +17 -18
- package/dist/browser/tuning/youtubeTv.js.map +1 -1
- package/dist/browser/video.d.ts +20 -6
- package/dist/browser/video.js +30 -38
- package/dist/browser/video.js.map +1 -1
- package/dist/channels/index.d.ts +1 -2
- package/dist/channels/index.js +73 -40
- package/dist/channels/index.js.map +1 -1
- package/dist/config/channelForm.d.ts +58 -0
- package/dist/config/channelForm.js +129 -0
- package/dist/config/channelForm.js.map +1 -0
- package/dist/config/consistencyProbe.d.ts +7 -0
- package/dist/config/consistencyProbe.js +143 -0
- package/dist/config/consistencyProbe.js.map +1 -0
- package/dist/config/health.d.ts +4 -3
- package/dist/config/health.js +75 -62
- package/dist/config/health.js.map +1 -1
- package/dist/config/index.d.ts +1 -1
- package/dist/config/index.js +19 -12
- package/dist/config/index.js.map +1 -1
- package/dist/config/paths.d.ts +9 -3
- package/dist/config/paths.js +12 -4
- package/dist/config/paths.js.map +1 -1
- package/dist/config/persistence.context.d.ts +8 -0
- package/dist/config/persistence.context.js +30 -0
- package/dist/config/persistence.context.js.map +1 -0
- package/dist/config/persistence.d.ts +110 -12
- package/dist/config/persistence.js +351 -32
- package/dist/config/persistence.js.map +1 -1
- package/dist/config/presets.d.ts +14 -4
- package/dist/config/presets.js +84 -75
- package/dist/config/presets.js.map +1 -1
- package/dist/config/profiles.d.ts +2 -2
- package/dist/config/profiles.js +7 -9
- package/dist/config/profiles.js.map +1 -1
- package/dist/config/servicePacks.d.ts +2 -2
- package/dist/config/servicePacks.js +28 -28
- package/dist/config/servicePacks.js.map +1 -1
- package/dist/config/services.d.ts +62 -36
- package/dist/config/services.js +150 -136
- package/dist/config/services.js.map +1 -1
- package/dist/config/sites.d.ts +3 -3
- package/dist/config/sites.js +16 -16
- package/dist/config/sites.js.map +1 -1
- package/dist/config/userChannels.d.ts +500 -41
- package/dist/config/userChannels.js +1201 -312
- package/dist/config/userChannels.js.map +1 -1
- package/dist/config/userConfig.d.ts +103 -10
- package/dist/config/userConfig.js +277 -117
- package/dist/config/userConfig.js.map +1 -1
- package/dist/config/userProfiles.d.ts +4 -2
- package/dist/config/userProfiles.js +72 -26
- package/dist/config/userProfiles.js.map +1 -1
- package/dist/hdhr/channelMap.js +8 -11
- package/dist/hdhr/channelMap.js.map +1 -1
- package/dist/hdhr/deviceId.js +10 -9
- package/dist/hdhr/deviceId.js.map +1 -1
- package/dist/hdhr/discover.js +4 -5
- package/dist/hdhr/discover.js.map +1 -1
- package/dist/hdhr/index.js +6 -10
- package/dist/hdhr/index.js.map +1 -1
- package/dist/index.js +12 -12
- package/dist/index.js.map +1 -1
- package/dist/native/codecInference.d.ts +44 -0
- package/dist/native/codecInference.js +327 -0
- package/dist/native/codecInference.js.map +1 -0
- package/dist/native/decrypt.d.ts +1 -1
- package/dist/native/index.d.ts +5 -5
- package/dist/native/index.js +42 -64
- package/dist/native/index.js.map +1 -1
- package/dist/native/probe.d.ts +27 -9
- package/dist/native/probe.js +158 -67
- package/dist/native/probe.js.map +1 -1
- package/dist/native/proxy.d.ts +4 -2
- package/dist/native/proxy.js +52 -49
- package/dist/native/proxy.js.map +1 -1
- package/dist/native/tokenExpiry.d.ts +22 -0
- package/dist/native/tokenExpiry.js +153 -0
- package/dist/native/tokenExpiry.js.map +1 -0
- package/dist/routes/auth.js +6 -10
- package/dist/routes/auth.js.map +1 -1
- package/dist/routes/components.js +2 -2
- package/dist/routes/components.js.map +1 -1
- package/dist/routes/config/channels/endpoints/browse.d.ts +6 -0
- package/dist/routes/config/channels/endpoints/browse.js +195 -0
- package/dist/routes/config/channels/endpoints/browse.js.map +1 -0
- package/dist/routes/config/channels/endpoints/bulk.d.ts +6 -0
- package/dist/routes/config/channels/endpoints/bulk.js +128 -0
- package/dist/routes/config/channels/endpoints/bulk.js.map +1 -0
- package/dist/routes/config/channels/endpoints/crud.d.ts +6 -0
- package/dist/routes/config/channels/endpoints/crud.js +504 -0
- package/dist/routes/config/channels/endpoints/crud.js.map +1 -0
- package/dist/routes/config/channels/endpoints/importExport.d.ts +6 -0
- package/dist/routes/config/channels/endpoints/importExport.js +131 -0
- package/dist/routes/config/channels/endpoints/importExport.js.map +1 -0
- package/dist/routes/config/channels/endpoints/predefined.d.ts +6 -0
- package/dist/routes/config/channels/endpoints/predefined.js +78 -0
- package/dist/routes/config/channels/endpoints/predefined.js.map +1 -0
- package/dist/routes/config/channels/endpoints/prefs.d.ts +6 -0
- package/dist/routes/config/channels/endpoints/prefs.js +58 -0
- package/dist/routes/config/channels/endpoints/prefs.js.map +1 -0
- package/dist/routes/config/channels/endpoints/service.d.ts +6 -0
- package/dist/routes/config/channels/endpoints/service.js +149 -0
- package/dist/routes/config/channels/endpoints/service.js.map +1 -0
- package/dist/routes/config/channels/endpoints/tags.d.ts +6 -0
- package/dist/routes/config/channels/endpoints/tags.js +185 -0
- package/dist/routes/config/channels/endpoints/tags.js.map +1 -0
- package/dist/routes/config/channels/http/handler.d.ts +10 -0
- package/dist/routes/config/channels/http/handler.js +20 -0
- package/dist/routes/config/channels/http/handler.js.map +1 -0
- package/dist/routes/config/channels/http/playlistHint.d.ts +25 -0
- package/dist/routes/config/channels/http/playlistHint.js +40 -0
- package/dist/routes/config/channels/http/playlistHint.js.map +1 -0
- package/dist/routes/config/channels/http/serviceWarning.d.ts +10 -0
- package/dist/routes/config/channels/http/serviceWarning.js +28 -0
- package/dist/routes/config/channels/http/serviceWarning.js.map +1 -0
- package/dist/routes/config/channels/index.d.ts +3 -3
- package/dist/routes/config/channels/index.js +1 -1
- package/dist/routes/config/channels/index.js.map +1 -1
- package/dist/routes/config/channels/{routes.d.ts → setup.d.ts} +1 -1
- package/dist/routes/config/channels/setup.js +23 -0
- package/dist/routes/config/channels/setup.js.map +1 -0
- package/dist/routes/config/channels/table.d.ts +9 -9
- package/dist/routes/config/channels/table.js +124 -76
- package/dist/routes/config/channels/table.js.map +1 -1
- package/dist/routes/config/http/envelope.d.ts +111 -0
- package/dist/routes/config/http/envelope.js +103 -0
- package/dist/routes/config/http/envelope.js.map +1 -0
- package/dist/routes/config/index.d.ts +9 -9
- package/dist/routes/config/index.js +2 -2
- package/dist/routes/config/index.js.map +1 -1
- package/dist/routes/config/services.js +69 -68
- package/dist/routes/config/services.js.map +1 -1
- package/dist/routes/config/settings.d.ts +1 -1
- package/dist/routes/config/settings.js +45 -38
- package/dist/routes/config/settings.js.map +1 -1
- package/dist/routes/debug.js +12 -11
- package/dist/routes/debug.js.map +1 -1
- package/dist/routes/icons.js +2 -2
- package/dist/routes/icons.js.map +1 -1
- package/dist/routes/logs.js +19 -30
- package/dist/routes/logs.js.map +1 -1
- package/dist/routes/mpegts.js +1 -1
- package/dist/routes/playlist.d.ts +1 -1
- package/dist/routes/playlist.js +37 -26
- package/dist/routes/playlist.js.map +1 -1
- package/dist/routes/root/content.js +27 -6
- package/dist/routes/root/content.js.map +1 -1
- package/dist/routes/root/index.js +2 -5
- package/dist/routes/root/index.js.map +1 -1
- package/dist/routes/root/scripts/channels.js +16 -16
- package/dist/routes/root/scripts/channels.js.map +1 -1
- package/dist/routes/root/scripts/config.js +59 -59
- package/dist/routes/root/scripts/config.js.map +1 -1
- package/dist/routes/root/scripts/index.d.ts +4 -4
- package/dist/routes/root/scripts/shared.js +24 -10
- package/dist/routes/root/scripts/shared.js.map +1 -1
- package/dist/routes/root/scripts/status.d.ts +4 -0
- package/dist/routes/root/scripts/status.handlers.d.ts +182 -0
- package/dist/routes/root/scripts/status.handlers.js +713 -0
- package/dist/routes/root/scripts/status.handlers.js.map +1 -0
- package/dist/routes/root/scripts/status.js +86 -488
- package/dist/routes/root/scripts/status.js.map +1 -1
- package/dist/routes/root/styles.js +5 -5
- package/dist/routes/services.js +18 -15
- package/dist/routes/services.js.map +1 -1
- package/dist/routes/sse.d.ts +16 -0
- package/dist/routes/sse.js +29 -0
- package/dist/routes/sse.js.map +1 -0
- package/dist/routes/streams.js +10 -23
- package/dist/routes/streams.js.map +1 -1
- package/dist/routes/ui.d.ts +2 -2
- package/dist/routes/upgrade.js +6 -7
- package/dist/routes/upgrade.js.map +1 -1
- package/dist/service/commands.context.d.ts +6 -0
- package/dist/service/commands.context.js +47 -0
- package/dist/service/commands.context.js.map +1 -0
- package/dist/service/commands.d.ts +53 -8
- package/dist/service/commands.js +171 -188
- package/dist/service/commands.js.map +1 -1
- package/dist/service/generators.context.d.ts +6 -0
- package/dist/service/generators.context.js +45 -0
- package/dist/service/generators.context.js.map +1 -0
- package/dist/service/generators.d.ts +56 -16
- package/dist/service/generators.js +499 -383
- package/dist/service/generators.js.map +1 -1
- package/dist/service/index.d.ts +2 -2
- package/dist/streaming/clients.d.ts +2 -2
- package/dist/streaming/clients.js +2 -2
- package/dist/streaming/codec.d.ts +2 -2
- package/dist/streaming/codec.js +0 -1
- package/dist/streaming/codec.js.map +1 -1
- package/dist/streaming/fmp4Segmenter.d.ts +2 -2
- package/dist/streaming/fmp4Segmenter.js +12 -12
- package/dist/streaming/hls.d.ts +3 -3
- package/dist/streaming/hls.js +81 -70
- package/dist/streaming/hls.js.map +1 -1
- package/dist/streaming/hlsResume.d.ts +3 -3
- package/dist/streaming/hlsResume.js +5 -5
- package/dist/streaming/hlsSegments.d.ts +5 -2
- package/dist/streaming/hlsSegments.js +14 -9
- package/dist/streaming/hlsSegments.js.map +1 -1
- package/dist/streaming/monitor.d.ts +12 -12
- package/dist/streaming/monitor.js +80 -54
- package/dist/streaming/monitor.js.map +1 -1
- package/dist/streaming/mp4Parser.d.ts +34 -4
- package/dist/streaming/mp4Parser.js +111 -29
- package/dist/streaming/mp4Parser.js.map +1 -1
- package/dist/streaming/mpegts.d.ts +1 -1
- package/dist/streaming/mpegts.js +13 -10
- package/dist/streaming/mpegts.js.map +1 -1
- package/dist/streaming/playlistBuilder.d.ts +1 -1
- package/dist/streaming/playlistBuilder.js +2 -2
- package/dist/streaming/preroll.d.ts +9 -9
- package/dist/streaming/preroll.js +39 -41
- package/dist/streaming/preroll.js.map +1 -1
- package/dist/streaming/pretune.js +4 -4
- package/dist/streaming/pretune.js.map +1 -1
- package/dist/streaming/recovery.d.ts +3 -3
- package/dist/streaming/recovery.js +4 -4
- package/dist/streaming/registry.d.ts +6 -6
- package/dist/streaming/setup.d.ts +9 -8
- package/dist/streaming/setup.js +97 -49
- package/dist/streaming/setup.js.map +1 -1
- package/dist/streaming/showInfo.d.ts +9 -3
- package/dist/streaming/showInfo.js +26 -18
- package/dist/streaming/showInfo.js.map +1 -1
- package/dist/streaming/statusEmitter.d.ts +4 -4
- package/dist/streaming/statusEmitter.js +2 -2
- package/dist/types/channels.d.ts +133 -34
- package/dist/types/channels.js +39 -1
- package/dist/types/channels.js.map +1 -1
- package/dist/types/config.d.ts +20 -1
- package/dist/types/index.d.ts +9 -8
- package/dist/types/index.js +1 -0
- package/dist/types/index.js.map +1 -1
- package/dist/types/profiles.d.ts +5 -4
- package/dist/types/selection.d.ts +48 -4
- package/dist/types/streaming.d.ts +1 -1
- package/dist/upgrade/commands.context.d.ts +6 -0
- package/dist/upgrade/commands.context.js +29 -0
- package/dist/upgrade/commands.context.js.map +1 -0
- package/dist/upgrade/commands.d.ts +29 -2
- package/dist/upgrade/commands.js +87 -134
- package/dist/upgrade/commands.js.map +1 -1
- package/dist/upgrade/detection.context.d.ts +6 -0
- package/dist/upgrade/detection.context.js +24 -0
- package/dist/upgrade/detection.context.js.map +1 -0
- package/dist/upgrade/detection.d.ts +140 -10
- package/dist/upgrade/detection.js +153 -66
- package/dist/upgrade/detection.js.map +1 -1
- package/dist/upgrade/index.d.ts +2 -2
- package/dist/utils/chromeFetch.d.ts +1 -1
- package/dist/utils/chromeFetch.js +1 -1
- package/dist/utils/clock.d.ts +14 -0
- package/dist/utils/clock.js +28 -0
- package/dist/utils/clock.js.map +1 -0
- package/dist/utils/debugFilter.d.ts +1 -1
- package/dist/utils/debugFilter.js +6 -4
- package/dist/utils/debugFilter.js.map +1 -1
- package/dist/utils/delay.d.ts +2 -3
- package/dist/utils/delay.js +10 -16
- package/dist/utils/delay.js.map +1 -1
- package/dist/utils/evaluate.js +12 -14
- package/dist/utils/evaluate.js.map +1 -1
- package/dist/utils/ffmpeg.context.d.ts +6 -0
- package/dist/utils/ffmpeg.context.js +31 -0
- package/dist/utils/ffmpeg.context.js.map +1 -0
- package/dist/utils/ffmpeg.d.ts +85 -29
- package/dist/utils/ffmpeg.js +126 -129
- package/dist/utils/ffmpeg.js.map +1 -1
- package/dist/utils/fileLogger.d.ts +18 -2
- package/dist/utils/fileLogger.js +58 -30
- package/dist/utils/fileLogger.js.map +1 -1
- package/dist/utils/format.d.ts +1 -1
- package/dist/utils/format.js +2 -2
- package/dist/utils/format.js.map +1 -1
- package/dist/utils/html.js +1 -3
- package/dist/utils/html.js.map +1 -1
- package/dist/utils/index.d.ts +21 -20
- package/dist/utils/index.js +1 -0
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/logger.js +16 -20
- package/dist/utils/logger.js.map +1 -1
- package/dist/utils/m3u.d.ts +18 -3
- package/dist/utils/m3u.js +28 -14
- package/dist/utils/m3u.js.map +1 -1
- package/dist/utils/memo.d.ts +19 -0
- package/dist/utils/memo.js +53 -0
- package/dist/utils/memo.js.map +1 -0
- package/dist/utils/morganStream.js +2 -2
- package/dist/utils/morganStream.js.map +1 -1
- package/dist/utils/pid.d.ts +2 -2
- package/dist/utils/pid.js +2 -2
- package/dist/utils/platform.d.ts +1 -1
- package/dist/utils/platform.js +3 -3
- package/dist/utils/platform.js.map +1 -1
- package/dist/utils/retry.d.ts +2 -0
- package/dist/utils/retry.js +9 -7
- package/dist/utils/retry.js.map +1 -1
- package/dist/utils/sanitize.d.ts +2 -2
- package/dist/utils/sanitize.js +4 -4
- package/dist/utils/timing.d.ts +6 -3
- package/dist/utils/timing.js +10 -6
- package/dist/utils/timing.js.map +1 -1
- package/dist/utils/version.d.ts +3 -2
- package/dist/utils/version.js +14 -27
- package/dist/utils/version.js.map +1 -1
- package/package.json +13 -7
- package/dist/native/intercept.d.ts +0 -35
- package/dist/native/intercept.js +0 -181
- package/dist/native/intercept.js.map +0 -1
- package/dist/routes/config/channels/routes.js +0 -1505
- package/dist/routes/config/channels/routes.js.map +0 -1
package/dist/config/presets.js
CHANGED
|
@@ -7,78 +7,87 @@ import { getMaxSupportedViewport } from "../browser/display.js";
|
|
|
7
7
|
*/
|
|
8
8
|
// Default viewport dimensions used as fallback if preset lookup fails. Matches 720p preset.
|
|
9
9
|
const DEFAULT_VIEWPORT = { height: 720, width: 1280 };
|
|
10
|
+
/* Each preset is declared as a standalone const so downstream code can reference specific presets by name (PRESET_480P as the minimum fallback, PRESET_720P
|
|
11
|
+
* as the default) with fully-narrowed types. Exporting the assembled array gives consumers the ordered list; exporting the individual consts gives us stable
|
|
12
|
+
* references we can use without re-indexing into the array and fighting the type system.
|
|
13
|
+
*/
|
|
14
|
+
const PRESET_480P = {
|
|
15
|
+
description: "Low bandwidth, older devices, minimal resource usage.",
|
|
16
|
+
id: "480p",
|
|
17
|
+
name: "480p",
|
|
18
|
+
values: {
|
|
19
|
+
"browser.viewport.height": 480,
|
|
20
|
+
"browser.viewport.width": 854,
|
|
21
|
+
"streaming.frameRate": 30,
|
|
22
|
+
"streaming.videoBitsPerSecond": 3000000
|
|
23
|
+
}
|
|
24
|
+
};
|
|
25
|
+
const PRESET_720P = {
|
|
26
|
+
description: "Balanced quality and bandwidth. Good for most content.",
|
|
27
|
+
id: "720p",
|
|
28
|
+
name: "720p",
|
|
29
|
+
values: {
|
|
30
|
+
"browser.viewport.height": 720,
|
|
31
|
+
"browser.viewport.width": 1280,
|
|
32
|
+
"streaming.frameRate": 60,
|
|
33
|
+
"streaming.videoBitsPerSecond": 8000000
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
const PRESET_720P_HIGH = {
|
|
37
|
+
description: "HD with higher bitrate. Best for sports and fast motion at 720p.",
|
|
38
|
+
id: "720p-high",
|
|
39
|
+
name: "720p High",
|
|
40
|
+
values: {
|
|
41
|
+
"browser.viewport.height": 720,
|
|
42
|
+
"browser.viewport.width": 1280,
|
|
43
|
+
"streaming.frameRate": 60,
|
|
44
|
+
"streaming.videoBitsPerSecond": 12000000
|
|
45
|
+
}
|
|
46
|
+
};
|
|
47
|
+
const PRESET_1080P = {
|
|
48
|
+
description: "Full HD resolution. Requires good bandwidth.",
|
|
49
|
+
id: "1080p",
|
|
50
|
+
name: "1080p",
|
|
51
|
+
values: {
|
|
52
|
+
"browser.viewport.height": 1080,
|
|
53
|
+
"browser.viewport.width": 1920,
|
|
54
|
+
"streaming.frameRate": 60,
|
|
55
|
+
"streaming.videoBitsPerSecond": 15000000
|
|
56
|
+
}
|
|
57
|
+
};
|
|
58
|
+
const PRESET_1080P_HIGH = {
|
|
59
|
+
description: "Full HD with higher bitrate. Best for sports and fast motion.",
|
|
60
|
+
id: "1080p-high",
|
|
61
|
+
name: "1080p High",
|
|
62
|
+
values: {
|
|
63
|
+
"browser.viewport.height": 1080,
|
|
64
|
+
"browser.viewport.width": 1920,
|
|
65
|
+
"streaming.frameRate": 60,
|
|
66
|
+
"streaming.videoBitsPerSecond": 20000000
|
|
67
|
+
}
|
|
68
|
+
};
|
|
69
|
+
const PRESET_4K = {
|
|
70
|
+
description: "4K resolution. High resource and bandwidth usage.",
|
|
71
|
+
id: "4k",
|
|
72
|
+
name: "4K",
|
|
73
|
+
values: {
|
|
74
|
+
"browser.viewport.height": 2160,
|
|
75
|
+
"browser.viewport.width": 3840,
|
|
76
|
+
"streaming.frameRate": 60,
|
|
77
|
+
"streaming.videoBitsPerSecond": 35000000
|
|
78
|
+
}
|
|
79
|
+
};
|
|
10
80
|
/**
|
|
11
|
-
* Available video quality presets. These presets configure viewport dimensions, video bitrate, and frame rate for common use cases. The presets are ordered
|
|
12
|
-
* to highest quality.
|
|
81
|
+
* Available video quality presets. These presets configure viewport dimensions, video bitrate, and frame rate for common use cases. The presets are ordered
|
|
82
|
+
* from lowest to highest quality.
|
|
13
83
|
*/
|
|
14
84
|
export const VIDEO_QUALITY_PRESETS = [
|
|
15
|
-
|
|
16
|
-
description: "Low bandwidth, older devices, minimal resource usage.",
|
|
17
|
-
id: "480p",
|
|
18
|
-
name: "480p",
|
|
19
|
-
values: {
|
|
20
|
-
"browser.viewport.height": 480,
|
|
21
|
-
"browser.viewport.width": 854,
|
|
22
|
-
"streaming.frameRate": 30,
|
|
23
|
-
"streaming.videoBitsPerSecond": 3000000
|
|
24
|
-
}
|
|
25
|
-
},
|
|
26
|
-
{
|
|
27
|
-
description: "Balanced quality and bandwidth. Good for most content.",
|
|
28
|
-
id: "720p",
|
|
29
|
-
name: "720p",
|
|
30
|
-
values: {
|
|
31
|
-
"browser.viewport.height": 720,
|
|
32
|
-
"browser.viewport.width": 1280,
|
|
33
|
-
"streaming.frameRate": 60,
|
|
34
|
-
"streaming.videoBitsPerSecond": 8000000
|
|
35
|
-
}
|
|
36
|
-
},
|
|
37
|
-
{
|
|
38
|
-
description: "HD with higher bitrate. Best for sports and fast motion at 720p.",
|
|
39
|
-
id: "720p-high",
|
|
40
|
-
name: "720p High",
|
|
41
|
-
values: {
|
|
42
|
-
"browser.viewport.height": 720,
|
|
43
|
-
"browser.viewport.width": 1280,
|
|
44
|
-
"streaming.frameRate": 60,
|
|
45
|
-
"streaming.videoBitsPerSecond": 12000000
|
|
46
|
-
}
|
|
47
|
-
},
|
|
48
|
-
{
|
|
49
|
-
description: "Full HD resolution. Requires good bandwidth.",
|
|
50
|
-
id: "1080p",
|
|
51
|
-
name: "1080p",
|
|
52
|
-
values: {
|
|
53
|
-
"browser.viewport.height": 1080,
|
|
54
|
-
"browser.viewport.width": 1920,
|
|
55
|
-
"streaming.frameRate": 60,
|
|
56
|
-
"streaming.videoBitsPerSecond": 15000000
|
|
57
|
-
}
|
|
58
|
-
},
|
|
59
|
-
{
|
|
60
|
-
description: "Full HD with higher bitrate. Best for sports and fast motion.",
|
|
61
|
-
id: "1080p-high",
|
|
62
|
-
name: "1080p High",
|
|
63
|
-
values: {
|
|
64
|
-
"browser.viewport.height": 1080,
|
|
65
|
-
"browser.viewport.width": 1920,
|
|
66
|
-
"streaming.frameRate": 60,
|
|
67
|
-
"streaming.videoBitsPerSecond": 20000000
|
|
68
|
-
}
|
|
69
|
-
},
|
|
70
|
-
{
|
|
71
|
-
description: "4K resolution. High resource and bandwidth usage.",
|
|
72
|
-
id: "4k",
|
|
73
|
-
name: "4K",
|
|
74
|
-
values: {
|
|
75
|
-
"browser.viewport.height": 2160,
|
|
76
|
-
"browser.viewport.width": 3840,
|
|
77
|
-
"streaming.frameRate": 60,
|
|
78
|
-
"streaming.videoBitsPerSecond": 35000000
|
|
79
|
-
}
|
|
80
|
-
}
|
|
85
|
+
PRESET_480P, PRESET_720P, PRESET_720P_HIGH, PRESET_1080P, PRESET_1080P_HIGH, PRESET_4K
|
|
81
86
|
];
|
|
87
|
+
// The default preset when no preset is configured. 720p is the established default.
|
|
88
|
+
const DEFAULT_PRESET = PRESET_720P;
|
|
89
|
+
// The minimum preset used when even the lowest-resolution preset does not fit the display - Chrome will constrain the actual viewport further.
|
|
90
|
+
const MINIMUM_PRESET = PRESET_480P;
|
|
82
91
|
/**
|
|
83
92
|
* Returns the list of valid preset IDs.
|
|
84
93
|
* @returns Array of preset ID strings.
|
|
@@ -112,9 +121,9 @@ export function getPresetViewport(config) {
|
|
|
112
121
|
* @returns The largest fitting preset, or null if no preset fits (extremely small display).
|
|
113
122
|
*/
|
|
114
123
|
export function findBestFittingPreset(maxWidth, maxHeight) {
|
|
115
|
-
// Iterate from highest to lowest resolution (
|
|
116
|
-
|
|
117
|
-
|
|
124
|
+
// Iterate from highest to lowest resolution via toReversed() so the search order reads naturally as "try the largest first" and the loop body deals in
|
|
125
|
+
// fully-typed QualityPreset values rather than array-index lookups.
|
|
126
|
+
for (const preset of VIDEO_QUALITY_PRESETS.toReversed()) {
|
|
118
127
|
const presetWidth = preset.values["browser.viewport.width"];
|
|
119
128
|
const presetHeight = preset.values["browser.viewport.height"];
|
|
120
129
|
if ((presetWidth <= maxWidth) && (presetHeight <= maxHeight)) {
|
|
@@ -131,7 +140,7 @@ export function findBestFittingPreset(maxWidth, maxHeight) {
|
|
|
131
140
|
*/
|
|
132
141
|
export function getEffectivePreset(config) {
|
|
133
142
|
// Find the configured preset.
|
|
134
|
-
const configuredPreset = VIDEO_QUALITY_PRESETS.find((p) => p.id === config.streaming.qualityPreset) ??
|
|
143
|
+
const configuredPreset = VIDEO_QUALITY_PRESETS.find((p) => p.id === config.streaming.qualityPreset) ?? DEFAULT_PRESET;
|
|
135
144
|
const maxViewport = getMaxSupportedViewport();
|
|
136
145
|
// If display detection hasn't completed yet, use configured preset without degradation.
|
|
137
146
|
if (!maxViewport) {
|
|
@@ -155,12 +164,12 @@ export function getEffectivePreset(config) {
|
|
|
155
164
|
}
|
|
156
165
|
// Configured preset doesn't fit - find the best alternative.
|
|
157
166
|
const bestFitting = findBestFittingPreset(maxViewport.width, maxViewport.height);
|
|
158
|
-
// Edge case: no preset fits (extremely small display). Use
|
|
167
|
+
// Edge case: no preset fits (extremely small display). Use the minimum preset and let Chrome constrain the actual viewport further.
|
|
159
168
|
if (!bestFitting) {
|
|
160
169
|
return {
|
|
161
170
|
configuredPreset,
|
|
162
171
|
degraded: true,
|
|
163
|
-
effectivePreset:
|
|
172
|
+
effectivePreset: MINIMUM_PRESET,
|
|
164
173
|
maxViewport
|
|
165
174
|
};
|
|
166
175
|
}
|
|
@@ -229,7 +238,7 @@ export function getPresetOptionsWithDegradation() {
|
|
|
229
238
|
}
|
|
230
239
|
// This preset doesn't fit - it will degrade to the best fitting preset.
|
|
231
240
|
return {
|
|
232
|
-
degradedTo: bestFitting ??
|
|
241
|
+
degradedTo: bestFitting ?? MINIMUM_PRESET,
|
|
233
242
|
preset
|
|
234
243
|
};
|
|
235
244
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../src/config/presets.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEhE;;;;;GAKG;AAEH,4FAA4F;AAC5F,MAAM,gBAAgB,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../src/config/presets.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { DEFAULT_SITE_PROFILE, DOMAIN_CONFIG, PROVIDER_PROFILES, SITE_PROFILES, getBuiltinProfile, getDomainConfig } from "./sites.
|
|
2
|
-
import type { ProfileCategory, ProfileResolutionResult, ResolvedSiteProfile } from "../types/index.
|
|
1
|
+
import { DEFAULT_SITE_PROFILE, DOMAIN_CONFIG, PROVIDER_PROFILES, SITE_PROFILES, getBuiltinProfile, getDomainConfig } from "./sites.ts";
|
|
2
|
+
import type { ProfileCategory, ProfileResolutionResult, ResolvedSiteProfile } from "../types/index.ts";
|
|
3
3
|
export { DEFAULT_SITE_PROFILE, DOMAIN_CONFIG, PROVIDER_PROFILES, SITE_PROFILES, getBuiltinProfile, getDomainConfig };
|
|
4
4
|
/**
|
|
5
5
|
* Resolves a named profile from SITE_PROFILES, handling inheritance and merging with the default profile to ensure all required properties are present. Inheritance
|
package/dist/config/profiles.js
CHANGED
|
@@ -50,7 +50,7 @@ export function resolveProfile(profileName) {
|
|
|
50
50
|
}
|
|
51
51
|
// Check all profile sources: static built-in tables (general + provider) and registered provider module profiles via getBuiltinProfile(), then user-defined
|
|
52
52
|
// profiles. User profiles can only extend built-in profiles (not other user profiles), so the resolution chain always terminates at a built-in profile.
|
|
53
|
-
const profile = getBuiltinProfile(profileName) ?? getUserProfiles()[profileName];
|
|
53
|
+
const profile = getBuiltinProfile(profileName) ?? (getUserProfiles()[profileName]);
|
|
54
54
|
if (!profile) {
|
|
55
55
|
return { ...DEFAULT_SITE_PROFILE };
|
|
56
56
|
}
|
|
@@ -147,7 +147,7 @@ export function getProfileForChannel(channel) {
|
|
|
147
147
|
profileName = "default";
|
|
148
148
|
}
|
|
149
149
|
// If the resolved profile requires channel selection (strategy other than "none") but the channel has no channelSelector, the hostname-specific domain entry
|
|
150
|
-
// (e.g., watch.sling.com
|
|
150
|
+
// (e.g., watch.sling.com -> slingLive) is not appropriate for this direct-URL channel. Fall back to the concise domain entry (e.g., sling.com ->
|
|
151
151
|
// embeddedVolumeLock) which provides generic player handling for direct URLs on the same service.
|
|
152
152
|
if ((profile.channelSelection.strategy !== "none") && !channel.channelSelector && channel.url) {
|
|
153
153
|
const conciseConfig = DOMAIN_CONFIG[extractDomain(channel.url)];
|
|
@@ -158,7 +158,7 @@ export function getProfileForChannel(channel) {
|
|
|
158
158
|
}
|
|
159
159
|
// Merge domain-level properties that apply regardless of how the profile was resolved. These represent site-specific behaviors or policies that must always be
|
|
160
160
|
// applied based on the channel's URL even when the player profile is explicitly overridden. For the URL-based path above, getProfileForUrl() already merges
|
|
161
|
-
// these
|
|
161
|
+
// these - the re-application here is idempotent. For the explicit-profile path, this fills the gap.
|
|
162
162
|
if (channel.url) {
|
|
163
163
|
profile = mergeDomainProperties(profile, getDomainConfig(channel.url));
|
|
164
164
|
}
|
|
@@ -251,7 +251,7 @@ export function validateProfiles() {
|
|
|
251
251
|
if (errors.length > 0) {
|
|
252
252
|
throw new Error(["Profile validation failed:\n ", errors.join("\n ")].join(""));
|
|
253
253
|
}
|
|
254
|
-
// Validate user-defined profiles and domain mappings. These are warnings, not fatal errors
|
|
254
|
+
// Validate user-defined profiles and domain mappings. These are warnings, not fatal errors - broken user profiles should not prevent the server from starting.
|
|
255
255
|
// The user can fix them via the web UI.
|
|
256
256
|
const userWarnings = [];
|
|
257
257
|
const allProfileNames = new Set([...allBuiltinProfiles.keys(), ...Object.keys(userProfiles)]);
|
|
@@ -277,9 +277,8 @@ export function validateProfiles() {
|
|
|
277
277
|
*/
|
|
278
278
|
export function getProfiles() {
|
|
279
279
|
const result = [];
|
|
280
|
-
// Add built-in profiles.
|
|
281
|
-
for (const name of Object.
|
|
282
|
-
const profile = SITE_PROFILES[name];
|
|
280
|
+
// Add built-in profiles. Iterate entries so each profile reference is fully-typed (keys from Object.keys would force a Record lookup per iteration).
|
|
281
|
+
for (const [name, profile] of Object.entries(SITE_PROFILES).toSorted(([a], [b]) => a.localeCompare(b))) {
|
|
283
282
|
result.push({
|
|
284
283
|
category: profile.category ?? "special",
|
|
285
284
|
description: profile.description ?? "",
|
|
@@ -290,8 +289,7 @@ export function getProfiles() {
|
|
|
290
289
|
}
|
|
291
290
|
// Add user-defined profiles. User profiles default to the "custom" category unless they explicitly specify a different category.
|
|
292
291
|
const userProfiles = getUserProfiles();
|
|
293
|
-
for (const name of Object.
|
|
294
|
-
const profile = userProfiles[name];
|
|
292
|
+
for (const [name, profile] of Object.entries(userProfiles).toSorted(([a], [b]) => a.localeCompare(b))) {
|
|
295
293
|
result.push({
|
|
296
294
|
category: profile.category ?? "custom",
|
|
297
295
|
description: profile.description ?? "",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profiles.js","sourceRoot":"","sources":["../../src/config/profiles.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,iBAAiB,EAAE,aAAa,EAAE,iBAAiB,EAAE,eAAe,EAChH,mCAAmC,EAAE,MAAM,YAAY,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACrG,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,2EAA2E;AAC3E,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,iBAAiB,EAAE,aAAa,EAAE,iBAAiB,EAAE,eAAe,EAAE,CAAC;AAErH;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,cAAc,CAAC,WAA+B;IAE5D,6CAA6C;IAC7C,IAAG,CAAC,WAAW,EAAE,CAAC;QAEhB,OAAO,EAAE,GAAG,oBAAoB,EAAE,CAAC;IACrC,CAAC;IAED,4JAA4J;IAC5J,wJAAwJ;IACxJ,MAAM,OAAO,GAAG,iBAAiB,CAAC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"profiles.js","sourceRoot":"","sources":["../../src/config/profiles.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ServicePack } from "../types/index.
|
|
1
|
+
import type { ServicePack } from "../types/index.ts";
|
|
2
2
|
/**
|
|
3
3
|
* Result of parsing a service pack.
|
|
4
4
|
*/
|
|
@@ -8,7 +8,7 @@ export interface ParseResult {
|
|
|
8
8
|
}
|
|
9
9
|
/**
|
|
10
10
|
* Summary of what was imported from a service pack. The primary import (profiles and domains) is tracked separately from the secondary channel import so that
|
|
11
|
-
* callers can report partial success accurately
|
|
11
|
+
* callers can report partial success accurately - profiles may save while channels fail.
|
|
12
12
|
*/
|
|
13
13
|
export interface ImportSummary {
|
|
14
14
|
channelsAdded: number;
|
|
@@ -18,31 +18,31 @@ export function parseServicePack(data) {
|
|
|
18
18
|
}
|
|
19
19
|
const raw = data;
|
|
20
20
|
// Validate required fields. Sanitize the pack name after the type check.
|
|
21
|
-
if ((typeof raw
|
|
21
|
+
if ((typeof raw["name"] !== "string") || (raw["name"].trim() === "")) {
|
|
22
22
|
errors.push("Missing or empty 'name' field.");
|
|
23
23
|
}
|
|
24
24
|
else {
|
|
25
|
-
raw
|
|
25
|
+
raw["name"] = sanitizeString(raw["name"]);
|
|
26
26
|
}
|
|
27
|
-
if ((typeof raw
|
|
27
|
+
if ((typeof raw["version"] !== "number") || !Number.isInteger(raw["version"])) {
|
|
28
28
|
errors.push("Missing or invalid 'version' field (must be an integer).");
|
|
29
29
|
}
|
|
30
|
-
else if (raw
|
|
31
|
-
errors.push("Unsupported version " + String(raw
|
|
30
|
+
else if (raw["version"] > CURRENT_VERSION) {
|
|
31
|
+
errors.push("Unsupported version " + String(raw["version"]) + ". This version of PrismCast supports up to version " + String(CURRENT_VERSION) + ".");
|
|
32
32
|
}
|
|
33
|
-
if (!raw
|
|
33
|
+
if (!raw["profiles"] || (typeof raw["profiles"] !== "object") || Array.isArray(raw["profiles"]) || (Object.keys(raw["profiles"]).length === 0)) {
|
|
34
34
|
errors.push("Missing or empty 'profiles' field (at least one profile is required).");
|
|
35
35
|
}
|
|
36
36
|
// If basic structure checks failed, return early.
|
|
37
37
|
if (errors.length > 0) {
|
|
38
38
|
return { errors };
|
|
39
39
|
}
|
|
40
|
-
// Normalize legacy profile field names before validation so that old service packs with renamed fields (e.g., noVideo
|
|
41
|
-
const rawProfiles = raw
|
|
40
|
+
// Normalize legacy profile field names before validation so that old service packs with renamed fields (e.g., noVideo -> staticCapture) pass validation cleanly.
|
|
41
|
+
const rawProfiles = raw["profiles"];
|
|
42
42
|
normalizeLegacyProfileFlags(rawProfiles);
|
|
43
43
|
// Validate the profiles and domains using the shared validation pipeline.
|
|
44
44
|
const validationResult = validateImportedProfiles({
|
|
45
|
-
domains: raw
|
|
45
|
+
domains: raw["domains"],
|
|
46
46
|
profiles: rawProfiles
|
|
47
47
|
});
|
|
48
48
|
if (!validationResult.valid) {
|
|
@@ -50,27 +50,27 @@ export function parseServicePack(data) {
|
|
|
50
50
|
}
|
|
51
51
|
// Validate channels if present using basic checks (full channel validation happens on import).
|
|
52
52
|
const channels = {};
|
|
53
|
-
if (raw
|
|
54
|
-
if ((typeof raw
|
|
53
|
+
if (raw["channels"]) {
|
|
54
|
+
if ((typeof raw["channels"] !== "object") || Array.isArray(raw["channels"])) {
|
|
55
55
|
errors.push("Invalid 'channels' field: expected an object.");
|
|
56
56
|
}
|
|
57
57
|
else {
|
|
58
|
-
// Basic channel structure validation
|
|
59
|
-
for (const [key, value] of Object.entries(raw
|
|
58
|
+
// Basic channel structure validation - detailed validation happens during importServicePack.
|
|
59
|
+
for (const [key, value] of Object.entries(raw["channels"])) {
|
|
60
60
|
if ((typeof value === "object") && (value !== null) && !Array.isArray(value)) {
|
|
61
61
|
const ch = value;
|
|
62
|
-
if ((typeof ch
|
|
62
|
+
if ((typeof ch["url"] === "string") && (typeof ch["name"] === "string")) {
|
|
63
63
|
// Sanitize channel string fields to strip non-printable characters before storing.
|
|
64
|
-
ch
|
|
65
|
-
ch
|
|
66
|
-
if (typeof ch
|
|
67
|
-
ch
|
|
64
|
+
ch["name"] = sanitizeString(ch["name"]);
|
|
65
|
+
ch["url"] = sanitizeString(ch["url"]);
|
|
66
|
+
if (typeof ch["channelSelector"] === "string") {
|
|
67
|
+
ch["channelSelector"] = sanitizeString(ch["channelSelector"]);
|
|
68
68
|
}
|
|
69
|
-
if (typeof ch
|
|
70
|
-
ch
|
|
69
|
+
if (typeof ch["stationId"] === "string") {
|
|
70
|
+
ch["stationId"] = sanitizeString(ch["stationId"]);
|
|
71
71
|
}
|
|
72
|
-
if (typeof ch
|
|
73
|
-
ch
|
|
72
|
+
if (typeof ch["profile"] === "string") {
|
|
73
|
+
ch["profile"] = sanitizeString(ch["profile"]);
|
|
74
74
|
}
|
|
75
75
|
channels[key] = value;
|
|
76
76
|
}
|
|
@@ -85,9 +85,9 @@ export function parseServicePack(data) {
|
|
|
85
85
|
return { errors };
|
|
86
86
|
}
|
|
87
87
|
const pack = {
|
|
88
|
-
name: raw
|
|
88
|
+
name: raw["name"],
|
|
89
89
|
profiles: validationResult.profiles,
|
|
90
|
-
version: raw
|
|
90
|
+
version: raw["version"]
|
|
91
91
|
};
|
|
92
92
|
if (Object.keys(validationResult.domains).length > 0) {
|
|
93
93
|
pack.domains = validationResult.domains;
|
|
@@ -117,14 +117,14 @@ export async function importServicePack(pack, options = {}) {
|
|
|
117
117
|
errors.push("Failed to save profiles: " + ((error instanceof Error) ? error.message : String(error)));
|
|
118
118
|
return { channelsAdded: 0, domainsAdded: 0, errors, profilesAdded: 0, success: false };
|
|
119
119
|
}
|
|
120
|
-
// Import channels if present and not skipped. Channel import is secondary
|
|
120
|
+
// Import channels if present and not skipped. Channel import is secondary - failures here produce warnings but do not mark the overall import as failed since
|
|
121
121
|
// profiles and domains were already saved successfully above.
|
|
122
122
|
let channelsAdded = 0;
|
|
123
123
|
if (!options.skipChannels && pack.channels && (Object.keys(pack.channels).length > 0)) {
|
|
124
124
|
const packChannels = pack.channels;
|
|
125
125
|
try {
|
|
126
|
-
await mutateChannels((
|
|
127
|
-
Object.assign(channels, packChannels);
|
|
126
|
+
await mutateChannels((data) => {
|
|
127
|
+
Object.assign(data.channels, packChannels);
|
|
128
128
|
});
|
|
129
129
|
channelsAdded = Object.keys(packChannels).length;
|
|
130
130
|
}
|
|
@@ -185,7 +185,7 @@ export function exportServicePack(profileKeys, options = {}) {
|
|
|
185
185
|
const channels = {};
|
|
186
186
|
for (const entry of listing) {
|
|
187
187
|
if (entry.channel.profile && keySet.has(entry.channel.profile)) {
|
|
188
|
-
// Strip hdhrEnabled from exported channels
|
|
188
|
+
// Strip hdhrEnabled from exported channels - it's a local deployment preference, not a service configuration property.
|
|
189
189
|
const exportChannel = { ...entry.channel };
|
|
190
190
|
Reflect.deleteProperty(exportChannel, "hdhrEnabled");
|
|
191
191
|
channels[entry.key] = exportChannel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"servicePacks.js","sourceRoot":"","sources":["../../src/config/servicePacks.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,cAAc,EAAE,2BAA2B,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAC3I,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;GAEG;AAEH,uCAAuC;AACvC,MAAM,eAAe,GAAG,CAAC,CAAC;AAoC1B;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,IAAa;IAE5C,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,IAAG,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QAExE,OAAO,EAAE,MAAM,EAAE,CAAC,yCAAyC,CAAC,EAAE,CAAC;IACjE,CAAC;IAED,MAAM,GAAG,GAAG,IAA+B,CAAC;IAE5C,yEAAyE;IACzE,IAAG,CAAC,OAAO,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"servicePacks.js","sourceRoot":"","sources":["../../src/config/servicePacks.ts"],"names":[],"mappings":"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"}
|