@rimori/client 2.5.43-next.0 → 2.5.44-next.0

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

@@ -30,6 +30,14 @@ export declare class PluginModule {
     * Updated automatically when the user toggles TTS.
     */
     ttsEnabled: boolean;
+    /**
+     * Single-flight cache for the plugin settings row. Holds the in-flight (or
+     * resolved) promise, not the value, so concurrent getSettings() callers join
+     * one GET instead of each issuing their own.
+     */
+    private settingsPromise?;
+    /** Key-count migration runs at most once per plugin lifetime, not per read. */
+    private migrationDone;
     constructor(supabase: SupabaseClient, communicationHandler: RimoriCommunicationHandler, info: RimoriInfo, ai: AIModule, eventBus: EventBusHandler);
     /**
      * Fetches settings based on guild configuration.

package/dist/plugin/module/PluginModule.js

@@ -22,6 +22,14 @@ export class PluginModule {
     * Updated automatically when the user toggles TTS.
     */
     ttsEnabled = true;
+    /**
+     * Single-flight cache for the plugin settings row. Holds the in-flight (or
+     * resolved) promise, not the value, so concurrent getSettings() callers join
+     * one GET instead of each issuing their own.
+     */
+    settingsPromise;
+    /** Key-count migration runs at most once per plugin lifetime, not per read. */
+    migrationDone = false;
     constructor(supabase, communicationHandler, info, ai, eventBus) {
         this.rimoriInfo = info;
         this.supabase = supabase;
@@ -33,6 +41,12 @@ export class PluginModule {
         this.translator = new Translator(info.interfaceLanguage, currentPlugin?.endpoint || '', ai);
         this.ttsEnabled = info.ttsEnabled ?? true;
         this.communicationHandler.onUpdate((updatedInfo) => {
+            // Settings are keyed by guild id — bust the cache if the guild changed so
+            // we don't serve another guild's settings from a stale promise.
+            if (updatedInfo.guild.id !== this.rimoriInfo.guild.id) {
+                this.settingsPromise = undefined;
+                this.migrationDone = false;
+            }
             this.rimoriInfo = updatedInfo;
             this.ttsEnabled = updatedInfo.ttsEnabled ?? true;
         });
@@ -46,16 +60,28 @@ export class PluginModule {
      * @returns The settings object or null if not found.
      */
     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;
+        // Join the in-flight request if one already exists.
+        if (this.settingsPromise)
+            return this.settingsPromise;
+        const promise = (async () => {
+            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);
+        })();
+        this.settingsPromise = promise;
+        // Don't poison the cache: drop a failed fetch so the next caller retries.
+        promise.catch(() => {
+            if (this.settingsPromise === promise)
+                this.settingsPromise = undefined;
+        });
+        return promise;
     }
     /**
      * Sets settings for the plugin.
@@ -65,6 +91,8 @@ export class PluginModule {
      * @throws {Error} if RLS blocks the operation.
      */
     async setSettings(settings) {
+        // Keep the read cache consistent with what we're about to persist.
+        this.settingsPromise = Promise.resolve(settings);
         const isGuildSetting = !this.rimoriInfo.guild.allowUserPluginSettings;
         const payload = {
             plugin_id: this.pluginId,
@@ -88,6 +116,8 @@ export class PluginModule {
             : updateQuery.select());
         if (updateError) {
             if (updateError.code === '42501' || updateError.message?.includes('policy')) {
+                // Write failed — drop the optimistic cache so reads refetch the truth.
+                this.settingsPromise = undefined;
                 throw new Error(`Cannot set ${isGuildSetting ? 'guild' : 'user'} settings: Permission denied.`);
             }
             // proceed to try insert in case of other issues
@@ -111,6 +141,8 @@ export class PluginModule {
                 if (!retryError)
                     return;
             }
+            // Write failed — drop the optimistic cache so reads refetch the truth.
+            this.settingsPromise = undefined;
             throw insertError;
         }
     }
@@ -125,14 +157,19 @@ export class PluginModule {
             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;
+        // Key-count migration runs at most once per plugin lifetime. Concurrent callers
+        // share the fetchSettings promise; the first to resume here flips the flag (a
+        // synchronous step before the next await), so the rest skip the redundant PATCH.
+        if (!this.migrationDone) {
+            this.migrationDone = true;
+            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;
     }

package/package.json

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