@malloy-publisher/server 0.0.80 → 0.0.82

package/package.json

@@ -1,7 +1,7 @@
 {
    "name": "@malloy-publisher/server",
    "description": "Malloy Publisher Server",
-   "version": "0.0.80",
+   "version": "0.0.82",
    "main": "dist/server.js",
    "bin": {
       "malloy-publisher": "dist/server.js"

package/src/controller/connection.controller.ts

@@ -3,6 +3,7 @@ import { Connection, PersistSQLResults } from "@malloydata/malloy/connection";
 import { TableSourceDef } from "../../../../../malloy/packages/malloy/dist";
 import { components } from "../api";
 import { ConnectionError } from "../errors";
+import { logger } from "../logger";
 import {
    getSchemasForConnection,
    getTablesForSchema,
@@ -115,7 +116,7 @@ export class ConnectionController {
             columns: fields,
          };
       } catch (error) {
-         console.log("error", error);
+         logger.error("error", { error });
          throw new ConnectionError((error as Error).message);
       }
    }
@@ -134,7 +135,7 @@ export class ConnectionController {
       }
       if (runSQLOptions.abortSignal) {
          // Add support for abortSignal in the future
-         console.log("Clearing unsupported abortSignal");
+         logger.info("Clearing unsupported abortSignal");
          runSQLOptions.abortSignal = undefined;
       }
 

package/src/data_styles.ts

@@ -1,5 +1,6 @@
 import { URLReader } from "@malloydata/malloy";
 import { DataStyles } from "@malloydata/render";
+import { logger } from "./logger";
 
 export function compileDataStyles(styles: string): DataStyles {
    try {
@@ -26,7 +27,7 @@ export async function dataStylesForFile(
          try {
             stylesText = await urlReader.readURL(new URL(fileName, url));
          } catch (error) {
-            console.error(`Error loading data style '${fileName}': ${error}`);
+            logger.error(`Error loading data style '${fileName}': ${error}`);
             stylesText = "{}";
          }
          styles = { ...styles, ...compileDataStyles(stylesText) };

package/src/instrumentation.ts

@@ -11,17 +11,17 @@ import {
 import { PeriodicExportingMetricReader } from "@opentelemetry/sdk-metrics";
 import { BatchSpanProcessor } from "@opentelemetry/sdk-trace-base";
 import { BatchLogRecordProcessor } from "@opentelemetry/sdk-logs";
+import { logger } from "./logger";
 
 function instrument() {
    const otelCollectorUrl = process.env.OTEL_EXPORTER_OTLP_ENDPOINT;
    if (!otelCollectorUrl) {
-      console.log("No OTLP collector URL found, skipping instrumentation");
+      logger.info("No OTLP collector URL found, skipping instrumentation");
       return;
    }
 
-   console.log(
-      "Initializing OpenTelemetry SDK with OTLP collector at",
-      otelCollectorUrl,
+   logger.info(
+      `Initializing OpenTelemetry SDK with OTLP collector at ${otelCollectorUrl}`,
    );
    const traceExporter = new OTLPTraceExporter({
       url: `${otelCollectorUrl}/v1/traces`,
@@ -53,7 +53,7 @@ function instrument() {
    });
 
    sdk.start();
-   console.log("Initialized OpenTelemetry SDK");
+   logger.info("Initialized OpenTelemetry SDK");
 }
 
 instrument();

package/src/logger.ts

@@ -0,0 +1,46 @@
+import { AxiosError } from "axios";
+import { RequestHandler } from "express";
+import winston from "winston";
+
+export const logger = winston.createLogger({
+   format: winston.format.combine(
+      winston.format.uncolorize(),
+      winston.format.timestamp(),
+      winston.format.json(),
+   ),
+   transports: [new winston.transports.Console()],
+});
+
+export const loggerMiddleware: RequestHandler = (req, res, next) => {
+   const startTime = performance.now();
+   res.on("finish", () => {
+      const endTime = performance.now();
+      logger.info(`${req.method} ${req.url}`, {
+         statusCode: res.statusCode,
+         duration: endTime - startTime,
+      });
+   });
+   next();
+};
+
+export const logAxiosError = (error: AxiosError) => {
+   if (error.response) {
+      // The request was made and the server responded with a status code
+      // that falls out of the range of 2xx
+      logger.error("Axios error", {
+         data: error.response.data,
+         status: error.response.status,
+         headers: error.response.headers,
+      });
+   } else if (error.request) {
+      // The request was made but no response was received
+      // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+      // http.ClientRequest in node.js
+      logger.error("Failed to receive a response from the server", {
+         request: error.request,
+      });
+   } else {
+      // Something happened in setting up the request that triggered an Error
+      logger.error("Error", { error });
+   }
+};

package/src/mcp/handler_utils.ts

@@ -15,6 +15,7 @@ import {
    type ErrorDetails,
 } from "./error_messages";
 import type { Model } from "../service/model";
+import { logger } from "../logger";
 
 // Custom error to wrap specific GetResource application errors
 export class McpGetResourceError extends Error {
@@ -71,9 +72,9 @@ export async function handleResourceGet<
          ],
       };
    } catch (error) {
-      console.error(
+      logger.error(
          `[MCP Server Error] Error reading ${resourceType} ${uri.href}:`,
-         error,
+         { error },
       );
 
       let errorDetails: ErrorDetails;
@@ -84,9 +85,9 @@ export async function handleResourceGet<
          errorDetails = error.details;
       } else {
          // Catch-all for truly unexpected errors not handled by the specific getData logic
-         console.error(
+         logger.error(
             "[MCP Server Error] Unexpected error type caught in handleResourceGet:",
-            error,
+            { error },
          );
          errorDetails = getInternalError(
             `GetResource (${resourceType})`,
@@ -163,9 +164,9 @@ export async function getModelForQuery(
          // Unexpected error during setup
          errorDetails = getInternalError("executeQuery (Setup)", error);
       }
-      console.error(
+      logger.error(
          `[MCP Server Error] Error accessing package/model for query: ${projectName}/${packageName}/${modelPath}`,
-         error,
+         { error },
       );
       return { error: errorDetails };
    }

package/src/mcp/prompts/prompt_service.ts

@@ -1,8 +1,9 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { z } from "zod";
+import { logger } from "../../logger";
 import { ProjectStore } from "../../service/project_store";
-import { MALLOY_PROMPTS } from "./prompt_definitions";
 import { promptHandlerMap } from "./handlers";
-import { z } from "zod";
+import { MALLOY_PROMPTS } from "./prompt_definitions";
 
 /**
  * Registers all defined Malloy prompts with the MCP server.
@@ -14,8 +15,8 @@ export function registerPromptCapability(
    mcpServer: McpServer,
    projectStore: ProjectStore,
 ): void {
-   console.log("[MCP Init] Registering prompt capability...");
-   const startTime = Date.now();
+   logger.info("[MCP Init] Registering prompt capability...");
+   const startTime = performance.now();
    let registeredCount = 0;
 
    for (const promptKey in MALLOY_PROMPTS) {
@@ -44,24 +45,23 @@ export function registerPromptCapability(
          );
 
          registeredCount++;
-         console.log(
+         logger.info(
             `[MCP Prompt Reg] Registered prompt: ${promptDefinition.id}`,
          );
       } else if (!handler) {
-         console.warn(
+         logger.warn(
             `Handler not found for prompt: ${promptDefinition.id}. It will not be registered.`,
          );
       } else if (!(promptDefinition.argsSchema instanceof z.ZodObject)) {
-         console.warn(
+         logger.warn(
             `Prompt definition for ${promptDefinition.id} does not have a ZodObject schema. It will not be registered.`,
          );
       }
    }
 
-   const endTime = Date.now();
-   console.log(
-      `[MCP Init] Finished registering prompts. Registered: ${registeredCount}. Duration: ${
-         endTime - startTime
-      }ms`,
+   const endTime = performance.now();
+   logger.info(
+      `[MCP Init] Finished registering prompts. Registered: ${registeredCount}`,
+      { duration: endTime - startTime },
    );
 }

package/src/mcp/resources/notebook_resource.ts

@@ -2,21 +2,22 @@ import {
    McpServer,
    ResourceTemplate,
 } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { ProjectStore } from "../../service/project_store";
+import { URL } from "url";
+import type { components } from "../../api"; // Need this for CompiledModel type
 import {
+   ModelCompilationError,
    ModelNotFoundError,
    PackageNotFoundError,
-   ModelCompilationError,
 } from "../../errors";
-import { handleResourceGet, McpGetResourceError } from "../handler_utils";
-import { RESOURCE_METADATA } from "../resource_metadata";
+import { logger } from "../../logger";
+import { ProjectStore } from "../../service/project_store";
 import {
-   getNotFoundError,
-   getMalloyErrorDetails,
    getInternalError,
+   getMalloyErrorDetails,
+   getNotFoundError,
 } from "../error_messages";
-import type { components } from "../../api"; // Need this for CompiledModel type
-import { URL } from "url";
+import { handleResourceGet, McpGetResourceError } from "../handler_utils";
+import { RESOURCE_METADATA } from "../resource_metadata";
 
 // Define the expected parameter types
 type NotebookParams = {
@@ -119,9 +120,9 @@ export function registerNotebookResource(
                   }
 
                   // Handle other unexpected errors
-                  console.error(
+                  logger.error(
                      `[MCP Server Error] Error fetching notebook '${notebookName}' from ${uri.href}:`,
-                     error,
+                     { error },
                   );
                   const fallbackErrorDetails = getInternalError(
                      `GetResource (notebook: ${uri.href})`,

package/src/mcp/resources/package_resource.ts

@@ -1,22 +1,23 @@
-import { URL } from "url";
 import {
    McpServer,
    ResourceTemplate,
 } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
-import { ProjectStore } from "../../service/project_store";
+import { URL } from "url";
 import { PackageNotFoundError } from "../../errors";
+import { logger } from "../../logger";
+import { ProjectStore } from "../../service/project_store";
+import {
+   getInternalError,
+   getNotFoundError,
+   type ErrorDetails,
+} from "../error_messages";
 import {
+   buildMalloyUri,
    handleResourceGet,
    McpGetResourceError,
-   buildMalloyUri,
 } from "../handler_utils";
 import { RESOURCE_METADATA } from "../resource_metadata";
-import {
-   getNotFoundError,
-   getInternalError,
-   type ErrorDetails,
-} from "../error_messages";
 
 // *** Define handleGetPackageContents function ***
 async function handleGetPackageContents(
@@ -47,7 +48,7 @@ async function handleGetPackageContents(
          const entryType = entry.type; // 'source' or 'notebook'
 
          if (typeof entryPath !== "string" || entryPath === "") {
-            console.warn(
+            logger.warn(
                `[MCP Server Warning] Skipping entry in package ${packageName} with invalid path:`,
                entry,
             );
@@ -64,7 +65,7 @@ async function handleGetPackageContents(
             case "notebook": {
                const resourceMetadata = RESOURCE_METADATA.notebook;
                if (!resourceMetadata) {
-                  console.warn(
+                  logger.warn(
                      `[MCP Server Warning] No metadata found for entry type 'notebook' path ${entryPath} in package ${packageName}`,
                   );
                   continue;
@@ -84,7 +85,7 @@ async function handleGetPackageContents(
                // 1. Add the source file itself
                const sourceResourceMetadata = RESOURCE_METADATA.source;
                if (!sourceResourceMetadata) {
-                  console.warn(
+                  logger.warn(
                      `[MCP Server Warning] No metadata found for entry type 'source' path ${entryPath} in package ${packageName}`,
                   );
                   // Continue processing views even if source metadata is missing
@@ -114,7 +115,7 @@ async function handleGetPackageContents(
                                  const viewResourceMetadata =
                                     RESOURCE_METADATA.view;
                                  if (!viewResourceMetadata) {
-                                    console.warn(
+                                    logger.warn(
                                        `[MCP Server Warning] No metadata found for entry type 'view' named '${view.name}' in source '${source.name}'`,
                                     );
                                     continue;
@@ -135,25 +136,25 @@ async function handleGetPackageContents(
                            }
                         }
                      } else {
-                        console.warn(
+                        logger.warn(
                            `[MCP Server Warning] Could not retrieve sources or sources is not an array for model ${entryPath}`,
                         );
                      }
                   } else {
-                     console.warn(
+                     logger.warn(
                         `[MCP Server Warning] Could not load model for path ${entryPath} to extract views.`,
                      );
                   }
                } catch (modelLoadError) {
                   // Log error if model loading fails, but continue processing other files
-                  console.warn(
+                  logger.warn(
                      `[MCP Server Warning] Failed to load model ${entryPath} to extract views: ${modelLoadError instanceof Error ? modelLoadError.message : String(modelLoadError)}`,
                   );
                }
                break;
             }
             default:
-               console.warn(
+               logger.warn(
                   `[MCP Server Warning] Unknown entry type '${entryType}' for path ${entryPath} in package ${packageName}`,
                );
                continue; // Skip unknown types
@@ -176,9 +177,9 @@ async function handleGetPackageContents(
             `Invalid project/package identifier in URI '${uri.href}'`,
          );
       } else {
-         console.error(
+         logger.error(
             `[MCP Server Error] Error getting package contents for ${uri.href}:`,
-            error,
+            { error },
          );
          errorDetails = getInternalError(
             `GetResource (package contents: ${uri.href})`,
@@ -305,9 +306,9 @@ export function registerPackageResource(
                ],
             };
          } catch (error) {
-            console.error(
+            logger.error(
                `[MCP Server Error] Error reading package contents ${uri.href}:`,
-               error,
+               { error },
             );
 
             let errorDetails: ErrorDetails;

package/src/mcp/resources/project_resource.ts

@@ -3,10 +3,11 @@ import {
    ResourceTemplate,
 } from "@modelcontextprotocol/sdk/server/mcp.js";
 import type { ListResourcesResult } from "@modelcontextprotocol/sdk/types.js"; // Needed for list return type
+import { logger } from "../../logger";
 import { ProjectStore } from "../../service/project_store";
+import { getInternalError, getNotFoundError } from "../error_messages"; // Needed for error handling in list AND get
 import { handleResourceGet, McpGetResourceError } from "../handler_utils";
 import { RESOURCE_METADATA } from "../resource_metadata";
-import { getInternalError, getNotFoundError } from "../error_messages"; // Needed for error handling in list AND get
 
 // Define an interface for the package object augmented with project name
 interface PackageWithProject {
@@ -32,20 +33,20 @@ export function registerProjectResource(
           * If projectName is not specified (general ListResources call), lists packages for the default 'home' project.
           */
          list: async (/* extra: ListProjectExtra - Deleted */): Promise<ListResourcesResult> => {
-            console.log(
+            logger.info(
                "[MCP LOG] Entering ListResources (project) handler (listing ALL packages)...",
             );
             // Ignore parameters from 'extra' as URI path params aren't passed to list handlers.
 
             try {
                const allProjects = await projectStore.listProjects();
-               console.log(
+               logger.info(
                   `[MCP LOG] Found ${allProjects.length} projects defined.`,
                );
 
                const packagePromises = allProjects.map(async (proj) => {
                   try {
-                     console.log(
+                     logger.info(
                         `[MCP LOG] Getting project '${proj.name}' to list its packages...`,
                      );
                      const projectInstance = await projectStore.getProject(
@@ -53,7 +54,7 @@ export function registerProjectResource(
                         false,
                      ); // Use proj.name
                      const packages = await projectInstance.listPackages();
-                     console.log(
+                     logger.info(
                         `[MCP LOG] Found ${packages.length} packages in project '${proj.name}'.`,
                      );
                      // Return packages along with their project name for URI construction
@@ -62,9 +63,9 @@ export function registerProjectResource(
                         projectName: proj.name,
                      }));
                   } catch (projectError) {
-                     console.error(
+                     logger.error(
                         `[MCP Server Error] Error getting/listing packages for project ${proj.name}:`,
-                        projectError,
+                        { error: projectError },
                      );
                      return []; // Return empty array for this project on error
                   }
@@ -80,7 +81,7 @@ export function registerProjectResource(
                            .value,
                   );
 
-               console.log(
+               logger.info(
                   `[MCP LOG] Total packages found across all projects: ${allPackagesWithProjectName.length}`,
                );
 
@@ -100,7 +101,7 @@ export function registerProjectResource(
                   };
                });
 
-               console.log(
+               logger.info(
                   `[MCP LOG] ListResources (project): Returning ${mappedResources.length} package resources.`,
                );
                return {
@@ -108,19 +109,17 @@ export function registerProjectResource(
                };
             } catch (error) {
                // Catch errors from projectStore.listProjects() itself
-               console.error(
-                  `[MCP Server Error] Error listing projects:`,
+               logger.error(`[MCP Server Error] Error listing projects:`, {
                   error,
-               );
+               });
                const errorDetails = getInternalError(
                   `ListResources (project - initial list)`,
                   error,
                );
-               console.error(
-                  "MCP ListResources (project) error:",
-                  errorDetails.message,
-               );
-               console.log(
+               logger.error("MCP ListResources (project) error:", {
+                  error: errorDetails.message,
+               });
+               logger.info(
                   "[MCP LOG] ListResources (project): Returning empty on error listing projects.",
                );
                return { resources: [] };
@@ -134,34 +133,34 @@ export function registerProjectResource(
             params,
             "project",
             async ({ projectName }: { projectName?: unknown }) => {
-               console.log(
+               logger.info(
                   `[MCP LOG] Entering GetResource (project) handler for projectName: ${projectName}`,
                );
                // Validate project name parameter
                if (typeof projectName !== "string") {
-                  console.error(
+                  logger.error(
                      "[MCP LOG] GetResource (project): Invalid project name param.",
                   );
                   throw new Error("Invalid project name parameter.");
                }
 
                try {
-                  console.log(
+                  logger.info(
                      `[MCP LOG] GetResource: Getting project '${projectName}'...`,
                   );
                   // Get the project instance, but we might not need its metadata directly
                   await projectStore.getProject(projectName, false);
                   // Construct the definition object expected by the test
                   const definition = { name: projectName };
-                  console.log(
+                  logger.info(
                      `[MCP LOG] GetResource (project): Returning definition for '${projectName}'.`,
                   );
                   // Return the explicit definition structure
                   return definition;
                } catch (error) {
-                  console.error(
+                  logger.error(
                      `[MCP LOG] GetResource (project): Error caught for '${projectName}':`,
-                     error,
+                     { error },
                   );
                   // Catch expected errors from this specific resource logic
                   if (error instanceof Error) {

package/src/mcp/resources/query_resource.ts

@@ -2,21 +2,22 @@ import {
    McpServer,
    ResourceTemplate,
 } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { ProjectStore } from "../../service/project_store";
+import { URL } from "url";
+import type { components } from "../../api"; // Need this for Query definition type
 import { ModelCompilationError } from "../../errors";
+import { logger } from "../../logger";
+import { ProjectStore } from "../../service/project_store";
+import {
+   getInternalError,
+   getMalloyErrorDetails,
+   getNotFoundError,
+} from "../error_messages";
 import {
+   getModelForQuery,
    handleResourceGet,
    McpGetResourceError,
-   getModelForQuery,
 } from "../handler_utils";
 import { RESOURCE_METADATA } from "../resource_metadata";
-import {
-   getNotFoundError,
-   getMalloyErrorDetails,
-   getInternalError,
-} from "../error_messages";
-import type { components } from "../../api"; // Need this for Query definition type
-import { URL } from "url";
 
 // Define the expected parameter types
 type QueryParams = {
@@ -99,9 +100,9 @@ export function registerQueryResource(
                      );
                      throw new McpGetResourceError(errorDetails);
                   }
-                  console.error(
+                  logger.error(
                      `[MCP Server Error] Error fetching query '${queryName}' from ${uri.href}:`,
-                     error,
+                     { error },
                   );
                   const fallbackErrorDetails = getInternalError(
                      `GetResource (query: ${uri.href})`,

package/src/mcp/resources/source_resource.ts

@@ -1,22 +1,23 @@
-import { URL } from "url"; // Import URL
 import {
    McpServer,
    ResourceTemplate,
 } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { ProjectStore } from "../../service/project_store";
+import { URL } from "url"; // Import URL
+import type { components } from "../../api"; // Need this for Source definition type
 import { ModelCompilationError } from "../../errors";
+import { logger } from "../../logger";
+import { ProjectStore } from "../../service/project_store";
+import {
+   getInternalError,
+   getMalloyErrorDetails,
+   getNotFoundError,
+} from "../error_messages";
 import {
+   getModelForQuery,
    handleResourceGet,
    McpGetResourceError,
-   getModelForQuery,
 } from "../handler_utils";
 import { RESOURCE_METADATA } from "../resource_metadata";
-import {
-   getNotFoundError,
-   getMalloyErrorDetails,
-   getInternalError,
-} from "../error_messages";
-import type { components } from "../../api"; // Need this for Source definition type
 
 // Define the expected parameter types for this resource
 type SourceParams = {
@@ -119,9 +120,9 @@ export function registerSourceResource(
                      throw new McpGetResourceError(errorDetails);
                   }
                   // Handle other potential errors (e.g., invalid params error from initial check)
-                  console.error(
+                  logger.error(
                      `[MCP Server Error] Error fetching source '${sourceName}' from ${uri.href}:`,
-                     error,
+                     { error },
                   );
                   // Fallback: Use getInternalError for unexpected issues
                   // Or getNotFoundError if it's likely a resource access issue

package/src/mcp/resources/view_resource.ts

@@ -2,21 +2,22 @@ import {
    McpServer,
    ResourceTemplate,
 } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { ProjectStore } from "../../service/project_store";
+import { URL } from "url";
+import type { components } from "../../api"; // Need this for View definition type
 import { ModelCompilationError } from "../../errors";
+import { logger } from "../../logger";
+import { ProjectStore } from "../../service/project_store";
+import {
+   getInternalError,
+   getMalloyErrorDetails,
+   getNotFoundError,
+} from "../error_messages";
 import {
+   getModelForQuery,
    handleResourceGet,
    McpGetResourceError,
-   getModelForQuery,
 } from "../handler_utils";
 import { RESOURCE_METADATA } from "../resource_metadata";
-import {
-   getNotFoundError,
-   getMalloyErrorDetails,
-   getInternalError,
-} from "../error_messages";
-import type { components } from "../../api"; // Need this for View definition type
-import { URL } from "url";
 
 // Define the expected parameter types
 type ViewParams = {
@@ -118,9 +119,9 @@ export function registerViewResource(
                      );
                      throw new McpGetResourceError(errorDetails);
                   }
-                  console.error(
+                  logger.error(
                      `[MCP Server Error] Error fetching view '${viewName}' from ${uri.href}:`,
-                     error,
+                     { error },
                   );
                   const fallbackErrorDetails = getInternalError(
                      `GetResource (view: ${uri.href})`,