@agentuity/runtime 0.0.29 → 0.0.30
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/dist/_context.d.ts +3 -1
- package/dist/_context.d.ts.map +1 -1
- package/dist/_server.d.ts.map +1 -1
- package/dist/agent.d.ts.map +1 -1
- package/dist/app.d.ts +7 -0
- package/dist/app.d.ts.map +1 -1
- package/dist/router.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/_context.ts +9 -3
- package/src/_server.ts +18 -1
- package/src/agent.ts +5 -1
- package/src/app.ts +7 -2
- package/src/router.ts +122 -27
package/dist/_context.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { AsyncLocalStorage } from 'node:async_hooks';
|
|
1
2
|
import type { Tracer } from '@opentelemetry/api';
|
|
2
3
|
import type { KeyValueStorage, ObjectStorage, StreamStorage, VectorStorage } from '@agentuity/core';
|
|
3
4
|
import type { AgentContext, AgentName } from './agent';
|
|
@@ -29,5 +30,6 @@ export declare class RequestAgentContext<TAgentMap, TAgent> implements AgentCont
|
|
|
29
30
|
}
|
|
30
31
|
export declare const inAgentContext: () => boolean;
|
|
31
32
|
export declare const getAgentContext: () => AgentContext;
|
|
32
|
-
export declare const
|
|
33
|
+
export declare const getAsyncLocalStorage: () => AsyncLocalStorage<AgentContext>;
|
|
34
|
+
export declare const runInAgentContext: <TAgentMap, TAgent>(ctxObject: Record<string, unknown>, args: RequestAgentContextArgs<TAgentMap, TAgent>, next: () => Promise<void>, isWebSocket?: boolean) => Promise<void>;
|
|
33
35
|
//# sourceMappingURL=_context.d.ts.map
|
package/dist/_context.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_context.d.ts","sourceRoot":"","sources":["../src/_context.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"_context.d.ts","sourceRoot":"","sources":["../src/_context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AACpG,OAAO,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIvC,MAAM,WAAW,uBAAuB,CAAC,SAAS,EAAE,MAAM;IACzD,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,SAAS,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;CAC1C;AAED,qBAAa,mBAAmB,CAAC,SAAS,EAAE,MAAM,CAAE,YAAW,YAAY;IAC1E,KAAK,EAAE,SAAS,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAG,eAAe,CAAC;IACrB,WAAW,EAAG,aAAa,CAAC;IAC5B,MAAM,EAAG,aAAa,CAAC;IACvB,MAAM,EAAG,aAAa,CAAC;IACvB,OAAO,CAAC,gBAAgB,CAAmB;gBAE/B,IAAI,EAAE,uBAAuB,CAAC,SAAS,EAAE,MAAM,CAAC;IAW5D,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI;IAIvE,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B;AAID,eAAO,MAAM,cAAc,QAAO,OAGjC,CAAC;AAEF,eAAO,MAAM,eAAe,QAAO,YAMlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,uCAA0B,CAAC;AAE5D,eAAO,MAAM,iBAAiB,GAAI,SAAS,EAAE,MAAM,EAClD,WAAW,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClC,MAAM,uBAAuB,CAAC,SAAS,EAAE,MAAM,CAAC,EAChD,MAAM,MAAM,OAAO,CAAC,IAAI,CAAC,EACzB,cAAa,OAAe,kBAmB5B,CAAC"}
|
package/dist/_server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_server.d.ts","sourceRoot":"","sources":["../src/_server.ts"],"names":[],"mappings":"AACA,OAAO,EAKN,KAAK,MAAM,EAGX,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"_server.d.ts","sourceRoot":"","sources":["../src/_server.ts"],"names":[],"mappings":"AACA,OAAO,EAKN,KAAK,MAAM,EAGX,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAInE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAEjD,OAAO,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAG5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAavC,wBAAgB,SAAS,wCAExB;AAED,wBAAgB,MAAM,4DAErB;AAED,wBAAgB,SAAS,kBAExB;AAED,wBAAgB,SAAS,kBAExB;AAcD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,aAAa,QAExD;AA2CD,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,GAAG,EAAE,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,UAAU,SAAS,iCA8H5E,CAAC"}
|
package/dist/agent.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,aAAa,EACb,aAAa,EACb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAS,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,KAAK,EAAW,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAEvD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,WAAW,YAAY;IAI5B,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC;IAC3E,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,eAAe,CAAC;IACpB,WAAW,EAAE,aAAa,CAAC;IAC3B,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,EAAE,aAAa,CAAC;CACtB;AAED,UAAU,aAAa;IACtB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,MAAM,KAAK,CAChB,MAAM,SAAS,gBAAgB,GAAG,SAAS,GAAG,GAAG,EACjD,OAAO,SAAS,gBAAgB,GAAG,SAAS,GAAG,GAAG,EAClD,OAAO,SAAS,OAAO,GAAG,KAAK,IAC5B;IACH,QAAQ,EAAE,aAAa,CAAC;IACxB,OAAO,EAAE,CAAC,GAAG,EAAE,YAAY,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CACnE,GAAG,CAAC,MAAM,SAAS,gBAAgB,GAAG;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,WAAW,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC,GACxF,CAAC,OAAO,SAAS,gBAAgB,GAAG;IAAE,YAAY,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,YAAY,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC,GACzF,CAAC,OAAO,SAAS,IAAI,GAAG;IAAE,MAAM,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,MAAM,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC,CAAC;AAEhE,KAAK,gBAAgB,CAAC,CAAC,IAAI,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;AAEhG,KAAK,iBAAiB,CAAC,OAAO,EAAE,OAAO,SAAS,OAAO,IAAI,OAAO,SAAS,IAAI,GAC5E,OAAO,SAAS,gBAAgB,GAC/B,cAAc,CAAC,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,GACrD,cAAc,CAAC,OAAO,CAAC,GACxB,OAAO,SAAS,gBAAgB,GAC/B,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,GACrC,IAAI,CAAC;AAET,MAAM,WAAW,WAAW,CAC3B,MAAM,SAAS,gBAAgB,GAAG,SAAS,GAAG,GAAG,EACjD,OAAO,SAAS,gBAAgB,GAAG,SAAS,GAAG,GAAG,EAClD,OAAO,SAAS,OAAO,GAAG,KAAK;IAE/B,QAAQ,EAAE,aAAa,CAAC;IACxB,GAAG,EAAE,SAAS,SAAS,MAAM,GAC1B,MAAM,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,CAAC,GACtE,CACA,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,KAC/C,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;CACxE;AAKD;;;;GAIG;AACH,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC;AAC/B,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAE3D,eAAO,MAAM,aAAa,GAAI,MAAM,SAAS,EAAE,OAAO,KAAK,KAAG,IAE7D,CAAC;AAEF,wBAAgB,WAAW,CAC1B,MAAM,SAAS,gBAAgB,GAAG,SAAS,GAAG,SAAS,EACvD,OAAO,SAAS,gBAAgB,GAAG,SAAS,GAAG,SAAS,EACxD,OAAO,SAAS,OAAO,GAAG,KAAK,EAC9B,MAAM,EAAE;IACT,MAAM,CAAC,EAAE;QACR,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,MAAM,CAAC,EAAE,OAAO,CAAC;KACjB,CAAC;IACF,QAAQ,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC,CAAC;IAC9C,OAAO,EAAE,MAAM,SAAS,gBAAgB,GACrC,OAAO,SAAS,IAAI,GACnB,OAAO,SAAS,gBAAgB,GAC/B,CACA,CAAC,EAAE,YAAY,EACf,KAAK,EAAE,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,KAEzC,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,GAC9D,cAAc,CAAC,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,GACvD,CACA,CAAC,EAAE,YAAY,EACf,KAAK,EAAE,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,KACvC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,GAC/D,OAAO,SAAS,gBAAgB,GAC/B,CACA,CAAC,EAAE,YAAY,EACf,KAAK,EAAE,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,KAEzC,OAAO,CAAC,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,GAC9C,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,GACvC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,gBAAgB,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,GACxF,OAAO,SAAS,IAAI,GACnB,OAAO,SAAS,gBAAgB,GAC/B,CACA,CAAC,EAAE,YAAY,KAEb,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,GAC9D,cAAc,CAAC,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,GACvD,CAAC,CAAC,EAAE,YAAY,KAAK,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,GAAG,cAAc,CAAC,OAAO,CAAC,GAChF,OAAO,SAAS,gBAAgB,GAC/B,CACA,CAAC,EAAE,YAAY,KAEb,OAAO,CAAC,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,GAC9C,gBAAgB,CAAC,WAAW,CAAC,OAAO,CAAC,GACvC,CAAC,CAAC,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAC/C,GAAG,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAmDlC;AA2BD,eAAO,MAAM,qBAAqB,GAAI,WAAW,SAAS,KAAG,
|
|
1
|
+
{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../src/agent.ts"],"names":[],"mappings":"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"}
|
package/dist/app.d.ts
CHANGED
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
import { type Env as HonoEnv, Hono } from 'hono';
|
|
2
|
+
import { cors } from 'hono/cors';
|
|
2
3
|
import type { Logger } from './logger';
|
|
3
4
|
import { type Meter, type Tracer } from '@opentelemetry/api';
|
|
5
|
+
type CorsOptions = Parameters<typeof cors>[0];
|
|
4
6
|
export interface AppConfig {
|
|
7
|
+
/**
|
|
8
|
+
* Override the default cors settings
|
|
9
|
+
*/
|
|
10
|
+
cors?: CorsOptions;
|
|
5
11
|
}
|
|
6
12
|
export interface Variables {
|
|
7
13
|
logger: Logger;
|
|
@@ -21,4 +27,5 @@ export declare function createApp(config?: AppConfig): {
|
|
|
21
27
|
server: Bun.Server<import("hono/bun").BunWebSocketData>;
|
|
22
28
|
logger: Logger;
|
|
23
29
|
};
|
|
30
|
+
export {};
|
|
24
31
|
//# sourceMappingURL=app.d.ts.map
|
package/dist/app.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,IAAI,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,GAAG,IAAI,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,KAAK,KAAK,EAAE,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE7D,KAAK,WAAW,GAAG,UAAU,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9C,MAAM,WAAW,SAAS;IACzB;;OAEG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;CACnB;AAED,MAAM,WAAW,SAAS;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,GAAI,SAAQ,OAAO;IACnC,SAAS,EAAE,SAAS,CAAC;CACrB;AAED;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,MAAM,CAAC,EAAE,SAAS;;;;EAK3C"}
|
package/dist/router.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,OAAO,EAAE,IAAI,EAAE,KAAK,KAAK,EAAE,KAAK,iBAAiB,EAAE,KAAK,MAAM,EAAE,MAAM,MAAM,CAAC;AAI3F,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agentuity/runtime",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.30",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./src/index.ts",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"prepublishOnly": "bun run clean && bun run build"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@agentuity/core": "0.0.
|
|
27
|
-
"@agentuity/server": "0.0.
|
|
26
|
+
"@agentuity/core": "0.0.29",
|
|
27
|
+
"@agentuity/server": "0.0.29",
|
|
28
28
|
"@opentelemetry/api": "^1.9.0",
|
|
29
29
|
"@opentelemetry/api-logs": "^0.207.0",
|
|
30
30
|
"@opentelemetry/auto-instrumentations-node": "^0.66.0",
|
package/src/_context.ts
CHANGED
|
@@ -64,10 +64,13 @@ export const getAgentContext = (): AgentContext => {
|
|
|
64
64
|
return context;
|
|
65
65
|
};
|
|
66
66
|
|
|
67
|
+
export const getAsyncLocalStorage = () => asyncLocalStorage;
|
|
68
|
+
|
|
67
69
|
export const runInAgentContext = <TAgentMap, TAgent>(
|
|
68
70
|
ctxObject: Record<string, unknown>,
|
|
69
71
|
args: RequestAgentContextArgs<TAgentMap, TAgent>,
|
|
70
|
-
next: () => Promise<void
|
|
72
|
+
next: () => Promise<void>,
|
|
73
|
+
isWebSocket: boolean = false
|
|
71
74
|
) => {
|
|
72
75
|
const ctx = new RequestAgentContext(args);
|
|
73
76
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -79,8 +82,11 @@ export const runInAgentContext = <TAgentMap, TAgent>(
|
|
|
79
82
|
ctxObject[k] = _ctx[k];
|
|
80
83
|
}
|
|
81
84
|
return asyncLocalStorage.run(ctx, async () => {
|
|
82
|
-
|
|
85
|
+
const result = await next();
|
|
86
|
+
// Don't call waitUntilAll for websocket upgrades - they stay open
|
|
87
|
+
if (!isWebSocket) {
|
|
83
88
|
setImmediate(() => ctx.waitUntilAll()); // TODO: move until session
|
|
84
|
-
}
|
|
89
|
+
}
|
|
90
|
+
return result;
|
|
85
91
|
});
|
|
86
92
|
};
|
package/src/_server.ts
CHANGED
|
@@ -11,6 +11,7 @@ import {
|
|
|
11
11
|
import type { Span } from '@opentelemetry/sdk-trace-base';
|
|
12
12
|
import type { SpanProcessor } from '@opentelemetry/sdk-trace-base';
|
|
13
13
|
import { ServiceException } from '@agentuity/core';
|
|
14
|
+
import { cors } from 'hono/cors';
|
|
14
15
|
import { createMiddleware } from 'hono/factory';
|
|
15
16
|
import { Hono } from 'hono';
|
|
16
17
|
import { HTTPException } from 'hono/http-exception';
|
|
@@ -155,13 +156,15 @@ export const createServer = <E extends Env>(app: Hono<E>, _config?: AppConfig) =
|
|
|
155
156
|
c.set('logger', otel.logger);
|
|
156
157
|
c.set('tracer', otel.tracer);
|
|
157
158
|
c.set('meter', otel.meter);
|
|
159
|
+
const isWebSocket = c.req.header('upgrade')?.toLowerCase() === 'websocket';
|
|
158
160
|
const skipLogging = c.req.path.startsWith('/_agentuity/');
|
|
159
161
|
const started = performance.now();
|
|
160
162
|
if (!skipLogging) {
|
|
161
163
|
otel.logger.debug('%s %s started', c.req.method, c.req.path);
|
|
162
164
|
}
|
|
163
165
|
await next();
|
|
164
|
-
|
|
166
|
+
// Don't log completion for websocket upgrades - they stay open
|
|
167
|
+
if (!skipLogging && !isWebSocket) {
|
|
165
168
|
otel.logger.debug(
|
|
166
169
|
'%s %s completed (%d) in %sms',
|
|
167
170
|
c.req.method,
|
|
@@ -172,6 +175,20 @@ export const createServer = <E extends Env>(app: Hono<E>, _config?: AppConfig) =
|
|
|
172
175
|
}
|
|
173
176
|
});
|
|
174
177
|
|
|
178
|
+
// setup the cors middleware
|
|
179
|
+
app.use(
|
|
180
|
+
'*',
|
|
181
|
+
cors({
|
|
182
|
+
origin: '*',
|
|
183
|
+
allowHeaders: [],
|
|
184
|
+
allowMethods: ['POST', 'GET', 'OPTIONS', 'HEAD', 'PUT', 'DELETE', 'PATCH'],
|
|
185
|
+
exposeHeaders: ['Content-Length'],
|
|
186
|
+
maxAge: 600,
|
|
187
|
+
credentials: true,
|
|
188
|
+
...(_config?.cors ?? {}), // allow the app config to override
|
|
189
|
+
})
|
|
190
|
+
);
|
|
191
|
+
|
|
175
192
|
app.route('/_agentuity', createAgentuityAPIs());
|
|
176
193
|
|
|
177
194
|
// Attach services to context for API routes
|
package/src/agent.ts
CHANGED
|
@@ -235,6 +235,9 @@ const createAgentRunner = <
|
|
|
235
235
|
|
|
236
236
|
export const createAgentMiddleware = (agentName: AgentName): MiddlewareHandler => {
|
|
237
237
|
return async (ctx, next) => {
|
|
238
|
+
// Detect websocket upgrade requests
|
|
239
|
+
const isWebSocket = ctx.req.header('upgrade')?.toLowerCase() === 'websocket';
|
|
240
|
+
|
|
238
241
|
// Populate agents object with strongly-typed keys
|
|
239
242
|
const agentsObj: any = {};
|
|
240
243
|
for (const [name, agentFn] of agents) {
|
|
@@ -260,7 +263,8 @@ export const createAgentMiddleware = (agentName: AgentName): MiddlewareHandler =
|
|
|
260
263
|
return runInAgentContext(
|
|
261
264
|
ctx as unknown as Record<string, unknown>,
|
|
262
265
|
args as RequestAgentContextArgs<any, any>,
|
|
263
|
-
next
|
|
266
|
+
next,
|
|
267
|
+
isWebSocket
|
|
264
268
|
);
|
|
265
269
|
|
|
266
270
|
// FIXME
|
package/src/app.ts
CHANGED
|
@@ -1,11 +1,16 @@
|
|
|
1
1
|
import { type Env as HonoEnv, Hono } from 'hono';
|
|
2
|
+
import { cors } from 'hono/cors';
|
|
2
3
|
import { createServer, getLogger } from './_server';
|
|
3
4
|
import type { Logger } from './logger';
|
|
4
5
|
import { type Meter, type Tracer } from '@opentelemetry/api';
|
|
5
6
|
|
|
6
|
-
|
|
7
|
+
type CorsOptions = Parameters<typeof cors>[0];
|
|
8
|
+
|
|
7
9
|
export interface AppConfig {
|
|
8
|
-
|
|
10
|
+
/**
|
|
11
|
+
* Override the default cors settings
|
|
12
|
+
*/
|
|
13
|
+
cors?: CorsOptions;
|
|
9
14
|
}
|
|
10
15
|
|
|
11
16
|
export interface Variables {
|
package/src/router.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { stream as honoStream, streamSSE as honoStreamSSE } from 'hono/streaming
|
|
|
5
5
|
import { upgradeWebSocket as honoUpgradeWebSocket } from 'hono/bun';
|
|
6
6
|
import { hash, returnResponse } from './_util';
|
|
7
7
|
import type { Env } from './app';
|
|
8
|
+
import { getAsyncLocalStorage } from './_context';
|
|
8
9
|
|
|
9
10
|
type AgentHandler<E extends Env = Env, P extends string = string, I extends Input = {}> = (
|
|
10
11
|
c: Context<E, P, I>
|
|
@@ -94,6 +95,8 @@ export const createRouter = <E extends Env = Env, S extends Schema = Schema>():
|
|
|
94
95
|
const wrapper = async (c: Context): Promise<Response> => {
|
|
95
96
|
let result = handler(c);
|
|
96
97
|
if (result instanceof Promise) result = await result;
|
|
98
|
+
// If handler returns a Response (e.g., websocket upgrade), return it unchanged
|
|
99
|
+
if (result instanceof Response) return result;
|
|
97
100
|
return returnResponse(c, result);
|
|
98
101
|
};
|
|
99
102
|
return _originalInvoker(path, wrapper);
|
|
@@ -104,6 +107,10 @@ export const createRouter = <E extends Env = Env, S extends Schema = Schema>():
|
|
|
104
107
|
const wrapper = async (c: Context): Promise<Response> => {
|
|
105
108
|
let result = handler(c);
|
|
106
109
|
if (result instanceof Promise) result = await result;
|
|
110
|
+
// If handler returns a Response (e.g., websocket upgrade), return it unchanged
|
|
111
|
+
if (result instanceof Response) {
|
|
112
|
+
return result;
|
|
113
|
+
}
|
|
107
114
|
return returnResponse(c, result);
|
|
108
115
|
};
|
|
109
116
|
return _originalInvoker(path, middleware, wrapper);
|
|
@@ -160,14 +167,26 @@ export const createRouter = <E extends Env = Env, S extends Schema = Schema>():
|
|
|
160
167
|
}
|
|
161
168
|
|
|
162
169
|
const wrapper = (c: Context) => {
|
|
170
|
+
// Capture the AgentContext from the request
|
|
171
|
+
const asyncLocalStorage = getAsyncLocalStorage();
|
|
172
|
+
const capturedContext = asyncLocalStorage.getStore();
|
|
173
|
+
|
|
163
174
|
return honoStream(c, async (s: any) => {
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
175
|
+
const runInContext = async () => {
|
|
176
|
+
try {
|
|
177
|
+
let streamResult = handler(c);
|
|
178
|
+
if (streamResult instanceof Promise) streamResult = await streamResult;
|
|
179
|
+
await s.pipe(streamResult);
|
|
180
|
+
} catch (err) {
|
|
181
|
+
console.error('Stream error:', err);
|
|
182
|
+
throw err;
|
|
183
|
+
}
|
|
184
|
+
};
|
|
185
|
+
|
|
186
|
+
if (capturedContext) {
|
|
187
|
+
await asyncLocalStorage.run(capturedContext, runInContext);
|
|
188
|
+
} else {
|
|
189
|
+
await runInContext();
|
|
171
190
|
}
|
|
172
191
|
});
|
|
173
192
|
};
|
|
@@ -196,6 +215,10 @@ export const createRouter = <E extends Env = Env, S extends Schema = Schema>():
|
|
|
196
215
|
let closeHandler: ((event: any) => void | Promise<void>) | undefined;
|
|
197
216
|
let initialized = false;
|
|
198
217
|
|
|
218
|
+
// Capture the AgentContext from the upgrade request
|
|
219
|
+
const asyncLocalStorage = getAsyncLocalStorage();
|
|
220
|
+
const capturedContext = asyncLocalStorage.getStore();
|
|
221
|
+
|
|
199
222
|
const wsConnection: WebSocketConnection = {
|
|
200
223
|
onOpen: (h) => {
|
|
201
224
|
openHandler = h;
|
|
@@ -214,41 +237,101 @@ export const createRouter = <E extends Env = Env, S extends Schema = Schema>():
|
|
|
214
237
|
const setupResult = handler(c);
|
|
215
238
|
const setupFn = typeof setupResult === 'function' ? setupResult : null;
|
|
216
239
|
|
|
240
|
+
// Call setup IMMEDIATELY during upgrade, not in onOpen
|
|
241
|
+
// This allows the user's code to register handlers before events fire
|
|
242
|
+
if (setupFn) {
|
|
243
|
+
if (capturedContext) {
|
|
244
|
+
asyncLocalStorage.run(capturedContext, () => setupFn(wsConnection));
|
|
245
|
+
} else {
|
|
246
|
+
setupFn(wsConnection);
|
|
247
|
+
}
|
|
248
|
+
initialized = true;
|
|
249
|
+
}
|
|
250
|
+
|
|
217
251
|
return {
|
|
218
252
|
onOpen: async (event: any, ws: any) => {
|
|
219
|
-
|
|
253
|
+
try {
|
|
254
|
+
// Bind the real ws.send now that we have the actual websocket
|
|
220
255
|
wsConnection.send = (data) => ws.send(data);
|
|
221
|
-
|
|
222
|
-
if (
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
256
|
+
|
|
257
|
+
if (openHandler) {
|
|
258
|
+
// Run handler in captured context
|
|
259
|
+
const handler = openHandler;
|
|
260
|
+
if (capturedContext) {
|
|
261
|
+
await asyncLocalStorage.run(capturedContext, () => handler(event));
|
|
262
|
+
} else {
|
|
263
|
+
await handler(event);
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
} catch (err) {
|
|
267
|
+
c.var.logger?.error('WebSocket onOpen error:', err);
|
|
268
|
+
throw err;
|
|
227
269
|
}
|
|
228
270
|
},
|
|
229
271
|
onMessage: async (event: any, ws: any) => {
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
272
|
+
try {
|
|
273
|
+
// Lazy initialization fallback (shouldn't normally happen)
|
|
274
|
+
if (!initialized && setupFn) {
|
|
275
|
+
wsConnection.send = (data) => ws.send(data);
|
|
276
|
+
if (capturedContext) {
|
|
277
|
+
await asyncLocalStorage.run(capturedContext, async () => {
|
|
278
|
+
const result = setupFn(wsConnection);
|
|
279
|
+
if (result instanceof Promise) await result;
|
|
280
|
+
});
|
|
281
|
+
} else {
|
|
282
|
+
const result = setupFn(wsConnection);
|
|
283
|
+
if (result instanceof Promise) await result;
|
|
284
|
+
}
|
|
285
|
+
initialized = true;
|
|
286
|
+
}
|
|
287
|
+
if (messageHandler) {
|
|
288
|
+
// Run handler in captured context
|
|
289
|
+
const handler = messageHandler;
|
|
290
|
+
if (capturedContext) {
|
|
291
|
+
await asyncLocalStorage.run(capturedContext, () => handler(event));
|
|
292
|
+
} else {
|
|
293
|
+
await handler(event);
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
} catch (err) {
|
|
297
|
+
c.var.logger?.error('WebSocket onMessage error:', err);
|
|
298
|
+
throw err;
|
|
238
299
|
}
|
|
239
300
|
},
|
|
240
301
|
onClose: async (event: any, _ws: any) => {
|
|
241
|
-
|
|
242
|
-
|
|
302
|
+
try {
|
|
303
|
+
if (closeHandler) {
|
|
304
|
+
// Run handler in captured context
|
|
305
|
+
const handler = closeHandler;
|
|
306
|
+
if (capturedContext) {
|
|
307
|
+
await asyncLocalStorage.run(capturedContext, () => handler(event));
|
|
308
|
+
} else {
|
|
309
|
+
await handler(event);
|
|
310
|
+
}
|
|
311
|
+
}
|
|
312
|
+
} catch (err) {
|
|
313
|
+
c.var.logger?.error('WebSocket onClose error:', err);
|
|
243
314
|
}
|
|
244
315
|
},
|
|
245
316
|
};
|
|
246
317
|
});
|
|
247
318
|
|
|
319
|
+
// wrapper is what upgradeWebSocket(...) returned. Force arity=2 so our get shim
|
|
320
|
+
// recognizes it as middleware and does not wrap/convert undefined -> 200.
|
|
321
|
+
const wsMiddleware: MiddlewareHandler = (c, next) =>
|
|
322
|
+
(wrapper as unknown as MiddlewareHandler)(c, next);
|
|
323
|
+
|
|
248
324
|
if (middleware) {
|
|
249
|
-
|
|
325
|
+
// Compose into a single middleware to avoid the 3-arg route which treats the
|
|
326
|
+
// second function as a handler and wraps it.
|
|
327
|
+
const composed: MiddlewareHandler = async (c, next) => {
|
|
328
|
+
return middleware(c, async () => {
|
|
329
|
+
await wsMiddleware(c, next);
|
|
330
|
+
});
|
|
331
|
+
};
|
|
332
|
+
return router.get(path, composed);
|
|
250
333
|
} else {
|
|
251
|
-
return router.get(path,
|
|
334
|
+
return router.get(path, wsMiddleware);
|
|
252
335
|
}
|
|
253
336
|
};
|
|
254
337
|
|
|
@@ -264,6 +347,10 @@ export const createRouter = <E extends Env = Env, S extends Schema = Schema>():
|
|
|
264
347
|
}
|
|
265
348
|
|
|
266
349
|
const wrapper = (c: Context) => {
|
|
350
|
+
// Capture the AgentContext from the request
|
|
351
|
+
const asyncLocalStorage = getAsyncLocalStorage();
|
|
352
|
+
const capturedContext = asyncLocalStorage.getStore();
|
|
353
|
+
|
|
267
354
|
return honoStreamSSE(c, async (stream: any) => {
|
|
268
355
|
// Wrap the stream to intercept write() calls
|
|
269
356
|
const wrappedStream = {
|
|
@@ -287,7 +374,15 @@ export const createRouter = <E extends Env = Env, S extends Schema = Schema>():
|
|
|
287
374
|
close: stream.close?.bind(stream),
|
|
288
375
|
};
|
|
289
376
|
|
|
290
|
-
|
|
377
|
+
const runInContext = async () => {
|
|
378
|
+
await handler(c)(wrappedStream);
|
|
379
|
+
};
|
|
380
|
+
|
|
381
|
+
if (capturedContext) {
|
|
382
|
+
await asyncLocalStorage.run(capturedContext, runInContext);
|
|
383
|
+
} else {
|
|
384
|
+
await runInContext();
|
|
385
|
+
}
|
|
291
386
|
});
|
|
292
387
|
};
|
|
293
388
|
|