@oxyhq/services 5.4.5 → 5.4.6

package/lib/typescript/ui/hooks/useFollow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFollow.d.ts","sourceRoot":"","sources":["../../../../src/ui/hooks/useFollow.ts"],"names":[],"mappings":"AAmCA;;;;GAIG;AACH,eAAO,MAAM,SAAS,GAAI,SAAS,MAAM,GAAG,MAAM,EAAE;;;;;iCA8CF,OAAO;;;;;;;;;;;;;;;wCAqBM,MAAM;2CAcT,MAAM,aAAa,OAAO;uCAIxB,MAAM;;sCAiBb,MAAM;;;;;;;;;;;;CA8B5D,CAAC"}
+{"version":3,"file":"useFollow.d.ts","sourceRoot":"","sources":["../../../../src/ui/hooks/useFollow.ts"],"names":[],"mappings":"AAuDA;;;;GAIG;AACH,eAAO,MAAM,SAAS,GAAI,SAAS,MAAM,GAAG,MAAM,EAAE;;;;;iCA8CF,OAAO;;;;;;;;;;;;;;;wCAqBM,MAAM;2CAcT,MAAM,aAAa,OAAO;uCAIxB,MAAM;;sCAiBb,MAAM;;;;;;;;;;;;CA8B5D,CAAC"}

package/lib/typescript/ui/screens/AppInfoScreen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AppInfoScreen.d.ts","sourceRoot":"","sources":["../../../../src/ui/screens/AppInfoScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAanD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAoBtD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA+kB5C,CAAC;AA2FF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"AppInfoScreen.d.ts","sourceRoot":"","sources":["../../../../src/ui/screens/AppInfoScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAanD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAoBtD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA8jB5C,CAAC;AA2FF,eAAe,aAAa,CAAC"}

package/lib/typescript/ui/screens/FileManagementScreen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FileManagementScreen.d.ts","sourceRoot":"","sources":["../../../../src/ui/screens/FileManagementScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoD,MAAM,OAAO,CAAC;AAezE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAOtD,UAAU,yBAA0B,SAAQ,eAAe;IACvD,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,QAAA,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CA6yD7D,CAAC;AA4qBF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"FileManagementScreen.d.ts","sourceRoot":"","sources":["../../../../src/ui/screens/FileManagementScreen.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAoD,MAAM,OAAO,CAAC;AAezE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAOtD,UAAU,yBAA0B,SAAQ,eAAe;IACvD,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,QAAA,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,yBAAyB,CAyxD7D,CAAC;AA4qBF,eAAe,oBAAoB,CAAC"}

package/lib/typescript/ui/store/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/ui/store/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAEpD,UAAU,SAAS;IACjB,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAClB,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,UAAU,WAAW;IAEnB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAExC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEtC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEvC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;CACvC;AAiBD,eAAO,MAAM,iBAAiB;;;;YAEc,MAAM;iBAAe,GAAG;;;;;;;;;;EA6BnE,CAAC;AAGF,eAAO,MAAM,gBAAgB;;;;;YAGjB,MAAM;iBACD,GAAG;0BACM,OAAO;;;;;;;;;;EAkEhC,CAAC;AAwFF,eAAO,MAAQ,UAAU,6EAAE,YAAY,kFAAE,YAAY,oFAAE,MAAM,uEAAsB,CAAC;AACpF,eAAO,MAAQ,kBAAkB;YA3D0C,MAAM;iBAAe,OAAO;iCA2DpE,gBAAgB,0FAAE,gBAAgB,mFAAwB,CAAC;AAG9F,eAAO,MAAM,wBAAwB,GAAI,OAAO,SAAS,EAAE,QAAQ,MAAM,YAC5B,CAAC;AAE9C,eAAO,MAAM,KAAK;;;;;;;;oCAKhB,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC;AAC1D,MAAM,MAAM,WAAW,GAAG,OAAO,KAAK,CAAC,QAAQ,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/ui/store/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAEpD,UAAU,SAAS;IACjB,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAClB,eAAe,EAAE,OAAO,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,UAAU,WAAW;IAEnB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAExC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEtC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEvC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;CACvC;AAiBD,eAAO,MAAM,iBAAiB;;;;YAEc,MAAM;iBAAe,GAAG;;;;;;;;;;EAkCnE,CAAC;AAGF,eAAO,MAAM,gBAAgB;;;;;YAGjB,MAAM;iBACD,GAAG;0BACM,OAAO;;;;;;;;;;EAkEhC,CAAC;AAwFF,eAAO,MAAQ,UAAU,6EAAE,YAAY,kFAAE,YAAY,oFAAE,MAAM,uEAAsB,CAAC;AACpF,eAAO,MAAQ,kBAAkB;YA3D0C,MAAM;iBAAe,OAAO;iCA2DpE,gBAAgB,0FAAE,gBAAgB,mFAAwB,CAAC;AAG9F,eAAO,MAAM,wBAAwB,GAAI,OAAO,SAAS,EAAE,QAAQ,MAAM,YACzB,CAAC;AAEjD,eAAO,MAAM,KAAK;;;;;;;;oCAKhB,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC;AAC1D,MAAM,MAAM,WAAW,GAAG,OAAO,KAAK,CAAC,QAAQ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@oxyhq/services",
-    "version": "5.4.5",
+    "version": "5.4.6",
     "description": "Reusable OxyHQ module to handle authentication, user management, karma system, device-based session management and more 🚀",
     "main": "lib/commonjs/node/index.js",
     "module": "lib/module/node/index.js",

package/src/ui/components/FollowButton.tsx

@@ -142,17 +142,31 @@ const FollowButton: React.FC<FollowButtonProps> = ({
   const dispatch = useDispatch();
   const { oxyServices, isAuthenticated } = useOxy();
 
-  // Optimized single selector to prevent multiple re-renders
-  const followState = useSelector((state: RootState) => ({
-    isFollowing: state.follow.followingUsers[userId] ?? initiallyFollowing ?? false,
-    isLoading: state.follow.loadingUsers[userId] ?? false,
-    error: state.follow.errors[userId]
-  }));
-
-  // Whether the follow status has been loaded from the store
-  const isStatusKnown = useSelector((state: RootState) =>
-    Object.prototype.hasOwnProperty.call(state.follow.followingUsers, userId)
-  );
+  // Optimized single selector to prevent multiple re-renders with defensive checks
+  const followState = useSelector((state: RootState) => {
+    // Defensive check to handle cases where follow state might not be initialized yet
+    if (!state.follow) {
+      return {
+        isFollowing: initiallyFollowing ?? false,
+        isLoading: false,
+        error: null
+      };
+    }
+
+    return {
+      isFollowing: state.follow.followingUsers?.[userId] ?? initiallyFollowing ?? false,
+      isLoading: state.follow.loadingUsers?.[userId] ?? false,
+      error: state.follow.errors?.[userId] ?? null
+    };
+  });
+
+  // Whether the follow status has been loaded from the store with defensive check
+  const isStatusKnown = useSelector((state: RootState) => {
+    if (!state.follow?.followingUsers) {
+      return false;
+    }
+    return Object.prototype.hasOwnProperty.call(state.follow.followingUsers, userId);
+  });
 
   const { isFollowing, isLoading, error } = followState;
 

package/src/ui/hooks/useFollow.ts

@@ -6,9 +6,9 @@ import { useOxy } from '../context/OxyContext';
 
 // Memoized selector to prevent unnecessary re-renders
 const createFollowSelector = (userId: string) => (state: RootState) => ({
-  isFollowing: state.follow.followingUsers[userId] ?? false,
-  isLoading: state.follow.loadingUsers[userId] ?? false,
-  error: state.follow.errors[userId] ?? null,
+  isFollowing: state.follow?.followingUsers?.[userId] ?? false,
+  isLoading: state.follow?.loadingUsers?.[userId] ?? false,
+  error: state.follow?.errors?.[userId] ?? null,
 });
 
 // Memoized selector for multiple users
@@ -16,20 +16,40 @@ const createMultipleFollowSelector = (userIds: string[]) => (state: RootState) =
   const followData: Record<string, { isFollowing: boolean; isLoading: boolean; error: string | null }> = {};
   const followState = state.follow;
   
+  // Defensive check for follow state
+  if (!followState) {
+    // Return default values if follow state is not initialized
+    for (const userId of userIds) {
+      followData[userId] = {
+        isFollowing: false,
+        isLoading: false,
+        error: null,
+      };
+    }
+    
+    return {
+      followData,
+      isAnyLoading: false,
+      hasAnyError: false,
+      allFollowing: false,
+      allNotFollowing: true,
+    };
+  }
+  
   for (const userId of userIds) {
     followData[userId] = {
-      isFollowing: followState.followingUsers[userId] ?? false,
-      isLoading: followState.loadingUsers[userId] ?? false,
-      error: followState.errors[userId] ?? null,
+      isFollowing: followState.followingUsers?.[userId] ?? false,
+      isLoading: followState.loadingUsers?.[userId] ?? false,
+      error: followState.errors?.[userId] ?? null,
     };
   }
   
   return {
     followData,
-    isAnyLoading: userIds.some(uid => followState.loadingUsers[uid]),
-    hasAnyError: userIds.some(uid => followState.errors[uid]),
-    allFollowing: userIds.every(uid => followState.followingUsers[uid]),
-    allNotFollowing: userIds.every(uid => !followState.followingUsers[uid]),
+    isAnyLoading: userIds.some(uid => followState.loadingUsers?.[uid]),
+    hasAnyError: userIds.some(uid => followState.errors?.[uid]),
+    allFollowing: userIds.every(uid => followState.followingUsers?.[uid]),
+    allNotFollowing: userIds.every(uid => !followState.followingUsers?.[uid]),
   };
 };
 

package/src/ui/screens/AppInfoScreen.tsx

@@ -69,18 +69,15 @@ const AppInfoScreen: React.FC<BaseScreenProps> = ({
         // Check API connection on mount
         const checkConnection = async () => {
             setConnectionStatus('checking');
-            const apiBaseUrl = oxyServices?.getBaseURL() || 'https://api.oxy.so';
+
+            if (!oxyServices) {
+                setConnectionStatus('disconnected');
+                return;
+            }
+
             try {
-                const response = await fetch(`${apiBaseUrl}/`, {
-                    method: 'GET',
-                    timeout: 3000,
-                } as any);
-
-                if (response.ok) {
-                    setConnectionStatus('connected');
-                } else {
-                    setConnectionStatus('disconnected');
-                }
+                await oxyServices.healthCheck();
+                setConnectionStatus('connected');
             } catch (error) {
                 setConnectionStatus('disconnected');
             }
@@ -121,22 +118,11 @@ const AppInfoScreen: React.FC<BaseScreenProps> = ({
             toast.info('Running system checks...', { duration: 2000 });
 
             try {
-                const response = await fetch(`${apiBaseUrl}/`, {
-                    method: 'GET',
-                    timeout: 5000,
-                } as any);
-
-                if (response.ok) {
-                    const data = await response.json();
-                    checks.push('✅ API server is responding');
-                    checks.push(`📊 Server stats: ${data.users || 0} users`);
-                    checks.push(`🌐 API URL: ${apiBaseUrl}`);
-                    setConnectionStatus('connected');
-                } else {
-                    checks.push('❌ API server returned error status');
-                    checks.push(`   Status: ${response.status} ${response.statusText}`);
-                    setConnectionStatus('disconnected');
-                }
+                const data = await oxyServices.healthCheck();
+                checks.push('✅ API server is responding');
+                checks.push(`📊 Server stats: ${data.users || 0} users`);
+                checks.push(`🌐 API URL: ${apiBaseUrl}`);
+                setConnectionStatus('connected');
             } catch (error) {
                 checks.push('❌ API server connection failed');
                 checks.push(`   Error: ${error instanceof Error ? error.message : 'Unknown error'}`);
@@ -514,20 +500,17 @@ const AppInfoScreen: React.FC<BaseScreenProps> = ({
                         }
                         onPress={async () => {
                             setConnectionStatus('checking');
-                            const apiBaseUrl = oxyServices?.getBaseURL() || 'https://api.oxy.so';
+
+                            if (!oxyServices) {
+                                setConnectionStatus('disconnected');
+                                toast.error('OxyServices not initialized');
+                                return;
+                            }
+
                             try {
-                                const response = await fetch(`${apiBaseUrl}/`, {
-                                    method: 'GET',
-                                    timeout: 3000,
-                                } as any);
-
-                                if (response.ok) {
-                                    setConnectionStatus('connected');
-                                    toast.success('API connection successful');
-                                } else {
-                                    setConnectionStatus('disconnected');
-                                    toast.error(`API server error: ${response.status}`);
-                                }
+                                await oxyServices.healthCheck();
+                                setConnectionStatus('connected');
+                                toast.success('API connection successful');
                             } catch (error) {
                                 setConnectionStatus('disconnected');
                                 toast.error('Failed to connect to API server');