@cogitator-ai/express 0.9.6 → 0.11.0
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.
- package/README.md +72 -12
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/middleware/auth.d.ts +6 -0
- package/dist/middleware/auth.d.ts.map +1 -1
- package/dist/middleware/auth.js +17 -6
- package/dist/middleware/auth.js.map +1 -1
- package/dist/middleware/error-handler.d.ts.map +1 -1
- package/dist/middleware/error-handler.js +16 -36
- package/dist/middleware/error-handler.js.map +1 -1
- package/dist/middleware/index.d.ts +1 -1
- package/dist/middleware/index.d.ts.map +1 -1
- package/dist/middleware/index.js +1 -1
- package/dist/middleware/index.js.map +1 -1
- package/dist/middleware/json-body.d.ts.map +1 -1
- package/dist/middleware/json-body.js +2 -1
- package/dist/middleware/json-body.js.map +1 -1
- package/dist/middleware/rate-limit.d.ts.map +1 -1
- package/dist/middleware/rate-limit.js +6 -6
- package/dist/middleware/rate-limit.js.map +1 -1
- package/dist/routes/agents.d.ts.map +1 -1
- package/dist/routes/agents.js +69 -31
- package/dist/routes/agents.js.map +1 -1
- package/dist/routes/swarms.d.ts.map +1 -1
- package/dist/routes/swarms.js +8 -4
- package/dist/routes/swarms.js.map +1 -1
- package/dist/routes/threads.d.ts.map +1 -1
- package/dist/routes/threads.js +15 -18
- package/dist/routes/threads.js.map +1 -1
- package/dist/routes/utils.d.ts +26 -8
- package/dist/routes/utils.d.ts.map +1 -1
- package/dist/routes/utils.js +52 -12
- package/dist/routes/utils.js.map +1 -1
- package/dist/routes/workflows.d.ts.map +1 -1
- package/dist/routes/workflows.js +6 -5
- package/dist/routes/workflows.js.map +1 -1
- package/dist/server.d.ts +2 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +11 -6
- package/dist/server.js.map +1 -1
- package/dist/types.d.ts +48 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/websocket/ws-handler.d.ts +2 -2
- package/dist/websocket/ws-handler.d.ts.map +1 -1
- package/dist/websocket/ws-handler.js +123 -28
- package/dist/websocket/ws-handler.js.map +1 -1
- package/package.json +7 -7
package/dist/server.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Router, json } from 'express';
|
|
2
2
|
import { getLogger } from '@cogitator-ai/core';
|
|
3
|
-
import { DEFAULT_THREAD_MESSAGE_ROLES, resolveSseHeartbeatMs } from '@cogitator-ai/server-shared';
|
|
4
|
-
import { createAuthMiddleware, createRateLimitMiddleware, createCorsMiddleware, createJsonBodyGuard, errorHandler, notFoundHandler, } from './middleware/index.js';
|
|
3
|
+
import { DEFAULT_THREAD_MESSAGE_ROLES, checkRunLimits, resolveSseHeartbeatMs, } from '@cogitator-ai/server-shared';
|
|
4
|
+
import { createAnonymousGuard, createAuthMiddleware, createRateLimitMiddleware, createCorsMiddleware, createJsonBodyGuard, errorHandler, notFoundHandler, } from './middleware/index.js';
|
|
5
5
|
import { createHealthRoutes, createAgentRoutes, createThreadRoutes, createToolRoutes, createWorkflowRoutes, createSwarmRoutes, } from './routes/index.js';
|
|
6
6
|
import { generateOpenAPISpec, serveSwaggerUI } from './swagger/index.js';
|
|
7
7
|
import { setupWebSocket } from './websocket/index.js';
|
|
@@ -37,6 +37,8 @@ export class CogitatorServer {
|
|
|
37
37
|
sseHeartbeatMs: resolveSseHeartbeatMs(cfg.sseHeartbeatMs),
|
|
38
38
|
acceptContext: cfg.acceptContext ?? false,
|
|
39
39
|
threadMessageRoles: cfg.threadMessageRoles ?? DEFAULT_THREAD_MESSAGE_ROLES,
|
|
40
|
+
limits: checkRunLimits(cfg.limits),
|
|
41
|
+
anonymous: cfg.anonymous ?? 'allow',
|
|
40
42
|
};
|
|
41
43
|
}
|
|
42
44
|
async init() {
|
|
@@ -63,14 +65,15 @@ export class CogitatorServer {
|
|
|
63
65
|
};
|
|
64
66
|
this.routeContext = ctx;
|
|
65
67
|
router.use(createHealthRoutes(ctx));
|
|
68
|
+
if (this.config.enableSwagger) {
|
|
69
|
+
this.setupSwagger(router, ctx);
|
|
70
|
+
}
|
|
71
|
+
router.use(createAnonymousGuard(this.config.anonymous));
|
|
66
72
|
router.use(createAgentRoutes(ctx));
|
|
67
73
|
router.use(createThreadRoutes(ctx));
|
|
68
74
|
router.use(createToolRoutes(ctx));
|
|
69
75
|
router.use(createWorkflowRoutes(ctx));
|
|
70
76
|
router.use(createSwarmRoutes(ctx));
|
|
71
|
-
if (this.config.enableSwagger) {
|
|
72
|
-
this.setupSwagger(router, ctx);
|
|
73
|
-
}
|
|
74
77
|
router.use(notFoundHandler);
|
|
75
78
|
router.use(errorHandler);
|
|
76
79
|
this.app.use(basePath, router);
|
|
@@ -82,6 +85,7 @@ export class CogitatorServer {
|
|
|
82
85
|
...this.config.swagger,
|
|
83
86
|
servers: this.config.swagger?.servers ?? [{ url: this.config.basePath }],
|
|
84
87
|
auth: this.config.swagger?.auth ?? Boolean(this.config.auth),
|
|
88
|
+
limits: this.config.limits,
|
|
85
89
|
});
|
|
86
90
|
router.get('/openapi.json', (_req, res) => {
|
|
87
91
|
res.json(spec);
|
|
@@ -91,7 +95,8 @@ export class CogitatorServer {
|
|
|
91
95
|
/**
|
|
92
96
|
* Attach the WebSocket endpoint (`<basePath>/ws` by default) to an HTTP server.
|
|
93
97
|
* Requires `config.enableWebSocket: true` and a prior `init()` call.
|
|
94
|
-
* The configured `auth` function is applied to the upgrade request
|
|
98
|
+
* The configured `auth` function is applied to the upgrade request, and with
|
|
99
|
+
* `anonymous: 'deny'` an upgrade without a user id is refused with 401.
|
|
95
100
|
*/
|
|
96
101
|
async attachWebSocket(server) {
|
|
97
102
|
if (!this.config.enableWebSocket) {
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import type { IncomingMessage } from 'http';
|
|
1
2
|
import type { Request, Response, NextFunction, Router } from 'express';
|
|
2
3
|
import type { Cogitator, Agent } from '@cogitator-ai/core';
|
|
3
|
-
import type { AgentRunResponse, ContextPolicy, PendingApproval, SwaggerConfig, ThreadMessageRole, WorkflowRunRequestBody } from '@cogitator-ai/server-shared';
|
|
4
|
+
import type { AgentRunResponse, AnonymousPolicy, AuthorizeThread, ContextPolicy, PendingApproval, RunLimits, SwaggerConfig, ThreadMessageRole, WorkflowRunRequestBody } from '@cogitator-ai/server-shared';
|
|
4
5
|
import type { Message, ToolCall, ToolResult, RunResult, Workflow, WorkflowResult, WorkflowState, SwarmConfig, SwarmResult, SwarmRunOptions, StreamingWorkflowEvent, SwarmEvent, SwarmMessage, ToolApprovalDecision } from '@cogitator-ai/types';
|
|
5
6
|
export type { Message, ToolCall, ToolResult, RunResult, Workflow, WorkflowResult, WorkflowState, SwarmConfig, SwarmResult, SwarmRunOptions, StreamingWorkflowEvent, SwarmEvent, SwarmMessage, ToolApprovalDecision, PendingApproval, AgentRunResponse, };
|
|
6
7
|
export interface AuthContext {
|
|
@@ -17,6 +18,13 @@ export interface CogitatorRequest<P = Request['params']> extends Request<P> {
|
|
|
17
18
|
};
|
|
18
19
|
}
|
|
19
20
|
export type AuthFunction = (req: Request) => Promise<AuthContext | undefined> | AuthContext | undefined;
|
|
21
|
+
/** Builds the `deps` an agent run of an HTTP request passes to its tools */
|
|
22
|
+
export type DepsFunction = (req: Request) => unknown | Promise<unknown>;
|
|
23
|
+
/**
|
|
24
|
+
* Builds the `deps` an agent run on a WebSocket connection passes to its tools, from the
|
|
25
|
+
* upgrade request
|
|
26
|
+
*/
|
|
27
|
+
export type WebSocketDepsFunction = (req: IncomingMessage) => unknown | Promise<unknown>;
|
|
20
28
|
export interface RateLimitConfig {
|
|
21
29
|
windowMs: number;
|
|
22
30
|
max: number;
|
|
@@ -38,6 +46,13 @@ export interface WebSocketConfig {
|
|
|
38
46
|
path?: string;
|
|
39
47
|
pingInterval?: number;
|
|
40
48
|
maxPayloadSize?: number;
|
|
49
|
+
/**
|
|
50
|
+
* Builds the `deps` of each agent run and resume on a connection, from its upgrade request.
|
|
51
|
+
* That request is a plain Node `IncomingMessage` that never went through Express, so it has
|
|
52
|
+
* `headers`, `url` and `socket` but no `req.get()` and nothing a middleware adds. Default:
|
|
53
|
+
* WebSocket runs get no deps. deps never come from a message.
|
|
54
|
+
*/
|
|
55
|
+
deps?: WebSocketDepsFunction;
|
|
41
56
|
}
|
|
42
57
|
export interface CogitatorServerConfig {
|
|
43
58
|
app: Router;
|
|
@@ -71,6 +86,30 @@ export interface CogitatorServerConfig {
|
|
|
71
86
|
* `assistant`. A `system` message is read by the model as operator instructions.
|
|
72
87
|
*/
|
|
73
88
|
threadMessageRoles?: readonly ThreadMessageRole[];
|
|
89
|
+
/**
|
|
90
|
+
* Caps on what a request may ask a run for: a swarm's `timeout`, a workflow's
|
|
91
|
+
* `maxIterations` and `maxConcurrency`. A request asking for more gets the cap, one asking
|
|
92
|
+
* for nothing gets the cap too. Checked when the server is created.
|
|
93
|
+
*/
|
|
94
|
+
limits?: RunLimits;
|
|
95
|
+
/**
|
|
96
|
+
* Whether a caller without a user id may use the API. `'allow'` (the default) lets them
|
|
97
|
+
* in, `'deny'` answers `401 UNAUTHORIZED` on every route but health, ready and the docs.
|
|
98
|
+
*/
|
|
99
|
+
anonymous?: AnonymousPolicy;
|
|
100
|
+
/**
|
|
101
|
+
* Decides whether a caller may touch a thread, on top of the ownership check of core:
|
|
102
|
+
* called with what `auth` returned and the thread a request names, on every route and
|
|
103
|
+
* WebSocket run that names one. Answering `false` refuses with `403 THREAD_FORBIDDEN`
|
|
104
|
+
* before any run starts.
|
|
105
|
+
*/
|
|
106
|
+
authorizeThread?: AuthorizeThread<AuthContext>;
|
|
107
|
+
/**
|
|
108
|
+
* Builds the `deps` an agent run, stream or resume gets for an HTTP request (tools read
|
|
109
|
+
* them as `context.deps`). deps never come from the request body. WebSocket runs use
|
|
110
|
+
* `websocket.deps`, since their upgrade request is not an Express `Request`.
|
|
111
|
+
*/
|
|
112
|
+
deps?: DepsFunction;
|
|
74
113
|
};
|
|
75
114
|
}
|
|
76
115
|
export interface AgentListResponse {
|
|
@@ -96,6 +135,8 @@ export interface ThreadResponse {
|
|
|
96
135
|
metadata?: Record<string, unknown>;
|
|
97
136
|
createdAt: number;
|
|
98
137
|
updatedAt: number;
|
|
138
|
+
/** Pass as `cursor` to read the page before this one, absent at the start of the thread */
|
|
139
|
+
nextCursor?: string;
|
|
99
140
|
}
|
|
100
141
|
export interface AddMessageRequest {
|
|
101
142
|
role: 'user' | 'assistant' | 'system';
|
|
@@ -180,12 +221,17 @@ export interface ErrorResponse {
|
|
|
180
221
|
};
|
|
181
222
|
}
|
|
182
223
|
export type ExpressMiddleware = (req: CogitatorRequest, res: Response, next: NextFunction) => void | Promise<void>;
|
|
224
|
+
type ServerOptions = NonNullable<CogitatorServerConfig['config']>;
|
|
225
|
+
/** The options that stay unset when the server is not given them */
|
|
226
|
+
type UnsetServerOptions = 'limits' | 'authorizeThread' | 'deps';
|
|
227
|
+
/** The server's options with their defaults applied */
|
|
228
|
+
export type ResolvedServerConfig = Required<Omit<ServerOptions, UnsetServerOptions>> & Pick<ServerOptions, UnsetServerOptions>;
|
|
183
229
|
export interface RouteContext {
|
|
184
230
|
cogitator: Cogitator;
|
|
185
231
|
agents: Record<string, Agent>;
|
|
186
232
|
workflows: Record<string, Workflow<WorkflowState>>;
|
|
187
233
|
swarms: Record<string, SwarmConfig>;
|
|
188
|
-
config:
|
|
234
|
+
config: ResolvedServerConfig;
|
|
189
235
|
}
|
|
190
236
|
export interface WebSocketMessage {
|
|
191
237
|
type: 'subscribe' | 'unsubscribe' | 'run' | 'resume' | 'stop' | 'ping';
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EACV,gBAAgB,EAChB,aAAa,EACb,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,sBAAsB,EACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EACV,OAAO,EACP,QAAQ,EACR,UAAU,EACV,SAAS,EACT,QAAQ,EACR,cAAc,EACd,aAAa,EACb,WAAW,EACX,WAAW,EACX,eAAe,EACf,sBAAsB,EACtB,UAAU,EACV,YAAY,EACZ,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAE7B,YAAY,EACV,OAAO,EACP,QAAQ,EACR,UAAU,EACV,SAAS,EACT,QAAQ,EACR,cAAc,EACd,aAAa,EACb,WAAW,EACX,WAAW,EACX,eAAe,EACf,sBAAsB,EACtB,UAAU,EACV,YAAY,EACZ,oBAAoB,EACpB,eAAe,EACf,gBAAgB,GACjB,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAC;IACzE,SAAS,CAAC,EAAE;QACV,IAAI,CAAC,EAAE,WAAW,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,MAAM,MAAM,YAAY,GAAG,CACzB,GAAG,EAAE,OAAO,KACT,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,GAAG,WAAW,GAAG,SAAS,CAAC;AAEhE,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,CAAC;IACxC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC;IACjC,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,KAAK,OAAO,CAAC,CAAC;IACtE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,YAAY,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAEjE,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAC5C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EACV,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,aAAa,EACb,eAAe,EACf,SAAS,EACT,aAAa,EACb,iBAAiB,EACjB,sBAAsB,EACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EACV,OAAO,EACP,QAAQ,EACR,UAAU,EACV,SAAS,EACT,QAAQ,EACR,cAAc,EACd,aAAa,EACb,WAAW,EACX,WAAW,EACX,eAAe,EACf,sBAAsB,EACtB,UAAU,EACV,YAAY,EACZ,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAE7B,YAAY,EACV,OAAO,EACP,QAAQ,EACR,UAAU,EACV,SAAS,EACT,QAAQ,EACR,cAAc,EACd,aAAa,EACb,WAAW,EACX,WAAW,EACX,eAAe,EACf,sBAAsB,EACtB,UAAU,EACV,YAAY,EACZ,oBAAoB,EACpB,eAAe,EACf,gBAAgB,GACjB,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,gBAAgB,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAE,SAAQ,OAAO,CAAC,CAAC,CAAC;IACzE,SAAS,CAAC,EAAE;QACV,IAAI,CAAC,EAAE,WAAW,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,MAAM,MAAM,YAAY,GAAG,CACzB,GAAG,EAAE,OAAO,KACT,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,GAAG,WAAW,GAAG,SAAS,CAAC;AAEhE,4EAA4E;AAC5E,MAAM,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAExE;;;GAGG;AACH,MAAM,MAAM,qBAAqB,GAAG,CAAC,GAAG,EAAE,eAAe,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAEzF,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,MAAM,CAAC;IACxC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC;IACjC,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,KAAK,OAAO,CAAC,CAAC;IACtE,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,YAAY,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAEjE,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,qBAAqB,CAAC;CAC9B;AAED,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC;IACpD,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACrC,MAAM,CAAC,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,eAAe,CAAC,EAAE,OAAO,CAAC;QAC1B,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,IAAI,CAAC,EAAE,YAAY,CAAC;QACpB,SAAS,CAAC,EAAE,eAAe,CAAC;QAC5B,IAAI,CAAC,EAAE,UAAU,CAAC;QAClB,OAAO,CAAC,EAAE,aAAa,CAAC;QACxB,SAAS,CAAC,EAAE,eAAe,CAAC;QAC5B;;;;WAIG;QACH,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB;;;;WAIG;QACH,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B;;;WAGG;QACH,kBAAkB,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;QAClD;;;;WAIG;QACH,MAAM,CAAC,EAAE,SAAS,CAAC;QACnB;;;WAGG;QACH,SAAS,CAAC,EAAE,eAAe,CAAC;QAC5B;;;;;WAKG;QACH,eAAe,CAAC,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC;QAC/C;;;;WAIG;QACH,IAAI,CAAC,EAAE,YAAY,CAAC;KACrB,CAAC;CACH;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,KAAK,EAAE,MAAM,EAAE,CAAC;KACjB,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IACjD,eAAe,CAAC,EAAE,oBAAoB,CAAC;CACxC;AAED,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,2FAA2F;IAC3F,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,QAAQ,CAAC;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,KAAK,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACrC,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,KAAK,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,MAAM,EAAE,CAAC;KACjB,CAAC,CAAC;CACJ;AAED,MAAM,MAAM,kBAAkB,GAAG,sBAAsB,CAAC;AAExD,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,MAAM,EAAE,OAAO,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACpE;AAED,MAAM,WAAW,sBAAsB;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IACvD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,EAAE,CAAC;KAClB,CAAC,CAAC;CACJ;AAED,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,KAAK,EAAE;QACL,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CACH;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,IAAI,GAAG,UAAU,GAAG,OAAO,CAAC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CACb,MAAM,EACN;QACE,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC;QACvB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,CACF,CAAC;CACH;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE;QACL,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,CAAC;CACH;AAED,MAAM,MAAM,iBAAiB,GAAG,CAC9B,GAAG,EAAE,gBAAgB,EACrB,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,YAAY,KACf,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAE1B,KAAK,aAAa,GAAG,WAAW,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC;AAElE,oEAAoE;AACpE,KAAK,kBAAkB,GAAG,QAAQ,GAAG,iBAAiB,GAAG,MAAM,CAAC;AAEhE,uDAAuD;AACvD,MAAM,MAAM,oBAAoB,GAAG,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC,GAClF,IAAI,CAAC,aAAa,EAAE,kBAAkB,CAAC,CAAC;AAE1C,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC;IACnD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACpC,MAAM,EAAE,oBAAoB,CAAC;CAC9B;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,WAAW,GAAG,aAAa,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;IACvE,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,YAAY,GAAG,cAAc,GAAG,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC;IACjE,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,YAAY,EACV,WAAW,EACX,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,6BAA6B,CAAC"}
|
|
@@ -5,8 +5,8 @@ type WebSocketServerType = import('ws').WebSocketServer;
|
|
|
5
5
|
* Attach the Cogitator WebSocket protocol to an HTTP server.
|
|
6
6
|
*
|
|
7
7
|
* When `ctx.config.auth` is set it is called with the upgrade request; connections whose
|
|
8
|
-
* auth function throws
|
|
9
|
-
* package is not installed.
|
|
8
|
+
* auth function throws, or that carry no user id under `anonymous: 'deny'`, are rejected
|
|
9
|
+
* with 401. Returns `null` when the optional `ws` package is not installed.
|
|
10
10
|
*/
|
|
11
11
|
export declare function setupWebSocket(server: HttpServer, ctx: RouteContext, config?: WebSocketConfig): Promise<WebSocketServerType | null>;
|
|
12
12
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-handler.d.ts","sourceRoot":"","sources":["../../src/websocket/ws-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAmB,MAAM,MAAM,CAAC;AAIlE,OAAO,KAAK,EAIV,YAAY,EACZ,eAAe,EAChB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"ws-handler.d.ts","sourceRoot":"","sources":["../../src/websocket/ws-handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAmB,MAAM,MAAM,CAAC;AAIlE,OAAO,KAAK,EAIV,YAAY,EACZ,eAAe,EAChB,MAAM,aAAa,CAAC;AAiBrB,KAAK,mBAAmB,GAAG,OAAO,IAAI,EAAE,eAAe,CAAC;AAqMxD;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,UAAU,EAClB,GAAG,EAAE,YAAY,EACjB,MAAM,GAAE,eAAoB,GAC3B,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CA0FrC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { getLogger } from '@cogitator-ai/core';
|
|
2
|
-
import { isJsonObject, parseResumeRequest, parseRunRequest, toAgentRunResponse, toAgentToolCall, } from '@cogitator-ai/server-shared';
|
|
2
|
+
import { admitCaller, authorizeThreadAccess, isJsonObject, parseResumeRequest, parseRunRequest, toAgentRunResponse, toAgentToolCall, } from '@cogitator-ai/server-shared';
|
|
3
3
|
import { generateId } from '../streaming/helpers.js';
|
|
4
4
|
import { resolveError } from '../routes/utils.js';
|
|
5
5
|
const WS_OPEN = 1;
|
|
@@ -14,18 +14,24 @@ const MESSAGE_TYPES = new Set([
|
|
|
14
14
|
'ping',
|
|
15
15
|
]);
|
|
16
16
|
/**
|
|
17
|
-
*
|
|
18
|
-
*
|
|
17
|
+
* The subscribers of each channel, with what authentication returned for them. A run's events
|
|
18
|
+
* reach a subscriber only when it acts as the user who started the run and `authorizeThread`
|
|
19
|
+
* lets it on the run's thread, so a caller never sees the prompts and results of a run it
|
|
20
|
+
* could not open itself.
|
|
19
21
|
*/
|
|
20
22
|
class ChannelHub {
|
|
23
|
+
authorizeThread;
|
|
21
24
|
channels = new Map();
|
|
22
|
-
|
|
25
|
+
constructor(authorizeThread) {
|
|
26
|
+
this.authorizeThread = authorizeThread;
|
|
27
|
+
}
|
|
28
|
+
subscribe(ws, channel, auth) {
|
|
23
29
|
let members = this.channels.get(channel);
|
|
24
30
|
if (!members) {
|
|
25
31
|
members = new Map();
|
|
26
32
|
this.channels.set(channel, members);
|
|
27
33
|
}
|
|
28
|
-
members.set(ws,
|
|
34
|
+
members.set(ws, auth);
|
|
29
35
|
}
|
|
30
36
|
unsubscribe(ws, channel) {
|
|
31
37
|
const members = this.channels.get(channel);
|
|
@@ -35,17 +41,74 @@ class ChannelHub {
|
|
|
35
41
|
if (members.size === 0)
|
|
36
42
|
this.channels.delete(channel);
|
|
37
43
|
}
|
|
38
|
-
|
|
39
|
-
|
|
44
|
+
/** The fan-out of one run's events to the subscribers of `channel` */
|
|
45
|
+
broadcast(channel, origin) {
|
|
46
|
+
return new RunBroadcast(() => this.channels.get(channel), channel, origin, this.authorizeThread);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Sends one run's events to the subscribers allowed to see them. Whether a subscriber may is
|
|
51
|
+
* asked of `authorizeThread` once per run, with the run's thread, and its events wait for the
|
|
52
|
+
* answer in the order they were published. A subscriber the authorizer refuses, or throws for,
|
|
53
|
+
* gets none of them, and with an authorizer set a run whose thread is not known yet is shown
|
|
54
|
+
* to nobody.
|
|
55
|
+
*/
|
|
56
|
+
class RunBroadcast {
|
|
57
|
+
members;
|
|
58
|
+
channel;
|
|
59
|
+
origin;
|
|
60
|
+
authorizeThread;
|
|
61
|
+
threadId;
|
|
62
|
+
deliveries = new Map();
|
|
63
|
+
constructor(members, channel, origin, authorizeThread) {
|
|
64
|
+
this.members = members;
|
|
65
|
+
this.channel = channel;
|
|
66
|
+
this.origin = origin;
|
|
67
|
+
this.authorizeThread = authorizeThread;
|
|
68
|
+
}
|
|
69
|
+
/** Names the thread the run is on, once it is known */
|
|
70
|
+
onThread(threadId) {
|
|
71
|
+
this.threadId = threadId;
|
|
72
|
+
}
|
|
73
|
+
publish(response) {
|
|
74
|
+
const members = this.members();
|
|
40
75
|
if (!members)
|
|
41
76
|
return;
|
|
42
|
-
for (const [member,
|
|
43
|
-
if (member
|
|
44
|
-
|
|
45
|
-
|
|
77
|
+
for (const [member, auth] of members) {
|
|
78
|
+
if (member === this.origin.ws || auth?.userId !== this.origin.auth?.userId)
|
|
79
|
+
continue;
|
|
80
|
+
const admitted = this.deliveries.get(member) ?? this.admit(auth);
|
|
81
|
+
this.deliveries.set(member, admitted.then((allowed) => {
|
|
82
|
+
if (allowed)
|
|
83
|
+
sendResponse(member, { ...response, channel: this.channel });
|
|
84
|
+
return allowed;
|
|
85
|
+
}));
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
async admit(auth) {
|
|
89
|
+
if (!this.authorizeThread)
|
|
90
|
+
return true;
|
|
91
|
+
if (this.threadId === undefined)
|
|
92
|
+
return false;
|
|
93
|
+
try {
|
|
94
|
+
return await new Promise((resolve, reject) => {
|
|
95
|
+
const timer = setTimeout(() => resolve(false), SUBSCRIBER_AUTHORIZATION_MS);
|
|
96
|
+
authorizeThreadAccess(this.authorizeThread, auth, this.threadId)
|
|
97
|
+
.then((refusal) => resolve(refusal === undefined), reject)
|
|
98
|
+
.finally(() => clearTimeout(timer));
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
catch (error) {
|
|
102
|
+
console.error('[CogitatorServer] authorizeThread failed for a WebSocket subscriber:', error);
|
|
103
|
+
return false;
|
|
46
104
|
}
|
|
47
105
|
}
|
|
48
106
|
}
|
|
107
|
+
/**
|
|
108
|
+
* How long `authorizeThread` may take to answer for a subscriber before it counts as a refusal,
|
|
109
|
+
* so a hook that hangs never holds the run's events for the subscriber in memory
|
|
110
|
+
*/
|
|
111
|
+
const SUBSCRIBER_AUTHORIZATION_MS = 5000;
|
|
49
112
|
function parseMessage(raw) {
|
|
50
113
|
let data;
|
|
51
114
|
try {
|
|
@@ -98,8 +161,8 @@ function isModuleNotFound(error) {
|
|
|
98
161
|
* Attach the Cogitator WebSocket protocol to an HTTP server.
|
|
99
162
|
*
|
|
100
163
|
* When `ctx.config.auth` is set it is called with the upgrade request; connections whose
|
|
101
|
-
* auth function throws
|
|
102
|
-
* package is not installed.
|
|
164
|
+
* auth function throws, or that carry no user id under `anonymous: 'deny'`, are rejected
|
|
165
|
+
* with 401. Returns `null` when the optional `ws` package is not installed.
|
|
103
166
|
*/
|
|
104
167
|
export async function setupWebSocket(server, ctx, config = {}) {
|
|
105
168
|
let wsModule;
|
|
@@ -113,18 +176,23 @@ export async function setupWebSocket(server, ctx, config = {}) {
|
|
|
113
176
|
return null;
|
|
114
177
|
}
|
|
115
178
|
const authFn = ctx.config.auth;
|
|
179
|
+
const anonymous = ctx.config.anonymous;
|
|
116
180
|
const authResults = new WeakMap();
|
|
117
|
-
const hub = new ChannelHub();
|
|
181
|
+
const hub = new ChannelHub(ctx.config.authorizeThread);
|
|
118
182
|
const path = config.path || `${ctx.config.basePath}/ws`;
|
|
119
183
|
const wss = new wsModule.WebSocketServer({
|
|
120
184
|
server,
|
|
121
185
|
path,
|
|
122
186
|
maxPayload: config.maxPayloadSize || 1024 * 1024,
|
|
123
|
-
verifyClient: authFn
|
|
187
|
+
verifyClient: authFn || anonymous === 'deny'
|
|
124
188
|
? (info, callback) => {
|
|
125
189
|
Promise.resolve()
|
|
126
|
-
.then(() => authFn(info.req))
|
|
190
|
+
.then(() => authFn?.(info.req))
|
|
127
191
|
.then((auth) => {
|
|
192
|
+
if (admitCaller(auth?.userId, anonymous)) {
|
|
193
|
+
callback(false, 401, 'Unauthorized');
|
|
194
|
+
return;
|
|
195
|
+
}
|
|
128
196
|
authResults.set(info.req, auth);
|
|
129
197
|
callback(true);
|
|
130
198
|
})
|
|
@@ -136,6 +204,7 @@ export async function setupWebSocket(server, ctx, config = {}) {
|
|
|
136
204
|
wss.on('connection', (ws, req) => {
|
|
137
205
|
const clientState = {
|
|
138
206
|
id: generateId('ws'),
|
|
207
|
+
request: req,
|
|
139
208
|
auth: authResults.get(req),
|
|
140
209
|
subscriptions: new Set(),
|
|
141
210
|
};
|
|
@@ -158,7 +227,7 @@ export async function setupWebSocket(server, ctx, config = {}) {
|
|
|
158
227
|
sendResponse(ws, { type: 'error', error: 'Invalid message' });
|
|
159
228
|
return;
|
|
160
229
|
}
|
|
161
|
-
void handleMessage(ws, message, ctx, clientState, hub);
|
|
230
|
+
void handleMessage(ws, message, ctx, config, clientState, hub);
|
|
162
231
|
});
|
|
163
232
|
const cleanup = () => {
|
|
164
233
|
clearInterval(heartbeat);
|
|
@@ -178,7 +247,7 @@ export async function setupWebSocket(server, ctx, config = {}) {
|
|
|
178
247
|
getLogger().debug('[CogitatorServer] WebSocket enabled', { path });
|
|
179
248
|
return wss;
|
|
180
249
|
}
|
|
181
|
-
async function handleMessage(ws, message, ctx, state, hub) {
|
|
250
|
+
async function handleMessage(ws, message, ctx, config, state, hub) {
|
|
182
251
|
switch (message.type) {
|
|
183
252
|
case 'ping':
|
|
184
253
|
sendResponse(ws, { type: 'pong', id: message.id });
|
|
@@ -198,7 +267,7 @@ async function handleMessage(ws, message, ctx, state, hub) {
|
|
|
198
267
|
break;
|
|
199
268
|
}
|
|
200
269
|
state.subscriptions.add(channel);
|
|
201
|
-
hub.subscribe(ws, channel, state.auth
|
|
270
|
+
hub.subscribe(ws, channel, state.auth);
|
|
202
271
|
sendResponse(ws, { type: 'subscribed', id: message.id, channel });
|
|
203
272
|
break;
|
|
204
273
|
}
|
|
@@ -210,10 +279,10 @@ async function handleMessage(ws, message, ctx, state, hub) {
|
|
|
210
279
|
}
|
|
211
280
|
break;
|
|
212
281
|
case 'run':
|
|
213
|
-
await handleRun(ws, message, ctx, state, hub);
|
|
282
|
+
await handleRun(ws, message, ctx, config, state, hub);
|
|
214
283
|
break;
|
|
215
284
|
case 'resume':
|
|
216
|
-
await handleResume(ws, message, ctx, state, hub);
|
|
285
|
+
await handleResume(ws, message, ctx, config, state, hub);
|
|
217
286
|
break;
|
|
218
287
|
case 'stop':
|
|
219
288
|
state.abortController?.abort();
|
|
@@ -221,7 +290,7 @@ async function handleMessage(ws, message, ctx, state, hub) {
|
|
|
221
290
|
break;
|
|
222
291
|
}
|
|
223
292
|
}
|
|
224
|
-
async function handleRun(ws, message, ctx, state, hub) {
|
|
293
|
+
async function handleRun(ws, message, ctx, config, state, hub) {
|
|
225
294
|
const payload = parseRunPayload(message.payload, ctx.config.acceptContext);
|
|
226
295
|
if (!payload) {
|
|
227
296
|
sendResponse(ws, { type: 'error', id: message.id, error: 'Invalid run payload' });
|
|
@@ -235,26 +304,27 @@ async function handleRun(ws, message, ctx, state, hub) {
|
|
|
235
304
|
});
|
|
236
305
|
return;
|
|
237
306
|
}
|
|
238
|
-
await streamAgentRun(ws, message, ctx, state, hub, payload
|
|
307
|
+
await streamAgentRun(ws, message, ctx, config, state, hub, payload, (agent, options) => ctx.cogitator.run(agent, {
|
|
239
308
|
...options,
|
|
240
309
|
input: payload.input,
|
|
241
310
|
context: payload.context,
|
|
242
311
|
threadId: payload.threadId,
|
|
243
312
|
}));
|
|
244
313
|
}
|
|
245
|
-
async function handleResume(ws, message, ctx, state, hub) {
|
|
314
|
+
async function handleResume(ws, message, ctx, config, state, hub) {
|
|
246
315
|
const payload = parseResumePayload(message.payload);
|
|
247
316
|
if (!payload) {
|
|
248
317
|
sendResponse(ws, { type: 'error', id: message.id, error: 'Invalid resume payload' });
|
|
249
318
|
return;
|
|
250
319
|
}
|
|
251
|
-
await streamAgentRun(ws, message, ctx, state, hub, payload
|
|
320
|
+
await streamAgentRun(ws, message, ctx, config, state, hub, payload, (agent, options) => ctx.cogitator.resume(agent, payload.threadId, {
|
|
252
321
|
...options,
|
|
253
322
|
decisions: payload.decisions,
|
|
254
323
|
defaultDecision: payload.defaultDecision,
|
|
255
324
|
}));
|
|
256
325
|
}
|
|
257
|
-
async function streamAgentRun(ws, message, ctx, state, hub,
|
|
326
|
+
async function streamAgentRun(ws, message, ctx, config, state, hub, target, execute) {
|
|
327
|
+
const { name } = target;
|
|
258
328
|
const agent = Object.hasOwn(ctx.agents, name) ? ctx.agents[name] : undefined;
|
|
259
329
|
if (!agent) {
|
|
260
330
|
sendResponse(ws, {
|
|
@@ -267,17 +337,42 @@ async function streamAgentRun(ws, message, ctx, state, hub, name, execute) {
|
|
|
267
337
|
state.abortController?.abort();
|
|
268
338
|
const controller = new AbortController();
|
|
269
339
|
state.abortController = controller;
|
|
270
|
-
|
|
340
|
+
let deps;
|
|
341
|
+
try {
|
|
342
|
+
const refusal = await authorizeThreadAccess(ctx.config.authorizeThread, state.auth, target.threadId);
|
|
343
|
+
if (refusal) {
|
|
344
|
+
sendResponse(ws, { type: 'error', id: message.id, error: refusal.message });
|
|
345
|
+
return;
|
|
346
|
+
}
|
|
347
|
+
deps = config.deps ? { deps: await config.deps(state.request) } : {};
|
|
348
|
+
}
|
|
349
|
+
catch (error) {
|
|
350
|
+
sendResponse(ws, {
|
|
351
|
+
type: 'error',
|
|
352
|
+
id: message.id,
|
|
353
|
+
error: resolveError(error, 'WebSocket run').message,
|
|
354
|
+
});
|
|
355
|
+
return;
|
|
356
|
+
}
|
|
357
|
+
if (controller.signal.aborted || ws.readyState !== WS_OPEN)
|
|
358
|
+
return;
|
|
359
|
+
const broadcast = hub.broadcast(`agent:${name}`, { ws, auth: state.auth });
|
|
360
|
+
if (target.threadId !== undefined)
|
|
361
|
+
broadcast.onThread(target.threadId);
|
|
271
362
|
const emit = (eventPayload) => {
|
|
272
363
|
const response = { type: 'event', id: message.id, payload: eventPayload };
|
|
273
364
|
sendResponse(ws, response);
|
|
274
|
-
|
|
365
|
+
broadcast.publish(response);
|
|
275
366
|
};
|
|
276
367
|
try {
|
|
277
368
|
const result = await execute(agent, {
|
|
278
369
|
userId: state.auth?.userId,
|
|
279
370
|
signal: controller.signal,
|
|
280
371
|
stream: true,
|
|
372
|
+
...deps,
|
|
373
|
+
onRunStart: ({ threadId }) => {
|
|
374
|
+
broadcast.onThread(threadId);
|
|
375
|
+
},
|
|
281
376
|
onToken: (token) => {
|
|
282
377
|
emit({ type: 'token', delta: token });
|
|
283
378
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-handler.js","sourceRoot":"","sources":["../../src/websocket/ws-handler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAc,MAAM,oBAAoB,CAAC;AAS3D,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,eAAe,EACf,kBAAkB,EAClB,eAAe,GAGhB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAKlD,MAAM,OAAO,GAAG,CAAC,CAAC;AAClB,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAC7B,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAC/B,MAAM,aAAa,GAAwB,IAAI,GAAG,CAAC;IACjD,WAAW;IACX,aAAa;IACb,KAAK;IACL,QAAQ;IACR,MAAM;IACN,MAAM;CACP,CAAC,CAAC;AA0BH;;;GAGG;AACH,MAAM,UAAU;IACG,QAAQ,GAAG,IAAI,GAAG,EAAkD,CAAC;IAEtF,SAAS,CAAC,EAAiB,EAAE,OAAe,EAAE,MAA0B;QACtE,IAAI,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;YACpB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAC1B,CAAC;IAED,WAAW,CAAC,EAAiB,EAAE,OAAe;QAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACnB,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC;YAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,CACL,OAAe,EACf,QAA2B,EAC3B,MAAyD;QAEzD,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,KAAK,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YACvC,IAAI,MAAM,KAAK,MAAM,CAAC,EAAE,IAAI,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;gBACrD,YAAY,CAAC,MAAM,EAAE,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED,SAAS,YAAY,CAAC,GAAW;IAC/B,IAAI,IAAa,CAAC;IAClB,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1F,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,IAAI,CAAC,EAAE,KAAK,SAAS,IAAI,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IACtE,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAChF,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,IAAgC;QAC3C,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,OAAgB,EAAE,aAA4B;IACrE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAC/B,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,UAAU,IAAI,IAAI,KAAK,OAAO;QAAE,OAAO,IAAI,CAAC;IAC7E,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACnD,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;IAC3D,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AAC5D,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAgB;IAC1C,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACzB,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACnD,MAAM,MAAM,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC3C,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACtD,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAc;IACtC,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,MAAM,IAAI,KAAK;QACf,CAAC,KAAK,CAAC,IAAI,KAAK,sBAAsB,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAC7E,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,MAAkB,EAClB,GAAiB,EACjB,SAA0B,EAAE;IAE5B,IAAI,QAA6B,CAAC;IAClC,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC;YAAE,MAAM,KAAK,CAAC;QAC1C,OAAO,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;QACpF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC;IAC/B,MAAM,WAAW,GAAG,IAAI,OAAO,EAA4C,CAAC;IAC5E,MAAM,GAAG,GAAG,IAAI,UAAU,EAAE,CAAC;IAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,KAAK,CAAC;IAExD,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,eAAe,CAAC;QACvC,MAAM;QACN,IAAI;QACJ,UAAU,EAAE,MAAM,CAAC,cAAc,IAAI,IAAI,GAAG,IAAI;QAChD,YAAY,EAAE,MAAM;YAClB,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;gBACjB,OAAO,CAAC,OAAO,EAAE;qBACd,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAc,CAAC,CAAC;qBACvC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;oBACb,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;oBAChC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACjB,CAAC,CAAC;qBACD,KAAK,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC;YACvD,CAAC;YACH,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,KAAK,CAAC;IAElD,GAAG,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAiB,EAAE,GAAoB,EAAE,EAAE;QAC/D,MAAM,WAAW,GAAgB;YAC/B,EAAE,EAAE,UAAU,CAAC,IAAI,CAAC;YACpB,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC;YAC1B,aAAa,EAAE,IAAI,GAAG,EAAE;SACzB,CAAC;QAEF,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE;YACjC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,aAAa,CAAC,SAAS,CAAC,CAAC;gBACzB,EAAE,CAAC,SAAS,EAAE,CAAC;gBACf,OAAO;YACT,CAAC;YACD,KAAK,GAAG,KAAK,CAAC;YACd,EAAE,CAAC,IAAI,EAAE,CAAC;QACZ,CAAC,EAAE,YAAY,CAAC,CAAC;QAEjB,EAAE,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;YACjB,KAAK,GAAG,IAAI,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,IAAY,EAAE,EAAE;YAChC,MAAM,OAAO,GAAG,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC9C,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,YAAY,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC,CAAC;gBAC9D,OAAO;YACT,CAAC;YACD,KAAK,aAAa,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,aAAa,CAAC,SAAS,CAAC,CAAC;YACzB,WAAW,CAAC,eAAe,EAAE,KAAK,EAAE,CAAC;YACrC,WAAW,CAAC,eAAe,GAAG,SAAS,CAAC;YACxC,KAAK,MAAM,OAAO,IAAI,WAAW,CAAC,aAAa;gBAAE,GAAG,CAAC,WAAW,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YAC9E,WAAW,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC;QACpC,CAAC,CAAC;QAEF,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACxB,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QACnB,KAAK,MAAM,MAAM,IAAI,GAAG,CAAC,OAAO;YAAE,MAAM,CAAC,SAAS,EAAE,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,SAAS,EAAE,CAAC,KAAK,CAAC,qCAAqC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IACnE,OAAO,GAAG,CAAC;AACb,CAAC;AAED,KAAK,UAAU,aAAa,CAC1B,EAAiB,EACjB,OAAyB,EACzB,GAAiB,EACjB,KAAkB,EAClB,GAAe;IAEf,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,MAAM;YACT,YAAY,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YACnD,MAAM;QAER,KAAK,WAAW,CAAC,CAAC,CAAC;YACjB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YAChC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,kBAAkB,EAAE,CAAC;gBACpD,YAAY,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC,CAAC;gBAC9E,MAAM;YACR,CAAC;YACD,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,aAAa,CAAC,IAAI,IAAI,iBAAiB,EAAE,CAAC;gBACvF,YAAY,CAAC,EAAE,EAAE;oBACf,IAAI,EAAE,OAAO;oBACb,EAAE,EAAE,OAAO,CAAC,EAAE;oBACd,KAAK,EAAE,mCAAmC,iBAAiB,GAAG;iBAC/D,CAAC,CAAC;gBACH,MAAM;YACR,CAAC;YACD,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACjC,GAAG,CAAC,SAAS,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC/C,YAAY,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;YAClE,MAAM;QACR,CAAC;QAED,KAAK,aAAa;YAChB,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACpB,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBAC5C,GAAG,CAAC,WAAW,CAAC,EAAE,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;gBACrC,YAAY,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YACvF,CAAC;YACD,MAAM;QAER,KAAK,KAAK;YACR,MAAM,SAAS,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;YAC9C,MAAM;QAER,KAAK,QAAQ;YACX,MAAM,YAAY,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;YACjD,MAAM;QAER,KAAK,MAAM;YACT,KAAK,CAAC,eAAe,EAAE,KAAK,EAAE,CAAC;YAC/B,KAAK,CAAC,eAAe,GAAG,SAAS,CAAC;YAClC,MAAM;IACV,CAAC;AACH,CAAC;AAED,KAAK,UAAU,SAAS,CACtB,EAAiB,EACjB,OAAyB,EACzB,GAAiB,EACjB,KAAkB,EAClB,GAAe;IAEf,MAAM,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAE3E,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,YAAY,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC,CAAC;QAClF,OAAO;IACT,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC7B,YAAY,CAAC,EAAE,EAAE;YACf,IAAI,EAAE,OAAO;YACb,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,KAAK,EAAE,aAAa,OAAO,CAAC,IAAI,mCAAmC;SACpE,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,MAAM,cAAc,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAClF,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE;QACvB,GAAG,OAAO;QACV,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CAAC,CACH,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,YAAY,CACzB,EAAiB,EACjB,OAAyB,EACzB,GAAiB,EACjB,KAAkB,EAClB,GAAe;IAEf,MAAM,OAAO,GAAG,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,YAAY,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,wBAAwB,EAAE,CAAC,CAAC;QACrF,OAAO;IACT,CAAC;IAED,MAAM,cAAc,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAClF,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE;QAC5C,GAAG,OAAO;QACV,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,eAAe,EAAE,OAAO,CAAC,eAAe;KACzC,CAAC,CACH,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,EAAiB,EACjB,OAAyB,EACzB,GAAiB,EACjB,KAAkB,EAClB,GAAe,EACf,IAAY,EACZ,OAAwE;IAExE,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAC7E,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,YAAY,CAAC,EAAE,EAAE;YACf,IAAI,EAAE,OAAO;YACb,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,KAAK,EAAE,UAAU,IAAI,aAAa;SACnC,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,KAAK,CAAC,eAAe,EAAE,KAAK,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,KAAK,CAAC,eAAe,GAAG,UAAU,CAAC;IAEnC,MAAM,OAAO,GAAG,SAAS,IAAI,EAAE,CAAC;IAChC,MAAM,IAAI,GAAG,CAAC,YAAqC,EAAE,EAAE;QACrD,MAAM,QAAQ,GAAsB,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;QAC7F,YAAY,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC3B,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACrE,CAAC,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,EAAE;YAClC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM;YAC1B,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,MAAM,EAAE,IAAI;YACZ,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBACjB,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;YACxC,CAAC;YACD,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE;gBACrB,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;YACrC,CAAC;YACD,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACvB,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC5D,CAAC;YACD,YAAY,EAAE,CAAC,UAAU,EAAE,EAAE;gBAC3B,IAAI,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;YAC/C,CAAC;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACjE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAC9B,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,YAAY,CAAC,EAAE,EAAE;gBACf,IAAI,EAAE,OAAO;gBACb,EAAE,EAAE,OAAO,CAAC,EAAE;gBACd,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC,OAAO;aACpD,CAAC,CAAC;QACL,CAAC;IACH,CAAC;YAAS,CAAC;QACT,IAAI,KAAK,CAAC,eAAe,KAAK,UAAU;YAAE,KAAK,CAAC,eAAe,GAAG,SAAS,CAAC;IAC9E,CAAC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,EAAiB,EAAE,QAA2B;IAClE,IAAI,EAAE,CAAC,UAAU,KAAK,OAAO;QAAE,OAAO;IACtC,IAAI,CAAC;QACH,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;AACZ,CAAC"}
|
|
1
|
+
{"version":3,"file":"ws-handler.js","sourceRoot":"","sources":["../../src/websocket/ws-handler.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cogitator-ai/express",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.11.0",
|
|
4
4
|
"description": "Express.js server adapter for Cogitator AI runtime",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -20,21 +20,21 @@
|
|
|
20
20
|
"node": ">=22.12.0"
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@cogitator-ai/core": "0.56.
|
|
23
|
+
"@cogitator-ai/core": "0.56.4",
|
|
24
24
|
"@cogitator-ai/types": "0.61.0",
|
|
25
|
-
"@cogitator-ai/server-shared": "0.
|
|
25
|
+
"@cogitator-ai/server-shared": "0.8.0"
|
|
26
26
|
},
|
|
27
27
|
"peerDependencies": {
|
|
28
28
|
"express": ">=4.18.0"
|
|
29
29
|
},
|
|
30
30
|
"optionalDependencies": {
|
|
31
|
-
"@cogitator-ai/workflows": "0.14.
|
|
32
|
-
"@cogitator-ai/swarms": "0.14.
|
|
31
|
+
"@cogitator-ai/workflows": "0.14.2",
|
|
32
|
+
"@cogitator-ai/swarms": "0.14.1",
|
|
33
33
|
"ws": "^8.22.0"
|
|
34
34
|
},
|
|
35
35
|
"devDependencies": {
|
|
36
|
-
"@cogitator-ai/workflows": "0.14.
|
|
37
|
-
"@cogitator-ai/swarms": "0.14.
|
|
36
|
+
"@cogitator-ai/workflows": "0.14.2",
|
|
37
|
+
"@cogitator-ai/swarms": "0.14.1",
|
|
38
38
|
"@types/express": "^5.0.6",
|
|
39
39
|
"@types/supertest": "^7.2.1",
|
|
40
40
|
"@types/ws": "^8.18.2",
|