@cuylabs/agent-foundry-agentserver-invocations 4.8.1 → 4.10.0

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import { Request, Response, Express } from 'express';
 import { Server } from 'node:http';
+import { AgentServerLogger } from '@cuylabs/agent-foundry-agentserver-core';
 
 /**
  * Shared types for the Foundry Invocations protocol.
@@ -280,12 +281,7 @@ interface InvocationsServerOptions {
      */
     configureObservability?: boolean;
 }
-interface InvocationsServerLogger {
-    info(message: string, meta?: Record<string, unknown>): void;
-    warn(message: string, meta?: Record<string, unknown>): void;
-    error(message: string, meta?: Record<string, unknown>): void;
-    debug?(message: string, meta?: Record<string, unknown>): void;
-}
+type InvocationsServerLogger = AgentServerLogger;
 interface InvocationsServer {
     readonly app: Express;
     readonly server: Server;

package/dist/index.js

@@ -318,17 +318,28 @@ import express from "express";
 import {
   CHAT_ISOLATION_HEADER,
   INVOCATION_ID_HEADER,
-  REQUEST_ID_HEADER,
   SESSION_ID_HEADER,
   USER_ISOLATION_HEADER,
   AGENTSERVER_CORE_PACKAGE_VERSION,
+  addProtectedHeaders,
+  agentServerLoggingMiddleware,
+  agentServerRequestHeadersMiddleware,
   buildPlatformServerHeader,
+  closeServerWithTimeout,
   configureAgentServerObservability,
+  configureExpressAgentServerApp,
   createErrorBody,
+  defaultAgentServerLogger,
+  errorMiddleware,
+  formatError,
+  healthzHandler,
+  logAgentServerStartupConfiguration,
+  methodNotAllowed,
+  notFoundMiddleware,
+  readinessHandler,
   resolveAgentServerConfig,
   resolveInvocationIdentity as resolveInvocationIdentity2,
   resolveRequestId,
-  sanitizeProtocolId,
   startAgentServerRequestSpan
 } from "@cuylabs/agent-foundry-agentserver-core";
 
@@ -345,7 +356,7 @@ var AGENTSERVER_INVOCATIONS_PACKAGE_VERSION = readPackageVersion();
 var DEFAULT_HOST = "0.0.0.0";
 var DEFAULT_BODY_LIMIT = "1mb";
 function createInvocationsApp(options) {
-  const logger = options.logger ?? defaultLogger();
+  const logger = options.logger ?? defaultAgentServerLogger("invocations");
   const config = resolveAgentServerConfig({
     port: options.port,
     gracefulShutdownTimeoutSeconds: options.gracefulShutdownTimeoutSeconds
@@ -366,8 +377,7 @@ function createInvocationsApp(options) {
   ]);
   const observabilityReady = options.configureObservability === false ? Promise.resolve(void 0) : configureAgentServerObservability({ config, logger });
   const app = express();
-  app.disable("x-powered-by");
-  app.set("trust proxy", trustProxy);
+  configureExpressAgentServerApp(app, { trustProxy });
   app.use(express.raw({ type: "*/*", limit: bodyLimit }));
   app.use(async (_req, _res, next) => {
     try {
@@ -380,17 +390,9 @@ function createInvocationsApp(options) {
       next();
     }
   });
-  app.use((req, res, next) => {
-    const requestId = resolveRequestId((name) => req.header(name));
-    req.agentServerRequestId = requestId;
-    addProtectedHeaders(res, {
-      [REQUEST_ID_HEADER]: requestId,
-      "x-platform-server": platformServer
-    });
-    next();
-  });
+  app.use(agentServerRequestHeadersMiddleware({ platformServer }));
   if (requestLogging) {
-    app.use(loggingMiddleware(logger));
+    app.use(agentServerLoggingMiddleware(logger));
   }
   const handlerProvider = makeHandlerProvider(options.handler);
   app.get("/", (_req, res) => {
@@ -405,9 +407,7 @@ function createInvocationsApp(options) {
       openapi: "/invocations/docs/openapi.json"
     });
   });
-  app.get("/healthz", (_req, res) => {
-    res.json({ ok: true });
-  });
+  app.get("/healthz", healthzHandler);
   app.get("/readiness", readinessHandler);
   app.get("/readyz", readinessHandler);
   app.get("/invocations/docs/openapi.json", (_req, res) => {
@@ -543,7 +543,7 @@ async function runInvocationsServer(options) {
   });
   const port = config.port;
   const host = options.host ?? DEFAULT_HOST;
-  const logger = options.logger ?? defaultLogger();
+  const logger = options.logger ?? defaultAgentServerLogger("invocations");
   const appName = options.appName ?? "foundry-invocations-host";
   const platformServer = buildPlatformServerHeader([
     {
@@ -557,7 +557,7 @@ async function runInvocationsServer(options) {
   ]);
   const server = await new Promise((resolve, reject) => {
     const httpServer = app.listen(port, host, () => {
-      logStartupConfiguration(logger, config, platformServer);
+      logAgentServerStartupConfiguration(logger, config, platformServer);
       logger.info(
         `${appName} listening on http://${host}:${port}/invocations`
       );
@@ -606,71 +606,6 @@ function startInvocationRequestSpan(options) {
   });
   return span;
 }
-async function closeServerWithTimeout(server, timeoutSeconds) {
-  const closePromise = new Promise((resolve, reject) => {
-    server.close((error) => {
-      if (!error || error.code === "ERR_SERVER_NOT_RUNNING") {
-        resolve();
-        return;
-      }
-      reject(error);
-    });
-  });
-  if (timeoutSeconds <= 0) {
-    await closePromise;
-    return;
-  }
-  let timeout;
-  const timeoutPromise = new Promise((resolve) => {
-    timeout = setTimeout(() => {
-      server.closeAllConnections?.();
-      resolve();
-    }, timeoutSeconds * 1e3);
-  });
-  try {
-    await Promise.race([closePromise, timeoutPromise]);
-  } finally {
-    if (timeout) {
-      clearTimeout(timeout);
-    }
-  }
-}
-function logStartupConfiguration(logger, config, platformServer) {
-  logger.info("Foundry Agent Server platform environment", {
-    isHosted: config.isHosted,
-    agentName: config.agentName || "(not set)",
-    agentVersion: config.agentVersion || "(not set)",
-    port: config.port,
-    sessionId: config.sessionId || "(not set)",
-    sseKeepAliveIntervalSeconds: config.sseKeepAliveIntervalSeconds > 0 ? config.sseKeepAliveIntervalSeconds : "disabled"
-  });
-  logger.info("Foundry Agent Server connectivity", {
-    projectEndpoint: maskUri(config.projectEndpoint),
-    otlpEndpoint: maskUri(config.otlpEndpoint),
-    applicationInsightsConfigured: Boolean(
-      config.applicationInsightsConnectionString.trim()
-    )
-  });
-  logger.info("Foundry Agent Server host options", {
-    gracefulShutdownTimeoutSeconds: config.gracefulShutdownTimeoutSeconds,
-    platformServer
-  });
-}
-function readinessHandler(_req, res) {
-  res.json({ status: "healthy" });
-}
-function maskUri(uri) {
-  const normalized = uri.trim();
-  if (!normalized) {
-    return "(not set)";
-  }
-  try {
-    const parsed = new URL(normalized);
-    return `${parsed.protocol}//${parsed.host}`;
-  } catch {
-    return "(redacted)";
-  }
-}
 function makeHandlerProvider(input) {
   if (typeof input === "function") {
     return input;
@@ -706,42 +641,6 @@ function buildContextFromRequest(req, res) {
     signal: controller.signal
   };
 }
-function loggingMiddleware(logger) {
-  return (req, res, next) => {
-    const start = Date.now();
-    res.on("finish", () => {
-      logger.info("http request", {
-        method: req.method,
-        path: req.path,
-        statusCode: res.statusCode,
-        durationMs: Date.now() - start,
-        requestId: req.agentServerRequestId,
-        clientRequestId: req.header("x-ms-client-request-id")
-      });
-    });
-    next();
-  };
-}
-function notFoundMiddleware() {
-  return (_req, res, _next) => {
-    res.status(404).json(createErrorBody("not_found", "No route matched this path."));
-  };
-}
-function errorMiddleware(logger) {
-  return (err, _req, res, _next) => {
-    logger.error("Unhandled middleware error", { error: formatError(err) });
-    if (res.headersSent) {
-      res.end();
-      return;
-    }
-    res.status(500).json(
-      createErrorBody(
-        "internal_error",
-        err instanceof Error ? err.message : String(err)
-      )
-    );
-  };
-}
 function handleHandlerError(res, error, logger, hookName) {
   logger.error(`Invocation handler hook ${hookName} threw`, {
     error: formatError(error)
@@ -757,65 +656,6 @@ function handleHandlerError(res, error, logger, hookName) {
     )
   );
 }
-function formatError(error) {
-  if (error instanceof Error) {
-    return error.stack ?? error.message;
-  }
-  return String(error);
-}
-function addProtectedHeaders(res, headers) {
-  const protectedRes = res;
-  if (!protectedRes.__agentServerProtectedHeaders) {
-    const protectedHeaders = /* @__PURE__ */ new Map();
-    const originalSetHeader2 = res.setHeader.bind(res);
-    protectedRes.__agentServerProtectedHeaders = protectedHeaders;
-    protectedRes.__agentServerOriginalSetHeader = originalSetHeader2;
-    res.setHeader = ((name, value) => {
-      const protectedValue = protectedHeaders.get(name.toLowerCase());
-      if (protectedValue !== void 0) {
-        return originalSetHeader2(name, protectedValue);
-      }
-      return originalSetHeader2(name, value);
-    });
-  }
-  const originalSetHeader = protectedRes.__agentServerOriginalSetHeader ?? res.setHeader.bind(res);
-  for (const [name, value] of Object.entries(headers)) {
-    const safeValue = name.toLowerCase() === INVOCATION_ID_HEADER || name.toLowerCase() === SESSION_ID_HEADER ? sanitizeProtocolId(value, value) : value;
-    protectedRes.__agentServerProtectedHeaders.set(
-      name.toLowerCase(),
-      safeValue
-    );
-    originalSetHeader(name, safeValue);
-  }
-}
-function methodNotAllowed(allowedMethods) {
-  return (_req, res) => {
-    res.setHeader("Allow", allowedMethods.join(", "));
-    res.status(405).json(
-      createErrorBody(
-        "method_not_allowed",
-        `Allowed methods: ${allowedMethods.join(", ")}`
-      )
-    );
-  };
-}
-function defaultLogger() {
-  return {
-    info: (message, meta) => {
-      if (meta) {
-        console.log(`[invocations] ${message}`, meta);
-      } else {
-        console.log(`[invocations] ${message}`);
-      }
-    },
-    warn: (message, meta) => {
-      console.warn(`[invocations] ${message}`, meta ?? "");
-    },
-    error: (message, meta) => {
-      console.error(`[invocations] ${message}`, meta ?? "");
-    }
-  };
-}
 export {
   InvocationHandler,
   buildInvocationsOpenApiSpec,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuylabs/agent-foundry-agentserver-invocations",
-  "version": "4.8.1",
+  "version": "4.10.0",
   "description": "TypeScript Foundry Agent Server Invocations-protocol host (mirrors azure-ai-agentserver-invocations)",
   "type": "module",
   "main": "./dist/index.js",
@@ -18,7 +18,7 @@
   ],
   "dependencies": {
     "express": "^5.0.0",
-    "@cuylabs/agent-foundry-agentserver-core": "^4.8.1"
+    "@cuylabs/agent-foundry-agentserver-core": "^4.10.0"
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.9.0",