@artinet/sdk 0.5.3 → 0.5.5

package/dist/server/lib/express-server.js

@@ -1,7 +1,17 @@
 import cors from "cors";
 import express from "express";
+import { ServiceManager } from "../../services/manager.js";
+import { errorHandler } from "../../utils/common/errors.js";
+import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
+import { Protocol } from "../../types/services/protocol.js";
+import { v4 as uuidv4 } from "uuid";
+import util from "util";
+import { logError, logInfo } from "../../utils/logging/log.js";
+import { INVALID_REQUEST } from "../../utils/common/errors.js";
+import { A2AService } from "../../services/a2a/service.js";
 /**
- * Creates an Express server for the A2A protocol.
+ * @deprecated Use ExpressServer instead.
+ * @description Creates an Express server for the A2A protocol.
  * Handles task creation, streaming, cancellation and more.
  * Uses Jayson for JSON-RPC handling.
  */
@@ -21,7 +31,7 @@ export function createExpressServer(params) {
         try {
             const body = req.body;
             if (body && body.method) {
-                if (body.method === "tasks/sendSubscribe") {
+                if (body.method === "message/stream") {
                     return await onTaskSendSubscribe(body, res);
                 }
                 else if (body.method === "tasks/resubscribe") {
@@ -40,4 +50,203 @@ export function createExpressServer(params) {
     app.use(errorHandler);
     return { app };
 }
+/**
+ * @description The express server class.
+ */
+export class ExpressServer extends ServiceManager {
+    basePath;
+    fallbackPath;
+    _serverInstance;
+    port;
+    app;
+    register;
+    corsOptions;
+    initialized = false;
+    /**
+     * @description Gets the server instance.
+     * @returns {http.Server | undefined} The server instance.
+     */
+    get serverInstance() {
+        return this._serverInstance;
+    }
+    /**
+     * @description The constructor.
+     * @param {ExpressServerOptions} params The express server options.
+     */
+    constructor(params) {
+        const atBasePath = Object.keys(params.services ?? {}).length > 1 ? false : true;
+        super({
+            ...params,
+            services: params.services ?? {
+                [Protocol.A2A]: new A2AService({
+                    engine: params.engine,
+                    taskStore: params.storage,
+                    card: params.card,
+                }),
+            },
+        });
+        this.corsOptions = params.corsOptions ?? {
+            origin: "*",
+            methods: ["GET", "POST", "PUT", "DELETE", "OPTIONS"],
+            allowedHeaders: ["Content-Type", "Authorization"],
+        };
+        let basePath = params.basePath ?? "/";
+        if (basePath !== "/") {
+            basePath = `/${basePath.replace(/^\/|\/$/g, "")}/`;
+        }
+        this.basePath = basePath;
+        this.fallbackPath = params.fallbackPath ?? "/agent-card";
+        this.port = params.port ?? 41241;
+        this.app = params.app ?? express();
+        this.app.use(cors(this.corsOptions));
+        this.app.use(express.json());
+        this.register = params.register ?? false;
+        this.registerRoutes(atBasePath);
+    }
+    /**
+     * @description Registers the routes.
+     * @param {StreamableHTTPServerTransport} transport The mcp transport.
+     */
+    registerRoutes(atBasePath = true, transport) {
+        this.app.get(`/.well-known/agent.json`, (_, res) => {
+            res.json(this.getCard());
+        });
+        this.app.get(this.fallbackPath, (_, res) => {
+            res.json(this.getCard());
+        });
+        for (const service of Object.values(this.services)) {
+            const path = atBasePath
+                ? `${this.basePath}`
+                : this.basePath === "/"
+                    ? `/${service.protocol}`
+                    : `${this.basePath}${service.protocol}`;
+            this.app.get(path, async (req, res, next) => {
+                try {
+                    const { id, method, params, jsonrpc } = req.body;
+                    if (jsonrpc !== "2.0") {
+                        res.status(400).json({ error: "Invalid JSON-RPC version" });
+                        return;
+                    }
+                    const context = this.createRequestContext({
+                        id,
+                        protocol: service.protocol,
+                        method,
+                        params: {
+                            ...params,
+                            protocol: service.protocol,
+                        },
+                        request: req,
+                        response: res,
+                        transport: service.protocol === Protocol.MCP
+                            ? transport
+                                ? transport
+                                : new StreamableHTTPServerTransport({
+                                    sessionIdGenerator: () => uuidv4(),
+                                })
+                            : undefined,
+                    });
+                    return await this.onRequest(context).catch((error) => {
+                        res.status(500).json({ id, error: error.message });
+                    });
+                }
+                catch (error) {
+                    logError("ExpressServer", "Error in GET", error);
+                    next(error);
+                }
+            });
+            this.app.post(path, async (req, res, next) => {
+                try {
+                    const { id, method, params, jsonrpc } = req.body;
+                    if (jsonrpc !== "2.0") {
+                        res.status(200).send({
+                            jsonrpc: "2.0",
+                            id: id,
+                            error: INVALID_REQUEST({
+                                jsonrpc: jsonrpc,
+                                data: req.body,
+                            }),
+                        });
+                        return;
+                    }
+                    const context = this.createRequestContext({
+                        id,
+                        protocol: service.protocol,
+                        method,
+                        params: {
+                            ...params,
+                            protocol: service.protocol,
+                        },
+                        request: req,
+                        response: res,
+                        transport: service.protocol === Protocol.MCP
+                            ? transport
+                                ? transport
+                                : new StreamableHTTPServerTransport({
+                                    sessionIdGenerator: () => uuidv4(),
+                                })
+                            : undefined,
+                    });
+                    return await this.onRequest(context).catch((error) => {
+                        res.status(500).json({ error: error.message });
+                    });
+                }
+                catch (error) {
+                    console.error("Error in POST", error);
+                    next(error);
+                }
+            });
+        }
+        this.app.use(errorHandler);
+        this.initialized = true;
+    }
+    /**
+     * @description Gets the app.
+     * @returns {express.Express} The app.
+     */
+    getApp() {
+        if (!this.initialized) {
+            this.registerRoutes();
+        }
+        return this.app;
+    }
+    /**
+     * @description Starts the server.
+     * @returns {Promise<http.Server>} The server.
+     */
+    async start() {
+        if (!this.initialized) {
+            this.registerRoutes();
+        }
+        if (this._serverInstance) {
+            return this._serverInstance;
+        }
+        this._serverInstance = this.app.listen(this.port, () => {
+            logInfo("ExpressServer", `Express Server started and listening`, {
+                port: this.port,
+                path: this.basePath,
+            });
+        });
+        return this._serverInstance;
+    }
+    /**
+     * @description Stops the server.
+     */
+    async stop() {
+        await super.destroy();
+        if (!this._serverInstance) {
+            return;
+        }
+        try {
+            const closeServer = util
+                .promisify(this._serverInstance.close)
+                .bind(this._serverInstance);
+            await closeServer();
+            this._serverInstance = undefined;
+        }
+        catch (error) {
+            this._serverInstance = undefined;
+            logError("ExpressServer", "Error stopping server:", error);
+        }
+    }
+}
 //# sourceMappingURL=express-server.js.map

package/dist/server/lib/express-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"express-server.js","sourceRoot":"","sources":["../../../src/server/lib/express-server.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,OAA4C,MAAM,SAAS,CAAC;AAGnE;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CAAC,MAAiC;IAGnE,MAAM,EACJ,IAAI,EACJ,WAAW,EACX,QAAQ,EACR,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,GAClB,GAAG,MAAM,CAAC;IACX,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;IAEtB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAE3B,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAExB,GAAG,CAAC,GAAG,CAAC,yBAAyB,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;QAC5C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;QAC/B,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,WAAW;IACX,GAAG,CAAC,IAAI,CACN,QAAQ,EACR,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACxD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACtB,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;gBACxB,IAAI,IAAI,CAAC,MAAM,KAAK,qBAAqB,EAAE,CAAC;oBAC1C,OAAO,MAAM,mBAAmB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBAC9C,CAAC;qBAAM,IAAI,IAAI,CAAC,MAAM,KAAK,mBAAmB,EAAE,CAAC;oBAC/C,OAAO,MAAM,iBAAiB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBAC5C,CAAC;YACH,CAAC;YACD,IAAI,EAAE,CAAC;QACT,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,KAAK,CAAC,CAAC;QACd,CAAC;IACH,CAAC,CACF,CAAC;IAEF,YAAY;IACZ,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC;IAE3C,yBAAyB;IACzB,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IAEtB,OAAO,EAAE,GAAG,EAAE,CAAC;AACjB,CAAC"}
+{"version":3,"file":"express-server.js","sourceRoot":"","sources":["../../../src/server/lib/express-server.ts"],"names":[],"mappings":"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"}

package/dist/server/lib/middleware/a2a-methods.js

@@ -1,25 +1,56 @@
-import { extractTaskId, getCurrentTimestamp } from "../../../utils/index.js";
+import { Protocol } from "../../../types/services/protocol.js";
+import { getCurrentTimestamp, validateSendMessageParams, } from "../../../utils/index.js";
 import { logError, logWarn } from "../../../utils/index.js";
-import { loadState, updateState } from "../state.js";
+import { loadState, processUpdate } from "../state.js";
 import { INTERNAL_ERROR, INVALID_PARAMS, PUSH_NOTIFICATION_NOT_SUPPORTED, TASK_NOT_CANCELABLE, TASK_NOT_FOUND, FAILED_UPDATE, SystemError, } from "../../../utils/index.js";
 import { FINAL_STATES } from "../../../utils/index.js";
+//todo move to the a2a plugin
 export const defaultSendTaskMethod = async (deps, requestParams, callback) => {
+    validateSendMessageParams(requestParams);
     const { taskStore, taskHandler, createTaskContext } = deps;
-    const taskId = extractTaskId(requestParams.id);
-    const { message, sessionId, metadata } = requestParams;
-    let currentData = await loadState(taskStore, taskId, message, sessionId, metadata);
-    const context = createTaskContext(currentData.task, message, currentData.history);
-    const generator = taskHandler(context);
+    const { message, configuration, metadata } = requestParams;
+    let currentData = await loadState(taskStore, message, metadata, message.taskId, message.contextId);
+    const context = createTaskContext(currentData.task, message, currentData.history, configuration);
+    const requestContext = {
+        id: context.contextId,
+        protocol: Protocol.A2A,
+        method: "message/send",
+        params: requestParams,
+        task: currentData.task,
+        request: null,
+        response: null,
+    };
+    const executionContext = {
+        id: context.contextId,
+        protocol: Protocol.A2A,
+        getRequestParams: () => requestParams,
+        isCancelled: () => deps.activeCancellations.has(context.task.id),
+        requestContext: requestContext,
+    };
+    const generator = taskHandler(executionContext);
     try {
         for await (const update of generator) {
-            currentData = await updateState(taskStore, currentData, update);
+            currentData = await processUpdate(taskStore, {
+                context: context,
+                current: currentData,
+                update: update,
+            });
         }
-        return callback(null, currentData.task); // Success
+        const task = {
+            ...currentData.task,
+            kind: "task",
+            history: [...(currentData.task.history || []), ...currentData.history],
+        };
+        return callback(null, task); // Success
     }
     catch (innerError) {
-        const failedUpdate = FAILED_UPDATE(`Task processing failed: ${innerError instanceof Error ? innerError.message : String(innerError)}`);
+        const failedUpdate = FAILED_UPDATE(currentData.task.id, currentData.task.contextId || "unknown", "failed-update", `Task processing failed: ${innerError instanceof Error ? innerError.message : String(innerError)}`);
         // Ensure state is saved before calling callback with error
-        await updateState(taskStore, currentData, failedUpdate);
+        await processUpdate(taskStore, {
+            context: context,
+            current: currentData,
+            update: failedUpdate,
+        });
         // Throwing here would be caught by createMethod's catch block
         if (innerError instanceof SystemError) {
             throw innerError;
@@ -29,7 +60,7 @@ export const defaultSendTaskMethod = async (deps, requestParams, callback) => {
 };
 export const defaultGetTaskMethod = async (deps, requestParams, callback) => {
     const { taskStore } = deps;
-    const taskId = extractTaskId(requestParams.id);
+    const { id: taskId } = requestParams;
     if (!taskId)
         throw INVALID_PARAMS("Missing task ID");
     const data = await taskStore.load(taskId);
@@ -37,18 +68,18 @@ export const defaultGetTaskMethod = async (deps, requestParams, callback) => {
         logError("taskGetLogic", "Task not found", { taskId });
         throw TASK_NOT_FOUND("Task Id: " + taskId);
     }
-    callback(null, data.task); // Success
+    return callback(null, data.task); // Success
 };
 export const defaultCancelTaskMethod = async (deps, requestParams, callback) => {
     const { taskStore, activeCancellations, closeStreamsForTask } = deps;
-    const taskId = extractTaskId(requestParams.id);
+    const { id: taskId } = requestParams;
     if (!taskId)
         throw INVALID_PARAMS("Missing task ID");
     const data = await taskStore.load(taskId);
     if (!data)
         throw TASK_NOT_FOUND("Task Id: " + taskId);
     if (FINAL_STATES.includes(data.task.status.state)) {
-        throw TASK_NOT_CANCELABLE("Task is in a final state");
+        throw TASK_NOT_CANCELABLE("Task is in a final state: " + data.task.status.state);
     }
     activeCancellations.add(taskId);
     const canceledTask = {
@@ -57,8 +88,10 @@ export const defaultCancelTaskMethod = async (deps, requestParams, callback) =>
             state: "canceled",
             timestamp: getCurrentTimestamp(),
             message: {
+                kind: "message",
+                messageId: data.task.status.message?.messageId || "canceled-task",
                 role: "agent",
-                parts: [{ type: "text", text: "Task was canceled." }],
+                parts: [{ kind: "text", text: "Task was canceled." }],
             },
         },
     };
@@ -69,28 +102,32 @@ export const defaultCancelTaskMethod = async (deps, requestParams, callback) =>
 };
 export const defaultSetTaskPushNotificationMethod = async (deps, requestParams, callback) => {
     const { taskStore, card } = deps;
-    logWarn("tasks/pushNotification/set", "Push notifications not fully implemented.");
+    logWarn("tasks/pushNotificationConfig/set", "Push notifications not fully implemented.");
     if (!card.capabilities?.pushNotifications) {
         throw PUSH_NOTIFICATION_NOT_SUPPORTED("Push notifications not supported");
     }
     const config = requestParams;
-    const taskId = extractTaskId(config.id);
-    if (!taskId || !config.pushNotificationConfig?.url) {
+    if (!config.taskId || !config.pushNotificationConfig?.url) {
         throw INVALID_PARAMS("Missing task ID or push notification URL");
     }
-    const data = await taskStore.load(taskId);
+    const data = await taskStore.load(config.taskId);
     if (!data) {
-        throw TASK_NOT_FOUND("Task Id: " + taskId);
+        throw TASK_NOT_FOUND("Task Id: " + config.taskId);
     }
-    return callback(null, config);
+    const response = {
+        id: config.taskId,
+        jsonrpc: "2.0",
+        result: config,
+    };
+    return callback(null, response);
 };
 export const defaultGetTaskPushNotificationMethod = async (deps, requestParams, callback) => {
     const { taskStore, card } = deps;
-    logWarn("tasks/pushNotification/get", "Push notifications not fully implemented.");
+    logWarn("tasks/pushNotificationConfig/get", "Push notifications not fully implemented.");
     if (!card.capabilities?.pushNotifications) {
         throw PUSH_NOTIFICATION_NOT_SUPPORTED("Push notifications not supported");
     }
-    const taskId = extractTaskId(requestParams.id);
+    const { id: taskId } = requestParams;
     if (!taskId) {
         throw INVALID_PARAMS("Missing task ID");
     }

package/dist/server/lib/middleware/a2a-methods.js.map

@@ -1 +1 @@
-{"version":3,"file":"a2a-methods.js","sourceRoot":"","sources":["../../../../src/server/lib/middleware/a2a-methods.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EACL,cAAc,EACd,cAAc,EACd,+BAA+B,EAC/B,mBAAmB,EACnB,cAAc,EACd,aAAa,EACb,WAAW,GACZ,MAAM,yBAAyB,CAAC;AAQjC,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,MAAM,CAAC,MAAM,qBAAqB,GAAmB,KAAK,EACxD,IAAI,EACJ,aAAa,EACb,QAAQ,EACR,EAAE;IACF,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;IAC3D,MAAM,MAAM,GAAG,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAC/C,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,aAAa,CAAC;IAEvD,IAAI,WAAW,GAAG,MAAM,SAAS,CAC/B,SAAS,EACT,MAAM,EACN,OAAO,EACP,SAAS,EACT,QAAQ,CACT,CAAC;IACF,MAAM,OAAO,GAAG,iBAAiB,CAC/B,WAAW,CAAC,IAAI,EAChB,OAAO,EACP,WAAW,CAAC,OAAO,CACpB,CAAC;IACF,MAAM,SAAS,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IACvC,IAAI,CAAC;QACH,IAAI,KAAK,EAAE,MAAM,MAAM,IAAI,SAAS,EAAE,CAAC;YACrC,WAAW,GAAG,MAAM,WAAW,CAAC,SAAS,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU;IACrD,CAAC;IAAC,OAAO,UAAU,EAAE,CAAC;QACpB,MAAM,YAAY,GAAoB,aAAa,CACjD,2BAA2B,UAAU,YAAY,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CACnG,CAAC;QACF,2DAA2D;QAC3D,MAAM,WAAW,CAAC,SAAS,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;QACxD,8DAA8D;QAC9D,IAAI,UAAU,YAAY,WAAW,EAAE,CAAC;YACtC,MAAM,UAAU,CAAC;QACnB,CAAC;QACD,MAAM,cAAc,CAAC,UAAU,CAAC,CAAC;IACnC,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAkB,KAAK,EACtD,IAAI,EACJ,aAAa,EACb,QAAQ,EACR,EAAE;IACF,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAC3B,MAAM,MAAM,GAAG,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAC/C,IAAI,CAAC,MAAM;QAAE,MAAM,cAAc,CAAC,iBAAiB,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,QAAQ,CAAC,cAAc,EAAE,gBAAgB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QACvD,MAAM,cAAc,CAAC,WAAW,GAAG,MAAM,CAAC,CAAC;IAC7C,CAAC;IACD,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU;AACvC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAqB,KAAK,EAC5D,IAAI,EACJ,aAAa,EACb,QAAQ,EACR,EAAE;IACF,MAAM,EAAE,SAAS,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC;IACrE,MAAM,MAAM,GAAG,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAC/C,IAAI,CAAC,MAAM;QAAE,MAAM,cAAc,CAAC,iBAAiB,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,CAAC,IAAI;QAAE,MAAM,cAAc,CAAC,WAAW,GAAG,MAAM,CAAC,CAAC;IACtD,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QAClD,MAAM,mBAAmB,CAAC,0BAA0B,CAAC,CAAC;IACxD,CAAC;IAED,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,MAAM,YAAY,GAAS;QACzB,GAAG,IAAI,CAAC,IAAI;QACZ,MAAM,EAAE;YACN,KAAK,EAAE,UAAuB;YAC9B,SAAS,EAAE,mBAAmB,EAAE;YAChC,OAAO,EAAE;gBACP,IAAI,EAAE,OAAgB;gBACtB,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,oBAAoB,EAAE,CAAC;aAC/D;SACF;KACF,CAAC;IACF,MAAM,WAAW,GAAG,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;IAClE,MAAM,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAClC,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC5B,OAAO,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;AACtC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oCAAoC,GAC/C,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE;IACtC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACjC,OAAO,CACL,4BAA4B,EAC5B,2CAA2C,CAC5C,CAAC;IACF,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,iBAAiB,EAAE,CAAC;QAC1C,MAAM,+BAA+B,CAAC,kCAAkC,CAAC,CAAC;IAC5E,CAAC;IACD,MAAM,MAAM,GAAG,aAAa,CAAC;IAC7B,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACxC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,GAAG,EAAE,CAAC;QACnD,MAAM,cAAc,CAAC,0CAA0C,CAAC,CAAC;IACnE,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,cAAc,CAAC,WAAW,GAAG,MAAM,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAChC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,oCAAoC,GAC/C,KAAK,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE;IACtC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;IACjC,OAAO,CACL,4BAA4B,EAC5B,2CAA2C,CAC5C,CAAC;IACF,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,iBAAiB,EAAE,CAAC;QAC1C,MAAM,+BAA+B,CAAC,kCAAkC,CAAC,CAAC;IAC5E,CAAC;IACD,MAAM,MAAM,GAAG,aAAa,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAC/C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,cAAc,CAAC,iBAAiB,CAAC,CAAC;IAC1C,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,cAAc,CAAC,WAAW,GAAG,MAAM,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AAC9B,CAAC,CAAC"}
+{"version":3,"file":"a2a-methods.js","sourceRoot":"","sources":["../../../../src/server/lib/middleware/a2a-methods.ts"],"names":[],"mappings":"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"}

package/dist/server/lib/middleware/factory.js

@@ -43,17 +43,17 @@ export function createJSONRPCMethod(deps, funct, methodName // Pass method name
 }
 export const defaultCreateJSONRPCServer = (params) => {
     // Create handlers using the generic factory and specific logic
-    const taskSendMethod = createJSONRPCMethod(params, defaultSendTaskMethod, "tasks/send");
+    const taskSendMethod = createJSONRPCMethod(params, defaultSendTaskMethod, "message/send");
     const taskGetMethod = createJSONRPCMethod(params, defaultGetTaskMethod, "tasks/get");
     const taskCancelMethod = createJSONRPCMethod(params, defaultCancelTaskMethod, "tasks/cancel");
-    const taskPushNotificationSetMethod = createJSONRPCMethod(params, defaultSetTaskPushNotificationMethod, "tasks/pushNotification/set");
-    const taskPushNotificationGetMethod = createJSONRPCMethod(params, defaultGetTaskPushNotificationMethod, "tasks/pushNotification/get");
+    const taskPushNotificationSetMethod = createJSONRPCMethod(params, defaultSetTaskPushNotificationMethod, "tasks/pushNotificationConfig/set");
+    const taskPushNotificationGetMethod = createJSONRPCMethod(params, defaultGetTaskPushNotificationMethod, "tasks/pushNotificationConfig/get");
     return new JSONRPCServer({
-        "tasks/send": taskSendMethod,
+        "message/send": taskSendMethod,
         "tasks/get": taskGetMethod,
         "tasks/cancel": taskCancelMethod,
-        "tasks/pushNotification/set": taskPushNotificationSetMethod,
-        "tasks/pushNotification/get": taskPushNotificationGetMethod,
+        "tasks/pushNotificationConfig/set": taskPushNotificationSetMethod,
+        "tasks/pushNotificationConfig/get": taskPushNotificationGetMethod,
     }, { reviver: undefined, replacer: undefined });
 };
 //# sourceMappingURL=factory.js.map

package/dist/server/lib/middleware/factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../../src/server/lib/middleware/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACzD,OAAO,EACL,cAAc,EACd,cAAc,EACd,WAAW,GACZ,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAEL,aAAa,GAId,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EACvB,oCAAoC,EACpC,oCAAoC,GACrC,MAAM,kBAAkB,CAAC;AAG1B;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAIjC,IAA+B,EAC/B,KAAuC,EACvC,UAAkB,CAAC,+BAA+B;;IAElD,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE;QACvC,IAAI,CAAC;YACH,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,cAAc,CAAC,4BAA4B,CAAC,CAAC;YACrD,CAAC;YACD,6BAA6B;YAC7B,MAAM,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC7C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iEAAiE;YACjE,QAAQ,CAAC,qBAAqB,EAAE,4BAA4B,EAAE,KAAK,CAAC,CAAC;YACrE,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;gBACjC,OAAO,QAAQ,CAAC;oBACd,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;iBACjB,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,UAAU,EAAE,+BAA+B,EAAE,KAAK,CAAC,CAAC;gBAC7D,MAAM,aAAa,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;gBAC5C,OAAO,QAAQ,CAAC;oBACd,OAAO,EAAE,aAAa,CAAC,OAAO;oBAC9B,IAAI,EAAE,aAAa,CAAC,IAAI;oBACxB,IAAI,EAAE,aAAa,CAAC,IAAI;iBACzB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAwB,CAAC,MAAM,EAAE,EAAE;IACxE,+DAA+D;IAC/D,MAAM,cAAc,GAAG,mBAAmB,CACxC,MAAM,EACN,qBAAqB,EACrB,YAAY,CACb,CAAC;IACF,MAAM,aAAa,GAAG,mBAAmB,CACvC,MAAM,EACN,oBAAoB,EACpB,WAAW,CACZ,CAAC;IACF,MAAM,gBAAgB,GAAG,mBAAmB,CAC1C,MAAM,EACN,uBAAuB,EACvB,cAAc,CACf,CAAC;IACF,MAAM,6BAA6B,GAAG,mBAAmB,CACvD,MAAM,EACN,oCAAoC,EACpC,4BAA4B,CAC7B,CAAC;IACF,MAAM,6BAA6B,GAAG,mBAAmB,CACvD,MAAM,EACN,oCAAoC,EACpC,4BAA4B,CAC7B,CAAC;IAEF,OAAO,IAAI,aAAa,CACtB;QACE,YAAY,EAAE,cAAc;QAC5B,WAAW,EAAE,aAAa;QAC1B,cAAc,EAAE,gBAAgB;QAChC,4BAA4B,EAAE,6BAA6B;QAC3D,4BAA4B,EAAE,6BAA6B;KAC5D,EACD,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,CAC5C,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"factory.js","sourceRoot":"","sources":["../../../../src/server/lib/middleware/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACzD,OAAO,EACL,cAAc,EACd,cAAc,EACd,WAAW,GACZ,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAEL,aAAa,GAId,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EACvB,oCAAoC,EACpC,oCAAoC,GACrC,MAAM,kBAAkB,CAAC;AAQ1B;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAIjC,IAA+B,EAC/B,KAA8C,EAC9C,UAAkB,CAAC,+BAA+B;;IAElD,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE;QACvC,IAAI,CAAC;YACH,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,cAAc,CAAC,4BAA4B,CAAC,CAAC;YACrD,CAAC;YACD,6BAA6B;YAC7B,MAAM,KAAK,CAAC,IAAI,EAAE,aAAa,EAAE,QAAQ,CAAC,CAAC;QAC7C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iEAAiE;YACjE,QAAQ,CAAC,qBAAqB,EAAE,4BAA4B,EAAE,KAAK,CAAC,CAAC;YACrE,IAAI,KAAK,YAAY,WAAW,EAAE,CAAC;gBACjC,OAAO,QAAQ,CAAC;oBACd,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;iBACjB,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,UAAU,EAAE,+BAA+B,EAAE,KAAK,CAAC,CAAC;gBAC7D,MAAM,aAAa,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;gBAC5C,OAAO,QAAQ,CAAC;oBACd,OAAO,EAAE,aAAa,CAAC,OAAO;oBAC9B,IAAI,EAAE,aAAa,CAAC,IAAI;oBACxB,IAAI,EAAE,aAAa,CAAC,IAAI;iBACzB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAwB,CAAC,MAAM,EAAE,EAAE;IACxE,+DAA+D;IAC/D,MAAM,cAAc,GAAG,mBAAmB,CACxC,MAAM,EACN,qBAAqB,EACrB,cAAc,CACf,CAAC;IACF,MAAM,aAAa,GAAG,mBAAmB,CACvC,MAAM,EACN,oBAAoB,EACpB,WAAW,CACZ,CAAC;IACF,MAAM,gBAAgB,GAAG,mBAAmB,CAC1C,MAAM,EACN,uBAAuB,EACvB,cAAc,CACf,CAAC;IACF,MAAM,6BAA6B,GAAG,mBAAmB,CACvD,MAAM,EACN,oCAAoC,EACpC,kCAAkC,CACnC,CAAC;IACF,MAAM,6BAA6B,GAAG,mBAAmB,CACvD,MAAM,EACN,oCAAoC,EACpC,kCAAkC,CACnC,CAAC;IAEF,OAAO,IAAI,aAAa,CACtB;QACE,cAAc,EAAE,cAAc;QAC9B,WAAW,EAAE,aAAa;QAC1B,cAAc,EAAE,gBAAgB;QAChC,kCAAkC,EAAE,6BAA6B;QACjE,kCAAkC,EAAE,6BAA6B;KAClE,EACD,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,CAC5C,CAAC;AACJ,CAAC,CAAC"}

package/dist/server/lib/state.js

@@ -1,107 +1,79 @@
-import { getCurrentTimestamp, isArtifactUpdate, isTaskStatusUpdate, } from "../../utils/common/utils.js";
-import { INVALID_REQUEST } from "../../utils/common/errors.js";
-export function updateTaskStatus(task, update) {
-    return { ...task.status, ...update, timestamp: getCurrentTimestamp() };
-}
-export function checkBounds(index, length) {
-    return index >= 0 && index < length;
-}
-export function updateByIndex(artifacts, index, update) {
-    const existingArtifact = artifacts[index];
-    if (update.append) {
-        //deep copy to avoid mutating original
-        const appendedArtifact = JSON.parse(JSON.stringify(existingArtifact));
-        appendedArtifact.parts.push(...update.parts);
-        if (update.metadata) {
-            appendedArtifact.metadata = {
-                ...(appendedArtifact.metadata || {}),
-                ...update.metadata,
+import { getCurrentTimestamp } from "../../utils/common/utils.js";
+import { TaskState, } from "../../types/extended-schema.js";
+import { v4 as uuidv4 } from "uuid";
+import { update } from "./update/base.js";
+//todo: move to update.ts
+export function updateByIndex(append, artifacts, index, artifactUpdate) {
+    if (append) {
+        const existingArtifact = artifacts[index];
+        existingArtifact.parts.push(...artifactUpdate.parts);
+        if (artifactUpdate.metadata) {
+            existingArtifact.metadata = {
+                ...(existingArtifact.metadata || {}),
+                ...artifactUpdate.metadata,
             };
         }
-        if (update.lastChunk !== undefined) {
-            appendedArtifact.lastChunk = update.lastChunk;
+        if (artifactUpdate.description) {
+            existingArtifact.description = artifactUpdate.description;
         }
-        if (update.description) {
-            appendedArtifact.description = update.description;
+        if (artifactUpdate.name) {
+            existingArtifact.name = artifactUpdate.name;
         }
-        artifacts[index] = appendedArtifact;
+        artifacts[index] = existingArtifact;
     }
     else {
-        artifacts[index] = { ...update };
+        artifacts[index] = { ...artifactUpdate };
     }
     return { artifacts, replaced: true };
 }
-export function updateByName(artifacts, update) {
-    const namedIndex = artifacts.findIndex((a) => a.name === update.name);
-    if (namedIndex >= 0) {
-        artifacts[namedIndex] = { ...update };
-        return { artifacts, replaced: true };
-    }
-    return { artifacts: artifacts, replaced: false };
-}
-export function processArtifactUpdate(artifacts, update) {
-    const existingIndex = update.index ?? -1;
+//todo: move to update.ts
+export function processArtifactUpdate(append, artifacts, artifactUpdate) {
+    const existingIndex = artifacts.findIndex((a) => a.artifactId === artifactUpdate.artifactId);
     let replaced = false;
     let newArtifacts = artifacts;
-    if (checkBounds(existingIndex, artifacts.length)) {
-        ({ artifacts: newArtifacts, replaced } = updateByIndex(artifacts, existingIndex, update));
-    }
-    else if (update.name) {
-        ({ artifacts: newArtifacts, replaced } = updateByName(artifacts, update));
+    if (existingIndex !== -1) {
+        ({ artifacts: newArtifacts, replaced } = updateByIndex(append, artifacts, existingIndex, artifactUpdate));
     }
     if (!replaced) {
-        newArtifacts.push({ ...update });
-        if (newArtifacts.some((a) => a.index !== undefined)) {
-            newArtifacts.sort((a, b) => (a.index ?? 0) - (b.index ?? 0));
-        }
-        replaced = true;
+        newArtifacts.push({ ...artifactUpdate });
     }
-    return { artifacts: newArtifacts, replaced };
+    return newArtifacts;
 }
-export async function updateState(taskStore, current, update) {
-    const newTask = { ...current.task };
-    const newHistory = [...current.history];
-    if (isTaskStatusUpdate(update)) {
-        newTask.status = updateTaskStatus(newTask, update);
-        if (update.message?.role === "agent") {
-            newHistory.push(update.message);
-        }
+export async function processUpdate(taskStore, updateProps) {
+    if (!(await update(updateProps))) {
+        throw new Error("processUpdate: Invalid update");
     }
-    else if (isArtifactUpdate(update)) {
-        const artifacts = !newTask.artifacts ? [] : [...newTask.artifacts];
-        const { artifacts: newArtifacts, replaced } = processArtifactUpdate(artifacts, update);
-        if (!replaced) {
-            throw INVALID_REQUEST("Invalid artifact update");
-        }
-        newTask.artifacts = newArtifacts;
-    }
-    const currentData = { task: newTask, history: newHistory };
-    await taskStore.save(currentData);
-    return currentData;
+    await taskStore.save(updateProps.current);
+    return updateProps.current;
 }
 /**
  * Loads or creates a task and its history.
  * @param taskId The task ID
  * @param message The message to process
- * @param sessionId Optional session ID
+ * @param contextId Optional context ID
  * @param metadata Optional metadata
  * @returns The task and history
  */
-export async function loadState(taskStore, taskId, message, sessionId, metadata) {
-    const existingData = await taskStore.load(taskId);
-    if (existingData) {
-        return existingData;
+export async function loadState(taskStore, message, metadata, taskId, contextId) {
+    if (taskId) {
+        const existingData = await taskStore.load(taskId);
+        if (existingData) {
+            return existingData;
+        }
     }
     const timestamp = getCurrentTimestamp();
     const newTask = {
-        id: taskId,
-        sessionId: sessionId,
+        id: taskId ?? uuidv4(),
+        contextId: contextId ?? uuidv4(),
+        kind: "task",
         status: {
-            state: "submitted",
+            state: TaskState.Submitted,
             timestamp,
         },
         metadata: metadata,
     };
+    message.taskId = newTask.id;
+    message.contextId = newTask.contextId;
     const newHistory = [message];
     return { task: newTask, history: newHistory };
 }

package/dist/server/lib/state.js.map

@@ -1 +1 @@
-{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../src/server/lib/state.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../src/server/lib/state.ts"],"names":[],"mappings":"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"}