@ignfab/geocontext 0.9.6 → 0.9.7

package/dist/index.js

@@ -3,24 +3,15 @@ import { MCPServer } from "mcp-framework";
 import { dirname, join } from "path";
 import { fileURLToPath } from "url";
 import { readFileSync } from "fs";
+import logger from "./logger.js";
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const TRANSPORTS = {
-    stdio: {
-        type: "stdio",
-    },
-    http: {
-        type: "http-stream",
-        options: {
-            port: 3000,
-            cors: {
-                allowOrigin: "*",
-            },
-        },
-    },
-};
 function isTransportType(value) {
-    return Object.prototype.hasOwnProperty.call(TRANSPORTS, value);
+    return value === "stdio" || value === "http";
 }
+/**
+ * Get the transport type from the environment variable TRANSPORT_TYPE.
+ * Valid values are "stdio" and "http". If not set, defaults to "stdio".
+ */
 function getTransportType() {
     const transportType = process.env.TRANSPORT_TYPE ?? "stdio";
     if (!isTransportType(transportType)) {
@@ -28,22 +19,73 @@ function getTransportType() {
     }
     return transportType;
 }
-function buildTransport(transportType) {
-    if (transportType !== "http") {
-        return TRANSPORTS[transportType];
+/**
+ * Get the HTTP port from the environment variable HTTP_PORT.
+ * The variable should be a decimal integer between 1 and 65535. If not set, defaults to 3000.
+ */
+function getHttpPort() {
+    const rawPort = process.env.HTTP_PORT?.trim();
+    const invalidHttpPortMessage = `Invalid HTTP_PORT: ${rawPort}. Expected a decimal integer between 1 and 65535.`;
+    if (!rawPort) {
+        return 3000;
+    }
+    if (!/^\d+$/.test(rawPort)) {
+        throw new Error(invalidHttpPortMessage);
+    }
+    const port = Number(rawPort);
+    if (!Number.isInteger(port) || port < 1 || port > 65535) {
+        throw new Error(invalidHttpPortMessage);
     }
-    const host = process.env.HTTP_HOST?.trim();
-    if (!host) {
-        return TRANSPORTS.http;
+    return port;
+}
+/**
+ * Get CORS allowed origins from the environment variable HTTP_CORS_ALLOWED_ORIGINS.
+ * The variable should be a comma-separated list of origins .
+ */
+function getCorsAllowedOrigins() {
+    if (process.env.HTTP_CORS_ALLOWED_ORIGINS === undefined) {
+        logger.warn('Security : HTTP_CORS_ALLOWED_ORIGINS is not set. It is recommended to set this variable to prevent DNS rebinding attacks (e.g., HTTP_CORS_ALLOWED_ORIGINS="http://localhost:3000,https://geollm.beta.ign.fr".');
+        return undefined;
+    }
+    const rawOrigins = process.env.HTTP_CORS_ALLOWED_ORIGINS?.trim();
+    const allowedOrigins = rawOrigins
+        ?.split(",")
+        .map((origin) => origin.trim())
+        .filter(Boolean);
+    if (!allowedOrigins || allowedOrigins.length === 0) {
+        logger.warn('Security : HTTP_CORS_ALLOWED_ORIGINS is empty. It is recommended to set this variable to prevent DNS rebinding attacks (e.g., HTTP_CORS_ALLOWED_ORIGINS="http://localhost:3000,https://geollm.beta.ign.fr".');
+        return undefined;
+    }
+    return allowedOrigins;
+}
+function buildTransport(transportType) {
+    // Handle stdio transport configuration
+    if (transportType === "stdio") {
+        return {
+            type: "stdio",
+        };
     }
+    // Handle HTTP transport configuration
+    const host = process.env.HTTP_HOST?.trim() || '127.0.0.1';
+    const endpoint = process.env.HTTP_MCP_ENDPOINT?.trim() || '/mcp';
+    const port = getHttpPort();
     return {
-        ...TRANSPORTS.http,
+        type: "http-stream",
         options: {
-            ...TRANSPORTS.http.options,
+            port: port,
+            endpoint,
+            responseMode: "stream",
+            cors: {
+                allowOrigin: "*",
+                allowedOrigins: getCorsAllowedOrigins(),
+            },
             host,
         },
     };
 }
+/**
+ * Get the version from package.json for the MCP server metadata.
+ */
 function getVersion() {
     const pkgMetadata = JSON.parse(readFileSync(join(__dirname, "../package.json"), "utf-8"));
     if (!pkgMetadata?.version || typeof pkgMetadata.version !== "string") {

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAElC,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE1D,MAAM,UAAU,GAAG;IACjB,KAAK,EAAE;QACL,IAAI,EAAE,OAAO;KACd;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE;YACP,IAAI,EAAE,IAAI;YACV,IAAI,EAAE;gBACJ,WAAW,EAAE,GAAG;aACjB;SACF;KACF;CACO,CAAC;AAIX,SAAS,eAAe,CAAC,KAAa;IACpC,OAAO,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,gBAAgB;IACvB,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,OAAO,CAAC;IAE5D,IAAI,CAAC,eAAe,CAAC,aAAa,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,2BAA2B,aAAa,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,SAAS,cAAc,CAAC,aAA4B;IAClD,IAAI,aAAa,KAAK,MAAM,EAAE,CAAC;QAC7B,OAAO,UAAU,CAAC,aAAa,CAAC,CAAC;IACnC,CAAC;IAED,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;IAC3C,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,UAAU,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,OAAO;QACL,GAAG,UAAU,CAAC,IAAI;QAClB,OAAO,EAAE;YACP,GAAG,UAAU,CAAC,IAAI,CAAC,OAAO;YAC1B,IAAI;SACL;KACF,CAAC;AACJ,CAAC;AAED,SAAS,UAAU;IACjB,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAC5B,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,iBAAiB,CAAC,EAAE,OAAO,CAAC,CAC1D,CAAC;IAEF,IAAI,CAAC,WAAW,EAAE,OAAO,IAAI,OAAO,WAAW,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACrE,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,CAAC;IAED,OAAO,WAAW,CAAC,OAAO,CAAC;AAC7B,CAAC;AAED,KAAK,UAAU,IAAI;IACjB,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAC;IACzC,MAAM,SAAS,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAE7B,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC;QAC9B,IAAI,EAAE,YAAY;QAClB,OAAO;QACP,QAAQ,EAAE,SAAS;QACnB,SAAS;KACV,CAAC,CAAC;IAEH,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;AAC1B,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IACrB,OAAO,CAAC,KAAK,CACX,wBAAwB,EACxB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACrD,CAAC;IACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/logger.d.ts

@@ -1,2 +1,2 @@
-export default logger;
 declare const logger: import("winston").Logger;
+export default logger;

package/dist/logger.js

@@ -4,8 +4,11 @@ const formats = {
     json: format.json(),
     simple: format.simple()
 };
+function isLogFormat(value) {
+    return Object.keys(formats).includes(value);
+}
 const LOG_FORMAT = process.env.LOG_FORMAT ? process.env.LOG_FORMAT : 'simple';
-if (!Object.keys(formats).includes(LOG_FORMAT)) {
+if (!isLogFormat(LOG_FORMAT)) {
     throw new Error(`LOG_FORMAT=${LOG_FORMAT} not found!`);
 }
 const logger = createLogger({

package/dist/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.js"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEnE,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;AAE1E,MAAM,OAAO,GAAG;IACZ,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE;IACnB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;CAC1B,CAAC;AAEF,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC9E,IAAK,CAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;IAC/C,MAAM,IAAI,KAAK,CAAC,cAAc,UAAU,aAAa,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,MAAM,GAAG,YAAY,CAAC;IACxB,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC;QACzC;;;WAGG;QACH,IAAI,UAAU,CAAC,OAAO,CAAC;YACnB,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;SAC/C,CAAC;KACL,CAAC,CAAC,CAAC;QACA,IAAI,UAAU,CAAC,IAAI,CAAC;YAChB,QAAQ,EAAE,gBAAgB;YAC1B,KAAK,EAAE,OAAO;SACjB,CAAC;KACL;CACJ,CAAC,CAAC;AAEH,eAAe,MAAM,CAAC"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEnE,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;AAE1E,MAAM,OAAO,GAAG;IACZ,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE;IACnB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;CAC1B,CAAC;AAIF,SAAS,WAAW,CAAC,KAAa;IAC9B,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC;AAE9E,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;IAC3B,MAAM,IAAI,KAAK,CAAC,cAAc,UAAU,aAAa,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,MAAM,GAAG,YAAY,CAAC;IACxB,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC;IAC3B,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC,CAAC;QACzC;;;WAGG;QACH,IAAI,UAAU,CAAC,OAAO,CAAC;YACnB,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;SAC/C,CAAC;KACL,CAAC,CAAC,CAAC;QACA,IAAI,UAAU,CAAC,IAAI,CAAC;YAChB,QAAQ,EAAE,gBAAgB;YAC1B,KAAK,EAAE,OAAO;SACjB,CAAC;KACL;CACJ,CAAC,CAAC;AAEH,eAAe,MAAM,CAAC"}

package/dist/tools/AdminexpressTool.d.ts

@@ -1,17 +1,20 @@
-import { MCPTool } from "mcp-framework";
+/**
+ * MCP tool exposing administrative units that cover a given point.
+ */
+import BaseTool from "./BaseTool.js";
 import { z } from "zod";
 declare const adminexpressInputSchema: z.ZodObject<{
     lon: z.ZodNumber;
     lat: z.ZodNumber;
 }, "strict", z.ZodTypeAny, {
-    lon?: number;
-    lat?: number;
+    lon: number;
+    lat: number;
 }, {
-    lon?: number;
-    lat?: number;
+    lon: number;
+    lat: number;
 }>;
 type AdminexpressInput = z.infer<typeof adminexpressInputSchema>;
-declare class AdminexpressTool extends MCPTool<AdminexpressInput> {
+declare class AdminexpressTool extends BaseTool<AdminexpressInput> {
     name: string;
     title: string;
     annotations: {
@@ -30,11 +33,11 @@ declare class AdminexpressTool extends MCPTool<AdminexpressInput> {
                 typename: z.ZodString;
                 feature_id: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                typename?: string;
-                feature_id?: string;
+                typename: string;
+                feature_id: string;
             }, {
-                typename?: string;
-                feature_id?: string;
+                typename: string;
+                feature_id: string;
             }>;
         }, "strip", z.ZodUnknown, z.objectOutputType<{
             type: z.ZodString;
@@ -44,11 +47,11 @@ declare class AdminexpressTool extends MCPTool<AdminexpressInput> {
                 typename: z.ZodString;
                 feature_id: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                typename?: string;
-                feature_id?: string;
+                typename: string;
+                feature_id: string;
             }, {
-                typename?: string;
-                feature_id?: string;
+                typename: string;
+                feature_id: string;
             }>;
         }, z.ZodUnknown, "strip">, z.objectInputType<{
             type: z.ZodString;
@@ -58,15 +61,15 @@ declare class AdminexpressTool extends MCPTool<AdminexpressInput> {
                 typename: z.ZodString;
                 feature_id: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                typename?: string;
-                feature_id?: string;
+                typename: string;
+                feature_id: string;
             }, {
-                typename?: string;
-                feature_id?: string;
+                typename: string;
+                feature_id: string;
             }>;
         }, z.ZodUnknown, "strip">>, "many">;
     }, "strip", z.ZodTypeAny, {
-        results?: z.objectOutputType<{
+        results: z.objectOutputType<{
             type: z.ZodString;
             id: z.ZodString;
             bbox: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
@@ -74,15 +77,15 @@ declare class AdminexpressTool extends MCPTool<AdminexpressInput> {
                 typename: z.ZodString;
                 feature_id: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                typename?: string;
-                feature_id?: string;
+                typename: string;
+                feature_id: string;
             }, {
-                typename?: string;
-                feature_id?: string;
+                typename: string;
+                feature_id: string;
             }>;
         }, z.ZodUnknown, "strip">[];
     }, {
-        results?: z.objectInputType<{
+        results: z.objectInputType<{
             type: z.ZodString;
             id: z.ZodString;
             bbox: z.ZodOptional<z.ZodArray<z.ZodNumber, "many">>;
@@ -90,11 +93,11 @@ declare class AdminexpressTool extends MCPTool<AdminexpressInput> {
                 typename: z.ZodString;
                 feature_id: z.ZodString;
             }, "strip", z.ZodTypeAny, {
-                typename?: string;
-                feature_id?: string;
+                typename: string;
+                feature_id: string;
             }, {
-                typename?: string;
-                feature_id?: string;
+                typename: string;
+                feature_id: string;
             }>;
         }, z.ZodUnknown, "strip">[];
     }>;
@@ -102,14 +105,20 @@ declare class AdminexpressTool extends MCPTool<AdminexpressInput> {
         lon: z.ZodNumber;
         lat: z.ZodNumber;
     }, "strict", z.ZodTypeAny, {
-        lon?: number;
-        lat?: number;
+        lon: number;
+        lat: number;
     }, {
-        lon?: number;
-        lat?: number;
+        lon: number;
+        lat: number;
     }>;
+    /**
+     * Looks up the administrative units covering the requested point.
+     *
+     * @param input Normalized tool input.
+     * @returns The matching administrative units enriched with reusable `feature_ref` metadata.
+     */
     execute(input: AdminexpressInput): Promise<{
-        results: object[];
+        results: import("../helpers/wfs_engine/response.js").FlatItem[];
     }>;
 }
 export default AdminexpressTool;

package/dist/tools/AdminexpressTool.js

@@ -1,8 +1,13 @@
-import { MCPTool } from "mcp-framework";
+/**
+ * MCP tool exposing administrative units that cover a given point.
+ */
+import BaseTool from "./BaseTool.js";
 import { z } from "zod";
 import { getAdminUnits, ADMINEXPRESS_TYPES, ADMINEXPRESS_SOURCE } from "../gpf/adminexpress.js";
 import { READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS } from "../helpers/toolAnnotations.js";
 import { featureRefSchema, lonSchema, latSchema } from "../helpers/schemas.js";
+import logger from "../logger.js";
+// --- Schema ---
 const adminexpressInputSchema = z.object({
     lon: lonSchema,
     lat: latSchema,
@@ -18,7 +23,8 @@ const adminexpressResultSchema = z
 const adminexpressOutputSchema = z.object({
     results: z.array(adminexpressResultSchema).describe("La liste des unités administratives couvrant le point demandé."),
 });
-class AdminexpressTool extends MCPTool {
+// --- Tool ---
+class AdminexpressTool extends BaseTool {
     name = "adminexpress";
     title = "Unités administratives";
     annotations = READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS;
@@ -31,7 +37,16 @@ class AdminexpressTool extends MCPTool {
     ].join("\n");
     outputSchemaShape = adminexpressOutputSchema;
     schema = adminexpressInputSchema;
+    /**
+     * Looks up the administrative units covering the requested point.
+     *
+     * @param input Normalized tool input.
+     * @returns The matching administrative units enriched with reusable `feature_ref` metadata.
+     */
     async execute(input) {
+        logger.info(`[tool] execute ${this.name} ...`, {
+            input: input
+        });
         return {
             results: await getAdminUnits(input.lon, input.lat),
         };

package/dist/tools/AdminexpressTool.js.map

@@ -1 +1 @@
-{"version":3,"file":"AdminexpressTool.js","sourceRoot":"","sources":["../../src/tools/AdminexpressTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAChG,OAAO,EAAE,qCAAqC,EAAE,MAAM,+BAA+B,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAE/E,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,GAAG,EAAE,SAAS;IACd,GAAG,EAAE,SAAS;CACf,CAAC,CAAC,MAAM,EAAE,CAAC;AAIZ,MAAM,wBAAwB,GAAG,CAAC;KAC/B,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mCAAmC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IAC/F,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,0CAA0C,CAAC;IACnE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,gDAAgD,CAAC,CAAC,QAAQ,EAAE;IAC/F,WAAW,EAAE,gBAAgB,CAAC,QAAQ,CAAC,mHAAmH,CAAC;CAC5J,CAAC;KACD,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;AAEzB,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC;IACxC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,QAAQ,CAAC,gEAAgE,CAAC;CACtH,CAAC,CAAC;AAEH,MAAM,gBAAiB,SAAQ,OAA0B;IACvD,IAAI,GAAG,cAAc,CAAC;IACtB,KAAK,GAAG,wBAAwB,CAAC;IACjC,WAAW,GAAG,qCAAqC,CAAC;IACpD,WAAW,GAAG;QACZ,8GAA8G,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,0FAA0F;QACrO,4GAA4G;QAC5G,6MAA6M;QAC7M,yGAAyG;QACzG,aAAa,mBAAmB,IAAI;KACrC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACH,iBAAiB,GAAG,wBAAwB,CAAC;IAEvD,MAAM,GAAG,uBAAuB,CAAC;IAEjC,KAAK,CAAC,OAAO,CAAC,KAAwB;QACpC,OAAO;YACL,OAAO,EAAE,MAAM,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC;SACnD,CAAC;IACJ,CAAC;CACF;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"AdminexpressTool.js","sourceRoot":"","sources":["../../src/tools/AdminexpressTool.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,QAAQ,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAChG,OAAO,EAAE,qCAAqC,EAAE,MAAM,+BAA+B,CAAC;AACtF,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAC/E,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,iBAAiB;AAEjB,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,GAAG,EAAE,SAAS;IACd,GAAG,EAAE,SAAS;CACf,CAAC,CAAC,MAAM,EAAE,CAAC;AAMZ,MAAM,wBAAwB,GAAG,CAAC;KAC/B,MAAM,CAAC;IACN,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mCAAmC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IAC/F,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,0CAA0C,CAAC;IACnE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,gDAAgD,CAAC,CAAC,QAAQ,EAAE;IAC/F,WAAW,EAAE,gBAAgB,CAAC,QAAQ,CAAC,mHAAmH,CAAC;CAC5J,CAAC;KACD,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;AAEzB,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC;IACxC,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,QAAQ,CAAC,gEAAgE,CAAC;CACtH,CAAC,CAAC;AAEH,eAAe;AAEf,MAAM,gBAAiB,SAAQ,QAA2B;IACxD,IAAI,GAAG,cAAc,CAAC;IACtB,KAAK,GAAG,wBAAwB,CAAC;IACjC,WAAW,GAAG,qCAAqC,CAAC;IACpD,WAAW,GAAG;QACZ,8GAA8G,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,0FAA0F;QACrO,4GAA4G;QAC5G,6MAA6M;QAC7M,yGAAyG;QACzG,aAAa,mBAAmB,IAAI;KACrC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACH,iBAAiB,GAAG,wBAAwB,CAAC;IAEvD,MAAM,GAAG,uBAAuB,CAAC;IAEjC;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CAAC,KAAwB;QACpC,MAAM,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,IAAI,MAAM,EAAE;YAC7C,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;QAEH,OAAO;YACL,OAAO,EAAE,MAAM,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC;SACnD,CAAC;IACJ,CAAC;CACF;AAED,eAAe,gBAAgB,CAAC"}

package/dist/tools/AltitudeTool.d.ts

@@ -1,17 +1,20 @@
-import { MCPTool } from "mcp-framework";
+/**
+ * MCP tool exposing altitude lookup for a single geographic position.
+ */
+import BaseTool from "./BaseTool.js";
 import { z } from "zod";
 declare const altitudeInputSchema: z.ZodObject<{
     lon: z.ZodNumber;
     lat: z.ZodNumber;
 }, "strict", z.ZodTypeAny, {
-    lon?: number;
-    lat?: number;
+    lon: number;
+    lat: number;
 }, {
-    lon?: number;
-    lat?: number;
+    lon: number;
+    lat: number;
 }>;
 type AltitudeInput = z.infer<typeof altitudeInputSchema>;
-declare class AltitudeTool extends MCPTool<AltitudeInput> {
+declare class AltitudeTool extends BaseTool<AltitudeInput> {
     name: string;
     title: string;
     annotations: {
@@ -22,54 +25,42 @@ declare class AltitudeTool extends MCPTool<AltitudeInput> {
     };
     description: string;
     protected outputSchemaShape: z.ZodObject<{
-        result: z.ZodObject<{
-            lon: z.ZodNumber;
-            lat: z.ZodNumber;
-            altitude: z.ZodNumber;
-            accuracy: z.ZodString;
-        }, "strip", z.ZodTypeAny, {
-            lon?: number;
-            lat?: number;
-            altitude?: number;
-            accuracy?: string;
-        }, {
-            lon?: number;
-            lat?: number;
-            altitude?: number;
-            accuracy?: string;
-        }>;
+        lon: z.ZodNumber;
+        lat: z.ZodNumber;
+        altitude: z.ZodNumber;
+        accuracy: z.ZodString;
     }, "strip", z.ZodTypeAny, {
-        result?: {
-            lon?: number;
-            lat?: number;
-            altitude?: number;
-            accuracy?: string;
-        };
+        lon: number;
+        lat: number;
+        altitude: number;
+        accuracy: string;
     }, {
-        result?: {
-            lon?: number;
-            lat?: number;
-            altitude?: number;
-            accuracy?: string;
-        };
+        lon: number;
+        lat: number;
+        altitude: number;
+        accuracy: string;
     }>;
     schema: z.ZodObject<{
         lon: z.ZodNumber;
         lat: z.ZodNumber;
     }, "strict", z.ZodTypeAny, {
-        lon?: number;
-        lat?: number;
+        lon: number;
+        lat: number;
     }, {
-        lon?: number;
-        lat?: number;
+        lon: number;
+        lat: number;
     }>;
+    /**
+     * Resolves the altitude information for the requested position.
+     *
+     * @param input Normalized tool input.
+     * @returns The altitude payload returned by the upstream service.
+     */
     execute(input: AltitudeInput): Promise<{
-        result: {
-            lon: number;
-            lat: number;
-            altitude: any;
-            accuracy: any;
-        };
+        lon: number;
+        lat: number;
+        altitude: number;
+        accuracy: string;
     }>;
 }
 export default AltitudeTool;

package/dist/tools/AltitudeTool.js

@@ -1,8 +1,13 @@
-import { MCPTool } from "mcp-framework";
+/**
+ * MCP tool exposing altitude lookup for a single geographic position.
+ */
+import BaseTool from "./BaseTool.js";
 import { z } from "zod";
 import { ALTITUDE_SOURCE, getAltitudeByLocation } from "../gpf/altitude.js";
 import { READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS } from "../helpers/toolAnnotations.js";
 import { lonSchema, latSchema } from "../helpers/schemas.js";
+import logger from "../logger.js";
+// --- Schema ---
 const altitudeInputSchema = z.object({
     lon: lonSchema,
     lat: latSchema,
@@ -13,20 +18,26 @@ const altitudeResultSchema = z.object({
     altitude: z.number().describe("L'altitude du point."),
     accuracy: z.string().describe("L'information de précision associée à l'altitude."),
 });
-const altitudeOutputSchema = z.object({
-    result: altitudeResultSchema.describe("Le résultat altimétrique pour la position demandée."),
-});
-class AltitudeTool extends MCPTool {
+const altitudeOutputSchema = altitudeResultSchema;
+// --- Tool ---
+class AltitudeTool extends BaseTool {
     name = "altitude";
     title = "Altitude d’une position";
     annotations = READ_ONLY_OPEN_WORLD_TOOL_ANNOTATIONS;
     description = `Renvoie l'altitude (en mètres) et la précision de la mesure (accuracy) d'un point géographique à partir de sa longitude et de sa latitude. (source : ${ALTITUDE_SOURCE}).`;
     outputSchemaShape = altitudeOutputSchema;
     schema = altitudeInputSchema;
+    /**
+     * Resolves the altitude information for the requested position.
+     *
+     * @param input Normalized tool input.
+     * @returns The altitude payload returned by the upstream service.
+     */
     async execute(input) {
-        return {
-            result: await getAltitudeByLocation(input.lon, input.lat),
-        };
+        logger.info(`[tool] execute ${this.name} ...`, {
+            input: input
+        });
+        return await getAltitudeByLocation(input.lon, input.lat);
     }
 }
 export default AltitudeTool;

package/dist/tools/AltitudeTool.js.map

@@ -1 +1 @@
-{"version":3,"file":"AltitudeTool.js","sourceRoot":"","sources":["../../src/tools/AltitudeTool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,EAAE,qCAAqC,EAAE,MAAM,+BAA+B,CAAC;AACtF,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IACnC,GAAG,EAAE,SAAS;IACd,GAAG,EAAE,SAAS;CACf,CAAC,CAAC,MAAM,EAAE,CAAC;AAIZ,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,wBAAwB,CAAC;IAClD,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,uBAAuB,CAAC;IACjD,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,sBAAsB,CAAC;IACrD,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mDAAmD,CAAC;CACnF,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,MAAM,EAAE,oBAAoB,CAAC,QAAQ,CAAC,qDAAqD,CAAC;CAC7F,CAAC,CAAC;AAEH,MAAM,YAAa,SAAQ,OAAsB;IAC/C,IAAI,GAAG,UAAU,CAAC;IAClB,KAAK,GAAG,yBAAyB,CAAC;IAClC,WAAW,GAAG,qCAAqC,CAAC;IACpD,WAAW,GAAG,wJAAwJ,eAAe,IAAI,CAAC;IAChL,iBAAiB,GAAG,oBAAoB,CAAC;IAEnD,MAAM,GAAG,mBAAmB,CAAC;IAE7B,KAAK,CAAC,OAAO,CAAC,KAAoB;QAChC,OAAO;YACL,MAAM,EAAE,MAAM,qBAAqB,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC;SAC1D,CAAC;IACJ,CAAC;CACF;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"AltitudeTool.js","sourceRoot":"","sources":["../../src/tools/AltitudeTool.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,QAAQ,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAC5E,OAAO,EAAE,qCAAqC,EAAE,MAAM,+BAA+B,CAAC;AACtF,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,iBAAiB;AAEjB,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IACnC,GAAG,EAAE,SAAS;IACd,GAAG,EAAE,SAAS;CACf,CAAC,CAAC,MAAM,EAAE,CAAC;AAMZ,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IACpC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,wBAAwB,CAAC;IAClD,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,uBAAuB,CAAC;IACjD,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,sBAAsB,CAAC;IACrD,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mDAAmD,CAAC;CACnF,CAAC,CAAC;AAEH,MAAM,oBAAoB,GAAG,oBAAoB,CAAC;AAElD,eAAe;AAEf,MAAM,YAAa,SAAQ,QAAuB;IAChD,IAAI,GAAG,UAAU,CAAC;IAClB,KAAK,GAAG,yBAAyB,CAAC;IAClC,WAAW,GAAG,qCAAqC,CAAC;IACpD,WAAW,GAAG,wJAAwJ,eAAe,IAAI,CAAC;IAChL,iBAAiB,GAAG,oBAAoB,CAAC;IAEnD,MAAM,GAAG,mBAAmB,CAAC;IAE7B;;;;;OAKG;IACH,KAAK,CAAC,OAAO,CAAC,KAAoB;QAChC,MAAM,CAAC,IAAI,CAAC,kBAAkB,IAAI,CAAC,IAAI,MAAM,EAAE;YAC7C,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;QAEH,OAAO,MAAM,qBAAqB,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;CACF;AAED,eAAe,YAAY,CAAC"}