@applicaster/quick-brick-player 16.0.0-rc.97 → 16.0.0-rc.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-player",
-  "version": "16.0.0-rc.97",
+  "version": "16.0.0-rc.98",
   "description": "Quick Brick Player",
   "main": "./src/index.ts",
   "types": "index.d.ts",
@@ -37,9 +37,9 @@
   "dependencies": {
     "@applicaster/quick-brick-mobile-transport-controls": "16.0.0-rc.93",
     "@applicaster/quick-brick-tv-transport-controls": "16.0.0-rc.69",
-    "@applicaster/zapp-react-native-tvos-app": "16.0.0-rc.97",
-    "@applicaster/zapp-react-native-ui-components": "16.0.0-rc.97",
-    "@applicaster/zapp-react-native-utils": "16.0.0-rc.97",
+    "@applicaster/zapp-react-native-tvos-app": "16.0.0-rc.98",
+    "@applicaster/zapp-react-native-ui-components": "16.0.0-rc.98",
+    "@applicaster/zapp-react-native-utils": "16.0.0-rc.98",
     "query-string": "7.1.3",
     "shaka-player": "4.3.5",
     "typeface-montserrat": "^0.0.54",

package/src/Player/AudioLayer/PlaylistNavigationController.ts

@@ -129,7 +129,17 @@ export class PlaylistNavigationController {
     try {
       const plugins = appStore?.get?.("plugins") || [];
       const queuePlugin = findPluginByIdentifier("queue-action", plugins, true);
-      const QueueManager = (queuePlugin as any)?.module?.QueueManager;
+      const module = (queuePlugin as any)?.module;
+      const QueueManager = module?.QueueManager;
+      const setupQuickBrickQueue = module?.setupQuickBrickQueue;
+
+      if (
+        QueueManager &&
+        !QueueManager.isInitialized?.() &&
+        typeof setupQuickBrickQueue === "function"
+      ) {
+        setupQuickBrickQueue();
+      }
 
       if (QueueManager?.isInitialized?.()) {
         return QueueManager.instance;
@@ -192,19 +202,15 @@ export class PlaylistNavigationController {
       return;
     }
 
-    const isPlayingFromQueue = Boolean(this.entry?.extensions?.queueItemId);
     const staticNextUrl = this.entry?.extensions?.play_next_feed_url;
     const staticPrevUrl = this.entry?.extensions?.play_previous_feed_url;
 
-    const hasNext = isPlayingFromQueue
-      ? upcoming.length > 0 || Boolean(staticNextUrl)
-      : Boolean(staticNextUrl) || upcoming.length > 0;
+    const hasNext = upcoming.length > 0 || Boolean(staticNextUrl);
 
     const canRestart = (this.playerState?.seekableDuration ?? 0) > 0;
 
-    const hasPrevious = isPlayingFromQueue
-      ? history.length > 0 || Boolean(staticPrevUrl) || canRestart
-      : Boolean(staticPrevUrl) || history.length > 0 || canRestart;
+    const hasPrevious =
+      history.length > 0 || Boolean(staticPrevUrl) || canRestart;
 
     if (this.hasNext$.getValue() !== hasNext) {
       this.hasNext$.next(hasNext);
@@ -227,9 +233,7 @@ export class PlaylistNavigationController {
 
       if (this.isDestroyed) return;
 
-      const isPlayingFromQueue = Boolean(this.entry?.extensions?.queueItemId);
-
-      if (isPlayingFromQueue && upcoming.length > 0) {
+      if (upcoming.length > 0) {
         const nextItem = upcoming[0];
 
         log_info(
@@ -259,20 +263,6 @@ export class PlaylistNavigationController {
         );
 
         this.navigator?.replaceTop?.(target);
-
-        return;
-      }
-
-      if (upcoming.length > 0) {
-        const nextItem = upcoming[0];
-
-        log_info(
-          `goNext: playing next item from queue "${nextItem.title}", id: ${nextItem.id}`,
-          { targetId: nextItem.id }
-        );
-
-        if (this.isDestroyed) return;
-        this.navigator?.replaceTop?.(nextItem);
       }
     } catch (error) {
       log_error("goNext: could not navigate to next entry", { error });
@@ -293,7 +283,6 @@ export class PlaylistNavigationController {
 
       if (this.isDestroyed) return;
 
-      const isPlayingFromQueue = Boolean(this.entry?.extensions?.queueItemId);
       const staticPrevUrl = this.entry?.extensions?.play_previous_feed_url;
 
       const currentTime = this.playerState?.currentTime ?? 0;
@@ -302,9 +291,7 @@ export class PlaylistNavigationController {
       const hasQueueHistory = history.length > 0;
       const hasStaticPrev = Boolean(staticPrevUrl);
 
-      const hasTarget = isPlayingFromQueue
-        ? hasQueueHistory || hasStaticPrev
-        : hasStaticPrev || hasQueueHistory;
+      const hasTarget = hasQueueHistory || hasStaticPrev;
 
       const shouldRestart =
         canRestart && (currentTime > RESTART_THRESHOLD_SECONDS || !hasTarget);
@@ -316,7 +303,7 @@ export class PlaylistNavigationController {
         return;
       }
 
-      if (isPlayingFromQueue && hasQueueHistory) {
+      if (hasQueueHistory) {
         const prevItem = history[history.length - 1];
 
         log_info(
@@ -344,20 +331,6 @@ export class PlaylistNavigationController {
         );
 
         this.navigator?.replaceTop?.(target);
-
-        return;
-      }
-
-      if (hasQueueHistory) {
-        const prevItem = history[history.length - 1];
-
-        log_info(
-          `goPrevious: playing previous item from queue "${prevItem.title}", id: ${prevItem.id}`,
-          { targetId: prevItem.id }
-        );
-
-        if (this.isDestroyed) return;
-        this.navigator?.replaceTop?.(prevItem);
       }
     } catch (error) {
       log_error("goPrevious: could not navigate to previous entry", { error });

package/src/Player/AudioLayer/__tests__/PlaylistNavigationController.test.ts

@@ -380,7 +380,7 @@ describe("PlaylistNavigationController", () => {
       controller.destroy();
     });
 
-    it("prioritizes static feed URLs when entry is not from queue", async () => {
+    it("prioritizes queue navigation over static feed URLs even when entry is not from queue", async () => {
       const queueNextItem = { id: "queue_next" } as ZappEntry;
       const queuePrevItem = { id: "queue_prev" } as ZappEntry;
       const staticNextTarget = { id: "static_next" } as ZappEntry;
@@ -411,30 +411,28 @@ describe("PlaylistNavigationController", () => {
       });
 
       await controller.goNext();
-      expect(loadFeedEntryMock).toHaveBeenCalledWith(NEXT_URL, entry);
-      expect(navigator.replaceTop).toHaveBeenCalledWith(staticNextTarget);
+      expect(loadFeedEntryMock).not.toHaveBeenCalled();
+      expect(navigator.replaceTop).toHaveBeenCalledWith(queueNextItem);
 
       await controller.goPrevious();
-      expect(loadFeedEntryMock).toHaveBeenCalledWith(PREV_URL, entry);
-      expect(navigator.replaceTop).toHaveBeenCalledWith(staticPrevTarget);
+      expect(loadFeedEntryMock).not.toHaveBeenCalled();
+      expect(navigator.replaceTop).toHaveBeenCalledWith(queuePrevItem);
 
       controller.destroy();
     });
 
-    it("prioritizes queue navigation when entry is from queue (has queueItemId)", async () => {
-      const queueNextItem = { id: "queue_next" } as ZappEntry;
-      const queuePrevItem = { id: "queue_prev" } as ZappEntry;
+    it("falls back to static feed URLs when queue is empty", async () => {
+      const staticNextTarget = { id: "static_next" } as ZappEntry;
+      const staticPrevTarget = { id: "static_prev" } as ZappEntry;
 
-      mockQueueManager.instance.getUpcomingQueue.mockResolvedValue([
-        queueNextItem,
-      ]);
+      mockQueueManager.instance.getUpcomingQueue.mockResolvedValue([]);
+      mockQueueManager.instance.getHistoryQueue.mockResolvedValue([]);
 
-      mockQueueManager.instance.getHistoryQueue.mockResolvedValue([
-        queuePrevItem,
-      ]);
+      loadFeedEntryMock.mockImplementation((url) =>
+        Promise.resolve(url === NEXT_URL ? staticNextTarget : staticPrevTarget)
+      );
 
       const entry = entryWith({
-        queueItemId: "current_queue_slot",
         play_next_feed_url: NEXT_URL,
         play_previous_feed_url: PREV_URL,
       });
@@ -447,11 +445,12 @@ describe("PlaylistNavigationController", () => {
       });
 
       await controller.goNext();
-      expect(loadFeedEntryMock).not.toHaveBeenCalled();
-      expect(navigator.replaceTop).toHaveBeenCalledWith(queueNextItem);
+      expect(loadFeedEntryMock).toHaveBeenCalledWith(NEXT_URL, entry);
+      expect(navigator.replaceTop).toHaveBeenCalledWith(staticNextTarget);
 
       await controller.goPrevious();
-      expect(navigator.replaceTop).toHaveBeenCalledWith(queuePrevItem);
+      expect(loadFeedEntryMock).toHaveBeenCalledWith(PREV_URL, entry);
+      expect(navigator.replaceTop).toHaveBeenCalledWith(staticPrevTarget);
 
       controller.destroy();
     });