@rimori/client 2.4.0-next.5 → 2.4.0-next.6

package/dist/cli/scripts/init/dev-registration.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { createClient } from '@supabase/supabase-js';
+// import { createClient } from '@supabase/supabase-js';
 import path from 'path';
 import * as readline from 'readline';
 import { DEFAULT_ANON_KEY, DEFAULT_ENDPOINT } from '../../../utils/endpoint.js';
@@ -112,7 +112,9 @@ export function authenticateWithSupabase(_a) {
         // Initialize Supabase client (you may need to adjust the URL and key)
         const supabaseUrl = process.env.SUPABASE_URL || DEFAULT_ENDPOINT;
         const supabaseKey = process.env.SUPABASE_ANON_KEY || DEFAULT_ANON_KEY;
-        const supabase = createClient(supabaseUrl, supabaseKey);
+        throw new Error('Authentication is disabled until new developer platform is released.');
+        // const supabase = createClient(supabaseUrl, supabaseKey);
+        const supabase = {};
         try {
             const { data, error } = yield supabase.auth.signInWithPassword({
                 email,

package/dist/cli/scripts/init/main.js

@@ -82,6 +82,7 @@ function main() {
                 updateGitignore();
             }
             else {
+                throw new Error('Registration is disabled until new developer platform is released.');
                 // Step 1: Get user credentials
                 const credentials = yield askForCredentials();
                 console.log('');

package/dist/controller/SettingsController.d.ts

@@ -1,4 +1,4 @@
-import { SupabaseClient } from '@supabase/supabase-js';
+import { SupabaseClient } from '../plugin/CommunicationHandler';
 import { LanguageLevel } from '../utils/difficultyConverter';
 import { Guild } from '../plugin/CommunicationHandler';
 export interface Buddy {

package/dist/controller/SharedContentController.d.ts

@@ -1,4 +1,4 @@
-import { SupabaseClient } from '@supabase/supabase-js';
+import { SupabaseClient } from '../plugin/CommunicationHandler';
 import { RimoriClient } from '../plugin/RimoriClient';
 import { ObjectRequest } from './ObjectController';
 export interface SharedContentObjectRequest extends ObjectRequest {

package/dist/plugin/CommunicationHandler.d.ts

@@ -1,6 +1,7 @@
-import { SupabaseClient } from '@supabase/supabase-js';
 import { UserInfo } from '../controller/SettingsController';
 import { ActivePlugin, Plugin } from '../fromRimori/PluginTypes';
+import { PostgrestClient } from '@supabase/postgrest-js';
+export type SupabaseClient = PostgrestClient;
 export interface Guild {
     allowUserPluginSettings: boolean;
     city: string | null;
@@ -53,6 +54,7 @@ export declare class RimoriCommunicationHandler {
     private sendHello;
     private sendFinishedInit;
     getQueryParam(key: string): string | null;
+    private getSupabase;
     getClient(): Promise<{
         supabase: SupabaseClient;
         info: RimoriInfo;

package/dist/plugin/CommunicationHandler.js

@@ -7,8 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { createClient } from '@supabase/supabase-js';
 import { EventBus } from '../fromRimori/EventBus';
+import { PostgrestClient } from '@supabase/postgrest-js';
 export class RimoriCommunicationHandler {
     constructor(pluginId, standalone) {
         this.port = null;
@@ -45,9 +45,7 @@ export class RimoriCommunicationHandler {
             // Initialize Supabase client immediately with provided info
             if (rimoriInfo) {
                 this.rimoriInfo = rimoriInfo;
-                this.supabase = createClient(rimoriInfo.url, rimoriInfo.key, {
-                    accessToken: () => Promise.resolve(rimoriInfo.token),
-                });
+                this.supabase = this.getSupabase(rimoriInfo.url, rimoriInfo.key, rimoriInfo.token);
             }
             // Handle messages from parent
             this.port.onmessage = ({ data }) => {
@@ -133,6 +131,16 @@ export class RimoriCommunicationHandler {
     getQueryParam(key) {
         return this.queryParams[key] || null;
     }
+    getSupabase(url, key, token) {
+        var _a;
+        return new PostgrestClient(`${url}/rest/v1`, {
+            schema: (_a = this.rimoriInfo) === null || _a === void 0 ? void 0 : _a.dbSchema,
+            headers: {
+                apikey: key,
+                Authorization: `Bearer ${token}`,
+            },
+        });
+    }
     getClient() {
         return __awaiter(this, void 0, void 0, function* () {
             // Return cached client if valid
@@ -174,9 +182,7 @@ export class RimoriCommunicationHandler {
                             var _a, _b;
                             if (((_a = event.data) === null || _a === void 0 ? void 0 : _a.topic) === 'global.supabase.requestAccess' && ((_b = event.data) === null || _b === void 0 ? void 0 : _b.eventId) === eventId) {
                                 this.rimoriInfo = event.data.data;
-                                this.supabase = createClient(this.rimoriInfo.url, this.rimoriInfo.key, {
-                                    accessToken: () => Promise.resolve(this.rimoriInfo.token),
-                                });
+                                this.supabase = this.getSupabase(this.rimoriInfo.url, this.rimoriInfo.key, this.rimoriInfo.token);
                                 self.onmessage = originalOnMessage; // Restore original handler
                                 resolve({ supabase: this.supabase, info: this.rimoriInfo });
                             }
@@ -193,9 +199,7 @@ export class RimoriCommunicationHandler {
                     const { data } = yield EventBus.request(this.pluginId, 'global.supabase.requestAccess');
                     // console.log({ data });
                     this.rimoriInfo = data;
-                    this.supabase = createClient(this.rimoriInfo.url, this.rimoriInfo.key, {
-                        accessToken: () => Promise.resolve(this.rimoriInfo.token),
-                    });
+                    this.supabase = this.getSupabase(this.rimoriInfo.url, this.rimoriInfo.key, this.rimoriInfo.token);
                 }
             }
             return { supabase: this.supabase, info: this.rimoriInfo };
@@ -209,9 +213,7 @@ export class RimoriCommunicationHandler {
         // Update cached rimoriInfo
         this.rimoriInfo = newInfo;
         // Update Supabase client with new token
-        this.supabase = createClient(newInfo.url, newInfo.key, {
-            accessToken: () => Promise.resolve(newInfo.token),
-        });
+        this.supabase = this.getSupabase(newInfo.url, newInfo.key, newInfo.token);
         // Notify all registered callbacks
         this.updateCallbacks.forEach((callback) => {
             try {

package/dist/plugin/StandaloneClient.d.ts

@@ -1,4 +1,4 @@
-import { SupabaseClient } from '@supabase/supabase-js';
+import { SupabaseClient } from './CommunicationHandler';
 export interface StandaloneConfig {
     url: string;
     key: string;

package/dist/plugin/StandaloneClient.js

@@ -7,12 +7,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { createClient } from '@supabase/supabase-js';
 import { EventBus } from '../fromRimori/EventBus';
 import { DEFAULT_ANON_KEY, DEFAULT_ENDPOINT } from '../utils/endpoint';
 export class StandaloneClient {
     constructor(config) {
-        this.supabase = createClient(config.url, config.key);
+        throw new Error('Authentication is disabled until new developer platform is released.');
+        // this.supabase = createClient(config.url, config.key);
+        this.supabase = {};
         this.config = config;
     }
     static getInstance() {

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

@@ -1,7 +1,7 @@
-import { PostgrestQueryBuilder } from '@supabase/postgrest-js';
-import { SupabaseClient } from '@supabase/supabase-js';
-import { GenericSchema } from '@supabase/supabase-js/dist/module/lib/types';
+import { PostgrestClientOptions, PostgrestQueryBuilder } from '@supabase/postgrest-js';
+import { SupabaseClient } from '../CommunicationHandler';
 import { RimoriCommunicationHandler, RimoriInfo } from '../CommunicationHandler';
+import { GenericSchema, GenericTable } from '@supabase/postgrest-js/dist/cjs/types/common/common';
 /**
  * Database module for plugin database operations.
  * Provides access to plugin tables with automatic prefixing and schema management.
@@ -19,7 +19,7 @@ export declare class DbModule {
      * @param relation The table name (without prefix for plugin tables, with 'global_' for global tables).
      * @returns A Postgrest query builder for the table.
      */
-    from<ViewName extends string & keyof GenericSchema['Views'], View extends GenericSchema['Views'][ViewName]>(relation: string): PostgrestQueryBuilder<GenericSchema, View, ViewName>;
+    from<ViewName extends string & keyof GenericSchema['Views'], View extends GenericSchema['Views'][ViewName]>(relation: string): PostgrestQueryBuilder<PostgrestClientOptions, GenericSchema, GenericTable, ViewName, View>;
     /**
      * 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.

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

@@ -1,6 +1,6 @@
-import { EventBusMessage, EventHandler, EventPayload, EventListener } from '../../fromRimori/EventBus';
 import { MainPanelAction } from '../../fromRimori/PluginTypes';
 import { AccomplishmentPayload } from '../../controller/AccomplishmentController';
+import { EventBusMessage, EventHandler, EventPayload, EventListener } from '../../fromRimori/EventBus';
 /**
  * Event module for plugin event bus operations.
  * Provides methods for emitting, listening to, and responding to events.

package/dist/plugin/module/EventModule.js

@@ -1,5 +1,5 @@
-import { EventBus } from '../../fromRimori/EventBus';
 import { AccomplishmentController } from '../../controller/AccomplishmentController';
+import { EventBus } from '../../fromRimori/EventBus';
 /**
  * Event module for plugin event bus operations.
  * Provides methods for emitting, listening to, and responding to events.

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

@@ -1,4 +1,4 @@
-import { SupabaseClient } from '@supabase/supabase-js';
+import { SupabaseClient } from '../CommunicationHandler';
 import { RimoriCommunicationHandler, RimoriInfo } from '../CommunicationHandler';
 import { EventModule } from './EventModule';
 export type TriggerAction = {

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

@@ -2,7 +2,7 @@ import { UserInfo } from '../../controller/SettingsController';
 import { RimoriCommunicationHandler, RimoriInfo } from '../CommunicationHandler';
 import { Translator } from '../../controller/TranslationController';
 import { ActivePlugin, Plugin } from '../../fromRimori/PluginTypes';
-import { SupabaseClient } from '@supabase/supabase-js';
+import { SupabaseClient } from '../CommunicationHandler';
 type Theme = 'light' | 'dark';
 type ApplicationMode = 'main' | 'sidebar' | 'settings';
 /**

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@rimori/client",
-  "version": "2.4.0-next.5",
+  "version": "2.4.0-next.6",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/rimori-org/rimori-client.git"
   },
-  "license": "apache-2.0",
+  "license": "Apache-2.0",
   "bin": {
     "rimori-release": "./dist/cli/scripts/release/release.js",
     "rimori-init": "./dist/cli/scripts/init/main.js"
@@ -27,12 +27,13 @@
     "format": "prettier --write ."
   },
   "dependencies": {
-    "@supabase/supabase-js": "2.49.4",
+    "@supabase/postgrest-js": "^2.87.1",
     "dotenv": "16.5.0",
     "i18next": "^25.6.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.37.0",
+    "@types/node": "^25.0.1",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-react-hooks": "^7.0.0",

package/src/cli/scripts/init/dev-registration.ts

@@ -1,4 +1,4 @@
-import { createClient } from '@supabase/supabase-js';
+// import { createClient } from '@supabase/supabase-js';
 import path from 'path';
 import * as readline from 'readline';
 import { DEFAULT_ANON_KEY, DEFAULT_ENDPOINT } from '../../../utils/endpoint.js';
@@ -120,7 +120,9 @@ export async function authenticateWithSupabase({ email, password }: UserCredenti
   const supabaseUrl = process.env.SUPABASE_URL || DEFAULT_ENDPOINT;
   const supabaseKey = process.env.SUPABASE_ANON_KEY || DEFAULT_ANON_KEY;
 
-  const supabase = createClient(supabaseUrl, supabaseKey);
+  throw new Error('Authentication is disabled until new developer platform is released.');
+  // const supabase = createClient(supabaseUrl, supabaseKey);
+  const supabase = {} as any;
 
   try {
     const { data, error } = await supabase.auth.signInWithPassword({

package/src/cli/scripts/init/main.ts

@@ -83,6 +83,7 @@ async function main(): Promise<void> {
       // Update gitignore
       updateGitignore();
     } else {
+      throw new Error('Registration is disabled until new developer platform is released.');
       // Step 1: Get user credentials
       const credentials = await askForCredentials();
       console.log('');

package/src/controller/SettingsController.ts

@@ -1,4 +1,4 @@
-import { SupabaseClient } from '@supabase/supabase-js';
+import { SupabaseClient } from '../plugin/CommunicationHandler';
 import { LanguageLevel } from '../utils/difficultyConverter';
 import { Guild } from '../plugin/CommunicationHandler';
 

package/src/controller/SharedContentController.ts

@@ -1,4 +1,4 @@
-import { SupabaseClient } from '@supabase/supabase-js';
+import { SupabaseClient } from '../plugin/CommunicationHandler';
 import { RimoriClient } from '../plugin/RimoriClient';
 import { ObjectRequest } from './ObjectController';
 

package/src/plugin/CommunicationHandler.ts

@@ -1,11 +1,13 @@
-import { createClient, SupabaseClient } from '@supabase/supabase-js';
 import { UserInfo } from '../controller/SettingsController';
 import { EventBus, EventBusMessage } from '../fromRimori/EventBus';
 import { ActivePlugin, Plugin } from '../fromRimori/PluginTypes';
+import { PostgrestClient } from '@supabase/postgrest-js';
 
 // Add declaration for WorkerGlobalScope
 declare const WorkerGlobalScope: any;
 
+export type SupabaseClient = PostgrestClient;
+
 export interface Guild {
   allowUserPluginSettings: boolean;
   city: string | null;
@@ -89,9 +91,7 @@ export class RimoriCommunicationHandler {
       // Initialize Supabase client immediately with provided info
       if (rimoriInfo) {
         this.rimoriInfo = rimoriInfo;
-        this.supabase = createClient(rimoriInfo.url, rimoriInfo.key, {
-          accessToken: () => Promise.resolve(rimoriInfo.token),
-        });
+        this.supabase = this.getSupabase(rimoriInfo.url, rimoriInfo.key, rimoriInfo.token);
       }
 
       // Handle messages from parent
@@ -180,6 +180,16 @@ export class RimoriCommunicationHandler {
     return this.queryParams[key] || null;
   }
 
+  private getSupabase(url: string, key: string, token: string): SupabaseClient {
+    return new PostgrestClient(`${url}/rest/v1`, {
+      schema: this.rimoriInfo?.dbSchema,
+      headers: {
+        apikey: key,
+        Authorization: `Bearer ${token}`,
+      },
+    }) as unknown as SupabaseClient;
+  }
+
   public async getClient(): Promise<{ supabase: SupabaseClient; info: RimoriInfo }> {
     // Return cached client if valid
     if (this.supabase && this.rimoriInfo && this.rimoriInfo.expiration > new Date()) {
@@ -223,9 +233,7 @@ export class RimoriCommunicationHandler {
           self.onmessage = (event) => {
             if (event.data?.topic === 'global.supabase.requestAccess' && event.data?.eventId === eventId) {
               this.rimoriInfo = event.data.data;
-              this.supabase = createClient(this.rimoriInfo!.url, this.rimoriInfo!.key, {
-                accessToken: () => Promise.resolve(this.rimoriInfo!.token),
-              });
+              this.supabase = this.getSupabase(this.rimoriInfo!.url, this.rimoriInfo!.key, this.rimoriInfo!.token);
               self.onmessage = originalOnMessage; // Restore original handler
               resolve({ supabase: this.supabase, info: this.rimoriInfo! });
             } else if (originalOnMessage) {
@@ -241,9 +249,7 @@ export class RimoriCommunicationHandler {
         const { data } = await EventBus.request<RimoriInfo>(this.pluginId, 'global.supabase.requestAccess');
         // console.log({ data });
         this.rimoriInfo = data;
-        this.supabase = createClient(this.rimoriInfo.url, this.rimoriInfo.key, {
-          accessToken: () => Promise.resolve(this.rimoriInfo!.token),
-        });
+        this.supabase = this.getSupabase(this.rimoriInfo.url, this.rimoriInfo.key, this.rimoriInfo.token);
       }
     }
 
@@ -259,9 +265,7 @@ export class RimoriCommunicationHandler {
     this.rimoriInfo = newInfo;
 
     // Update Supabase client with new token
-    this.supabase = createClient(newInfo.url, newInfo.key, {
-      accessToken: () => Promise.resolve(newInfo.token),
-    });
+    this.supabase = this.getSupabase(newInfo.url, newInfo.key, newInfo.token);
 
     // Notify all registered callbacks
     this.updateCallbacks.forEach((callback) => {

package/src/plugin/RimoriClient.ts

@@ -1,4 +1,3 @@
-import { SupabaseClient } from '@supabase/supabase-js';
 import {
   SharedContent,
   SharedContentController,
@@ -12,6 +11,7 @@ import { DbModule } from './module/DbModule';
 import { EventModule } from './module/EventModule';
 import { AIModule } from './module/AIModule';
 import { ExerciseModule } from './module/ExerciseModule';
+import { PostgrestClient } from '@supabase/postgrest-js';
 
 // Add declaration for WorkerGlobalScope
 declare const WorkerGlobalScope: any;
@@ -27,7 +27,7 @@ export class RimoriClient {
   public exercise: ExerciseModule;
   private rimoriInfo: RimoriInfo;
 
-  private constructor(controller: RimoriCommunicationHandler, supabase: SupabaseClient, info: RimoriInfo) {
+  private constructor(controller: RimoriCommunicationHandler, supabase: PostgrestClient, info: RimoriInfo) {
     this.rimoriInfo = info;
     this.pluginController = controller;
     this.sharedContentController = new SharedContentController(supabase, this);

package/src/plugin/StandaloneClient.ts

@@ -1,4 +1,4 @@
-import { createClient, SupabaseClient } from '@supabase/supabase-js';
+import { SupabaseClient } from './CommunicationHandler';
 import { EventBus } from '../fromRimori/EventBus';
 import { DEFAULT_ANON_KEY, DEFAULT_ENDPOINT } from '../utils/endpoint';
 
@@ -11,10 +11,12 @@ export interface StandaloneConfig {
 export class StandaloneClient {
   private static instance: StandaloneClient;
   private config: StandaloneConfig;
-  private supabase: SupabaseClient;
+  private supabase: SupabaseClient & { auth: any }; // TODO: remove any
 
   private constructor(config: StandaloneConfig) {
-    this.supabase = createClient(config.url, config.key);
+    throw new Error('Authentication is disabled until new developer platform is released.');
+    // this.supabase = createClient(config.url, config.key);
+    this.supabase = {} as any;
     this.config = config;
   }
 

package/src/plugin/module/DbModule.ts

@@ -1,7 +1,8 @@
-import { PostgrestQueryBuilder } from '@supabase/postgrest-js';
-import { SupabaseClient } from '@supabase/supabase-js';
-import { GenericSchema } from '@supabase/supabase-js/dist/module/lib/types';
+import { PostgrestClientOptions, PostgrestQueryBuilder } from '@supabase/postgrest-js';
+import { SupabaseClient } from '../CommunicationHandler';
+// import { GenericSchema } from '@supabase/postgrest-js/dist/module/lib/types';
 import { RimoriCommunicationHandler, RimoriInfo } from '../CommunicationHandler';
+import { GenericSchema, GenericTable } from '@supabase/postgrest-js/dist/cjs/types/common/common';
 
 /**
  * Database module for plugin database operations.
@@ -35,7 +36,7 @@ export class DbModule {
    */
   from<ViewName extends string & keyof GenericSchema['Views'], View extends GenericSchema['Views'][ViewName]>(
     relation: string,
-  ): PostgrestQueryBuilder<GenericSchema, View, ViewName> {
+  ): PostgrestQueryBuilder<PostgrestClientOptions, GenericSchema, GenericTable, ViewName, View> {
     const tableName = this.getTableName(relation);
     // Use the schema determined by rimori-main based on release channel
     // Global tables (starting with 'global_') remain in public schema

package/src/plugin/module/EventModule.ts

@@ -1,6 +1,6 @@
-import { EventBus, EventBusMessage, EventHandler, EventPayload, EventListener } from '../../fromRimori/EventBus';
 import { MainPanelAction } from '../../fromRimori/PluginTypes';
 import { AccomplishmentController, AccomplishmentPayload } from '../../controller/AccomplishmentController';
+import { EventBus, EventBusMessage, EventHandler, EventPayload, EventListener } from '../../fromRimori/EventBus';
 
 /**
  * Event module for plugin event bus operations.

package/src/plugin/module/ExerciseModule.ts

@@ -1,4 +1,4 @@
-import { SupabaseClient } from '@supabase/supabase-js';
+import { SupabaseClient } from '../CommunicationHandler';
 import { RimoriCommunicationHandler, RimoriInfo } from '../CommunicationHandler';
 import { EventModule } from './EventModule';
 

package/src/plugin/module/PluginModule.ts

@@ -2,7 +2,7 @@ import { SettingsController, UserInfo } from '../../controller/SettingsControlle
 import { RimoriCommunicationHandler, RimoriInfo } from '../CommunicationHandler';
 import { Translator } from '../../controller/TranslationController';
 import { ActivePlugin, Plugin } from '../../fromRimori/PluginTypes';
-import { SupabaseClient } from '@supabase/supabase-js';
+import { SupabaseClient } from '../CommunicationHandler';
 
 type Theme = 'light' | 'dark';
 type ApplicationMode = 'main' | 'sidebar' | 'settings';