From 3c1406ad77b092153af8f81b64d03950a2ea4a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=9C=D0=B0?= =?UTF-8?q?=D0=BD=D0=B0=D0=B5=D0=B2?= Date: Fri, 29 Aug 2025 19:19:19 +0000 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?autoplay=20=D0=B8=D0=B7=20=D1=80=D0=B0=D0=B7=D0=BB=D0=B8=D1=87?= =?UTF-8?q?=D0=BD=D1=8B=D1=85=20=D0=B8=D1=81=D1=82=D0=BE=D1=87=D0=BD=D0=B8?= =?UTF-8?q?=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/serve.json | 4 ++++ serve.sh | 2 +- src/internal/player/VokaCorePlayer.ts | 6 ++++-- src/public/@types.ts | 2 +- src/public/VokaPlayerImpl.ts | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 demo/serve.json diff --git a/demo/serve.json b/demo/serve.json new file mode 100644 index 0000000..a396929 --- /dev/null +++ b/demo/serve.json @@ -0,0 +1,4 @@ +{ + "cleanUrls": false, + "trailingSlash": false +} \ No newline at end of file diff --git a/serve.sh b/serve.sh index fbf6065..7fe1ae8 100644 --- a/serve.sh +++ b/serve.sh @@ -13,5 +13,5 @@ if ! npx --no-install serve -v >/dev/null 2>&1; then fi # Запускаем локальный сервер на 5000 порту (или любой другой) -echo "[VOKA] Starting server at http://localhost:8080" +echo "[VOKA] Starting server port 8080" serve -s demo -l 8080 diff --git a/src/internal/player/VokaCorePlayer.ts b/src/internal/player/VokaCorePlayer.ts index 5a145ba..048c5dd 100755 --- a/src/internal/player/VokaCorePlayer.ts +++ b/src/internal/player/VokaCorePlayer.ts @@ -399,8 +399,9 @@ namespace VokaCorePlayer { playableContent['adv'] = content.adv playableContent['subtitlesUrl'] = content.subtitlesUrl - this.autoPlayOption = content.streamOptions?.autoplay - this.setupAutoplay(this.autoPlayOption) + if (content.streamOptions?.autoplay != null) { + this.autoPlayOption = content.streamOptions?.autoplay + } this.player.src(playableContent) // hls.js в процессе работы может менять исходник на blob, а такое @@ -701,6 +702,7 @@ namespace VokaCorePlayer { if (autoplay === "muted") { autoplayValue = "muted"; } else if (this.isLive) { + // Для лайв всегда форсируем автоплей (бизнес правила Voka) autoplayValue = true; } else { autoplayValue = JSON.parse(autoplay); diff --git a/src/public/@types.ts b/src/public/@types.ts index d087735..e768e59 100644 --- a/src/public/@types.ts +++ b/src/public/@types.ts @@ -200,7 +200,7 @@ namespace VokaOptions { } export interface IStream { - autoplay: boolean + autoplay: boolean | "muted" | any drmConfig: IDRMConfig | null metrics: IMetrics | null heartbeat: IHeartbeat | null diff --git a/src/public/VokaPlayerImpl.ts b/src/public/VokaPlayerImpl.ts index 2af5384..653c1b6 100644 --- a/src/public/VokaPlayerImpl.ts +++ b/src/public/VokaPlayerImpl.ts @@ -197,7 +197,7 @@ export class VokaPlayerImpl implements IVokaPlayer { enable: options.controls.editing.enable } }, - autoplay: (BrowserUtils.getLocationParam('autoplay') || (options.streamOpts && options.streamOpts.autoplay) || 'false'), + autoplay: (BrowserUtils.getLocationParam('autoplay') || (options.streamOpts && options.streamOpts.autoplay) || false), log: options.log, bus: this.bus, loggerId: options.loggerId