@applicaster/zapp-react-native-utils 16.0.0-alpha.1263110541 → 16.0.0-alpha.1314750780

package/appUtils/contextKeysManager/__tests__/setKey/failure/failedToSaveInStorage.test.ts

@@ -38,10 +38,6 @@ describe("Context Keys Manager - setKey", () => {
       secureStorage: mockedSecureStorage,
     });
 
-    const setReferenceForKey = jest
-      .spyOn(contextManager, "setReferenceForKey")
-      .mockResolvedValueOnce(true);
-
     // run
     const result = await contextManager.setKey({ key, value, storageLevel });
 
@@ -68,12 +64,6 @@ describe("Context Keys Manager - setKey", () => {
 
     expect(mockedSecureStorage.getItem).not.toHaveBeenCalled();
     expect(mockedSecureStorage.setItem).not.toHaveBeenCalled();
-
-    expect(setReferenceForKey).toHaveBeenCalledWith(
-      "key",
-      "namespace",
-      storageLevel
-    );
   });
 
   it("returns false if failed to saved with storage-level=persisted", async () => {
@@ -112,10 +102,6 @@ describe("Context Keys Manager - setKey", () => {
       secureStorage: mockedSecureStorage,
     });
 
-    const setReferenceForKey = jest
-      .spyOn(contextManager, "setReferenceForKey")
-      .mockResolvedValueOnce(true);
-
     // run
     const result = await contextManager.setKey({ key, value, storageLevel });
 
@@ -142,12 +128,6 @@ describe("Context Keys Manager - setKey", () => {
 
     expect(mockedSecureStorage.getItem).not.toHaveBeenCalled();
     expect(mockedSecureStorage.setItem).not.toHaveBeenCalled();
-
-    expect(setReferenceForKey).toHaveBeenCalledWith(
-      "key",
-      "namespace",
-      storageLevel
-    );
   });
 
   it("returns false if failed to saved with storage-level=secure", async () => {
@@ -186,10 +166,6 @@ describe("Context Keys Manager - setKey", () => {
       secureStorage: mockedSecureStorage,
     });
 
-    const setReferenceForKey = jest
-      .spyOn(contextManager, "setReferenceForKey")
-      .mockResolvedValueOnce(true);
-
     // run
     const result = await contextManager.setKey({ key, value, storageLevel });
 
@@ -216,12 +192,6 @@ describe("Context Keys Manager - setKey", () => {
       value,
       "namespace"
     );
-
-    expect(setReferenceForKey).toHaveBeenCalledWith(
-      "key",
-      "namespace",
-      storageLevel
-    );
   });
 
   it("returns false if failed to saved with storage-level=undefined", async () => {
@@ -259,10 +229,6 @@ describe("Context Keys Manager - setKey", () => {
       secureStorage: mockedSecureStorage,
     });
 
-    const setReferenceForKey = jest
-      .spyOn(contextManager, "setReferenceForKey")
-      .mockResolvedValueOnce(true);
-
     // run
     const result = await contextManager.setKey({ key, value });
 
@@ -289,11 +255,5 @@ describe("Context Keys Manager - setKey", () => {
 
     expect(mockedSecureStorage.getItem).not.toHaveBeenCalled();
     expect(mockedSecureStorage.setItem).not.toHaveBeenCalled();
-
-    expect(setReferenceForKey).toHaveBeenCalledWith(
-      "key",
-      "namespace",
-      StorageLevel.default
-    );
   });
 });

package/appUtils/contextKeysManager/__tests__/setKey/{success/saveItemAndReference.test.ts → success.test.ts}

@@ -1,5 +1,5 @@
-import { ContextKeysManager } from "../../..";
-import { StorageLevel } from "../../../consts";
+import { ContextKeysManager } from "../..";
+import { StorageLevel } from "../../consts";
 
 describe("Context Keys Manager - setKey", () => {
   it("returns true if saved with success with storage-level=undefined", async () => {
@@ -37,10 +37,6 @@ describe("Context Keys Manager - setKey", () => {
       secureStorage: mockedSecureStorage,
     });
 
-    const setReferenceForKey = jest
-      .spyOn(contextManager, "setReferenceForKey")
-      .mockResolvedValueOnce(true);
-
     // run
     const result = await contextManager.setKey({ key, value, storageLevel });
 
@@ -62,12 +58,6 @@ describe("Context Keys Manager - setKey", () => {
 
     expect(mockedSecureStorage.getItem).not.toHaveBeenCalled();
     expect(mockedSecureStorage.setItem).not.toHaveBeenCalled();
-
-    expect(setReferenceForKey).toHaveBeenCalledWith(
-      "key",
-      "namespace",
-      StorageLevel.default
-    );
   });
 
   it("returns true if saved with success with storage-level=default", async () => {
@@ -105,10 +95,6 @@ describe("Context Keys Manager - setKey", () => {
       secureStorage: mockedSecureStorage,
     });
 
-    const setReferenceForKey = jest
-      .spyOn(contextManager, "setReferenceForKey")
-      .mockResolvedValueOnce(true);
-
     // run
     const result = await contextManager.setKey({ key, value, storageLevel });
 
@@ -130,12 +116,6 @@ describe("Context Keys Manager - setKey", () => {
 
     expect(mockedSecureStorage.getItem).not.toHaveBeenCalled();
     expect(mockedSecureStorage.setItem).not.toHaveBeenCalled();
-
-    expect(setReferenceForKey).toHaveBeenCalledWith(
-      "key",
-      "namespace",
-      StorageLevel.default
-    );
   });
 
   it("returns true if saved with success with storage-level=persisted", async () => {
@@ -173,10 +153,6 @@ describe("Context Keys Manager - setKey", () => {
       secureStorage: mockedSecureStorage,
     });
 
-    const setReferenceForKey = jest
-      .spyOn(contextManager, "setReferenceForKey")
-      .mockResolvedValueOnce(true);
-
     // run
     const result = await contextManager.setKey({ key, value, storageLevel });
 
@@ -198,12 +174,6 @@ describe("Context Keys Manager - setKey", () => {
 
     expect(mockedSecureStorage.getItem).not.toHaveBeenCalled();
     expect(mockedSecureStorage.setItem).not.toHaveBeenCalled();
-
-    expect(setReferenceForKey).toHaveBeenCalledWith(
-      "key",
-      "namespace",
-      storageLevel
-    );
   });
 
   it("returns true if saved with success with storage-level=secure", async () => {
@@ -241,10 +211,6 @@ describe("Context Keys Manager - setKey", () => {
       secureStorage: mockedSecureStorage,
     });
 
-    const setReferenceForKey = jest
-      .spyOn(contextManager, "setReferenceForKey")
-      .mockResolvedValueOnce(true);
-
     // run
     const result = await contextManager.setKey({ key, value, storageLevel });
 
@@ -266,11 +232,5 @@ describe("Context Keys Manager - setKey", () => {
       value,
       "namespace"
     );
-
-    expect(setReferenceForKey).toHaveBeenCalledWith(
-      "key",
-      "namespace",
-      storageLevel
-    );
   });
 });

package/appUtils/contextKeysManager/index.ts

@@ -1,6 +1,6 @@
 import { isNil } from "@applicaster/zapp-react-native-utils/utils";
 
-import { StorageLevel, StorageType } from "./consts";
+import { StorageLevel } from "./consts";
 import {
   getNamespaceAndKey,
   keyIsValid,
@@ -59,18 +59,14 @@ type Setup = {
   sessionStorage?: Storage;
   localStorage?: Storage;
   secureStorage?: Storage;
-  referenceStorage?: Storage;
 };
 
-export const REFERENCE_NAMESPACE = "applicaster.v2.references";
-
 export class ContextKeysManager {
   private static _instance: ContextKeysManager;
   private _logger: Logger;
   private _sessionStorage: Storage;
   private _localStorage: Storage;
   private _secureStorage: Storage;
-  private _referenceStorage: Storage;
 
   public static get instance() {
     if (!this._instance) {
@@ -79,7 +75,6 @@ export class ContextKeysManager {
         sessionStorage: SessionStorage,
         localStorage: LocalStorage,
         secureStorage: SecureStorage,
-        referenceStorage: SessionStorage,
       });
 
       this._instance = instance;
@@ -94,13 +89,11 @@ export class ContextKeysManager {
     sessionStorage = SessionStorage,
     localStorage = LocalStorage,
     secureStorage = SecureStorage,
-    referenceStorage = SessionStorage,
-  }: Setup) {
+  }: Setup = {}) {
     this._logger = logger;
     this._sessionStorage = sessionStorage;
     this._localStorage = localStorage;
     this._secureStorage = secureStorage;
-    this._referenceStorage = referenceStorage;
   }
 
   private parseKey(key: KeyName): ParsedKeyAndNamespace {
@@ -119,41 +112,6 @@ export class ContextKeysManager {
     return { isValid: true, ...parsedKey };
   }
 
-  // GET
-  public async getKeyByReference(
-    key: string,
-    namespace: string
-  ): Promise<ValueOrNothing> {
-    // 1) look for storage
-    // 2) if storage found - look value in it
-    // 3) if storage not found return NOTHING
-
-    return this._referenceStorage
-      .getItem(buildNamespaceKey(key, namespace), REFERENCE_NAMESPACE)
-      .then((storage: StorageType | unknown) => {
-        switch (storage) {
-          case StorageType.session:
-            return this._sessionStorage.getItem(key, namespace);
-          case StorageType.local:
-            return this._localStorage.getItem(key, namespace);
-          case StorageType.secure:
-            return this._secureStorage.getItem(key, namespace);
-          default:
-            // unknown storage
-            return NOTHING;
-        }
-      })
-      .catch((error) => {
-        // something went wrong
-        this._logger.warn({
-          message: error.message,
-          data: { key, namespace },
-        });
-
-        return NOTHING;
-      });
-  }
-
   public async getKeys(
     keys: Array<KeyName>,
     contextObj?: { key: string; required?: boolean }[]
@@ -228,19 +186,7 @@ export class ContextKeysManager {
       return NOTHING;
     }
 
-    // at first - try to find by reference
-    // if not found, look in session > local > secure
-
-    const resultByReference = await this.getKeyByReference(
-      parsedKey,
-      parsedNamespace
-    );
-
-    if (!isNil(resultByReference)) {
-      return resultByReference;
-    }
-
-    // try to full-search
+    // look in session > local > secure
     try {
       const resultFromSessionStorage = await this._sessionStorage.getItem(
         parsedKey,
@@ -284,41 +230,6 @@ export class ContextKeysManager {
   // GET
 
   // SET
-  public async setReferenceForKey(
-    key: string,
-    namespace: string,
-    storageLevel: StorageLevel
-  ): Promise<boolean> {
-    return this._referenceStorage
-      .setItem(
-        buildNamespaceKey(key, namespace),
-        storageLevel,
-        REFERENCE_NAMESPACE
-      )
-      .then((result) => {
-        if (savingResultIsSuccess(result)) {
-          return true;
-        }
-
-        this._logger.warn({
-          message:
-            "While saving reference - reference storage return non expected value: true",
-          data: { key, namespace, storageLevel },
-        });
-
-        return false;
-      })
-      .catch((error) => {
-        // something went wrong
-        this._logger.warn({
-          message: error.message,
-          data: { key, namespace, storageLevel },
-        });
-
-        return false;
-      });
-  }
-
   // for all keys where saving were succeed return true
   // for others return false
   public async setKeys(
@@ -352,29 +263,36 @@ export class ContextKeysManager {
     }
 
     try {
+      let setItemResult: boolean;
+
       switch (storageLevel) {
         case StorageLevel.persisted:
-          return await Promise.all([
-            this._localStorage.setItem(parsedKey, value, parsedNamespace),
-            this.setReferenceForKey(parsedKey, parsedNamespace, storageLevel),
-          ]).then(([setItemResult]) => {
-            return savingResultIsSuccess(setItemResult);
-          });
+          setItemResult = await this._localStorage.setItem(
+            parsedKey,
+            value,
+            parsedNamespace
+          );
+
+          break;
         case StorageLevel.secure:
-          return await Promise.all([
-            this._secureStorage.setItem(parsedKey, value, parsedNamespace),
-            this.setReferenceForKey(parsedKey, parsedNamespace, storageLevel),
-          ]).then(([setItemResult]) => {
-            return savingResultIsSuccess(setItemResult);
-          });
+          setItemResult = await this._secureStorage.setItem(
+            parsedKey,
+            value,
+            parsedNamespace
+          );
+
+          break;
         default:
-          return await Promise.all([
-            this._sessionStorage.setItem(parsedKey, value, parsedNamespace),
-            this.setReferenceForKey(parsedKey, parsedNamespace, storageLevel),
-          ]).then(([setItemResult]) => {
-            return savingResultIsSuccess(setItemResult);
-          });
+          setItemResult = await this._sessionStorage.setItem(
+            parsedKey,
+            value,
+            parsedNamespace
+          );
+
+          break;
       }
+
+      return savingResultIsSuccess(setItemResult);
     } catch (error) {
       // something went wrong
       this._logger.warn({
@@ -388,24 +306,6 @@ export class ContextKeysManager {
   // SET
 
   // REMOVE
-  public async removeReferenceForKey(
-    key: string,
-    namespace: string
-  ): Promise<boolean> {
-    return this._referenceStorage
-      .removeItem(buildNamespaceKey(key, namespace), REFERENCE_NAMESPACE)
-      .then(() => true)
-      .catch((error) => {
-        // something went wrong
-        this._logger.warn({
-          message: error.message,
-          data: { key, namespace },
-        });
-
-        return false;
-      });
-  }
-
   public async removeKey(key: KeyName): Promise<boolean> {
     const {
       isValid: isValidKey,
@@ -422,7 +322,6 @@ export class ContextKeysManager {
       this._sessionStorage.removeItem(parsedKey, parsedNamespace),
       this._localStorage.removeItem(parsedKey, parsedNamespace),
       this._secureStorage.removeItem(parsedKey, parsedNamespace),
-      this.removeReferenceForKey(parsedKey, parsedNamespace),
     ])
       .then(() => true)
       .catch((error) => {

package/appUtils/playerManager/OverlayObserver/OverlaysObserver.ts

@@ -2,8 +2,7 @@ import { BehaviorSubject, Observable } from "rxjs";
 import { distinctUntilChanged } from "rxjs/operators";
 import { Player } from "../player";
 import { createLogger, utilsLogger } from "../../../logger";
-import { appStore } from "@applicaster/zapp-react-native-redux/AppStore";
-import { findPluginByIdentifier } from "../../../pluginUtils";
+import { getPluginByIdentifier } from "@applicaster/zapp-react-native-utils/pluginUtils";
 import {
   loadFeedEntry,
   loadFeedAndPrefetchThumbnailImage,
@@ -237,11 +236,8 @@ export class OverlaysObserver {
 
   preparePlayNext = async () => {
     try {
-      const plugins = appStore.get("plugins");
-
-      const playNextPlugin: any = findPluginByIdentifier(
-        "QuickBrickPlayNextOverlay",
-        plugins
+      const playNextPlugin: any = getPluginByIdentifier(
+        "QuickBrickPlayNextOverlay"
       );
 
       if (!playNextPlugin) {
@@ -252,10 +248,7 @@ export class OverlaysObserver {
         return;
       }
 
-      const playNextFeedUrl: string = await retrieveFeedUrl(
-        this.entry,
-        plugins
-      );
+      const playNextFeedUrl: string = await retrieveFeedUrl(this.entry);
 
       if (!playNextFeedUrl || typeof playNextFeedUrl !== "string") {
         log_debug(

package/appUtils/playerManager/OverlayObserver/__tests__/getUpcomingQueue.test.ts

@@ -0,0 +1,67 @@
+import { getUpcomingQueue } from "../getUpcomingQueue";
+
+describe("getUpcomingQueue", () => {
+  it("returns null when plugin is not provided or has no module", async () => {
+    expect(await getUpcomingQueue(undefined)).toBeNull();
+    expect(await getUpcomingQueue({} as any)).toBeNull();
+  });
+
+  it("returns null when QueueManager is not present on module", async () => {
+    const plugin = {
+      identifier: "queue-action",
+      module: {},
+    } as any;
+
+    expect(await getUpcomingQueue(plugin)).toBeNull();
+  });
+
+  it("calls setupQuickBrickQueue when QueueManager is not initialized", async () => {
+    const setupQuickBrickQueue = jest.fn();
+    const mockUpcoming = [{ id: "item_1" }];
+
+    const QueueManager = {
+      isInitialized: jest
+        .fn()
+        .mockReturnValueOnce(false)
+        .mockReturnValueOnce(true),
+      instance: {
+        getUpcomingQueue: jest.fn().mockResolvedValue(mockUpcoming),
+      },
+    };
+
+    const plugin = {
+      identifier: "queue-action",
+      module: {
+        QueueManager,
+        setupQuickBrickQueue,
+      },
+    } as any;
+
+    const result = await getUpcomingQueue(plugin);
+
+    expect(setupQuickBrickQueue).toHaveBeenCalled();
+    expect(result).toEqual(mockUpcoming);
+  });
+
+  it("returns upcoming items when QueueManager is already initialized", async () => {
+    const mockUpcoming = [{ id: "item_1" }, { id: "item_2" }];
+
+    const QueueManager = {
+      isInitialized: jest.fn().mockReturnValue(true),
+      instance: {
+        getUpcomingQueue: jest.fn().mockResolvedValue(mockUpcoming),
+      },
+    };
+
+    const plugin = {
+      identifier: "queue-action",
+      module: {
+        QueueManager,
+      },
+    } as any;
+
+    const result = await getUpcomingQueue(plugin);
+
+    expect(result).toEqual(mockUpcoming);
+  });
+});

package/appUtils/playerManager/OverlayObserver/__tests__/utils.test.ts

@@ -1,5 +1,12 @@
 import { retrieveFeedUrl, retrievePlayPreviousFeedUrl } from "../utils";
 
+// mock for import { appStore } from "@applicaster/zapp-react-native-redux/AppStore";
+jest.mock("@applicaster/zapp-react-native-redux/AppStore", () => ({
+  appStore: {
+    get: jest.fn(() => []),
+  },
+}));
+
 const entryWith = (extensions: Record<string, unknown>): ZappEntry =>
   ({ id: "1", type: { value: "video" }, extensions }) as ZappEntry;
 
@@ -7,14 +14,14 @@ describe("playlist feed url accessors", () => {
   it("returns the next feed url when present", async () => {
     const entry = entryWith({ play_next_feed_url: "https://feeds/next.json" });
 
-    await expect(retrieveFeedUrl(entry, [])).resolves.toBe(
+    await expect(retrieveFeedUrl(entry)).resolves.toBe(
       "https://feeds/next.json"
     );
   });
 
   it("resolves to null for a missing entry", async () => {
     await expect(
-      retrieveFeedUrl(undefined as unknown as ZappEntry, [])
+      retrieveFeedUrl(undefined as unknown as ZappEntry)
     ).resolves.toBeNull();
   });
 

package/appUtils/playerManager/OverlayObserver/getUpcomingQueue.ts

@@ -1,9 +1,22 @@
 export const getUpcomingQueue = async (
   plugin?: QuickBrickPlugin | ZappPlugin
 ): Promise<unknown[] | null> => {
-  const QueueManager = (plugin as any)?.module?.QueueManager;
+  const module = (plugin as any)?.module;
+  const QueueManager = module?.QueueManager;
+  const setupQuickBrickQueue = module?.setupQuickBrickQueue;
 
-  if (!QueueManager?.instance) {
+  if (!QueueManager) {
+    return null;
+  }
+
+  if (
+    !QueueManager.isInitialized?.() &&
+    typeof setupQuickBrickQueue === "function"
+  ) {
+    setupQuickBrickQueue();
+  }
+
+  if (!QueueManager.isInitialized?.()) {
     return null;
   }
 

package/appUtils/playerManager/OverlayObserver/utils.ts

@@ -59,13 +59,10 @@ export const parseTimeToSeconds = (timeStr: string): number => {
  * on playerManager, decoupling Queue playback logic entirely from OverlaysObserver (which should
  * strictly focus on recommendation visuals and chapter markers).
  */
-export const retrieveFeedUrl = async (
-  entry: ZappEntry,
-  plugins?: ZappPlugin[]
-): Promise<string> => {
+export const retrieveFeedUrl = async (entry: ZappEntry): Promise<string> => {
   if (!entry) return null;
 
-  const availablePlugins = plugins || appStore.get("plugins");
+  const availablePlugins = appStore.get("plugins");
 
   const queuePlugin = findPluginByIdentifier(
     "queue-action",

package/appUtils/playerManager/__tests__/playerDiagnostics.test.ts

@@ -0,0 +1,62 @@
+import { Player } from "../player";
+
+const entry = (id: string) => ({ id, title: id }) as unknown as ZappEntry;
+
+const makePlayer = () => {
+  const player = new Player({ playerId: "test-player" });
+  player.entry = entry("first");
+
+  return player;
+};
+
+describe("Player per-entry diagnostics", () => {
+  it("keeps the latest of onError and onVideoError, and clears it when a new entry loads", () => {
+    const player = makePlayer();
+    const second = { message: "second" };
+
+    player.onError({ message: "first" } as any);
+    player.onVideoError(second as any);
+
+    expect(player.lastError).toBe(second);
+
+    player.entry = entry("second");
+
+    expect(player.lastError).toBeNull();
+  });
+
+  it("reads the next entry without creating the overlay observer", () => {
+    const player = makePlayer();
+
+    expect(player.getPlayNextEntry()).toBeNull();
+
+    jest
+      .spyOn(player.getOverlayObservable(), "getPlayNextEntry")
+      .mockReturnValue(entry("next"));
+
+    expect(player.getPlayNextEntry()).toEqual(entry("next"));
+  });
+
+  it("keeps the content clock while a client-side ad plays", () => {
+    const player = makePlayer();
+
+    player.onVideoProgress({
+      currentTime: 300,
+      duration: 1800,
+      seekableDuration: 1800,
+    });
+
+    player.onAdBegin({});
+
+    player.onVideoProgress({
+      currentTime: 5,
+      duration: 15,
+      seekableDuration: 15,
+    });
+
+    expect(player.getPosition()).toBe(5);
+    expect(player.getDuration()).toBe(15);
+    expect(player.getContentPosition()).toBe(300);
+    expect(player.getContentDuration()).toBe(1800);
+    expect(player.getSeekableDuration()).toBe(1800);
+  });
+});