@applicaster/zapp-react-native-bridge 13.0.0-rc.1 → 13.0.0-rc.100

package/Favorites/__tests__/__snapshots__/favorites.test.ts.snap

@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`getAllFavorites returns all favorites 1`] = `
-Array [
-  Object {
+[
+  {
     "foo": "bar",
     "id": "A123",
   },
-  Object {
+  {
     "foo": "baz",
     "id": "B456",
   },

package/Favorites/__tests__/favorites.test.ts

@@ -1,90 +1,86 @@
 import * as R from "ramda";
 
-const {
+import {
   favoritesListener,
   isFavorite,
   setAsFavorite,
   removeFromFavorites,
   getAllFavorites,
-} = require("../index");
+} from "..";
+
+import { localStorage } from "../../ZappStorage/LocalStorage";
+import { bridgeLogger } from "../../logger";
 
-const { localStorage } = require("../../ZappStorage/LocalStorage");
 const namespace = "local_favourites";
 
 const REMOVE_ERROR = new Error(
   "entry with id I throw when retrieved is not in the favourites list"
 );
 
-const { bridgeLogger } = require("../../logger");
-
 const GET_ERROR = new Error("could not get item");
 const SET_ERROR = new Error("could not set item");
 
-const item = {
+const item: any = {
   id: "A123",
   foo: "bar",
 };
 
-const item2 = {
+const item2: any = {
   id: "B456",
   foo: "baz",
 };
 
-const itemThatThrowsGet = {
+const itemThatThrowsGet: any = {
   id: "I throw when retrieved",
 };
 
-const itemThatThrowsSet = {
+const itemThatThrowsSet: any = {
   id: "I throw when set",
 };
 
-jest.mock("../../ZappStorage/LocalStorage", () => {
-  let storage = {};
-
-  return {
-    localStorage: {
-      setItem: jest.fn((key, value, namespace) => {
-        if (R.includes(itemThatThrowsSet, value)) {
-          throw SET_ERROR;
-        }
-
-        if (!storage[namespace]) {
-          storage[namespace] = {};
-        }
-
-        storage[namespace][key] = value;
-
-        return Promise.resolve(true);
-      }),
-      getItem: jest.fn((key, namespace) => {
-        const values = storage[namespace]?.[key] || [];
-
-        if (R.includes(itemThatThrowsGet, values)) {
-          throw GET_ERROR;
-        }
-
-        return Promise.resolve(values);
-      }),
-      __reset: () => {
-        storage = {};
-      },
-    },
-  };
+let mockStorage = {};
+
+const mockSetItem = jest.fn((key, value, namespace) => {
+  if (R.includes(itemThatThrowsSet, value)) {
+    throw SET_ERROR;
+  }
+
+  if (!mockStorage[namespace]) {
+    mockStorage[namespace] = {};
+  }
+
+  mockStorage[namespace][key] = value;
+
+  return Promise.resolve(true);
+});
+
+const mockGetItem = jest.fn((key, namespace) => {
+  const values = mockStorage[namespace]?.[key] || [];
+
+  if (R.includes(itemThatThrowsGet, values)) {
+    throw GET_ERROR;
+  }
+
+  return Promise.resolve(values);
 });
 
+jest.spyOn(localStorage, "setItem").mockImplementation(mockSetItem);
+jest.spyOn(localStorage, "getItem").mockImplementation(mockGetItem);
+
 jest.mock("../../logger", () => ({
   bridgeLogger: {
+    ...jest.requireActual("../../logger").bridgeLogger,
     error: jest.fn(),
   },
 }));
 
 beforeEach(() => {
+  mockStorage = {};
   bridgeLogger.error.mockClear();
 });
 
 describe("isFavorite", () => {
   beforeEach(() => {
-    localStorage.__reset();
     localStorage.setItem("favourites", [item], namespace);
   });
 
@@ -104,10 +100,6 @@ describe("isFavorite", () => {
 });
 
 describe("setAsFavorite", () => {
-  beforeEach(() => {
-    localStorage.__reset();
-  });
-
   it("rejects when it throws", async () => {
     await expect(setAsFavorite(itemThatThrowsSet)).rejects.toEqual(SET_ERROR);
     expect(bridgeLogger.error).toHaveBeenCalledWith(SET_ERROR);
@@ -124,7 +116,6 @@ describe("setAsFavorite", () => {
 
 describe("removeFromFavorites", () => {
   beforeEach(() => {
-    localStorage.__reset();
     localStorage.setItem("favourites", [item], namespace);
   });
 
@@ -148,7 +139,6 @@ describe("removeFromFavorites", () => {
 
 describe("getAllFavorites", () => {
   beforeEach(() => {
-    localStorage.__reset();
     localStorage.setItem("favourites", [item, item2], namespace);
   });
 
@@ -164,15 +154,15 @@ describe("getAllFavorites", () => {
 });
 
 describe("favouritesListener", () => {
-  beforeEach(() => {
-    localStorage.__reset();
-  });
-
   it("allows to register a listener called when favourites are changed", async () => {
     const listener = jest.fn();
     favoritesListener.on("FAVORITES_CHANGED", listener);
-    await setAsFavorite(item);
+    jest.clearAllMocks();
+    await setAsFavorite({ ...item, id: "A1234" });
 
-    return expect(listener).toHaveBeenCalledWith([item], expect.any(Function));
+    return expect(listener).toHaveBeenCalledWith(
+      [{ ...item, id: "A1234" }],
+      expect.any(Function)
+    );
   });
 });

package/OfflineAssets/__tests__/__snapshots__/fileManager.test.ts.snap

@@ -3,7 +3,7 @@
 exports[`fileManager deleteFolders deletes each provided path 1`] = `true`;
 
 exports[`fileManager storeFiles calls the store file function of the native module with the provided args 1`] = `
-Object {
+{
   "http://file": true,
   "http://file2": true,
 }

package/OfflineAssets/__tests__/__snapshots__/utils.test.ts.snap

@@ -1,19 +1,19 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`collectAssets collects asset information from config files 1`] = `
-Array [
-  Object {
+[
+  {
     "file": "/nativ/path/files/f5f757ab2a29a4b611a116682d5117a9.jpg",
-    "path": Array [
+    "path": [
       "screen1",
       "asset",
     ],
     "source": "files",
     "url": "http://img.com/asset.jpg",
   },
-  Object {
+  {
     "file": "/nativ/path/files/12b7aa4be9b486035922c2536c15154a.png",
-    "path": Array [
+    "path": [
       "plugins",
       "plugin_asset",
     ],
@@ -24,11 +24,11 @@ Array [
 `;
 
 exports[`remapAssetPath remaps the asset url 1`] = `
-Object {
-  "plugins": Object {
+{
+  "plugins": {
     "plugin_asset": "file://asset.png",
   },
-  "screen1": Object {
+  "screen1": {
     "asset": "file://asset.jpg",
     "title": "title",
   },

package/OfflineAssets/index.ts

@@ -85,37 +85,40 @@ export const remapAssetPath = (
 ): Record<string, any> => {
   const startTime = performance.now();
 
-  const result = assets.reduce((obj, { path, url }) => {
-    const localFile = localFiles[url];
-
-    if (!localFile) {
-      bridgeLogger.warning({
-        message: `remapAssetPath: Could not replace asset with local file for url: ${url}`,
-        data: { path, obj },
-      });
+  const result = assets.reduce(
+    (obj, { path, url }) => {
+      const localFile = localFiles[url];
+
+      if (!localFile) {
+        bridgeLogger.warning({
+          message: `remapAssetPath: Could not replace asset with local file for url: ${url}`,
+          data: { path, obj },
+        });
+
+        return obj;
+      }
+
+      let target = obj;
+
+      // Traverse the path to the appropriate nested object
+      for (let i = 0; i < path.length - 1; i++) {
+        target = target[path[i]] = target[path[i]];
+      }
+
+      if (!target) {
+        bridgeLogger.error({
+          message: `remapAssetPath: Could not find path ${path.join(".")}`,
+          data: obj,
+        });
+      } else {
+        // Set the final value
+        target[path[path.length - 1]] = localFile;
+      }
 
       return obj;
-    }
-
-    let target = obj;
-
-    // Traverse the path to the appropriate nested object
-    for (let i = 0; i < path.length - 1; i++) {
-      target = target[path[i]] = target[path[i]];
-    }
-
-    if (!target) {
-      bridgeLogger.error({
-        message: `remapAssetPath: Could not find path ${path.join(".")}`,
-        data: obj,
-      });
-    } else {
-      // Set the final value
-      target[path[path.length - 1]] = localFile;
-    }
-
-    return obj;
-  }, JSON.parse(JSON.stringify(source)));
+    },
+    JSON.parse(JSON.stringify(source))
+  );
 
   bridgeLogger.log({
     message: `remapAssetPath: remapping took ${

package/PluginManager/index.ts

@@ -105,9 +105,8 @@ async function isPluginEnabled(identifier) {
     return isPluginEnabledNative(identifier);
   }
 
-  const enabledInConfigurationJSON = await isPluginSupportToggleLogic(
-    identifier
-  );
+  const enabledInConfigurationJSON =
+    await isPluginSupportToggleLogic(identifier);
 
   if (enabledInConfigurationJSON !== undefined) {
     const enabledOverriden = await localStorage.getItem(

package/PushNotifications/PushTopicManager.ts

@@ -40,7 +40,7 @@ export class PushTopicManager {
     return this.pushTopicSubject;
   };
 
-  notifyTagsChange = () => {
+  private notifyTagsChange = () => {
     this.pushTopicSubject.next(this.registeredTags);
   };
 

package/QuickBrick/__tests__/__snapshots__/quickBrickModule_noModule.test.ts.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`when QuickBrickCommunication Module is undefined getAppData returns the default values 1`] = `
-Object {
+{
   "accountId": 667,
   "accountsAccountId": "5ae06cef8fba0f00084bd3c6",
   "broadcasterId": 770,

package/QuickBrick/__tests__/quickBrickModule_noModule.test.ts

@@ -1,6 +1,5 @@
-const { NativeModules } = require("react-native");
-
-NativeModules.Foo = jest.fn();
+import { sendQuickBrickEvent, getAppData, getLegacyInitialProps } from "../";
+import { bridgeLogger } from "../../logger";
 
 jest.mock("../../logger", () => ({
   bridgeLogger: {
@@ -8,25 +7,17 @@ jest.mock("../../logger", () => ({
   },
 }));
 
-const {
-  sendQuickBrickEvent,
-  getAppData,
-  getLegacyInitialProps,
-} = require("../");
-
-const eventName = "event";
 const payload = {};
 
-const { bridgeLogger } = require("../../logger");
-
 describe("when QuickBrickCommunication Module is undefined", () => {
-  beforeEach(() => {
-    jest.unmock("react-native");
-    jest.resetModules();
+  beforeAll(() => {
+    require("react-native").NativeModules.QuickBrickCommunicationModule =
+      undefined;
   });
 
   describe("sendQuickBrickEvent", () => {
     it("throws an error", () => {
+      const eventName = "event";
       expect(() => sendQuickBrickEvent(eventName, payload)).toThrow();
     });
   });

package/QuickBrick/index.ts

@@ -28,7 +28,6 @@ export interface QuickBrickCommunicationModuleI extends AppData {
 }
 
 const { NativeModules } = require("react-native");
-const { QuickBrickCommunicationModule } = NativeModules;
 
 /**
  * sends an event to the native QuickBrick manager module
@@ -42,9 +41,7 @@ export function sendQuickBrickEvent(
   eventName: QuickBrickEvent,
   payload: { [key: string]: any } = {}
 ): void {
-  const QBNativeModule =
-    QuickBrickCommunicationModule ||
-    NativeModules.QuickBrickCommunicationModule;
+  const QBNativeModule = NativeModules.QuickBrickCommunicationModule;
 
   if (!QBNativeModule) {
     throw new Error("QuickBrickCommunicationModule not found");
@@ -81,18 +78,21 @@ export function getAppData(): AppData {
     try {
       const uuid = window.localStorage.uuid || uuidv4();
       window.localStorage.setItem("uuid", uuid);
-      QuickBrickCommunicationModule.uuid = uuid;
+      NativeModules.QuickBrickCommunicationModule.uuid = uuid;
     } catch (error) {
       bridgeLogger.error({ message: "cannot set device uuid", error });
     }
   }
 
   if (
-    QuickBrickCommunicationModule &&
+    NativeModules.QuickBrickCommunicationModule &&
     R.allPass(R.map(R.has, APP_PROPERTY_KEYS))
   ) {
     // $FlowFixMe - CORRECT DECLARATIONS PLZ ! KTHXBYE
-    return R.pick(APP_PROPERTY_KEYS, QuickBrickCommunicationModule);
+    return R.pick(
+      APP_PROPERTY_KEYS,
+      NativeModules.QuickBrickCommunicationModule
+    );
   } else {
     // TODO: in the end, we probably want to throw if the constants are not defined from the native side
     // for now, stubbing values is good enough
@@ -106,8 +106,8 @@ export function getAppData(): AppData {
 }
 
 export function getLegacyInitialProps() {
-  if (QuickBrickCommunicationModule) {
-    return QuickBrickCommunicationModule.initialProps;
+  if (NativeModules.QuickBrickCommunicationModule) {
+    return NativeModules.QuickBrickCommunicationModule.initialProps;
   }
 
   bridgeLogger.warning("QuickBrickCommunicationModule not found");

package/ZappStorage/StorageSingleSelectProvider.ts

@@ -0,0 +1,108 @@
+import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
+import { bridgeLogger } from "../logger";
+import { BehaviorSubject } from "rxjs";
+import { localStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage";
+import { getNamespaceAndKey } from "@applicaster/zapp-react-native-utils/appUtils/contextKeysManager/utils";
+
+export const { log_verbose, log_debug, log_warning, log_info, log_error } =
+  createLogger({
+    category: "StorageSingleValueProvider",
+    subsystem: "zapp-react-native-bridge",
+    parent: bridgeLogger,
+  });
+
+export interface SingleValueProvider {
+  getObservable(): BehaviorSubject<string | null>;
+
+  setValue(value: string): Promise<void>;
+  getValue(): string | null;
+  getValueAsync(): Promise<string | null>;
+  clearValue(): Promise<void>;
+}
+
+interface StorageListenerArgs {
+  value: string | null;
+}
+
+export class StorageSingleValueProvider implements SingleValueProvider {
+  // Static cache of providers by namespace
+  private static singleValueProviders: Record<
+    string,
+    StorageSingleValueProvider
+  > = {};
+
+  public static getProvider(keyNamespace: string): StorageSingleValueProvider {
+    if (!this.singleValueProviders[keyNamespace]) {
+      this.singleValueProviders[keyNamespace] = new StorageSingleValueProvider(
+        keyNamespace
+      );
+    }
+
+    return this.singleValueProviders[keyNamespace];
+  }
+
+  private valueSubject: BehaviorSubject<string | null>;
+
+  private readonly key: string;
+  private readonly namespace: string;
+
+  private constructor(keyNamespace: string) {
+    const { namespace, key } = getNamespaceAndKey(keyNamespace);
+
+    if (!key) {
+      throw new Error("StorageSingleValueProvider: Key is required");
+    }
+
+    this.key = key;
+    this.namespace = namespace;
+    localStorage.addListener?.({ key, namespace }, this.reloadValue);
+
+    this.valueSubject = new BehaviorSubject<string | null>(null);
+
+    void this.getValueAsync();
+    log_debug("StorageSingleValueProvider: Initializing");
+  }
+
+  private reloadValue = async ({ value }: StorageListenerArgs) => {
+    log_debug(`reloadValue: request to reload value: ${value}`);
+
+    this.valueSubject.next(value);
+  };
+
+  public getObservable = (): BehaviorSubject<string | null> =>
+    this.valueSubject;
+
+  private async updateValueAndNotifyObservers(value: string | null) {
+    if (value === null) {
+      await localStorage.removeItem(this.key, this.namespace);
+    } else {
+      await localStorage.setItem(this.key, value, this.namespace);
+    }
+
+    this.valueSubject.next(value);
+  }
+
+  public setValue = async (value: string): Promise<void> => {
+    log_debug(`setValue: Setting new value: ${value}`);
+
+    await this.updateValueAndNotifyObservers(value);
+  };
+
+  public clearValue = async (): Promise<void> => {
+    await localStorage.removeItem(this.key, this.namespace);
+    log_debug("clearValue: Removing value");
+
+    this.valueSubject.next(null);
+  };
+
+  public getValueAsync = async (): Promise<string | null> => {
+    const value = await localStorage.getItem(this.key, this.namespace);
+    this.valueSubject.next(value);
+
+    return value;
+  };
+
+  public getValue = (): string | null => {
+    return this.valueSubject.getValue();
+  };
+}

package/ZappStorage/__tests__/localStorage.test.ts

@@ -1,12 +1,6 @@
 import { localStorage as NativeLocalStorage } from "../__mocks__/ios";
 import { DEFAULT_NAMESPACE } from "../__mocks__/storageMock";
 
-const { localStorage } = require("../LocalStorage");
-
-const RN = require("react-native");
-
-RN.NativeModules.LocalStorage = NativeLocalStorage;
-
 const test_key = "test_key";
 const test_value = "test_value";
 const namespaced_key = "namespaced_key";
@@ -23,7 +17,17 @@ function setUpStorage() {
   NativeLocalStorage.setItem(obj_key, JSON.stringify(obj_value));
 }
 
+const RN = require("react-native");
+
+RN.NativeModules.LocalStorage = NativeLocalStorage;
+
 describe("localStorage", () => {
+  const { localStorage } = require("../LocalStorage");
+
+  beforeAll(() => {
+    jest.resetModules();
+  });
+
   describe("setItem", () => {
     beforeEach(async () => {
       NativeLocalStorage.__clear();

package/ZappStorage/__tests__/localStorageAndroid.test.ts

@@ -1,7 +1,5 @@
 import { localStorage as NativeLocalStorage } from "../__mocks__/android";
 
-const { localStorage } = require("../LocalStorage");
-
 const RN = require("react-native");
 
 RN.NativeModules.LocalStorage = NativeLocalStorage;
@@ -24,6 +22,7 @@ function setUpStorage() {
 }
 
 describe("localStorage - getAllItems", () => {
+  const { localStorage } = require("../LocalStorage");
   beforeAll(setUpStorage);
 
   it("retrieves all values", async () => {

package/ZappStorage/errors.ts

@@ -28,7 +28,7 @@ export function throwUndefinedKeyError(storage: string, message: string) {
 }
 
 class UndefinedValueError extends Error {
-  constructor(message, storage: string, key) {
+  constructor(message, _storage: string, key) {
     super(message);
     logError(message, this, { key });
   }

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@applicaster/zapp-react-native-bridge",
-  "version": "13.0.0-rc.1",
+  "version": "13.0.0-rc.100",
   "description": "Applicaster Zapp React Native modules",
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {
-    "test": "jest -w=2",
     "build": "echo 'skipping ts build for core packages'"
   },
   "publishConfig": {
@@ -33,14 +32,18 @@
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
     "@applicaster/zapp-pipes-dev-kit": "1.4.7",
-    "@applicaster/zapp-react-native-utils": "13.0.0-rc.1",
+    "@applicaster/zapp-react-native-utils": "13.0.0-rc.100",
     "md5": "^2.3.0",
     "uuid": "^3.3.2"
   },
   "peerDependencies": {
-    "@types/node": "*",
-    "@types/react-native": "0.69.6",
-    "react": "17.0.2",
-    "react-native": "0.68.6"
+    "@applicaster/zapp-pipes-v2-client": "*",
+    "@react-native-community/netinfo": "*",
+    "immer": "*",
+    "react": "*",
+    "react-native": "*",
+    "uglify-js": "*",
+    "validate-color": "*",
+    "zustand": "*"
   }
 }