@applicaster/quick-brick-core 15.1.5-alpha.6034932020 → 15.1.5-alpha.6655775719

package/App/ActionSetters/index.ts

@@ -20,10 +20,6 @@ const warnUndefinedContext = (context) =>
     data: { context },
   });
 
-type Subscription = {
-  [x: string]: () => any;
-};
-
 const getModuleContext = R.path(["module", "context"]);
 
 const getContexts = R.compose(
@@ -63,24 +59,40 @@ 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;
+    }
+  }
 
-  const subscriptions = React.useMemo(() => {
-    if (!actionProvidersSubscriptions.length) return undefined;
-
-    return actionProvidersSubscriptions.reduce((acc, item) => {
-      const riverInitialStatePromise = item[key]?.();
-
-      if (riverInitialStatePromise) {
-        acc.push(riverInitialStatePromise);
-      }
-
-      return acc;
-    }, [] as Subscription[]);
-  }, [actionProvidersSubscriptions]);
+  if (!actionProvidersSubscriptions.length) {
+    return undefined;
+  }
 
-  if (!actionProvidersSubscriptions.length) return undefined;
-
-  return subscriptions;
+  return capturedPromisesRef.current === null
+    ? undefined
+    : capturedPromisesRef.current;
 };
 
 const getActionInitialStateSetters = (key) => {

package/App/remoteContextReloader/cachedRemoteJson.ts

@@ -0,0 +1,35 @@
+/**
+ * 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().finally(() => {
+        cache.delete(url);
+      })
+    );
+  }
+
+  return cache.get(url) as Promise<T>;
+}

package/App/remoteContextReloader/getRemoteContextData/getLegacyRemoteContextData.ts

@@ -1,15 +1,14 @@
 import * as R from "ramda";
 import { loadAppContextData } from "@applicaster/zapp-react-native-redux";
 
-import { URL_KEYS } from "../consts";
 import {
   fetchPluginConfiguration,
-  getPromiseForKey,
-  prepareRuntimeConfigurationUrls,
+  fetchAllRemoteConfigurations,
 } 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");
@@ -33,6 +32,18 @@ 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);
@@ -50,25 +61,16 @@ export async function getLegacyRemoteContextData(
     isTablet: isTabletDevice,
   });
 
-  const { preparedRuntimeConfigurationUrls, layoutData = [] } =
-    await prepareRuntimeConfigurationUrls(
-      configurationUrls || runtimeConfigurationUrls,
-      isTabletDevice
-    );
+  mark("selectLayout done");
 
-  const promises = R.compose(
-    R.map(getPromiseForKey(preparedRuntimeConfigurationUrls)),
-    R.reject(R.isNil),
-    R.keys,
-    R.pick(URL_KEYS)
-  )(preparedRuntimeConfigurationUrls);
+  const remoteDataRaw = await fetchAllRemoteConfigurations(
+    configurationUrls || runtimeConfigurationUrls,
+    isTabletDevice
+  );
 
-  const resolvedPromises = await Promise.all(promises);
+  mark("fetchAllRemoteConfigurations done");
 
-  const remoteData = R.compose(
-    buildContextData,
-    R.mergeAll
-  )([...layoutData, ...resolvedPromises]);
+  const remoteData = buildContextData(remoteDataRaw);
 
   const useTabletLayout =
     isTabletDevice &&
@@ -83,6 +85,8 @@ export async function getLegacyRemoteContextData(
       : remoteData.cellStyles,
   });
 
+  mark("cacheAssets done");
+
   const { pluginConfigurations } = cachedRemoteData;
 
   const updatedPlugins = R.map(
@@ -105,4 +109,6 @@ export async function getLegacyRemoteContextData(
     ...appProperties,
     plugins: updatedPlugins,
   });
+
+  mark("loadAppContextData done");
 }

package/App/remoteContextReloader/getRemoteContextData/getNativeRemoteContextData.ts

@@ -20,6 +20,18 @@ 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(
@@ -33,6 +45,8 @@ export async function getNativeRemoteContextData(
     "pipesEndpoints",
   ]);
 
+  mark("generalConfiguration done");
+
   loadAppContextData(dispatch, R.mergeAll([...generalConfiguration]));
 
   try {
@@ -60,7 +74,10 @@ export async function getNativeRemoteContextData(
     });
   }
 
+  mark("selectLayout done");
+
   const layout = await getPromiseForType("layout");
+  mark("layout done");
 
   const layoutLoadingErrorMessage = "Failed to load layout data";
 
@@ -79,6 +96,7 @@ export async function getNativeRemoteContextData(
   dispatch(AppData.actions.merge({ layoutVersion: apiVersion || "v1" }));
 
   const resolvedPromises = await mapPromises(getPromiseForType, ["cellStyles"]);
+  mark("cellStyles done");
 
   let optionalResolvedPromise;
 
@@ -102,6 +120,8 @@ export async function getNativeRemoteContextData(
     cellStyles: remoteData.cellStyles,
   });
 
+  mark("cacheAssets done");
+
   const { pluginConfigurations } = cachedRemoteData;
 
   const updatedPlugins = R.map(
@@ -126,4 +146,6 @@ export async function getNativeRemoteContextData(
     ...appProperties,
     plugins: updatedPlugins,
   });
+
+  mark("loadAppContextData done");
 }

package/App/remoteContextReloader/helpers.ts

@@ -2,8 +2,9 @@ import axios from "axios";
 import camelize from "camelize";
 import * as R from "ramda";
 import { NativeModules } from "react-native";
-import { URL_KEY_SUFFIX } from "./consts";
+import { URL_KEY_SUFFIX, URL_KEYS } from "./consts";
 import { sessionStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage";
+import { cachedRemoteJson } from "./cachedRemoteJson";
 
 const { AppLoaderBridge } = NativeModules;
 
@@ -27,25 +28,127 @@ export const urlKeyToContext = R.compose(
   R.replace(URL_KEY_SUFFIX, "")
 );
 
-export function getPromiseForKey(runtimeConfigurationUrls) {
-  return async function (urlKey) {
-    const context = urlKeyToContext(urlKey);
-    const url = R.prop(urlKey, runtimeConfigurationUrls);
+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];
 
-    try {
+    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);
 
-      const { data } = response;
+      return response.data;
+    });
 
-      return {
-        [context]: data,
-      };
-    } catch (e) {
-      throw new Error("cannot retrieve configuration data for " + urlKey);
-    }
+    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 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;
+    });
+
+    return {
+      ...remoteData,
+      [cellStylesContext]: cellStyles,
+    };
+  }
+
+  return remoteData;
+}
+
 export async function prepareRuntimeConfigurationUrls(
   runtimeConfigurationUrls,
   isTablet
@@ -64,31 +167,21 @@ export async function prepareRuntimeConfigurationUrls(
   const context = urlKeyToContext(layoutUrlKey);
 
   try {
-    const response = await axios.get(layoutUrl);
-    const { data } = response;
-    const layoutData = [{ [context]: data }];
-    const { id: layoutId } = data;
+    const data = await cachedRemoteJson(layoutUrl, async () => {
+      const response = await axios.get(layoutUrl);
 
-    const preparedRuntimeConfigurationUrls = { ...runtimeConfigurationUrls };
-    delete preparedRuntimeConfigurationUrls[layoutUrlKey];
+      return response.data;
+    });
 
-    if (isTablet) {
-      preparedRuntimeConfigurationUrls[REMOTE_CONFIG_KEYS.TABLET.LAYOUT] &&
-        delete preparedRuntimeConfigurationUrls[
-          REMOTE_CONFIG_KEYS.MOBILE.LAYOUT
-        ];
+    const layoutData = [{ [context]: data }];
+    const { id: layoutId } = data;
 
-      preparedRuntimeConfigurationUrls[REMOTE_CONFIG_KEYS.TABLET.CELL_STYLES] &&
-        delete preparedRuntimeConfigurationUrls[
-          REMOTE_CONFIG_KEYS.MOBILE.CELL_STYLES
-        ];
-    } else {
-      delete preparedRuntimeConfigurationUrls[REMOTE_CONFIG_KEYS.TABLET.LAYOUT];
+    const preparedRuntimeConfigurationUrls = stripOppositePlatformUrls(
+      runtimeConfigurationUrls,
+      isTablet
+    );
 
-      delete preparedRuntimeConfigurationUrls[
-        REMOTE_CONFIG_KEYS.TABLET.CELL_STYLES
-      ];
-    }
+    delete preparedRuntimeConfigurationUrls[layoutUrlKey];
 
     if (cellStylesUrl && !cellStylesUrl.includes(layoutId)) {
       const splitedUrl = cellStylesUrl.split("/");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-core",
-  "version": "15.1.5-alpha.6034932020",
+  "version": "15.1.5-alpha.6655775719",
   "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.6034932020",
-    "@applicaster/quick-brick-core-plugins": "15.1.5-alpha.6034932020",
-    "@applicaster/zapp-pipes-v2-client": "15.1.5-alpha.6034932020",
-    "@applicaster/zapp-react-native-bridge": "15.1.5-alpha.6034932020",
-    "@applicaster/zapp-react-native-redux": "15.1.5-alpha.6034932020",
-    "@applicaster/zapp-react-native-ui-components": "15.1.5-alpha.6034932020",
-    "@applicaster/zapp-react-native-utils": "15.1.5-alpha.6034932020",
+    "@applicaster/applicaster-types": "15.1.5-alpha.6655775719",
+    "@applicaster/quick-brick-core-plugins": "15.1.5-alpha.6655775719",
+    "@applicaster/zapp-pipes-v2-client": "15.1.5-alpha.6655775719",
+    "@applicaster/zapp-react-native-bridge": "15.1.5-alpha.6655775719",
+    "@applicaster/zapp-react-native-redux": "15.1.5-alpha.6655775719",
+    "@applicaster/zapp-react-native-ui-components": "15.1.5-alpha.6655775719",
+    "@applicaster/zapp-react-native-utils": "15.1.5-alpha.6655775719",
     "atob": "^2.1.2",
     "axios": "^0.28.0",
     "btoa": "^1.2.1",