@xiboplayer/renderer 0.7.3 → 0.7.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiboplayer/renderer",
-  "version": "0.7.3",
+  "version": "0.7.5",
   "description": "RendererLite - Fast, efficient XLF layout rendering engine",
   "type": "module",
   "main": "./src/index.js",
@@ -12,9 +12,9 @@
   },
   "dependencies": {
     "pdfjs-dist": "^4.10.38",
-    "@xiboplayer/schedule": "0.7.3",
-    "@xiboplayer/utils": "0.7.3",
-    "@xiboplayer/cache": "0.7.3"
+    "@xiboplayer/cache": "0.7.5",
+    "@xiboplayer/schedule": "0.7.5",
+    "@xiboplayer/utils": "0.7.5"
   },
   "devDependencies": {
     "jsdom": "^25.0.1",

package/src/renderer-lite.js

@@ -1517,11 +1517,10 @@ export class RendererLite {
       el.play().catch(() => {});
     };
     el.addEventListener('seeked', playAfterSeek);
-    // Fallback: if seeked doesn't fire (already at 0), try play directly
-    if (el.currentTime === 0 && el.readyState >= 2) {
-      el.removeEventListener('seeked', playAfterSeek);
-      el.play().catch(() => {});
-    }
+    // Always call play() — for preloaded-then-paused videos, seeked may not
+    // fire (currentTime already 0) and readyState may be < 2 (not buffered yet).
+    // play() handles both cases: if not ready, it queues; if ready, it plays.
+    el.play().catch(() => {});
   }
 
   /**
@@ -2300,10 +2299,9 @@ export class RendererLite {
     }
 
     // Detect video duration for dynamic layout timing (when useDuration=0)
-    // Capture the layout ID at creation time — if the layout changes before
-    // loadedmetadata fires (e.g. video was preloaded for next layout), we must
-    // NOT update the current layout's duration with a different layout's video.
-    const createdForLayoutId = this.currentLayoutId;
+    // Capture the layout ID at creation time — during preload, _preloadingLayoutId
+    // is the target layout (currentLayoutId is still the playing layout).
+    const createdForLayoutId = this._preloadingLayoutId || this.currentLayoutId;
     const onLoadedMetadata = () => {
       const videoDuration = video.duration;
       this.log.info(`Video ${storedAs} duration detected: ${videoDuration}s`);
@@ -2464,7 +2462,7 @@ export class RendererLite {
     audio.addEventListener('ended', onAudioEnded);
 
     // Detect audio duration for dynamic layout timing (when useDuration=0)
-    const audioCreatedForLayoutId = this.currentLayoutId;
+    const audioCreatedForLayoutId = this._preloadingLayoutId || this.currentLayoutId;
     const onAudioLoadedMetadata = () => {
       const audioDuration = Math.floor(audio.duration);
       this.log.info(`Audio ${storedAs} duration detected: ${audioDuration}s`);

package/src/renderer-lite.test.js

@@ -2917,4 +2917,55 @@ describe('RendererLite', () => {
       vi.useRealTimers();
     });
   });
+
+  // ── Video layout ID tracking during preload ──────────────────────
+  // Regression test: createdForLayoutId must use _preloadingLayoutId
+  // during preload, not currentLayoutId (which is the *playing* layout).
+  // Without this, video duration updates for preloaded layouts are
+  // rejected, causing layouts to play with wrong (10s) duration.
+
+  describe('Video createdForLayoutId during preload', () => {
+    it('should capture _preloadingLayoutId for video elements created during preload', () => {
+      renderer.currentLayoutId = 100;       // currently playing
+      renderer._preloadingLayoutId = 200;    // preloading next
+
+      // The fix: _preloadingLayoutId || currentLayoutId should give 200
+      const capturedId = renderer._preloadingLayoutId || renderer.currentLayoutId;
+      expect(capturedId).toBe(200);
+    });
+
+    it('should fall back to currentLayoutId when not preloading', () => {
+      renderer.currentLayoutId = 100;
+      renderer._preloadingLayoutId = null;
+
+      const capturedId = renderer._preloadingLayoutId || renderer.currentLayoutId;
+      expect(capturedId).toBe(100);
+    });
+
+    it('should allow duration update when preloaded layout becomes current', () => {
+      // Simulate: video created during preload of layout 200
+      renderer._preloadingLayoutId = 200;
+      const createdForLayoutId = renderer._preloadingLayoutId || renderer.currentLayoutId;
+
+      // Now layout 200 swaps in
+      renderer.currentLayoutId = 200;
+      renderer._preloadingLayoutId = null;
+
+      // Duration update check should pass
+      expect(renderer.currentLayoutId === createdForLayoutId).toBe(true);
+    });
+
+    it('should reject duration update when a different layout is current', () => {
+      // Video created during preload of layout 200
+      renderer._preloadingLayoutId = 200;
+      const createdForLayoutId = renderer._preloadingLayoutId || renderer.currentLayoutId;
+
+      // But layout 300 swaps in instead (e.g., schedule changed)
+      renderer.currentLayoutId = 300;
+      renderer._preloadingLayoutId = null;
+
+      // Duration update should be rejected — wrong layout
+      expect(renderer.currentLayoutId === createdForLayoutId).toBe(false);
+    });
+  });
 });