@rimori/client 2.5.32 → 2.5.33

package/dist/plugin/module/EventModule.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { AccomplishmentController } from '../../controller/AccomplishmentController';
 import { EventBus } from '../../fromRimori/EventBus';
 /**
@@ -14,10 +5,14 @@ import { EventBus } from '../../fromRimori/EventBus';
  * Provides methods for emitting, listening to, and responding to events.
  */
 export class EventModule {
+    pluginId;
+    accomplishmentController;
+    aiModule;
+    eventBus;
     constructor(pluginId, aiModule, eventBus) {
         this.pluginId = pluginId;
         this.aiModule = aiModule;
-        this.eventBus = eventBus !== null && eventBus !== void 0 ? eventBus : EventBus;
+        this.eventBus = eventBus ?? EventBus;
         this.accomplishmentController = new AccomplishmentController(pluginId, this.eventBus);
         // Listen for session token broadcasts from rimori-main (ExerciseSessionManager).
         // When an exercise starts: adopt the exercise token unconditionally.
@@ -33,7 +28,6 @@ export class EventModule {
         });
     }
     getGlobalEventTopic(preliminaryTopic) {
-        var _a;
         if (preliminaryTopic.startsWith('global.')) {
             return preliminaryTopic;
         }
@@ -50,7 +44,7 @@ export class EventModule {
         else if (topicParts.length > 3) {
             throw new Error(`The event topic must consist of 3 parts. <pluginId>.<topic area>.<action>. Received: ${preliminaryTopic}`);
         }
-        const topicRoot = (_a = this.pluginId) !== null && _a !== void 0 ? _a : 'global';
+        const topicRoot = this.pluginId ?? 'global';
         return `${topicRoot}.${preliminaryTopic}`;
     }
     /**
@@ -73,13 +67,10 @@ export class EventModule {
      * @param data The data to request.
      * @returns The response from the event.
      */
-    request(topic, data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const globalTopic = this.getGlobalEventTopic(topic);
-            const sessionToken = (_a = this.aiModule.session.get()) !== null && _a !== void 0 ? _a : undefined;
-            return this.eventBus.request(this.pluginId, globalTopic, data, sessionToken);
-        });
+    async request(topic, data) {
+        const globalTopic = this.getGlobalEventTopic(topic);
+        const sessionToken = this.aiModule.session.get() ?? undefined;
+        return this.eventBus.request(this.pluginId, globalTopic, data, sessionToken);
     }
     /**
      * Subscribe to an event.
@@ -113,14 +104,14 @@ export class EventModule {
         const topics = Array.isArray(topic) ? topic : [topic];
         let wrappedData = data;
         if (typeof data === 'function') {
-            wrappedData = (event) => __awaiter(this, void 0, void 0, function* () {
+            wrappedData = async (event) => {
                 const previousToken = this.aiModule.session.get();
                 if (event.ai_session_token) {
                     this.aiModule.session.set(event.ai_session_token);
                 }
                 try {
                     // console.log('responding to event', event);
-                    return yield data(event);
+                    return await data(event);
                 }
                 finally {
                     if (event.ai_session_token) {
@@ -132,7 +123,7 @@ export class EventModule {
                         }
                     }
                 }
-            });
+            };
         }
         this.eventBus.respond(this.pluginId, topics.map((t) => this.getGlobalEventTopic(t)), wrappedData);
     }
@@ -140,10 +131,8 @@ export class EventModule {
      * Emit an accomplishment.
      * @param payload The payload to emit.
      */
-    emitAccomplishment(payload) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.accomplishmentController.emitAccomplishment(payload);
-        });
+    async emitAccomplishment(payload) {
+        this.accomplishmentController.emitAccomplishment(payload);
     }
     /**
      * Subscribe to an accomplishment.
@@ -169,7 +158,7 @@ export class EventModule {
      * @param params Optional additional parameters to pass to the action.
      */
     emitMainPanelAction(pluginId, actionKey, params) {
-        this.emit('global.mainPanel.triggerAction', Object.assign({ plugin_id: pluginId, action_key: actionKey }, params));
+        this.emit('global.mainPanel.triggerAction', { plugin_id: pluginId, action_key: actionKey, ...params });
     }
     /**
      * Subscribe to main panel actions triggered by the user from the dashboard.
@@ -196,15 +185,17 @@ export class EventModule {
      */
     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.emit('action.requestMain');
-        return this.on('action.requestMain', ({ data }) => {
-            // console.log('Received action for main panel ' + data.action_key);
-            // console.log('Listening to actions', listeningActions);
+        // Register the listener BEFORE emitting the request so that synchronous responses
+        // from the federated bridge (in-process, not postMessage) are captured.
+        // In iframe mode the bridge is async (postMessage) so order didn't matter before,
+        // but in federated mode the respond fires synchronously during emit.
+        const listener = this.on('action.requestMain', ({ data }) => {
             if (listeningActions.length === 0 || listeningActions.includes(data.action_key)) {
                 callback(data);
             }
         });
+        this.emit('action.requestMain');
+        return listener;
     }
     /**
      * Subscribe to side panel actions triggered by the user from the dashboard.

package/dist/plugin/module/ExerciseModule.js

@@ -1,17 +1,11 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 /**
  * Controller for exercise-related operations.
  * Provides access to weekly exercises and exercise management.
  */
 export class ExerciseModule {
+    supabase;
+    communicationHandler;
+    eventModule;
     constructor(supabase, communicationHandler, _info, eventModule) {
         this.supabase = supabase;
         this.communicationHandler = communicationHandler;
@@ -22,14 +16,12 @@ export class ExerciseModule {
      * Shows exercises for the current week that haven't expired.
      * @returns Array of exercise objects.
      */
-    view() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { data, error } = yield this.supabase.schema('public').from('weekly_exercises').select('*');
-            if (error) {
-                throw new Error(`Failed to fetch weekly exercises: ${error.message}`);
-            }
-            return data || [];
-        });
+    async view() {
+        const { data, error } = await this.supabase.schema('public').from('weekly_exercises').select('*');
+        if (error) {
+            throw new Error(`Failed to fetch weekly exercises: ${error.message}`);
+        }
+        return data || [];
     }
     /**
      * Creates one or more exercises via the backend API.
@@ -38,21 +30,19 @@ export class ExerciseModule {
      * @param params Exercise creation parameters (single or array).
      * @returns Created exercise objects.
      */
-    add(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const exercises = Array.isArray(params) ? params : [params];
-            const response = yield this.communicationHandler.fetchBackend('/exercises', {
-                method: 'POST',
-                body: JSON.stringify({ exercises }),
-            });
-            if (!response.ok) {
-                const errorText = yield response.text();
-                throw new Error(`Failed to create exercises: ${errorText}`);
-            }
-            const data = yield response.json();
-            this.eventModule.emit('global.exercises.triggerChange');
-            return data;
+    async add(params) {
+        const exercises = Array.isArray(params) ? params : [params];
+        const response = await this.communicationHandler.fetchBackend('/exercises', {
+            method: 'POST',
+            body: JSON.stringify({ exercises }),
         });
+        if (!response.ok) {
+            const errorText = await response.text();
+            throw new Error(`Failed to create exercises: ${errorText}`);
+        }
+        const data = await response.json();
+        this.eventModule.emit('global.exercises.triggerChange');
+        return data;
     }
     /**
      * Requests a new exercise session token from rimori-main.
@@ -66,22 +56,20 @@ export class ExerciseModule {
      * @param params.actionKey The action key identifying this exercise type.
      * @param params.knowledgeId Optional knowledge ID for tracking what was studied.
      */
-    start(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                const timeout = setTimeout(() => {
+    async start(params) {
+        return new Promise((resolve, reject) => {
+            const timeout = setTimeout(() => {
+                listener.off();
+                reject(new Error('Exercise start timed out: rimori-main did not respond within 5s'));
+            }, 5000);
+            const listener = this.eventModule.on('global.session.triggerUpdate', ({ data }) => {
+                if (data.session_token) {
+                    clearTimeout(timeout);
                     listener.off();
-                    reject(new Error('Exercise start timed out: rimori-main did not respond within 5s'));
-                }, 5000);
-                const listener = this.eventModule.on('global.session.triggerUpdate', ({ data }) => {
-                    if (data.session_token) {
-                        clearTimeout(timeout);
-                        listener.off();
-                        resolve();
-                    }
-                });
-                this.eventModule.emit('global.exercise.triggerStart', params);
+                    resolve();
+                }
             });
+            this.eventModule.emit('global.exercise.triggerStart', params);
         });
     }
     /**
@@ -89,17 +77,15 @@ export class ExerciseModule {
      * @param id The exercise ID to delete.
      * @returns Success status.
      */
-    delete(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const response = yield this.communicationHandler.fetchBackend(`/exercises/${id}`, {
-                method: 'DELETE',
-            });
-            if (!response.ok) {
-                const errorText = yield response.text();
-                throw new Error(`Failed to delete exercise: ${errorText}`);
-            }
-            this.eventModule.emit('global.exercises.triggerChange');
-            return yield response.json();
+    async delete(id) {
+        const response = await this.communicationHandler.fetchBackend(`/exercises/${id}`, {
+            method: 'DELETE',
         });
+        if (!response.ok) {
+            const errorText = await response.text();
+            throw new Error(`Failed to delete exercise: ${errorText}`);
+        }
+        this.eventModule.emit('global.exercises.triggerChange');
+        return await response.json();
     }
 }

package/dist/plugin/module/PluginModule.js

@@ -1,37 +1,38 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { Translator } from '../../controller/TranslationController';
 /**
  * Controller for plugin-related operations.
  * Provides access to plugin settings, user info, and plugin information.
  */
 export class PluginModule {
+    pluginId;
+    rimoriInfo;
+    translator;
+    supabase;
+    communicationHandler;
+    /**
+     * The release channel of this plugin installation.
+     * Determines which database schema is used for plugin tables.
+     */
+    releaseChannel;
+    applicationMode;
+    theme;
+    /**
+    * Whether text-to-speech is globally enabled (set in rimori-main navbar).
+    * Updated automatically when the user toggles TTS.
+    */
+    ttsEnabled = true;
     constructor(supabase, communicationHandler, info, ai) {
-        var _a;
-        /**
-        * Whether text-to-speech is globally enabled (set in rimori-main navbar).
-        * Updated automatically when the user toggles TTS.
-        */
-        this.ttsEnabled = true;
         this.rimoriInfo = info;
         this.supabase = supabase;
         this.pluginId = info.pluginId;
         this.releaseChannel = info.releaseChannel;
         this.communicationHandler = communicationHandler;
         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) || '', ai);
-        this.ttsEnabled = (_a = info.ttsEnabled) !== null && _a !== void 0 ? _a : true;
+        this.translator = new Translator(info.interfaceLanguage, currentPlugin?.endpoint || '', ai);
+        this.ttsEnabled = info.ttsEnabled ?? true;
         this.communicationHandler.onUpdate((updatedInfo) => {
-            var _a;
             this.rimoriInfo = updatedInfo;
-            this.ttsEnabled = (_a = updatedInfo.ttsEnabled) !== null && _a !== void 0 ? _a : true;
+            this.ttsEnabled = updatedInfo.ttsEnabled ?? true;
         });
         this.applicationMode = this.communicationHandler.getQueryParam('applicationMode');
         this.theme = this.communicationHandler.getQueryParam('rm_theme') || 'light';
@@ -42,20 +43,17 @@ export class PluginModule {
      * Otherwise, fetches user-specific settings.
      * @returns The settings object or null if not found.
      */
-    fetchSettings() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const isGuildSetting = !this.rimoriInfo.guild.allowUserPluginSettings;
-            const { data } = yield this.supabase
-                .schema('public')
-                .from('plugin_settings')
-                .select('*')
-                .eq('plugin_id', this.pluginId)
-                .eq('guild_id', this.rimoriInfo.guild.id)
-                .eq('is_guild_setting', isGuildSetting)
-                .maybeSingle();
-            return (_a = data === null || data === void 0 ? void 0 : data.settings) !== null && _a !== void 0 ? _a : null;
-        });
+    async fetchSettings() {
+        const isGuildSetting = !this.rimoriInfo.guild.allowUserPluginSettings;
+        const { data } = await this.supabase
+            .schema('public')
+            .from('plugin_settings')
+            .select('*')
+            .eq('plugin_id', this.pluginId)
+            .eq('guild_id', this.rimoriInfo.guild.id)
+            .eq('is_guild_setting', isGuildSetting)
+            .maybeSingle();
+        return data?.settings ?? null;
     }
     /**
      * Sets settings for the plugin.
@@ -64,82 +62,77 @@ export class PluginModule {
      * @param settings - The settings object to save.
      * @throws {Error} if RLS blocks the operation.
      */
-    setSettings(settings) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const isGuildSetting = !this.rimoriInfo.guild.allowUserPluginSettings;
-            const payload = {
-                plugin_id: this.pluginId,
-                settings,
-                guild_id: this.rimoriInfo.guild.id,
-                is_guild_setting: isGuildSetting,
-            };
-            if (isGuildSetting) {
-                payload.user_id = null;
-            }
-            // Try UPDATE first (safe with RLS). If nothing updated, INSERT.
-            const updateQuery = this.supabase
-                .schema('public')
-                .from('plugin_settings')
-                .update({ settings })
-                .eq('plugin_id', this.pluginId)
-                .eq('guild_id', this.rimoriInfo.guild.id)
-                .eq('is_guild_setting', isGuildSetting);
-            const { data: updatedRows, error: updateError } = yield (isGuildSetting
-                ? updateQuery.is('user_id', null).select()
-                : updateQuery.select());
-            if (updateError) {
-                if (updateError.code === '42501' || ((_a = updateError.message) === null || _a === void 0 ? void 0 : _a.includes('policy'))) {
-                    throw new Error(`Cannot set ${isGuildSetting ? 'guild' : 'user'} settings: Permission denied.`);
-                }
-                // proceed to try insert in case of other issues
-            }
-            if (updatedRows && updatedRows.length > 0) {
-                return; // updated successfully
+    async setSettings(settings) {
+        const isGuildSetting = !this.rimoriInfo.guild.allowUserPluginSettings;
+        const payload = {
+            plugin_id: this.pluginId,
+            settings,
+            guild_id: this.rimoriInfo.guild.id,
+            is_guild_setting: isGuildSetting,
+        };
+        if (isGuildSetting) {
+            payload.user_id = null;
+        }
+        // Try UPDATE first (safe with RLS). If nothing updated, INSERT.
+        const updateQuery = this.supabase
+            .schema('public')
+            .from('plugin_settings')
+            .update({ settings })
+            .eq('plugin_id', this.pluginId)
+            .eq('guild_id', this.rimoriInfo.guild.id)
+            .eq('is_guild_setting', isGuildSetting);
+        const { data: updatedRows, error: updateError } = await (isGuildSetting
+            ? updateQuery.is('user_id', null).select()
+            : updateQuery.select());
+        if (updateError) {
+            if (updateError.code === '42501' || updateError.message?.includes('policy')) {
+                throw new Error(`Cannot set ${isGuildSetting ? 'guild' : 'user'} settings: Permission denied.`);
             }
-            // No row updated -> INSERT
-            const { error: insertError } = yield this.supabase.schema('public').from('plugin_settings').insert(payload);
-            if (insertError) {
-                // In case of race condition (duplicate), try one more UPDATE
-                if (insertError.code === '23505' /* unique_violation */) {
-                    const retry = this.supabase
-                        .schema('public')
-                        .from('plugin_settings')
-                        .update({ settings })
-                        .eq('plugin_id', this.pluginId)
-                        .eq('guild_id', this.rimoriInfo.guild.id)
-                        .eq('is_guild_setting', isGuildSetting);
-                    const { error: retryError } = yield (isGuildSetting ? retry.is('user_id', null) : retry);
-                    if (!retryError)
-                        return;
-                }
-                throw insertError;
+            // proceed to try insert in case of other issues
+        }
+        if (updatedRows && updatedRows.length > 0) {
+            return; // updated successfully
+        }
+        // No row updated -> INSERT
+        const { error: insertError } = await this.supabase.schema('public').from('plugin_settings').insert(payload);
+        if (insertError) {
+            // In case of race condition (duplicate), try one more UPDATE
+            if (insertError.code === '23505' /* unique_violation */) {
+                const retry = this.supabase
+                    .schema('public')
+                    .from('plugin_settings')
+                    .update({ settings })
+                    .eq('plugin_id', this.pluginId)
+                    .eq('guild_id', this.rimoriInfo.guild.id)
+                    .eq('is_guild_setting', isGuildSetting);
+                const { error: retryError } = await (isGuildSetting ? retry.is('user_id', null) : retry);
+                if (!retryError)
+                    return;
             }
-        });
+            throw insertError;
+        }
     }
     /**
      * Get the settings for the plugin. T can be any type of settings, UserSettings or SystemSettings.
      * @param defaultSettings The default settings to use if no settings are found.
      * @returns The settings for the plugin.
      */
-    getSettings(defaultSettings) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const storedSettings = yield this.fetchSettings();
-            if (!storedSettings) {
-                yield this.setSettings(defaultSettings);
-                return defaultSettings;
-            }
-            // Handle settings migration
-            const storedKeys = Object.keys(storedSettings);
-            const defaultKeys = Object.keys(defaultSettings);
-            if (storedKeys.length !== defaultKeys.length) {
-                const validStoredSettings = Object.fromEntries(Object.entries(storedSettings).filter(([key]) => defaultKeys.includes(key)));
-                const mergedSettings = Object.assign(Object.assign({}, defaultSettings), validStoredSettings);
-                yield this.setSettings(mergedSettings);
-                return mergedSettings;
-            }
-            return storedSettings;
-        });
+    async getSettings(defaultSettings) {
+        const storedSettings = await this.fetchSettings();
+        if (!storedSettings) {
+            await this.setSettings(defaultSettings);
+            return defaultSettings;
+        }
+        // Handle settings migration
+        const storedKeys = Object.keys(storedSettings);
+        const defaultKeys = Object.keys(defaultSettings);
+        if (storedKeys.length !== defaultKeys.length) {
+            const validStoredSettings = Object.fromEntries(Object.entries(storedSettings).filter(([key]) => defaultKeys.includes(key)));
+            const mergedSettings = { ...defaultSettings, ...validStoredSettings };
+            await this.setSettings(mergedSettings);
+            return mergedSettings;
+        }
+        return storedSettings;
     }
     /**
      * Get the current user info.
@@ -183,11 +176,9 @@ export class PluginModule {
      * Get the translator for the plugin.
      * @returns The translator for the plugin.
      */
-    getTranslator() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.translator.initialize();
-            return this.translator;
-        });
+    async getTranslator() {
+        await this.translator.initialize();
+        return this.translator;
     }
 }
 /** Ordered tiers from lowest to highest access level */