@rimori/client 2.4.0-next.2 → 2.4.0-next.4

package/.github/workflows/create-release-branch.yml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.PAT_TOKEN }}
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -109,7 +109,7 @@ jobs:
       - name: Create Pull Request
         id: create_pr
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.PAT_TOKEN }}
         run: |
           NEW_VERSION="${{ steps.bump_version.outputs.new_version }}"
           BRANCH_NAME="release/v$NEW_VERSION"

package/.github/workflows/release-on-merge.yml

@@ -28,6 +28,8 @@ jobs:
         with:
           node-version: '20'
           cache: 'yarn'
+          registry-url: 'https://registry.npmjs.org'
+          provenance: true
 
       - name: Get version from package.json
         id: get_version
@@ -69,7 +71,7 @@ jobs:
           yarn install --frozen-lockfile
           yarn build
 
-      - name: Create GitHub Release (Prerelease)
+      - name: Create GitHub Release
         uses: softprops/action-gh-release@v1
         with:
           tag_name: v${{ steps.get_version.outputs.version }}
@@ -80,18 +82,31 @@ jobs:
             ### Changes in this release
 
             ${{ steps.get_changelog.outputs.changelog }}
-
-            ---
-
-            **Note:** This is a prerelease. It will be promoted to a stable release after testing.
-          prerelease: true
+          prerelease: false
           generate_release_notes: true
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Publish to npm
+      - name: Publish to npm (stable)
         id: npm_publish
         run: |
-          npm publish --provenance --access public --tag prerelease || echo "npm publish skipped (may already exist)"
+          npm publish --provenance --access public --tag latest
+
+      - name: Publish to npm (next)
+        id: npm_publish_next
+        run: |
+          VERSION="${{ steps.get_version.outputs.version }}"
+          NEXT_VERSION="${VERSION}-next.0"
+          
+          # Temporarily update package.json version for next publish
+          node -e "const fs = require('fs'); const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8')); pkg.version = '$NEXT_VERSION'; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\n');"
+          
+          # Publish with next tag
+          npm publish --provenance --access public --tag next
+          
+          # Restore original version (don't commit)
+          git checkout package.json
+          
+          echo "Published version: $NEXT_VERSION with tag 'next'"
 
       - name: Send Slack notification - Success
         if: success()
@@ -118,7 +133,7 @@ jobs:
                     },
                     {
                       "type": "mrkdwn",
-                      "text": "*Type:*\nPrerelease"
+                      "text": "*Type:*\nStable + Next"
                     },
                     {
                       "type": "mrkdwn",

package/dist/fromRimori/EventBus.js

@@ -106,7 +106,7 @@ export class EventBusHandler {
             const blackListedEventIds = [];
             const eventHandler = (data) => {
                 if (blackListedEventIds.some((item) => item.eventId === data.eventId && item.sender === data.sender)) {
-                    console.log('BLACKLISTED EVENT ID', data.eventId, data);
+                    // console.log('BLACKLISTED EVENT ID', data.eventId, data);
                     return;
                 }
                 blackListedEventIds.push({

package/dist/plugin/CommunicationHandler.d.ts

@@ -47,6 +47,7 @@ export declare class RimoriCommunicationHandler {
     private pluginId;
     private isMessageChannelReady;
     private pendingRequests;
+    private updateCallbacks;
     constructor(pluginId: string, standalone: boolean);
     private initMessageChannel;
     private sendHello;
@@ -65,4 +66,15 @@ export declare class RimoriCommunicationHandler {
     getSupabaseUrl(): string;
     getBackendUrl(): string;
     getGlobalEventTopic(preliminaryTopic: string): string;
+    /**
+     * Handles updates to RimoriInfo from rimori-main.
+     * Updates the cached info and Supabase client, then notifies all registered callbacks.
+     */
+    private handleRimoriInfoUpdate;
+    /**
+     * Registers a callback to be called when RimoriInfo is updated.
+     * @param callback - Function to call with the new RimoriInfo
+     * @returns Cleanup function to unregister the callback
+     */
+    onUpdate(callback: (info: RimoriInfo) => void): () => void;
 }

package/dist/plugin/CommunicationHandler.js

@@ -17,6 +17,7 @@ export class RimoriCommunicationHandler {
         this.rimoriInfo = null;
         this.isMessageChannelReady = false;
         this.pendingRequests = [];
+        this.updateCallbacks = new Set();
         this.pluginId = pluginId;
         this.getClient = this.getClient.bind(this);
         //no need to forward messages to parent in standalone mode or worker context
@@ -78,6 +79,12 @@ export class RimoriCommunicationHandler {
                     (_a = this.port) === null || _a === void 0 ? void 0 : _a.postMessage({ event: ev });
                 }
             });
+            // Listen for updates from rimori-main (data changes, token refresh, etc.)
+            // Topic format: {pluginId}.supabase.triggerUpdate
+            EventBus.on(`${this.pluginId}.supabase.triggerUpdate`, (ev) => {
+                console.log('[RimoriCommunicationHandler] Received update from rimori-main');
+                this.handleRimoriInfoUpdate(ev.data);
+            });
             // Mark MessageChannel as ready and process pending requests
             this.isMessageChannelReady = true;
             // Process any pending requests
@@ -250,4 +257,36 @@ export class RimoriCommunicationHandler {
         const topicRoot = (_b = (_a = this.rimoriInfo) === null || _a === void 0 ? void 0 : _a.pluginId) !== null && _b !== void 0 ? _b : 'global';
         return `${topicRoot}.${preliminaryTopic}`;
     }
+    /**
+     * Handles updates to RimoriInfo from rimori-main.
+     * Updates the cached info and Supabase client, then notifies all registered callbacks.
+     */
+    handleRimoriInfoUpdate(newInfo) {
+        // Update cached rimoriInfo
+        this.rimoriInfo = newInfo;
+        // Update Supabase client with new token
+        this.supabase = createClient(newInfo.url, newInfo.key, {
+            accessToken: () => Promise.resolve(newInfo.token),
+        });
+        // Notify all registered callbacks
+        this.updateCallbacks.forEach((callback) => {
+            try {
+                callback(newInfo);
+            }
+            catch (error) {
+                console.error('[RimoriCommunicationHandler] Error in update callback:', error);
+            }
+        });
+    }
+    /**
+     * Registers a callback to be called when RimoriInfo is updated.
+     * @param callback - Function to call with the new RimoriInfo
+     * @returns Cleanup function to unregister the callback
+     */
+    onUpdate(callback) {
+        this.updateCallbacks.add(callback);
+        return () => {
+            this.updateCallbacks.delete(callback);
+        };
+    }
 }

package/dist/plugin/RimoriClient.d.ts

@@ -8,6 +8,7 @@ import { CreateExerciseParams } from '../controller/ExerciseController';
 import { EventBusMessage, EventHandler, EventPayload, EventListener } from '../fromRimori/EventBus';
 import { ActivePlugin, MainPanelAction, Plugin, Tool } from '../fromRimori/PluginTypes';
 import { AccomplishmentPayload } from '../controller/AccomplishmentController';
+import { RimoriInfo } from './CommunicationHandler';
 import { Translator } from '../controller/TranslationController';
 export declare class RimoriClient {
     private static instance;
@@ -39,7 +40,19 @@ export declare class RimoriClient {
          * @returns The settings for the plugin.
          */
         getSettings: <T extends object>(defaultSettings: T) => Promise<T>;
+        /**
+         * Get the current user info.
+         * Note: For reactive updates in React components, use the userInfo from useRimori() hook instead.
+         * @returns The user info.
+         */
         getUserInfo: () => UserInfo;
+        /**
+         * Register a callback to be notified when RimoriInfo is updated.
+         * This is useful for reacting to changes in user info, tokens, or other rimori data.
+         * @param callback - Function to call with the new RimoriInfo
+         * @returns Cleanup function to unregister the callback
+         */
+        onRimoriInfoUpdate: (callback: (info: RimoriInfo) => void) => (() => void);
         /**
          * Retrieves information about plugins, including:
          * - All installed plugins

package/dist/plugin/RimoriClient.js

@@ -333,9 +333,23 @@ export class RimoriClient {
             getSettings: (defaultSettings) => __awaiter(this, void 0, void 0, function* () {
                 return yield this.settingsController.getSettings(defaultSettings);
             }),
+            /**
+             * Get the current user info.
+             * Note: For reactive updates in React components, use the userInfo from useRimori() hook instead.
+             * @returns The user info.
+             */
             getUserInfo: () => {
                 return this.rimoriInfo.profile;
             },
+            /**
+             * Register a callback to be notified when RimoriInfo is updated.
+             * This is useful for reacting to changes in user info, tokens, or other rimori data.
+             * @param callback - Function to call with the new RimoriInfo
+             * @returns Cleanup function to unregister the callback
+             */
+            onRimoriInfoUpdate: (callback) => {
+                return this.pluginController.onUpdate(callback);
+            },
             /**
              * Retrieves information about plugins, including:
              * - All installed plugins

package/package.json

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

package/src/fromRimori/EventBus.ts

@@ -162,7 +162,7 @@ export class EventBusHandler {
       const blackListedEventIds: { eventId: number; sender: string }[] = [];
       const eventHandler = (data: EventBusMessage) => {
         if (blackListedEventIds.some((item) => item.eventId === data.eventId && item.sender === data.sender)) {
-          console.log('BLACKLISTED EVENT ID', data.eventId, data);
+          // console.log('BLACKLISTED EVENT ID', data.eventId, data);
           return;
         }
         blackListedEventIds.push({

package/src/plugin/CommunicationHandler.ts

@@ -54,6 +54,7 @@ export class RimoriCommunicationHandler {
   private pluginId: string;
   private isMessageChannelReady = false;
   private pendingRequests: Array<() => void> = [];
+  private updateCallbacks: Set<(info: RimoriInfo) => void> = new Set();
 
   public constructor(pluginId: string, standalone: boolean) {
     this.pluginId = pluginId;
@@ -124,6 +125,13 @@ export class RimoriCommunicationHandler {
         }
       });
 
+      // Listen for updates from rimori-main (data changes, token refresh, etc.)
+      // Topic format: {pluginId}.supabase.triggerUpdate
+      EventBus.on(`${this.pluginId}.supabase.triggerUpdate`, (ev) => {
+        console.log('[RimoriCommunicationHandler] Received update from rimori-main');
+        this.handleRimoriInfoUpdate(ev.data as RimoriInfo);
+      });
+
       // Mark MessageChannel as ready and process pending requests
       this.isMessageChannelReady = true;
 
@@ -307,4 +315,39 @@ export class RimoriCommunicationHandler {
     const topicRoot = this.rimoriInfo?.pluginId ?? 'global';
     return `${topicRoot}.${preliminaryTopic}`;
   }
+
+  /**
+   * Handles updates to RimoriInfo from rimori-main.
+   * Updates the cached info and Supabase client, then notifies all registered callbacks.
+   */
+  private handleRimoriInfoUpdate(newInfo: RimoriInfo): void {
+    // Update cached rimoriInfo
+    this.rimoriInfo = newInfo;
+
+    // Update Supabase client with new token
+    this.supabase = createClient(newInfo.url, newInfo.key, {
+      accessToken: () => Promise.resolve(newInfo.token),
+    });
+
+    // Notify all registered callbacks
+    this.updateCallbacks.forEach((callback) => {
+      try {
+        callback(newInfo);
+      } catch (error) {
+        console.error('[RimoriCommunicationHandler] Error in update callback:', error);
+      }
+    });
+  }
+
+  /**
+   * Registers a callback to be called when RimoriInfo is updated.
+   * @param callback - Function to call with the new RimoriInfo
+   * @returns Cleanup function to unregister the callback
+   */
+  public onUpdate(callback: (info: RimoriInfo) => void): () => void {
+    this.updateCallbacks.add(callback);
+    return () => {
+      this.updateCallbacks.delete(callback);
+    };
+  }
 }

package/src/plugin/RimoriClient.ts

@@ -74,9 +74,23 @@ export class RimoriClient {
       getSettings: async <T extends object>(defaultSettings: T): Promise<T> => {
         return await this.settingsController.getSettings<T>(defaultSettings);
       },
+      /**
+       * Get the current user info.
+       * Note: For reactive updates in React components, use the userInfo from useRimori() hook instead.
+       * @returns The user info.
+       */
       getUserInfo: (): UserInfo => {
         return this.rimoriInfo.profile;
       },
+      /**
+       * Register a callback to be notified when RimoriInfo is updated.
+       * This is useful for reacting to changes in user info, tokens, or other rimori data.
+       * @param callback - Function to call with the new RimoriInfo
+       * @returns Cleanup function to unregister the callback
+       */
+      onRimoriInfoUpdate: (callback: (info: RimoriInfo) => void): (() => void) => {
+        return this.pluginController.onUpdate(callback);
+      },
       /**
        * Retrieves information about plugins, including:
        * - All installed plugins