@backendkit-labs/agent-web 0.6.2 → 0.6.4
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 +17 -1
- package/dist/auth/JwtAuth.d.ts +8 -1
- package/dist/auth/JwtAuth.d.ts.map +1 -1
- package/dist/auth/JwtAuth.js +11 -5
- package/dist/auth/JwtAuth.js.map +1 -1
- package/dist/server/AgentServer.d.ts +9 -1
- package/dist/server/AgentServer.d.ts.map +1 -1
- package/dist/server/AgentServer.js +14 -2
- package/dist/server/AgentServer.js.map +1 -1
- package/dist/session/SessionManager.d.ts +8 -0
- package/dist/session/SessionManager.d.ts.map +1 -1
- package/dist/session/SessionManager.js +15 -6
- package/dist/session/SessionManager.js.map +1 -1
- package/dist/store/SessionMetaStore.d.ts +4 -0
- package/dist/store/SessionMetaStore.d.ts.map +1 -1
- package/dist/store/SessionMetaStore.js +26 -3
- package/dist/store/SessionMetaStore.js.map +1 -1
- package/dist/trigger/TriggerBus.d.ts.map +1 -1
- package/dist/trigger/TriggerBus.js +25 -1
- package/dist/trigger/TriggerBus.js.map +1 -1
- package/package.json +3 -3
package/README.md
CHANGED
|
@@ -87,7 +87,8 @@ interface AgentServerOptions {
|
|
|
87
87
|
// Network
|
|
88
88
|
port?: number; // default: 3000
|
|
89
89
|
host?: string; // default: '127.0.0.1' (use '0.0.0.0', with auth, for remote callers)
|
|
90
|
-
cors?: string | string[]; // default: '*'
|
|
90
|
+
cors?: string | string[]; // default: '*' (none with strict)
|
|
91
|
+
strict?: boolean; // fail-closed defaults, see "Strict mode"
|
|
91
92
|
logger?: boolean | object; // Fastify logger, default: false
|
|
92
93
|
|
|
93
94
|
// Auth
|
|
@@ -269,6 +270,21 @@ const all = sessions.list(); // SessionMeta[]
|
|
|
269
270
|
|
|
270
271
|
`JwtAuth` validates Bearer tokens in the `Authorization` header or `?token=` query parameter (useful for browser WebSocket connections that can't set custom headers).
|
|
271
272
|
|
|
273
|
+
### Strict mode
|
|
274
|
+
|
|
275
|
+
For a server that other people reach, turn on both switches:
|
|
276
|
+
|
|
277
|
+
```ts
|
|
278
|
+
const auth = new JwtAuth({ secret: process.env.JWT_SECRET!, allowQueryToken: false }).hook();
|
|
279
|
+
new AgentServer({ engineFactory, host: '0.0.0.0', auth, strict: true, cors: ['https://app.example.com'] });
|
|
280
|
+
```
|
|
281
|
+
|
|
282
|
+
- `allowQueryToken: false` ignores `?token=` (a token in a URL lands in logs, proxies and history). A browser sends the
|
|
283
|
+
token as the WebSocket subprotocol: `new WebSocket(url, ['bearer', jwt])`; `useAgentSession({ url, token })` in
|
|
284
|
+
`agent-web-ui` does it for you.
|
|
285
|
+
- `strict: true` allows no CORS origin unless `cors` lists it, adds `X-Content-Type-Options`, `X-Frame-Options: DENY` and
|
|
286
|
+
`Referrer-Policy: no-referrer`, and refuses (throws) to listen on a non-loopback `host` without `auth`.
|
|
287
|
+
|
|
272
288
|
### Setup
|
|
273
289
|
|
|
274
290
|
```typescript
|
package/dist/auth/JwtAuth.d.ts
CHANGED
|
@@ -8,6 +8,12 @@ export interface JwtAuthOptions {
|
|
|
8
8
|
algorithms?: jwt.Algorithm[];
|
|
9
9
|
audience?: string | RegExp | string[];
|
|
10
10
|
issuer?: string;
|
|
11
|
+
/**
|
|
12
|
+
* Accept the token in the `?token=` query parameter. Default: true. A token in a URL ends up in access logs,
|
|
13
|
+
* proxies and browser history; set false and send it as `Authorization: Bearer` or, from a browser
|
|
14
|
+
* WebSocket, as the subprotocol `bearer, <jwt>` (`new WebSocket(url, ['bearer', jwt])`).
|
|
15
|
+
*/
|
|
16
|
+
allowQueryToken?: boolean;
|
|
11
17
|
}
|
|
12
18
|
export interface AuthUser {
|
|
13
19
|
sub: string;
|
|
@@ -25,7 +31,8 @@ declare module 'fastify' {
|
|
|
25
31
|
*
|
|
26
32
|
* Reads the token from:
|
|
27
33
|
* 1. Authorization: Bearer <token> header (REST / MCP)
|
|
28
|
-
* 2.
|
|
34
|
+
* 2. Sec-WebSocket-Protocol: bearer, <jwt> (browser WebSocket — can't set headers)
|
|
35
|
+
* 3. ?token=<jwt> query param, unless `allowQueryToken` is false
|
|
29
36
|
*
|
|
30
37
|
* Usage:
|
|
31
38
|
* const server = new AgentServer({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JwtAuth.d.ts","sourceRoot":"","sources":["../../src/auth/JwtAuth.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,cAAc,CAAC;AAE/B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,WAAW,cAAc;IAC3B,8CAA8C;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0CAA0C;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"JwtAuth.d.ts","sourceRoot":"","sources":["../../src/auth/JwtAuth.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,cAAc,CAAC;AAE/B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEtD,MAAM,WAAW,cAAc;IAC3B,8CAA8C;IAC9C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,0CAA0C;IAC1C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,QAAQ;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AAGD,OAAO,QAAQ,SAAS,CAAC;IACrB,UAAU,cAAc;QACpB,IAAI,CAAC,EAAE,QAAQ,CAAC;KACnB;CACJ;AAED;;;;;;;;;;;;;GAaG;AACH,qBAAa,OAAO;IACJ,OAAO,CAAC,QAAQ,CAAC,IAAI;gBAAJ,IAAI,EAAE,cAAc;IAMjD,IAAI,IAAI,QAAQ;IAehB,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,QAAQ;CAalC"}
|
package/dist/auth/JwtAuth.js
CHANGED
|
@@ -10,7 +10,8 @@ const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
|
10
10
|
*
|
|
11
11
|
* Reads the token from:
|
|
12
12
|
* 1. Authorization: Bearer <token> header (REST / MCP)
|
|
13
|
-
* 2.
|
|
13
|
+
* 2. Sec-WebSocket-Protocol: bearer, <jwt> (browser WebSocket — can't set headers)
|
|
14
|
+
* 3. ?token=<jwt> query param, unless `allowQueryToken` is false
|
|
14
15
|
*
|
|
15
16
|
* Usage:
|
|
16
17
|
* const server = new AgentServer({
|
|
@@ -28,7 +29,7 @@ class JwtAuth {
|
|
|
28
29
|
}
|
|
29
30
|
hook() {
|
|
30
31
|
return async (req, reply) => {
|
|
31
|
-
const token = extractToken(req);
|
|
32
|
+
const token = extractToken(req, this.opts.allowQueryToken !== false);
|
|
32
33
|
if (!token) {
|
|
33
34
|
reply.code(401).send({ error: 'Missing authentication token' });
|
|
34
35
|
return;
|
|
@@ -56,12 +57,17 @@ class JwtAuth {
|
|
|
56
57
|
}
|
|
57
58
|
}
|
|
58
59
|
exports.JwtAuth = JwtAuth;
|
|
59
|
-
function extractToken(req) {
|
|
60
|
+
function extractToken(req, allowQueryToken) {
|
|
60
61
|
const auth = req.headers.authorization;
|
|
61
62
|
if (auth?.startsWith('Bearer '))
|
|
62
63
|
return auth.slice(7);
|
|
63
|
-
// Browser WebSocket can't set headers
|
|
64
|
-
const
|
|
64
|
+
// Browser WebSocket can't set headers: the token rides as the second subprotocol, `bearer, <jwt>`.
|
|
65
|
+
const protocols = String(req.headers['sec-websocket-protocol'] ?? '').split(',').map(p => p.trim());
|
|
66
|
+
if (protocols[0] === 'bearer' && protocols[1])
|
|
67
|
+
return protocols[1];
|
|
68
|
+
if (!allowQueryToken)
|
|
69
|
+
return null;
|
|
70
|
+
const query = (req.query ?? {});
|
|
65
71
|
if (typeof query.token === 'string' && query.token)
|
|
66
72
|
return query.token;
|
|
67
73
|
return null;
|
package/dist/auth/JwtAuth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JwtAuth.js","sourceRoot":"","sources":["../../src/auth/JwtAuth.ts"],"names":[],"mappings":";;;;;;AAAA,gEAA+B;
|
|
1
|
+
{"version":3,"file":"JwtAuth.js","sourceRoot":"","sources":["../../src/auth/JwtAuth.ts"],"names":[],"mappings":";;;;;;AAAA,gEAA+B;AAkC/B;;;;;;;;;;;;;GAaG;AACH,MAAa,OAAO;IACa;IAA7B,YAA6B,IAAoB;QAApB,SAAI,GAAJ,IAAI,CAAgB;QAC7C,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;QACnF,CAAC;IACL,CAAC;IAED,IAAI;QACA,OAAO,KAAK,EAAE,GAAmB,EAAE,KAAmB,EAAiB,EAAE;YACrE,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,KAAK,KAAK,CAAC,CAAC;YACrE,IAAI,CAAC,KAAK,EAAE,CAAC;gBACT,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,8BAA8B,EAAE,CAAC,CAAC;gBAChE,OAAO;YACX,CAAC;YACD,IAAI,CAAC;gBACD,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAClC,CAAC;YAAC,MAAM,CAAC;gBACL,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC,CAAC;YAChE,CAAC;QACL,CAAC,CAAC;IACN,CAAC;IAED,MAAM,CAAC,KAAa;QAChB,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,CAAE,CAAC;QACvD,MAAM,OAAO,GAAG,sBAAG,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,EAAE;YACnC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU;YAChC,qEAAqE;YACrE,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAyC;YAC7D,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;SAC3B,CAAC,CAAC;QACH,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,OAAO,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,OAAmB,CAAC;IAC/B,CAAC;CACJ;AAnCD,0BAmCC;AAED,SAAS,YAAY,CAAC,GAAmB,EAAE,eAAwB;IAC/D,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;IACvC,IAAI,IAAI,EAAE,UAAU,CAAC,SAAS,CAAC;QAAE,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACtD,mGAAmG;IACnG,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,wBAAwB,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACpG,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,SAAS,CAAC,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC;IACnE,IAAI,CAAC,eAAe;QAAE,OAAO,IAAI,CAAC;IAClC,MAAM,KAAK,GAAG,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAA2B,CAAC;IAC1D,IAAI,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC,KAAK,CAAC;IACvE,OAAO,IAAI,CAAC;AAChB,CAAC"}
|
|
@@ -34,8 +34,16 @@ export interface AgentServerOptions extends Omit<SessionManagerOptions, 'metrics
|
|
|
34
34
|
adminRole?: string;
|
|
35
35
|
/** Fastify logger. Default: false (silent). Pass true for pretty logs in dev. */
|
|
36
36
|
logger?: boolean | object;
|
|
37
|
-
/** Allowed CORS origins. Default: '*'. */
|
|
37
|
+
/** Allowed CORS origins. Default: '*', or none when `strict` is set. */
|
|
38
38
|
cors?: string | string[];
|
|
39
|
+
/**
|
|
40
|
+
* Fail-closed defaults for a server that other people reach:
|
|
41
|
+
* - no CORS origin is allowed unless `cors` lists it (default without `strict`: '*');
|
|
42
|
+
* - responses carry `X-Content-Type-Options: nosniff`, `X-Frame-Options: DENY` and `Referrer-Policy: no-referrer`;
|
|
43
|
+
* - the constructor throws when the server listens on a non-loopback `host` without an `auth` hook.
|
|
44
|
+
* Pair it with `JwtAuth({ allowQueryToken: false })`. Default: false.
|
|
45
|
+
*/
|
|
46
|
+
strict?: boolean;
|
|
39
47
|
/**
|
|
40
48
|
* Rate limiting per IP. Requires @fastify/rate-limit to be installed.
|
|
41
49
|
* @example { max: 60, timeWindow: '1 minute' }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AgentServer.d.ts","sourceRoot":"","sources":["../../src/server/AgentServer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAmB,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGxD,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnF,MAAM,WAAW,gBAAgB;IAC7B,yDAAyD;IACzD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,+EAA+E;IAC/E,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,cAAe,SAAQ,uBAAuB;IAC3D,2DAA2D;IAC3D,OAAO,EAAE,OAAO,CAAC;IACjB,0DAA0D;IAC1D,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,kBAAmB,SAAQ,IAAI,CAAC,qBAAqB,EAAE,SAAS,GAAG,OAAO,CAAC;IACxF,4CAA4C;IAC5C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,mGAAmG;IACnG,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,0EAA0E;IAC1E,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iFAAiF;IACjF,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC1B,
|
|
1
|
+
{"version":3,"file":"AgentServer.d.ts","sourceRoot":"","sources":["../../src/server/AgentServer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAmB,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGxD,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnF,MAAM,WAAW,gBAAgB;IAC7B,yDAAyD;IACzD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,+EAA+E;IAC/E,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,cAAe,SAAQ,uBAAuB;IAC3D,2DAA2D;IAC3D,OAAO,EAAE,OAAO,CAAC;IACjB,0DAA0D;IAC1D,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,kBAAmB,SAAQ,IAAI,CAAC,qBAAqB,EAAE,SAAS,GAAG,OAAO,CAAC;IACxF,4CAA4C;IAC5C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,mGAAmG;IACnG,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,0EAA0E;IAC1E,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iFAAiF;IACjF,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC1B,wEAAwE;IACxE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IACzB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;OAGG;IACH,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAChC;;;OAGG;IACH,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB;;;OAGG;IACH,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB;;;;;;;;;OASG;IACH,QAAQ,CAAC,EAAE,UAAU,CAAC;CACzB;AAED,qBAAa,WAAW;IACpB,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAa;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA+B;IACzD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAyB;IACpD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;gBAElB,IAAI,EAAE,kBAAkB;IA2F9B,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;IAMxB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAM3B,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,cAAc,IAAI,cAAc,CAEnC;IAED,IAAI,UAAU,IAAI,UAAU,CAE3B;CACJ"}
|
|
@@ -21,6 +21,9 @@ class AgentServer {
|
|
|
21
21
|
constructor(opts) {
|
|
22
22
|
this._port = opts.port ?? 3000;
|
|
23
23
|
this.host = opts.host ?? '127.0.0.1';
|
|
24
|
+
if (opts.strict && !opts.auth && !['127.0.0.1', 'localhost', '::1'].includes(this.host)) {
|
|
25
|
+
throw new Error(`AgentServer: strict mode refuses to listen on "${this.host}" without an auth hook.`);
|
|
26
|
+
}
|
|
24
27
|
this.monitor = new MonitorBus_1.MonitorBus();
|
|
25
28
|
this.triggerBus = opts.triggers;
|
|
26
29
|
this.collector = opts.metrics?.enabled
|
|
@@ -37,7 +40,7 @@ class AgentServer {
|
|
|
37
40
|
this.app = (0, fastify_1.default)({ logger: opts.logger ?? false });
|
|
38
41
|
// CORS headers. The header carries one origin or '*', never a list: a list is matched against the
|
|
39
42
|
// request's Origin and that origin is echoed back; an origin that is not listed gets no header.
|
|
40
|
-
const origins = opts.cors ?? '*';
|
|
43
|
+
const origins = opts.cors ?? (opts.strict ? [] : '*');
|
|
41
44
|
const allowOrigin = (requestOrigin) => {
|
|
42
45
|
if (!Array.isArray(origins))
|
|
43
46
|
return origins;
|
|
@@ -54,6 +57,11 @@ class AgentServer {
|
|
|
54
57
|
};
|
|
55
58
|
this.app.addHook('onSend', async (req, reply) => {
|
|
56
59
|
setAllowOrigin(req, reply);
|
|
60
|
+
if (opts.strict) {
|
|
61
|
+
reply.header('X-Content-Type-Options', 'nosniff');
|
|
62
|
+
reply.header('X-Frame-Options', 'DENY');
|
|
63
|
+
reply.header('Referrer-Policy', 'no-referrer');
|
|
64
|
+
}
|
|
57
65
|
});
|
|
58
66
|
this.app.options('*', async (req, reply) => {
|
|
59
67
|
setAllowOrigin(req, reply);
|
|
@@ -88,7 +96,11 @@ class AgentServer {
|
|
|
88
96
|
const metricsPath = opts.metrics?.path;
|
|
89
97
|
const triggers = this.triggerBus;
|
|
90
98
|
this.app.register(async (instance) => {
|
|
91
|
-
|
|
99
|
+
// A browser that offers the subprotocols `bearer, <jwt>` needs the server to select one of them,
|
|
100
|
+
// or it drops the connection. Select `bearer`, never the token.
|
|
101
|
+
await instance.register(websocket_1.default, {
|
|
102
|
+
options: { handleProtocols: (protocols) => (protocols.has('bearer') ? 'bearer' : false) },
|
|
103
|
+
});
|
|
92
104
|
(0, routes_1.registerRoutes)(instance, sessions, monitor, collector, metricsPath, opts.adminRole);
|
|
93
105
|
triggers?.registerRoutes(instance);
|
|
94
106
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AgentServer.js","sourceRoot":"","sources":["../../src/server/AgentServer.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA8B;AAC9B,mEAAkD;AAElD,8DAA2D;AAE3D,sDAAmD;AACnD,kEAA+D;AAI/D,qCAA0C;
|
|
1
|
+
{"version":3,"file":"AgentServer.js","sourceRoot":"","sources":["../../src/server/AgentServer.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA8B;AAC9B,mEAAkD;AAElD,8DAA2D;AAE3D,sDAAmD;AACnD,kEAA+D;AAI/D,qCAA0C;AAwE1C,MAAa,WAAW;IACZ,GAAG,CAAkB;IACrB,QAAQ,CAAiB;IAChB,OAAO,CAAa;IACpB,SAAS,CAA+B;IACxC,UAAU,CAAyB;IACnC,KAAK,CAAS;IACd,IAAI,CAAS;IAE9B,YAAY,IAAwB;QAChC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,WAAW,CAAC;QACrC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACtF,MAAM,IAAI,KAAK,CAAC,kDAAkD,IAAI,CAAC,IAAI,yBAAyB,CAAC,CAAC;QAC1G,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAU,EAAE,CAAC;QAChC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC;QAEhC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO;YAClC,CAAC,CAAC,IAAI,mCAAgB,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,kBAAkB,EAAE,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC;YAC5G,CAAC,CAAC,SAAS,CAAC;QAEhB,IAAI,CAAC,QAAQ,GAAG,IAAI,+BAAc,CAAC;YAC/B,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,UAAU,EAAE,IAAI,CAAC,OAAO;YACxB,OAAO,EAAE,IAAI,CAAC,SAAS;YACvB,KAAK,EAAE,IAAI,CAAC,KAAK;SACpB,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,GAAG,IAAA,iBAAO,EAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,KAAK,EAAE,CAAC,CAAC;QAErD,kGAAkG;QAClG,gGAAgG;QAChG,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACtD,MAAM,WAAW,GAAG,CAAC,aAAiC,EAAsB,EAAE;YAC1E,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;gBAAE,OAAO,OAAO,CAAC;YAC5C,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAAE,OAAO,GAAG,CAAC;YACtC,OAAO,aAAa,IAAI,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;QACxF,CAAC,CAAC;QACF,MAAM,cAAc,GAAG,CAAC,GAAqC,EAAE,KAAuD,EAAQ,EAAE;YAC5H,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC/C,IAAI,MAAM;gBAAE,KAAK,CAAC,MAAM,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC;YAChE,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;gBAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC/D,CAAC,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;YAC5C,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAC3B,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBACd,KAAK,CAAC,MAAM,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC;gBAClD,KAAK,CAAC,MAAM,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC;gBACxC,KAAK,CAAC,MAAM,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;YACnD,CAAC;QACL,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;YACvC,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAC3B,KAAK,CAAC,MAAM,CAAC,8BAA8B,EAAE,4BAA4B,CAAC,CAAC;YAC3E,KAAK,CAAC,MAAM,CAAC,8BAA8B,EAAE,6BAA6B,CAAC,CAAC;YAC5E,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH,+BAA+B;QAC/B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;YAC7B,IAAI,CAAC;gBACD,iEAAiE;gBACjE,MAAM,eAAe,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;gBACvD,KAAK,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,eAAe,EAAE;oBACpC,GAAG,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG;oBAClB,UAAU,EAAE,EAAE,CAAC,UAAU,IAAI,UAAU;iBAC1C,CAAC,CAAC;YACP,CAAC;YAAC,MAAM,CAAC;gBACL,OAAO,CAAC,IAAI,CAAC,oGAAoG,CAAC,CAAC;YACvH,CAAC;QACL,CAAC;QAED,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC;YAC3B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC7C,CAAC;QAED,wEAAwE;QACxE,4EAA4E;QAC5E,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QACjC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC;QACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC;QACjC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACjC,iGAAiG;YACjG,gEAAgE;YAChE,MAAM,QAAQ,CAAC,QAAQ,CAAC,mBAAgB,EAAE;gBACtC,OAAO,EAAE,EAAE,eAAe,EAAE,CAAC,SAAsB,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;aACzG,CAAC,CAAC;YACH,IAAA,uBAAc,EAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YACpF,QAAQ,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC;QACzB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7E,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,CAAC;QAC/B,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;QACtB,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAED,IAAI,IAAI;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,IAAI,cAAc;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAED,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;CACJ;AA3HD,kCA2HC"}
|
|
@@ -27,6 +27,12 @@ export interface SessionManagerOptions {
|
|
|
27
27
|
metrics?: MetricsCollector;
|
|
28
28
|
/** Optional durable store for session metadata (Redis, etc.). */
|
|
29
29
|
store?: SessionMetaStore;
|
|
30
|
+
/**
|
|
31
|
+
* Minimum time between writes of one session's `lastActivityAt` to the store. `get()` runs on every
|
|
32
|
+
* message, and a write per message turned each of them into a store round trip. In-memory activity is
|
|
33
|
+
* always exact; the stored value lags by at most this much. Default 30000; 0 writes on every `get()`.
|
|
34
|
+
*/
|
|
35
|
+
activityPersistIntervalMs?: number;
|
|
30
36
|
}
|
|
31
37
|
export declare class SessionManager {
|
|
32
38
|
private sessions;
|
|
@@ -36,6 +42,8 @@ export declare class SessionManager {
|
|
|
36
42
|
private readonly monitorBus;
|
|
37
43
|
private readonly metrics;
|
|
38
44
|
private readonly store;
|
|
45
|
+
private readonly activityPersistIntervalMs;
|
|
46
|
+
private readonly lastPersisted;
|
|
39
47
|
private sweepTimer;
|
|
40
48
|
constructor(opts: SessionManagerOptions);
|
|
41
49
|
/** Create a new session and wire a WebSocket to it. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionManager.d.ts","sourceRoot":"","sources":["../../src/session/SessionManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAc,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAEpC,MAAM,WAAW,OAAO;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,kBAAkB,CAAC;IAC9B,SAAS,EAAE,IAAI,CAAC;IAChB,cAAc,EAAE,IAAI,CAAC;IACrB,mCAAmC;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,kBAAkB,KAAK,WAAW,CAAC;AAE9F,MAAM,WAAW,qBAAqB;IAClC,uFAAuF;IACvF,aAAa,EAAE,aAAa,CAAC;IAC7B,0FAA0F;IAC1F,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gFAAgF;IAChF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mFAAmF;IACnF,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,6CAA6C;IAC7C,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,iEAAiE;IACjE,KAAK,CAAC,EAAE,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"SessionManager.d.ts","sourceRoot":"","sources":["../../src/session/SessionManager.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAc,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAEpC,MAAM,WAAW,OAAO;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,WAAW,CAAC;IACpB,SAAS,EAAE,kBAAkB,CAAC;IAC9B,SAAS,EAAE,IAAI,CAAC;IAChB,cAAc,EAAE,IAAI,CAAC;IACrB,mCAAmC;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,kBAAkB,KAAK,WAAW,CAAC;AAE9F,MAAM,WAAW,qBAAqB;IAClC,uFAAuF;IACvF,aAAa,EAAE,aAAa,CAAC;IAC7B,0FAA0F;IAC1F,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gFAAgF;IAChF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,mFAAmF;IACnF,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,6CAA6C;IAC7C,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,iEAAiE;IACjE,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB;;;;OAIG;IACH,yBAAyB,CAAC,EAAE,MAAM,CAAC;CACtC;AAED,qBAAa,cAAc;IACvB,OAAO,CAAC,QAAQ,CAA8B;IAC9C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAyB;IACpD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA+B;IACvD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA+B;IACrD,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAS;IACnD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA6B;IAC3D,OAAO,CAAC,UAAU,CAA+C;gBAErD,IAAI,EAAE,qBAAqB;IAcvC,uDAAuD;IACvD,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO;IA8CnD,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAkBpC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAYzB,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG,WAAW,GAAG,gBAAgB,GAAG,QAAQ,CAAC,EAAE;IAMzE,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,KAAK,IAAI,IAAI;IASb,OAAO,CAAC,SAAS;CAQpB"}
|
|
@@ -11,6 +11,8 @@ class SessionManager {
|
|
|
11
11
|
monitorBus;
|
|
12
12
|
metrics;
|
|
13
13
|
store;
|
|
14
|
+
activityPersistIntervalMs;
|
|
15
|
+
lastPersisted = new Map();
|
|
14
16
|
sweepTimer = null;
|
|
15
17
|
constructor(opts) {
|
|
16
18
|
this.engineFactory = opts.engineFactory;
|
|
@@ -19,6 +21,7 @@ class SessionManager {
|
|
|
19
21
|
this.monitorBus = opts.monitorBus;
|
|
20
22
|
this.metrics = opts.metrics;
|
|
21
23
|
this.store = opts.store;
|
|
24
|
+
this.activityPersistIntervalMs = opts.activityPersistIntervalMs ?? 30_000;
|
|
22
25
|
// sweep idle sessions every minute
|
|
23
26
|
this.sweepTimer = setInterval(() => this.sweepIdle(), 60_000);
|
|
24
27
|
this.sweepTimer.unref?.();
|
|
@@ -52,6 +55,7 @@ class SessionManager {
|
|
|
52
55
|
this.sessions.set(id, session);
|
|
53
56
|
this.monitorBus?.notifySessionOpen(id, userId);
|
|
54
57
|
this.metrics?.sessionOpened();
|
|
58
|
+
this.lastPersisted.set(id, now.getTime());
|
|
55
59
|
this.store?.set(id, {
|
|
56
60
|
id,
|
|
57
61
|
createdAt: now.toISOString(),
|
|
@@ -65,12 +69,16 @@ class SessionManager {
|
|
|
65
69
|
const session = this.sessions.get(id);
|
|
66
70
|
if (session) {
|
|
67
71
|
session.lastActivityAt = new Date();
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
72
|
+
const now = session.lastActivityAt.getTime();
|
|
73
|
+
if (this.store && now - (this.lastPersisted.get(id) ?? 0) >= this.activityPersistIntervalMs) {
|
|
74
|
+
this.lastPersisted.set(id, now);
|
|
75
|
+
this.store.set(id, {
|
|
76
|
+
id,
|
|
77
|
+
createdAt: session.createdAt.toISOString(),
|
|
78
|
+
lastActivityAt: session.lastActivityAt.toISOString(),
|
|
79
|
+
userId: session.userId,
|
|
80
|
+
}).catch(() => { });
|
|
81
|
+
}
|
|
74
82
|
}
|
|
75
83
|
return session;
|
|
76
84
|
}
|
|
@@ -87,6 +95,7 @@ class SessionManager {
|
|
|
87
95
|
}
|
|
88
96
|
catch { /* may already be closed */ }
|
|
89
97
|
this.sessions.delete(id);
|
|
98
|
+
this.lastPersisted.delete(id);
|
|
90
99
|
this.monitorBus?.notifySessionClose(id);
|
|
91
100
|
this.metrics?.sessionClosed();
|
|
92
101
|
this.store?.delete(id).catch(() => { });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionManager.js","sourceRoot":"","sources":["../../src/session/SessionManager.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AAEzC,wEAAqE;
|
|
1
|
+
{"version":3,"file":"SessionManager.js","sourceRoot":"","sources":["../../src/session/SessionManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,8 @@ export interface RedisLike {
|
|
|
26
26
|
set(key: string, value: string, expiryMode: string, time: number): Promise<unknown>;
|
|
27
27
|
del(key: string): Promise<unknown>;
|
|
28
28
|
keys(pattern: string): Promise<string[]>;
|
|
29
|
+
scan?(cursor: string, matchToken: 'MATCH', pattern: string, countToken: 'COUNT', count: number): Promise<[string, string[]]>;
|
|
30
|
+
mget?(keys: string[]): Promise<Array<string | null>>;
|
|
29
31
|
quit(): Promise<unknown>;
|
|
30
32
|
}
|
|
31
33
|
export declare class RedisSessionMetaStore implements SessionMetaStore {
|
|
@@ -41,6 +43,8 @@ export declare class RedisSessionMetaStore implements SessionMetaStore {
|
|
|
41
43
|
get(id: string): Promise<SessionMeta | null>;
|
|
42
44
|
delete(id: string): Promise<void>;
|
|
43
45
|
list(): Promise<SessionMeta[]>;
|
|
46
|
+
/** SCAN walks the keyspace in small steps; KEYS does it in one blocking call. */
|
|
47
|
+
private listKeys;
|
|
44
48
|
close(): Promise<void>;
|
|
45
49
|
}
|
|
46
50
|
//# sourceMappingURL=SessionMetaStore.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionMetaStore.d.ts","sourceRoot":"","sources":["../../src/store/SessionMetaStore.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,WAAW;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mDAAmD;IACnD,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC7B,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAC7C,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;IAC/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAID,qBAAa,wBAAyB,YAAW,gBAAgB;IAC7D,OAAO,CAAC,IAAI,CAAkC;IAExC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjD,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAI5C,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIjC,IAAI,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAI9B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG/B;
|
|
1
|
+
{"version":3,"file":"SessionMetaStore.d.ts","sourceRoot":"","sources":["../../src/store/SessionMetaStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,8 @@ class InMemorySessionMetaStore {
|
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
exports.InMemorySessionMetaStore = InMemorySessionMetaStore;
|
|
38
|
+
const SCAN_COUNT = 200;
|
|
39
|
+
const MGET_CHUNK = 500;
|
|
38
40
|
class RedisSessionMetaStore {
|
|
39
41
|
redis;
|
|
40
42
|
prefix;
|
|
@@ -58,12 +60,33 @@ class RedisSessionMetaStore {
|
|
|
58
60
|
await this.redis.del(this.key(id));
|
|
59
61
|
}
|
|
60
62
|
async list() {
|
|
61
|
-
const keys = await this.
|
|
62
|
-
const
|
|
63
|
-
|
|
63
|
+
const keys = await this.listKeys();
|
|
64
|
+
const values = [];
|
|
65
|
+
for (let i = 0; i < keys.length; i += MGET_CHUNK) {
|
|
66
|
+
const chunk = keys.slice(i, i + MGET_CHUNK);
|
|
67
|
+
values.push(...(this.redis.mget
|
|
68
|
+
? await this.redis.mget(chunk)
|
|
69
|
+
: await Promise.all(chunk.map(k => this.redis.get(k)))));
|
|
70
|
+
}
|
|
71
|
+
return values
|
|
64
72
|
.filter((r) => r !== null)
|
|
65
73
|
.map(r => JSON.parse(r));
|
|
66
74
|
}
|
|
75
|
+
/** SCAN walks the keyspace in small steps; KEYS does it in one blocking call. */
|
|
76
|
+
async listKeys() {
|
|
77
|
+
const pattern = `${this.prefix}*`;
|
|
78
|
+
if (!this.redis.scan)
|
|
79
|
+
return this.redis.keys(pattern);
|
|
80
|
+
const seen = new Set(); // SCAN may return a key more than once
|
|
81
|
+
let cursor = '0';
|
|
82
|
+
do {
|
|
83
|
+
const [next, batch] = await this.redis.scan(cursor, 'MATCH', pattern, 'COUNT', SCAN_COUNT);
|
|
84
|
+
for (const k of batch)
|
|
85
|
+
seen.add(k);
|
|
86
|
+
cursor = next;
|
|
87
|
+
} while (cursor !== '0');
|
|
88
|
+
return [...seen];
|
|
89
|
+
}
|
|
67
90
|
async close() {
|
|
68
91
|
await this.redis.quit();
|
|
69
92
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionMetaStore.js","sourceRoot":"","sources":["../../src/store/SessionMetaStore.ts"],"names":[],"mappings":";AAAA,kFAAkF;AAClF,EAAE;AACF,kFAAkF;AAClF,iEAAiE;AACjE,EAAE;AACF,+EAA+E;AAC/E,+BAA+B;AAC/B,4DAA4D;AAC5D,6DAA6D;AAC7D,0DAA0D;AAC1D,EAAE;AACF,mBAAmB;AACnB,oEAAoE;AACpE,iFAAiF;;;AAmBjF,iFAAiF;AAEjF,MAAa,wBAAwB;IACzB,IAAI,GAAG,IAAI,GAAG,EAAuB,CAAC;IAE9C,KAAK,CAAC,GAAG,CAAC,EAAU,EAAE,IAAiB;QACnC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,EAAU;QAChB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU;QACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,IAAI;QACN,OAAO,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;CACJ;AAtBD,4DAsBC;
|
|
1
|
+
{"version":3,"file":"SessionMetaStore.js","sourceRoot":"","sources":["../../src/store/SessionMetaStore.ts"],"names":[],"mappings":";AAAA,kFAAkF;AAClF,EAAE;AACF,kFAAkF;AAClF,iEAAiE;AACjE,EAAE;AACF,+EAA+E;AAC/E,+BAA+B;AAC/B,4DAA4D;AAC5D,6DAA6D;AAC7D,0DAA0D;AAC1D,EAAE;AACF,mBAAmB;AACnB,oEAAoE;AACpE,iFAAiF;;;AAmBjF,iFAAiF;AAEjF,MAAa,wBAAwB;IACzB,IAAI,GAAG,IAAI,GAAG,EAAuB,CAAC;IAE9C,KAAK,CAAC,GAAG,CAAC,EAAU,EAAE,IAAiB;QACnC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,EAAU;QAChB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU;QACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,IAAI;QACN,OAAO,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;CACJ;AAtBD,4DAsBC;AAkBD,MAAM,UAAU,GAAG,GAAG,CAAC;AACvB,MAAM,UAAU,GAAG,GAAG,CAAC;AAEvB,MAAa,qBAAqB;IAKT;IAJJ,MAAM,CAAS;IACf,GAAG,CAAS;IAE7B,YACqB,KAAgB,EACjC,OAAiD,EAAE;QADlC,UAAK,GAAL,KAAK,CAAW;QAGjC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,aAAa,CAAC;QAC3C,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,UAAU,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,cAAc;IAC7D,CAAC;IAEO,GAAG,CAAC,EAAU;QAClB,OAAO,GAAG,IAAI,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,EAAU,EAAE,IAAiB;QACnC,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAC7E,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,EAAU;QAChB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAC/C,OAAO,GAAG,CAAC,CAAC,CAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAiB,CAAC,CAAC,CAAC,IAAI,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,EAAU;QACnB,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACnC,MAAM,MAAM,GAAyB,EAAE,CAAC;QACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC;YAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC;YAC5C,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;gBAC3B,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;gBAC9B,CAAC,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,MAAM;aACR,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;aACtC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAgB,CAAC,CAAC;IAChD,CAAC;IAED,iFAAiF;IACzE,KAAK,CAAC,QAAQ;QAClB,MAAM,OAAO,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC,CAAC,uCAAuC;QACvE,IAAI,MAAM,GAAG,GAAG,CAAC;QACjB,GAAG,CAAC;YACA,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;YAC3F,KAAK,MAAM,CAAC,IAAI,KAAK;gBAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,GAAG,IAAI,CAAC;QAClB,CAAC,QAAQ,MAAM,KAAK,GAAG,EAAE;QACzB,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,KAAK;QACP,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAC5B,CAAC;CACJ;AA5DD,sDA4DC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TriggerBus.d.ts","sourceRoot":"","sources":["../../src/trigger/TriggerBus.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TriggerBus.d.ts","sourceRoot":"","sources":["../../src/trigger/TriggerBus.ts"],"names":[],"mappings":"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"}
|
|
@@ -99,12 +99,36 @@ class TriggerBus {
|
|
|
99
99
|
// ── Fastify integration ───────────────────────────────────────────────────
|
|
100
100
|
/** Register webhook routes on a Fastify instance. Called by AgentServer. */
|
|
101
101
|
registerRoutes(app) {
|
|
102
|
+
// Senders (GitHub and others) sign the EXACT bytes of the body. Re-serializing the parsed
|
|
103
|
+
// body changes whitespace and key order and breaks the signature, so keep the raw bytes.
|
|
104
|
+
if (this.webhookDefs.some(d => d.secret) && typeof app.addContentTypeParser === 'function') {
|
|
105
|
+
try {
|
|
106
|
+
app.addContentTypeParser('application/json', { parseAs: 'buffer' }, (req, body, done) => {
|
|
107
|
+
req.rawBody = body;
|
|
108
|
+
const text = body.toString('utf8');
|
|
109
|
+
if (text.length === 0) {
|
|
110
|
+
done(Object.assign(new Error("Body cannot be empty when content-type is set to 'application/json'"), { statusCode: 400 }), undefined);
|
|
111
|
+
return;
|
|
112
|
+
}
|
|
113
|
+
try {
|
|
114
|
+
// The reviver drops "__proto__" keys, as Fastify's own parser refuses them.
|
|
115
|
+
done(null, JSON.parse(text, (k, v) => (k === '__proto__' ? undefined : v)));
|
|
116
|
+
}
|
|
117
|
+
catch (err) {
|
|
118
|
+
done(Object.assign(err, { statusCode: 400 }), undefined);
|
|
119
|
+
}
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
catch {
|
|
123
|
+
// The host already installed its own JSON parser: signatures fall back to the re-serialized body.
|
|
124
|
+
}
|
|
125
|
+
}
|
|
102
126
|
for (const def of this.webhookDefs) {
|
|
103
127
|
const method = (def.method ?? 'POST').toLowerCase();
|
|
104
128
|
app[method](def.path, async (req, reply) => {
|
|
105
129
|
if (def.secret) {
|
|
106
130
|
const sig = (req.headers['x-hub-signature-256'] ?? '');
|
|
107
|
-
const rawBody = JSON.stringify(req.body);
|
|
131
|
+
const rawBody = req.rawBody ?? JSON.stringify(req.body) ?? '';
|
|
108
132
|
if (!verifyHmac(rawBody, sig, def.secret)) {
|
|
109
133
|
return reply.code(401).send({ error: 'Invalid webhook signature' });
|
|
110
134
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TriggerBus.js","sourceRoot":"","sources":["../../src/trigger/TriggerBus.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiC;AACjC,6CAAyC;AAGzC,sEAAmE;AAgFnE,iFAAiF;AAEjF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAa,UAAU;IAWE;IACA;IAXJ,QAAQ,GAA2B,EAAE,CAAC;IACtC,WAAW,GAAwB,EAAE,CAAC;IACtC,SAAS,GAA0B,EAAE,CAAC;IACvD,8DAA8D;IACtD,SAAS,GAAa,EAAE,CAAC,CAAE,0CAA0C;IAC7E,8DAA8D;IACtD,YAAY,GAAU,EAAE,CAAC,CAAE,kCAAkC;IAC7D,OAAO,GAAG,KAAK,CAAC;IAExB,YACqB,aAAmC,EACnC,UAAuB;QADvB,kBAAa,GAAb,aAAa,CAAsB;QACnC,eAAU,GAAV,UAAU,CAAa;IACzC,CAAC;IAEJ,OAAO,CAAC,GAAmB;QACvB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,GAAsB;QAC7B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,QAAQ,CAAC,GAAoB;QACzB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,6EAA6E;IAE7E,4EAA4E;IAC5E,cAAc,CAAC,GAAoB;QAC/B,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACjC,MAAM,MAAM,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,WAAW,EAA4B,CAAC;YAC9E,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,GAAmB,EAAE,KAAmB,EAAE,EAAE;gBACrE,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;oBACb,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,EAAE,CAAW,CAAC;oBACjE,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"TriggerBus.js","sourceRoot":"","sources":["../../src/trigger/TriggerBus.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@backendkit-labs/agent-web",
|
|
3
|
-
"version": "0.6.
|
|
3
|
+
"version": "0.6.4",
|
|
4
4
|
"description": "HTTP/WebSocket server layer for agent-core — browser-ready streaming agent sessions",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"prepublishOnly": "npm run build"
|
|
18
18
|
},
|
|
19
19
|
"peerDependencies": {
|
|
20
|
-
"@backendkit-labs/agent-core": ">=0.24.0 <0.
|
|
20
|
+
"@backendkit-labs/agent-core": ">=0.24.0 <0.38.0"
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"@fastify/websocket": "^11.0.0",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"node-cron": "^4.2.1"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@backendkit-labs/agent-core": "^0.
|
|
34
|
+
"@backendkit-labs/agent-core": "^0.37.0",
|
|
35
35
|
"@types/jest": "^29.5.14",
|
|
36
36
|
"@types/jsonwebtoken": "^9.0.0",
|
|
37
37
|
"@types/node": "^20.0.0",
|