@rimori/client 2.5.14-next.3 → 2.5.14-next.5

package/dist/index.d.ts

@@ -1,20 +1,20 @@
-export * from './plugin/CommunicationHandler';
-export * from './cli/types/DatabaseTypes';
-export * from './utils/difficultyConverter';
-export * from './fromRimori/PluginTypes';
 export * from './fromRimori/EventBus';
 export * from './plugin/RimoriClient';
+export * from './fromRimori/PluginTypes';
 export * from './plugin/StandaloneClient';
+export * from './cli/types/DatabaseTypes';
+export * from './plugin/TTS/MessageSender';
+export * from './utils/difficultyConverter';
+export * from './plugin/CommunicationHandler';
+export type { TOptions } from 'i18next';
 export { setupWorker } from './worker/WorkerSetup';
+export type { EventBusMessage } from './fromRimori/EventBus';
 export { AudioController } from './controller/AudioController';
-export { Translator } from './controller/TranslationController';
-export type { TOptions } from 'i18next';
-export type { SharedContent, BasicSharedContent, ContentStatus } from './plugin/module/SharedContentController';
 export type { Exercise } from './plugin/module/ExerciseModule';
-export type { UserInfo, Language, UserRole } from './controller/SettingsController';
-export type { Message, ToolInvocation } from './plugin/module/AIModule';
+export { Translator } from './controller/TranslationController';
 export type { TriggerAction } from './plugin/module/ExerciseModule';
-export type { MacroAccomplishmentPayload, MicroAccomplishmentPayload } from './controller/AccomplishmentController';
-export type { EventBusMessage } from './fromRimori/EventBus';
+export type { Message, ToolInvocation } from './plugin/module/AIModule';
 export type { Theme, ApplicationMode } from './plugin/module/PluginModule';
-export * from './plugin/TTS/MessageSender';
+export type { UserInfo, Language, UserRole, ExplicitUndefined } from './plugin/module/PluginModule';
+export type { SharedContent, BasicSharedContent, ContentStatus } from './plugin/module/SharedContentController';
+export type { MacroAccomplishmentPayload, MicroAccomplishmentPayload } from './controller/AccomplishmentController';

package/dist/index.js

@@ -1,12 +1,12 @@
 // Re-export everything
-export * from './plugin/CommunicationHandler';
-export * from './cli/types/DatabaseTypes';
-export * from './utils/difficultyConverter';
-export * from './fromRimori/PluginTypes';
 export * from './fromRimori/EventBus';
 export * from './plugin/RimoriClient';
+export * from './fromRimori/PluginTypes';
 export * from './plugin/StandaloneClient';
+export * from './cli/types/DatabaseTypes';
+export * from './plugin/TTS/MessageSender';
+export * from './utils/difficultyConverter';
+export * from './plugin/CommunicationHandler';
 export { setupWorker } from './worker/WorkerSetup';
 export { AudioController } from './controller/AudioController';
 export { Translator } from './controller/TranslationController';
-export * from './plugin/TTS/MessageSender';

package/dist/modules.d.ts

@@ -1,5 +1,5 @@
+export * from './fromRimori/EventBus';
 export * from './plugin/module/AIModule';
 export * from './fromRimori/PluginTypes';
-export * from './fromRimori/EventBus';
 export * from './cli/types/DatabaseTypes';
 export * from './plugin/TTS/MessageSender';

package/dist/modules.js

@@ -1,6 +1,6 @@
 // Re-export everything
+export * from './fromRimori/EventBus';
 export * from './plugin/module/AIModule';
 export * from './fromRimori/PluginTypes';
-export * from './fromRimori/EventBus';
 export * from './cli/types/DatabaseTypes';
 export * from './plugin/TTS/MessageSender';

package/dist/plugin/CommunicationHandler.d.ts

@@ -1,6 +1,6 @@
-import { UserInfo } from '../controller/SettingsController';
-import { ActivePlugin, Plugin } from '../fromRimori/PluginTypes';
+import { UserInfo } from './module/PluginModule';
 import { PostgrestClient } from '@supabase/postgrest-js';
+import { ActivePlugin, Plugin } from '../fromRimori/PluginTypes';
 export type SupabaseClient = PostgrestClient;
 export interface Guild {
     allowUserPluginSettings: boolean;

package/dist/plugin/CommunicationHandler.js

@@ -7,8 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { EventBus } from '../fromRimori/EventBus';
 import { PostgrestClient } from '@supabase/postgrest-js';
+import { EventBus } from '../fromRimori/EventBus';
 export class RimoriCommunicationHandler {
     constructor(pluginId, standalone) {
         this.port = null;

package/dist/plugin/RimoriClient.js

@@ -15,6 +15,7 @@ import { DbModule } from './module/DbModule';
 import { EventModule } from './module/EventModule';
 import { AIModule } from './module/AIModule';
 import { ExerciseModule } from './module/ExerciseModule';
+import { EventBus } from '../fromRimori/EventBus';
 export class RimoriClient {
     constructor(controller, supabase, info) {
         this.navigation = {
@@ -30,7 +31,10 @@ export class RimoriClient {
         this.rimoriInfo = info;
         this.sharedContent = new SharedContentController(supabase, this);
         this.ai = new AIModule(info.backendUrl, () => this.rimoriInfo.token);
-        this.event = new EventModule(info.pluginId);
+        this.ai.setOnRateLimited((exercisesRemaining) => {
+            EventBus.emit(info.pluginId, 'global.quota.triggerExceeded', { exercises_remaining: exercisesRemaining });
+        });
+        this.event = new EventModule(info.pluginId, info.backendUrl, () => this.rimoriInfo.token, this.ai);
         this.db = new DbModule(supabase, controller, info);
         this.plugin = new PluginModule(supabase, controller, info, this.ai);
         this.exercise = new ExerciseModule(supabase, controller, info, this.event);

package/dist/plugin/module/AIModule.d.ts

@@ -1,5 +1,5 @@
+import { Language } from './PluginModule';
 import { Tool } from '../../fromRimori/PluginTypes';
-import { Language } from '../../controller/SettingsController';
 export type OnStreamedObjectResult<T = any> = (result: T, isLoading: boolean) => void;
 type PrimitiveType = 'string' | 'number' | 'boolean';
 type ObjectToolParameterType = PrimitiveType | {
@@ -58,7 +58,17 @@ export interface ObjectRequest {
 export declare class AIModule {
     private getToken;
     private backendUrl;
+    private sessionTokenId;
+    private onRateLimitedCb?;
     constructor(backendUrl: string, getToken: () => string);
+    /** Returns the current exercise session token ID (null if no active session). */
+    getSessionTokenId(): string | null;
+    /** Sets the session token ID (used by workers inheriting a session from the plugin). */
+    setSessionToken(id: string): void;
+    /** Clears the stored session token (called after macro accomplishment). */
+    clearSessionToken(): void;
+    /** Registers a callback invoked whenever a 429 rate-limit response is received. */
+    setOnRateLimited(cb: (exercisesRemaining: number) => void): void;
     /**
      * Generate text from messages using AI.
      * @param messages The messages to generate text from.

package/dist/plugin/module/AIModule.js

@@ -13,9 +13,26 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
  */
 export class AIModule {
     constructor(backendUrl, getToken) {
+        this.sessionTokenId = null;
         this.backendUrl = backendUrl;
         this.getToken = getToken;
     }
+    /** Returns the current exercise session token ID (null if no active session). */
+    getSessionTokenId() {
+        return this.sessionTokenId;
+    }
+    /** Sets the session token ID (used by workers inheriting a session from the plugin). */
+    setSessionToken(id) {
+        this.sessionTokenId = id;
+    }
+    /** Clears the stored session token (called after macro accomplishment). */
+    clearSessionToken() {
+        this.sessionTokenId = null;
+    }
+    /** Registers a callback invoked whenever a 429 rate-limit response is received. */
+    setOnRateLimited(cb) {
+        this.onRateLimitedCb = cb;
+    }
     /**
      * Generate text from messages using AI.
      * @param messages The messages to generate text from.
@@ -78,13 +95,14 @@ export class AIModule {
      */
     getVoice(text_1) {
         return __awaiter(this, arguments, void 0, function* (text, voice = 'alloy', speed = 1, language, cache = false) {
+            var _a;
             return yield fetch(`${this.backendUrl}/voice/tts`, {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
                     Authorization: `Bearer ${this.getToken()}`,
                 },
-                body: JSON.stringify({ input: text, voice, speed, language, cache }),
+                body: JSON.stringify({ input: text, voice, speed, language, cache, session_token_id: (_a = this.sessionTokenId) !== null && _a !== void 0 ? _a : undefined }),
             }).then((r) => r.blob());
         });
     }
@@ -101,6 +119,9 @@ export class AIModule {
             if (language) {
                 formData.append('language', language.code);
             }
+            if (this.sessionTokenId) {
+                formData.append('session_token_id', this.sessionTokenId);
+            }
             return yield fetch(`${this.backendUrl}/voice/stt`, {
                 method: 'POST',
                 headers: { Authorization: `Bearer ${this.getToken()}` },
@@ -172,6 +193,7 @@ export class AIModule {
     }
     streamObject(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d;
             const { messages, responseSchema, onResult = () => null, cache = false, tools = [], model = undefined, knowledgeId, } = params;
             const chatMessages = messages.map((message, index) => (Object.assign(Object.assign({}, message), { id: `${index + 1}` })));
             const response = yield fetch(`${this.backendUrl}/ai/llm`, {
@@ -183,11 +205,18 @@ export class AIModule {
                     messages: chatMessages,
                     model,
                     knowledge_id: knowledgeId,
+                    session_token_id: (_a = this.sessionTokenId) !== null && _a !== void 0 ? _a : undefined,
                 }),
                 method: 'POST',
                 headers: { Authorization: `Bearer ${this.getToken()}`, 'Content-Type': 'application/json' },
             });
             if (!response.ok) {
+                if (response.status === 429) {
+                    const body = yield response.json().catch(() => ({}));
+                    const remaining = (_b = body.exercises_remaining) !== null && _b !== void 0 ? _b : 0;
+                    (_c = this.onRateLimitedCb) === null || _c === void 0 ? void 0 : _c.call(this, remaining);
+                    throw new Error(`Rate limit exceeded: ${(_d = body.error) !== null && _d !== void 0 ? _d : 'Daily exercise limit reached'}. exercises_remaining: ${remaining}`);
+                }
                 throw new Error(`Failed to stream object: ${response.status} ${response.statusText}`);
             }
             if (!response.body) {
@@ -212,6 +241,19 @@ export class AIModule {
                 const chunk = decoder.decode(value, { stream: true });
                 const lines = chunk.split('\n').filter((line) => line.trim());
                 for (const line of lines) {
+                    // Handle token: line (session token issued by backend on first AI call)
+                    if (line.startsWith('token:')) {
+                        try {
+                            const tokenData = JSON.parse(line.slice(6).trim());
+                            if (tokenData.token_id) {
+                                this.sessionTokenId = tokenData.token_id;
+                            }
+                        }
+                        catch (_e) {
+                            console.error('Failed to parse token: line', line);
+                        }
+                        continue;
+                    }
                     const command = line.substring(0, 5);
                     const dataStr = line.substring(5).trim();
                     if (dataStr === '[DONE]') {

package/dist/plugin/module/EventModule.d.ts

@@ -1,6 +1,7 @@
 import { MainPanelAction, SidebarAction } from '../../fromRimori/PluginTypes';
 import { AccomplishmentPayload } from '../../controller/AccomplishmentController';
 import { EventBusMessage, EventHandler, EventPayload, EventListener } from '../../fromRimori/EventBus';
+import { AIModule } from './AIModule';
 /**
  * Event module for plugin event bus operations.
  * Provides methods for emitting, listening to, and responding to events.
@@ -8,7 +9,10 @@ import { EventBusMessage, EventHandler, EventPayload, EventListener } from '../.
 export declare class EventModule {
     private pluginId;
     private accomplishmentController;
-    constructor(pluginId: string);
+    private aiModule;
+    private backendUrl;
+    private getToken;
+    constructor(pluginId: string, backendUrl: string, getToken: () => string, aiModule: AIModule);
     getGlobalEventTopic(preliminaryTopic: string): string;
     /**
      * Emit an event to Rimori or a plugin.
@@ -51,7 +55,7 @@ export declare class EventModule {
      * Emit an accomplishment.
      * @param payload The payload to emit.
      */
-    emitAccomplishment(payload: AccomplishmentPayload): void;
+    emitAccomplishment(payload: AccomplishmentPayload): Promise<void>;
     /**
      * Subscribe to an accomplishment.
      * @param accomplishmentTopic The topic to subscribe to.

package/dist/plugin/module/EventModule.js

@@ -1,3 +1,12 @@
+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';
 /**
@@ -5,8 +14,11 @@ import { EventBus } from '../../fromRimori/EventBus';
  * Provides methods for emitting, listening to, and responding to events.
  */
 export class EventModule {
-    constructor(pluginId) {
+    constructor(pluginId, backendUrl, getToken, aiModule) {
         this.pluginId = pluginId;
+        this.backendUrl = backendUrl;
+        this.getToken = getToken;
+        this.aiModule = aiModule;
         this.accomplishmentController = new AccomplishmentController(pluginId);
     }
     getGlobalEventTopic(preliminaryTopic) {
@@ -86,7 +98,24 @@ export class EventModule {
      * @param payload The payload to emit.
      */
     emitAccomplishment(payload) {
-        this.accomplishmentController.emitAccomplishment(payload);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (payload.type === 'macro') {
+                const sessionId = this.aiModule.getSessionTokenId();
+                if (sessionId) {
+                    try {
+                        yield fetch(`${this.backendUrl}/ai/session/${sessionId}/complete`, {
+                            method: 'PATCH',
+                            headers: { Authorization: `Bearer ${this.getToken()}` },
+                        });
+                    }
+                    catch (_a) {
+                        // non-fatal — session will expire naturally
+                    }
+                    this.aiModule.clearSessionToken();
+                }
+            }
+            this.accomplishmentController.emitAccomplishment(payload);
+        });
     }
     /**
      * Subscribe to an accomplishment.

package/dist/plugin/module/PluginModule.d.ts

@@ -1,9 +1,9 @@
-import { UserInfo } from '../../controller/SettingsController';
-import { RimoriCommunicationHandler, RimoriInfo } from '../CommunicationHandler';
+import { AIModule } from './AIModule';
+import { SupabaseClient } from '../CommunicationHandler';
+import { LanguageLevel } from '../../utils/difficultyConverter';
 import { Translator } from '../../controller/TranslationController';
 import { ActivePlugin, Plugin } from '../../fromRimori/PluginTypes';
-import { SupabaseClient } from '../CommunicationHandler';
-import { AIModule } from './AIModule';
+import { RimoriCommunicationHandler, RimoriInfo } from '../CommunicationHandler';
 export type Theme = 'light' | 'dark' | 'system';
 export type ApplicationMode = 'main' | 'sidebar' | 'settings';
 /**
@@ -11,11 +11,11 @@ export type ApplicationMode = 'main' | 'sidebar' | 'settings';
  * Provides access to plugin settings, user info, and plugin information.
  */
 export declare class PluginModule {
-    private settingsController;
-    private communicationHandler;
-    private translator;
-    private rimoriInfo;
     pluginId: string;
+    private rimoriInfo;
+    private translator;
+    private supabase;
+    private communicationHandler;
     /**
      * The release channel of this plugin installation.
      * Determines which database schema is used for plugin tables.
@@ -25,8 +25,18 @@ export declare class PluginModule {
     theme: Theme;
     constructor(supabase: SupabaseClient, communicationHandler: RimoriCommunicationHandler, info: RimoriInfo, ai: AIModule);
     /**
-     * Set the settings for the plugin.
-     * @param settings The settings to set.
+     * Fetches settings based on guild configuration.
+     * If guild doesn't allow user settings, fetches guild-level settings.
+     * Otherwise, fetches user-specific settings.
+     * @returns The settings object or null if not found.
+     */
+    private fetchSettings;
+    /**
+     * Sets settings for the plugin.
+     * Automatically saves as guild settings if guild doesn't allow user settings,
+     * otherwise saves as user-specific settings.
+     * @param settings - The settings object to save.
+     * @throws {Error} if RLS blocks the operation.
      */
     setSettings(settings: any): Promise<void>;
     /**
@@ -34,7 +44,7 @@ export declare class PluginModule {
      * @param defaultSettings The default settings to use if no settings are found.
      * @returns The settings for the plugin.
      */
-    getSettings<T extends object>(defaultSettings: T): Promise<T>;
+    getSettings<T>(defaultSettings: ExplicitUndefined<T>): Promise<ExplicitUndefined<T>>;
     /**
      * Get the current user info.
      * Note: For reactive updates in React components, use the userInfo from useRimori() hook instead.
@@ -79,3 +89,69 @@ export declare class PluginModule {
      */
     getTranslator(): Promise<Translator>;
 }
+export interface Buddy {
+    id: string;
+    name: string;
+    description: string;
+    avatarUrl: string;
+    voiceId: string;
+    aiPersonality: string;
+}
+export interface Language {
+    code: string;
+    name: string;
+    native: string;
+    capitalized: string;
+    uppercase: string;
+}
+export type UserRole = 'user' | 'plugin_moderator' | 'lang_moderator' | 'admin';
+export declare const LEARNING_REASONS: readonly ["work", "partner", "friends", "study", "living", "culture", "growth", "citizenship", "other"];
+export type LearningReason = (typeof LEARNING_REASONS)[number];
+export type ExplicitUndefined<T> = {
+    [K in keyof T]-?: T[K] | undefined;
+};
+export interface UserInfo {
+    /**
+     * The user's unique ID
+     */
+    user_id: string;
+    skill_level_reading: LanguageLevel;
+    skill_level_writing: LanguageLevel;
+    skill_level_grammar: LanguageLevel;
+    skill_level_speaking: LanguageLevel;
+    skill_level_listening: LanguageLevel;
+    skill_level_understanding: LanguageLevel;
+    study_buddy: Buddy;
+    study_duration: number;
+    /**
+     * The language the user speaks natively.
+     */
+    mother_tongue: Language;
+    /**
+     * The language the user targets to learn.
+     */
+    target_language: Language;
+    /**
+     * Why the user is learning the language
+     */
+    learning_reason: LearningReason;
+    /**
+     * Free-text personal interests
+     */
+    personal_interests: string;
+    onboarding_completed: boolean;
+    context_menu_on_select: boolean;
+    user_name?: string;
+    /**
+     * ISO 3166-1 alpha-2 country code of user's target location (exposed to plugins)
+     */
+    target_country: string;
+    /**
+     * 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;
+}

package/dist/plugin/module/PluginModule.js

@@ -7,7 +7,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { SettingsController } from '../../controller/SettingsController';
 import { Translator } from '../../controller/TranslationController';
 /**
  * Controller for plugin-related operations.
@@ -16,10 +15,10 @@ import { Translator } from '../../controller/TranslationController';
 export class PluginModule {
     constructor(supabase, communicationHandler, info, ai) {
         this.rimoriInfo = info;
-        this.communicationHandler = communicationHandler;
+        this.supabase = supabase;
         this.pluginId = info.pluginId;
         this.releaseChannel = info.releaseChannel;
-        this.settingsController = new SettingsController(supabase, info.pluginId, info.guild);
+        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.communicationHandler.onUpdate((updatedInfo) => (this.rimoriInfo = updatedInfo));
@@ -27,12 +26,84 @@ export class PluginModule {
         this.theme = this.communicationHandler.getQueryParam('rm_theme') || 'light';
     }
     /**
-     * Set the settings for the plugin.
-     * @param settings The settings to set.
+     * Fetches settings based on guild configuration.
+     * If guild doesn't allow user settings, fetches guild-level settings.
+     * 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;
+        });
+    }
+    /**
+     * Sets settings for the plugin.
+     * Automatically saves as guild settings if guild doesn't allow user settings,
+     * otherwise saves as user-specific settings.
+     * @param settings - The settings object to save.
+     * @throws {Error} if RLS blocks the operation.
      */
     setSettings(settings) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.settingsController.setSettings(settings);
+            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
+            }
+            // 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;
+            }
         });
     }
     /**
@@ -42,7 +113,21 @@ export class PluginModule {
      */
     getSettings(defaultSettings) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.settingsController.getSettings(defaultSettings);
+            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;
         });
     }
     /**
@@ -93,3 +178,14 @@ export class PluginModule {
         });
     }
 }
+export const LEARNING_REASONS = [
+    'work',
+    'partner',
+    'friends',
+    'study',
+    'living',
+    'culture',
+    'growth',
+    'citizenship',
+    'other',
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rimori/client",
-  "version": "2.5.14-next.3",
+  "version": "2.5.14-next.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": {

package/dist/controller/SettingsController.d.ts

@@ -1,93 +0,0 @@
-import { SupabaseClient } from '../plugin/CommunicationHandler';
-import { LanguageLevel } from '../utils/difficultyConverter';
-import { Guild } from '../plugin/CommunicationHandler';
-export interface Buddy {
-    id: string;
-    name: string;
-    description: string;
-    avatarUrl: string;
-    voiceId: string;
-    aiPersonality: string;
-}
-export interface Language {
-    code: string;
-    name: string;
-    native: string;
-    capitalized: string;
-    uppercase: string;
-}
-export type UserRole = 'user' | 'plugin_moderator' | 'lang_moderator' | 'admin';
-export declare const LEARNING_REASONS: readonly ["work", "partner", "friends", "study", "living", "culture", "growth", "citizenship", "other"];
-export type LearningReason = (typeof LEARNING_REASONS)[number];
-export interface UserInfo {
-    /**
-     * The user's unique ID
-     */
-    user_id: string;
-    skill_level_reading: LanguageLevel;
-    skill_level_writing: LanguageLevel;
-    skill_level_grammar: LanguageLevel;
-    skill_level_speaking: LanguageLevel;
-    skill_level_listening: LanguageLevel;
-    skill_level_understanding: LanguageLevel;
-    study_buddy: Buddy;
-    study_duration: number;
-    /**
-     * The language the user speaks natively.
-     */
-    mother_tongue: Language;
-    /**
-     * The language the user targets to learn.
-     */
-    target_language: Language;
-    /**
-     * Why the user is learning the language
-     */
-    learning_reason: LearningReason;
-    /**
-     * Free-text personal interests
-     */
-    personal_interests: string;
-    onboarding_completed: boolean;
-    context_menu_on_select: boolean;
-    user_name?: string;
-    /**
-     * ISO 3166-1 alpha-2 country code of user's target location (exposed to plugins)
-     */
-    target_country: string;
-    /**
-     * 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 declare class SettingsController {
-    private pluginId;
-    private supabase;
-    private guild;
-    constructor(supabase: SupabaseClient, pluginId: string, guild: Guild);
-    /**
-     * Fetches settings based on guild configuration.
-     * If guild doesn't allow user settings, fetches guild-level settings.
-     * Otherwise, fetches user-specific settings.
-     * @returns The settings object or null if not found.
-     */
-    private fetchSettings;
-    /**
-     * Sets settings for the plugin.
-     * Automatically saves as guild settings if guild doesn't allow user settings,
-     * otherwise saves as user-specific settings.
-     * @param settings - The settings object to save.
-     * @throws {Error} if RLS blocks the operation.
-     */
-    setSettings(settings: any): Promise<void>;
-    /**
-     * 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<T extends object>(defaultSettings: T): Promise<T>;
-}

package/dist/controller/SettingsController.js

@@ -1,132 +0,0 @@
-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());
-    });
-};
-export const LEARNING_REASONS = [
-    'work',
-    'partner',
-    'friends',
-    'study',
-    'living',
-    'culture',
-    'growth',
-    'citizenship',
-    'other',
-];
-export class SettingsController {
-    constructor(supabase, pluginId, guild) {
-        this.supabase = supabase;
-        this.pluginId = pluginId;
-        this.guild = guild;
-    }
-    /**
-     * Fetches settings based on guild configuration.
-     * If guild doesn't allow user settings, fetches guild-level settings.
-     * 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.guild.allowUserPluginSettings;
-            const { data } = yield this.supabase
-                .schema('public')
-                .from('plugin_settings')
-                .select('*')
-                .eq('plugin_id', this.pluginId)
-                .eq('guild_id', this.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;
-        });
-    }
-    /**
-     * Sets settings for the plugin.
-     * Automatically saves as guild settings if guild doesn't allow user settings,
-     * otherwise saves as user-specific settings.
-     * @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.guild.allowUserPluginSettings;
-            const payload = {
-                plugin_id: this.pluginId,
-                settings,
-                guild_id: this.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.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
-            }
-            // 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.guild.id)
-                        .eq('is_guild_setting', isGuildSetting);
-                    const { error: retryError } = yield (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;
-        });
-    }
-}