@applicaster/quick-brick-core 15.1.5-alpha.7597480209 → 15.1.5-rc.1

package/App/ActionSetters/index.ts

@@ -20,6 +20,10 @@ const warnUndefinedContext = (context) =>
     data: { context },
   });
 
+type Subscription = {
+  [x: string]: () => any;
+};
+
 const getModuleContext = R.path(["module", "context"]);
 
 const getContexts = R.compose(
@@ -59,40 +63,24 @@ const useSubscribeToActionProviders = () => {
 export const useRiverInitialState = () => {
   const key = "getRiverInitialState";
   const actionProvidersSubscriptions = useSubscribeToActionProviders();
-  // Capture river-init promises once. Re-calling getRiverInitialState() on every
-  // context re-render causes thrash and can drop already-completed observables.
-  // Plugins should return Promise.resolve() when already initialized (not undefined).
-  const capturedPromisesRef = React.useRef<Promise<unknown>[] | null>(null);
-
-  if (
-    capturedPromisesRef.current === null &&
-    actionProvidersSubscriptions.length > 0
-  ) {
-    const providersWithMethod = actionProvidersSubscriptions.filter(
-      (item) => item?.[key]
-    );
-
-    const promises = providersWithMethod
-      .map((item) => item[key]())
-      .filter(Boolean) as Promise<unknown>[];
-
-    // Lock when every river-init provider returned a promise, or none expose it.
-    // Retry while a provider still returns undefined (getInitialState not started).
-    if (
-      providersWithMethod.length === 0 ||
-      promises.length === providersWithMethod.length
-    ) {
-      capturedPromisesRef.current = promises;
-    }
-  }
 
-  if (!actionProvidersSubscriptions.length) {
-    return undefined;
-  }
+  const subscriptions = React.useMemo(() => {
+    if (!actionProvidersSubscriptions.length) return undefined;
+
+    return actionProvidersSubscriptions.reduce((acc, item) => {
+      const riverInitialStatePromise = item[key]?.();
 
-  return capturedPromisesRef.current === null
-    ? undefined
-    : capturedPromisesRef.current;
+      if (riverInitialStatePromise) {
+        acc.push(riverInitialStatePromise);
+      }
+
+      return acc;
+    }, [] as Subscription[]);
+  }, [actionProvidersSubscriptions]);
+
+  if (!actionProvidersSubscriptions.length) return undefined;
+
+  return subscriptions;
 };
 
 const getActionInitialStateSetters = (key) => {

package/App/remoteContextReloader/getRemoteContextData/getLegacyRemoteContextData.ts

@@ -1,14 +1,15 @@
 import * as R from "ramda";
 import { loadAppContextData } from "@applicaster/zapp-react-native-redux";
 
+import { URL_KEYS } from "../consts";
 import {
   fetchPluginConfiguration,
-  fetchAllRemoteConfigurations,
+  getPromiseForKey,
+  prepareRuntimeConfigurationUrls,
 } from "../helpers";
 import { isTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
 import { Dimensions } from "react-native";
 import { cacheAssets } from "../../AssetCache";
-import { logger } from "@applicaster/zapp-react-native-utils/logger";
 
 const buildContextData = (remoteData) => {
   const { width, height } = Dimensions.get("window");
@@ -32,18 +33,6 @@ export async function getLegacyRemoteContextData(
   runtimeConfigurationUrls,
   plugins
 ) {
-  const t0 = performance.now();
-
-  const mark = (label: string) => {
-    logger.log({
-      message: `[PERF][remote] ${label} +${Math.round(
-        performance.now() - t0
-      )}ms`,
-    });
-  };
-
-  mark("start");
-
   const layoutManagerPlugin = R.find(
     R.pathSatisfies(R.is(Function), ["module", "selectLayout"])
   )(plugins);
@@ -61,16 +50,25 @@ export async function getLegacyRemoteContextData(
     isTablet: isTabletDevice,
   });
 
-  mark("selectLayout done");
+  const { preparedRuntimeConfigurationUrls, layoutData = [] } =
+    await prepareRuntimeConfigurationUrls(
+      configurationUrls || runtimeConfigurationUrls,
+      isTabletDevice
+    );
 
-  const remoteDataRaw = await fetchAllRemoteConfigurations(
-    configurationUrls || runtimeConfigurationUrls,
-    isTabletDevice
-  );
+  const promises = R.compose(
+    R.map(getPromiseForKey(preparedRuntimeConfigurationUrls)),
+    R.reject(R.isNil),
+    R.keys,
+    R.pick(URL_KEYS)
+  )(preparedRuntimeConfigurationUrls);
 
-  mark("fetchAllRemoteConfigurations done");
+  const resolvedPromises = await Promise.all(promises);
 
-  const remoteData = buildContextData(remoteDataRaw);
+  const remoteData = R.compose(
+    buildContextData,
+    R.mergeAll
+  )([...layoutData, ...resolvedPromises]);
 
   const useTabletLayout =
     isTabletDevice &&
@@ -85,8 +83,6 @@ export async function getLegacyRemoteContextData(
       : remoteData.cellStyles,
   });
 
-  mark("cacheAssets done");
-
   const { pluginConfigurations } = cachedRemoteData;
 
   const updatedPlugins = R.map(
@@ -109,6 +105,4 @@ export async function getLegacyRemoteContextData(
     ...appProperties,
     plugins: updatedPlugins,
   });
-
-  mark("loadAppContextData done");
 }

package/App/remoteContextReloader/getRemoteContextData/getNativeRemoteContextData.ts

@@ -20,18 +20,6 @@ export async function getNativeRemoteContextData(
   runtimeConfigurationUrls,
   plugins
 ) {
-  const t0 = performance.now();
-
-  const mark = (label: string) => {
-    logger.log({
-      message: `[PERF][remote-native] ${label} +${Math.round(
-        performance.now() - t0
-      )}ms`,
-    });
-  };
-
-  mark("start");
-
   const { width, height } = Dimensions.get("window");
 
   const isTabletDevice = isTablet(
@@ -45,8 +33,6 @@ export async function getNativeRemoteContextData(
     "pipesEndpoints",
   ]);
 
-  mark("generalConfiguration done");
-
   loadAppContextData(dispatch, R.mergeAll([...generalConfiguration]));
 
   try {
@@ -74,10 +60,7 @@ export async function getNativeRemoteContextData(
     });
   }
 
-  mark("selectLayout done");
-
   const layout = await getPromiseForType("layout");
-  mark("layout done");
 
   const layoutLoadingErrorMessage = "Failed to load layout data";
 
@@ -96,7 +79,6 @@ export async function getNativeRemoteContextData(
   dispatch(AppData.actions.merge({ layoutVersion: apiVersion || "v1" }));
 
   const resolvedPromises = await mapPromises(getPromiseForType, ["cellStyles"]);
-  mark("cellStyles done");
 
   let optionalResolvedPromise;
 
@@ -120,8 +102,6 @@ export async function getNativeRemoteContextData(
     cellStyles: remoteData.cellStyles,
   });
 
-  mark("cacheAssets done");
-
   const { pluginConfigurations } = cachedRemoteData;
 
   const updatedPlugins = R.map(
@@ -146,6 +126,4 @@ export async function getNativeRemoteContextData(
     ...appProperties,
     plugins: updatedPlugins,
   });
-
-  mark("loadAppContextData done");
 }

package/App/remoteContextReloader/helpers.ts

@@ -2,9 +2,8 @@ import axios from "axios";
 import camelize from "camelize";
 import * as R from "ramda";
 import { NativeModules } from "react-native";
-import { URL_KEY_SUFFIX, URL_KEYS } from "./consts";
+import { URL_KEY_SUFFIX } from "./consts";
 import { sessionStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage";
-import { cachedRemoteJson } from "./cachedRemoteJson";
 
 const { AppLoaderBridge } = NativeModules;
 
@@ -28,125 +27,23 @@ export const urlKeyToContext = R.compose(
   R.replace(URL_KEY_SUFFIX, "")
 );
 
-function stripOppositePlatformUrls(runtimeConfigurationUrls, isTablet) {
-  const preparedRuntimeConfigurationUrls = { ...runtimeConfigurationUrls };
-
-  if (isTablet) {
-    if (preparedRuntimeConfigurationUrls[REMOTE_CONFIG_KEYS.TABLET.LAYOUT]) {
-      delete preparedRuntimeConfigurationUrls[REMOTE_CONFIG_KEYS.MOBILE.LAYOUT];
-    }
-
-    if (
-      preparedRuntimeConfigurationUrls[REMOTE_CONFIG_KEYS.TABLET.CELL_STYLES]
-    ) {
-      delete preparedRuntimeConfigurationUrls[
-        REMOTE_CONFIG_KEYS.MOBILE.CELL_STYLES
-      ];
-    }
-  } else {
-    delete preparedRuntimeConfigurationUrls[REMOTE_CONFIG_KEYS.TABLET.LAYOUT];
-
-    delete preparedRuntimeConfigurationUrls[
-      REMOTE_CONFIG_KEYS.TABLET.CELL_STYLES
-    ];
-  }
-
-  return preparedRuntimeConfigurationUrls;
-}
-
-async function fetchJsonByUrlKey(runtimeConfigurationUrls, urlKey) {
-  const context = urlKeyToContext(urlKey);
-  const url = R.prop(urlKey, runtimeConfigurationUrls);
-
-  try {
-    const data = await cachedRemoteJson(url, async () => {
-      const response = await axios.get(url);
-
-      return response.data;
-    });
-
-    return {
-      [context]: data,
-    };
-  } catch (e) {
-    throw new Error("cannot retrieve configuration data for " + urlKey);
-  }
-}
-
 export function getPromiseForKey(runtimeConfigurationUrls) {
   return async function (urlKey) {
-    return fetchJsonByUrlKey(runtimeConfigurationUrls, urlKey);
-  };
-}
-
-/**
- * Fetches layout + remaining remote JSON in parallel.
- * If cell_styles URL is out of sync with layout.id, refetches cells only.
- */
-export async function fetchAllRemoteConfigurations(
-  runtimeConfigurationUrls,
-  isTablet
-) {
-  const layoutUrlKey = isTablet
-    ? REMOTE_CONFIG_KEYS.TABLET.LAYOUT
-    : REMOTE_CONFIG_KEYS.MOBILE.LAYOUT;
+    const context = urlKeyToContext(urlKey);
+    const url = R.prop(urlKey, runtimeConfigurationUrls);
 
-  const cellStylesUrlKey = isTablet
-    ? REMOTE_CONFIG_KEYS.TABLET.CELL_STYLES
-    : REMOTE_CONFIG_KEYS.MOBILE.CELL_STYLES;
-
-  const layoutUrl = R.prop(layoutUrlKey, runtimeConfigurationUrls);
-  const cellStylesUrl = R.prop(cellStylesUrlKey, runtimeConfigurationUrls);
-  const layoutContext = urlKeyToContext(layoutUrlKey);
-  const cellStylesContext = urlKeyToContext(cellStylesUrlKey);
-
-  const preparedRuntimeConfigurationUrls = stripOppositePlatformUrls(
-    runtimeConfigurationUrls,
-    isTablet
-  );
-
-  const keys = R.compose(
-    R.reject(R.isNil),
-    R.keys,
-    R.pick(URL_KEYS)
-  )(preparedRuntimeConfigurationUrls);
-
-  if (!layoutUrl) {
-    const resolvedPromises = await Promise.all(
-      keys.map(getPromiseForKey(preparedRuntimeConfigurationUrls))
-    );
-
-    return R.mergeAll(resolvedPromises);
-  }
-
-  const resolvedPromises = await Promise.all(
-    keys.map(getPromiseForKey(preparedRuntimeConfigurationUrls))
-  );
-
-  const remoteData = R.mergeAll(resolvedPromises);
-  const layout = remoteData[layoutContext];
-  const layoutId = layout?.id;
-
-  if (cellStylesUrl && layoutId && !cellStylesUrl.includes(layoutId)) {
-    const splitedUrl = cellStylesUrl.split("/");
-    const oldLayoutId = splitedUrl[splitedUrl.length - 2];
-    const correctedUrl = cellStylesUrl.replace(oldLayoutId, layoutId);
-
-    await sessionStorage.setItem("rivers_configuration_id", layoutId);
-
-    const cellStyles = await cachedRemoteJson(correctedUrl, async () => {
-      const response = await axios.get(correctedUrl);
-
-      return response.data;
-    });
+    try {
+      const response = await axios.get(url);
 
-    return {
-      ...remoteData,
-      [cellStylesContext]: cellStyles,
-    };
-  }
+      const { data } = response;
 
-  return remoteData;
+      return {
+        [context]: data,
+      };
+    } catch (e) {
+      throw new Error("cannot retrieve configuration data for " + urlKey);
+    }
+  };
 }
 
 export async function prepareRuntimeConfigurationUrls(
@@ -167,22 +64,32 @@ export async function prepareRuntimeConfigurationUrls(
   const context = urlKeyToContext(layoutUrlKey);
 
   try {
-    const data = await cachedRemoteJson(layoutUrl, async () => {
-      const response = await axios.get(layoutUrl);
-
-      return response.data;
-    });
-
+    const response = await axios.get(layoutUrl);
+    const { data } = response;
     const layoutData = [{ [context]: data }];
     const { id: layoutId } = data;
 
-    const preparedRuntimeConfigurationUrls = stripOppositePlatformUrls(
-      runtimeConfigurationUrls,
-      isTablet
-    );
-
+    const preparedRuntimeConfigurationUrls = { ...runtimeConfigurationUrls };
     delete preparedRuntimeConfigurationUrls[layoutUrlKey];
 
+    if (isTablet) {
+      preparedRuntimeConfigurationUrls[REMOTE_CONFIG_KEYS.TABLET.LAYOUT] &&
+        delete preparedRuntimeConfigurationUrls[
+          REMOTE_CONFIG_KEYS.MOBILE.LAYOUT
+        ];
+
+      preparedRuntimeConfigurationUrls[REMOTE_CONFIG_KEYS.TABLET.CELL_STYLES] &&
+        delete preparedRuntimeConfigurationUrls[
+          REMOTE_CONFIG_KEYS.MOBILE.CELL_STYLES
+        ];
+    } else {
+      delete preparedRuntimeConfigurationUrls[REMOTE_CONFIG_KEYS.TABLET.LAYOUT];
+
+      delete preparedRuntimeConfigurationUrls[
+        REMOTE_CONFIG_KEYS.TABLET.CELL_STYLES
+      ];
+    }
+
     if (cellStylesUrl && !cellStylesUrl.includes(layoutId)) {
       const splitedUrl = cellStylesUrl.split("/");
       const oldLayoutId = splitedUrl[splitedUrl.length - 2];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-core",
-  "version": "15.1.5-alpha.7597480209",
+  "version": "15.1.5-rc.1",
   "description": "Core package for Applicaster's Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -28,13 +28,13 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "15.1.5-alpha.7597480209",
-    "@applicaster/quick-brick-core-plugins": "15.1.5-alpha.7597480209",
-    "@applicaster/zapp-pipes-v2-client": "15.1.5-alpha.7597480209",
-    "@applicaster/zapp-react-native-bridge": "15.1.5-alpha.7597480209",
-    "@applicaster/zapp-react-native-redux": "15.1.5-alpha.7597480209",
-    "@applicaster/zapp-react-native-ui-components": "15.1.5-alpha.7597480209",
-    "@applicaster/zapp-react-native-utils": "15.1.5-alpha.7597480209",
+    "@applicaster/applicaster-types": "15.1.5-rc.1",
+    "@applicaster/quick-brick-core-plugins": "15.1.5-rc.1",
+    "@applicaster/zapp-pipes-v2-client": "15.1.5-rc.1",
+    "@applicaster/zapp-react-native-bridge": "15.1.5-rc.1",
+    "@applicaster/zapp-react-native-redux": "15.1.5-rc.1",
+    "@applicaster/zapp-react-native-ui-components": "15.1.5-rc.1",
+    "@applicaster/zapp-react-native-utils": "15.1.5-rc.1",
     "atob": "^2.1.2",
     "axios": "^0.28.0",
     "btoa": "^1.2.1",

package/App/remoteContextReloader/cachedRemoteJson.ts

@@ -1,37 +0,0 @@
-/**
- * Boot-time dedupe for remote JSON GETs.
- * Shared across packages via globalThis so layout-manager + core
- * don't double-fetch the same URL during startup.
- */
-declare global {
-  // eslint-disable-next-line no-var
-  var __QB_REMOTE_JSON_INFLIGHT__: Map<string, Promise<unknown>> | undefined;
-}
-
-export function cachedRemoteJson<T>(
-  url: string,
-  fetcher: () => Promise<T>
-): Promise<T> {
-  if (!url) {
-    return fetcher();
-  }
-
-  if (!globalThis.__QB_REMOTE_JSON_INFLIGHT__) {
-    globalThis.__QB_REMOTE_JSON_INFLIGHT__ = new Map();
-  }
-
-  const cache = globalThis.__QB_REMOTE_JSON_INFLIGHT__;
-
-  if (!cache.has(url)) {
-    cache.set(
-      url,
-      fetcher().catch((error) => {
-        cache.delete(url);
-
-        throw error;
-      })
-    );
-  }
-
-  return cache.get(url) as Promise<T>;
-}