@chrryai/chrry 1.7.38 → 1.7.40

package/dist/index.d.mts

@@ -1629,13 +1629,14 @@ declare const getApps: ({ API_URL, token, chrryUrl, appId, }: {
     error: string;
     status: number;
 }>;
-declare const getApp: ({ API_URL, token, appId, chrryUrl, skipCache, pathname, }: {
+declare const getApp: ({ API_URL, token, appId, chrryUrl, skipCache, pathname, storeSlug, }: {
     API_URL?: string;
     token: string;
     appId?: string;
     chrryUrl?: string;
     pathname?: string;
     skipCache?: boolean;
+    storeSlug?: string;
 }) => Promise<appWithStore>;
 declare const getTranslations: ({ API_URL, token, locale, }?: {
     API_URL?: string;

package/dist/index.d.ts

@@ -1629,13 +1629,14 @@ declare const getApps: ({ API_URL, token, chrryUrl, appId, }: {
     error: string;
     status: number;
 }>;
-declare const getApp: ({ API_URL, token, appId, chrryUrl, skipCache, pathname, }: {
+declare const getApp: ({ API_URL, token, appId, chrryUrl, skipCache, pathname, storeSlug, }: {
     API_URL?: string;
     token: string;
     appId?: string;
     chrryUrl?: string;
     pathname?: string;
     skipCache?: boolean;
+    storeSlug?: string;
 }) => Promise<appWithStore>;
 declare const getTranslations: ({ API_URL, token, locale, }?: {
     API_URL?: string;

package/dist/index.js

@@ -2434,7 +2434,8 @@ var init_lib = __esm({
       appId,
       chrryUrl,
       skipCache,
-      pathname
+      pathname,
+      storeSlug
     }) => {
       const params = new URLSearchParams();
       if (chrryUrl) params.append("chrryUrl", chrryUrl);
@@ -3264,7 +3265,7 @@ var init_utils = __esm({
     };
     isFirefox = typeof navigator !== "undefined" && navigator?.userAgent?.includes("Firefox");
     config = getSiteConfig(getClientHostname2());
-    VERSION = config.version || "1.7.38";
+    VERSION = config.version || "1.7.40";
     getSlugFromPathname = (path) => {
       return getAppAndStoreSlugs(path, {
         defaultAppSlug: config.slug,
@@ -23806,6 +23807,33 @@ function AuthProvider({
       setIsCookieReady(true);
     }
   }, [isExtension2]);
+  const merge = (prevApps, newApps) => {
+    const existingAppsMap = new Map(prevApps.map((app2) => [app2.id, app2]));
+    newApps.forEach((newApp2) => {
+      const existingApp = existingAppsMap.get(newApp2.id);
+      if (newApp2.name === "MyAgent") {
+      }
+      if (existingApp && hasStoreApps(newApp2)) {
+        existingAppsMap.set(newApp2.id, newApp2);
+      } else {
+        existingAppsMap.set(newApp2.id, newApp2);
+      }
+    });
+    return Array.from(existingAppsMap.values());
+  };
+  const [userBaseApp, setUserBaseApp] = (0, import_react20.useState)(
+    session2?.userBaseApp
+  );
+  const userBaseStore = userBaseApp?.store;
+  const [guestBaseApp, setGuestBaseApp] = (0, import_react20.useState)(
+    session2?.guestBaseApp
+  );
+  const accountApp = userBaseApp || guestBaseApp;
+  const setBaseAccountApp = (app2) => {
+    user && setUserBaseApp(app2);
+    guest && setGuestBaseApp(app2);
+  };
+  const guestBaseStore = guestBaseApp?.store;
   function processSession(sessionData2) {
     if (sessionData2) {
       setSession(sessionData2);
@@ -23876,15 +23904,40 @@ function AuthProvider({
       removeParams("signIn");
     }
   };
+  const [newApp, setNewApp] = (0, import_react20.useState)(void 0);
+  const [updatedApp, setUpdatedApp] = (0, import_react20.useState)(
+    void 0
+  );
+  const [loadingAppId, setLoadingAppId] = (0, import_react20.useState)(
+    void 0
+  );
+  const allApps = merge(
+    session2?.app?.store?.apps || [],
+    userBaseApp ? [userBaseApp] : guestBaseApp ? [guestBaseApp] : []
+  );
+  const [storeApps, setAllApps] = (0, import_react20.useState)(allApps);
+  const getAppSlug2 = (targetApp, defaultSlug = "/") => getAppSlug_default({ targetApp, defaultSlug, pathname, baseApp });
+  const baseAppInternal = storeApps.find((item) => {
+    if (!item) return false;
+    if (siteConfig.slug === item.slug && item.store?.slug === siteConfig.storeSlug) {
+      return true;
+    }
+  });
+  const [baseApp, setBaseApp] = (0, import_react20.useState)(
+    baseAppInternal
+  );
+  const [app, setAppInternal] = (0, import_react20.useState)(props.app || session2?.app || baseApp);
+  const appId = newApp?.id || updatedApp?.id || loadingAppId || app?.id;
+  const [isSavingApp, setIsSavingApp] = (0, import_react20.useState)(false);
+  const [isManagingApp, setIsManagingApp] = (0, import_react20.useState)(false);
   const {
     data: sessionSwr,
     mutate: refetchSession,
     isLoading: isSessionLoading,
     error: sessionError
   } = (0, import_swr.default)(
-    (isExtension2 ? isStorageReady && isCookieReady : true) && fingerprint && token && deviceId && shouldFetchSession && !isRemovingApp ? "session" : null,
+    (isExtension2 ? isStorageReady && isCookieReady : true) && fingerprint && token && deviceId && shouldFetchSession && !isRemovingApp && !isSavingApp && !isManagingApp ? "session" : null,
     async () => {
-      console.log(`\u{1F680} ~ fingerprint:`, fingerprint);
       try {
         const result = await getSession({
           deviceId,
@@ -24008,54 +24061,11 @@ function AuthProvider({
       isPWA
     });
   };
-  const merge = (prevApps, newApps) => {
-    const existingAppsMap = new Map(prevApps.map((app2) => [app2.id, app2]));
-    newApps.forEach((newApp2) => {
-      const existingApp = existingAppsMap.get(newApp2.id);
-      if (newApp2.name === "MyAgent") {
-      }
-      if (existingApp && hasStoreApps(newApp2)) {
-        existingAppsMap.set(newApp2.id, newApp2);
-      } else {
-        existingAppsMap.set(newApp2.id, newApp2);
-      }
-    });
-    return Array.from(existingAppsMap.values());
-  };
-  const [userBaseApp, setUserBaseApp] = (0, import_react20.useState)(
-    session2?.userBaseApp
-  );
-  const userBaseStore = userBaseApp?.store;
-  const [guestBaseApp, setGuestBaseApp] = (0, import_react20.useState)(
-    session2?.guestBaseApp
-  );
-  const accountApp = userBaseApp || guestBaseApp;
-  const setBaseAccountApp = (app2) => {
-    user && setUserBaseApp(app2);
-    guest && setGuestBaseApp(app2);
-  };
-  const guestBaseStore = guestBaseApp?.store;
-  const allApps = merge(
-    sessionData?.app?.store?.apps || [],
-    userBaseApp ? [userBaseApp] : guestBaseApp ? [guestBaseApp] : []
-  );
-  const [storeApps, setAllApps] = (0, import_react20.useState)(allApps);
-  const getAppSlug2 = (targetApp, defaultSlug = "/") => getAppSlug_default({ targetApp, defaultSlug, pathname, baseApp });
-  const baseAppInternal = storeApps.find((item) => {
-    if (!item) return false;
-    if (siteConfig.slug === item.slug && item.store?.slug === siteConfig.storeSlug) {
-      return true;
-    }
-  });
-  const [baseApp, setBaseApp] = (0, import_react20.useState)(
-    baseAppInternal
-  );
   (0, import_react20.useEffect)(() => {
     hasStoreApps(baseAppInternal) && setBaseApp(baseAppInternal);
   }, [baseAppInternal]);
   const threadId = getThreadId(pathname);
   const threadIdRef = (0, import_react20.useRef)(threadId);
-  const [app, setAppInternal] = (0, import_react20.useState)(props.app || session2?.app || baseApp);
   (0, import_react20.useEffect)(() => {
     const signInParam = searchParams.get("signIn");
     const currentPart = signInParam;
@@ -24177,10 +24187,6 @@ function AuthProvider({
     "lastAppId",
     void 0
   );
-  const [newApp, setNewApp] = (0, import_react20.useState)(void 0);
-  const [updatedApp, setUpdatedApp] = (0, import_react20.useState)(
-    void 0
-  );
   const mergeApps = (0, import_react20.useCallback)(
     (newApps) => {
       setAllApps(merge(storeApps, newApps));
@@ -24193,9 +24199,6 @@ function AuthProvider({
     shouldFetchSession && await refetchSession();
   };
   const [isSplash, setIsSplash] = (0, import_react20.useState)(true);
-  const [loadingAppId, setLoadingAppId] = (0, import_react20.useState)(
-    void 0
-  );
   const [loadingApp, setLoadingAppInternal] = (0, import_react20.useState)(void 0);
   const setLoadingApp = (appWithStore) => {
     setLoadingAppId(appWithStore?.id);
@@ -24207,8 +24210,6 @@ function AuthProvider({
   const sushi = storeApps?.find((app2) => app2.slug === "sushi");
   const focus2 = storeApps?.find((app2) => app2.slug === "focus");
   const accountAppId = userBaseApp?.id || guestBaseApp?.id;
-  const appId = newApp?.id || updatedApp?.id || loadingAppId || app?.id;
-  const [isManagingApp, setIsManagingApp] = (0, import_react20.useState)(false);
   const {
     data: storeAppsSwr,
     mutate: refetchApps,
@@ -24216,29 +24217,24 @@ function AuthProvider({
   } = (0, import_swr.default)(token && !isRemovingApp && ["app", appId], async () => {
     try {
       if (!token) return;
-      const app2 = await getApp({
+      const result = await getApp({
         token,
         appId,
         chrryUrl,
         pathname,
-        skipCache: !!accountAppId || appId === accountAppId || !!newApp?.id || isManagingApp
+        skipCache: appId !== app?.id || appId === accountAppId
       });
-      return app2;
+      return result;
     } catch (error2) {
       captureException(error2);
     }
   });
-  (0, import_react20.useEffect)(() => {
-    if (newApp?.id || updatedApp?.id) {
-      refetchApps();
-    }
-  }, [newApp?.id, updatedApp?.id]);
   (0, import_react20.useEffect)(() => {
     if (storeAppsSwr) {
       storeAppsSwr.store?.apps?.find((app2) => app2.id === loadingAppId) && setLoadingApp(void 0);
       mergeApps(storeAppsSwr.store?.apps || []);
     }
-  }, [storeAppsSwr, guest, user, newApp, updatedApp, loadingAppId]);
+  }, [storeAppsSwr]);
   const canShowFocus = !!(focus2 && app && app?.id === focus2.id && !threadId);
   const [showFocus, setShowFocus] = (0, import_react20.useState)(canShowFocus);
   (0, import_react20.useEffect)(() => {
@@ -24548,7 +24544,6 @@ function AuthProvider({
       console.warn("PerformanceObserver not supported:", error2);
     }
   }, [track]);
-  const [isSavingApp, setIsSavingApp] = (0, import_react20.useState)(false);
   const [shouldFetchTasks, setShouldFetchTasks] = (0, import_react20.useState)(false);
   const [isLoadingTasks, setIsLoadingTasks] = (0, import_react20.useState)(false);
   const { data: tasksData, mutate: refetchTasks } = (0, import_swr.default)(
@@ -24864,7 +24859,7 @@ function DataProvider({ children, ...rest }) {
   const [instructions, setInstructions] = (0, import_react21.useState)([]);
   const [affiliateStats, setAffiliateStats] = (0, import_react21.useState)(null);
   const [loadingAffiliateStats, setLoadingAffiliateStats] = (0, import_react21.useState)(false);
-  const VERSION4 = "1.7.38";
+  const VERSION4 = "1.7.40";
   const [weather, setWeather] = useLocalStorage2("weather", user?.weather || guest?.weather || void 0);
   const {
     API_URL: API_URL2,
@@ -26029,7 +26024,7 @@ function AppProvider({ children }) {
       Object.entries(payload).forEach(([key, value]) => {
         newSearchParams.set(key, String(value));
       });
-      const slug2 = userBaseApp?.store?.slug || guestBaseApp?.store?.slug || baseApp?.store?.slug;
+      const slug2 = baseApp?.store?.slug;
       const newUrl = `/${slug2 === chrry?.slug ? "" : slug2 ?? chrry?.slug}/${app?.slug}?${newSearchParams.toString()}`;
       push(newUrl);
     } else {
@@ -27075,10 +27070,10 @@ function ChatProvider({
   }, [appStatus?.part]);
   const [shouldFetchThread, setShouldFetchThread] = (0, import_react29.useState)(!auth.threadData);
   (0, import_react29.useEffect)(() => {
-    if (threadId && auth?.threadData?.thread.id !== threadId && !shouldFetchThread) {
+    if (threadId && !shouldFetchThread) {
       setShouldFetchThread(true);
     }
-  }, [threadId, auth?.threadData?.thread.id, shouldFetchThread]);
+  }, [threadId, shouldFetchThread]);
   const [until, setUntil] = (0, import_react29.useState)(1);
   const [liked, setLiked] = (0, import_react29.useState)(void 0);
   const [isLoading, setIsLoading] = (0, import_react29.useState)(!!threadId);