@a2a-js/sdk 0.3.3 → 0.3.5

package/dist/server/index.js

@@ -1,7 +1,7 @@
 import {
   A2AError,
   JsonRpcTransportHandler
-} from "../chunk-JA52GYRU.js";
+} from "../chunk-SY3G7ITG.js";
 
 // src/server/agent_execution/request_context.ts
 var RequestContext = class {
@@ -257,6 +257,109 @@ var ResultManager = class {
   }
 };
 
+// src/server/push_notification/push_notification_store.ts
+var InMemoryPushNotificationStore = class {
+  store = /* @__PURE__ */ new Map();
+  async save(taskId, pushNotificationConfig) {
+    const configs = this.store.get(taskId) || [];
+    if (!pushNotificationConfig.id) {
+      pushNotificationConfig.id = taskId;
+    }
+    const existingIndex = configs.findIndex((config) => config.id === pushNotificationConfig.id);
+    if (existingIndex !== -1) {
+      configs.splice(existingIndex, 1);
+    }
+    configs.push(pushNotificationConfig);
+    this.store.set(taskId, configs);
+  }
+  async load(taskId) {
+    const configs = this.store.get(taskId);
+    return configs || [];
+  }
+  async delete(taskId, configId) {
+    if (configId === void 0) {
+      configId = taskId;
+    }
+    const configs = this.store.get(taskId);
+    if (!configs) {
+      return;
+    }
+    const configIndex = configs.findIndex((config) => config.id === configId);
+    if (configIndex !== -1) {
+      configs.splice(configIndex, 1);
+    }
+    if (configs.length === 0) {
+      this.store.delete(taskId);
+    } else {
+      this.store.set(taskId, configs);
+    }
+  }
+};
+
+// src/server/push_notification/default_push_notification_sender.ts
+var DefaultPushNotificationSender = class {
+  pushNotificationStore;
+  notificationChain;
+  options;
+  constructor(pushNotificationStore, options = {}) {
+    this.pushNotificationStore = pushNotificationStore;
+    this.notificationChain = /* @__PURE__ */ new Map();
+    this.options = {
+      timeout: 5e3,
+      tokenHeaderName: "X-A2A-Notification-Token",
+      ...options
+    };
+  }
+  async send(task) {
+    const pushConfigs = await this.pushNotificationStore.load(task.id);
+    if (!pushConfigs || pushConfigs.length === 0) {
+      return;
+    }
+    const lastPromise = this.notificationChain.get(task.id) ?? Promise.resolve();
+    const newPromise = lastPromise.then(async () => {
+      const dispatches = pushConfigs.map(async (pushConfig) => {
+        try {
+          await this._dispatchNotification(task, pushConfig);
+        } catch (error) {
+          console.error(`Error sending push notification for task_id=${task.id} to URL: ${pushConfig.url}. Error:`, error);
+        }
+      });
+      await Promise.all(dispatches);
+    });
+    this.notificationChain.set(task.id, newPromise);
+    newPromise.finally(() => {
+      if (this.notificationChain.get(task.id) === newPromise) {
+        this.notificationChain.delete(task.id);
+      }
+    });
+  }
+  async _dispatchNotification(task, pushConfig) {
+    const url = pushConfig.url;
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), this.options.timeout);
+    try {
+      const headers = {
+        "Content-Type": "application/json"
+      };
+      if (pushConfig.token) {
+        headers[this.options.tokenHeaderName] = pushConfig.token;
+      }
+      const response = await fetch(url, {
+        method: "POST",
+        headers,
+        body: JSON.stringify(task),
+        signal: controller.signal
+      });
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+      }
+      console.info(`Push notification sent for task_id=${task.id} to URL: ${url}`);
+    } finally {
+      clearTimeout(timeoutId);
+    }
+  }
+};
+
 // src/server/request_handler/default_request_handler.ts
 var terminalStates = ["completed", "failed", "canceled", "rejected"];
 var DefaultRequestHandler = class {
@@ -265,14 +368,18 @@ var DefaultRequestHandler = class {
   taskStore;
   agentExecutor;
   eventBusManager;
-  // Store for push notification configurations (could be part of TaskStore or separate)
-  pushNotificationConfigs = /* @__PURE__ */ new Map();
-  constructor(agentCard, taskStore, agentExecutor, eventBusManager = new DefaultExecutionEventBusManager(), extendedAgentCard) {
+  pushNotificationStore;
+  pushNotificationSender;
+  constructor(agentCard, taskStore, agentExecutor, eventBusManager = new DefaultExecutionEventBusManager(), pushNotificationStore, pushNotificationSender, extendedAgentCard) {
     this.agentCard = agentCard;
     this.taskStore = taskStore;
     this.agentExecutor = agentExecutor;
     this.eventBusManager = eventBusManager;
     this.extendedAgentCard = extendedAgentCard;
+    if (agentCard.capabilities.pushNotifications) {
+      this.pushNotificationStore = pushNotificationStore || new InMemoryPushNotificationStore();
+      this.pushNotificationSender = pushNotificationSender || new DefaultPushNotificationSender(this.pushNotificationStore);
+    }
   }
   async getAgentCard() {
     return this.agentCard;
@@ -294,6 +401,8 @@ var DefaultRequestHandler = class {
       if (terminalStates.includes(task.status.state)) {
         throw A2AError.invalidRequest(`Task ${task.id} is in a terminal state (${task.status.state}) and cannot be modified.`);
       }
+      task.history = [...task.history || [], incomingMessage];
+      await this.taskStore.save(task);
     }
     if (incomingMessage.referenceTaskIds && incomingMessage.referenceTaskIds.length > 0) {
       referenceTasks = [];
@@ -324,9 +433,16 @@ var DefaultRequestHandler = class {
     try {
       for await (const event of eventQueue.events()) {
         await resultManager.processEvent(event);
+        await this._sendPushNotificationIfNeeded(event);
         if (options?.firstResultResolver && !firstResultSent) {
-          if (event.kind === "message" || event.kind === "task") {
-            options.firstResultResolver(event);
+          let firstResult;
+          if (event.kind === "message") {
+            firstResult = event;
+          } else {
+            firstResult = resultManager.getCurrentTask();
+          }
+          if (firstResult) {
+            options.firstResultResolver(firstResult);
             firstResultSent = true;
           }
         }
@@ -355,6 +471,9 @@ var DefaultRequestHandler = class {
     resultManager.setContext(incomingMessage);
     const requestContext = await this._createRequestContext(incomingMessage, taskId, false);
     const finalMessageForAgent = requestContext.userMessage;
+    if (params.configuration?.pushNotificationConfig && this.agentCard.capabilities.pushNotifications) {
+      await this.pushNotificationStore?.save(taskId, params.configuration.pushNotificationConfig);
+    }
     const eventBus = this.eventBusManager.createOrGetByTaskId(taskId);
     const eventQueue = new ExecutionEventQueue(eventBus);
     this.agentExecutor.execute(requestContext, eventBus).catch((err) => {
@@ -422,6 +541,9 @@ var DefaultRequestHandler = class {
     const finalMessageForAgent = requestContext.userMessage;
     const eventBus = this.eventBusManager.createOrGetByTaskId(taskId);
     const eventQueue = new ExecutionEventQueue(eventBus);
+    if (params.configuration?.pushNotificationConfig && this.agentCard.capabilities.pushNotifications) {
+      await this.pushNotificationStore?.save(taskId, params.configuration.pushNotificationConfig);
+    }
     this.agentExecutor.execute(requestContext, eventBus).catch((err) => {
       console.error(`Agent execution failed for stream message ${finalMessageForAgent.messageId}:`, err);
       const errorTaskStatus = {
@@ -449,6 +571,7 @@ var DefaultRequestHandler = class {
     try {
       for await (const event of eventQueue.events()) {
         await resultManager.processEvent(event);
+        await this._sendPushNotificationIfNeeded(event);
         yield event;
       }
     } finally {
@@ -480,7 +603,9 @@ var DefaultRequestHandler = class {
     }
     const eventBus = this.eventBusManager.getByTaskId(params.id);
     if (eventBus) {
+      const eventQueue = new ExecutionEventQueue(eventBus);
       await this.agentExecutor.cancelTask(params.id, eventBus);
+      await this._processEvents(params.id, new ResultManager(this.taskStore), eventQueue);
     } else {
       task.status = {
         state: "canceled",
@@ -499,6 +624,12 @@ var DefaultRequestHandler = class {
       await this.taskStore.save(task);
     }
     const latestTask = await this.taskStore.load(params.id);
+    if (!latestTask) {
+      throw A2AError.internalError(`Task ${params.id} not found after cancellation.`);
+    }
+    if (latestTask.status.state != "canceled") {
+      throw A2AError.taskNotCancelable(params.id);
+    }
     return latestTask;
   }
   async setTaskPushNotificationConfig(params) {
@@ -513,10 +644,7 @@ var DefaultRequestHandler = class {
     if (!pushNotificationConfig.id) {
       pushNotificationConfig.id = taskId;
     }
-    const configs = this.pushNotificationConfigs.get(taskId) || [];
-    const updatedConfigs = configs.filter((c) => c.id !== pushNotificationConfig.id);
-    updatedConfigs.push(pushNotificationConfig);
-    this.pushNotificationConfigs.set(taskId, updatedConfigs);
+    await this.pushNotificationStore?.save(taskId, pushNotificationConfig);
     return params;
   }
   async getTaskPushNotificationConfig(params) {
@@ -527,7 +655,7 @@ var DefaultRequestHandler = class {
     if (!task) {
       throw A2AError.taskNotFound(params.id);
     }
-    const configs = this.pushNotificationConfigs.get(params.id) || [];
+    const configs = await this.pushNotificationStore?.load(params.id) || [];
     if (configs.length === 0) {
       throw A2AError.internalError(`Push notification config not found for task ${params.id}.`);
     }
@@ -551,7 +679,7 @@ var DefaultRequestHandler = class {
     if (!task) {
       throw A2AError.taskNotFound(params.id);
     }
-    const configs = this.pushNotificationConfigs.get(params.id) || [];
+    const configs = await this.pushNotificationStore?.load(params.id) || [];
     return configs.map((config) => ({
       taskId: params.id,
       pushNotificationConfig: config
@@ -566,16 +694,7 @@ var DefaultRequestHandler = class {
       throw A2AError.taskNotFound(params.id);
     }
     const { id: taskId, pushNotificationConfigId } = params;
-    const configs = this.pushNotificationConfigs.get(taskId);
-    if (!configs) {
-      return;
-    }
-    const updatedConfigs = configs.filter((c) => c.id !== pushNotificationConfigId);
-    if (updatedConfigs.length === 0) {
-      this.pushNotificationConfigs.delete(taskId);
-    } else if (updatedConfigs.length < configs.length) {
-      this.pushNotificationConfigs.set(taskId, updatedConfigs);
-    }
+    await this.pushNotificationStore?.delete(taskId, pushNotificationConfigId);
   }
   async *resubscribe(params) {
     if (!this.agentCard.capabilities.streaming) {
@@ -610,6 +729,28 @@ var DefaultRequestHandler = class {
       eventQueue.stop();
     }
   }
+  async _sendPushNotificationIfNeeded(event) {
+    if (!this.agentCard.capabilities.pushNotifications) {
+      return;
+    }
+    let taskId = "";
+    if (event.kind == "task") {
+      const task2 = event;
+      taskId = task2.id;
+    } else {
+      taskId = event.taskId;
+    }
+    if (!taskId) {
+      console.error(`Task ID not found for event ${event.kind}.`);
+      return;
+    }
+    const task = await this.taskStore.load(taskId);
+    if (!task) {
+      console.error(`Task ${taskId} not found.`);
+      return;
+    }
+    this.pushNotificationSender?.send(task);
+  }
 };
 
 // src/server/store.ts
@@ -627,8 +768,10 @@ export {
   A2AError,
   DefaultExecutionEventBus,
   DefaultExecutionEventBusManager,
+  DefaultPushNotificationSender,
   DefaultRequestHandler,
   ExecutionEventQueue,
+  InMemoryPushNotificationStore,
   InMemoryTaskStore,
   JsonRpcTransportHandler,
   RequestContext,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@a2a-js/sdk",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "Server & Client SDK for Agent2Agent protocol",
   "repository": {
     "type": "git",
@@ -47,6 +47,7 @@
     "@types/mocha": "^10.0.10",
     "@types/node": "^22.13.14",
     "@types/sinon": "^17.0.4",
+    "@types/supertest": "^6.0.3",
     "c8": "^10.1.3",
     "chai": "^5.2.0",
     "express": "^5.1.0",
@@ -55,6 +56,7 @@
     "json-schema-to-typescript": "^15.0.4",
     "mocha": "^11.6.0",
     "sinon": "^20.0.0",
+    "supertest": "^7.1.4",
     "tsup": "^8.5.0",
     "tsx": "^4.19.3",
     "typescript": "^5.8.2"
@@ -66,8 +68,9 @@
     "test": "mocha test/**/*.spec.ts",
     "coverage": "c8 npm run test",
     "generate": "curl https://raw.githubusercontent.com/google-a2a/A2A/refs/heads/main/specification/json/a2a.json > spec.json && node scripts/generateTypes.js && rm spec.json",
-    "sample:cli": "tsx src/samples/cli.ts",
-    "sample:movie-agent": "tsx src/samples/agents/movie-agent/index.ts"
+    "a2a:cli": "tsx src/samples/cli.ts",
+    "agents:movie-agent": "tsx src/samples/agents/movie-agent/index.ts",
+    "agents:sample-agent": "tsx src/samples/agents/sample-agent/index.ts"
   },
   "dependencies": {
     "uuid": "^11.1.0"
@@ -83,4 +86,4 @@
   "mocha": {
     "require": "tsx"
   }
-}
+}