npm - agent-swarm-kit - Versions diffs - 1.0.71 → 1.0.73 - Mend

agent-swarm-kit 1.0.71 → 1.0.73

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/build/index.cjs CHANGED Viewed

@@ -983,7 +983,8 @@ var ClientAgent = /** @class */ (function () {
                                 },
                                 context: {
                                     agentName: this.params.agentName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 7:
                         _a.sent();
@@ -1006,7 +1007,8 @@ var ClientAgent = /** @class */ (function () {
                                 },
                                 context: {
                                     agentName: this.params.agentName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 10:
                         _a.sent();
@@ -1150,7 +1152,8 @@ var ClientAgent = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     agentName: this.params.agentName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _a.sent();
@@ -1184,7 +1187,8 @@ var ClientAgent = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     agentName: this.params.agentName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _a.sent();
@@ -1211,7 +1215,8 @@ var ClientAgent = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     agentName: this.params.agentName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _a.sent();
@@ -1248,7 +1253,8 @@ var ClientAgent = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     agentName: this.params.agentName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _a.sent();
@@ -1290,7 +1296,8 @@ var ClientAgent = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     agentName: this.params.agentName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 3:
                         _a.sent();
@@ -1725,7 +1732,8 @@ var ClientHistory = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     agentName: this.params.agentName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _a.sent();
@@ -2134,6 +2142,7 @@ var ClientSwarm = /** @class */ (function () {
                                 context: {
                                     swarmName: this.params.swarmName,
                                 },
+                                clientId: this.params.clientId,
                             })];
                     case 3:
                         _d.sent();
@@ -2208,6 +2217,7 @@ var ClientSwarm = /** @class */ (function () {
                                 context: {
                                     swarmName: this.params.swarmName,
                                 },
+                                clientId: this.params.clientId,
                             })];
                     case 3:
                         _c.sent();
@@ -2241,6 +2251,7 @@ var ClientSwarm = /** @class */ (function () {
                             context: {
                                 swarmName: this.params.swarmName,
                             },
+                            clientId: this.params.clientId,
                         })];
                     case 3:
                         _b.sent();
@@ -2272,6 +2283,7 @@ var ClientSwarm = /** @class */ (function () {
                                 context: {
                                     swarmName: this.params.swarmName,
                                 },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _a.sent();
@@ -2305,6 +2317,7 @@ var ClientSwarm = /** @class */ (function () {
                                 context: {
                                     swarmName: this.params.swarmName,
                                 },
+                                clientId: this.params.clientId,
                             })];
                     case 1:
                         _a.sent();
@@ -2338,6 +2351,7 @@ var ClientSwarm = /** @class */ (function () {
                                 context: {
                                     swarmName: this.params.swarmName,
                                 },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _a.sent();
@@ -2643,7 +2657,8 @@ var ClientSession = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     swarmName: this.params.swarmName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _a.sent();
@@ -2688,7 +2703,8 @@ var ClientSession = /** @class */ (function () {
                                 },
                                 context: {
                                     swarmName: this.params.swarmName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 3:
                         _a.sent();
@@ -2727,7 +2743,8 @@ var ClientSession = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     swarmName: this.params.swarmName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 3:
                         _a.sent();
@@ -2763,7 +2780,8 @@ var ClientSession = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     swarmName: this.params.swarmName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 3:
                         _a.sent();
@@ -2794,7 +2812,8 @@ var ClientSession = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     swarmName: this.params.swarmName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 3:
                         _a.sent();
@@ -2830,7 +2849,8 @@ var ClientSession = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     swarmName: this.params.swarmName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 3:
                         _a.sent();
@@ -2872,7 +2892,8 @@ var ClientSession = /** @class */ (function () {
                 output: {},
                 context: {
                     swarmName: _this.params.swarmName,
-                }
+                },
+                clientId: _this.params.clientId,
             });
             return function (incoming) { return __awaiter(_this, void 0, void 0, function () {
                 var _a;
@@ -4915,7 +4936,8 @@ var ClientStorage = /** @class */ (function () {
                                     },
                                     context: {
                                         storageName: this.params.storageName,
-                                    }
+                                    },
+                                    clientId: this.params.clientId,
                                 })];
                         case 3:
                             _c.sent();
@@ -4954,7 +4976,8 @@ var ClientStorage = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     storageName: this.params.storageName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _c.sent();
@@ -4989,7 +5012,8 @@ var ClientStorage = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     storageName: this.params.storageName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 1:
                         _c.sent();
@@ -5015,7 +5039,8 @@ var ClientStorage = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     storageName: this.params.storageName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 1:
                         _a.sent();
@@ -5049,7 +5074,8 @@ var ClientStorage = /** @class */ (function () {
                                 },
                                 context: {
                                     storageName: this.params.storageName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 1:
                         _b.sent();
@@ -5097,7 +5123,8 @@ var ClientStorage = /** @class */ (function () {
                                 },
                                 context: {
                                     storageName: this.params.storageName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 1:
                         _d.sent();
@@ -5840,7 +5867,8 @@ var ClientState = /** @class */ (function () {
                                 },
                                 context: {
                                     stateName: this.params.stateName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _b.sent();
@@ -5873,7 +5901,8 @@ var ClientState = /** @class */ (function () {
                                 },
                                 context: {
                                     stateName: this.params.stateName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _b.sent();
@@ -6188,7 +6217,9 @@ var BusService = /** @class */ (function () {
     function BusService() {
         var _this = this;
         this.loggerService = inject(TYPES.loggerService);
+        this.sessionValidationService = inject(TYPES.sessionValidationService);
         this._eventSourceSet = new Set();
+        this._eventWildcardMap = new Map();
         this.getEventSubject = functoolsKit.memoize(function (_a) {
             var _b = __read(_a, 2), clientId = _b[0], source = _b[1];
             return "".concat(clientId, "-").concat(source);
@@ -6198,15 +6229,17 @@ var BusService = /** @class */ (function () {
          * @param {string} clientId - The client ID.
          * @param {EventSource} source - The event source.
          * @param {(event: T) => void} fn - The callback function to handle the event.
-         * @returns {Subscription} The subscription object.
          */
         this.subscribe = function (clientId, source, fn) {
             _this.loggerService.log("busService subscribe", {
                 clientId: clientId,
                 source: source,
             });
+            if (clientId === "*") {
+                _this._eventWildcardMap.set(source, true);
+            }
             _this._eventSourceSet.add(source);
-            return _this.getEventSubject(clientId, source).subscribe(fn);
+            _this.getEventSubject(clientId, source).subscribe(fn);
         };
         /**
          * Subscribes to a single event for a specific client and source.
@@ -6221,6 +6254,9 @@ var BusService = /** @class */ (function () {
                 clientId: clientId,
                 source: source,
             });
+            if (clientId === "*") {
+                _this._eventWildcardMap.set(source, true);
+            }
             _this._eventSourceSet.add(source);
             return _this.getEventSubject(clientId, source).filter(filterFn).once(fn);
         };
@@ -6238,13 +6274,21 @@ var BusService = /** @class */ (function () {
                             clientId: clientId,
                             event: event,
                         });
-                        if (!this.getEventSubject.has("".concat(clientId, "-").concat(event.source))) {
+                        if (!this.sessionValidationService.hasSession(clientId)) {
                             return [2 /*return*/];
                         }
+                        if (!this.getEventSubject.has("".concat(clientId, "-").concat(event.source))) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.getEventSubject(clientId, event.source).next(event)];
                     case 1:
                         _a.sent();
-                        return [2 /*return*/];
+                        _a.label = 2;
+                    case 2:
+                        if (!this._eventWildcardMap.has(event.source)) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this.getEventSubject("*", event.source).next(event)];
+                    case 3:
+                        _a.sent();
+                        _a.label = 4;
+                    case 4: return [2 /*return*/];
                 }
             });
         }); };
@@ -7517,13 +7561,20 @@ var DISALLOWED_EVENT_SOURCE_LIST$1 = new Set([
     "storage",
     "swarm",
 ]);
+var validateClientId$6 = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenEvent session not found for clientId=".concat(clientId));
+    }
+};
 /**
  * Listens for an event on the swarm bus service and executes a callback function when the event is received.
  *
  * @template T - The type of the data payload.
  * @param {string} clientId - The ID of the client to listen for events from.
  * @param {(data: T) => void} fn - The callback function to execute when the event is received. The data payload is passed as an argument to this function.
- * @returns {void} - Returns nothing.
  */
 var listenEvent = function (clientId, topicName, fn) {
     swarm.loggerService.log("function listenEvent", {
@@ -7532,6 +7583,7 @@ var listenEvent = function (clientId, topicName, fn) {
     if (DISALLOWED_EVENT_SOURCE_LIST$1.has(topicName)) {
         throw new Error("agent-swarm listenEvent topic is reserved topicName=".concat(topicName));
     }
+    validateClientId$6(clientId);
     return swarm.busService.subscribe(clientId, topicName, function (_a) {
         var payload = _a.payload;
         return fn(payload);
@@ -7746,6 +7798,7 @@ var event = function (clientId, topicName, payload) {
     return swarm.busService.emit(clientId, {
         source: topicName,
         payload: payload,
+        clientId: clientId,
     });
 };
@@ -7814,88 +7867,136 @@ var cancelOutputForce = function (clientId) { return __awaiter(void 0, void 0, v
     });
 }); };
+var validateClientId$5 = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenAgentEvent session not found for clientId=".concat(clientId));
+    }
+};
 /**
  * Hook to subscribe to agent events for a specific client.
  *
  * @param {string} clientId - The ID of the client to subscribe to events for.
  * @param {function} fn - The callback function to handle the event.
- * @returns {function} - A function to unsubscribe from the event.
  */
 var listenAgentEvent = function (clientId, fn) {
     swarm.loggerService.log("middleware listenAgentEvent", {
         clientId: clientId,
     });
-    return swarm.busService.subscribe(clientId, "agent", fn);
+    validateClientId$5(clientId);
+    swarm.busService.subscribe(clientId, "agent", fn);
 };
+var validateClientId$4 = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenHistoryEvent session not found for clientId=".concat(clientId));
+    }
+};
 /**
  * Hook to subscribe to history events for a specific client.
  *
  * @param {string} clientId - The ID of the client to subscribe to.
- * @param {(event: IBaseEvent) => void} fn - The callback function to handle the event.
- * @returns {Function} - The unsubscribe function.
+ * @param {(event: IBusEvent) => void} fn - The callback function to handle the event.
  */
 var listenHistoryEvent = function (clientId, fn) {
     swarm.loggerService.log("middleware listenHistoryEvent", {
         clientId: clientId,
     });
-    return swarm.busService.subscribe(clientId, "history", fn);
+    validateClientId$4(clientId);
+    swarm.busService.subscribe(clientId, "history", fn);
 };
+var validateClientId$3 = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenSessionEvent session not found for clientId=".concat(clientId));
+    }
+};
 /**
  * Hook to subscribe to session events for a specific client.
  *
  * @param {string} clientId - The ID of the client to subscribe to session events for.
  * @param {function} fn - The callback function to handle the session events.
- * @returns {function} - The unsubscribe function to stop listening to session events.
  */
 var listenSessionEvent = function (clientId, fn) {
     swarm.loggerService.log("middleware listenSessionEvent", {
         clientId: clientId,
     });
-    return swarm.busService.subscribe(clientId, "session", fn);
+    validateClientId$3(clientId);
+    swarm.busService.subscribe(clientId, "session", fn);
 };
+var validateClientId$2 = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenStateEvent session not found for clientId=".concat(clientId));
+    }
+};
 /**
  * Hook to subscribe to state events for a specific client.
  *
  * @param {string} clientId - The ID of the client to subscribe to.
  * @param {function} fn - The callback function to handle the event.
- * @returns {function} - The unsubscribe function to stop listening to the events.
  */
 var listenStateEvent = function (clientId, fn) {
     swarm.loggerService.log("middleware listenStateEvent", {
         clientId: clientId,
     });
-    return swarm.busService.subscribe(clientId, "state", fn);
+    validateClientId$2(clientId);
+    swarm.busService.subscribe(clientId, "state", fn);
 };
+var validateClientId$1 = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenStorageEvent session not found for clientId=".concat(clientId));
+    }
+};
 /**
  * Hook to subscribe to storage events for a specific client.
  *
  * @param {string} clientId - The ID of the client to subscribe to storage events for.
  * @param {function} fn - The callback function to handle the storage event.
- * @returns {function} - A function to unsubscribe from the storage events.
  */
 var listenStorageEvent = function (clientId, fn) {
     swarm.loggerService.log("middleware listenStorageEvent", {
         clientId: clientId,
     });
-    return swarm.busService.subscribe(clientId, "storage", fn);
+    validateClientId$1(clientId);
+    swarm.busService.subscribe(clientId, "storage", fn);
 };
+var validateClientId = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenSwarmEvent session not found for clientId=".concat(clientId));
+    }
+};
 /**
  * Hook to subscribe to swarm events for a specific client.
  *
  * @param {string} clientId - The ID of the client to subscribe to events for.
- * @param {(event: IBaseEvent) => void} fn - The callback function to handle the event.
- * @returns {Function} - A function to unsubscribe from the event.
+ * @param {(event: IBusEvent) => void} fn - The callback function to handle the event.
  */
 var listenSwarmEvent = function (clientId, fn) {
     swarm.loggerService.log("middleware listenSwarmEvent", {
         clientId: clientId,
     });
-    return swarm.busService.subscribe(clientId, "swarm", fn);
+    validateClientId(clientId);
+    swarm.busService.subscribe(clientId, "swarm", fn);
 };
 var StorageUtils = /** @class */ (function () {

package/build/index.mjs CHANGED Viewed

@@ -981,7 +981,8 @@ var ClientAgent = /** @class */ (function () {
                                 },
                                 context: {
                                     agentName: this.params.agentName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 7:
                         _a.sent();
@@ -1004,7 +1005,8 @@ var ClientAgent = /** @class */ (function () {
                                 },
                                 context: {
                                     agentName: this.params.agentName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 10:
                         _a.sent();
@@ -1148,7 +1150,8 @@ var ClientAgent = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     agentName: this.params.agentName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _a.sent();
@@ -1182,7 +1185,8 @@ var ClientAgent = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     agentName: this.params.agentName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _a.sent();
@@ -1209,7 +1213,8 @@ var ClientAgent = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     agentName: this.params.agentName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _a.sent();
@@ -1246,7 +1251,8 @@ var ClientAgent = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     agentName: this.params.agentName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _a.sent();
@@ -1288,7 +1294,8 @@ var ClientAgent = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     agentName: this.params.agentName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 3:
                         _a.sent();
@@ -1723,7 +1730,8 @@ var ClientHistory = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     agentName: this.params.agentName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _a.sent();
@@ -2132,6 +2140,7 @@ var ClientSwarm = /** @class */ (function () {
                                 context: {
                                     swarmName: this.params.swarmName,
                                 },
+                                clientId: this.params.clientId,
                             })];
                     case 3:
                         _d.sent();
@@ -2206,6 +2215,7 @@ var ClientSwarm = /** @class */ (function () {
                                 context: {
                                     swarmName: this.params.swarmName,
                                 },
+                                clientId: this.params.clientId,
                             })];
                     case 3:
                         _c.sent();
@@ -2239,6 +2249,7 @@ var ClientSwarm = /** @class */ (function () {
                             context: {
                                 swarmName: this.params.swarmName,
                             },
+                            clientId: this.params.clientId,
                         })];
                     case 3:
                         _b.sent();
@@ -2270,6 +2281,7 @@ var ClientSwarm = /** @class */ (function () {
                                 context: {
                                     swarmName: this.params.swarmName,
                                 },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _a.sent();
@@ -2303,6 +2315,7 @@ var ClientSwarm = /** @class */ (function () {
                                 context: {
                                     swarmName: this.params.swarmName,
                                 },
+                                clientId: this.params.clientId,
                             })];
                     case 1:
                         _a.sent();
@@ -2336,6 +2349,7 @@ var ClientSwarm = /** @class */ (function () {
                                 context: {
                                     swarmName: this.params.swarmName,
                                 },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _a.sent();
@@ -2641,7 +2655,8 @@ var ClientSession = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     swarmName: this.params.swarmName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _a.sent();
@@ -2686,7 +2701,8 @@ var ClientSession = /** @class */ (function () {
                                 },
                                 context: {
                                     swarmName: this.params.swarmName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 3:
                         _a.sent();
@@ -2725,7 +2741,8 @@ var ClientSession = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     swarmName: this.params.swarmName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 3:
                         _a.sent();
@@ -2761,7 +2778,8 @@ var ClientSession = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     swarmName: this.params.swarmName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 3:
                         _a.sent();
@@ -2792,7 +2810,8 @@ var ClientSession = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     swarmName: this.params.swarmName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 3:
                         _a.sent();
@@ -2828,7 +2847,8 @@ var ClientSession = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     swarmName: this.params.swarmName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 3:
                         _a.sent();
@@ -2870,7 +2890,8 @@ var ClientSession = /** @class */ (function () {
                 output: {},
                 context: {
                     swarmName: _this.params.swarmName,
-                }
+                },
+                clientId: _this.params.clientId,
             });
             return function (incoming) { return __awaiter(_this, void 0, void 0, function () {
                 var _a;
@@ -4913,7 +4934,8 @@ var ClientStorage = /** @class */ (function () {
                                     },
                                     context: {
                                         storageName: this.params.storageName,
-                                    }
+                                    },
+                                    clientId: this.params.clientId,
                                 })];
                         case 3:
                             _c.sent();
@@ -4952,7 +4974,8 @@ var ClientStorage = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     storageName: this.params.storageName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _c.sent();
@@ -4987,7 +5010,8 @@ var ClientStorage = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     storageName: this.params.storageName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 1:
                         _c.sent();
@@ -5013,7 +5037,8 @@ var ClientStorage = /** @class */ (function () {
                                 output: {},
                                 context: {
                                     storageName: this.params.storageName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 1:
                         _a.sent();
@@ -5047,7 +5072,8 @@ var ClientStorage = /** @class */ (function () {
                                 },
                                 context: {
                                     storageName: this.params.storageName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 1:
                         _b.sent();
@@ -5095,7 +5121,8 @@ var ClientStorage = /** @class */ (function () {
                                 },
                                 context: {
                                     storageName: this.params.storageName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 1:
                         _d.sent();
@@ -5838,7 +5865,8 @@ var ClientState = /** @class */ (function () {
                                 },
                                 context: {
                                     stateName: this.params.stateName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _b.sent();
@@ -5871,7 +5899,8 @@ var ClientState = /** @class */ (function () {
                                 },
                                 context: {
                                     stateName: this.params.stateName,
-                                }
+                                },
+                                clientId: this.params.clientId,
                             })];
                     case 2:
                         _b.sent();
@@ -6186,7 +6215,9 @@ var BusService = /** @class */ (function () {
     function BusService() {
         var _this = this;
         this.loggerService = inject(TYPES.loggerService);
+        this.sessionValidationService = inject(TYPES.sessionValidationService);
         this._eventSourceSet = new Set();
+        this._eventWildcardMap = new Map();
         this.getEventSubject = memoize(function (_a) {
             var _b = __read(_a, 2), clientId = _b[0], source = _b[1];
             return "".concat(clientId, "-").concat(source);
@@ -6196,15 +6227,17 @@ var BusService = /** @class */ (function () {
          * @param {string} clientId - The client ID.
          * @param {EventSource} source - The event source.
          * @param {(event: T) => void} fn - The callback function to handle the event.
-         * @returns {Subscription} The subscription object.
          */
         this.subscribe = function (clientId, source, fn) {
             _this.loggerService.log("busService subscribe", {
                 clientId: clientId,
                 source: source,
             });
+            if (clientId === "*") {
+                _this._eventWildcardMap.set(source, true);
+            }
             _this._eventSourceSet.add(source);
-            return _this.getEventSubject(clientId, source).subscribe(fn);
+            _this.getEventSubject(clientId, source).subscribe(fn);
         };
         /**
          * Subscribes to a single event for a specific client and source.
@@ -6219,6 +6252,9 @@ var BusService = /** @class */ (function () {
                 clientId: clientId,
                 source: source,
             });
+            if (clientId === "*") {
+                _this._eventWildcardMap.set(source, true);
+            }
             _this._eventSourceSet.add(source);
             return _this.getEventSubject(clientId, source).filter(filterFn).once(fn);
         };
@@ -6236,13 +6272,21 @@ var BusService = /** @class */ (function () {
                             clientId: clientId,
                             event: event,
                         });
-                        if (!this.getEventSubject.has("".concat(clientId, "-").concat(event.source))) {
+                        if (!this.sessionValidationService.hasSession(clientId)) {
                             return [2 /*return*/];
                         }
+                        if (!this.getEventSubject.has("".concat(clientId, "-").concat(event.source))) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.getEventSubject(clientId, event.source).next(event)];
                     case 1:
                         _a.sent();
-                        return [2 /*return*/];
+                        _a.label = 2;
+                    case 2:
+                        if (!this._eventWildcardMap.has(event.source)) return [3 /*break*/, 4];
+                        return [4 /*yield*/, this.getEventSubject("*", event.source).next(event)];
+                    case 3:
+                        _a.sent();
+                        _a.label = 4;
+                    case 4: return [2 /*return*/];
                 }
             });
         }); };
@@ -7515,13 +7559,20 @@ var DISALLOWED_EVENT_SOURCE_LIST$1 = new Set([
     "storage",
     "swarm",
 ]);
+var validateClientId$6 = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenEvent session not found for clientId=".concat(clientId));
+    }
+};
 /**
  * Listens for an event on the swarm bus service and executes a callback function when the event is received.
  *
  * @template T - The type of the data payload.
  * @param {string} clientId - The ID of the client to listen for events from.
  * @param {(data: T) => void} fn - The callback function to execute when the event is received. The data payload is passed as an argument to this function.
- * @returns {void} - Returns nothing.
  */
 var listenEvent = function (clientId, topicName, fn) {
     swarm.loggerService.log("function listenEvent", {
@@ -7530,6 +7581,7 @@ var listenEvent = function (clientId, topicName, fn) {
     if (DISALLOWED_EVENT_SOURCE_LIST$1.has(topicName)) {
         throw new Error("agent-swarm listenEvent topic is reserved topicName=".concat(topicName));
     }
+    validateClientId$6(clientId);
     return swarm.busService.subscribe(clientId, topicName, function (_a) {
         var payload = _a.payload;
         return fn(payload);
@@ -7744,6 +7796,7 @@ var event = function (clientId, topicName, payload) {
     return swarm.busService.emit(clientId, {
         source: topicName,
         payload: payload,
+        clientId: clientId,
     });
 };
@@ -7812,88 +7865,136 @@ var cancelOutputForce = function (clientId) { return __awaiter(void 0, void 0, v
     });
 }); };
+var validateClientId$5 = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenAgentEvent session not found for clientId=".concat(clientId));
+    }
+};
 /**
  * Hook to subscribe to agent events for a specific client.
  *
  * @param {string} clientId - The ID of the client to subscribe to events for.
  * @param {function} fn - The callback function to handle the event.
- * @returns {function} - A function to unsubscribe from the event.
  */
 var listenAgentEvent = function (clientId, fn) {
     swarm.loggerService.log("middleware listenAgentEvent", {
         clientId: clientId,
     });
-    return swarm.busService.subscribe(clientId, "agent", fn);
+    validateClientId$5(clientId);
+    swarm.busService.subscribe(clientId, "agent", fn);
 };
+var validateClientId$4 = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenHistoryEvent session not found for clientId=".concat(clientId));
+    }
+};
 /**
  * Hook to subscribe to history events for a specific client.
  *
  * @param {string} clientId - The ID of the client to subscribe to.
- * @param {(event: IBaseEvent) => void} fn - The callback function to handle the event.
- * @returns {Function} - The unsubscribe function.
+ * @param {(event: IBusEvent) => void} fn - The callback function to handle the event.
  */
 var listenHistoryEvent = function (clientId, fn) {
     swarm.loggerService.log("middleware listenHistoryEvent", {
         clientId: clientId,
     });
-    return swarm.busService.subscribe(clientId, "history", fn);
+    validateClientId$4(clientId);
+    swarm.busService.subscribe(clientId, "history", fn);
 };
+var validateClientId$3 = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenSessionEvent session not found for clientId=".concat(clientId));
+    }
+};
 /**
  * Hook to subscribe to session events for a specific client.
  *
  * @param {string} clientId - The ID of the client to subscribe to session events for.
  * @param {function} fn - The callback function to handle the session events.
- * @returns {function} - The unsubscribe function to stop listening to session events.
  */
 var listenSessionEvent = function (clientId, fn) {
     swarm.loggerService.log("middleware listenSessionEvent", {
         clientId: clientId,
     });
-    return swarm.busService.subscribe(clientId, "session", fn);
+    validateClientId$3(clientId);
+    swarm.busService.subscribe(clientId, "session", fn);
 };
+var validateClientId$2 = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenStateEvent session not found for clientId=".concat(clientId));
+    }
+};
 /**
  * Hook to subscribe to state events for a specific client.
  *
  * @param {string} clientId - The ID of the client to subscribe to.
  * @param {function} fn - The callback function to handle the event.
- * @returns {function} - The unsubscribe function to stop listening to the events.
  */
 var listenStateEvent = function (clientId, fn) {
     swarm.loggerService.log("middleware listenStateEvent", {
         clientId: clientId,
     });
-    return swarm.busService.subscribe(clientId, "state", fn);
+    validateClientId$2(clientId);
+    swarm.busService.subscribe(clientId, "state", fn);
 };
+var validateClientId$1 = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenStorageEvent session not found for clientId=".concat(clientId));
+    }
+};
 /**
  * Hook to subscribe to storage events for a specific client.
  *
  * @param {string} clientId - The ID of the client to subscribe to storage events for.
  * @param {function} fn - The callback function to handle the storage event.
- * @returns {function} - A function to unsubscribe from the storage events.
  */
 var listenStorageEvent = function (clientId, fn) {
     swarm.loggerService.log("middleware listenStorageEvent", {
         clientId: clientId,
     });
-    return swarm.busService.subscribe(clientId, "storage", fn);
+    validateClientId$1(clientId);
+    swarm.busService.subscribe(clientId, "storage", fn);
 };
+var validateClientId = function (clientId) {
+    if (clientId === "*") {
+        return;
+    }
+    if (!swarm.sessionValidationService.hasSession(clientId)) {
+        throw new Error("agent-swarm listenSwarmEvent session not found for clientId=".concat(clientId));
+    }
+};
 /**
  * Hook to subscribe to swarm events for a specific client.
  *
  * @param {string} clientId - The ID of the client to subscribe to events for.
- * @param {(event: IBaseEvent) => void} fn - The callback function to handle the event.
- * @returns {Function} - A function to unsubscribe from the event.
+ * @param {(event: IBusEvent) => void} fn - The callback function to handle the event.
  */
 var listenSwarmEvent = function (clientId, fn) {
     swarm.loggerService.log("middleware listenSwarmEvent", {
         clientId: clientId,
     });
-    return swarm.busService.subscribe(clientId, "swarm", fn);
+    validateClientId(clientId);
+    swarm.busService.subscribe(clientId, "swarm", fn);
 };
 var StorageUtils = /** @class */ (function () {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "agent-swarm-kit",
-  "version": "1.0.71",
+  "version": "1.0.73",
   "description": "A TypeScript library for building orchestrated framework-agnostic multi-agent AI systems",
   "author": {
     "name": "Petr Tripolsky",

package/types.d.ts CHANGED Viewed

@@ -390,7 +390,7 @@ type StateName = string;
 /**
  * Interface representing the base context for an event.
  */
-interface IBaseEventContext {
+interface IBusEventContext {
     /**
      * The name of the agent.
      */
@@ -420,6 +420,34 @@ interface IBaseEvent {
      * The source of the event.
      */
     source: EventSource;
+    /**
+     * The client id
+     */
+    clientId: string;
+}
+interface IBusEvent extends IBaseEvent {
+    /**
+     * The type of the event.
+     */
+    type: string;
+    /**
+     * The input data for the event.
+     */
+    input: Record<string, any>;
+    /**
+     * The output data for the event.
+     */
+    output: Record<string, any>;
+    /**
+     * The context of the event.
+     */
+    context: Partial<IBusEventContext>;
+}
+interface ICustomEvent<T extends any = any> extends IBaseEvent {
+    /**
+     * The payload of the event, if any.
+     */
+    payload?: T;
 }
 interface IBus {
@@ -2893,16 +2921,17 @@ declare class StateSchemaService {
 declare class BusService implements IBus {
     private readonly loggerService;
+    private readonly sessionValidationService;
     private _eventSourceSet;
+    private _eventWildcardMap;
     private getEventSubject;
     /**
      * Subscribes to events for a specific client and source.
      * @param {string} clientId - The client ID.
      * @param {EventSource} source - The event source.
      * @param {(event: T) => void} fn - The callback function to handle the event.
-     * @returns {Subscription} The subscription object.
      */
-    subscribe: <T extends IBaseEvent>(clientId: string, source: EventSource, fn: (event: T) => void) => () => void;
+    subscribe: <T extends IBaseEvent>(clientId: string, source: EventSource, fn: (event: T) => void) => void;
     /**
      * Subscribes to a single event for a specific client and source.
      * @param {string} clientId - The client ID.
@@ -3294,9 +3323,8 @@ declare const executeForce: (content: string, clientId: string) => Promise<strin
  * @template T - The type of the data payload.
  * @param {string} clientId - The ID of the client to listen for events from.
  * @param {(data: T) => void} fn - The callback function to execute when the event is received. The data payload is passed as an argument to this function.
- * @returns {void} - Returns nothing.
  */
-declare const listenEvent: <T extends unknown = any>(clientId: string, topicName: string, fn: (data: T) => void) => () => void;
+declare const listenEvent: <T extends unknown = any>(clientId: string, topicName: string, fn: (data: T) => void) => void;
 /**
  * Retrieves the last message sent by the user from the client's message history.
@@ -3412,54 +3440,48 @@ declare const cancelOutputForce: (clientId: string) => Promise<void>;
  *
  * @param {string} clientId - The ID of the client to subscribe to events for.
  * @param {function} fn - The callback function to handle the event.
- * @returns {function} - A function to unsubscribe from the event.
  */
-declare const listenAgentEvent: (clientId: string, fn: (event: IBaseEvent) => void) => () => void;
+declare const listenAgentEvent: (clientId: string, fn: (event: IBusEvent) => void) => void;
 /**
  * Hook to subscribe to history events for a specific client.
  *
  * @param {string} clientId - The ID of the client to subscribe to.
- * @param {(event: IBaseEvent) => void} fn - The callback function to handle the event.
- * @returns {Function} - The unsubscribe function.
+ * @param {(event: IBusEvent) => void} fn - The callback function to handle the event.
  */
-declare const listenHistoryEvent: (clientId: string, fn: (event: IBaseEvent) => void) => () => void;
+declare const listenHistoryEvent: (clientId: string, fn: (event: IBusEvent) => void) => void;
 /**
  * Hook to subscribe to session events for a specific client.
  *
  * @param {string} clientId - The ID of the client to subscribe to session events for.
  * @param {function} fn - The callback function to handle the session events.
- * @returns {function} - The unsubscribe function to stop listening to session events.
  */
-declare const listenSessionEvent: (clientId: string, fn: (event: IBaseEvent) => void) => () => void;
+declare const listenSessionEvent: (clientId: string, fn: (event: IBusEvent) => void) => void;
 /**
  * Hook to subscribe to state events for a specific client.
  *
  * @param {string} clientId - The ID of the client to subscribe to.
  * @param {function} fn - The callback function to handle the event.
- * @returns {function} - The unsubscribe function to stop listening to the events.
  */
-declare const listenStateEvent: (clientId: string, fn: (event: IBaseEvent) => void) => () => void;
+declare const listenStateEvent: (clientId: string, fn: (event: IBusEvent) => void) => void;
 /**
  * Hook to subscribe to storage events for a specific client.
  *
  * @param {string} clientId - The ID of the client to subscribe to storage events for.
  * @param {function} fn - The callback function to handle the storage event.
- * @returns {function} - A function to unsubscribe from the storage events.
  */
-declare const listenStorageEvent: (clientId: string, fn: (event: IBaseEvent) => void) => () => void;
+declare const listenStorageEvent: (clientId: string, fn: (event: IBusEvent) => void) => void;
 /**
  * Hook to subscribe to swarm events for a specific client.
  *
  * @param {string} clientId - The ID of the client to subscribe to events for.
- * @param {(event: IBaseEvent) => void} fn - The callback function to handle the event.
- * @returns {Function} - A function to unsubscribe from the event.
+ * @param {(event: IBusEvent) => void} fn - The callback function to handle the event.
  */
-declare const listenSwarmEvent: (clientId: string, fn: (event: IBaseEvent) => void) => () => void;
+declare const listenSwarmEvent: (clientId: string, fn: (event: IBusEvent) => void) => void;
 declare const GLOBAL_CONFIG: {
     CC_TOOL_CALL_EXCEPTION_PROMPT: string;
@@ -3622,4 +3644,4 @@ declare class StateUtils implements TState {
  */
 declare const State: StateUtils;
-export { ContextService, type EventSource, History, HistoryAdapter, HistoryInstance, type IAgentSchema, type IAgentTool, type IBaseEvent, type IBaseEventContext, type ICompletionArgs, type ICompletionSchema, type IEmbeddingSchema, type IHistoryAdapter, type IHistoryInstance, type IHistoryInstanceCallbacks, type IIncomingMessage, type IMakeConnectionConfig, type IMakeDisposeParams, type IModelMessage, type IOutgoingMessage, type ISessionConfig, type IStateSchema, type IStorageSchema, type ISwarmSchema, type ITool, type IToolCall, type ReceiveMessageFn, type SendMessageFn$1 as SendMessageFn, State, Storage, addAgent, addCompletion, addEmbedding, addState, addStorage, addSwarm, addTool, cancelOutput, cancelOutputForce, changeAgent, commitFlush, commitFlushForce, commitSystemMessage, commitSystemMessageForce, commitToolOutput, commitToolOutputForce, commitUserMessage, commitUserMessageForce, complete, disposeConnection, emit, emitForce, event, execute, executeForce, getAgentHistory, getAgentName, getAssistantHistory, getLastAssistantMessage, getLastSystemMessage, getLastUserMessage, getRawHistory, getSessionMode, getUserHistory, listenAgentEvent, listenEvent, listenHistoryEvent, listenSessionEvent, listenStateEvent, listenStorageEvent, listenSwarmEvent, makeAutoDispose, makeConnection, session, setConfig, swarm };
+export { ContextService, type EventSource, History, HistoryAdapter, HistoryInstance, type IAgentSchema, type IAgentTool, type IBaseEvent, type IBusEvent, type IBusEventContext, type ICompletionArgs, type ICompletionSchema, type ICustomEvent, type IEmbeddingSchema, type IHistoryAdapter, type IHistoryInstance, type IHistoryInstanceCallbacks, type IIncomingMessage, type IMakeConnectionConfig, type IMakeDisposeParams, type IModelMessage, type IOutgoingMessage, type ISessionConfig, type IStateSchema, type IStorageSchema, type ISwarmSchema, type ITool, type IToolCall, type ReceiveMessageFn, type SendMessageFn$1 as SendMessageFn, State, Storage, addAgent, addCompletion, addEmbedding, addState, addStorage, addSwarm, addTool, cancelOutput, cancelOutputForce, changeAgent, commitFlush, commitFlushForce, commitSystemMessage, commitSystemMessageForce, commitToolOutput, commitToolOutputForce, commitUserMessage, commitUserMessageForce, complete, disposeConnection, emit, emitForce, event, execute, executeForce, getAgentHistory, getAgentName, getAssistantHistory, getLastAssistantMessage, getLastSystemMessage, getLastUserMessage, getRawHistory, getSessionMode, getUserHistory, listenAgentEvent, listenEvent, listenHistoryEvent, listenSessionEvent, listenStateEvent, listenStorageEvent, listenSwarmEvent, makeAutoDispose, makeConnection, session, setConfig, swarm };