@rimori/client 2.5.57-next.0 → 2.5.57

package/dist/index.d.ts

@@ -7,6 +7,7 @@ export * from './cli/types/DatabaseTypes';
 export * from './cli/types/PromptTypes';
 export * from './plugin/TTS/MessageSender';
 export * from './utils/difficultyConverter';
+export { resolveEnvironment, type RimoriEnvironment } from './utils/environment';
 export * from './plugin/CommunicationHandler';
 export type { TOptions } from 'i18next';
 export { setupWorker } from './worker/WorkerSetup';

package/dist/index.js

@@ -8,6 +8,7 @@ export * from './cli/types/DatabaseTypes';
 export * from './cli/types/PromptTypes';
 export * from './plugin/TTS/MessageSender';
 export * from './utils/difficultyConverter';
+export { resolveEnvironment } from './utils/environment';
 export * from './plugin/CommunicationHandler';
 export { setupWorker } from './worker/WorkerSetup';
 export { AudioController } from './controller/AudioController';

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

@@ -56,10 +56,10 @@ export declare class PluginModule {
     setSettings(settings: any): Promise<void>;
     /**
      * Seeds the plugin's default settings row without ever clobbering an existing one.
-     * Used by getSettings when no row was read. Inserts the defaults; if a concurrent
-     * writer already created the row (unique-violation) — or it existed all along and
-     * the read merely missed it — re-reads and returns the persisted settings instead
-     * of the defaults. This keeps the read-triggered seed idempotent and race-safe.
+     * Used by getSettings when no row was read. Inserts the defaults if absent; if a
+     * concurrent writer already created the row — or it existed all along and the read
+     * merely missed it — re-reads and returns the persisted settings instead of the
+     * defaults. This keeps the read-triggered seed idempotent and race-safe.
      */
     private seedDefaultSettings;
     /**
@@ -145,8 +145,6 @@ export type SubscriptionTier = 'anonymous' | 'free' | 'standard' | 'premium' | '
 export declare const TIER_ORDER: SubscriptionTier[];
 /** Ordered roles from lowest to highest access level */
 export declare const ROLE_ORDER: UserRole[];
-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 Exclude<keyof T, never>]-?: {} extends Pick<T, K> ? T[K] | undefined : T[K];
 };
@@ -177,14 +175,6 @@ export interface UserInfo {
      * 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;

package/dist/plugin/module/PluginModule.js

@@ -101,10 +101,10 @@ export class PluginModule {
             settings,
             guild_id: this.rimoriInfo.guild.id,
             is_guild_setting: isGuildSetting,
+            // Explicit so the value is also the ON CONFLICT arbiter key on the upsert
+            // fallback below. For user settings this equals the column default auth.uid().
+            user_id: isGuildSetting ? null : this.rimoriInfo.profile.user_id,
         };
-        if (isGuildSetting) {
-            payload.user_id = null;
-        }
         // Try UPDATE first (safe with RLS). If nothing updated, INSERT.
         const updateQuery = this.supabase
             .schema('public')
@@ -127,33 +127,30 @@ export class PluginModule {
         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);
+        // No row updated -> INSERT. upsert (INSERT ... ON CONFLICT DO UPDATE) instead
+        // of a bare insert so a concurrent first-time writer that beat us to the row
+        // doesn't turn this into a 23505 / HTTP 409 in the browser console. The
+        // onConflict key names the non-partial ux_plugin_settings_guild_plugin_user_nnd
+        // index — a partial index can't be an ON CONFLICT arbiter without its predicate.
+        const { error: insertError } = await this.supabase
+            .schema('public')
+            .from('plugin_settings')
+            .upsert(payload, { onConflict: 'guild_id,plugin_id,user_id' });
         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;
-            }
             // Write failed — drop the optimistic cache so reads refetch the truth.
             this.settingsPromise = undefined;
+            if (insertError.code === '42501' || insertError.message?.includes('policy')) {
+                throw new Error(`Cannot set ${isGuildSetting ? 'guild' : 'user'} settings: Permission denied.`);
+            }
             throw insertError;
         }
     }
     /**
      * Seeds the plugin's default settings row without ever clobbering an existing one.
-     * Used by getSettings when no row was read. Inserts the defaults; if a concurrent
-     * writer already created the row (unique-violation) — or it existed all along and
-     * the read merely missed it — re-reads and returns the persisted settings instead
-     * of the defaults. This keeps the read-triggered seed idempotent and race-safe.
+     * Used by getSettings when no row was read. Inserts the defaults if absent; if a
+     * concurrent writer already created the row — or it existed all along and the read
+     * merely missed it — re-reads and returns the persisted settings instead of the
+     * defaults. This keeps the read-triggered seed idempotent and race-safe.
      */
     async seedDefaultSettings(defaults) {
         const isGuildSetting = !this.rimoriInfo.guild.allowUserPluginSettings;
@@ -162,20 +159,27 @@ export class PluginModule {
             settings: defaults,
             guild_id: this.rimoriInfo.guild.id,
             is_guild_setting: isGuildSetting,
+            // Explicit so it is also the ON CONFLICT arbiter key. For user settings this
+            // equals the column default auth.uid().
+            user_id: isGuildSetting ? null : this.rimoriInfo.profile.user_id,
         };
-        if (isGuildSetting) {
-            payload.user_id = null;
-        }
-        const { error } = await this.supabase.schema('public').from('plugin_settings').insert(payload);
+        // upsert with ignoreDuplicates => INSERT ... ON CONFLICT DO NOTHING, which
+        // succeeds for BOTH racers: the loser gets a 204, not a 23505 / HTTP 409 in
+        // the console. During first onboarding the federated main panel and the plugin
+        // worker run independent Supabase clients with independent single-flight caches
+        // and both reach this branch before any row exists. onConflict names the
+        // non-partial ux_plugin_settings_guild_plugin_user_nnd index — a partial index
+        // cannot be an ON CONFLICT arbiter without its predicate, which PostgREST
+        // cannot send.
+        const { error } = await this.supabase
+            .schema('public')
+            .from('plugin_settings')
+            .upsert(payload, { onConflict: 'guild_id,plugin_id,user_id', ignoreDuplicates: true });
         if (!error) {
-            // Keep the read cache consistent with what we just persisted.
-            this.settingsPromise = Promise.resolve(defaults);
-            return defaults;
-        }
-        // Row already exists (another instance won the race, or the earlier read missed
-        // it). Adopt the persisted row rather than overwriting it with our defaults.
-        if (error.code === '23505' /* unique_violation */) {
-            this.settingsPromise = undefined; // force a fresh refetch
+            // Our defaults may or may not be the row that landed. Re-read the
+            // authoritative row rather than assuming we won — a concurrent writer may
+            // have already persisted richer state (e.g. is_inited:true).
+            this.settingsPromise = undefined;
             const existing = await this.fetchSettings();
             return existing ?? defaults;
         }
@@ -200,9 +204,9 @@ export class PluginModule {
             // runtime with its own client + single-flight cache and so doesn't share the
             // in-flight dedupe above. They all reach this null branch before any row exists
             // and race to create it. An unconditional write here both 409s on the unique
-            // index (ux_plugin_settings_guild_plugin_user) and lets a loser clobber a
-            // freshly-persisted row (e.g. is_inited:true) back to defaults. Insert-if-absent
-            // and adopt the existing row on conflict — this also guards against a transient
+            // index and lets a loser clobber a freshly-persisted row (e.g. is_inited:true)
+            // back to defaults. seedDefaultSettings does INSERT ... ON CONFLICT DO NOTHING
+            // and adopts the existing row on conflict — this also guards against a transient
             // read miss (fetchSettings swallows errors → null) overwriting good data.
             return (await this.seedDefaultSettings(defaultSettings));
         }
@@ -289,14 +293,3 @@ export class PluginModule {
 export const TIER_ORDER = ['anonymous', 'free', 'standard', 'premium', 'early_access'];
 /** Ordered roles from lowest to highest access level */
 export const ROLE_ORDER = ['user', 'plugin_moderator', 'lang_moderator', 'admin'];
-export const LEARNING_REASONS = [
-    'work',
-    'partner',
-    'friends',
-    'study',
-    'living',
-    'culture',
-    'growth',
-    'citizenship',
-    'other',
-];

package/dist/utils/environment.d.ts

@@ -0,0 +1,13 @@
+export type RimoriEnvironment = 'prod' | 'dev' | 'local';
+/**
+ * Resolves the deployment environment from the hostname.
+ *
+ * `import.meta.env.DEV` only distinguishes a local dev build from anything deployed — it cannot
+ * tell prod (`app.rimori.se`) apart from the deployed dev stack (`dev-app.rimori.se`), so events
+ * from both used to land in the same bucket. The hostname is the authoritative signal; it is also
+ * what VoiceDebugStore's isProdHost() uses, and federated plugins share rimori-main's window, so
+ * plugin code sees the host's hostname here too.
+ *
+ * `local` is the "do not report" answer: callers must skip PostHog init entirely for it.
+ */
+export declare function resolveEnvironment(hostname?: string): RimoriEnvironment;

package/dist/utils/environment.js

@@ -0,0 +1,22 @@
+/**
+ * Resolves the deployment environment from the hostname.
+ *
+ * `import.meta.env.DEV` only distinguishes a local dev build from anything deployed — it cannot
+ * tell prod (`app.rimori.se`) apart from the deployed dev stack (`dev-app.rimori.se`), so events
+ * from both used to land in the same bucket. The hostname is the authoritative signal; it is also
+ * what VoiceDebugStore's isProdHost() uses, and federated plugins share rimori-main's window, so
+ * plugin code sees the host's hostname here too.
+ *
+ * `local` is the "do not report" answer: callers must skip PostHog init entirely for it.
+ */
+export function resolveEnvironment(hostname) {
+    const host = hostname ?? (typeof window !== 'undefined' ? window.location.hostname : '');
+    if (host === 'app.rimori.se' || host === 'rimori.se' || host === 'www.rimori.se')
+        return 'prod';
+    if (host === 'dev-app.rimori.se' || host === 'dev.rimori.se')
+        return 'dev';
+    // Other *.rimori.se hosts are deployed preview/dev surfaces, never a developer machine.
+    if (host.endsWith('.rimori.se'))
+        return 'dev';
+    return 'local';
+}

package/dist/utils/environment.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utils/environment.test.js

@@ -0,0 +1,18 @@
+import { describe, expect, it } from 'vitest';
+import { resolveEnvironment } from './environment';
+describe('resolveEnvironment', () => {
+    it.each([
+        ['app.rimori.se', 'prod'],
+        ['rimori.se', 'prod'],
+        ['www.rimori.se', 'prod'],
+        ['dev-app.rimori.se', 'dev'],
+        ['dev.rimori.se', 'dev'],
+        // Any other deployed *.rimori.se surface is a dev surface, never a developer machine.
+        ['preview.rimori.se', 'dev'],
+        ['localhost', 'local'],
+        ['127.0.0.1', 'local'],
+        ['', 'local'],
+    ])('maps %s to %s', (hostname, expected) => {
+        expect(resolveEnvironment(hostname)).toBe(expected);
+    });
+});

package/package.json

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