@rimori/client 2.2.0 → 2.3.0-next.2

package/dist/plugin/CommunicationHandler.js

@@ -26,15 +26,17 @@ export class RimoriCommunicationHandler {
     }
     initMessageChannel(worker = false) {
         const listener = (event) => {
-            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;
             }
             this.queryParams = queryParams || {};
@@ -182,7 +184,7 @@ export class RimoriCommunicationHandler {
                 else {
                     // In main thread context, use EventBus
                     const { data } = yield EventBus.request(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/dist/plugin/Logger.d.ts

@@ -54,6 +54,7 @@ export declare class Logger {
     private getBrowserInfo;
     /**
      * 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 captureScreenshot;

package/dist/plugin/Logger.js

@@ -7,7 +7,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import html2canvas from 'html2canvas';
 /**
  * Singleton Logger class for Rimori client plugins.
  * Handles all logging levels, production filtering, and log transmission to Rimori.
@@ -242,17 +241,30 @@ 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
      */
     captureScreenshot() {
         return __awaiter(this, void 0, void 0, function* () {
-            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
+                // html2canvas is an optional peer dependency - provided by @rimori/react-client
+                // In worker builds, this import should be marked as external to prevent bundling
+                const html2canvas = (yield import('html2canvas')).default;
                 const canvas = yield html2canvas(document.body);
                 const screenshot = canvas.toDataURL('image/png');
                 // this.originalConsole.log("screenshot captured", screenshot)
                 return screenshot;
             }
-            return null;
+            catch (error) {
+                // html2canvas may not be available (e.g., in workers or when not installed)
+                // Silently fail to avoid breaking logging functionality
+                return null;
+            }
         });
     }
     /**

package/dist/plugin/RimoriClient.d.ts

@@ -22,6 +22,11 @@ export declare class RimoriClient {
     private constructor();
     get plugin(): {
         pluginId: string;
+        /**
+         * The release channel of this plugin installation.
+         * Determines which database schema is used for plugin tables.
+         */
+        releaseChannel: "alpha" | "beta" | "stable";
         /**
          * Set the settings for the plugin.
          * @param settings The settings to set.
@@ -67,6 +72,13 @@ export declare class RimoriClient {
          * The table prefix for of database tables of the plugin.
          */
         tablePrefix: string;
+        /**
+         * The database schema used for plugin tables.
+         * Determined by rimori-main based on release channel:
+         * - 'plugins_alpha' for alpha release channel
+         * - 'plugins' for beta and stable release channels
+         */
+        schema: "plugins" | "plugins_alpha";
         /**
          * Get the table name for a given plugin table.
          * Internally all tables are prefixed with the plugin id. This function is used to get the correct table name for a given public table.

package/dist/plugin/RimoriClient.js

@@ -101,9 +101,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('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);
                     }
                 });
@@ -113,9 +113,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('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);
                     }
                 });
@@ -272,11 +273,12 @@ export class RimoriClient {
         this.rimoriInfo = info;
         this.superbase = supabase;
         this.pluginController = controller;
-        this.exerciseController = new ExerciseController(supabase);
+        this.exerciseController = new ExerciseController(supabase, this);
         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.interfaceLanguage);
+        const currentPlugin = info.installedPlugins.find((plugin) => plugin.id === info.pluginId);
+        this.translator = new Translator(info.interfaceLanguage, (currentPlugin === null || currentPlugin === void 0 ? void 0 : currentPlugin.endpoint) || '');
         //only init logger in workers and on main plugin pages
         if (this.getQueryParam('applicationMode') !== 'sidebar') {
             Logger.getInstance(this);
@@ -285,6 +287,11 @@ export class RimoriClient {
     get plugin() {
         return {
             pluginId: this.rimoriInfo.pluginId,
+            /**
+             * The release channel of this plugin installation.
+             * Determines which database schema is used for plugin tables.
+             */
+            releaseChannel: this.rimoriInfo.releaseChannel,
             /**
              * Set the settings for the plugin.
              * @param settings The settings to set.
@@ -337,7 +344,16 @@ export class RimoriClient {
             //   relation: ViewName,
             // ): PostgrestQueryBuilder<GenericSchema, View, ViewName>;
             from: (relation) => {
-                return this.superbase.from(this.db.getTableName(relation));
+                const tableName = this.db.getTableName(relation);
+                // Use the schema determined by rimori-main based on release channel
+                // Global tables (starting with 'global_') remain in public schema
+                // Plugin tables use the schema provided by rimori-main (plugins or plugins_alpha)
+                if (relation.startsWith('global_')) {
+                    // Global tables stay in public schema
+                    return this.superbase.from(tableName);
+                }
+                // Plugin tables go to the schema provided by rimori-main
+                return this.superbase.schema(this.rimoriInfo.dbSchema).from(tableName);
             },
             // storage: this.superbase.storage,
             // functions: this.superbase.functions,
@@ -345,6 +361,13 @@ export class RimoriClient {
              * The table prefix for of database tables of the plugin.
              */
             tablePrefix: this.rimoriInfo.tablePrefix,
+            /**
+             * The database schema used for plugin tables.
+             * Determined by rimori-main based on release channel:
+             * - 'plugins_alpha' for alpha release channel
+             * - 'plugins' for beta and stable release channels
+             */
+            schema: this.rimoriInfo.dbSchema,
             /**
              * Get the table name for a given plugin table.
              * Internally all tables are prefixed with the plugin id. This function is used to get the correct table name for a given public table.

package/example/worker/vite.config.ts

@@ -14,6 +14,9 @@ export default defineConfig({
     outDir: path.resolve(__dirname, '../public'),
     emptyOutDir: false,
     rollupOptions: {
+      // Exclude DOM-only libraries that can't run in workers
+      // html2canvas is provided by @rimori/react-client for browser contexts
+      external: ['html2canvas'],
       output: {
         inlineDynamicImports: true,
         entryFileNames: 'web-worker.js',

package/package.json

@@ -1,8 +1,13 @@
 {
   "name": "@rimori/client",
-  "version": "2.2.0",
+  "version": "2.3.0-next.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/rimori-org/rimori-client.git"
+  },
+  "license": "apache-2.0",
   "bin": {
     "rimori-release": "./dist/cli/scripts/release/release.js",
     "rimori-init": "./dist/cli/scripts/init/main.js"
@@ -32,6 +37,7 @@
     "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-react-hooks": "^7.0.0",
     "eslint-plugin-react-refresh": "^0.4.23",
+    "html2canvas": "^1.4.1",
     "globals": "^16.4.0",
     "prettier": "^3.6.2",
     "typescript": "^5.7.2",

package/src/controller/ExerciseController.ts

@@ -1,4 +1,5 @@
 import { SupabaseClient } from '@supabase/supabase-js';
+import { RimoriClient } from '../plugin/RimoriClient';
 
 export type TriggerAction = { action_key: string } & Record<string, string | number | boolean>;
 
@@ -27,9 +28,11 @@ export interface Exercise {
 
 export class ExerciseController {
   private supabase: SupabaseClient;
+  private rimoriClient: RimoriClient;
 
-  constructor(supabase: SupabaseClient) {
+  constructor(supabase: SupabaseClient, rimoriClient: RimoriClient) {
     this.supabase = supabase;
+    this.rimoriClient = rimoriClient;
   }
 
   /**
@@ -68,6 +71,7 @@ export class ExerciseController {
       const errorText = await response.text();
       throw new Error(`Failed to create exercise: ${errorText}`);
     }
+    this.rimoriClient.event.emit('global.exercises.triggerChange');
 
     return await response.json();
   }
@@ -95,6 +99,7 @@ export class ExerciseController {
       const errorText = await response.text();
       throw new Error(`Failed to delete exercise: ${errorText}`);
     }
+    this.rimoriClient.event.emit('global.exercises.triggerChange');
 
     return await response.json();
   }

package/src/controller/SettingsController.ts

@@ -19,6 +19,8 @@ export interface Language {
   uppercase: string;
 }
 
+export type UserRole = 'user' | 'plugin_moderator' | 'lang_moderator' | 'admin';
+
 export interface UserInfo {
   skill_level_reading: LanguageLevel;
   skill_level_writing: LanguageLevel;
@@ -32,8 +34,7 @@ export interface UserInfo {
   story_genre: string;
   study_duration: number;
   /**
-   * The 2 letter language code of the language the user speaks natively.
-   * With the function getLanguageName, the language name can be retrieved.
+   * The language the user speaks natively.
    */
   mother_tongue: Language;
   /**
@@ -52,6 +53,10 @@ export interface UserInfo {
    * Optional: nearest big city (>100,000) near user's location
    */
   target_city?: string;
+  /**
+   * The user's role: 'user', 'plugin_moderator', 'lang_moderator', or 'admin'
+   */
+  user_role: UserRole;
 }
 
 export class SettingsController {

package/src/controller/TranslationController.ts

@@ -1,16 +1,22 @@
 import { createInstance, ThirdPartyModule, TOptions, i18n as i18nType } from 'i18next';
 
+type InitializationState = 'not-inited' | 'initing' | 'finished';
+
 /**
  * Translator class for handling internationalization
  */
 export class Translator {
   private currentLanguage: string;
-  private isInitialized: boolean;
+  private initializationState: InitializationState;
+  private initializationPromise: Promise<void> | null;
   private i18n: i18nType | undefined;
+  private translationUrl: string;
 
-  constructor(initialLanguage: string) {
-    this.isInitialized = false;
+  constructor(initialLanguage: string, translationUrl: string) {
     this.currentLanguage = initialLanguage;
+    this.initializationState = 'not-inited';
+    this.initializationPromise = null;
+    this.translationUrl = translationUrl;
   }
 
   /**
@@ -18,23 +24,46 @@ export class Translator {
    * @param userLanguage - Language code from user info
    */
   async initialize(): Promise<void> {
-    if (this.isInitialized) return;
-
-    const translations = await this.fetchTranslations(this.currentLanguage);
-
-    const instance = createInstance({
-      lng: this.currentLanguage,
-      resources: {
-        [this.currentLanguage]: {
-          translation: translations,
-        },
-      },
-      debug: window.location.hostname === 'localhost',
-    });
-
-    await instance.init();
-    this.i18n = instance;
-    this.isInitialized = true;
+    // If already finished, return immediately
+    if (this.initializationState === 'finished') {
+      return;
+    }
+
+    // If currently initializing, wait for the existing initialization to complete
+    if (this.initializationState === 'initing' && this.initializationPromise) {
+      return this.initializationPromise;
+    }
+
+    // Start initialization
+    this.initializationState = 'initing';
+
+    // Create a promise that will be resolved when initialization completes
+    this.initializationPromise = (async (): Promise<void> => {
+      try {
+        const translations = await this.fetchTranslations(this.currentLanguage);
+
+        const instance = createInstance({
+          lng: this.currentLanguage,
+          resources: {
+            [this.currentLanguage]: {
+              translation: translations,
+            },
+          },
+          debug: window.location.hostname === 'localhost',
+        });
+
+        await instance.init();
+        this.i18n = instance;
+        this.initializationState = 'finished';
+      } catch (error) {
+        // Reset state on error so it can be retried
+        this.initializationState = 'not-inited';
+        this.initializationPromise = null;
+        throw error;
+      }
+    })();
+
+    return this.initializationPromise;
   }
 
   private getTranslationUrl(language: string): string {
@@ -45,7 +74,7 @@ export class Translator {
       return `${window.location.origin}/locales/${filename}.json`;
     }
 
-    return `./locales/${language}.json`;
+    return `${this.translationUrl}/locales/${language}.json`;
   }
 
   public usePlugin(plugin: ThirdPartyModule): void {
@@ -102,6 +131,6 @@ export class Translator {
    * Check if translator is initialized
    */
   isReady(): boolean {
-    return this.isInitialized;
+    return this.initializationState === 'finished';
   }
 }