@rimori/client 1.2.0 → 1.3.1

package/src/providers/PluginProvider.tsx

@@ -18,10 +18,18 @@ const PluginContext = createContext<RimoriClient | null>(null);
 export const PluginProvider: React.FC<PluginProviderProps> = ({ children, pluginId, settings }) => {
   const [plugin, setPlugin] = 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 isSidebar = applicationMode === "sidebar";
+  const isSettings = applicationMode === "settings";
 
   useEffect(() => {
     initEventBus(pluginId);
-    const standaloneDetected = new URLSearchParams(window.location.search).get("secret") === null;
+    
+    // Check if we're in an iframe context - if not, we're standalone
+    const standaloneDetected = window === window.parent;
+    
     if (standaloneDetected && !standaloneClient) {
       StandaloneClient.getInstance().then(client => {
         client.needsLogin().then((needLogin) => setStandaloneClient(needLogin ? client : true));
@@ -29,7 +37,16 @@ export const PluginProvider: React.FC<PluginProviderProps> = ({ children, plugin
     }
 
     if ((!standaloneDetected && !plugin) || (standaloneDetected && standaloneClient === true)) {
-      PluginController.getInstance(pluginId, standaloneDetected).then(setPlugin);
+      PluginController.getInstance(pluginId, standaloneDetected).then(client => {
+        setPlugin(client);
+        // Get applicationMode and theme from MessageChannel query params
+        if (!standaloneDetected) {
+          const mode = client.getQueryParam("applicationMode");
+          const themeParam = client.getQueryParam("rm_theme");
+          setApplicationMode(mode);
+          setTheme(themeParam);
+        }
+      });
     }
   }, [pluginId, standaloneClient]);
 
@@ -37,11 +54,10 @@ export const PluginProvider: React.FC<PluginProviderProps> = ({ children, plugin
   useEffect(() => {
     if (!plugin) return;
 
-    const url = new URL(window.location.href);
     //sidebar pages should not report url changes
-    if (url.searchParams.get("applicationMode") === "sidebar") return;
+    if (isSidebar) return;
 
-    let lastHash = url.hash;
+    let lastHash = window.location.hash;
     const emitUrlChange = (url: string) => plugin.event.emit('session.triggerUrlChange', { url });
 
     const interval = setInterval(() => {
@@ -76,23 +92,37 @@ export const PluginProvider: React.FC<PluginProviderProps> = ({ children, plugin
 
   return (
     <PluginContext.Provider value={plugin}>
-      {!settings?.disableContextMenu && <ContextMenu client={plugin} />}
+      {!settings?.disableContextMenu && !isSidebar && !isSettings && <ContextMenu client={plugin} />}
       {children}
     </PluginContext.Provider>
   );
 };
 
-export const usePlugin = () => {
+export const useRimori = () => {
   const context = useContext(PluginContext);
   if (context === null) {
-    throw new Error('usePlugin must be used within an PluginProvider');
+    throw new Error('useRimori must be used within an PluginProvider');
   }
   return context;
 };
 
-function initEventBus(pluginId: string) {
+function getUrlParam(name: string) {
+  // First try to get from URL hash query params (for compatibility)
+  const hashParts = window.location.hash.split('?');
+  if (hashParts.length > 1) {
+    const hashParams = new URLSearchParams(hashParts[1]);
+    const hashValue = hashParams.get(name);
+    if (hashValue) return hashValue;
+  }
+  
+  // Fallback to regular URL search params
   const url = new URL(window.location.href);
-  const isSidebar = url.searchParams.get("applicationMode") === "sidebar";
+  return url.searchParams.get(name);
+}
+
+function initEventBus(pluginId: string) {
+  // For now, use URL fallback for EventBus naming - this will be updated once MessageChannel is ready
+  const isSidebar = getUrlParam("applicationMode") === "sidebar";
   EventBusHandler.getInstance("Plugin EventBus " + pluginId + " " + (isSidebar ? "sidebar" : "main"));
 }
 

package/src/worker/WorkerSetup.ts

@@ -1,36 +1,22 @@
-import { EventBus, EventBusHandler, EventBusMessage } from "../fromRimori/EventBus";
-import { PluginController } from "../plugin/PluginController";
 import { RimoriClient } from "../plugin/RimoriClient";
-
-let controller: RimoriClient | null = null;
-const listeners: ((event: { data: { event: EventBusMessage, secret: string } }) => void)[] = [];
-let debugEnabled = false;
+import { EventBusHandler } from "../fromRimori/EventBus";
+import { PluginController } from "../plugin/PluginController";
 
 /**
  * Sets up the web worker for the plugin to be able receive and send messages to Rimori.
- * @param init - The function containing the subscription logic.
+ * @param pluginId - The id of the plugin to setup the worker for.
+ * @param init - The function containing the initialization logic.
  */
-export function setupWorker(init: (controller: RimoriClient) => void | Promise<void>) {
+export async function setupWorker(pluginId: string, init: (client: RimoriClient) => void | Promise<void>) {
+  
   // Mock of the window object for the worker context to be able to use the PluginController.
   const mockWindow = {
     isWorker: true,
-    location: { search: '?secret=123' },
+    location: {},
     parent: {
-      postMessage: (message: { event: EventBusMessage }) => {
-        message.event.sender = "worker." + message.event.sender;
-        checkDebugMode(message.event);
-        logIfDebug('sending event to Rimori', message.event);
-        self.postMessage(message)
-      }
-    },
-    addEventListener: (_: string, listener: any) => {
-      listeners.push(listener);
-    },
-    APP_CONFIG: {
-      SUPABASE_URL: 'NOT_SET',
-      SUPABASE_ANON_KEY: 'NOT_SET',
-      BACKEND_URL: 'NOT_SET',
+      postMessage: () => { }
     },
+    addEventListener: () => { }
   };
 
   // Assign the mock to globalThis.
@@ -38,46 +24,11 @@ export function setupWorker(init: (controller: RimoriClient) => void | Promise<v
 
   EventBusHandler.getInstance("Worker EventBus");
 
-  // Handle init message from Rimori.
-  self.onmessage = async (response: MessageEvent) => {
-    checkDebugMode(response.data);
-    logIfDebug('Message received', response.data);
-
-    const event = response.data as EventBusMessage;
-
-    if (event.topic === 'global.worker.requestInit') {
-      if (!controller) {
-        mockWindow.APP_CONFIG.SUPABASE_URL = event.data.supabaseUrl;
-        mockWindow.APP_CONFIG.SUPABASE_ANON_KEY = event.data.supabaseAnonKey;
-        mockWindow.APP_CONFIG.BACKEND_URL = event.data.backendUrl;
-        controller = await PluginController.getInstance(event.data.pluginId);
-        logIfDebug('Worker initialized.');
-        await init(controller);
-        logIfDebug('Plugin listeners initialized.');
-      }
-      const initEvent: EventBusMessage = {
-        timestamp: new Date().toISOString(),
-        eventId: event.eventId,
-        sender: "worker." + event.sender,
-        topic: 'global.worker.requestInit',
-        data: { success: true },
-        debug: debugEnabled
-      };
-      return self.postMessage({ secret: "123", event: initEvent });
-    }
-    listeners.forEach(listener => listener({ data: { event: response.data, secret: "123" } }));
-  };
-}
+  const rimoriClient = await PluginController.getInstance(pluginId);
+  console.debug('[Worker] RimoriClient initialized.');
 
-function checkDebugMode(event: EventBusMessage) {
-  if (event.topic === 'global.system.requestDebug' || event.debug) {
-    debugEnabled = true;
-    EventBus.emit("worker", "global.system.requestDebug");
-  }
-}
+  await init(rimoriClient);
+  console.debug('[Worker] Worker initialized.');
 
-function logIfDebug(...args: any[]) {
-  if (debugEnabled) {
-    console.debug('[Worker] ' + args[0], ...args.slice(1));
-  }
+  self.postMessage({ type: "rimori:acknowledged", pluginId: pluginId });
 }