@malloy-publisher/server 0.0.198-dev3 → 0.0.198-dev6

package/build.ts

@@ -5,14 +5,14 @@ fs.rmSync("./dist", { recursive: true, force: true });
 fs.mkdirSync("./dist");
 
 await build({
+   // package_load_worker.ts is bundled as a SEPARATE entrypoint so it
+   // can be loaded by `new Worker(...)` at runtime. It must NOT be
+   // inlined into server.mjs (workers can't share module state with
+   // the parent process — they get their own JS realm).
    entrypoints: [
       "./src/server.ts",
       "./src/instrumentation.ts",
-      // Schema-introspection worker. Loaded at runtime via
-      // `new Worker(new URL("./schema_worker.mjs", import.meta.url))`
-      // from `schema_worker_pool.ts`, so it has to be a separate
-      // bundle output sitting next to server.mjs in dist/.
-      "./src/service/schema_worker.ts",
+      "./src/package_load/package_load_worker.ts",
    ],
    outdir: "./dist",
    target: "node",
@@ -56,13 +56,27 @@ fs.copyFileSync(
 // Rename ESM outputs to .mjs so both Node and Bun can execute them
 fs.renameSync("./dist/server.js", "./dist/server.mjs");
 fs.renameSync("./dist/instrumentation.js", "./dist/instrumentation.mjs");
-// Bun nests outputs by their path relative to the common entrypoint
-// root (./src). schema_worker.ts is under src/service/, so its output
-// lands at dist/service/schema_worker.js — not dist/.
-fs.renameSync(
-   "./dist/service/schema_worker.js",
-   "./dist/service/schema_worker.mjs",
-);
+// Bun emits package_load_worker into its source-relative subdir;
+// flatten so package_load_pool.ts's `resolveWorkerScript()` finds it
+// as a sibling of server.mjs. The path layout match is intentional —
+// keep these two in sync or the worker pool throws at boot (the
+// in-process fallback was removed; missing worker = no service).
+if (fs.existsSync("./dist/package_load/package_load_worker.js")) {
+   fs.renameSync(
+      "./dist/package_load/package_load_worker.js",
+      "./dist/package_load_worker.mjs",
+   );
+   try {
+      fs.rmdirSync("./dist/package_load");
+   } catch {
+      /* directory may be non-empty if Bun produced sourcemaps; leave it */
+   }
+} else if (fs.existsSync("./dist/package_load_worker.js")) {
+   fs.renameSync(
+      "./dist/package_load_worker.js",
+      "./dist/package_load_worker.mjs",
+   );
+}
 
 // Add shebang to server.mjs for npx/bunx compatibility
 const serverJsPath = "./dist/server.mjs";

package/dist/instrumentation.mjs

@@ -43,6 +43,7 @@ var __export = (target, all) => {
       set: __exportSetter.bind(all, name)
     });
 };
+var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 // ../../node_modules/@opentelemetry/api/build/src/platform/node/globalThis.js
@@ -115086,40 +115087,7 @@ var require_winston = __commonJS((exports) => {
   warn.forProperties(exports, "deprecated", ["emitErrs", "levelLength"]);
 });
 
-// src/instrumentation.ts
-var import_api = __toESM(require_src(), 1);
-var import_auto_instrumentations_node = __toESM(require_src59(), 1);
-var import_exporter_logs_otlp_proto = __toESM(require_src66(), 1);
-var import_exporter_prometheus = __toESM(require_src71(), 1);
-var import_exporter_trace_otlp_proto = __toESM(require_src72(), 1);
-var import_instrumentation_express = __toESM(require_src17(), 1);
-var import_resources = __toESM(require_src57(), 1);
-var import_sdk_logs = __toESM(require_src75(), 1);
-var import_sdk_node = __toESM(require_src106(), 1);
-var import_sdk_trace_base = __toESM(require_src82(), 1);
-var import_semantic_conventions = __toESM(require_src2(), 1);
-import { monitorEventLoopDelay } from "node:perf_hooks";
-
 // src/logger.ts
-var import_winston = __toESM(require_winston(), 1);
-var isTelemetryEnabled = Boolean(process.env.OTEL_EXPORTER_OTLP_ENDPOINT);
-var VALID_LOG_LEVELS = ["error", "warn", "info", "verbose", "debug", "silly"];
-var getLogLevel = () => {
-  if (process.env.LOG_LEVEL) {
-    const logLevel = process.env.LOG_LEVEL.toLowerCase();
-    if (VALID_LOG_LEVELS.includes(logLevel)) {
-      return logLevel;
-    } else {
-      console.error(`Invalid log level: ${process.env.LOG_LEVEL}. Valid log levels are: ${VALID_LOG_LEVELS.join(", ")}. Defaulting to "debug".`);
-    }
-  }
-  return "debug";
-};
-var logger = import_winston.default.createLogger({
-  level: getLogLevel(),
-  format: isTelemetryEnabled ? import_winston.default.format.combine(import_winston.default.format.uncolorize(), import_winston.default.format.timestamp(), import_winston.default.format.errors({ stack: true }), import_winston.default.format.json()) : import_winston.default.format.combine(import_winston.default.format.colorize(), import_winston.default.format.simple()),
-  transports: [new import_winston.default.transports.Console]
-});
 function extractTraceIdFromTraceparent(traceparent) {
   if (!traceparent) {
     return;
@@ -115131,7 +115099,6 @@ function extractTraceIdFromTraceparent(traceparent) {
   }
   return;
 }
-var DISABLE_RESPONSE_LOGGING = process.env.DISABLE_RESPONSE_LOGGING === "true" || process.env.DISABLE_RESPONSE_LOGGING === "1";
 function formatDuration(durationMs) {
   if (durationMs >= 1000) {
     const seconds = durationMs / 1000;
@@ -115139,7 +115106,17 @@ function formatDuration(durationMs) {
   }
   return `${durationMs.toFixed(2)}ms`;
 }
-var loggerMiddleware = (req, res, next) => {
+var import_winston, isTelemetryEnabled, VALID_LOG_LEVELS, getLogLevel = () => {
+  if (process.env.LOG_LEVEL) {
+    const logLevel = process.env.LOG_LEVEL.toLowerCase();
+    if (VALID_LOG_LEVELS.includes(logLevel)) {
+      return logLevel;
+    } else {
+      console.error(`Invalid log level: ${process.env.LOG_LEVEL}. Valid log levels are: ${VALID_LOG_LEVELS.join(", ")}. Defaulting to "debug".`);
+    }
+  }
+  return "debug";
+}, logger, DISABLE_RESPONSE_LOGGING, loggerMiddleware = (req, res, next) => {
   const startTime = performance.now();
   const resJson = res.json;
   res.json = (body) => {
@@ -115169,8 +115146,7 @@ var loggerMiddleware = (req, res, next) => {
     }
   });
   next();
-};
-var logAxiosError = (error) => {
+}, logAxiosError = (error) => {
   if (error.response) {
     logger.error("Axios server-side error", {
       url: error.response.config.url,
@@ -115184,8 +115160,32 @@ var logAxiosError = (error) => {
     logger.error("Axios unknown error", { error });
   }
 };
+var init_logger = __esm(() => {
+  import_winston = __toESM(require_winston(), 1);
+  isTelemetryEnabled = Boolean(process.env.OTEL_EXPORTER_OTLP_ENDPOINT);
+  VALID_LOG_LEVELS = ["error", "warn", "info", "verbose", "debug", "silly"];
+  logger = import_winston.default.createLogger({
+    level: getLogLevel(),
+    format: isTelemetryEnabled ? import_winston.default.format.combine(import_winston.default.format.uncolorize(), import_winston.default.format.timestamp(), import_winston.default.format.errors({ stack: true }), import_winston.default.format.json()) : import_winston.default.format.combine(import_winston.default.format.colorize(), import_winston.default.format.simple()),
+    transports: [new import_winston.default.transports.Console]
+  });
+  DISABLE_RESPONSE_LOGGING = process.env.DISABLE_RESPONSE_LOGGING === "true" || process.env.DISABLE_RESPONSE_LOGGING === "1";
+});
 
 // src/instrumentation.ts
+init_logger();
+var import_api = __toESM(require_src(), 1);
+var import_auto_instrumentations_node = __toESM(require_src59(), 1);
+var import_exporter_logs_otlp_proto = __toESM(require_src66(), 1);
+var import_exporter_prometheus = __toESM(require_src71(), 1);
+var import_exporter_trace_otlp_proto = __toESM(require_src72(), 1);
+var import_instrumentation_express = __toESM(require_src17(), 1);
+var import_resources = __toESM(require_src57(), 1);
+var import_sdk_logs = __toESM(require_src75(), 1);
+var import_sdk_node = __toESM(require_src106(), 1);
+var import_sdk_trace_base = __toESM(require_src82(), 1);
+var import_semantic_conventions = __toESM(require_src2(), 1);
+import { monitorEventLoopDelay } from "node:perf_hooks";
 var prometheusExporter = null;
 var sdk = null;
 function getPrometheusMetricsHandler() {