@rimori/client 1.0.4 → 1.0.5

package/dist/controller/SettingsController.d.ts

@@ -2,25 +2,33 @@ import { SupabaseClient } from "@supabase/supabase-js";
 import { LanguageLevel } from "../utils/difficultyConverter";
 export interface UserInfo {
     motherTongue: string;
-    languageLevel: LanguageLevel;
-    contextMenuOnSelect: boolean;
-}
-export interface SystemSettings {
+    xp: number;
+    listening_level: LanguageLevel;
+    reading_level: LanguageLevel;
+    speaking_level: LanguageLevel;
+    writing_level: LanguageLevel;
+    understanding_level: LanguageLevel;
+    grammar_level: LanguageLevel;
+    longterm_goal: string;
+    motivation_type: string;
+    study_buddy: string;
+    preferred_genre: string;
+    milestone: string;
+    settings: {
+        contextMenuOnSelect: boolean;
+    };
 }
 export declare class SettingsController {
     private pluginId;
     private supabase;
     constructor(supabase: SupabaseClient, pluginId: string);
-    private getSettingsType;
     private fetchSettings;
-    private saveSettings;
+    setSettings(settings: any): Promise<void>;
     getUserInfo(): Promise<UserInfo>;
     /**
      * 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.
-     * @param genericSettings The type of settings to get.
      * @returns The settings for the plugin.
      */
-    getSettings<T extends object>(defaultSettings: T, genericSettings?: "user" | "system"): Promise<T>;
-    setSettings(settings: any, genericSettings?: "user" | "system"): Promise<void>;
+    getSettings<T extends object>(defaultSettings: T): Promise<T>;
 }

package/dist/controller/SettingsController.js

@@ -12,50 +12,56 @@ export class SettingsController {
         this.supabase = supabase;
         this.pluginId = pluginId;
     }
-    getSettingsType(genericSettings) {
-        return genericSettings || "plugin";
-    }
-    fetchSettings(type) {
+    fetchSettings() {
         return __awaiter(this, void 0, void 0, function* () {
-            const pluginId = type === "plugin" ? this.pluginId : type;
-            const { data } = yield this.supabase.from("plugin_settings").select("*").eq("plugin_id", pluginId);
+            const { data } = yield this.supabase.from("plugin_settings").select("*").eq("plugin_id", this.pluginId);
             if (!data || data.length === 0) {
                 return null;
             }
             return data[0].settings;
         });
     }
-    saveSettings(settings, type) {
+    setSettings(settings) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (type !== "plugin") {
-                throw new Error(`Cannot modify ${type} settings`);
-            }
             yield this.supabase.from("plugin_settings").upsert({ plugin_id: this.pluginId, settings });
         });
     }
     getUserInfo() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.getSettings({
-                motherTongue: "sv",
-                languageLevel: "A1",
-                contextMenuOnSelect: true,
-            }, "user");
+            const { data } = yield this.supabase.from("profiles").select("*");
+            if (!data || data.length === 0) {
+                return {
+                    motherTongue: "en",
+                    xp: 0,
+                    listening_level: "Pre-A1",
+                    reading_level: "Pre-A1",
+                    speaking_level: "Pre-A1",
+                    writing_level: "Pre-A1",
+                    understanding_level: "Pre-A1",
+                    grammar_level: "Pre-A1",
+                    longterm_goal: "",
+                    motivation_type: "self-motivated",
+                    study_buddy: "clarence",
+                    preferred_genre: "adventure",
+                    milestone: "",
+                    settings: {
+                        contextMenuOnSelect: false,
+                    }
+                };
+            }
+            return data[0];
         });
     }
     /**
      * 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.
-     * @param genericSettings The type of settings to get.
      * @returns The settings for the plugin.
      */
-    getSettings(defaultSettings, genericSettings) {
+    getSettings(defaultSettings) {
         return __awaiter(this, void 0, void 0, function* () {
-            const type = this.getSettingsType(genericSettings);
-            const storedSettings = yield this.fetchSettings(type);
+            const storedSettings = yield this.fetchSettings();
             if (!storedSettings) {
-                if (type === "plugin") {
-                    yield this.saveSettings(defaultSettings, type);
-                }
+                yield this.setSettings(defaultSettings);
                 return defaultSettings;
             }
             // Handle settings migration
@@ -64,18 +70,10 @@ export class SettingsController {
             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);
-                if (type === "plugin") {
-                    yield this.saveSettings(mergedSettings, type);
-                }
+                yield this.setSettings(mergedSettings);
                 return mergedSettings;
             }
             return storedSettings;
         });
     }
-    setSettings(settings, genericSettings) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const type = this.getSettingsType(genericSettings);
-            yield this.saveSettings(settings, type);
-        });
-    }
 }

package/dist/plugin/PluginController.js

@@ -11,7 +11,6 @@ import { createClient } from '@supabase/supabase-js';
 import { RimoriClient } from "./RimoriClient";
 import { EventBus } from './fromRimori/EventBus';
 import { setTheme } from './ThemeSetter';
-setTheme();
 export class PluginController {
     constructor(pluginId) {
         this.communicationSecret = null;
@@ -19,6 +18,9 @@ export class PluginController {
         this.supabaseInfo = null;
         this.pluginId = pluginId;
         this.getClient = this.getClient.bind(this);
+        if (typeof WorkerGlobalScope === 'undefined') {
+            setTheme();
+        }
         window.addEventListener("message", (event) => {
             // console.log("client: message received", event);
             const { topic, sender, data, eventId } = event.data.event;

package/dist/plugin/ThemeSetter.js

@@ -1,13 +1,13 @@
 export function setTheme() {
     const urlParams = new URLSearchParams(window.location.search);
     let theme = urlParams.get('theme');
-    const isSidebar = urlParams.get('applicationMode') === "sidebar";
     if (!theme || theme === 'system') {
         theme = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
     }
     document.documentElement.classList.add("dark:text-gray-200", "bg-white");
     if (theme === 'dark') {
-        document.documentElement.classList.add('dark', isSidebar ? "bg-gray-920" : "bg-gray-950");
-        document.documentElement.style.background = isSidebar ? "rgb(6, 12, 30)" : "rgb(3, 7, 18)";
+        document.documentElement.setAttribute("data-theme", "dark");
+        document.documentElement.classList.add('dark', "bg-gray-950");
+        document.documentElement.style.background = "hsl(var(--background))";
     }
 }

package/dist/worker/WorkerSetup.js

@@ -19,6 +19,7 @@ let debugEnabled = false;
 export function setupWorker(init) {
     // Mock of the window object for the worker context to be able to use the PluginController.
     const mockWindow = {
+        isWorker: true,
         location: { search: '?secret=123' },
         parent: {
             postMessage: (message) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rimori/client",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {
@@ -32,6 +32,7 @@
     "@tiptap/starter-kit": "2.10.3",
     "uuid": "11.1.0",
     "react-icons": "^5.4.0",
+    "react-markdown": "^10.1.0",
     "tiptap-markdown": "^0.8.10",
     "typescript": "^5.7.2"
   },

package/src/controller/SettingsController.ts

@@ -1,16 +1,23 @@
 import { SupabaseClient } from "@supabase/supabase-js";
 import { LanguageLevel } from "../utils/difficultyConverter";
 
-type SettingsType = "user" | "system" | "plugin";
-
 export interface UserInfo {
     motherTongue: string;
-    languageLevel: LanguageLevel;
-    contextMenuOnSelect: boolean;
-}
-
-export interface SystemSettings {
-    // TODO: add system settings
+    xp: number;
+    listening_level: LanguageLevel;
+    reading_level: LanguageLevel;
+    speaking_level: LanguageLevel;
+    writing_level: LanguageLevel;
+    understanding_level: LanguageLevel;
+    grammar_level: LanguageLevel;
+    longterm_goal: string;
+    motivation_type: string;
+    study_buddy: string;
+    preferred_genre: string;
+    milestone: string;
+    settings: {
+        contextMenuOnSelect: boolean;
+    }
 }
 
 export class SettingsController {
@@ -22,13 +29,8 @@ export class SettingsController {
         this.pluginId = pluginId;
     }
 
-    private getSettingsType(genericSettings?: "user" | "system"): SettingsType {
-        return genericSettings || "plugin";
-    }
-
-    private async fetchSettings(type: SettingsType): Promise<any | null> {
-        const pluginId = type === "plugin" ? this.pluginId : type;
-        const { data } = await this.supabase.from("plugin_settings").select("*").eq("plugin_id", pluginId)
+    private async fetchSettings(): Promise<any | null> {
+        const { data } = await this.supabase.from("plugin_settings").select("*").eq("plugin_id", this.pluginId)
 
         if (!data || data.length === 0) {
             return null;
@@ -37,36 +39,47 @@ export class SettingsController {
         return data[0].settings;
     }
 
-    private async saveSettings(settings: any, type: SettingsType): Promise<void> {
-        if (type !== "plugin") {
-            throw new Error(`Cannot modify ${type} settings`);
-        }
-
+    public async setSettings(settings: any): Promise<void> {
         await this.supabase.from("plugin_settings").upsert({ plugin_id: this.pluginId, settings });
     }
 
     public async getUserInfo(): Promise<UserInfo> {
-        return this.getSettings<UserInfo>({
-            motherTongue: "sv",
-            languageLevel: "A1",
-            contextMenuOnSelect: true,
-        }, "user");
+        const { data } = await this.supabase.from("profiles").select("*");
+
+        if (!data || data.length === 0) {
+            return {
+                motherTongue: "en",
+                xp: 0,
+                listening_level: "Pre-A1",
+                reading_level: "Pre-A1",
+                speaking_level: "Pre-A1",
+                writing_level: "Pre-A1",
+                understanding_level: "Pre-A1",
+                grammar_level: "Pre-A1",
+                longterm_goal: "",
+                motivation_type: "self-motivated",
+                study_buddy: "clarence",
+                preferred_genre: "adventure",
+                milestone: "",
+                settings: {
+                    contextMenuOnSelect: false,
+                }
+            }
+        }
+
+        return data[0];
     }
 
     /**
      * 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.
-     * @param genericSettings The type of settings to get.
      * @returns The settings for the plugin. 
      */
-    public async getSettings<T extends object>(defaultSettings: T, genericSettings?: "user" | "system"): Promise<T> {
-        const type = this.getSettingsType(genericSettings);
-        const storedSettings = await this.fetchSettings(type) as T | null;
+    public async getSettings<T extends object>(defaultSettings: T): Promise<T> {
+        const storedSettings = await this.fetchSettings() as T | null;
 
         if (!storedSettings) {
-            if (type === "plugin") {
-                await this.saveSettings(defaultSettings, type);
-            }
+            await this.setSettings(defaultSettings);
             return defaultSettings;
         }
 
@@ -80,17 +93,10 @@ export class SettingsController {
             );
             const mergedSettings = { ...defaultSettings, ...validStoredSettings } as T;
 
-            if (type === "plugin") {
-                await this.saveSettings(mergedSettings, type);
-            }
+            await this.setSettings(mergedSettings);
             return mergedSettings;
         }
 
         return storedSettings;
     }
-
-    public async setSettings(settings: any, genericSettings?: "user" | "system"): Promise<void> {
-        const type = this.getSettingsType(genericSettings);
-        await this.saveSettings(settings, type);
-    }
 }

package/src/plugin/PluginController.ts

@@ -3,7 +3,8 @@ import { RimoriClient } from "./RimoriClient";
 import { EventBus, EventBusMessage } from './fromRimori/EventBus';
 import { setTheme } from './ThemeSetter';
 
-setTheme();
+// Add declaration for WorkerGlobalScope
+declare const WorkerGlobalScope: any;
 
 interface SupabaseInfo {
     url: string,
@@ -26,6 +27,10 @@ export class PluginController {
         this.pluginId = pluginId;
         this.getClient = this.getClient.bind(this);
 
+        if (typeof WorkerGlobalScope === 'undefined') {
+            setTheme();
+        }
+
         window.addEventListener("message", (event) => {
             // console.log("client: message received", event);
             const { topic, sender, data, eventId } = event.data.event as EventBusMessage;
@@ -72,7 +77,7 @@ export class PluginController {
             return { supabase: this.supabase, tablePrefix: this.supabaseInfo.tablePrefix, pluginId: this.supabaseInfo.pluginId };
         }
 
-        const {data} = await EventBus.request<SupabaseInfo>(this.pluginId, "global.supabase.requestAccess");
+        const { data } = await EventBus.request<SupabaseInfo>(this.pluginId, "global.supabase.requestAccess");
         this.supabaseInfo = data;
         this.supabase = createClient(this.supabaseInfo.url, this.supabaseInfo.key, {
             accessToken: () => Promise.resolve(this.getToken())
@@ -86,7 +91,7 @@ export class PluginController {
             return this.supabaseInfo.token;
         }
 
-        const {data} = await EventBus.request<{ token: string, expiration: Date }>(this.pluginId, "global.supabase.requestAccess");
+        const { data } = await EventBus.request<{ token: string, expiration: Date }>(this.pluginId, "global.supabase.requestAccess");
 
         if (!this.supabaseInfo) {
             throw new Error("Supabase info not found");

package/src/plugin/ThemeSetter.ts

@@ -2,8 +2,6 @@ export function setTheme() {
   const urlParams = new URLSearchParams(window.location.search);
 
   let theme = urlParams.get('theme');
-  const isSidebar = urlParams.get('applicationMode') === "sidebar";
-
   if (!theme || theme === 'system') {
     theme = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
   }
@@ -11,7 +9,8 @@ export function setTheme() {
   document.documentElement.classList.add("dark:text-gray-200", "bg-white");
 
   if (theme === 'dark') {
-    document.documentElement.classList.add('dark', isSidebar ? "bg-gray-920" : "bg-gray-950");
-    document.documentElement.style.background = isSidebar ? "rgb(6, 12, 30)" : "rgb(3, 7, 18)";
+    document.documentElement.setAttribute("data-theme", "dark");
+    document.documentElement.classList.add('dark', "bg-gray-950");
+    document.documentElement.style.background = "hsl(var(--background))";
   }
 }

package/src/worker/WorkerSetup.ts

@@ -13,6 +13,7 @@ let debugEnabled = false;
 export function setupWorker(init: (controller: RimoriClient) => void | Promise<void>) {
   // Mock of the window object for the worker context to be able to use the PluginController.
   const mockWindow = {
+    isWorker: true,
     location: { search: '?secret=123' },
     parent: {
       postMessage: (message: { event: EventBusMessage }) => {