@rimori/client 2.1.8 → 2.2.0-next.1

package/src/fromRimori/EventBus.ts

@@ -3,9 +3,9 @@ export type EventPayload = Record<string, any>;
 
 /**
  * Interface representing a message sent through the EventBus
- * 
+ *
  * Debug capabilities:
- * - System-wide debugging: Send an event to "global.system.requestDebug" 
+ * - System-wide debugging: Send an event to "global.system.requestDebug"
  *   Example: `EventBus.emit("yourPluginId", "global.system.requestDebug");`
  */
 export interface EventBusMessage<T = EventPayload> {
@@ -23,7 +23,9 @@ export interface EventBusMessage<T = EventPayload> {
   debug: boolean;
 }
 
-export type EventHandler<T = EventPayload> = (event: EventBusMessage<T>) => void | Promise<void>;
+export type EventHandler<T = EventPayload> = (
+  event: EventBusMessage<T>
+) => void | Promise<void>;
 
 interface Listeners<T = EventPayload> {
   id: number;
@@ -37,7 +39,10 @@ export interface EventListener {
 
 export class EventBusHandler {
   private listeners: Map<string, Set<Listeners<EventPayload>>> = new Map();
-  private responseResolvers: Map<number, (value: EventBusMessage<unknown>) => void> = new Map();
+  private responseResolvers: Map<
+    number,
+    (value: EventBusMessage<unknown>) => void
+  > = new Map();
   private static instance: EventBusHandler | null = null;
   private debugEnabled: boolean = false;
   private evName: string = "";
@@ -52,7 +57,11 @@ export class EventBusHandler {
 
       EventBusHandler.instance.on("global.system.requestDebug", () => {
         EventBusHandler.instance!.debugEnabled = true;
-        console.log(`[${EventBusHandler.instance!.evName}] Debug mode enabled. Make sure debugging messages are enabled in the browser console.`);
+        console.log(
+          `[${
+            EventBusHandler.instance!.evName
+          }] Debug mode enabled. Make sure debugging messages are enabled in the browser console.`
+        );
       });
     }
     if (name && EventBusHandler.instance.evName === "") {
@@ -61,7 +70,12 @@ export class EventBusHandler {
     return EventBusHandler.instance;
   }
 
-  private createEvent(sender: string, topic: string, data: EventPayload, eventId?: number): EventBusMessage {
+  private createEvent(
+    sender: string,
+    topic: string,
+    data: EventPayload,
+    eventId?: number
+  ): EventBusMessage {
     const generatedEventId = eventId || Math.floor(Math.random() * 10000000000);
 
     return {
@@ -80,9 +94,9 @@ export class EventBusHandler {
    * @param topic - The topic of the event.
    * @param data - The data of the event.
    * @param eventId - The event id of the event.
-   * 
+   *
    * The topic format is: **pluginId.area.action**
-   * 
+   *
    * Example topics:
    * - pl1234.card.requestHard
    * - pl1234.card.requestNew
@@ -92,11 +106,22 @@ export class EventBusHandler {
    * - pl1234.card.delete
    * - pl1234.card.triggerBackup
    */
-  public emit<T = EventPayload>(sender: string, topic: string, data?: T, eventId?: number): void {
+  public emit<T = EventPayload>(
+    sender: string,
+    topic: string,
+    data?: T,
+    eventId?: number
+  ): void {
     this.emitInternal(sender, topic, data || {}, eventId);
   }
 
-  private emitInternal(sender: string, topic: string, data: EventPayload, eventId?: number, skipResponseTrigger = false): void {
+  private emitInternal(
+    sender: string,
+    topic: string,
+    data: EventPayload,
+    eventId?: number,
+    skipResponseTrigger = false
+  ): void {
     if (!this.validateTopic(topic)) {
       this.logAndThrowError(false, `Invalid topic: ` + topic);
       return;
@@ -105,7 +130,7 @@ export class EventBusHandler {
     const event = this.createEvent(sender, topic, data, eventId);
 
     const handlers = this.getMatchingHandlers(event.topic);
-    handlers.forEach(handler => {
+    handlers.forEach((handler) => {
       if (handler.ignoreSender && handler.ignoreSender.includes(sender)) {
         // console.log("ignore event as its in the ignoreSender list", { event, ignoreList: handler.ignoreSender });
         return;
@@ -118,7 +143,11 @@ export class EventBusHandler {
     }
 
     // If it's a response to a request
-    if (eventId && this.responseResolvers.has(eventId) && !skipResponseTrigger) {
+    if (
+      eventId &&
+      this.responseResolvers.has(eventId) &&
+      !skipResponseTrigger
+    ) {
       // console.log("[Rimori] Resolving response to request: " + eventId, event.data);
       this.responseResolvers.get(eventId)!(event);
       this.responseResolvers.delete(eventId);
@@ -132,8 +161,12 @@ export class EventBusHandler {
    * @param ignoreSender - The senders to ignore.
    * @returns An EventListener object containing an off() method to unsubscribe the listeners.
    */
-  public on<T = EventPayload>(topics: string | string[], handler: EventHandler<T>, ignoreSender: string[] = []): EventListener {
-    const ids = this.toArray(topics).map(topic => {
+  public on<T = EventPayload>(
+    topics: string | string[],
+    handler: EventHandler<T>,
+    ignoreSender: string[] = []
+  ): EventListener {
+    const ids = this.toArray(topics).map((topic) => {
       this.logIfDebug(`Subscribing to ` + topic, { ignoreSender });
       if (!this.validateTopic(topic)) {
         this.logAndThrowError(true, `Invalid topic: ` + topic);
@@ -144,17 +177,42 @@ export class EventBusHandler {
       }
       const id = Math.floor(Math.random() * 10000000000);
 
-      // Type assertion to handle the generic type mismatch
-      const eventHandler = handler as unknown as EventHandler<EventPayload>;
-      this.listeners.get(topic)!.add({ id, handler: eventHandler, ignoreSender });
+      // To prevent infinite loops and processing the same eventId multiple times
+      const blackListedEventIds: { eventId: number; sender: string }[] = [];
+      const eventHandler = (data: EventBusMessage) => {
+        if (
+          blackListedEventIds.some(
+            (item) =>
+              item.eventId === data.eventId && item.sender === data.sender
+          )
+        ) {
+          console.log("BLACKLISTED EVENT ID", data.eventId, data);
+          return;
+        }
+        blackListedEventIds.push({
+          eventId: data.eventId,
+          sender: data.sender,
+        });
+        if (blackListedEventIds.length > 100) {
+          blackListedEventIds.shift();
+        }
+        return (handler as unknown as EventHandler<EventPayload>)(data);
+      };
+
+      this.listeners
+        .get(topic)!
+        .add({ id, handler: eventHandler, ignoreSender });
 
-      this.logIfDebug(`Subscribed to ` + topic, { listenerId: id, ignoreSender });
+      this.logIfDebug(`Subscribed to ` + topic, {
+        listenerId: id,
+        ignoreSender,
+      });
 
       return btoa(JSON.stringify({ topic, id }));
     });
 
     return {
-      off: () => this.off(ids)
+      off: () => this.off(ids),
     };
   }
 
@@ -165,33 +223,47 @@ export class EventBusHandler {
    * @param handler - The handler to be called when the event is received. The handler returns the data to be emitted. Can be a static object or a function.
    * @returns An EventListener object containing an off() method to unsubscribe the listeners.
    */
-  public respond(sender: string, topic: string | string[], handler: EventPayload | ((data: EventBusMessage) => EventPayload | Promise<EventPayload>)): EventListener {
+  public respond(
+    sender: string,
+    topic: string | string[],
+    handler:
+      | EventPayload
+      | ((data: EventBusMessage) => EventPayload | Promise<EventPayload>)
+  ): EventListener {
     const topics = Array.isArray(topic) ? topic : [topic];
-    const listeners = topics.map(topic => {
+    const listeners = topics.map((topic) => {
       const blackListedEventIds: number[] = [];
       //To allow event communication inside the same plugin the sender needs to be ignored but the events still need to be checked for the same event just reaching the subscriber to prevent infinite loops
       const finalIgnoreSender = !topic.startsWith("self.") ? [sender] : [];
 
-      const listener = this.on(topic, async (data: EventBusMessage) => {
-        if (blackListedEventIds.includes(data.eventId)) {
-          // console.log("BLACKLISTED EVENT ID", data.eventId);
-          return;
-        }
-        blackListedEventIds.push(data.eventId);
-        if (blackListedEventIds.length > 20) {
-          blackListedEventIds.shift();
-        }
-        const response = typeof handler === "function" ? await handler(data) : handler;
-        this.emit(sender, topic, response, data.eventId);
-      }, finalIgnoreSender);
-
-      this.logIfDebug(`Added respond listener ` + sender + " to topic " + topic, { listener, sender });
+      const listener = this.on(
+        topic,
+        async (data: EventBusMessage) => {
+          if (blackListedEventIds.includes(data.eventId)) {
+            // console.log("BLACKLISTED EVENT ID", data.eventId);
+            return;
+          }
+          blackListedEventIds.push(data.eventId);
+          if (blackListedEventIds.length > 100) {
+            blackListedEventIds.shift();
+          }
+          const response =
+            typeof handler === "function" ? await handler(data) : handler;
+          this.emit(sender, topic, response, data.eventId);
+        },
+        finalIgnoreSender
+      );
+
+      this.logIfDebug(
+        `Added respond listener ` + sender + " to topic " + topic,
+        { listener, sender }
+      );
       return {
-        off: () => listener.off()
+        off: () => listener.off(),
       };
     });
     return {
-      off: () => listeners.forEach(listener => listener.off())
+      off: () => listeners.forEach((listener) => listener.off()),
     };
   }
 
@@ -221,15 +293,18 @@ export class EventBusHandler {
    * @param listenerIds - The ids of the listeners to unsubscribe from.
    */
   private off(listenerIds: string | string[]): void {
-    this.toArray(listenerIds).forEach(fullId => {
+    this.toArray(listenerIds).forEach((fullId) => {
       const { topic, id } = JSON.parse(atob(fullId));
 
       const listeners = this.listeners.get(topic) || new Set();
 
-      listeners.forEach(listener => {
+      listeners.forEach((listener) => {
         if (listener.id === Number(id)) {
           listeners.delete(listener);
-          this.logIfDebug(`Removed listener ` + fullId, { topic, listenerId: id });
+          this.logIfDebug(`Removed listener ` + fullId, {
+            topic,
+            listenerId: id,
+          });
         }
       });
     });
@@ -246,7 +321,11 @@ export class EventBusHandler {
    * @param data - The data of the event.
    * @returns A promise that resolves to the event.
    */
-  public async request<T = EventPayload>(sender: string, topic: string, data?: EventPayload): Promise<EventBusMessage<T>> {
+  public async request<T = EventPayload>(
+    sender: string,
+    topic: string,
+    data?: EventPayload
+  ): Promise<EventBusMessage<T>> {
     if (!this.validateTopic(topic)) {
       this.logAndThrowError(true, `Invalid topic: ` + topic);
     }
@@ -255,8 +334,12 @@ export class EventBusHandler {
 
     this.logIfDebug(`Requesting data from ` + topic, { event });
 
-    return new Promise<EventBusMessage<T>>(resolve => {
-      this.responseResolvers.set(event.eventId, (value: EventBusMessage<unknown>) => resolve(value as EventBusMessage<T>));
+    return new Promise<EventBusMessage<T>>((resolve) => {
+      this.responseResolvers.set(
+        event.eventId,
+        (value: EventBusMessage<unknown>) =>
+          resolve(value as EventBusMessage<T>)
+      );
       this.emitInternal(sender, topic, data || {}, event.eventId, true);
     });
   }
@@ -271,7 +354,9 @@ export class EventBusHandler {
 
     // Find wildcard matches
     const wildcard = [...this.listeners.entries()]
-      .filter(([key]) => key.endsWith("*") && topic.startsWith(key.slice(0, -1)))
+      .filter(
+        ([key]) => key.endsWith("*") && topic.startsWith(key.slice(0, -1))
+      )
       .flatMap(([_, handlers]) => [...handlers]);
     return new Set([...exact, ...wildcard]);
   }
@@ -293,7 +378,10 @@ export class EventBusHandler {
       if (parts.length === 2 && plugin !== "*" && area === "*") {
         return true;
       }
-      this.logAndThrowError(false, `Event type must have 3 parts separated by dots. Received: ` + topic);
+      this.logAndThrowError(
+        false,
+        `Event type must have 3 parts separated by dots. Received: ` + topic
+      );
       return false;
     }
 
@@ -304,11 +392,17 @@ export class EventBusHandler {
     // Validate action part
     const validActions = ["request", "create", "update", "delete", "trigger"];
 
-    if (validActions.some(a => action.startsWith(a))) {
+    if (validActions.some((a) => action.startsWith(a))) {
       return true;
     }
 
-    this.logAndThrowError(false, `Invalid event topic name. The action: ` + action + ". Must be or start with one of: " + validActions.join(", "));
+    this.logAndThrowError(
+      false,
+      `Invalid event topic name. The action: ` +
+        action +
+        ". Must be or start with one of: " +
+        validActions.join(", ")
+    );
     return false;
   }
 
@@ -318,7 +412,10 @@ export class EventBusHandler {
     }
   }
 
-  private logAndThrowError(throwError: boolean, ...args: (string | EventPayload)[]) {
+  private logAndThrowError(
+    throwError: boolean,
+    ...args: (string | EventPayload)[]
+  ) {
     const message = `[${this.evName}] ` + args[0];
     console.error(message, ...args.slice(1));
     if (throwError) {
@@ -327,4 +424,4 @@ export class EventBusHandler {
   }
 }
 
-export const EventBus = EventBusHandler.getInstance();
+export const EventBus = EventBusHandler.getInstance();

package/src/index.ts

@@ -12,7 +12,8 @@ export { Translator } from './controller/TranslationController';
 export type { TOptions } from 'i18next';
 export type { SharedContent, SharedContentObjectRequest } from './controller/SharedContentController';
 export type { Exercise } from './controller/ExerciseController';
-export type { UserInfo, Language } from './controller/SettingsController';
+export type { UserInfo, Language, UserRole } from './controller/SettingsController';
 export type { Message, ToolInvocation } from './controller/AIController';
 export type { TriggerAction } from './controller/ExerciseController';
 export type { MacroAccomplishmentPayload, MicroAccomplishmentPayload } from './controller/AccomplishmentController';
+export type { EventBusMessage } from './fromRimori/EventBus';

package/src/plugin/CommunicationHandler.ts

@@ -32,6 +32,7 @@ export interface RimoriInfo {
   profile: UserInfo;
   mainPanelPlugin?: ActivePlugin;
   sidePanelPlugin?: ActivePlugin;
+  interfaceLanguage: string;
 }
 
 export class RimoriCommunicationHandler {
@@ -55,16 +56,18 @@ export class RimoriCommunicationHandler {
 
   private initMessageChannel(worker = false): void {
     const listener = (event: MessageEvent) => {
-      console.log('[PluginController] window message', { origin: event.origin, data: event.data });
+      // console.log('[PluginController] window message', { origin: event.origin, data: event.data });
       const { type, pluginId, queryParams, rimoriInfo } = event.data || {};
       const [transferredPort] = event.ports || [];
 
       if (type !== 'rimori:init' || !transferredPort || pluginId !== this.pluginId) {
-        console.log('[PluginController] message ignored (not init or wrong plugin)', {
-          type,
-          pluginId,
-          hasPort: !!transferredPort,
-        });
+        // console.log('[PluginController] message ignored (not init or wrong plugin)', {
+        //   type,
+        //   pluginId,
+        //   currentPluginId: this.pluginId,
+        //   hasPortProperty: !!transferredPort,
+        //   event
+        // });
         return;
       }
 
@@ -217,7 +220,7 @@ export class RimoriCommunicationHandler {
       } else {
         // In main thread context, use EventBus
         const { data } = await EventBus.request<RimoriInfo>(this.pluginId, 'global.supabase.requestAccess');
-        console.log({ data });
+        // console.log({ data });
         this.rimoriInfo = data;
         this.supabase = createClient(this.rimoriInfo.url, this.rimoriInfo.key, {
           accessToken: () => Promise.resolve(this.getToken()),

package/src/plugin/Logger.ts

@@ -1,5 +1,4 @@
 import { RimoriClient } from './RimoriClient';
-import html2canvas from 'html2canvas';
 
 type LogLevel = 'debug' | 'info' | 'warn' | 'error';
 
@@ -307,16 +306,29 @@ export class Logger {
 
   /**
    * Capture a screenshot of the current page.
+   * Dynamically imports html2canvas only in browser environments.
    * @returns Promise resolving to base64 screenshot or null if failed
    */
   private async captureScreenshot(): Promise<string | null> {
-    if (typeof window !== 'undefined' && typeof document !== 'undefined') {
+    // Only attempt to capture screenshot in browser environments
+    if (typeof window === 'undefined' || typeof document === 'undefined') {
+      return null;
+    }
+
+    try {
+      // Dynamically import html2canvas only when window is available
+      // This allows tree-shaking for environments without window (e.g., Node.js)
+      const html2canvas = (await import('html2canvas')).default;
       const canvas = await html2canvas(document.body);
       const screenshot = canvas.toDataURL('image/png');
       // this.originalConsole.log("screenshot captured", screenshot)
       return screenshot;
+    } catch (error) {
+      // html2canvas may not be available or may fail to load
+      // Silently fail to avoid breaking logging functionality
+      this.originalConsole.warn('[Rimori Logger] Failed to capture screenshot:', error);
+      return null;
     }
-    return null;
   }
 
   /**

package/src/plugin/RimoriClient.ts

@@ -43,7 +43,7 @@ export class RimoriClient {
     this.accomplishmentHandler = new AccomplishmentController(info.pluginId);
     this.settingsController = new SettingsController(supabase, info.pluginId, info.guild);
     this.sharedContentController = new SharedContentController(supabase, this);
-    this.translator = new Translator(info.profile.mother_tongue.code);
+    this.translator = new Translator(info.interfaceLanguage);
 
     //only init logger in workers and on main plugin pages
     if (this.getQueryParam('applicationMode') !== 'sidebar') {
@@ -122,7 +122,16 @@ export class RimoriClient {
       from: <ViewName extends string & keyof GenericSchema['Views'], View extends GenericSchema['Views'][ViewName]>(
         relation: string,
       ): PostgrestQueryBuilder<GenericSchema, View, ViewName> => {
-        return this.superbase.from(this.db.getTableName(relation));
+        const tableName = this.db.getTableName(relation);
+        // Use plugins schema for plugin-specific tables (those with plugin prefix pattern pl[0-9]+_*)
+        // Global tables (starting with 'global_') remain in public schema
+        // Plugin tables always have the prefix, so use plugins schema for all prefixed tables
+        if (relation.startsWith('global_')) {
+          // Global tables stay in public schema
+          return this.superbase.from(tableName);
+        }
+        // All plugin tables go to plugins schema
+        return this.superbase.schema('plugins').from(tableName);
       },
       // storage: this.superbase.storage,
       // functions: this.superbase.functions,
@@ -243,9 +252,9 @@ export class RimoriClient {
       // this needs to be a emit and on because the main panel action is triggered by the user and not by the plugin
       this.event.emit('action.requestMain');
       this.event.on<MainPanelAction>('action.requestMain', ({ data }) => {
-        console.log('Received action ' + data.action);
-        console.log('Listening to actions', listeningActions);
-        if (actionsToListen.length === 0 || actionsToListen.includes(data.action)) {
+        // console.log('Received action for main panel ' + data.action_key);
+        // console.log('Listening to actions', listeningActions);
+        if (listeningActions.length === 0 || listeningActions.includes(data.action_key)) {
           callback(data);
         }
       });
@@ -256,9 +265,10 @@ export class RimoriClient {
       // this needs to be a emit and on because the main panel action is triggered by the user and not by the plugin
       this.event.emit('action.requestSidebar');
       this.event.on<MainPanelAction>('action.requestSidebar', ({ data }) => {
-        console.log('Received action ' + data.action);
-        console.log('Listening to actions', listeningActions);
-        if (actionsToListen.length === 0 || actionsToListen.includes(data.action)) {
+        // console.log("eventHandler .onSidePanelAction", data);
+        // console.log('Received action for sidebar ' + data.action);
+        // console.log('Listening to actions', listeningActions);
+        if (listeningActions.length === 0 || listeningActions.includes(data.action)) {
           callback(data);
         }
       });
@@ -474,3 +484,4 @@ export class RimoriClient {
     },
   };
 }
+