@rimori/client 1.0.4 → 1.1.0

package/README.md

@@ -48,4 +48,17 @@ Inside the pages simply use the `usePlugin` hook.
 
 ```typescript
 const { getSettings, ... } = usePlugin();
+```
+
+If you use the components then you need to add the library to tailwind.config.js
+
+```javascript
+export default {
+  darkMode: ["class"],  // to detect the dark mode set by the plugin
+  content: [
+    ....
+    "node_modules/@rimori/client/dist/components/**/*.{js,jsx}",
+  ],
+  ....
+}
 ```

package/dist/components/MarkdownEditor.js

@@ -29,12 +29,14 @@ const MenuBar = () => {
 const extensions = [
     StarterKit.configure({
         bulletList: {
-            keepMarks: true,
-            keepAttributes: false,
+            HTMLAttributes: {
+                class: "list-disc list-inside dark:text-white p-1 mt-1 [&_li]:mb-1 [&_p]:inline m-0",
+            },
         },
         orderedList: {
-            keepMarks: true,
-            keepAttributes: false,
+            HTMLAttributes: {
+                className: "list-decimal list-inside dark:text-white p-1 mt-1 [&_li]:mb-1 [&_p]:inline m-0",
+            },
         },
     }),
     Markdown,

package/dist/components/PluginController.d.ts

@@ -0,0 +1,21 @@
+import { SupabaseClient } from '@supabase/supabase-js';
+import { RimoriClient } from "../plugin/RimoriClient";
+export declare class PluginController {
+    private static client;
+    private static instance;
+    private communicationSecret;
+    private supabase;
+    private supabaseInfo;
+    private pluginId;
+    private constructor();
+    static getInstance(sender: string): Promise<RimoriClient>;
+    private getSecret;
+    getClient(): Promise<{
+        supabase: SupabaseClient;
+        tablePrefix: string;
+        pluginId: string;
+    }>;
+    getToken(): Promise<string>;
+    getSupabaseUrl(): string;
+    getGlobalEventTopic(preliminaryTopic: string): string;
+}

package/dist/components/PluginController.js

@@ -0,0 +1,116 @@
+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 { createClient } from '@supabase/supabase-js';
+import { EventBus } from '../plugin/fromRimori/EventBus';
+import { RimoriClient } from "../plugin/RimoriClient";
+import { setTheme } from '../plugin/ThemeSetter';
+export class PluginController {
+    constructor(pluginId) {
+        this.communicationSecret = null;
+        this.supabase = null;
+        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;
+            // skip forwarding messages from own plugin
+            if (sender === pluginId)
+                return;
+            EventBus.emit(sender, topic, data, eventId);
+        });
+        EventBus.on("*", (event) => {
+            // skip messages which are not from the own plugin
+            if (event.sender !== this.pluginId)
+                return;
+            if (event.topic.startsWith("self."))
+                return;
+            window.parent.postMessage({ event, secret: this.getSecret() }, "*");
+        });
+    }
+    static getInstance(sender) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!PluginController.instance) {
+                PluginController.instance = new PluginController(sender);
+                PluginController.client = yield RimoriClient.getInstance(PluginController.instance);
+            }
+            return PluginController.client;
+        });
+    }
+    getSecret() {
+        if (!this.communicationSecret) {
+            const secret = new URLSearchParams(window.location.search).get("secret");
+            if (!secret) {
+                throw new Error("Communication secret not found in URL as query parameter");
+            }
+            this.communicationSecret = secret;
+        }
+        return this.communicationSecret;
+    }
+    getClient() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.supabase &&
+                this.supabaseInfo &&
+                this.supabaseInfo.expiration > new Date()) {
+                return { supabase: this.supabase, tablePrefix: this.supabaseInfo.tablePrefix, pluginId: this.supabaseInfo.pluginId };
+            }
+            const { data } = yield EventBus.request(this.pluginId, "global.supabase.requestAccess");
+            this.supabaseInfo = data;
+            this.supabase = createClient(this.supabaseInfo.url, this.supabaseInfo.key, {
+                accessToken: () => Promise.resolve(this.getToken())
+            });
+            return { supabase: this.supabase, tablePrefix: this.supabaseInfo.tablePrefix, pluginId: this.supabaseInfo.pluginId };
+        });
+    }
+    getToken() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.supabaseInfo && this.supabaseInfo.expiration && this.supabaseInfo.expiration > new Date()) {
+                return this.supabaseInfo.token;
+            }
+            const { data } = yield EventBus.request(this.pluginId, "global.supabase.requestAccess");
+            if (!this.supabaseInfo) {
+                throw new Error("Supabase info not found");
+            }
+            this.supabaseInfo.token = data.token;
+            this.supabaseInfo.expiration = data.expiration;
+            return this.supabaseInfo.token;
+        });
+    }
+    getSupabaseUrl() {
+        if (!this.supabaseInfo) {
+            throw new Error("Supabase info not found");
+        }
+        return this.supabaseInfo.url;
+    }
+    getGlobalEventTopic(preliminaryTopic) {
+        var _a, _b;
+        if (preliminaryTopic.startsWith("global.")) {
+            return preliminaryTopic;
+        }
+        if (preliminaryTopic.startsWith("self.")) {
+            return preliminaryTopic;
+        }
+        const topicParts = preliminaryTopic.split(".");
+        if (topicParts.length === 3) {
+            if (!topicParts[0].startsWith("pl") && topicParts[0] !== "global") {
+                throw new Error("The event topic must start with the plugin id or 'global'.");
+            }
+            return preliminaryTopic;
+        }
+        else if (topicParts.length > 3) {
+            throw new Error(`The event topic must consist of 3 parts. <pluginId>.<topic area>.<action>. Received: ${preliminaryTopic}`);
+        }
+        const topicRoot = (_b = (_a = this.supabaseInfo) === null || _a === void 0 ? void 0 : _a.pluginId) !== null && _b !== void 0 ? _b : "global";
+        return `${topicRoot}.${preliminaryTopic}`;
+    }
+}

package/dist/components/ai/Assistant.js

@@ -15,7 +15,7 @@ export function AssistantChat({ avatarImageUrl, voiceId, onComplete, autoStartCo
     const { messages, append, isLoading, setMessages } = useChat();
     const lastAssistantMessage = (_a = [...messages].filter((m) => m.role === 'assistant').pop()) === null || _a === void 0 ? void 0 : _a.content;
     useEffect(() => {
-        sender.setOnLoudnessChange((value) => event.emit('self.avatar.triggerLoudness', value));
+        sender.setOnLoudnessChange((value) => event.emit('self.avatar.triggerLoudness', { loudness: value }));
         if (!autoStartConversation) {
             return;
         }

package/dist/components/ai/Avatar.d.ts

@@ -1,11 +1,13 @@
 import { Tool } from '../../core';
 import { FirstMessages } from './utils';
 interface Props {
-    title?: string;
     voiceId: any;
-    avatarImageUrl: string;
     agentTools: Tool[];
+    avatarImageUrl: string;
+    circleSize?: string;
+    isDarkTheme?: boolean;
+    children?: React.ReactNode;
     autoStartConversation?: FirstMessages;
 }
-export declare function Avatar({ avatarImageUrl, voiceId, title, agentTools, autoStartConversation }: Props): import("react/jsx-runtime").JSX.Element;
+export declare function Avatar({ avatarImageUrl, voiceId, agentTools, autoStartConversation, children, isDarkTheme, circleSize }: Props): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/ai/Avatar.js

@@ -1,20 +1,27 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useEffect, useMemo } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { VoiceRecorder } from './EmbeddedAssistent/VoiceRecoder';
 import { MessageSender } from './EmbeddedAssistent/TTS/MessageSender';
 import { CircleAudioAvatar } from './EmbeddedAssistent/CircleAudioAvatar';
 import { useChat } from '../../hooks/UseChatHook';
 import { usePlugin } from '../../components';
 import { getFirstMessages } from './utils';
-export function Avatar({ avatarImageUrl, voiceId, title, agentTools, autoStartConversation }) {
+export function Avatar({ avatarImageUrl, voiceId, agentTools, autoStartConversation, children, isDarkTheme = false, circleSize = "300px" }) {
     const { llm, event } = usePlugin();
+    const [agentReplying, setAgentReplying] = useState(false);
+    const [isProcessingMessage, setIsProcessingMessage] = useState(false);
     const sender = useMemo(() => new MessageSender(llm.getVoice, voiceId), []);
     const { messages, append, isLoading, lastMessage, setMessages } = useChat(agentTools);
     useEffect(() => {
         console.log("messages", messages);
     }, [messages]);
     useEffect(() => {
-        sender.setOnLoudnessChange((value) => event.emit('self.avatar.triggerLoudness', value));
+        if (!isLoading)
+            setIsProcessingMessage(false);
+    }, [isLoading]);
+    useEffect(() => {
+        sender.setOnLoudnessChange((value) => event.emit('self.avatar.triggerLoudness', { loudness: value }));
+        sender.setOnEndOfSpeech(() => setAgentReplying(false));
         if (!autoStartConversation)
             return;
         setMessages(getFirstMessages(autoStartConversation));
@@ -32,8 +39,9 @@ export function Avatar({ avatarImageUrl, voiceId, title, agentTools, autoStartCo
             sender.handleNewText(lastMessage.content, isLoading);
         }
     }, [lastMessage, isLoading]);
-    return (_jsxs("div", { className: 'pb-8', children: [title && _jsx("p", { className: "text-center mt-5 w-3/4 mx-auto rounded-lg dark:text-gray-100", children: title }), _jsx(CircleAudioAvatar, { imageUrl: avatarImageUrl, width: "250px", className: 'mx-auto' }), _jsx("div", { className: 'w-16 h-16 flex text-4xl shadow-lg flex-row justify-center items-center rounded-full mx-auto bg-gray-400 dark:bg-gray-800', children: _jsx(VoiceRecorder, { className: 'w-7', iconSize: '300', onVoiceRecorded: (message) => {
-                        append([{ role: 'user', content: "Message(" + Math.floor((messages.length + 1) / 2) + "): " + message, id: messages.length.toString() }]);
-                    } }) })] }));
+    return (_jsxs("div", { className: 'pb-8', children: [_jsx(CircleAudioAvatar, { width: circleSize, className: 'mx-auto', imageUrl: avatarImageUrl, isDarkTheme: isDarkTheme }), children, _jsx(VoiceRecorder, { iconSize: '300', disabled: agentReplying, loading: isProcessingMessage, onVoiceRecorded: (message) => {
+                    setAgentReplying(true);
+                    append([{ role: 'user', content: "Message(" + Math.floor((messages.length + 1) / 2) + "): " + message, id: messages.length.toString() }]);
+                }, onRecordingStatusChange: (running) => !running && setIsProcessingMessage(true) })] }));
 }
 ;

package/dist/components/ai/EmbeddedAssistent/CircleAudioAvatar.d.ts

@@ -2,6 +2,7 @@ interface CircleAudioAvatarProps {
     width?: string;
     imageUrl: string;
     className?: string;
+    isDarkTheme?: boolean;
 }
-export declare function CircleAudioAvatar({ imageUrl, className, width }: CircleAudioAvatarProps): import("react/jsx-runtime").JSX.Element;
+export declare function CircleAudioAvatar({ imageUrl, className, isDarkTheme, width }: CircleAudioAvatarProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/components/ai/EmbeddedAssistent/CircleAudioAvatar.js

@@ -1,8 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect, useRef } from 'react';
 import { EventBus } from '../../../core';
-export function CircleAudioAvatar({ imageUrl, className, width = "150px" }) {
+export function CircleAudioAvatar({ imageUrl, className, isDarkTheme = false, width = "150px" }) {
     const canvasRef = useRef(null);
+    const currentLoudnessRef = useRef(0);
+    const targetLoudnessRef = useRef(0);
+    const animationFrameRef = useRef(null);
     useEffect(() => {
         const canvas = canvasRef.current;
         if (canvas) {
@@ -10,35 +13,54 @@ export function CircleAudioAvatar({ imageUrl, className, width = "150px" }) {
             if (ctx) {
                 const image = new Image();
                 image.src = imageUrl;
+                let isMounted = true;
                 image.onload = () => {
+                    if (!isMounted)
+                        return;
                     draw(ctx, canvas, image, 0);
+                    const animate = () => {
+                        const decayRate = 0.06;
+                        if (currentLoudnessRef.current > targetLoudnessRef.current) {
+                            currentLoudnessRef.current = Math.max(targetLoudnessRef.current, currentLoudnessRef.current - decayRate * currentLoudnessRef.current);
+                        }
+                        else {
+                            currentLoudnessRef.current = targetLoudnessRef.current;
+                        }
+                        draw(ctx, canvas, image, currentLoudnessRef.current);
+                        animationFrameRef.current = requestAnimationFrame(animate);
+                    };
+                    animationFrameRef.current = requestAnimationFrame(animate);
                 };
-                const handleLoudness = (event) => {
-                    draw(ctx, canvas, image, event.data.loudness);
+                const handleLoudness = ({ data }) => {
+                    const newLoudness = data.loudness;
+                    if (newLoudness > currentLoudnessRef.current) {
+                        currentLoudnessRef.current = newLoudness;
+                    }
+                    targetLoudnessRef.current = newLoudness;
                 };
-                // Subscribe to loudness changes
-                const listenerId = EventBus.on('self.avatar.triggerLoudness', handleLoudness);
+                const listener = EventBus.on('self.avatar.triggerLoudness', handleLoudness);
                 return () => {
-                    EventBus.off(listenerId);
+                    isMounted = false;
+                    listener.off();
+                    if (animationFrameRef.current) {
+                        cancelAnimationFrame(animationFrameRef.current);
+                    }
                 };
             }
         }
     }, [imageUrl]);
-    // Function to draw on the canvas
     const draw = (ctx, canvas, image, loudness) => {
         if (canvas && ctx) {
             ctx.clearRect(0, 0, canvas.width, canvas.height);
-            // Draw pulsing circle
             const radius = Math.min(canvas.width, canvas.height) / 3;
             const centerX = canvas.width / 2;
             const centerY = canvas.height / 2;
-            const pulseRadius = radius + loudness / 2.5; // Adjust the divisor for sensitivity
+            const pulseRadius = radius + loudness / 2.5;
             ctx.beginPath();
             ctx.arc(centerX, centerY, pulseRadius, 0, Math.PI * 2, true);
-            ctx.strokeStyle = 'rgba(0, 0, 0, 0.5)';
+            ctx.strokeStyle = isDarkTheme ? 'rgba(255, 255, 255, 0.5)' : 'rgba(0, 0, 0, 0.5)';
             ctx.lineWidth = 5;
             ctx.stroke();
-            // Draw image circle
             ctx.save();
             ctx.beginPath();
             ctx.arc(centerX, centerY, radius, 0, Math.PI * 2, true);
@@ -46,11 +68,10 @@ export function CircleAudioAvatar({ imageUrl, className, width = "150px" }) {
             ctx.clip();
             ctx.drawImage(image, centerX - radius, centerY - radius, radius * 2, radius * 2);
             ctx.restore();
-            // Draw circular frame around the image
             ctx.beginPath();
             ctx.arc(centerX, centerY, radius, 0, Math.PI * 2, true);
-            ctx.strokeStyle = 'rgba(20,20, 20, 0.9)';
-            ctx.lineWidth = 5; // Adjust the width of the frame as needed
+            ctx.strokeStyle = isDarkTheme ? 'rgba(255, 255, 255, 0.9)' : 'rgba(0, 0, 0, 0.9)';
+            ctx.lineWidth = 5;
             ctx.stroke();
         }
     };

package/dist/components/ai/EmbeddedAssistent/TTS/MessageSender.d.ts

@@ -15,5 +15,6 @@ export declare class MessageSender {
     private reset;
     setVolume(volume: number): void;
     setOnLoudnessChange(callback: (value: number) => void): void;
+    setOnEndOfSpeech(callback: () => void): void;
 }
 export {};

package/dist/components/ai/EmbeddedAssistent/TTS/MessageSender.js

@@ -83,4 +83,7 @@ export class MessageSender {
             callback(loudness);
         });
     }
+    setOnEndOfSpeech(callback) {
+        this.player.setOnEndOfSpeech(callback);
+    }
 }

package/dist/components/ai/EmbeddedAssistent/TTS/Player.d.ts

@@ -11,6 +11,7 @@ export declare class ChunkedAudioPlayer {
     private loudnessCallback;
     private currentIndex;
     private startedPlaying;
+    private onEndOfSpeech;
     constructor();
     private init;
     setOnLoudnessChange(callback: (value: number) => void): void;
@@ -22,4 +23,5 @@ export declare class ChunkedAudioPlayer {
     playAgain(): Promise<void>;
     private monitorLoudness;
     reset(): void;
+    setOnEndOfSpeech(callback: () => void): void;
 }

package/dist/components/ai/EmbeddedAssistent/TTS/Player.js

@@ -18,6 +18,7 @@ export class ChunkedAudioPlayer {
         this.loudnessCallback = () => { };
         this.currentIndex = 0;
         this.startedPlaying = false;
+        this.onEndOfSpeech = () => { };
         this.init();
     }
     init() {
@@ -134,6 +135,7 @@ export class ChunkedAudioPlayer {
             // console.log('Loudness monitoring stopped.');
             cancelAnimationFrame(this.handle);
             this.loudnessCallback(0);
+            this.onEndOfSpeech();
             return;
         }
         // Get the time domain data from the analyser (this is a snapshot of the waveform)
@@ -177,4 +179,7 @@ export class ChunkedAudioPlayer {
         this.isPlaying = false;
         this.init();
     }
+    setOnEndOfSpeech(callback) {
+        this.onEndOfSpeech = callback;
+    }
 }

package/dist/components/ai/EmbeddedAssistent/VoiceRecoder.d.ts

@@ -1,6 +1,9 @@
 interface Props {
     iconSize?: string;
     className?: string;
+    disabled?: boolean;
+    loading?: boolean;
+    onRecordingStatusChange: (running: boolean) => void;
     onVoiceRecorded: (message: string) => void;
 }
 export declare const VoiceRecorder: import("react").ForwardRefExoticComponent<Props & import("react").RefAttributes<unknown>>;

package/dist/components/ai/EmbeddedAssistent/VoiceRecoder.js

@@ -8,16 +8,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { jsx as _jsx } from "react/jsx-runtime";
-import { useState, useRef, forwardRef, useImperativeHandle } from 'react';
-import { FaMicrophone } from 'react-icons/fa6';
+import { useState, useRef, forwardRef, useImperativeHandle, useEffect } from 'react';
+import { FaMicrophone, FaSpinner } from 'react-icons/fa6';
 import { usePlugin } from '../../../components';
-export const VoiceRecorder = forwardRef(({ onVoiceRecorded, iconSize, className }, ref) => {
+export const VoiceRecorder = forwardRef(({ onVoiceRecorded, iconSize, className, disabled, loading, onRecordingStatusChange }, ref) => {
     const [isRecording, setIsRecording] = useState(false);
     const mediaRecorderRef = useRef(null);
     const audioChunksRef = useRef([]);
+    const mediaStreamRef = useRef(null);
     const { llm } = usePlugin();
+    // Ref for latest onVoiceRecorded callback
+    const onVoiceRecordedRef = useRef(onVoiceRecorded);
+    useEffect(() => {
+        onVoiceRecordedRef.current = onVoiceRecorded;
+    }, [onVoiceRecorded]);
     const startRecording = () => __awaiter(void 0, void 0, void 0, function* () {
         const stream = yield navigator.mediaDevices.getUserMedia({ audio: true });
+        mediaStreamRef.current = stream;
         const mediaRecorder = new MediaRecorder(stream);
         mediaRecorderRef.current = mediaRecorder;
         mediaRecorder.ondataavailable = (event) => {
@@ -26,20 +33,49 @@ export const VoiceRecorder = forwardRef(({ onVoiceRecorded, iconSize, className
         mediaRecorder.onstop = () => __awaiter(void 0, void 0, void 0, function* () {
             const audioBlob = new Blob(audioChunksRef.current);
             audioChunksRef.current = [];
-            onVoiceRecorded(yield llm.getTextFromVoice(audioBlob));
+            onVoiceRecordedRef.current(yield llm.getTextFromVoice(audioBlob));
         });
         mediaRecorder.start();
         setIsRecording(true);
+        onRecordingStatusChange(true);
     });
     const stopRecording = () => {
         if (mediaRecorderRef.current) {
             mediaRecorderRef.current.stop();
             setIsRecording(false);
+            onRecordingStatusChange(false);
+        }
+        if (mediaStreamRef.current) {
+            mediaStreamRef.current.getTracks().forEach(track => track.stop());
+            mediaStreamRef.current = null;
         }
     };
     useImperativeHandle(ref, () => ({
         startRecording,
         stopRecording,
     }));
-    return (_jsx("div", { className: className, children: _jsx("button", { onClick: isRecording ? stopRecording : startRecording, children: _jsx(FaMicrophone, { size: iconSize, className: "h-7 w-7 mr-2 " + (isRecording ? "text-red-600" : "") }) }) }));
+    // push to talk feature
+    const spacePressedRef = useRef(false);
+    useEffect(() => {
+        const handleKeyDown = (event) => __awaiter(void 0, void 0, void 0, function* () {
+            if (event.code === 'Space' && !spacePressedRef.current) {
+                spacePressedRef.current = true;
+                yield startRecording();
+            }
+        });
+        const handleKeyUp = (event) => {
+            if (event.code === 'Space' && spacePressedRef.current) {
+                spacePressedRef.current = false;
+                stopRecording();
+            }
+        };
+        window.addEventListener('keydown', handleKeyDown);
+        window.addEventListener('keyup', handleKeyUp);
+        return () => {
+            window.removeEventListener('keydown', handleKeyDown);
+            window.removeEventListener('keyup', handleKeyUp);
+        };
+    }, []);
+    return (_jsx("button", { className: "w-16 h-16 flex text-4xl shadow-lg flex-row justify-center items-center rounded-full mx-auto bg-gray-400 dark:bg-gray-800 pl-[6px] disabled:opacity-50 " + className, onClick: isRecording ? stopRecording : startRecording, disabled: disabled || loading, children: loading ? _jsx(FaSpinner, { className: "animate-spin mr-[6px]" }) :
+            _jsx(FaMicrophone, { size: iconSize, className: "h-7 w-7 mr-2 " + (isRecording ? "text-red-600" : "") }) }));
 });

package/dist/components/ai/utils.d.ts

@@ -1,6 +1,6 @@
 export interface FirstMessages {
     instructions?: string;
-    userMessage: string;
+    userMessage?: string;
     assistantMessage?: string;
 }
 export declare function getFirstMessages(instructions: FirstMessages): any[];

package/dist/components.d.ts

@@ -7,3 +7,4 @@ export * from "./plugin/ThemeSetter";
 export * from "./providers/PluginProvider";
 export * from "./components/ai/Avatar";
 export * from "./components/ai/Assistant";
+export * from "./types/Actions";

package/dist/components.js

@@ -8,3 +8,4 @@ export * from "./plugin/ThemeSetter";
 export * from "./providers/PluginProvider";
 export * from "./components/ai/Avatar";
 export * from "./components/ai/Assistant";
+export * from "./types/Actions";

package/dist/controller/AIController.js

@@ -47,7 +47,8 @@ export function streamChatGPT(supabaseUrl, messages, tools, onResponse, token) {
                         content += data;
                         // console.log("AI response:", content);
                         //content \n\n should be real line break when message is displayed
-                        onResponse(messageId, content.replace(/\\n/g, '\n'), false);
+                        //content \"\" should be real double quote when message is displayed
+                        onResponse(messageId, content.replace(/\\n/g, '\n').replace(/\\+"|"\\+/g, '"'), false);
                     }
                     else if (command === 'd') {
                         // console.log("AI usage:", JSON.parse(line.substring(2)));

package/dist/controller/SettingsController.d.ts

@@ -1,26 +1,34 @@
 import { SupabaseClient } from "@supabase/supabase-js";
 import { LanguageLevel } from "../utils/difficultyConverter";
+import { Language } from "../utils/Language";
 export interface UserInfo {
-    motherTongue: string;
-    languageLevel: LanguageLevel;
-    contextMenuOnSelect: boolean;
-}
-export interface SystemSettings {
+    skill_level_reading: LanguageLevel;
+    skill_level_writing: LanguageLevel;
+    skill_level_grammar: LanguageLevel;
+    skill_level_speaking: LanguageLevel;
+    skill_level_listening: LanguageLevel;
+    skill_level_understanding: LanguageLevel;
+    goal_longterm: string;
+    goal_weekly: string;
+    study_buddy: string;
+    story_genre: string;
+    study_duration: number;
+    mother_tongue: Language;
+    motivation_type: string;
+    onboarding_completed: boolean;
+    context_menu_on_select: 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>;
 }