@malloy-publisher/server 0.2.6 → 0.2.7

package/dist/runtime/publisher.js

@@ -251,27 +251,73 @@
             var pad = parseFloat(bodyStyle.paddingBottom) || 0;
             return Math.ceil(maxBottom + scrollTop + pad);
          }
-         function postSize() {
+         // Smallest SHRINK worth reporting. measureContentHeight already ceils,
+         // so nothing sub-pixel reaches here; what this absorbs is a 1-2px
+         // rounding flip-flop between two layout passes, which the host cannot
+         // act on without the resize itself becoming a layout change inside this
+         // frame — the feedback loop.
+         //
+         // Applied to shrinks ONLY, deliberately. A frame a few pixels too tall
+         // shows dead space; a few pixels too short CLIPS, and the frame has no
+         // internal scrollbar. The asymmetry also stops the two sides' bands
+         // compounding: the host runs its own epsilon against ITS height, which
+         // its MIN clamp guarantees can differ from lastHeight here, so two
+         // symmetric 8px bands leave a dead zone wider than either. Growing at
+         // 1px precision keeps the host's band the only one that applies.
+         var RESIZE_EPSILON = 8;
+         var resizePending = false;
+
+         function emitSize() {
             var h = measureContentHeight();
-            if (h !== lastHeight) {
-               lastHeight = h;
-               try {
-                  window.parent.postMessage(
-                     { type: "publisher:resize", height: h },
-                     "*",
-                  );
-               } catch (_e) {
-                  /* ignore */
-               }
+            if (h < lastHeight && lastHeight - h < RESIZE_EPSILON) return;
+            if (h === lastHeight) return;
+            lastHeight = h;
+            try {
+               window.parent.postMessage(
+                  { type: "publisher:resize", height: h },
+                  "*",
+               );
+            } catch (_e) {
+               /* ignore */
             }
          }
+
+         // Coalesce a burst into one message per frame.
+         //
+         // ResizeObserver on documentElement fires on EVERY layout change, so a
+         // dashboard whose tiles resolve one by one used to post a height per
+         // tile. The host resized on each, which is what made an embedded app
+         // visibly jitter while it loaded. Same `pending`-flag idiom as the SSE
+         // reload debounce below; rAF rather than a timeout because the next
+         // paint is exactly when a coalesced layout is worth measuring.
+         //
+         // Trailing edge, not leading: the last measurement in a burst is the
+         // settled one, and reporting the first would send a stale height.
+         function postSize() {
+            if (resizePending) return;
+            resizePending = true;
+            var schedule =
+               typeof requestAnimationFrame === "function"
+                  ? requestAnimationFrame
+                  : function (fn) {
+                       setTimeout(fn, 16);
+                    };
+            schedule(function () {
+               resizePending = false;
+               emitSize();
+            });
+         }
          // Initial + observe content changes
+         // The first report goes out synchronously: the host shows a
+         // MIN_EMBED_HEIGHT placeholder until one arrives, so deferring it by a
+         // frame would leave a collapsed frame for no benefit. Only the bursts
+         // that follow need coalescing.
          if (document.readyState === "loading") {
-            document.addEventListener("DOMContentLoaded", postSize);
+            document.addEventListener("DOMContentLoaded", emitSize);
          } else {
-            postSize();
+            emitSize();
          }
-         window.addEventListener("load", postSize);
+         window.addEventListener("load", emitSize);
          if (typeof ResizeObserver !== "undefined") {
             var ro = new ResizeObserver(postSize);
             // Observe documentElement so we catch any layout change

package/dist/server.mjs

@@ -156437,7 +156437,7 @@ var BUNDLED_DEFAULT_CONFIG_PATH, PER_MODE_COLOR_KEYS, DEFAULT_HIGH_WATER_FRACTIO
       return false;
     }
     if (!conn.name || typeof conn.name !== "string") {
-      logger.warn(`Invalid connection: missing or invalid "name" field. Skipping.`, { connection: conn });
+      logger.warn(`Invalid connection: missing or invalid "name" field. Skipping.`, { type: typeof conn.type === "string" ? conn.type : undefined });
       return false;
     }
     if (!conn.type || typeof conn.type !== "string") {
@@ -156461,13 +156461,13 @@ var BUNDLED_DEFAULT_CONFIG_PATH, PER_MODE_COLOR_KEYS, DEFAULT_HIGH_WATER_FRACTIO
     };
   }
   const validEnvironments = [];
-  for (const environment of rawConfig.environments) {
+  for (const [index, environment] of rawConfig.environments.entries()) {
     if (!environment || typeof environment !== "object") {
       logger.warn(`Invalid environment in ${PUBLISHER_CONFIG_NAME}: entry must be an object. Skipping.`);
       continue;
     }
     if (!environment.name || typeof environment.name !== "string") {
-      logger.warn(`Invalid environment in ${PUBLISHER_CONFIG_NAME}: missing or invalid "name" field. Skipping entry.`, { environment });
+      logger.warn(`Invalid environment in ${PUBLISHER_CONFIG_NAME}: missing or invalid "name" field. Skipping entry.`, { index });
       continue;
     }
     if (!Array.isArray(environment.packages)) {
@@ -156539,6 +156539,19 @@ var init_config = __esm(() => {
 
 // src/errors.ts
 import { MalloyError } from "@malloydata/malloy";
+function logInternalFailure(summary, error, level = "error") {
+  const strip = (value) => value.replace(/[\u0000-\u001f\u007f-\u009f\u2028\u2029]/g, " ");
+  const message = error.message ?? "";
+  const stack = error.stack ?? "";
+  const framesOnly = stack.startsWith(`${error.name}: ${message}`) ? stack.slice(`${error.name}: ${message}`.length).replace(/^\r?\n/, "") : stack;
+  logger[level](summary, {
+    error: {
+      name: error.name,
+      message: strip(message).slice(0, MAX_LOGGED_DETAIL_CHARS),
+      stack: strip(framesOnly).slice(0, MAX_LOGGED_DETAIL_CHARS)
+    }
+  });
+}
 function internalErrorToHttpError(error) {
   if (error instanceof BadRequestError) {
     return httpError(400, error.message);
@@ -156573,7 +156586,11 @@ function internalErrorToHttpError(error) {
   } else if (error instanceof ModelCompilationError) {
     return httpError(424, error.message);
   } else if (error instanceof ConnectionError) {
-    return httpError(502, error.message);
+    if (error.callerSafe) {
+      return httpError(502, error.message);
+    }
+    logInternalFailure("Upstream connection error", error, "warn");
+    return httpError(502, GENERIC_UPSTREAM_MESSAGE);
   } else if (error instanceof MaterializationNotFoundError) {
     return httpError(404, error.message);
   } else if (error instanceof MaterializationConflictError) {
@@ -156589,7 +156606,8 @@ function internalErrorToHttpError(error) {
   } else if (error instanceof NotImplementedError) {
     return httpError(501, error.message);
   } else {
-    return httpError(500, error.message);
+    logInternalFailure("Unhandled internal error", error);
+    return httpError(500, GENERIC_INTERNAL_MESSAGE);
   }
 }
 function httpError(code, message, reason) {
@@ -156602,9 +156620,10 @@ function httpError(code, message, reason) {
     }
   };
 }
-var NotImplementedError, BadRequestError, InvalidArgumentError, EnvironmentNotFoundError, PackageNotFoundError, ModelNotFoundError, DashboardNotFoundError, ConnectionNotFoundError, TableNotFoundError, ConnectionError, DestinationNotFoundError, ConnectionAuthError, UnsupportedCatalogFormatError, ModelCompilationError, MaterializationEligibilityError, PublisherConfigError, FrozenConfigError, AccessDeniedError, NotQueryableError, MaterializationNotFoundError, MaterializationConflictError, InvalidStateTransitionError, ServiceUnavailableError, PayloadTooLargeError, ResponseUnserializableError, QueryTimeoutError;
+var GENERIC_INTERNAL_MESSAGE = "Internal server error.", GENERIC_UPSTREAM_MESSAGE = "Upstream connection error.", MAX_LOGGED_DETAIL_CHARS = 2000, NotImplementedError, BadRequestError, InvalidArgumentError, EnvironmentNotFoundError, PackageNotFoundError, ModelNotFoundError, DashboardNotFoundError, ConnectionNotFoundError, TableNotFoundError, ConnectionError, DestinationNotFoundError, ConnectionAuthError, UnsupportedCatalogFormatError, ModelCompilationError, MaterializationEligibilityError, PublisherConfigError, FrozenConfigError, AccessDeniedError, NotQueryableError, MaterializationNotFoundError, MaterializationConflictError, InvalidStateTransitionError, ServiceUnavailableError, PayloadTooLargeError, ResponseUnserializableError, QueryTimeoutError;
 var init_errors = __esm(() => {
   init_constants();
+  init_logger();
   NotImplementedError = class NotImplementedError extends Error {
     constructor(message) {
       super(message);
@@ -156648,8 +156667,10 @@ var init_errors = __esm(() => {
     }
   };
   ConnectionError = class ConnectionError extends Error {
-    constructor(message) {
+    callerSafe;
+    constructor(message, options) {
       super(message);
+      this.callerSafe = options?.callerSafe ?? false;
     }
   };
   DestinationNotFoundError = class DestinationNotFoundError extends Error {
@@ -213217,11 +213238,6 @@ var require_utils74 = __commonJS((exports, module) => {
   };
 });
 
-// ../../node_modules/ssh2/lib/protocol/crypto/build/Release/sshcrypto.node
-var require_sshcrypto = __commonJS((exports, module) => {
-  module.exports = __require("./sshcrypto-xqan60jb.node");
-});
-
 // ../../node_modules/ssh2/lib/protocol/crypto/poly1305.js
 var require_poly1305 = __commonJS((exports, module) => {
   var __dirname = "/home/runner/work/publisher/publisher/node_modules/ssh2/lib/protocol/crypto", __filename = "/home/runner/work/publisher/publisher/node_modules/ssh2/lib/protocol/crypto/poly1305.js";
@@ -213708,7 +213724,7 @@ var require_crypto = __commonJS((exports, module) => {
   var ChaChaPolyDecipher;
   var GenericDecipher;
   try {
-    binding = require_sshcrypto();
+    binding = (()=>{throw new Error("Cannot require module "+"./crypto/build/Release/sshcrypto.node");})();
     ({
       AESGCMCipher,
       ChaChaPolyCipher,
@@ -254140,7 +254156,7 @@ function hydrateMarkdownOnlyCells(notebookCells) {
     return { type: "code", text: sc.text };
   });
 }
-var MALLOY_VERSION, REQUEST_CHAIN_MAX_NAMES = 64, Model;
+var MALLOY_VERSION, REQUEST_CHAIN_MAX_NAMES = 64, NO_PREAGGREGATE_VIOLATIONS, Model;
 var init_model = __esm(() => {
   init_telemetry();
   init_materialization_metrics();
@@ -254176,6 +254192,7 @@ var init_model = __esm(() => {
   init_authorize_metrics();
   init_path_safety();
   MALLOY_VERSION = createRequire2(import.meta.url)("@malloydata/malloy/package.json").version;
+  NO_PREAGGREGATE_VIOLATIONS = Object.freeze([]);
   Model = class Model {
     packageName;
     modelPath;
@@ -254199,6 +254216,7 @@ var init_model = __esm(() => {
     givens;
     declaredQueryMetadataMemo;
     declaredSourceQueryMetadataMemo;
+    preaggregateViolationsMemo;
     authorizeReferencedGivenNames = new Set;
     discoveryCurationEnabled = false;
     queryBoundary = { mode: "all", exploresDeclared: false, isQueryEntryPoint: true };
@@ -255148,8 +255166,11 @@ var init_model = __esm(() => {
     }
     preaggregateViolations() {
       if (!this.modelDef)
-        return [];
-      return validateModelPreaggregation(this.modelDef.contents);
+        return NO_PREAGGREGATE_VIOLATIONS;
+      if (this.preaggregateViolationsMemo === undefined) {
+        this.preaggregateViolationsMemo = validateModelPreaggregation(this.modelDef.contents);
+      }
+      return this.preaggregateViolationsMemo;
     }
     async buildPreaggregateServeModel(packagePath, malloyConfig, buildManifest) {
       this.preaggregateServeMaterializer = undefined;
@@ -277629,7 +277650,9 @@ class ConnectionController {
       if (packages.length === 1) {
         const onlyPackage = packages[0].name;
         if (!onlyPackage) {
-          throw new ConnectionError("Package name is undefined");
+          throw new ConnectionError("Package name is undefined", {
+            callerSafe: true
+          });
         }
         const pkg = await environment.getPackage(onlyPackage);
         return await pkg.getMalloyConnection(connectionName);
@@ -278188,6 +278211,7 @@ init_errors();
 import { MalloyError as MalloyError2 } from "@malloydata/malloy";
 
 // src/mcp/error_messages.ts
+init_errors();
 function getNotFoundError(resourceUriOrContext) {
   const baseMessage = `Resource not found: ${resourceUriOrContext}`;
   const suggestions = [
@@ -278201,13 +278225,21 @@ function getNotFoundError(resourceUriOrContext) {
 }
 function getInternalError(operation, error) {
   const baseMessage = `An unexpected internal error occurred during ${operation}.`;
+  const suggestions = [
+    "Try the request again later.",
+    "If the problem persists, check server logs or contact support."
+  ];
+  if (error instanceof ConnectionError && !error.callerSafe) {
+    logInternalFailure(`Upstream connection error during ${operation}`, error, "warn");
+    return {
+      message: `${baseMessage}: Upstream connection error.`,
+      suggestions
+    };
+  }
   const errorMessage = error instanceof Error ? error.message : String(error);
   return {
     message: error ? `${baseMessage}: ${errorMessage}` : baseMessage,
-    suggestions: [
-      "Try the request again later.",
-      "If the problem persists, check server logs or contact support."
-    ]
+    suggestions
   };
 }
 var RESTRICTED_CONSTRUCTS = "raw SQL (duckdb.sql(...) / connection.sql(...)), direct SQL function calls (name!type(...)), the sql_* function family (sql_number, sql_string, sql_date, sql_timestamp, sql_boolean), import statements, ##! flags, or new sources from connection.table(...)";
@@ -292467,8 +292499,8 @@ class WatchModeController {
       assertSafePackageName(watchName);
     } catch (error) {
       logger.error(error);
-      const { status } = internalErrorToHttpError(error);
-      res.status(status).json({ error: error.message });
+      const { status, json } = internalErrorToHttpError(error);
+      res.status(status).json({ error: json.message });
       return;
     }
     const environmentManifest = await EnvironmentStore.reloadEnvironmentManifest(this.environmentStore.serverRootPath);
@@ -292483,8 +292515,8 @@ class WatchModeController {
       await this.ensureWatching(watchName);
     } catch (error) {
       logger.error(error);
-      const { status } = internalErrorToHttpError(error);
-      res.status(status).json({ error: error.message });
+      const { status, json } = internalErrorToHttpError(error);
+      res.status(status).json({ error: json.message });
       return;
     }
     res.json();

package/package.json

@@ -1,7 +1,7 @@
 {
    "name": "@malloy-publisher/server",
    "description": "Malloy Publisher Server",
-   "version": "0.2.6",
+   "version": "0.2.7",
    "main": "dist/server.mjs",
    "bin": {
       "malloy-publisher": "dist/server.mjs"