@rimori/client 2.1.7 → 2.2.0-next.1

package/dist/plugin/RimoriClient.js

@@ -97,10 +97,26 @@ export class RimoriClient {
                 this.event.emit('global.sidebar.triggerAction', { plugin_id: pluginId, action_key: actionKey, text });
             },
             onMainPanelAction: (callback, actionsToListen = []) => {
+                const listeningActions = Array.isArray(actionsToListen) ? actionsToListen : [actionsToListen];
                 // 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 }) => {
-                    if (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);
+                    }
+                });
+            },
+            onSidePanelAction: (callback, actionsToListen = []) => {
+                const listeningActions = Array.isArray(actionsToListen) ? actionsToListen : [actionsToListen];
+                // 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("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);
                     }
                 });
@@ -261,7 +277,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') {
             Logger.getInstance(this);
@@ -322,7 +338,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 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,

package/package.json

@@ -1,8 +1,13 @@
 {
   "name": "@rimori/client",
-  "version": "2.1.7",
+  "version": "2.2.0-next.1",
   "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"
@@ -26,6 +31,14 @@
     "dotenv": "16.5.0",
     "i18next": "^25.6.0"
   },
+  "peerDependencies": {
+    "html2canvas": "^1.4.1"
+  },
+  "peerDependenciesMeta": {
+    "html2canvas": {
+      "optional": true
+    }
+  },
   "devDependencies": {
     "@eslint/js": "^9.37.0",
     "eslint-config-prettier": "^10.1.8",
@@ -33,6 +46,7 @@
     "eslint-plugin-react-hooks": "^7.0.0",
     "eslint-plugin-react-refresh": "^0.4.23",
     "globals": "^16.4.0",
+    "html2canvas": "^1.4.1",
     "prettier": "^3.6.2",
     "typescript": "^5.7.2",
     "typescript-eslint": "^8.46.0"

package/src/cli/types/DatabaseTypes.ts

@@ -3,14 +3,7 @@
 /**
  * Supported database column data types for table schema definitions.
  */
-type DbColumnType =
-  | 'decimal'
-  | 'integer'
-  | 'text'
-  | 'boolean'
-  | 'json'
-  | 'timestamp'
-  | 'uuid';
+type DbColumnType = 'decimal' | 'integer' | 'text' | 'boolean' | 'json' | 'timestamp' | 'uuid';
 
 /**
  * Foreign key relationship configuration with cascade delete support.
@@ -55,10 +48,12 @@ export interface DbColumnDefinition {
   restrict?: {
     /** Restrictions for the user */
     user: Partial<Omit<DbPermissionDefinition, 'delete'>>;
-    /** Restrictions for the moderator */
-    moderator?: Partial<Omit<DbPermissionDefinition, 'delete'>>;
+    /** Restrictions for the guild moderator */
+    guild_moderator?: Partial<Omit<DbPermissionDefinition, 'delete'>>;
+    /** Restrictions for the language moderator */
+    lang_moderator?: Partial<Omit<DbPermissionDefinition, 'delete'>>;
     /** Restrictions for the maintainer */
-    // maintainer?: Partial<DbPermissionDefinition>,
+    // maintainer?: Partial<Omit<DbPermissionDefinition, 'delete'>>;
   };
 }
 
@@ -86,9 +81,14 @@ export interface DbTableDefinition {
   description: string;
   /** Permissions for the table */
   permissions: {
+    /** Permissions for the user */
     user: DbPermissionDefinition;
-    moderator?: DbPermissionDefinition;
-    // maintainer?: DbPermissionDefinition,
+    /** Permissions for the guild moderator */
+    guild_moderator?: DbPermissionDefinition;
+    /** Permissions for the language moderator */
+    lang_moderator?: DbPermissionDefinition;
+    /** Permissions for the maintainer */
+    // maintainer?: DbPermissionDefinition;
   };
   /** Column definitions for the table */
   columns: {
@@ -100,11 +100,13 @@ export interface DbTableDefinition {
  * Permission definition for a database table.
  * NONE means the action is not allowed.
  * OWN means only do the action on your own records.
+ * GUILD means do the action on all records in the guild.
+ * LANG means do the action on all records in the language.
  * ALL means do the action on all records.
  *
  * Defines the permissions for a database table.
  */
-export type DbPermission = 'NONE' | 'OWN' | 'ALL';
+export type DbPermission = 'NONE' | 'OWN' | 'GUILD' | 'LANG' | 'ALL';
 
 /**
  * Permission definition for a database table.
@@ -120,5 +122,4 @@ export interface DbPermissionDefinition {
 /**
  * Full table definition that includes automatically generated fields.
  */
-export type FullTable<T extends Record<string, DbColumnDefinition>> = T &
-  BaseTableStructure;
+export type FullTable<T extends Record<string, DbColumnDefinition>> = T & BaseTableStructure;

package/src/controller/AccomplishmentController.ts

@@ -49,7 +49,9 @@ export class AccomplishmentController {
       type: 'durationMinutes' in payload ? 'macro' : 'micro',
     } as AccomplishmentPayload;
 
-    this.validateAccomplishment(accomplishmentPayload);
+    if (!this.validateAccomplishment(accomplishmentPayload)) {
+      return;
+    }
 
     const sanitizedPayload = this.sanitizeAccomplishment(accomplishmentPayload);
 
@@ -58,7 +60,7 @@ export class AccomplishmentController {
     EventBus.emit(this.pluginId, topic, sanitizedPayload);
   }
 
-  private validateAccomplishment(payload: AccomplishmentPayload) {
+  private validateAccomplishment(payload: AccomplishmentPayload): boolean {
     if (!skillCategories.includes(payload.skillCategory)) {
       throw new Error(`Invalid skill category: ${payload.skillCategory}`);
     }
@@ -82,7 +84,8 @@ export class AccomplishmentController {
 
     //durationMinutes is required
     if (payload.type === 'macro' && payload.durationMinutes < 4) {
-      throw new Error('The duration must be at least 4 minutes');
+      console.warn('The duration must be at least 4 minutes');
+      return false;
     }
 
     //errorRatio is required
@@ -98,6 +101,7 @@ export class AccomplishmentController {
         }
       });
     }
+    return true;
   }
 
   private sanitizeAccomplishment(payload: AccomplishmentPayload) {

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/SharedContentController.ts

@@ -36,38 +36,40 @@ export class SharedContentController {
     filter?: SharedContentFilter,
     options?: { privateTopic?: boolean; skipDbSave?: boolean; alwaysGenerateNew?: boolean; excludeIds?: string[] },
   ): Promise<SharedContent<T>> {
-    let query = this.supabase
-      .from('shared_content')
-      .select('*, scc:shared_content_completed(id, state)')
-      .eq('content_type', contentType)
-      .not('scc.state', 'in', '("completed","ongoing","hidden")')
-      .is('deleted_at', null);
-
-    if (options?.excludeIds && options.excludeIds.length > 0) {
-      const excludeIds = options.excludeIds.filter((id) => !id.startsWith('internal-temp-id-'));
-      // Supabase expects raw PostgREST syntax like '("id1","id2")'.
-      const excludeList = `(${excludeIds.map((id) => `"${id}"`).join(',')})`;
-      query = query.not('id', 'in', excludeList);
-    }
-
-    if (filter) {
-      query.contains('data', filter);
-    }
-
-    const { data: newAssignments, error } = await query.limit(30);
-
-    if (error) {
-      console.error('error fetching new assignments:', error);
-      throw new Error('error fetching new assignments');
-    }
-
-    // console.log('newAssignments:', newAssignments);
-
-    if (!options?.alwaysGenerateNew && newAssignments.length > 0) {
-      const index = Math.floor(Math.random() * newAssignments.length);
-      return newAssignments[index];
-    }
-
+    // The db cache of the shared content is temporary disabled until the new shared content implementation is completed
+    // if (false) {
+    //   let query = this.supabase
+    //     .from('shared_content')
+    //     .select('*, scc:shared_content_completed(id, state)')
+    //     .eq('content_type', contentType)
+    //     .not('scc.state', 'in', '("completed","ongoing","hidden")')
+    //     .is('deleted_at', null);
+
+    //   if (options?.excludeIds?.length ?? 0 > 0) {
+    //     const excludeIds = options.excludeIds.filter((id) => !id.startsWith('internal-temp-id-'));
+    //     // Supabase expects raw PostgREST syntax like '("id1","id2")'.
+    //     const excludeList = `(${excludeIds.map((id) => `"${id}"`).join(',')})`;
+    //     query = query.not('id', 'in', excludeList);
+    //   }
+
+    //   if (filter) {
+    //     query.contains('data', filter);
+    //   }
+
+    //   const { data: newAssignments, error } = await query.limit(30);
+
+    //   if (error) {
+    //     console.error('error fetching new assignments:', error);
+    //     throw new Error('error fetching new assignments');
+    //   }
+
+    //   // console.log('newAssignments:', newAssignments);
+
+    //   if (!options?.alwaysGenerateNew && newAssignments.length > 0) {
+    //     const index = Math.floor(Math.random() * newAssignments.length);
+    //     return newAssignments[index];
+    //   }
+    // }
     const instructions = await this.generateNewAssignment(contentType, generatorInstructions, filter);
 
     console.log('instructions:', instructions);

package/src/controller/TranslationController.ts

@@ -1,16 +1,20 @@
 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;
 
   constructor(initialLanguage: string) {
-    this.isInitialized = false;
     this.currentLanguage = initialLanguage;
+    this.initializationState = 'not-inited';
+    this.initializationPromise = null;
   }
 
   /**
@@ -18,23 +22,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 {
@@ -102,6 +129,6 @@ export class Translator {
    * Check if translator is initialized
    */
   isReady(): boolean {
-    return this.isInitialized;
+    return this.initializationState === 'finished';
   }
 }