@malloy-publisher/server 0.0.235 → 0.0.236

package/tests/fixtures/persist-schedule-warn-test/persist_warn_test.malloy

@@ -1,11 +0,0 @@
-##! experimental.persistence
-
-source: raw_orders is duckdb.table('data/orders.csv')
-
-#@ persist name="order_summary"
-source: order_summary is raw_orders -> {
-  group_by: category
-  aggregate:
-    total_orders is count()
-    total_revenue is amount.sum()
-}

package/tests/fixtures/persist-schedule-warn-test/publisher.json

@@ -1,6 +0,0 @@
-{
-   "name": "persist-schedule-warn-test",
-   "version": "1.0.0",
-   "description": "DuckDB persist fixture with a schedule but no version scope — a load-tolerated persistence-policy warning (schedule requires scope: version)",
-   "materialization": { "schedule": "0 6 * * *" }
-}

package/tests/fixtures/persist-test/data/orders.csv

@@ -1,5 +0,0 @@
-category,amount
-electronics,100
-clothing,50
-electronics,200
-clothing,75

package/tests/fixtures/persist-test/persist_test.malloy

@@ -1,11 +0,0 @@
-##! experimental.persistence
-
-source: raw_orders is duckdb.table('data/orders.csv')
-
-#@ persist name="order_summary"
-source: order_summary is raw_orders -> {
-  group_by: category
-  aggregate:
-    total_orders is count()
-    total_revenue is amount.sum()
-}

package/tests/fixtures/persist-test/publisher.json

@@ -1,5 +0,0 @@
-{
-  "name": "persist-test",
-  "version": "1.0.0",
-  "description": "DuckDB persist test fixture"
-}

package/tests/fixtures/publisher.config.json

@@ -1,15 +0,0 @@
-{
-  "frozenConfig": false,
-  "environments": [
-    {
-      "name": "test-project",
-      "packages": [
-        {
-          "name": "persist-test",
-          "location": "./persist-test"
-        }
-      ],
-      "connections": []
-    }
-  ]
-}

package/tests/fixtures/query-givens/data/orders.csv

@@ -1,7 +0,0 @@
-id,region,status,amount
-1,US,active,100
-2,US,active,200
-3,US,cancelled,50
-4,EU,active,300
-5,EU,cancelled,400
-6,EU,active,500

package/tests/fixtures/query-givens/model.malloy

@@ -1,34 +0,0 @@
-##! experimental.givens
-
-given: target_region :: string is 'US'
-given: min_amount :: number is 0
-given: role :: string is 'guest'
-
-#(filter) dimension=status type=equal
-source: orders is duckdb.table('data/orders.csv') extend {
-   primary_key: id
-
-   measure:
-      order_count is count()
-
-   view: by_given_region is {
-      where: region = $target_region and amount >= $min_amount
-      aggregate: order_count
-   }
-}
-
-// Gated variant for authorize-interaction coverage: only $role = 'admin' may
-// read it. Shares the givens above so we can prove the name-vs-value-vs-authorize
-// status matrix on a gated source.
-#(authorize) "$role = 'admin'"
-source: gated_orders is duckdb.table('data/orders.csv') extend {
-   primary_key: id
-
-   measure:
-      order_count is count()
-
-   view: by_given_region is {
-      where: region = $target_region and amount >= $min_amount
-      aggregate: order_count
-   }
-}

package/tests/fixtures/query-givens/publisher.json

@@ -1,5 +0,0 @@
-{
-  "name": "query-givens",
-  "version": "1.0.0",
-  "description": "Fixture for /query givens forwarding (server + SDK)"
-}

package/tests/harness/mcp_test_setup.ts

@@ -1,332 +0,0 @@
-import { Client } from "@modelcontextprotocol/sdk/client/index.js";
-import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
-import {
-   Notification,
-   Request,
-   Result,
-} from "@modelcontextprotocol/sdk/types.js";
-import { Mutex } from "async-mutex";
-import http from "http";
-import { AddressInfo } from "net";
-import path from "path";
-import { fileURLToPath } from "url";
-import { URL } from "url";
-
-// --- Real Server Import ---
-// Import the actual configured Express app instance
-
-// --- E2E Test Environment Setup ---
-
-export interface McpE2ETestEnvironment {
-   httpServer: http.Server;
-   serverUrl: string;
-   mcpClient: Client<Request, Notification, Result>;
-   originalServerRoot: string | undefined;
-   originalInitializeStorage: string | undefined;
-}
-
-// Counter for unique port assignment per test suite (incremented only under e2eSetupMutex)
-let portCounter = 0;
-
-// True mutex: the previous Promise-based lock had a TOCTOU race where two beforeAll hooks
-// could both pass the `if (initializationLock)` check and run setup concurrently, sharing
-// one publisher.db / server singleton and causing flaky tool calls and port collisions.
-const e2eSetupMutex = new Mutex();
-
-/**
- * Starts the real application server and connects a real MCP client.
- */
-export async function setupE2ETestEnvironment(): Promise<McpE2ETestEnvironment> {
-   return e2eSetupMutex.runExclusive(async () => {
-      console.log(
-         "[E2E Test Setup] Acquired setup mutex; starting environment...",
-      );
-      return setupE2ETestEnvironmentInternal();
-   });
-}
-
-async function setupE2ETestEnvironmentInternal(): Promise<McpE2ETestEnvironment> {
-   // --- Store and Set SERVER_ROOT Env Var ---
-   // The EnvironmentStore relies on SERVER_ROOT to find publisher.config.json.
-   const originalServerRoot = process.env.SERVER_ROOT; // Store original value
-   // Resolve the path to 'packages/server' based on the location of this file
-   // Use import.meta.url for cross-platform compatibility (works on Windows)
-   const __filename = fileURLToPath(import.meta.url);
-   const __dirname = path.dirname(__filename);
-   const serverPackageDir = path.resolve(__dirname, "../../"); // Go up two levels from .../packages/server/tests/harness
-   process.env.SERVER_ROOT = serverPackageDir;
-   console.log(
-      `[E2E Test Setup] Temporarily set SERVER_ROOT=${process.env.SERVER_ROOT}`,
-   );
-
-   // --- Set INITIALIZE_STORAGE to ensure packages are downloaded ---
-   // This ensures packages from GitHub are cloned/downloaded during initialization
-   const originalInitializeStorage = process.env.INITIALIZE_STORAGE; // Store original value
-   process.env.INITIALIZE_STORAGE = "true";
-   console.log(
-      `[E2E Test Setup] Temporarily set INITIALIZE_STORAGE=${process.env.INITIALIZE_STORAGE}`,
-   );
-
-   // --- IMPORTANT: Import server *after* setting env var ---
-   // Dynamically import the actual app instance
-   const { mcpApp } = await import("../../src/server");
-
-   let serverInstance: http.Server;
-   let serverUrl: string;
-
-   // Use unique port per test suite to avoid conflicts when running in parallel
-   // Increment port counter and use it to create unique ports: 4042, 4043, 4044, etc.
-   const portOffset = portCounter++;
-   const TEST_MCP_PORT = Number(process.env.MCP_PORT || 4040) + 2 + portOffset;
-
-   await new Promise<void>((resolve, reject) => {
-      const server = http
-         .createServer(mcpApp)
-         .listen(TEST_MCP_PORT, "127.0.0.1", () => {
-            // Use explicit TEST_MCP_PORT
-            try {
-               const address = server.address() as AddressInfo;
-               if (!address)
-                  throw new Error("Server address is null after listen");
-               serverInstance = server;
-               serverUrl = `http://127.0.0.1:${TEST_MCP_PORT}`;
-               console.log(
-                  `[E2E Test Setup] Real server (using mcpApp) listening on ${serverUrl} (Port: ${TEST_MCP_PORT})`,
-               );
-               resolve();
-            } catch (err) {
-               reject(err);
-            }
-         });
-      server.on("error", (err: NodeJS.ErrnoException) => {
-         // Provide more specific error info if available (like EADDRINUSE)
-         console.error(
-            `[E2E Test Setup] Server failed to start on port ${TEST_MCP_PORT}: ${err.code} - ${err.message}`,
-         );
-         reject(err);
-      });
-   });
-
-   // Ensure serverInstance and serverUrl are assigned
-   const listeningServerInstance = serverInstance!;
-   const listeningServerUrl = serverUrl!;
-
-   // --- Wait a moment for server to start accepting connections ---
-   console.log("[E2E Test Setup] Waiting for server to accept connections...");
-   await new Promise((resolve) => setTimeout(resolve, 1000));
-
-   // --- Wait for server to be ready (packages downloaded) ---
-   // Poll the readiness endpoint to ensure initialization completes before tests run
-   // Allow >90s: cold CI can spend most of the budget on clone + package load before markReady().
-   console.log("[E2E Test Setup] Waiting for server to be ready...");
-   const maxWaitTime = 150000; // 150 seconds (INITIALIZE_STORAGE + large samples can be slow)
-   const pollInterval = 1000; // Check every second
-   const startTime = Date.now();
-   let isReady = false;
-
-   while (!isReady && Date.now() - startTime < maxWaitTime) {
-      try {
-         // Use Promise.race to add timeout to fetch
-         const fetchPromise = fetch(`${listeningServerUrl}/health/readiness`);
-         const timeoutPromise = new Promise<never>((_, reject) =>
-            setTimeout(() => reject(new Error("Fetch timeout")), 5000),
-         );
-         const response = await Promise.race([fetchPromise, timeoutPromise]);
-
-         if (response.ok) {
-            const data = await response.json();
-            if (data.status === "UP") {
-               isReady = true;
-               console.log("[E2E Test Setup] Server is ready.");
-               break;
-            } else {
-               console.log(
-                  `[E2E Test Setup] Server not ready yet (status: ${data.status}), waiting... (${Math.round((Date.now() - startTime) / 1000)}s)`,
-               );
-            }
-         } else {
-            console.log(
-               `[E2E Test Setup] Readiness check returned ${response.status}, waiting... (${Math.round((Date.now() - startTime) / 1000)}s)`,
-            );
-         }
-      } catch (error) {
-         // Server might not be ready yet, continue polling
-         const errorMsg =
-            error instanceof Error ? error.message : String(error);
-         // Only log every 5 seconds to reduce noise
-         const elapsed = Math.round((Date.now() - startTime) / 1000);
-         if (elapsed % 5 === 0) {
-            console.log(
-               `[E2E Test Setup] Readiness check failed (${errorMsg}), waiting... (${elapsed}s)`,
-            );
-         }
-      }
-      await new Promise((resolve) => setTimeout(resolve, pollInterval));
-   }
-
-   if (!isReady) {
-      // Cleanup before throwing
-      if (listeningServerInstance?.listening) {
-         listeningServerInstance.closeAllConnections?.();
-         await new Promise<void>((res) =>
-            listeningServerInstance.close(() => res()),
-         );
-      }
-      throw new Error(
-         `Server did not become ready within ${maxWaitTime / 1000} seconds. Package downloads may have failed.`,
-      );
-   }
-
-   // --- Client Setup ---
-   const mcpClient = new Client<Request, Notification, Result>({
-      name: "mcp-e2e-test-client",
-      version: "1.0",
-   });
-
-   // Use StreamableHTTPClientTransport, connecting to the base URL + /mcp endpoint
-   const mcpEndpointPath = "/mcp"; // Matches the endpoint used in server.ts
-   const clientTransport = new StreamableHTTPClientTransport(
-      new URL(`${listeningServerUrl}${mcpEndpointPath}`),
-   );
-
-   // Connect client (with timeout)
-   console.log(
-      `[E2E Test Setup] Connecting MCP client to ${listeningServerUrl}${mcpEndpointPath} ...`,
-   );
-   let connectTimeout: NodeJS.Timeout | null = null;
-   try {
-      const connectPromise = mcpClient.connect(clientTransport);
-      const timeoutPromise = new Promise((_, reject) => {
-         connectTimeout = setTimeout(() => {
-            reject(
-               new Error("[E2E Test Setup] Client connection timeout (5s)"),
-            );
-         }, 5000);
-      });
-      await Promise.race([connectPromise, timeoutPromise]);
-      console.log("[E2E Test Setup] MCP client connected.");
-   } catch (error) {
-      console.error("[E2E Test Setup] MCP Client connection failed:", error);
-      // Attempt cleanup even if connection failed
-      await mcpClient
-         ?.close()
-         .catch(() =>
-            console.error("[E2E Test Setup] Error closing failed client:"),
-         );
-      if (listeningServerInstance?.listening) {
-         listeningServerInstance.closeAllConnections?.(); // Force close connections
-         await new Promise<void>((res) =>
-            listeningServerInstance.close(() => res()),
-         );
-      }
-      throw error;
-   } finally {
-      if (connectTimeout) clearTimeout(connectTimeout);
-   }
-
-   // --- Return Environment ---
-   return {
-      httpServer: listeningServerInstance,
-      serverUrl: listeningServerUrl,
-      mcpClient,
-      originalServerRoot,
-      originalInitializeStorage,
-   };
-}
-
-/**
- * Cleans up the E2E test environment by closing the client and server.
- */
-export async function cleanupE2ETestEnvironment(
-   env: McpE2ETestEnvironment | null,
-): Promise<void> {
-   if (!env) {
-      // Attempt cleanup even if env is null (e.g., setup failed after config creation)
-      return;
-   }
-
-   // --- Restore Original SERVER_ROOT and INITIALIZE_STORAGE ---
-   // Restore the original SERVER_ROOT value after tests are complete.
-   const { originalServerRoot, originalInitializeStorage } = env;
-   if (originalServerRoot === undefined) {
-      delete process.env.SERVER_ROOT;
-      console.log("[E2E Test Cleanup] Restored SERVER_ROOT (deleted)");
-   } else {
-      process.env.SERVER_ROOT = originalServerRoot;
-      console.log(
-         `[E2E Test Cleanup] Restored SERVER_ROOT=${process.env.SERVER_ROOT}`,
-      );
-   }
-
-   // Restore the original INITIALIZE_STORAGE value after tests are complete.
-   if (originalInitializeStorage === undefined) {
-      delete process.env.INITIALIZE_STORAGE;
-      console.log("[E2E Test Cleanup] Restored INITIALIZE_STORAGE (deleted)");
-   } else {
-      process.env.INITIALIZE_STORAGE = originalInitializeStorage;
-      console.log(
-         `[E2E Test Cleanup] Restored INITIALIZE_STORAGE=${process.env.INITIALIZE_STORAGE}`,
-      );
-   }
-
-   const { mcpClient, httpServer } = env;
-
-   // 1. Close client first (with timeout)
-   if (mcpClient) {
-      try {
-         const closePromise = mcpClient.close();
-         const timeoutPromise = new Promise<void>((_, reject) => {
-            setTimeout(() => reject(new Error("Client close timeout")), 5000);
-         });
-         await Promise.race([closePromise, timeoutPromise]);
-      } catch (error) {
-         // Ignore client close errors during cleanup potentially
-         console.warn(
-            "[E2E Test Cleanup] Error closing MCP client (ignoring):",
-            error instanceof Error ? error.message : String(error),
-         );
-      }
-   }
-
-   // 2. Close HTTP server connections and then the server itself (with timeout)
-   if (httpServer) {
-      // Force close any remaining connections immediately
-      httpServer.closeAllConnections?.();
-
-      if (httpServer.listening) {
-         try {
-            const closePromise = new Promise<void>((resolve, reject) => {
-               const timeout = setTimeout(() => {
-                  reject(new Error("Server close timeout"));
-               }, 5000);
-               httpServer.close((err: NodeJS.ErrnoException | undefined) => {
-                  clearTimeout(timeout);
-                  if (err && err.code !== "ERR_SERVER_NOT_RUNNING") {
-                     console.error(
-                        "[E2E Test Cleanup] Error closing HTTP server (after closing connections):",
-                        err,
-                     );
-                  } else if (!err) {
-                     console.log("[E2E Test Cleanup] HTTP server closed.");
-                  }
-                  resolve();
-               });
-            });
-            await closePromise;
-         } catch (error) {
-            console.warn(
-               "[E2E Test Cleanup] Server close timeout or error (forcing close):",
-               error instanceof Error ? error.message : String(error),
-            );
-            // Force destroy if close times out
-            if (httpServer.listening) {
-               httpServer.closeAllConnections?.();
-            }
-         }
-      } else {
-         console.log(
-            "[E2E Test Cleanup] HTTP server was not listening or already closed.",
-         );
-      }
-   }
-}

package/tests/harness/rest_e2e.ts

@@ -1,68 +0,0 @@
-import http from "http";
-
-export interface RestE2EEnv {
-   httpServer: http.Server;
-   baseUrl: string;
-}
-
-/**
- * Spin up an HTTP server wrapping the real Express REST app.
- *
- * Works regardless of which test file first imported server.ts —
- * reuses the cached Express app and binds on an OS-assigned port
- * to avoid collisions.
- *
- * Callers are responsible for creating any test-specific environments
- * via the REST API (POST /api/v0/environments) and cleaning them up.
- */
-export async function startRestE2E(): Promise<
-   RestE2EEnv & { stop(): Promise<void> }
-> {
-   const { app } = await import("../../src/server");
-
-   const httpServer: http.Server = await new Promise<http.Server>(
-      (resolve, reject) => {
-         const srv = http
-            .createServer(app)
-            .listen(0, "127.0.0.1", () => resolve(srv));
-         srv.on("error", (err: NodeJS.ErrnoException) => {
-            console.error("[REST E2E] server listen error", err);
-            reject(err);
-         });
-      },
-   );
-
-   const addr = httpServer.address() as { port: number };
-   const baseUrl = `http://127.0.0.1:${addr.port}`;
-
-   const maxWait = 180_000;
-   const start = Date.now();
-   let ready = false;
-   while (!ready && Date.now() - start < maxWait) {
-      try {
-         const res = await fetch(`${baseUrl}/health/readiness`);
-         if (res.ok) {
-            const data = (await res.json()) as { status: string };
-            if (data.status === "UP") {
-               ready = true;
-               break;
-            }
-         }
-      } catch {
-         // server not ready yet
-      }
-      await new Promise((r) => setTimeout(r, 500));
-   }
-   if (!ready) {
-      httpServer.closeAllConnections?.();
-      await new Promise<void>((r) => httpServer.close(() => r()));
-      throw new Error("REST E2E server did not become ready in time");
-   }
-
-   const stop = async (): Promise<void> => {
-      httpServer.closeAllConnections?.();
-      await new Promise<void>((r) => httpServer.close(() => r()));
-   };
-
-   return { httpServer, baseUrl, stop };
-}

package/tests/integration/authorize/compile_authorize_http.integration.spec.ts

@@ -1,92 +0,0 @@
-import { afterAll, beforeAll, describe, expect, it } from "bun:test";
-import path from "path";
-import { fileURLToPath } from "url";
-import { type RestE2EEnv, startRestE2E } from "../../harness/rest_e2e";
-
-// HTTP end-to-end for the /compile authorize gate: proves AccessDeniedError
-// surfaces as a real 403 body through the express route + internalErrorToHttpError,
-// and that the 403 names only the source (never the gate expression).
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const PROJECT = "authorize-compile-test-project";
-const PKG = "authorize-compile";
-const MODEL = "model.malloy";
-
-describe("compile authorize gate (HTTP E2E)", () => {
-   let env: (RestE2EEnv & { stop(): Promise<void> }) | null = null;
-   let baseUrl: string;
-
-   beforeAll(async () => {
-      env = await startRestE2E();
-      baseUrl = env.baseUrl;
-      const fixtureDir = path.resolve(
-         __dirname,
-         "../../fixtures/authorize-compile",
-      );
-      const createRes = await fetch(`${baseUrl}/api/v0/projects`, {
-         method: "POST",
-         headers: { "Content-Type": "application/json" },
-         body: JSON.stringify({
-            name: PROJECT,
-            packages: [{ name: PKG, location: fixtureDir }],
-            connections: [],
-         }),
-      });
-      if (!createRes.ok) {
-         throw new Error(
-            `Failed to create test project (${createRes.status}): ${await createRes.text()}`,
-         );
-      }
-      const deadline = Date.now() + 30_000;
-      while (Date.now() < deadline) {
-         const res = await fetch(
-            `${baseUrl}/api/v0/projects/${PROJECT}/packages/${PKG}`,
-         );
-         if (res.ok) break;
-         await new Promise((r) => setTimeout(r, 250));
-      }
-   });
-
-   afterAll(async () => {
-      await env?.stop();
-   });
-
-   const compile = (body: unknown) =>
-      fetch(
-         `${baseUrl}/api/v0/environments/${PROJECT}/packages/${PKG}/models/${MODEL}/compile`,
-         {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify(body),
-         },
-      );
-
-   it("returns 403 with a source-only message when the gate is not satisfied", async () => {
-      const res = await compile({
-         source: "run: gated -> { aggregate: c }",
-         givens: {},
-      });
-      expect(res.status).toBe(403);
-      const json = (await res.json()) as { code: number; message: string };
-      expect(json.code).toBe(403);
-      expect(json.message).toBe('Access denied for source "gated".');
-      // Redaction: the runtime 403 must NOT leak the authorize expression.
-      expect(json.message).not.toContain("ROLE");
-      expect(json.message).not.toContain("analyst");
-   });
-
-   it("returns 200 when a satisfying given is supplied", async () => {
-      const res = await compile({
-         source: "run: gated -> { aggregate: c }",
-         givens: { ROLE: "analyst" },
-      });
-      expect(res.status).toBe(200);
-   });
-
-   it("compiles an ungated source without any given", async () => {
-      const res = await compile({
-         source: "run: open_src -> { aggregate: c }",
-      });
-      expect(res.status).toBe(200);
-   });
-});