@rimori/client 2.3.0-next.5 → 2.3.0-next.7

package/dist/controller/AccomplishmentController.js

@@ -18,8 +18,8 @@ export class AccomplishmentController {
             throw new Error(`Invalid skill category: ${payload.skillCategory}`);
         }
         //regex validate accomplishmentKeyword
-        if (!/^[a-z_-]+$/.test(payload.accomplishmentKeyword)) {
-            throw new Error(`The accomplishment keyword: ${payload.accomplishmentKeyword} is invalid. Only lowercase letters, minuses and underscores are allowed`);
+        if (!/^[0-9a-z_.-]+$/.test(payload.accomplishmentKeyword)) {
+            throw new Error(`The accomplishment keyword: ${payload.accomplishmentKeyword} is invalid. Only lowercase letters, minuses, underscores and periods are allowed`);
         }
         //description is required
         if (payload.description.length < 10) {

package/dist/plugin/RimoriClient.d.ts

@@ -5,7 +5,7 @@ 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 { EventBusMessage, EventHandler, EventPayload, EventListener } from '../fromRimori/EventBus';
 import { ActivePlugin, MainPanelAction, Plugin, Tool } from '../fromRimori/PluginTypes';
 import { AccomplishmentPayload } from '../controller/AccomplishmentController';
 import { Translator } from '../controller/TranslationController';
@@ -112,7 +112,7 @@ export declare class RimoriClient {
          * @param callback The callback to call when the event is emitted.
          * @returns An EventListener object containing an off() method to unsubscribe the listeners.
          */
-        on: <T = EventPayload>(topic: string | string[], callback: EventHandler<T>) => import("../fromRimori/EventBus").EventListener;
+        on: <T = EventPayload>(topic: string | string[], callback: EventHandler<T>) => EventListener;
         /**
          * Subscribe to an event once.
          * @param topic The topic to subscribe to.
@@ -143,8 +143,8 @@ 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, actionsToListen?: string | string[]) => void;
-        onSidePanelAction: (callback: (data: MainPanelAction) => void, actionsToListen?: string | string[]) => void;
+        onMainPanelAction: (callback: (data: MainPanelAction) => void, actionsToListen?: string | string[]) => EventListener;
+        onSidePanelAction: (callback: (data: MainPanelAction) => void, actionsToListen?: string | string[]) => EventListener;
     };
     navigation: {
         toDashboard: () => void;

package/dist/plugin/RimoriClient.js

@@ -100,7 +100,7 @@ export class RimoriClient {
                 const listeningActions = Array.isArray(actionsToListen) ? actionsToListen : [actionsToListen];
                 // this needs to be a emit and on because the main panel action is triggered by the user and not by the plugin
                 this.event.emit('action.requestMain');
-                this.event.on('action.requestMain', ({ data }) => {
+                return this.event.on('action.requestMain', ({ data }) => {
                     // console.log('Received action for main panel ' + data.action_key);
                     // console.log('Listening to actions', listeningActions);
                     if (listeningActions.length === 0 || listeningActions.includes(data.action_key)) {
@@ -112,7 +112,7 @@ export class RimoriClient {
                 const listeningActions = Array.isArray(actionsToListen) ? actionsToListen : [actionsToListen];
                 // this needs to be a emit and on because the main panel action is triggered by the user and not by the plugin
                 this.event.emit('action.requestSidebar');
-                this.event.on('action.requestSidebar', ({ data }) => {
+                return this.event.on('action.requestSidebar', ({ data }) => {
                     // console.log("eventHandler .onSidePanelAction", data);
                     // console.log('Received action for sidebar ' + data.action);
                     // console.log('Listening to actions', listeningActions);

package/package.json

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

package/src/controller/AccomplishmentController.ts

@@ -66,9 +66,9 @@ export class AccomplishmentController {
     }
 
     //regex validate accomplishmentKeyword
-    if (!/^[a-z_-]+$/.test(payload.accomplishmentKeyword)) {
+    if (!/^[0-9a-z_.-]+$/.test(payload.accomplishmentKeyword)) {
       throw new Error(
-        `The accomplishment keyword: ${payload.accomplishmentKeyword} is invalid. Only lowercase letters, minuses and underscores are allowed`,
+        `The accomplishment keyword: ${payload.accomplishmentKeyword} is invalid. Only lowercase letters, minuses, underscores and periods are allowed`,
       );
     }
 

package/src/plugin/RimoriClient.ts

@@ -12,7 +12,7 @@ import {
 } from '../controller/SharedContentController';
 import { getSTTResponse, getTTSResponse } from '../controller/VoiceController';
 import { ExerciseController, CreateExerciseParams } from '../controller/ExerciseController';
-import { EventBus, EventBusMessage, EventHandler, EventPayload } from '../fromRimori/EventBus';
+import { EventBus, EventBusMessage, EventHandler, EventPayload, EventListener } from '../fromRimori/EventBus';
 import { ActivePlugin, MainPanelAction, Plugin, Tool } from '../fromRimori/PluginTypes';
 import { AccomplishmentController, AccomplishmentPayload } from '../controller/AccomplishmentController';
 import { RimoriCommunicationHandler, RimoriInfo } from './CommunicationHandler';
@@ -201,7 +201,7 @@ export class RimoriClient {
      * @param callback The callback to call when the event is emitted.
      * @returns An EventListener object containing an off() method to unsubscribe the listeners.
      */
-    on: <T = EventPayload>(topic: string | string[], callback: EventHandler<T>) => {
+    on: <T = EventPayload>(topic: string | string[], callback: EventHandler<T>): EventListener => {
       const topics = Array.isArray(topic) ? topic : [topic];
       return EventBus.on<T>(
         topics.map((t) => this.pluginController.getGlobalEventTopic(t)),
@@ -260,11 +260,14 @@ export class RimoriClient {
       this.event.emit('global.sidebar.triggerAction', { plugin_id: pluginId, action_key: actionKey, text });
     },
 
-    onMainPanelAction: (callback: (data: MainPanelAction) => void, actionsToListen: string | string[] = []) => {
+    onMainPanelAction: (
+      callback: (data: MainPanelAction) => void,
+      actionsToListen: string | string[] = [],
+    ): EventListener => {
       const listeningActions = Array.isArray(actionsToListen) ? actionsToListen : [actionsToListen];
       // this needs to be a emit and on because the main panel action is triggered by the user and not by the plugin
       this.event.emit('action.requestMain');
-      this.event.on<MainPanelAction>('action.requestMain', ({ data }) => {
+      return this.event.on<MainPanelAction>('action.requestMain', ({ data }) => {
         // console.log('Received action for main panel ' + data.action_key);
         // console.log('Listening to actions', listeningActions);
         if (listeningActions.length === 0 || listeningActions.includes(data.action_key)) {
@@ -273,11 +276,14 @@ export class RimoriClient {
       });
     },
 
-    onSidePanelAction: (callback: (data: MainPanelAction) => void, actionsToListen: string | string[] = []) => {
+    onSidePanelAction: (
+      callback: (data: MainPanelAction) => void,
+      actionsToListen: string | string[] = [],
+    ): EventListener => {
       const listeningActions = Array.isArray(actionsToListen) ? actionsToListen : [actionsToListen];
       // this needs to be a emit and on because the main panel action is triggered by the user and not by the plugin
       this.event.emit('action.requestSidebar');
-      this.event.on<MainPanelAction>('action.requestSidebar', ({ data }) => {
+      return this.event.on<MainPanelAction>('action.requestSidebar', ({ data }) => {
         // console.log("eventHandler .onSidePanelAction", data);
         // console.log('Received action for sidebar ' + data.action);
         // console.log('Listening to actions', listeningActions);