@malloy-publisher/server 0.0.235 → 0.0.237

package/src/oom_guards.integration.spec.ts

@@ -1,269 +0,0 @@
-/**
- * End-to-end integration test for the OOM-mitigation guardrails
- * (Steps 1-6). Mounts a real Express app with the same middleware
- * + controller wiring `server.ts` uses, then exercises each layer
- * of the defense via HTTP requests.
- *
- * What's covered, in firing order:
- *   1. Admission gate — memory governor flags back-pressure →
- *      `ConnectionController` short-circuits with 503 BEFORE the
- *      connector is touched.
- *   2. Concurrency middleware — when the pod is at
- *      `PUBLISHER_MAX_CONCURRENT_QUERIES`, new requests get 503
- *      BEFORE the controller is invoked.
- *   3. Timeout — when the underlying driver takes longer than
- *      `PUBLISHER_QUERY_TIMEOUT_MS`, the request gets 504 and the
- *      abort signal fires.
- *   4. Row cap — when the driver returns more rows than
- *      `PUBLISHER_MAX_QUERY_ROWS`, the request gets 413.
- *
- * Mocked: only the Malloy `Connection.runSQL`. Everything else
- * (admission gate, concurrency middleware, timeout helper, cap
- * detection, error-to-HTTP mapping) is real production code.
- */
-
-import type { Connection, RunSQLOptions } from "@malloydata/malloy";
-import { afterEach, beforeEach, describe, expect, it } from "bun:test";
-import express from "express";
-import sinon from "sinon";
-import request from "supertest";
-
-import { ConnectionController } from "./controller/connection.controller";
-import { internalErrorToHttpError, ServiceUnavailableError } from "./errors";
-import {
-   queryConcurrency,
-   resetActiveQueryCountForTesting,
-   resetQueryConcurrencyTelemetryForTesting,
-} from "./query_concurrency";
-import type { EnvironmentStore } from "./service/environment_store";
-
-function buildApp(
-   runSQL: sinon.SinonStub,
-   opts: { assertCanAdmitQuery?: sinon.SinonStub } = {},
-): {
-   app: express.Express;
-   assertCanAdmitQuery: sinon.SinonStub;
-   runSQL: sinon.SinonStub;
-} {
-   const fakeConnection = { runSQL } as unknown as Connection;
-   const assertCanAdmitQuery =
-      opts.assertCanAdmitQuery ?? sinon.stub().returns(undefined);
-   const fakeEnv = { assertCanAdmitQuery };
-   const fakeStore = {
-      getEnvironment: sinon.stub().resolves(fakeEnv),
-   } as unknown as EnvironmentStore;
-   const controller = new ConnectionController(fakeStore);
-   // Bypass the connector lookup; the test only cares about the
-   // guardrail chain on top of a stub.
-   sinon
-      .stub(
-         controller as unknown as {
-            getMalloyConnection: (...args: unknown[]) => Promise<Connection>;
-         },
-         "getMalloyConnection",
-      )
-      .resolves(fakeConnection);
-
-   const app = express();
-   app.use(express.json());
-
-   // Same shape as `server.ts` registers for `/sqlQuery` — middleware
-   // first, then a thin route handler that delegates to the controller.
-   app.post(
-      "/api/v0/environments/:env/connections/:conn/sqlQuery",
-      queryConcurrency(),
-      async (req, res) => {
-         try {
-            const result = await controller.getConnectionQueryData(
-               req.params.env,
-               req.params.conn,
-               req.body.sqlStatement as string,
-               (req.body.options as string | undefined) ?? "",
-            );
-            res.status(200).json(result);
-         } catch (error) {
-            const { json, status } = internalErrorToHttpError(error as Error);
-            res.status(status).json(json);
-         }
-      },
-   );
-
-   // Mirror the global error handler from `server.ts` — required
-   // for the concurrency middleware's `next(err)` path to map
-   // `ServiceUnavailableError` to a 503 instead of Express's
-   // default 500. Without this the integration test would be
-   // exercising a different error path than production.
-   app.use(
-      (
-         err: Error,
-         _req: express.Request,
-         res: express.Response,
-         _next: express.NextFunction,
-      ): void => {
-         const { json, status } = internalErrorToHttpError(err);
-         res.status(status).json(json);
-      },
-   );
-
-   return { app, assertCanAdmitQuery, runSQL };
-}
-
-describe("OOM guardrails: end-to-end chain", () => {
-   const savedEnv = {
-      max: process.env.PUBLISHER_MAX_QUERY_ROWS,
-      timeout: process.env.PUBLISHER_QUERY_TIMEOUT_MS,
-      concurrency: process.env.PUBLISHER_MAX_CONCURRENT_QUERIES,
-      metadata: process.env.PUBLISHER_QUERY_METADATA,
-   };
-
-   beforeEach(() => {
-      resetActiveQueryCountForTesting();
-      resetQueryConcurrencyTelemetryForTesting();
-      // Query metadata ships dark; the happy path below asserts the correlation
-      // id the response carries, which needs it on.
-      process.env.PUBLISHER_QUERY_METADATA = "on";
-   });
-
-   afterEach(() => {
-      sinon.restore();
-      resetActiveQueryCountForTesting();
-      resetQueryConcurrencyTelemetryForTesting();
-      // Restore env so later tests don't see this suite's bleed-through.
-      const restore = (key: keyof typeof savedEnv, envVar: string): void => {
-         if (savedEnv[key] === undefined) delete process.env[envVar];
-         else process.env[envVar] = savedEnv[key]!;
-      };
-      restore("max", "PUBLISHER_MAX_QUERY_ROWS");
-      restore("timeout", "PUBLISHER_QUERY_TIMEOUT_MS");
-      restore("concurrency", "PUBLISHER_MAX_CONCURRENT_QUERIES");
-      restore("metadata", "PUBLISHER_QUERY_METADATA");
-   });
-
-   it("admission gate fires FIRST: 503 before the connector is touched", async () => {
-      const runSQL = sinon.stub().resolves({ rows: [], totalRows: 0 });
-      const assertCanAdmitQuery = sinon
-         .stub()
-         .throws(
-            new ServiceUnavailableError(
-               "Publisher is under memory pressure and cannot accept new queries.",
-            ),
-         );
-      const { app } = buildApp(runSQL, { assertCanAdmitQuery });
-
-      const res = await request(app)
-         .post("/api/v0/environments/e/connections/c/sqlQuery")
-         .send({ sqlStatement: "SELECT 1" });
-
-      expect(res.status).toBe(503);
-      // Critical load-shedding invariant: connector must NOT have
-      // been called when the gate rejects.
-      expect(runSQL.called).toBe(false);
-   });
-
-   it("concurrency cap fires SECOND: 503 before the controller is touched, once the slot pool is full", async () => {
-      process.env.PUBLISHER_MAX_CONCURRENT_QUERIES = "1";
-      // First request: runSQL takes ~200 ms so the slot stays
-      // held while we fire the second. Using a real timer rather
-      // than an unresolved deferred keeps the test deterministic
-      // even when supertest spawns one ephemeral http server per
-      // `request(app)` call — both sockets will eventually close
-      // on their own regardless of orchestration order.
-      const runSQL = sinon
-         .stub()
-         .callsFake(
-            () =>
-               new Promise((resolve) =>
-                  setTimeout(() => resolve({ rows: [], totalRows: 0 }), 200),
-               ),
-         );
-      const { app } = buildApp(runSQL);
-
-      // Drive both requests in parallel — `Promise.all` keeps the
-      // event loop turning on the first request's pending timer
-      // while the second runs through the middleware.
-      const [first, second] = await Promise.all([
-         request(app)
-            .post("/api/v0/environments/e/connections/c/sqlQuery")
-            .send({ sqlStatement: "SELECT 1" }),
-         (async () => {
-            // Yield a few ticks so the first request actually
-            // enters the middleware and holds the slot before
-            // the second one is dispatched. 20 ms is far longer
-            // than any scheduler hop but well below the 200 ms
-            // runSQL timer, leaving the slot definitely held.
-            await new Promise((r) => setTimeout(r, 20));
-            return request(app)
-               .post("/api/v0/environments/e/connections/c/sqlQuery")
-               .send({ sqlStatement: "SELECT 2" });
-         })(),
-      ]);
-
-      expect(first.status).toBe(200);
-      expect(second.status).toBe(503);
-      // Connector should still have been called only once — the
-      // middleware rejected the second request before it reached
-      // the controller.
-      expect(runSQL.callCount).toBe(1);
-   });
-
-   it("timeout fires THIRD: 504 when the driver outlasts PUBLISHER_QUERY_TIMEOUT_MS, and the abort signal is delivered to the driver", async () => {
-      process.env.PUBLISHER_QUERY_TIMEOUT_MS = "20";
-      let observedSignal: AbortSignal | undefined;
-      const runSQL = sinon.stub().callsFake(
-         (_sql: string, opts: RunSQLOptions) =>
-            new Promise((_resolve, reject) => {
-               observedSignal = opts.abortSignal;
-               opts.abortSignal?.addEventListener("abort", () =>
-                  // The driver MUST reject when its abort signal
-                  // fires; otherwise the timeout helper has nothing
-                  // to convert to 504 (the success-after-timeout
-                  // race is explicitly allowed).
-                  reject(new Error("driver: aborted")),
-               );
-            }),
-      );
-      const { app } = buildApp(runSQL);
-
-      const res = await request(app)
-         .post("/api/v0/environments/e/connections/c/sqlQuery")
-         .send({ sqlStatement: "SELECT pg_sleep(1)" });
-
-      expect(res.status).toBe(504);
-      expect(observedSignal).toBeDefined();
-      expect(observedSignal?.aborted).toBe(true);
-   });
-
-   it("row cap fires LAST: 413 when the driver overshoots PUBLISHER_MAX_QUERY_ROWS", async () => {
-      process.env.PUBLISHER_MAX_QUERY_ROWS = "2";
-      // Driver returns 3 rows even though we asked for cap+1 = 3
-      // — the sentinel pattern catches this and 413s.
-      const rows = [{ a: 1 }, { a: 2 }, { a: 3 }];
-      const runSQL = sinon.stub().resolves({ rows, totalRows: rows.length });
-      const { app } = buildApp(runSQL);
-
-      const res = await request(app)
-         .post("/api/v0/environments/e/connections/c/sqlQuery")
-         .send({ sqlStatement: "SELECT * FROM big_table" });
-
-      expect(res.status).toBe(413);
-      expect(JSON.stringify(res.body)).toContain("more than 2 rows");
-   });
-
-   it("happy path: all gates pass-through, 200 with the result body", async () => {
-      const rows = [{ a: 1 }];
-      const runSQL = sinon.stub().resolves({ rows, totalRows: rows.length });
-      const { app } = buildApp(runSQL);
-
-      const res = await request(app)
-         .post("/api/v0/environments/e/connections/c/sqlQuery")
-         .send({ sqlStatement: "SELECT 1" });
-
-      expect(res.status).toBe(200);
-      expect(res.body.data).toEqual(
-         JSON.stringify({ rows, totalRows: rows.length }),
-      );
-      // The response carries the id the statement was tagged with, so a caller
-      // can find this query in the backend's own history.
-      expect(res.body.queryCorrelationId).toMatch(/^[0-9a-f-]{36}$/);
-   });
-});

package/src/package_load/package_load_pool.spec.ts

@@ -1,252 +0,0 @@
-/**
- * Unit + light integration tests for the PackageLoadPool.
- *
- * The pool runs real `worker_threads` workers under the hood. These
- * tests intentionally exercise that path so we catch regressions in
- * RPC routing, queueing, lifecycle, and error propagation that
- * wouldn't surface in a pure mock.
- *
- * Pool reuse strategy
- * -------------------
- * The "real worker" tests share a single `PackageLoadPool` across
- * cases via Bun's `beforeAll`/`afterAll`. The worker itself owns no
- * native handles (all duckdb work runs on the main thread); we still
- * share to keep per-test overhead low and to match the production
- * deployment, where the pool spawns workers up-front and reuses them.
- */
-import {
-   afterAll,
-   afterEach,
-   beforeAll,
-   beforeEach,
-   describe,
-   expect,
-   it,
-} from "bun:test";
-import * as fs from "fs";
-import * as os from "os";
-import * as path from "path";
-import {
-   PackageLoadPool,
-   __setPackageLoadPoolForTests,
-   getPackageLoadWorkerCount,
-} from "./package_load_pool";
-
-// ──────────────────────────────────────────────────────────────────────
-// getPackageLoadWorkerCount — env var parsing
-// ──────────────────────────────────────────────────────────────────────
-
-describe("getPackageLoadWorkerCount", () => {
-   const ORIGINAL = process.env.PACKAGE_LOAD_WORKERS;
-
-   afterEach(() => {
-      if (ORIGINAL === undefined) {
-         delete process.env.PACKAGE_LOAD_WORKERS;
-      } else {
-         process.env.PACKAGE_LOAD_WORKERS = ORIGINAL;
-      }
-   });
-
-   it("defaults to 1 worker when env unset", () => {
-      delete process.env.PACKAGE_LOAD_WORKERS;
-      expect(getPackageLoadWorkerCount()).toBe(1);
-   });
-
-   it("throws when env value is non-numeric", () => {
-      process.env.PACKAGE_LOAD_WORKERS = "not-a-number";
-      expect(() => getPackageLoadWorkerCount()).toThrow(/positive integer/);
-   });
-
-   it("throws when env value is negative", () => {
-      process.env.PACKAGE_LOAD_WORKERS = "-2";
-      expect(() => getPackageLoadWorkerCount()).toThrow(/positive integer/);
-   });
-
-   it("throws when env value is 0 (no in-process fallback)", () => {
-      process.env.PACKAGE_LOAD_WORKERS = "0";
-      expect(() => getPackageLoadWorkerCount()).toThrow(/positive integer/);
-   });
-
-   it("honors positive overrides", () => {
-      process.env.PACKAGE_LOAD_WORKERS = "4";
-      expect(getPackageLoadWorkerCount()).toBe(4);
-   });
-});
-
-// ──────────────────────────────────────────────────────────────────────
-// PackageLoadPool constructor validation
-// ──────────────────────────────────────────────────────────────────────
-
-describe("PackageLoadPool constructor", () => {
-   it("throws when maxWorkers is 0", () => {
-      expect(() => new PackageLoadPool(0)).toThrow(/maxWorkers >= 1/);
-   });
-
-   it("throws when maxWorkers is negative", () => {
-      expect(() => new PackageLoadPool(-1)).toThrow(/maxWorkers >= 1/);
-   });
-});
-
-// ──────────────────────────────────────────────────────────────────────
-// PackageLoadPool — real worker loads a package
-//
-// One shared pool across the describe; each test gets its own temp
-// package directory and its own DuckDB connection.
-// ──────────────────────────────────────────────────────────────────────
-
-describe("PackageLoadPool (real worker)", () => {
-   let pool: PackageLoadPool;
-   let tempDir: string;
-
-   beforeAll(() => {
-      pool = new PackageLoadPool(1);
-   });
-
-   afterAll(async () => {
-      await pool.shutdown();
-      await __setPackageLoadPoolForTests(null);
-   });
-
-   beforeEach(() => {
-      tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "publisher-compile-"));
-   });
-
-   afterEach(() => {
-      if (tempDir) {
-         fs.rmSync(tempDir, { recursive: true, force: true });
-         tempDir = "";
-      }
-   });
-
-   function writeManifest(dir: string, name = "pkg"): void {
-      fs.writeFileSync(
-         path.join(dir, "publisher.json"),
-         JSON.stringify({ name, description: "test package" }),
-      );
-   }
-
-   async function buildConfig(): Promise<{
-      malloyConfig: import("@malloydata/malloy").MalloyConfig;
-      duckdb: { close: () => Promise<void> };
-   }> {
-      const { MalloyConfig, FixedConnectionMap } = await import(
-         "@malloydata/malloy"
-      );
-      const { DuckDBConnection } = await import("@malloydata/db-duckdb");
-      const duckdb = new DuckDBConnection("duckdb", ":memory:");
-      const connections = new FixedConnectionMap(
-         new Map([["duckdb", duckdb]]),
-         "duckdb",
-      );
-      const malloyConfig = new MalloyConfig({ connections: {} });
-      malloyConfig.wrapConnections(() => connections);
-      return { malloyConfig, duckdb };
-   }
-
-   it("loads a trivial single-model package and returns a hydratable modelDef", async () => {
-      writeManifest(tempDir);
-      fs.writeFileSync(
-         path.join(tempDir, "trivial.malloy"),
-         `source: nums is duckdb.sql("select 1 as a, 2 as b") extend {
-  measure: total is a.sum()
-}`,
-      );
-
-      const { malloyConfig, duckdb } = await buildConfig();
-      try {
-         const outcome = await pool.loadPackage({
-            packagePath: tempDir,
-            packageName: "pkg",
-            malloyConfig,
-            defaultConnectionName: "duckdb",
-         });
-
-         expect(outcome.packageMetadata.name).toBe("pkg");
-         expect(outcome.models).toHaveLength(1);
-         const m = outcome.models[0];
-         expect(m.modelPath).toBe("trivial.malloy");
-         expect(m.modelType).toBe("model");
-         expect(m.compilationError).toBeUndefined();
-         expect(m.modelDef).toBeDefined();
-         expect(Array.isArray(m.sources)).toBe(true);
-         expect(outcome.loadDurationMs).toBeGreaterThan(0);
-      } finally {
-         await duckdb.close();
-      }
-   });
-
-   it("propagates a per-model compile failure in-band (not as a rejected Promise)", async () => {
-      writeManifest(tempDir);
-      fs.writeFileSync(
-         path.join(tempDir, "broken.malloy"),
-         `source: bad is duckdb.sql("select 1 as a") extend {
-  measure: oops is THIS_FUNC_DOES_NOT_EXIST(a)
-}`,
-      );
-
-      const { malloyConfig, duckdb } = await buildConfig();
-      try {
-         const outcome = await pool.loadPackage({
-            packagePath: tempDir,
-            packageName: "pkg",
-            malloyConfig,
-            defaultConnectionName: "duckdb",
-         });
-         expect(outcome.models).toHaveLength(1);
-         const m = outcome.models[0];
-         expect(m.compilationError).toBeDefined();
-         expect(m.modelDef).toBeUndefined();
-      } finally {
-         await duckdb.close();
-      }
-   });
-
-   it("ignores embedded csv/parquet files (database probing is a main-thread concern)", async () => {
-      // The worker is pure-CPU: it reads the manifest and compiles
-      // .malloy files only. Database probing stays on the main thread
-      // (Package.readDatabases) so the worker doesn't need to dlopen
-      // duckdb-native. Verify that dropping a .csv next to the model
-      // doesn't crash the worker and doesn't show up in the result.
-      writeManifest(tempDir);
-      fs.writeFileSync(path.join(tempDir, "rows.csv"), "a,b\n1,2\n3,4\n5,6\n");
-      fs.writeFileSync(
-         path.join(tempDir, "trivial.malloy"),
-         `source: nums is duckdb.sql("select 1 as a") extend {\n  measure: total is a.sum()\n}`,
-      );
-
-      const { malloyConfig, duckdb } = await buildConfig();
-      try {
-         const outcome = await pool.loadPackage({
-            packagePath: tempDir,
-            packageName: "pkg",
-            malloyConfig,
-            defaultConnectionName: "duckdb",
-         });
-         expect(outcome.models).toHaveLength(1);
-         expect(outcome.models[0].compilationError).toBeUndefined();
-      } finally {
-         await duckdb.close();
-      }
-   });
-});
-
-// ──────────────────────────────────────────────────────────────────────
-// PackageLoadPool — shutdown rejects new submissions
-// Separate describe so the shutdown doesn't poison the shared pool above.
-// ──────────────────────────────────────────────────────────────────────
-
-describe("PackageLoadPool (shutdown)", () => {
-   it("rejects loadPackage() after shutdown()", async () => {
-      const { MalloyConfig } = await import("@malloydata/malloy");
-      const pool = new PackageLoadPool(1);
-      await pool.shutdown();
-      await expect(
-         pool.loadPackage({
-            packagePath: "/tmp/nowhere",
-            packageName: "nowhere",
-            malloyConfig: new MalloyConfig({ connections: {} }),
-            defaultConnectionName: "duckdb",
-         }),
-      ).rejects.toThrow("shutting down");
-   });
-});