@nomercy-entertainment/nomercy-video-player 2.0.3 → 2.0.4

package/dist/adapters/video-backend/IVideoBackend.d.ts

@@ -1,4 +1,4 @@
-import type { AudioTrack, BackendLoaderState, BackendState, HdrOnSdrFallback, MinimalBackendEventPayload, QualityLevel, SubtitleCueChange, SubtitleTrack } from '@nomercy-entertainment/nomercy-player-core';
+import type { AudioTrack, AuthHeaderProvider, BackendLoaderState, BackendState, HdrOnSdrFallback, MinimalBackendEventPayload, QualityLevel, SubtitleCueChange, SubtitleTrack } from '@nomercy-entertainment/nomercy-player-core';
 import type { HtmlPreloadMode } from '../../types.js';
 /**
  * Per-event payload map. Each backend event has a fixed payload shape so
@@ -135,7 +135,7 @@ export interface IVideoBackend {
      * manifests/segments). Optional — backends without their own network
      * stack omit it.
      */
-    setAuthHeaderProvider?(provider: () => string | undefined | Promise<string | undefined>): void;
+    setAuthHeaderProvider?(provider: AuthHeaderProvider): void;
     /**
      * Consumer policy for an all-HDR item on a display that can't show HDR and
      * a backend that can't tone-map it. Optional — backends that never face the

package/dist/adapters/video-backend/html5.js

@@ -219,7 +219,7 @@ export class Html5VideoBackend extends MediaElementBackend {
         // what produces the ~8 s stall on auto-advance.
         resetMediaElement(this.element);
         performance.mark('nm:backend:load:start');
-        const headerValue = await this._authHeaderProvider?.();
+        const headerValue = this._authHeaderProvider?.(url);
         if (hlsUrl && !nativeHls) {
             const { default: Hls } = await import('hls.js');
             if (!Hls?.isSupported?.()) {
@@ -239,7 +239,7 @@ export class Html5VideoBackend extends MediaElementBackend {
                 enableCEA708Captions: true,
                 startPosition: typeof opts?.startTime === 'number' && opts.startTime > 0 ? opts.startTime : -1,
                 startFragPrefetch: true,
-                xhrSetup: createAuthorizationXhrSetup(headerValue),
+                xhrSetup: createAuthorizationXhrSetup(this._authHeaderProvider),
             });
             this.hls = hlsInstance;
             this.hlsInstance = hlsInstance;

package/dist/index.d.ts

@@ -107,6 +107,8 @@ export declare class NMVideoPlayer<T extends VideoPlaylistItem = VideoPlaylistIt
     private _checkItemEndingSoon;
     /** @internal */
     private _timeStateAt;
+    /** @internal */
+    private _mediaIsStale;
     playbackRate: {
         (): number;
         (rate: number): Promise<void>;

package/dist/index.js

@@ -260,13 +260,9 @@ export class NMVideoPlayer extends EventEmitter {
         // Authenticated media servers need the Authorization header on every
         // hls.js manifest/segment request. The provider reads the auth config
         // lazily so getter-style tokens (Vue refs, stores) stay live.
-        instance.setAuthHeaderProvider?.(async () => {
-            const bearer = this.options?.auth?.bearerToken;
-            if (!bearer)
-                return undefined;
-            const token = typeof bearer === 'function' ? await bearer() : bearer;
-            return token ? `Bearer ${token}` : undefined;
-        });
+        // Read per request rather than captured, so a consumer whose token or
+        // rule changes mid-session is not answered from a stale closure.
+        instance.setAuthHeaderProvider?.((url) => this.options?.auth?.mediaAuthorization?.(url));
         // Consumer's HDR-on-SDR policy, read once here rather than normalized
         // into `options` — `hdrDecision`'s own default ('play') applies at the
         // point of use when this was never pushed at all.
@@ -360,6 +356,15 @@ export class NMVideoPlayer extends EventEmitter {
             this.emit('subtitleCue', data);
         });
         instance.on('timeupdate', () => {
+            // Between a `next()` and the incoming item's mount, this element is
+            // still the OUTGOING item's — the cursor already moved. Publishing
+            // its position here hands every listener the previous item's
+            // position stamped with the new item's identity. Optional call:
+            // the dependency range admits a core that predates the reader, and
+            // an older core must degrade to the old behaviour, not throw on
+            // every tick.
+            if (this._mediaIsStale?.())
+                return;
             const currentTime = instance.currentTime();
             const duration = instance.duration();
             // The payload is core's full TimeState snapshot, built from the
@@ -702,9 +707,23 @@ composeMixins(NMVideoPlayer.prototype, ...playerCoreMethods);
 {
     const composedDispose = NMVideoPlayer.prototype.dispose;
     NMVideoPlayer.prototype.dispose = async function () {
+        // The container id is released before the first await, not after the
+        // teardown resolves. Consumers re-create on the same container in the
+        // same tick — a responsive view handing `#player1` from its desktop
+        // variant to its mobile one does exactly that — and the registry still
+        // held this player, so they were given back the very instance they had
+        // just asked to dispose. `setup()` then threw `already-setup`, and the
+        // throw left that player attached and playing with nobody holding a
+        // reference to stop it.
+        const claimedId = this.playerId;
+        _instances.delete(claimedId);
         await composedDispose.call(this);
-        if (this.phase() !== 'disposed')
-            return; // beforeDispose was prevented — backend + registry stay intact
+        if (this.phase() !== 'disposed') {
+            // beforeDispose was prevented — the player is still alive, so it
+            // takes its id back and the backend stays intact.
+            _instances.set(claimedId, this);
+            return;
+        }
         this._disposeBackend();
     };
 }