Merge pull request #14 from LovesWorking/fix-external-device-info-crash

Fix external device info crash

Author: LovesWorking

src/react-query-external-sync/hydration.ts

@@ -49,6 +49,7 @@ function dehydrateMutation(mutation: Mutation): DehydratedMutation {
     mutationId: mutation.mutationId,
     mutationKey: mutation.options.mutationKey,
     state: mutation.state,
+    gcTime: mutation.gcTime,
     ...(mutation.options.scope && { scope: mutation.options.scope }),
     ...(mutation.meta && { meta: mutation.meta }),
   };
@@ -72,6 +73,7 @@ function dehydrateQuery(query: Query): DehydratedQuery {
     },
     queryKey: query.queryKey,
     queryHash: query.queryHash,
+    gcTime: query.gcTime,
     ...(query.meta && { meta: query.meta }),
     observers: observerStates,
   };

src/react-query-external-sync/types.ts

@@ -33,6 +33,7 @@ export interface DehydratedMutation {
   state: MutationState;
   meta?: MutationMeta;
   scope?: MutationScope;
+  gcTime?: number;
 }
 export interface DehydratedQuery {
   queryHash: string;
@@ -41,6 +42,7 @@ export interface DehydratedQuery {
   promise?: Promise<unknown>;
   meta?: QueryMeta;
   observers: ObserverState[];
+  gcTime?: number;
 }
 export interface ObserverState<
   TQueryFnData = unknown,

src/react-query-external-sync/useMySocket.ts

@@ -109,7 +109,9 @@ export function useMySocket({
             deviceName,
             deviceId: persistentDeviceId,
             platform,
-            extraDeviceInfo: JSON.stringify(extraDeviceInfo),
+            ...(extraDeviceInfo && Object.keys(extraDeviceInfo).length > 0
+              ? { extraDeviceInfo: JSON.stringify(extraDeviceInfo) }
+              : {}),
           },
           reconnection: false,
           transports: ["websocket"], // Prefer websocket transport for React Native

src/react-query-external-sync/useSyncQueriesExternal.ts

@@ -2,11 +2,11 @@ import { useEffect, useRef } from "react";
 import type { QueryKey } from "@tanstack/query-core";
 import { onlineManager, QueryClient } from "@tanstack/react-query";
 
+import { log } from "./utils/logger";
 import { Dehydrate } from "./hydration";
+import { PlatformOS } from "./platformUtils";
 import { SyncMessage } from "./types";
 import { useMySocket } from "./useMySocket";
-import { PlatformOS } from "./platformUtils";
-import { log } from "./utils/logger";
 
 /**
  * Query actions that can be performed on a query.
@@ -29,7 +29,9 @@ type QueryActions =
   | "ACTION-ONLINE-MANAGER-ONLINE" // Set online manager to online
   | "ACTION-ONLINE-MANAGER-OFFLINE" // Set online manager to offline
   // Internal action
-  | "success"; // Internal success action
+  | "success" // Internal success action
+  | "ACTION-CLEAR-MUTATION-CACHE" // Clear the mutation cache
+  | "ACTION-CLEAR-QUERY-CACHE"; // Clear the query cache
 
 /**
  * Message structure for query actions between dashboard and devices
@@ -270,6 +272,17 @@ export function useSyncQueriesExternal({
           `${logPrefix} Received query action: ${action} for query ${queryHash}`,
           enableLogs
         );
+        // If action is clear cache do the action here before moving on
+        if (action === "ACTION-CLEAR-MUTATION-CACHE") {
+          queryClient.getMutationCache().clear();
+          log(`${logPrefix} Cleared mutation cache`, enableLogs);
+          return;
+        }
+        if (action === "ACTION-CLEAR-QUERY-CACHE") {
+          queryClient.getQueryCache().clear();
+          log(`${logPrefix} Cleared query cache`, enableLogs);
+          return;
+        }
 
         const activeQuery = queryClient.getQueryCache().get(queryHash);
         if (!activeQuery) {
@@ -440,7 +453,15 @@ export function useSyncQueriesExternal({
       onlineManagerSubscription?.off();
       unsubscribe();
     };
-  }, [queryClient, socket, deviceName, isConnected, deviceId, enableLogs]);
+  }, [
+    queryClient,
+    socket,
+    deviceName,
+    isConnected,
+    deviceId,
+    enableLogs,
+    logPrefix,
+  ]);
 
   return { connect, disconnect, isConnected, socket };
 }