@rimori/client 1.4.10 → 2.1.0

package/dist/{core/controller → controller}/AIController.d.ts

@@ -1,4 +1,4 @@
-import { Tool } from '../../fromRimori/PluginTypes';
+import { Tool } from '../fromRimori/PluginTypes';
 export interface ToolInvocation {
     toolCallId: string;
     toolName: string;

package/dist/{core/controller → controller}/AIController.js

@@ -31,7 +31,7 @@ export function generateText(backendUrl, messages, tools, token) {
 export function streamChatGPT(backendUrl, messages, tools, onResponse, token) {
     return __awaiter(this, void 0, void 0, function* () {
         const messageId = Math.random().toString(36).substring(3);
-        let currentMessages = [...messages];
+        const currentMessages = [...messages];
         console.log('Starting streamChatGPT with:', {
             messageId,
             messageCount: messages.length,
@@ -60,7 +60,7 @@ export function streamChatGPT(backendUrl, messages, tools, onResponse, token) {
                 const decoder = new TextDecoder('utf-8');
                 let content = '';
                 let done = false;
-                let toolInvocations = [];
+                const toolInvocations = [];
                 let currentTextId = '';
                 let isToolCallMode = false;
                 let buffer = ''; // Buffer for incomplete chunks

package/dist/{plugin/AccomplishmentHandler.d.ts → controller/AccomplishmentController.d.ts}

@@ -21,7 +21,7 @@ export interface MacroAccomplishmentPayload extends BaseAccomplishmentPayload {
     durationMinutes: number;
 }
 export type AccomplishmentPayload = MicroAccomplishmentPayload | MacroAccomplishmentPayload;
-export declare class AccomplishmentHandler {
+export declare class AccomplishmentController {
     private pluginId;
     constructor(pluginId: string);
     emitAccomplishment(payload: Omit<AccomplishmentPayload, 'type'>): void;

package/dist/{plugin/AccomplishmentHandler.js → controller/AccomplishmentController.js}

@@ -1,6 +1,6 @@
 import { EventBus } from '../fromRimori/EventBus';
 export const skillCategories = ['reading', 'listening', 'speaking', 'writing', 'learning', 'community'];
-export class AccomplishmentHandler {
+export class AccomplishmentController {
     constructor(pluginId) {
         this.pluginId = pluginId;
     }

package/dist/{core/controller → controller}/ExerciseController.d.ts

@@ -1,5 +1,4 @@
 import { SupabaseClient } from '@supabase/supabase-js';
-import { PluginController } from '../../plugin/PluginController';
 export type TriggerAction = {
     action_key: string;
 } & Record<string, string | number | boolean>;
@@ -26,8 +25,7 @@ export interface Exercise {
 }
 export declare class ExerciseController {
     private supabase;
-    private pluginController;
-    constructor(supabase: SupabaseClient, pluginController: PluginController);
+    constructor(supabase: SupabaseClient);
     /**
      * Fetches weekly exercises from the weekly_exercises view.
      * Shows exercises for the current week that haven't expired.
@@ -36,16 +34,20 @@ export declare class ExerciseController {
     viewWeeklyExercises(): Promise<Exercise[]>;
     /**
      * Creates a new exercise via the backend API.
+     * @param token The token to use for authentication.
+     * @param backendUrl The URL of the backend API.
      * @param params Exercise creation parameters.
      * @returns Created exercise object.
      */
-    addExercise(params: CreateExerciseParams): Promise<Exercise>;
+    addExercise(token: string, backendUrl: string, params: CreateExerciseParams): Promise<Exercise>;
     /**
      * Deletes an exercise via the backend API.
-     * @param id The exercise ID to delete.
+     * @param token The token to use for authentication.
+     * @param backendUrl The URL of the backend API.
+     * @param exerciseId The exercise ID to delete.
      * @returns Success status.
      */
-    deleteExercise(id: string): Promise<{
+    deleteExercise(token: string, backendUrl: string, id: string): Promise<{
         success: boolean;
         message: string;
     }>;

package/dist/{core/controller → controller}/ExerciseController.js

@@ -8,9 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 export class ExerciseController {
-    constructor(supabase, pluginController) {
+    constructor(supabase) {
         this.supabase = supabase;
-        this.pluginController = pluginController;
     }
     /**
      * Fetches weekly exercises from the weekly_exercises view.
@@ -28,13 +27,14 @@ export class ExerciseController {
     }
     /**
      * Creates a new exercise via the backend API.
+     * @param token The token to use for authentication.
+     * @param backendUrl The URL of the backend API.
      * @param params Exercise creation parameters.
      * @returns Created exercise object.
      */
-    addExercise(params) {
+    addExercise(token, backendUrl, params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const token = yield this.pluginController.getToken();
-            const response = yield fetch(`${this.pluginController.getBackendUrl()}/exercises`, {
+            const response = yield fetch(`${backendUrl}/exercises`, {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json',
@@ -51,13 +51,14 @@ export class ExerciseController {
     }
     /**
      * Deletes an exercise via the backend API.
-     * @param id The exercise ID to delete.
+     * @param token The token to use for authentication.
+     * @param backendUrl The URL of the backend API.
+     * @param exerciseId The exercise ID to delete.
      * @returns Success status.
      */
-    deleteExercise(id) {
+    deleteExercise(token, backendUrl, id) {
         return __awaiter(this, void 0, void 0, function* () {
-            const token = yield this.pluginController.getToken();
-            const response = yield fetch(`${this.pluginController.getBackendUrl()}/exercises/${id}`, {
+            const response = yield fetch(`${backendUrl}/exercises/${id}`, {
                 method: 'DELETE',
                 headers: {
                     Authorization: `Bearer ${token}`,

package/dist/{core/controller → controller}/ObjectController.d.ts

@@ -36,7 +36,7 @@ export interface ObjectRequest {
      */
     instructions: string;
 }
-export declare function generateObject(backendUrl: string, request: ObjectRequest, token: string): Promise<any>;
+export declare function generateObject<T = any>(backendUrl: string, request: ObjectRequest, token: string): Promise<T>;
 export type OnLLMResponse = (id: string, response: string, finished: boolean, toolInvocations?: any[]) => void;
 export declare function streamObject(backendUrl: string, request: ObjectRequest, onResponse: OnLLMResponse, token: string): Promise<void>;
 export {};

package/dist/{core/controller → controller}/ObjectController.js

@@ -42,7 +42,7 @@ export function streamObject(backendUrl, request, onResponse, token) {
         const decoder = new TextDecoder('utf-8');
         let content = '';
         let done = false;
-        let toolInvocations = [];
+        const toolInvocations = [];
         while (!done) {
             const { value } = yield reader.read();
             if (value) {

package/dist/{core/controller → controller}/SettingsController.d.ts

@@ -1,6 +1,6 @@
 import { SupabaseClient } from '@supabase/supabase-js';
-import { LanguageLevel } from '../../utils/difficultyConverter';
-import { Guild } from '../core';
+import { LanguageLevel } from '../utils/difficultyConverter';
+import { Guild } from '../plugin/CommunicationHandler';
 export interface Buddy {
     id: string;
     name: string;

package/dist/{core/controller → controller}/SharedContentController.d.ts

@@ -1,5 +1,5 @@
 import { SupabaseClient } from '@supabase/supabase-js';
-import { RimoriClient } from '../../plugin/RimoriClient';
+import { RimoriClient } from '../plugin/RimoriClient';
 import { ObjectRequest } from './ObjectController';
 export interface SharedContentObjectRequest extends ObjectRequest {
     fixedProperties?: Record<string, string | number | boolean>;

package/dist/{core/controller → controller}/VoiceController.d.ts

@@ -1,4 +1,4 @@
-export declare function getSTTResponse(backendUrl: string, audio: Blob, token: string): Promise<any>;
+export declare function getSTTResponse(backendUrl: string, audio: Blob, token: string): Promise<string>;
 export declare function getTTSResponse(backendUrl: string, request: TTSRequest, token: string): Promise<Blob>;
 interface TTSRequest {
     input: string;

package/dist/index.d.ts

@@ -1,11 +1,17 @@
-export * from './components';
-export * from './hooks/UseChatHook';
-export * from './plugin/PluginController';
-export * from './providers/PluginProvider';
+export * from './plugin/CommunicationHandler';
 export * from './cli/types/DatabaseTypes';
 export * from './utils/difficultyConverter';
-export * from './utils/PluginUtils';
 export * from './fromRimori/PluginTypes';
-export { FirstMessages } from './components/ai/utils';
-export { AudioController } from './plugin/AudioController';
-export { useTranslation } from './hooks/I18nHooks';
+export * from './fromRimori/EventBus';
+export * from './plugin/RimoriClient';
+export * from './plugin/StandaloneClient';
+export { setupWorker } from './worker/WorkerSetup';
+export { AudioController } from './controller/AudioController';
+export { Translator } from './controller/TranslationController';
+export type { TOptions } from 'i18next';
+export type { SharedContent, SharedContentObjectRequest } from './controller/SharedContentController';
+export type { Exercise } from './controller/ExerciseController';
+export type { UserInfo, Language } from './controller/SettingsController';
+export type { Message, ToolInvocation } from './controller/AIController';
+export type { TriggerAction } from './controller/ExerciseController';
+export type { MacroAccomplishmentPayload, MicroAccomplishmentPayload } from './controller/AccomplishmentController';

package/dist/index.js

@@ -1,11 +1,11 @@
 // Re-export everything
-export * from './components';
-export * from './hooks/UseChatHook';
-export * from './plugin/PluginController';
-export * from './providers/PluginProvider';
+export * from './plugin/CommunicationHandler';
 export * from './cli/types/DatabaseTypes';
 export * from './utils/difficultyConverter';
-export * from './utils/PluginUtils';
 export * from './fromRimori/PluginTypes';
-export { AudioController } from './plugin/AudioController';
-export { useTranslation } from './hooks/I18nHooks';
+export * from './fromRimori/EventBus';
+export * from './plugin/RimoriClient';
+export * from './plugin/StandaloneClient';
+export { setupWorker } from './worker/WorkerSetup';
+export { AudioController } from './controller/AudioController';
+export { Translator } from './controller/TranslationController';

package/dist/plugin/{PluginController.d.ts → CommunicationHandler.d.ts}

@@ -1,7 +1,6 @@
 import { SupabaseClient } from '@supabase/supabase-js';
-import { UserInfo } from '../core/controller/SettingsController';
+import { UserInfo } from '../controller/SettingsController';
 import { ActivePlugin, Plugin } from '../fromRimori/PluginTypes';
-import { RimoriClient } from './RimoriClient';
 export interface Guild {
     id: string;
     longTermGoalOverride: string;
@@ -21,9 +20,7 @@ export interface RimoriInfo {
     mainPanelPlugin?: ActivePlugin;
     sidePanelPlugin?: ActivePlugin;
 }
-export declare class PluginController {
-    private static client;
-    private static instance;
+export declare class RimoriCommunicationHandler {
     private port;
     private queryParams;
     private supabase;
@@ -31,10 +28,10 @@ export declare class PluginController {
     private pluginId;
     private isMessageChannelReady;
     private pendingRequests;
-    private constructor();
+    constructor(pluginId: string, standalone: boolean);
     private initMessageChannel;
     private sendHello;
-    static getInstance(pluginId: string, standalone?: boolean): Promise<RimoriClient>;
+    private sendFinishedInit;
     getQueryParam(key: string): string | null;
     getClient(): Promise<{
         supabase: SupabaseClient;

package/dist/plugin/{PluginController.js → CommunicationHandler.js}

@@ -9,11 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { createClient } from '@supabase/supabase-js';
 import { EventBus } from '../fromRimori/EventBus';
-import { RimoriClient } from './RimoriClient';
-import { StandaloneClient } from './StandaloneClient';
-import { setTheme } from './ThemeSetter';
-import { Logger } from './Logger';
-export class PluginController {
+export class RimoriCommunicationHandler {
     constructor(pluginId, standalone) {
         this.port = null;
         this.queryParams = {};
@@ -23,12 +19,6 @@ export class PluginController {
         this.pendingRequests = [];
         this.pluginId = pluginId;
         this.getClient = this.getClient.bind(this);
-        if (typeof WorkerGlobalScope === 'undefined') {
-            // In standalone mode, use URL fallback. In iframe mode, theme will be set after MessageChannel init
-            if (standalone) {
-                setTheme();
-            }
-        }
         //no need to forward messages to parent in standalone mode or worker context
         if (standalone)
             return;
@@ -75,8 +65,9 @@ export class PluginController {
             };
             // Set theme from MessageChannel query params
             if (!worker) {
-                const theme = this.queryParams['rm_theme'];
-                setTheme(theme);
+                // const theme = this.queryParams['rm_theme'];
+                // setTheme(theme);
+                // console.log('TODO: set theme from MessageChannel query params');
             }
             // Forward plugin events to parent (only after MessageChannel is ready)
             EventBus.on('*', (ev) => {
@@ -98,6 +89,9 @@ export class PluginController {
             window.addEventListener('message', listener);
         }
         this.sendHello(worker);
+        EventBus.on('self.rimori.triggerInitFinished', () => {
+            this.sendFinishedInit(worker);
+        });
     }
     sendHello(isWorker = false) {
         try {
@@ -113,21 +107,19 @@ export class PluginController {
             console.error('[PluginController] Error sending hello:', e);
         }
     }
-    static getInstance(pluginId_1) {
-        return __awaiter(this, arguments, void 0, function* (pluginId, standalone = false) {
-            if (!PluginController.instance) {
-                if (standalone) {
-                    yield StandaloneClient.initListeners(pluginId);
-                }
-                PluginController.instance = new PluginController(pluginId, standalone);
-                PluginController.client = yield RimoriClient.getInstance(PluginController.instance);
-                //only init logger in workers and on main plugin pages
-                if (PluginController.instance.getQueryParam('applicationMode') !== 'sidebar') {
-                    Logger.getInstance(PluginController.client);
-                }
+    sendFinishedInit(isWorker = false) {
+        try {
+            const payload = { type: 'rimori:acknowledged', pluginId: this.pluginId };
+            if (isWorker) {
+                self.postMessage(payload);
             }
-            return PluginController.client;
-        });
+            else {
+                window.parent.postMessage(payload, '*');
+            }
+        }
+        catch (e) {
+            console.error('[PluginController] Error sending finished init:', e);
+        }
     }
     getQueryParam(key) {
         return this.queryParams[key] || null;

package/dist/plugin/RimoriClient.d.ts

@@ -1,65 +1,14 @@
 import { PostgrestQueryBuilder } from '@supabase/postgrest-js';
 import { GenericSchema } from '@supabase/supabase-js/dist/module/lib/types';
-import { Message, OnLLMResponse } from '../core/controller/AIController';
-import { ObjectRequest } from '../core/controller/ObjectController';
-import { UserInfo } from '../core/controller/SettingsController';
-import { SharedContent, SharedContentFilter, SharedContentObjectRequest } from '../core/controller/SharedContentController';
-import { CreateExerciseParams } from '../core/controller/ExerciseController';
+import { Message, OnLLMResponse } from '../controller/AIController';
+import { ObjectRequest } from '../controller/ObjectController';
+import { UserInfo } from '../controller/SettingsController';
+import { SharedContent, SharedContentFilter, SharedContentObjectRequest } from '../controller/SharedContentController';
+import { CreateExerciseParams } from '../controller/ExerciseController';
 import { EventBusMessage, EventHandler, EventPayload } from '../fromRimori/EventBus';
 import { ActivePlugin, MainPanelAction, Plugin, Tool } from '../fromRimori/PluginTypes';
-import { AccomplishmentPayload } from './AccomplishmentHandler';
-import { PluginController } from './PluginController';
-import { Translator } from './TranslationController';
-interface Db {
-    from: {
-        <TableName extends string & keyof GenericSchema['Tables'], Table extends GenericSchema['Tables'][TableName]>(relation: TableName): PostgrestQueryBuilder<GenericSchema, Table, TableName>;
-        <ViewName extends string & keyof GenericSchema['Views'], View extends GenericSchema['Views'][ViewName]>(relation: ViewName): PostgrestQueryBuilder<GenericSchema, View, ViewName>;
-    };
-    /**
-     * The table prefix for of database tables of the plugin.
-     */
-    tablePrefix: string;
-    /**
-     * Get the table name for a given plugin table.
-     * Internally all tables are prefixed with the plugin id. This function is used to get the correct table name for a given public table.
-     * @param table The plugin table name to get the full table name for.
-     * @returns The full table name.
-     */
-    getTableName: (table: string) => string;
-}
-interface PluginInterface {
-    pluginId: string;
-    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.
-     * @param genericSettings The type of settings to get.
-     * @returns The settings for the plugin.
-     */
-    getSettings: <T extends object>(defaultSettings: T) => Promise<T>;
-    /**
-     * Retrieves information about plugins, including:
-     * - All installed plugins
-     * - The currently active plugin in the main panel
-     * - The currently active plugin in the side panel
-     */
-    getPluginInfo: () => {
-        /**
-         * All installed plugins.
-         */
-        installedPlugins: Plugin[];
-        /**
-         * The plugin that is loaded in the main panel.
-         */
-        mainPanelPlugin?: ActivePlugin;
-        /**
-         * The plugin that is loaded in the side panel.
-         */
-        sidePanelPlugin?: ActivePlugin;
-    };
-    getUserInfo: () => UserInfo;
-    getTranslator: () => Promise<Translator>;
-}
+import { AccomplishmentPayload } from '../controller/AccomplishmentController';
+import { Translator } from '../controller/TranslationController';
 export declare class RimoriClient {
     private static instance;
     private superbase;
@@ -70,9 +19,62 @@ export declare class RimoriClient {
     private accomplishmentHandler;
     private rimoriInfo;
     private translator;
-    plugin: PluginInterface;
-    db: Db;
     private constructor();
+    get plugin(): {
+        pluginId: string;
+        /**
+         * Set the settings for the plugin.
+         * @param settings The settings to set.
+         */
+        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.
+         * @param genericSettings The type of settings to get.
+         * @returns The settings for the plugin.
+         */
+        getSettings: <T extends object>(defaultSettings: T) => Promise<T>;
+        getUserInfo: () => UserInfo;
+        /**
+         * Retrieves information about plugins, including:
+         * - All installed plugins
+         * - The currently active plugin in the main panel
+         * - The currently active plugin in the side panel
+         */
+        getPluginInfo: () => {
+            /**
+             * All installed plugins.
+             */
+            installedPlugins: Plugin[];
+            /**
+             * The plugin that is loaded in the main panel.
+             */
+            mainPanelPlugin?: ActivePlugin;
+            /**
+             * The plugin that is loaded in the side panel.
+             */
+            sidePanelPlugin?: ActivePlugin;
+        };
+        /**
+         * Get the translator for the plugin.
+         * @returns The translator for the plugin.
+         */
+        getTranslator: () => Promise<Translator>;
+    };
+    get db(): {
+        from: <ViewName extends string & keyof GenericSchema["Views"], View extends GenericSchema["Views"][ViewName]>(relation: string) => PostgrestQueryBuilder<GenericSchema, View, ViewName>;
+        /**
+         * The table prefix for of database tables of the plugin.
+         */
+        tablePrefix: string;
+        /**
+         * Get the table name for a given plugin table.
+         * Internally all tables are prefixed with the plugin id. This function is used to get the correct table name for a given public table.
+         * @param table The plugin table name to get the full table name for.
+         * @returns The full table name.
+         */
+        getTableName: (table: string) => string;
+    };
     event: {
         /**
          * Emit an event to Rimori or a plugin.
@@ -129,7 +131,7 @@ export declare class RimoriClient {
          * @param text Optional text to be used for the action like for example text that the translator would look up.
          */
         emitSidebarAction: (pluginId: string, actionKey: string, text?: string) => void;
-        onMainPanelAction: (callback: (data: MainPanelAction) => void) => void;
+        onMainPanelAction: (callback: (data: MainPanelAction) => void, actionsToListen?: string[]) => void;
     };
     navigation: {
         toDashboard: () => void;
@@ -140,15 +142,13 @@ export declare class RimoriClient {
      * @returns The query parameter value or null if not found
      */
     getQueryParam(key: string): string | null;
-    static getInstance(pluginController: PluginController): Promise<RimoriClient>;
-    private from;
-    private getTableName;
+    static getInstance(pluginId?: string): Promise<RimoriClient>;
     ai: {
         getText: (messages: Message[], tools?: Tool[]) => Promise<string>;
         getSteamedText: (messages: Message[], onMessage: OnLLMResponse, tools?: Tool[]) => Promise<void>;
         getVoice: (text: string, voice?: string, speed?: number, language?: string) => Promise<Blob>;
         getTextFromVoice: (file: Blob) => Promise<string>;
-        getObject: (request: ObjectRequest) => Promise<any>;
+        getObject: <T = any>(request: ObjectRequest) => Promise<T>;
     };
     runtime: {
         fetchBackend: (url: string, options: RequestInit) => Promise<Response>;
@@ -238,13 +238,13 @@ export declare class RimoriClient {
          * Shows exercises for the current week that haven't expired.
          * @returns Array of exercise objects.
          */
-        view: () => Promise<import("../core/controller/ExerciseController").Exercise[]>;
+        view: () => Promise<import("../controller/ExerciseController").Exercise[]>;
         /**
          * Creates a new exercise via the backend API.
          * @param params Exercise creation parameters.
          * @returns Created exercise object.
          */
-        add: (params: CreateExerciseParams) => Promise<import("../core/controller/ExerciseController").Exercise>;
+        add: (params: CreateExerciseParams) => Promise<import("../controller/ExerciseController").Exercise>;
         /**
          * Deletes an exercise via the backend API.
          * @param id The exercise ID to delete.
@@ -256,4 +256,3 @@ export declare class RimoriClient {
         }>;
     };
 }
-export {};