@rimori/react-client 0.4.0-next.2 → 0.4.0-next.3

package/dist/providers/PluginProvider.d.ts

@@ -1,5 +1,6 @@
 import React, { ReactNode } from 'react';
 import { RimoriClient } from '@rimori/client';
+import type { UserInfo } from '@rimori/client';
 interface PluginProviderProps {
     children: ReactNode;
     pluginId: string;
@@ -8,5 +9,7 @@ interface PluginProviderProps {
     };
 }
 export declare const PluginProvider: React.FC<PluginProviderProps>;
-export declare const useRimori: () => RimoriClient;
+export declare const useRimori: () => RimoriClient & {
+    userInfo: UserInfo;
+};
 export {};

package/dist/providers/PluginProvider.js

@@ -18,6 +18,7 @@ export const PluginProvider = ({ children, pluginId, settings }) => {
     const [standaloneClient, setStandaloneClient] = useState(false);
     const [applicationMode, setApplicationMode] = useState(null);
     const [theme, setTheme] = useState(null);
+    const [userInfo, setUserInfo] = useState(null);
     useTheme(theme);
     const isSidebar = applicationMode === 'sidebar';
     const isSettings = applicationMode === 'settings';
@@ -33,6 +34,8 @@ export const PluginProvider = ({ children, pluginId, settings }) => {
         if ((!standaloneDetected && !client) || (standaloneDetected && standaloneClient === true)) {
             void RimoriClient.getInstance(pluginId).then((client) => {
                 setClient(client);
+                // Set initial userInfo
+                setUserInfo(client.plugin.getUserInfo());
                 // Get applicationMode and theme from MessageChannel query params
                 if (!standaloneDetected) {
                     const mode = client.getQueryParam('applicationMode');
@@ -44,6 +47,16 @@ export const PluginProvider = ({ children, pluginId, settings }) => {
             });
         }
     }, [pluginId, standaloneClient, client]);
+    // Listen for RimoriInfo updates and update userInfo
+    useEffect(() => {
+        if (!client)
+            return;
+        const unsubscribe = client.plugin.onRimoriInfoUpdate((info) => {
+            console.log('[PluginProvider] Received RimoriInfo update, updating userInfo');
+            setUserInfo(info.profile);
+        });
+        return () => unsubscribe();
+    }, [client]);
     useEffect(() => {
         if (!client)
             return;
@@ -63,17 +76,19 @@ export const PluginProvider = ({ children, pluginId, settings }) => {
                     setStandaloneClient(true);
             }) }));
     }
-    if (!client) {
+    if (!client || !userInfo) {
         return '';
     }
-    return (_jsxs(PluginContext.Provider, { value: client, children: [!(settings === null || settings === void 0 ? void 0 : settings.disableContextMenu) && !isSidebar && !isSettings && _jsx(ContextMenu, { client: client }), children] }));
+    return (_jsxs(PluginContext.Provider, { value: { client, userInfo }, children: [!(settings === null || settings === void 0 ? void 0 : settings.disableContextMenu) && !isSidebar && !isSettings && _jsx(ContextMenu, { client: client }), children] }));
 };
 export const useRimori = () => {
     const context = useContext(PluginContext);
     if (context === null) {
         throw new Error('useRimori must be used within an PluginProvider');
     }
-    return context;
+    // Return client with userInfo at root level for easy access
+    // Maintains backwards compatibility - all client properties are still accessible
+    return Object.assign(context.client, { userInfo: context.userInfo });
 };
 function getUrlParam(name) {
     // First try to get from URL hash query params (for compatibility)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rimori/react-client",
-  "version": "0.4.0-next.2",
+  "version": "0.4.0-next.3",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -23,7 +23,7 @@
     "format": "prettier --write ."
   },
   "peerDependencies": {
-    "@rimori/client": "2.4.0-next.3",
+    "@rimori/client": "2.4.0-next.4",
     "react": "^18.1.0",
     "react-dom": "^18.1.0"
   },
@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.37.0",
-    "@rimori/client": "2.4.0-next.3",
+    "@rimori/client": "2.4.0-next.4",
     "@types/react": "^18.3.21",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.4",

package/src/providers/PluginProvider.tsx

@@ -1,5 +1,6 @@
 import React, { createContext, useContext, ReactNode, useEffect, useState } from 'react';
 import { EventBusHandler, RimoriClient, StandaloneClient } from '@rimori/client';
+import type { UserInfo } from '@rimori/client';
 import ContextMenu from '../components/ContextMenu';
 import { useTheme } from '../hooks/ThemeSetter';
 
@@ -11,13 +12,19 @@ interface PluginProviderProps {
   };
 }
 
-const PluginContext = createContext<RimoriClient | null>(null);
+interface PluginContextValue {
+  client: RimoriClient;
+  userInfo: UserInfo;
+}
+
+const PluginContext = createContext<PluginContextValue | null>(null);
 
 export const PluginProvider: React.FC<PluginProviderProps> = ({ children, pluginId, settings }) => {
   const [client, setClient] = useState<RimoriClient | null>(null);
   const [standaloneClient, setStandaloneClient] = useState<StandaloneClient | boolean>(false);
   const [applicationMode, setApplicationMode] = useState<string | null>(null);
   const [theme, setTheme] = useState<string | null>(null);
+  const [userInfo, setUserInfo] = useState<UserInfo | null>(null);
 
   useTheme(theme);
 
@@ -39,6 +46,9 @@ export const PluginProvider: React.FC<PluginProviderProps> = ({ children, plugin
     if ((!standaloneDetected && !client) || (standaloneDetected && standaloneClient === true)) {
       void RimoriClient.getInstance(pluginId).then((client) => {
         setClient(client);
+        // Set initial userInfo
+        setUserInfo(client.plugin.getUserInfo());
+
         // Get applicationMode and theme from MessageChannel query params
         if (!standaloneDetected) {
           const mode = client.getQueryParam('applicationMode');
@@ -51,6 +61,18 @@ export const PluginProvider: React.FC<PluginProviderProps> = ({ children, plugin
     }
   }, [pluginId, standaloneClient, client]);
 
+  // Listen for RimoriInfo updates and update userInfo
+  useEffect(() => {
+    if (!client) return;
+
+    const unsubscribe = client.plugin.onRimoriInfoUpdate((info) => {
+      console.log('[PluginProvider] Received RimoriInfo update, updating userInfo');
+      setUserInfo(info.profile);
+    });
+
+    return (): void => unsubscribe();
+  }, [client]);
+
   useEffect(() => {
     if (!client) return;
     if (isSidebar) return; //sidebar pages should not report url changes
@@ -74,24 +96,26 @@ export const PluginProvider: React.FC<PluginProviderProps> = ({ children, plugin
     );
   }
 
-  if (!client) {
+  if (!client || !userInfo) {
     return '';
   }
 
   return (
-    <PluginContext.Provider value={client}>
+    <PluginContext.Provider value={{ client, userInfo }}>
       {!settings?.disableContextMenu && !isSidebar && !isSettings && <ContextMenu client={client} />}
       {children}
     </PluginContext.Provider>
   );
 };
 
-export const useRimori = () => {
+export const useRimori = (): RimoriClient & { userInfo: UserInfo } => {
   const context = useContext(PluginContext);
   if (context === null) {
     throw new Error('useRimori must be used within an PluginProvider');
   }
-  return context;
+  // Return client with userInfo at root level for easy access
+  // Maintains backwards compatibility - all client properties are still accessible
+  return Object.assign(context.client, { userInfo: context.userInfo }) as RimoriClient & { userInfo: UserInfo };
 };
 
 function getUrlParam(name: string): string | null {