@cogitator-ai/a2a 0.3.11 → 0.4.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 +64 -7
- package/dist/adapters/express.d.ts.map +1 -1
- package/dist/adapters/express.js +22 -22
- package/dist/adapters/express.js.map +1 -1
- package/dist/adapters/fastify.d.ts.map +1 -1
- package/dist/adapters/fastify.js +23 -24
- package/dist/adapters/fastify.js.map +1 -1
- package/dist/adapters/hono.d.ts.map +1 -1
- package/dist/adapters/hono.js +25 -8
- package/dist/adapters/hono.js.map +1 -1
- package/dist/adapters/koa.d.ts.map +1 -1
- package/dist/adapters/koa.js +16 -23
- package/dist/adapters/koa.js.map +1 -1
- package/dist/adapters/next.d.ts.map +1 -1
- package/dist/adapters/next.js +22 -19
- package/dist/adapters/next.js.map +1 -1
- package/dist/adapters/shared.d.ts +18 -0
- package/dist/adapters/shared.d.ts.map +1 -0
- package/dist/adapters/shared.js +52 -0
- package/dist/adapters/shared.js.map +1 -0
- package/dist/adapters/sse-error-event.d.ts +3 -0
- package/dist/adapters/sse-error-event.d.ts.map +1 -0
- package/dist/adapters/sse-error-event.js +11 -0
- package/dist/adapters/sse-error-event.js.map +1 -0
- package/dist/agent-card.d.ts.map +1 -1
- package/dist/agent-card.js +15 -2
- package/dist/agent-card.js.map +1 -1
- package/dist/client.d.ts +24 -4
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +163 -83
- package/dist/client.js.map +1 -1
- package/dist/errors.d.ts +1 -0
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +3 -0
- package/dist/errors.js.map +1 -1
- package/dist/index.d.ts +6 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -3
- package/dist/index.js.map +1 -1
- package/dist/json-rpc.d.ts +2 -2
- package/dist/json-rpc.d.ts.map +1 -1
- package/dist/json-rpc.js +11 -7
- package/dist/json-rpc.js.map +1 -1
- package/dist/push-notifications.d.ts +8 -1
- package/dist/push-notifications.d.ts.map +1 -1
- package/dist/push-notifications.js +178 -25
- package/dist/push-notifications.js.map +1 -1
- package/dist/redis-task-store.d.ts +1 -0
- package/dist/redis-task-store.d.ts.map +1 -1
- package/dist/redis-task-store.js +44 -4
- package/dist/redis-task-store.js.map +1 -1
- package/dist/server.d.ts +19 -2
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +287 -135
- package/dist/server.js.map +1 -1
- package/dist/task-manager.d.ts +27 -2
- package/dist/task-manager.d.ts.map +1 -1
- package/dist/task-manager.js +126 -36
- package/dist/task-manager.js.map +1 -1
- package/dist/task-store.d.ts +10 -0
- package/dist/task-store.d.ts.map +1 -1
- package/dist/task-store.js +28 -0
- package/dist/task-store.js.map +1 -1
- package/dist/types.d.ts +17 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +7 -0
- package/dist/types.js.map +1 -1
- package/package.json +5 -5
package/dist/errors.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAEzD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAE9D;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CAM9E;AAED,wBAAgB,6BAA6B,IAAI,YAAY,CAE5D;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAM3E;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAEjE;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY,CAMzE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAEjE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,CAE7D;AAED,wBAAgB,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAExD;AAED,wBAAgB,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAE5D;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAE3D;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAE1D;AAED,wBAAgB,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAE3D;AAED,qBAAa,QAAS,SAAQ,KAAK;aACL,YAAY,EAAE,YAAY;gBAA1B,YAAY,EAAE,YAAY;IAKtD,IAAI,IAAI,IAAI,MAAM,CAEjB;CACF"}
|
|
1
|
+
{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAEzD;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAE9D;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CAM9E;AAED,wBAAgB,6BAA6B,IAAI,YAAY,CAE5D;AAED,wBAAgB,8BAA8B,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAM3E;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAEjE;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY,CAMzE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAEjE;AAED,wBAAgB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,CAE7D;AAED,wBAAgB,YAAY,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAE1D;AAED,wBAAgB,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAExD;AAED,wBAAgB,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAE5D;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAE3D;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAE1D;AAED,wBAAgB,aAAa,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAE3D;AAED,qBAAa,QAAS,SAAQ,KAAK;aACL,YAAY,EAAE,YAAY;gBAA1B,YAAY,EAAE,YAAY;IAKtD,IAAI,IAAI,IAAI,MAAM,CAEjB;CACF"}
|
package/dist/errors.js
CHANGED
|
@@ -37,6 +37,9 @@ export function invalidAgentResponse(detail) {
|
|
|
37
37
|
export function agentNotFound(agentName) {
|
|
38
38
|
return { code: -32007, message: `Agent not found: ${agentName}`, data: { agentName } };
|
|
39
39
|
}
|
|
40
|
+
export function unauthorized(detail) {
|
|
41
|
+
return { code: -32000, message: detail ? `Unauthorized: ${detail}` : 'Unauthorized' };
|
|
42
|
+
}
|
|
40
43
|
export function parseError(detail) {
|
|
41
44
|
return { code: -32700, message: detail ? `Parse error: ${detail}` : 'Parse error' };
|
|
42
45
|
}
|
package/dist/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
export { A2AServer } from './server.js';
|
|
2
2
|
export { A2AClient } from './client.js';
|
|
3
|
-
export type { A2AToolOptions, A2AToolResult } from './client.js';
|
|
3
|
+
export type { A2AToolOptions, A2AToolResult, A2ARequestOptions } from './client.js';
|
|
4
4
|
export { generateAgentCard, signAgentCard, verifyAgentCardSignature } from './agent-card.js';
|
|
5
5
|
export type { AgentCardOptions, AgentCardSigningOptions } from './agent-card.js';
|
|
6
6
|
export { InMemoryTaskStore } from './task-store.js';
|
|
7
|
+
export type { InMemoryTaskStoreConfig } from './task-store.js';
|
|
7
8
|
export { RedisTaskStore } from './redis-task-store.js';
|
|
8
9
|
export type { RedisClientLike, RedisTaskStoreConfig } from './redis-task-store.js';
|
|
9
10
|
export { TaskManager } from './task-manager.js';
|
|
10
|
-
export type { TaskManagerConfig } from './task-manager.js';
|
|
11
|
-
export { InMemoryPushNotificationStore, PushNotificationSender, validateWebhookUrl, } from './push-notifications.js';
|
|
11
|
+
export type { TaskManagerConfig, ExecuteTaskOptions } from './task-manager.js';
|
|
12
|
+
export { InMemoryPushNotificationStore, PushNotificationSender, validateWebhookUrl, isPrivateAddress, } from './push-notifications.js';
|
|
12
13
|
export { parseJsonRpcRequest, createSuccessResponse, createErrorResponse, isValidRequest, JsonRpcParseError, } from './json-rpc.js';
|
|
13
14
|
export type { JsonRpcRequest, JsonRpcResponse, JsonRpcError } from './json-rpc.js';
|
|
14
|
-
export { taskNotFound, taskNotCancelable, taskNotContinuable, pushNotificationsNotSupported, pushNotificationsNotConfigured, unsupportedOperation, contentTypeNotSupported, invalidAgentResponse, agentNotFound, parseError, invalidRequest, methodNotFound, invalidParams, internalError, A2AError, } from './errors.js';
|
|
15
|
-
export { TERMINAL_STATES, isTerminalState } from './types.js';
|
|
15
|
+
export { taskNotFound, taskNotCancelable, taskNotContinuable, pushNotificationsNotSupported, pushNotificationsNotConfigured, unsupportedOperation, contentTypeNotSupported, invalidAgentResponse, agentNotFound, unauthorized, parseError, invalidRequest, methodNotFound, invalidParams, internalError, A2AError, } from './errors.js';
|
|
16
|
+
export { TERMINAL_STATES, isTerminalState, isStreamFinalState } from './types.js';
|
|
16
17
|
export type { TaskState, TextPart, FilePart, DataPart, Part, A2AMessage, Artifact, A2AErrorDetail, TaskStatus, A2ATask, AgentProvider, A2ACapabilities, AgentSkill, SecurityScheme, AgentCard, ExtendedAgentCard, SendMessageConfiguration, TaskFilter, TaskStore, TaskStatusUpdateEvent, TaskArtifactUpdateEvent, TokenStreamEvent, A2AStreamEvent, AgentRunResult, CogitatorLike, A2AAuthConfig, A2AServerConfig, A2AClientConfig, PushNotificationConfig, PushNotificationStore, } from './types.js';
|
|
17
18
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEpF,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAC7F,YAAY,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAEjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,YAAY,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,YAAY,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAEnF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,YAAY,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAE/E,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACtB,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,mBAAmB,EACnB,cAAc,EACd,iBAAiB,GAClB,MAAM,eAAe,CAAC;AACvB,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAEnF,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,6BAA6B,EAC7B,8BAA8B,EAC9B,oBAAoB,EACpB,uBAAuB,EACvB,oBAAoB,EACpB,aAAa,EACb,YAAY,EACZ,UAAU,EACV,cAAc,EACd,cAAc,EACd,aAAa,EACb,aAAa,EACb,QAAQ,GACT,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAClF,YAAY,EACV,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,cAAc,EACd,UAAU,EACV,OAAO,EACP,aAAa,EACb,eAAe,EACf,UAAU,EACV,cAAc,EACd,SAAS,EACT,iBAAiB,EACjB,wBAAwB,EACxB,UAAU,EACV,SAAS,EACT,qBAAqB,EACrB,uBAAuB,EACvB,gBAAgB,EAChB,cAAc,EACd,cAAc,EACd,aAAa,EACb,aAAa,EACb,eAAe,EACf,eAAe,EACf,sBAAsB,EACtB,qBAAqB,GACtB,MAAM,YAAY,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -4,8 +4,8 @@ export { generateAgentCard, signAgentCard, verifyAgentCardSignature } from './ag
|
|
|
4
4
|
export { InMemoryTaskStore } from './task-store.js';
|
|
5
5
|
export { RedisTaskStore } from './redis-task-store.js';
|
|
6
6
|
export { TaskManager } from './task-manager.js';
|
|
7
|
-
export { InMemoryPushNotificationStore, PushNotificationSender, validateWebhookUrl, } from './push-notifications.js';
|
|
7
|
+
export { InMemoryPushNotificationStore, PushNotificationSender, validateWebhookUrl, isPrivateAddress, } from './push-notifications.js';
|
|
8
8
|
export { parseJsonRpcRequest, createSuccessResponse, createErrorResponse, isValidRequest, JsonRpcParseError, } from './json-rpc.js';
|
|
9
|
-
export { taskNotFound, taskNotCancelable, taskNotContinuable, pushNotificationsNotSupported, pushNotificationsNotConfigured, unsupportedOperation, contentTypeNotSupported, invalidAgentResponse, agentNotFound, parseError, invalidRequest, methodNotFound, invalidParams, internalError, A2AError, } from './errors.js';
|
|
10
|
-
export { TERMINAL_STATES, isTerminalState } from './types.js';
|
|
9
|
+
export { taskNotFound, taskNotCancelable, taskNotContinuable, pushNotificationsNotSupported, pushNotificationsNotConfigured, unsupportedOperation, contentTypeNotSupported, invalidAgentResponse, agentNotFound, unauthorized, parseError, invalidRequest, methodNotFound, invalidParams, internalError, A2AError, } from './errors.js';
|
|
10
|
+
export { TERMINAL_STATES, isTerminalState, isStreamFinalState } from './types.js';
|
|
11
11
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAG7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAG7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAGpD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACtB,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,mBAAmB,EACnB,qBAAqB,EACrB,mBAAmB,EACnB,cAAc,EACd,iBAAiB,GAClB,MAAM,eAAe,CAAC;AAGvB,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,kBAAkB,EAClB,6BAA6B,EAC7B,8BAA8B,EAC9B,oBAAoB,EACpB,uBAAuB,EACvB,oBAAoB,EACpB,aAAa,EACb,YAAY,EACZ,UAAU,EACV,cAAc,EACd,cAAc,EACd,aAAa,EACb,aAAa,EACb,QAAQ,GACT,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC"}
|
package/dist/json-rpc.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ export interface JsonRpcRequest {
|
|
|
2
2
|
jsonrpc: '2.0';
|
|
3
3
|
method: string;
|
|
4
4
|
params?: unknown;
|
|
5
|
-
id
|
|
5
|
+
id?: string | number | null;
|
|
6
6
|
}
|
|
7
7
|
export interface JsonRpcResponse {
|
|
8
8
|
jsonrpc: '2.0';
|
|
@@ -21,6 +21,6 @@ export declare class JsonRpcParseError extends Error {
|
|
|
21
21
|
}
|
|
22
22
|
export declare function isValidRequest(req: unknown): req is JsonRpcRequest;
|
|
23
23
|
export declare function parseJsonRpcRequest(body: unknown): JsonRpcRequest | JsonRpcRequest[];
|
|
24
|
-
export declare function createSuccessResponse(id: string | number, result: unknown): JsonRpcResponse;
|
|
24
|
+
export declare function createSuccessResponse(id: string | number | null, result: unknown): JsonRpcResponse;
|
|
25
25
|
export declare function createErrorResponse(id: string | number | null, error: JsonRpcError): JsonRpcResponse;
|
|
26
26
|
//# sourceMappingURL=json-rpc.d.ts.map
|
package/dist/json-rpc.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-rpc.d.ts","sourceRoot":"","sources":["../src/json-rpc.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,KAAK,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"json-rpc.d.ts","sourceRoot":"","sources":["../src/json-rpc.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,KAAK,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,KAAK,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,qBAAa,iBAAkB,SAAQ,KAAK;aAGxB,IAAI,EAAE,MAAM;gBAD5B,OAAO,EAAE,MAAM,EACC,IAAI,GAAE,MAAe;CAKxC;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,cAAc,CAalE;AAID,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,OAAO,GAAG,cAAc,GAAG,cAAc,EAAE,CA2BpF;AAED,wBAAgB,qBAAqB,CACnC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,EAC1B,MAAM,EAAE,OAAO,GACd,eAAe,CAEjB;AAED,wBAAgB,mBAAmB,CACjC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,EAC1B,KAAK,EAAE,YAAY,GAClB,eAAe,CAEjB"}
|
package/dist/json-rpc.js
CHANGED
|
@@ -11,27 +11,31 @@ export function isValidRequest(req) {
|
|
|
11
11
|
return false;
|
|
12
12
|
}
|
|
13
13
|
const obj = req;
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
if (obj.jsonrpc !== '2.0' || typeof obj.method !== 'string') {
|
|
15
|
+
return false;
|
|
16
|
+
}
|
|
17
|
+
if (obj.id === undefined || obj.id === null)
|
|
18
|
+
return true;
|
|
19
|
+
return typeof obj.id === 'string' || typeof obj.id === 'number';
|
|
17
20
|
}
|
|
21
|
+
const INVALID_REQUEST_CODE = -32600;
|
|
18
22
|
export function parseJsonRpcRequest(body) {
|
|
19
23
|
if (body === null || body === undefined || typeof body !== 'object') {
|
|
20
|
-
throw new JsonRpcParseError('Invalid JSON-RPC request: expected object or array');
|
|
24
|
+
throw new JsonRpcParseError('Invalid JSON-RPC request: expected object or array', INVALID_REQUEST_CODE);
|
|
21
25
|
}
|
|
22
26
|
if (Array.isArray(body)) {
|
|
23
27
|
if (body.length === 0) {
|
|
24
|
-
throw new JsonRpcParseError('Invalid JSON-RPC batch: empty array');
|
|
28
|
+
throw new JsonRpcParseError('Invalid JSON-RPC batch: empty array', INVALID_REQUEST_CODE);
|
|
25
29
|
}
|
|
26
30
|
for (const item of body) {
|
|
27
31
|
if (!isValidRequest(item)) {
|
|
28
|
-
throw new JsonRpcParseError('Invalid JSON-RPC request in batch');
|
|
32
|
+
throw new JsonRpcParseError('Invalid JSON-RPC request in batch', INVALID_REQUEST_CODE);
|
|
29
33
|
}
|
|
30
34
|
}
|
|
31
35
|
return body;
|
|
32
36
|
}
|
|
33
37
|
if (!isValidRequest(body)) {
|
|
34
|
-
throw new JsonRpcParseError('Invalid JSON-RPC request structure');
|
|
38
|
+
throw new JsonRpcParseError('Invalid JSON-RPC request structure', INVALID_REQUEST_CODE);
|
|
35
39
|
}
|
|
36
40
|
return body;
|
|
37
41
|
}
|
package/dist/json-rpc.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-rpc.js","sourceRoot":"","sources":["../src/json-rpc.ts"],"names":[],"mappings":"AAoBA,MAAM,OAAO,iBAAkB,SAAQ,KAAK;IAGxB;IAFlB,YACE,OAAe,EACC,OAAe,CAAC,KAAK;QAErC,KAAK,CAAC,OAAO,CAAC,CAAC;QAFC,SAAI,GAAJ,IAAI,CAAiB;QAGrC,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AAED,MAAM,UAAU,cAAc,CAAC,GAAY;IACzC,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAClE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,GAAG,GAAG,GAA8B,CAAC;IAE3C,
|
|
1
|
+
{"version":3,"file":"json-rpc.js","sourceRoot":"","sources":["../src/json-rpc.ts"],"names":[],"mappings":"AAoBA,MAAM,OAAO,iBAAkB,SAAQ,KAAK;IAGxB;IAFlB,YACE,OAAe,EACC,OAAe,CAAC,KAAK;QAErC,KAAK,CAAC,OAAO,CAAC,CAAC;QAFC,SAAI,GAAJ,IAAI,CAAiB;QAGrC,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CACF;AAED,MAAM,UAAU,cAAc,CAAC,GAAY;IACzC,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAClE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,GAAG,GAAG,GAA8B,CAAC;IAE3C,IAAI,GAAG,CAAC,OAAO,KAAK,KAAK,IAAI,OAAO,GAAG,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC5D,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,GAAG,CAAC,EAAE,KAAK,SAAS,IAAI,GAAG,CAAC,EAAE,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACzD,OAAO,OAAO,GAAG,CAAC,EAAE,KAAK,QAAQ,IAAI,OAAO,GAAG,CAAC,EAAE,KAAK,QAAQ,CAAC;AAClE,CAAC;AAED,MAAM,oBAAoB,GAAG,CAAC,KAAK,CAAC;AAEpC,MAAM,UAAU,mBAAmB,CAAC,IAAa;IAC/C,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,SAAS,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QACpE,MAAM,IAAI,iBAAiB,CACzB,oDAAoD,EACpD,oBAAoB,CACrB,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,MAAM,IAAI,iBAAiB,CAAC,qCAAqC,EAAE,oBAAoB,CAAC,CAAC;QAC3F,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;YACxB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC1B,MAAM,IAAI,iBAAiB,CAAC,mCAAmC,EAAE,oBAAoB,CAAC,CAAC;YACzF,CAAC;QACH,CAAC;QAED,OAAO,IAAwB,CAAC;IAClC,CAAC;IAED,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,iBAAiB,CAAC,oCAAoC,EAAE,oBAAoB,CAAC,CAAC;IAC1F,CAAC;IAED,OAAO,IAAsB,CAAC;AAChC,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,EAA0B,EAC1B,MAAe;IAEf,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;AACxC,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,EAA0B,EAC1B,KAAmB;IAEnB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;AACvC,CAAC"}
|
|
@@ -7,10 +7,17 @@ export declare class InMemoryPushNotificationStore implements PushNotificationSt
|
|
|
7
7
|
delete(taskId: string, configId: string): Promise<void>;
|
|
8
8
|
cleanup(taskId: string): void;
|
|
9
9
|
}
|
|
10
|
+
/**
|
|
11
|
+
* Whether an IP address belongs to a loopback, private, link-local, CGNAT,
|
|
12
|
+
* multicast, documentation or otherwise non-public range (IPv4, IPv6 and
|
|
13
|
+
* IPv4-mapped/translated IPv6).
|
|
14
|
+
*/
|
|
15
|
+
export declare function isPrivateAddress(address: string): boolean;
|
|
10
16
|
export declare function validateWebhookUrl(url: string): void;
|
|
11
17
|
export declare class PushNotificationSender {
|
|
12
18
|
private store;
|
|
13
|
-
|
|
19
|
+
private allowPrivateUrls;
|
|
20
|
+
constructor(store: PushNotificationStore, allowPrivateUrls?: boolean);
|
|
14
21
|
notify(taskId: string, event: A2AStreamEvent): Promise<void>;
|
|
15
22
|
private sendWebhook;
|
|
16
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push-notifications.d.ts","sourceRoot":"","sources":["../src/push-notifications.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"push-notifications.d.ts","sourceRoot":"","sources":["../src/push-notifications.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEhG,qBAAa,6BAA8B,YAAW,qBAAqB;IACzE,OAAO,CAAC,OAAO,CAA0D;IAEnE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,sBAAsB,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAQvF,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,GAAG,IAAI,CAAC;IAI7E,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAKvD,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7D,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAG9B;AA8FD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAKzD;AA0BD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAIpD;AA+DD,qBAAa,sBAAsB;IACjC,OAAO,CAAC,KAAK,CAAwB;IACrC,OAAO,CAAC,gBAAgB,CAAU;gBAEtB,KAAK,EAAE,qBAAqB,EAAE,gBAAgB,UAAQ;IAK5D,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;YAcpD,WAAW;CA+B1B"}
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { lookup as dnsLookup } from 'node:dns';
|
|
3
|
+
import { request as httpRequest } from 'node:http';
|
|
4
|
+
import { request as httpsRequest } from 'node:https';
|
|
5
|
+
import { isIP } from 'node:net';
|
|
2
6
|
export class InMemoryPushNotificationStore {
|
|
3
7
|
configs = new Map();
|
|
4
8
|
async create(taskId, config) {
|
|
@@ -23,6 +27,116 @@ export class InMemoryPushNotificationStore {
|
|
|
23
27
|
this.configs.delete(taskId);
|
|
24
28
|
}
|
|
25
29
|
}
|
|
30
|
+
const IPV4_BLOCKED_CIDRS = [
|
|
31
|
+
['0.0.0.0', 8],
|
|
32
|
+
['10.0.0.0', 8],
|
|
33
|
+
['100.64.0.0', 10],
|
|
34
|
+
['127.0.0.0', 8],
|
|
35
|
+
['169.254.0.0', 16],
|
|
36
|
+
['172.16.0.0', 12],
|
|
37
|
+
['192.0.0.0', 24],
|
|
38
|
+
['192.0.2.0', 24],
|
|
39
|
+
['192.168.0.0', 16],
|
|
40
|
+
['198.18.0.0', 15],
|
|
41
|
+
['198.51.100.0', 24],
|
|
42
|
+
['203.0.113.0', 24],
|
|
43
|
+
['224.0.0.0', 4],
|
|
44
|
+
['240.0.0.0', 4],
|
|
45
|
+
];
|
|
46
|
+
const WEBHOOK_TIMEOUT_MS = 10_000;
|
|
47
|
+
function describeError(reason) {
|
|
48
|
+
if (reason instanceof Error) {
|
|
49
|
+
const code = reason.code;
|
|
50
|
+
return reason.message || code || reason.name;
|
|
51
|
+
}
|
|
52
|
+
return String(reason);
|
|
53
|
+
}
|
|
54
|
+
function ipv4ToNumber(ip) {
|
|
55
|
+
return ip.split('.').reduce((acc, octet) => acc * 256 + Number(octet), 0);
|
|
56
|
+
}
|
|
57
|
+
function isBlockedIpv4(ip) {
|
|
58
|
+
const value = ipv4ToNumber(ip);
|
|
59
|
+
return IPV4_BLOCKED_CIDRS.some(([base, bits]) => {
|
|
60
|
+
const size = 2 ** (32 - bits);
|
|
61
|
+
const start = ipv4ToNumber(base);
|
|
62
|
+
return value >= start && value < start + size;
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
function expandIpv6(ip) {
|
|
66
|
+
let address = ip.toLowerCase();
|
|
67
|
+
const zoneIndex = address.indexOf('%');
|
|
68
|
+
if (zoneIndex !== -1)
|
|
69
|
+
address = address.slice(0, zoneIndex);
|
|
70
|
+
const lastColon = address.lastIndexOf(':');
|
|
71
|
+
const tail = address.slice(lastColon + 1);
|
|
72
|
+
if (tail.includes('.')) {
|
|
73
|
+
if (isIP(tail) !== 4)
|
|
74
|
+
return null;
|
|
75
|
+
const v4 = ipv4ToNumber(tail);
|
|
76
|
+
address = `${address.slice(0, lastColon + 1)}${(v4 >>> 16).toString(16)}:${(v4 & 0xffff).toString(16)}`;
|
|
77
|
+
}
|
|
78
|
+
const halves = address.split('::');
|
|
79
|
+
if (halves.length > 2)
|
|
80
|
+
return null;
|
|
81
|
+
const head = halves[0] ? halves[0].split(':') : [];
|
|
82
|
+
const rest = halves.length === 2 && halves[1] ? halves[1].split(':') : [];
|
|
83
|
+
const missing = 8 - head.length - rest.length;
|
|
84
|
+
if (missing < 0 || (halves.length === 1 && missing !== 0))
|
|
85
|
+
return null;
|
|
86
|
+
const groups = [...head, ...Array(halves.length === 2 ? missing : 0).fill('0'), ...rest];
|
|
87
|
+
const parsed = groups.map((group) => parseInt(group, 16));
|
|
88
|
+
return parsed.length === 8 && parsed.every((g) => Number.isInteger(g) && g >= 0 && g <= 0xffff)
|
|
89
|
+
? parsed
|
|
90
|
+
: null;
|
|
91
|
+
}
|
|
92
|
+
function isBlockedIpv6(ip) {
|
|
93
|
+
const groups = expandIpv6(ip);
|
|
94
|
+
if (!groups)
|
|
95
|
+
return true;
|
|
96
|
+
const embeddedV4 = () => `${groups[6] >> 8}.${groups[6] & 0xff}.${groups[7] >> 8}.${groups[7] & 0xff}`;
|
|
97
|
+
if (groups.every((g) => g === 0))
|
|
98
|
+
return true;
|
|
99
|
+
if (groups.slice(0, 7).every((g) => g === 0) && groups[7] === 1)
|
|
100
|
+
return true;
|
|
101
|
+
if (groups.slice(0, 5).every((g) => g === 0) && groups[5] === 0xffff) {
|
|
102
|
+
return isBlockedIpv4(embeddedV4());
|
|
103
|
+
}
|
|
104
|
+
if (groups.slice(0, 6).every((g) => g === 0)) {
|
|
105
|
+
return isBlockedIpv4(embeddedV4());
|
|
106
|
+
}
|
|
107
|
+
if (groups[0] === 0x64 && groups[1] === 0xff9b && groups.slice(2, 6).every((g) => g === 0)) {
|
|
108
|
+
return isBlockedIpv4(embeddedV4());
|
|
109
|
+
}
|
|
110
|
+
if ((groups[0] & 0xfe00) === 0xfc00)
|
|
111
|
+
return true;
|
|
112
|
+
if ((groups[0] & 0xffc0) === 0xfe80)
|
|
113
|
+
return true;
|
|
114
|
+
if ((groups[0] & 0xff00) === 0xff00)
|
|
115
|
+
return true;
|
|
116
|
+
if (groups[0] === 0x2001 && groups[1] === 0x0db8)
|
|
117
|
+
return true;
|
|
118
|
+
return false;
|
|
119
|
+
}
|
|
120
|
+
/**
|
|
121
|
+
* Whether an IP address belongs to a loopback, private, link-local, CGNAT,
|
|
122
|
+
* multicast, documentation or otherwise non-public range (IPv4, IPv6 and
|
|
123
|
+
* IPv4-mapped/translated IPv6).
|
|
124
|
+
*/
|
|
125
|
+
export function isPrivateAddress(address) {
|
|
126
|
+
const version = isIP(address);
|
|
127
|
+
if (version === 4)
|
|
128
|
+
return isBlockedIpv4(address);
|
|
129
|
+
if (version === 6)
|
|
130
|
+
return isBlockedIpv6(address);
|
|
131
|
+
return true;
|
|
132
|
+
}
|
|
133
|
+
function isPrivateHostname(hostname) {
|
|
134
|
+
const host = hostname.toLowerCase().replace(/\.$/, '');
|
|
135
|
+
return (host === 'localhost' ||
|
|
136
|
+
host.endsWith('.localhost') ||
|
|
137
|
+
host.endsWith('.local') ||
|
|
138
|
+
host.endsWith('.internal'));
|
|
139
|
+
}
|
|
26
140
|
function isPrivateUrl(urlStr) {
|
|
27
141
|
let parsed;
|
|
28
142
|
try {
|
|
@@ -33,49 +147,93 @@ function isPrivateUrl(urlStr) {
|
|
|
33
147
|
}
|
|
34
148
|
if (!['http:', 'https:'].includes(parsed.protocol))
|
|
35
149
|
return true;
|
|
36
|
-
const hostname = parsed.hostname;
|
|
37
|
-
if (hostname
|
|
38
|
-
return true;
|
|
39
|
-
if (hostname === '[::1]')
|
|
40
|
-
return true;
|
|
41
|
-
if (hostname.startsWith('169.254.'))
|
|
42
|
-
return true;
|
|
43
|
-
if (hostname.startsWith('10.'))
|
|
44
|
-
return true;
|
|
45
|
-
if (hostname.startsWith('192.168.'))
|
|
150
|
+
const hostname = parsed.hostname.replace(/^\[|\]$/g, '');
|
|
151
|
+
if (!hostname)
|
|
46
152
|
return true;
|
|
47
|
-
if (
|
|
48
|
-
return
|
|
49
|
-
|
|
50
|
-
return true;
|
|
51
|
-
return false;
|
|
153
|
+
if (isIP(hostname))
|
|
154
|
+
return isPrivateAddress(hostname);
|
|
155
|
+
return isPrivateHostname(hostname);
|
|
52
156
|
}
|
|
53
157
|
export function validateWebhookUrl(url) {
|
|
54
158
|
if (isPrivateUrl(url)) {
|
|
55
159
|
throw new Error(`Webhook URL rejected: private/internal address not allowed: ${url}`);
|
|
56
160
|
}
|
|
57
161
|
}
|
|
162
|
+
/**
|
|
163
|
+
* DNS lookup that refuses to connect to private addresses. Used as the socket
|
|
164
|
+
* lookup for webhook requests so the check applies to the address actually
|
|
165
|
+
* connected to (no DNS-rebinding window between validation and connect).
|
|
166
|
+
*/
|
|
167
|
+
const publicOnlyLookup = (hostname, options, callback) => {
|
|
168
|
+
dnsLookup(hostname, { ...options, all: true }, (err, addresses) => {
|
|
169
|
+
if (err) {
|
|
170
|
+
callback(err, '');
|
|
171
|
+
return;
|
|
172
|
+
}
|
|
173
|
+
const blocked = addresses.find((entry) => isPrivateAddress(entry.address));
|
|
174
|
+
if (blocked || addresses.length === 0) {
|
|
175
|
+
const error = new Error(`Webhook host ${hostname} resolves to a private/internal address${blocked ? ` (${blocked.address})` : ''}`);
|
|
176
|
+
error.code = 'ERR_A2A_PRIVATE_ADDRESS';
|
|
177
|
+
callback(error, '');
|
|
178
|
+
return;
|
|
179
|
+
}
|
|
180
|
+
if (options.all) {
|
|
181
|
+
callback(null, addresses);
|
|
182
|
+
}
|
|
183
|
+
else {
|
|
184
|
+
callback(null, addresses[0].address, addresses[0].family);
|
|
185
|
+
}
|
|
186
|
+
});
|
|
187
|
+
};
|
|
188
|
+
function postJson(url, headers, body, lookup) {
|
|
189
|
+
const request = url.protocol === 'https:' ? httpsRequest : httpRequest;
|
|
190
|
+
return new Promise((resolve, reject) => {
|
|
191
|
+
const req = request(url, {
|
|
192
|
+
method: 'POST',
|
|
193
|
+
headers: { ...headers, 'Content-Length': String(Buffer.byteLength(body)) },
|
|
194
|
+
lookup,
|
|
195
|
+
timeout: WEBHOOK_TIMEOUT_MS,
|
|
196
|
+
}, (res) => {
|
|
197
|
+
res.resume();
|
|
198
|
+
res.on('end', () => resolve(res.statusCode ?? 0));
|
|
199
|
+
res.on('error', reject);
|
|
200
|
+
});
|
|
201
|
+
const deadline = setTimeout(() => req.destroy(new Error(`Webhook timed out after ${WEBHOOK_TIMEOUT_MS}ms`)), WEBHOOK_TIMEOUT_MS);
|
|
202
|
+
req.on('close', () => clearTimeout(deadline));
|
|
203
|
+
req.on('timeout', () => req.destroy(new Error('Webhook socket timed out')));
|
|
204
|
+
req.on('error', reject);
|
|
205
|
+
req.end(body);
|
|
206
|
+
});
|
|
207
|
+
}
|
|
58
208
|
export class PushNotificationSender {
|
|
59
209
|
store;
|
|
60
|
-
|
|
210
|
+
allowPrivateUrls;
|
|
211
|
+
constructor(store, allowPrivateUrls = false) {
|
|
61
212
|
this.store = store;
|
|
213
|
+
this.allowPrivateUrls = allowPrivateUrls;
|
|
62
214
|
}
|
|
63
215
|
async notify(taskId, event) {
|
|
64
216
|
const configs = await this.store.list(taskId);
|
|
65
217
|
const results = await Promise.allSettled(configs.map((config) => this.sendWebhook(config, event)));
|
|
66
218
|
for (const result of results) {
|
|
67
219
|
if (result.status === 'rejected') {
|
|
68
|
-
process.stderr.write(`[a2a] Webhook delivery failed for task ${taskId}: ${result.reason}\n`);
|
|
220
|
+
process.stderr.write(`[a2a] Webhook delivery failed for task ${taskId}: ${describeError(result.reason)}\n`);
|
|
69
221
|
}
|
|
70
222
|
}
|
|
71
223
|
}
|
|
72
224
|
async sendWebhook(config, event) {
|
|
225
|
+
if (!this.allowPrivateUrls) {
|
|
226
|
+
validateWebhookUrl(config.webhookUrl);
|
|
227
|
+
}
|
|
73
228
|
const headers = { 'Content-Type': 'application/json' };
|
|
74
229
|
if (config.authenticationInfo) {
|
|
75
230
|
const { scheme, credentials } = config.authenticationInfo;
|
|
76
231
|
if (scheme === 'bearer' && credentials.token) {
|
|
77
232
|
headers.Authorization = `Bearer ${credentials.token}`;
|
|
78
233
|
}
|
|
234
|
+
else if (scheme === 'oauth2' && (credentials.accessToken ?? credentials.token)) {
|
|
235
|
+
headers.Authorization = `Bearer ${credentials.accessToken ?? credentials.token}`;
|
|
236
|
+
}
|
|
79
237
|
else if (scheme === 'apiKey' && credentials.key) {
|
|
80
238
|
headers[credentials.headerName ?? 'X-API-Key'] = credentials.key;
|
|
81
239
|
}
|
|
@@ -83,14 +241,9 @@ export class PushNotificationSender {
|
|
|
83
241
|
headers.Authorization = `Basic ${Buffer.from(`${credentials.username}:${credentials.password}`).toString('base64')}`;
|
|
84
242
|
}
|
|
85
243
|
}
|
|
86
|
-
const
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
body: JSON.stringify(event),
|
|
90
|
-
signal: AbortSignal.timeout(10000),
|
|
91
|
-
});
|
|
92
|
-
if (!response.ok) {
|
|
93
|
-
throw new Error(`Webhook returned HTTP ${response.status}`);
|
|
244
|
+
const status = await postJson(new URL(config.webhookUrl), headers, JSON.stringify(event), this.allowPrivateUrls ? undefined : publicOnlyLookup);
|
|
245
|
+
if (status < 200 || status >= 300) {
|
|
246
|
+
throw new Error(`Webhook returned HTTP ${status}`);
|
|
94
247
|
}
|
|
95
248
|
}
|
|
96
249
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"push-notifications.js","sourceRoot":"","sources":["../src/push-notifications.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"push-notifications.js","sourceRoot":"","sources":["../src/push-notifications.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ export interface RedisClientLike {
|
|
|
7
7
|
setex?(key: string, seconds: number, value: string): Promise<unknown>;
|
|
8
8
|
scan?(cursor: number | string, ...args: string[]): Promise<[string, string[]]>;
|
|
9
9
|
mget?(...keys: string[]): Promise<(string | null)[]>;
|
|
10
|
+
eval?(script: string, numKeys: number, ...args: string[]): Promise<unknown>;
|
|
10
11
|
}
|
|
11
12
|
export interface RedisTaskStoreConfig {
|
|
12
13
|
client: RedisClientLike;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis-task-store.d.ts","sourceRoot":"","sources":["../src/redis-task-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEjE,MAAM,WAAW,eAAe;IAC9B,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACzC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACnC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,KAAK,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACtE,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAC/E,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"redis-task-store.d.ts","sourceRoot":"","sources":["../src/redis-task-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEjE,MAAM,WAAW,eAAe;IAC9B,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACzC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAClD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACnC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,KAAK,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACtE,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAC/E,IAAI,CAAC,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;IACrD,IAAI,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC7E;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,eAAe,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAyCD,qBAAa,cAAe,YAAW,SAAS;IAC9C,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,GAAG,CAAC,CAAS;gBAET,MAAM,EAAE,oBAAoB;IASlC,MAAM,CAAC,IAAI,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAUpC,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAM5C,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAqB/D,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAoC7C,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAI7B,QAAQ;CAmBvB"}
|
package/dist/redis-task-store.js
CHANGED
|
@@ -1,3 +1,37 @@
|
|
|
1
|
+
const ATOMIC_UPDATE_SCRIPT = `
|
|
2
|
+
local key = KEYS[1]
|
|
3
|
+
local existing = redis.call('GET', key)
|
|
4
|
+
if not existing then return 0 end
|
|
5
|
+
local task = cjson.decode(existing)
|
|
6
|
+
local update = cjson.decode(ARGV[1])
|
|
7
|
+
for k, v in pairs(update) do task[k] = v end
|
|
8
|
+
local result = cjson.encode(task)
|
|
9
|
+
local ttl = tonumber(ARGV[2])
|
|
10
|
+
if ttl and ttl > 0 then
|
|
11
|
+
redis.call('SETEX', key, ttl, result)
|
|
12
|
+
else
|
|
13
|
+
redis.call('SET', key, result)
|
|
14
|
+
end
|
|
15
|
+
return 1
|
|
16
|
+
`;
|
|
17
|
+
const ARRAY_FIELDS = new Set(['history', 'artifacts', 'parts', 'referenceTaskIds']);
|
|
18
|
+
/**
|
|
19
|
+
* Redis' Lua cjson encodes empty tables as `{}`, so an atomic update turns
|
|
20
|
+
* empty arrays (e.g. `artifacts: []`) into objects. Known array fields are
|
|
21
|
+
* restored while parsing.
|
|
22
|
+
*/
|
|
23
|
+
function parseTask(data) {
|
|
24
|
+
return JSON.parse(data, (key, value) => {
|
|
25
|
+
if (ARRAY_FIELDS.has(key) &&
|
|
26
|
+
value !== null &&
|
|
27
|
+
typeof value === 'object' &&
|
|
28
|
+
!Array.isArray(value) &&
|
|
29
|
+
Object.keys(value).length === 0) {
|
|
30
|
+
return [];
|
|
31
|
+
}
|
|
32
|
+
return value;
|
|
33
|
+
});
|
|
34
|
+
}
|
|
1
35
|
export class RedisTaskStore {
|
|
2
36
|
client;
|
|
3
37
|
prefix;
|
|
@@ -24,14 +58,20 @@ export class RedisTaskStore {
|
|
|
24
58
|
const data = await this.client.get(this.prefix + taskId);
|
|
25
59
|
if (!data)
|
|
26
60
|
return null;
|
|
27
|
-
return
|
|
61
|
+
return parseTask(data);
|
|
28
62
|
}
|
|
29
63
|
async update(taskId, update) {
|
|
64
|
+
const key = this.prefix + taskId;
|
|
65
|
+
const updateJson = JSON.stringify(update);
|
|
66
|
+
const ttlArg = String(this.ttl ?? 0);
|
|
67
|
+
if (this.client.eval) {
|
|
68
|
+
await this.client.eval(ATOMIC_UPDATE_SCRIPT, 1, key, updateJson, ttlArg);
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
30
71
|
const existing = await this.get(taskId);
|
|
31
72
|
if (!existing)
|
|
32
73
|
return;
|
|
33
74
|
const updated = { ...existing, ...update };
|
|
34
|
-
const key = this.prefix + taskId;
|
|
35
75
|
const json = JSON.stringify(updated);
|
|
36
76
|
if (this.ttl && this.client.setex) {
|
|
37
77
|
await this.client.setex(key, this.ttl, json);
|
|
@@ -49,14 +89,14 @@ export class RedisTaskStore {
|
|
|
49
89
|
const values = await this.client.mget(...keys);
|
|
50
90
|
for (const data of values) {
|
|
51
91
|
if (data)
|
|
52
|
-
tasks.push(
|
|
92
|
+
tasks.push(parseTask(data));
|
|
53
93
|
}
|
|
54
94
|
}
|
|
55
95
|
else {
|
|
56
96
|
const results = await Promise.all(keys.map((key) => this.client.get(key)));
|
|
57
97
|
for (const data of results) {
|
|
58
98
|
if (data)
|
|
59
|
-
tasks.push(
|
|
99
|
+
tasks.push(parseTask(data));
|
|
60
100
|
}
|
|
61
101
|
}
|
|
62
102
|
let filtered = tasks;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redis-task-store.js","sourceRoot":"","sources":["../src/redis-task-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"redis-task-store.js","sourceRoot":"","sources":["../src/redis-task-store.ts"],"names":[],"mappings":"AAmBA,MAAM,oBAAoB,GAAG;;;;;;;;;;;;;;;CAe5B,CAAC;AAEF,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,kBAAkB,CAAC,CAAC,CAAC;AAEpF;;;;GAIG;AACH,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,KAAc,EAAE,EAAE;QAC9C,IACE,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC;YACrB,KAAK,KAAK,IAAI;YACd,OAAO,KAAK,KAAK,QAAQ;YACzB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAC/B,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAY,CAAC;AAChB,CAAC;AAED,MAAM,OAAO,cAAc;IACjB,MAAM,CAAkB;IACxB,MAAM,CAAS;IACf,GAAG,CAAU;IAErB,YAAY,MAA4B;QACtC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,IAAI,WAAW,CAAC;QAC9C,IAAI,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;QACtB,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAa;QACxB,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,MAAc;QACtB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;QACzD,IAAI,CAAC,IAAI;YAAE,OAAO,IAAI,CAAC;QACvB,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,MAAc,EAAE,MAAwB;QACnD,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACjC,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QAErC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACrB,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;YACzE,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,CAAC,QAAQ;YAAE,OAAO;QACtB,MAAM,OAAO,GAAG,EAAE,GAAG,QAAQ,EAAE,GAAG,MAAM,EAAE,CAAC;QAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QACrC,IAAI,IAAI,CAAC,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAmB;QAC5B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC;QACpD,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAEjC,MAAM,KAAK,GAAc,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACrB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;YAC/C,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;gBAC1B,IAAI,IAAI;oBAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAC3E,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;gBAC3B,IAAI,IAAI;oBAAE,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;QAED,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,MAAM,EAAE,SAAS,EAAE,CAAC;YACtB,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC;QACtE,CAAC;QACD,IAAI,MAAM,EAAE,KAAK,EAAE,CAAC;YAClB,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC;QACrE,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACrB,MAAM,EAAE,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC;YAClD,MAAM,EAAE,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC;YAClD,OAAO,EAAE,GAAG,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,EAAE,MAAM,IAAI,CAAC,CAAC;QACnC,MAAM,KAAK,GAAG,MAAM,EAAE,KAAK,IAAI,QAAQ,CAAC,MAAM,CAAC;QAC/C,OAAO,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,MAAc;QACzB,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IAC9C,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,OAAe;QACpC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACrB,MAAM,IAAI,GAAa,EAAE,CAAC;YAC1B,IAAI,MAAM,GAAoB,CAAC,CAAC;YAChC,GAAG,CAAC;gBACF,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAChD,MAAM,EACN,OAAO,EACP,OAAO,EACP,OAAO,EACP,KAAK,CACN,CAAC;gBACF,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;gBACpB,MAAM,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;YAClF,CAAC,QAAQ,MAAM,KAAK,CAAC,EAAE;YACvB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;CACF"}
|