@mastra/deployer 1.8.0 → 1.9.0

package/dist/server/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAGlD,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGhE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAW5B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAoBnD,KAAK,QAAQ,GAAG,YAAY,CAAC;AAE7B,KAAK,SAAS,GAAG,aAAa,GAAG;IAC/B,OAAO,EAAE,GAAG,CAAC;QAAE,UAAU,EAAE,+BAA+B,CAAA;KAAE,CAAC,CAAC;CAC/D,CAAC;AAEF,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,wCAmB/D;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,mBAER;cAegC,QAAQ;eAAa,SAAS;2CA8VhE;AAED,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAmC,mDAqDlG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAGlD,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGhE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAW5B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAoBnD,KAAK,QAAQ,GAAG,YAAY,CAAC;AAE7B,KAAK,SAAS,GAAG,aAAa,GAAG;IAC/B,OAAO,EAAE,GAAG,CAAC;QAAE,UAAU,EAAE,+BAA+B,CAAA;KAAE,CAAC,CAAC;CAC/D,CAAC;AAEF,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE,wCAmB/D;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,mBAER;cAegC,QAAQ;eAAa,SAAS;2CA0WhE;AAED,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAmC,mDAqDlG"}

package/dist/server/index.js

@@ -1,4 +1,4 @@
-import { normalizeStudioBase } from '../chunk-UKA2IZKF.js';
+import { normalizeStudioBase, injectStudioHtmlConfig } from '../chunk-XN3FKMO6.js';
 import { readFile } from 'fs/promises';
 import * as https from 'https';
 import { join, dirname } from 'path';
@@ -16,7 +16,6 @@ import { formatZodError } from '@mastra/server/handlers/error';
 import { MastraServer as MastraServer$1, normalizeQueryParams, redactStreamChunk } from '@mastra/server/server-adapter';
 import util from 'util';
 import { Buffer as Buffer$1 } from 'buffer';
-import { isDevPlaygroundRequest, isProtectedPath, canAccessPublicly, checkRules, defaultAuthConfig } from '@mastra/server/auth';
 import { InMemoryTaskStore } from '@mastra/server/a2a/store';
 import { Hono } from 'hono';
 import { cors } from 'hono/cors';
@@ -2655,6 +2654,8 @@ function toFetchResponse(res) {
   }
   return res.fetchResponse;
 }
+
+// ../../server-adapters/hono/dist/index.js
 var HTTPException = class extends Error {
   res;
   status;
@@ -3056,117 +3057,18 @@ ZodError.create = (issues) => {
   const error = new ZodError(issues);
   return error;
 };
-var authenticationMiddleware = async (c, next) => {
-  const mastra = c.get("mastra");
-  const authConfig = mastra.getServer()?.auth;
-  const customRouteAuthConfig = c.get("customRouteAuthConfig");
-  if (!authConfig) {
-    return next();
-  }
-  const path = c.req.path;
-  const method = c.req.method;
-  const getHeader = (name) => c.req.header(name);
-  if (isDevPlaygroundRequest(path, method, getHeader, authConfig, customRouteAuthConfig)) {
-    return next();
-  }
-  if (!isProtectedPath(c.req.path, c.req.method, authConfig, customRouteAuthConfig)) {
-    return next();
-  }
-  if (canAccessPublicly(c.req.path, c.req.method, authConfig)) {
-    return next();
-  }
-  const authHeader = c.req.header("Authorization");
-  let token = authHeader ? authHeader.replace("Bearer ", "") : null;
-  if (!token && c.req.query("apiKey")) {
-    token = c.req.query("apiKey") || null;
-  }
-  if (!token) {
-    return c.json({ error: "Authentication required" }, 401);
-  }
-  try {
-    let user;
-    if (typeof authConfig.authenticateToken === "function") {
-      user = await authConfig.authenticateToken(token, c.req);
-    } else {
-      throw new Error("No token verification method configured");
-    }
-    if (!user) {
-      return c.json({ error: "Invalid or expired token" }, 401);
-    }
-    c.get("requestContext").set("user", user);
-    return next();
-  } catch (err) {
-    mastra.getLogger()?.error("Authentication error", {
-      error: err instanceof Error ? { message: err.message, stack: err.stack } : err
+var _hasPermissionPromise;
+function loadHasPermission() {
+  if (!_hasPermissionPromise) {
+    _hasPermissionPromise = import('@mastra/core/auth/ee').then((m) => m.hasPermission).catch(() => {
+      console.error(
+        "[@mastra/hono] Auth features require @mastra/core >= 1.6.0. Please upgrade: npm install @mastra/core@latest"
+      );
+      return void 0;
     });
-    return c.json({ error: "Invalid or expired token" }, 401);
   }
-};
-var authorizationMiddleware = async (c, next) => {
-  const mastra = c.get("mastra");
-  const authConfig = mastra.getServer()?.auth;
-  const customRouteAuthConfig = c.get("customRouteAuthConfig");
-  if (!authConfig) {
-    return next();
-  }
-  const path = c.req.path;
-  const method = c.req.method;
-  const getHeader = (name) => c.req.header(name);
-  if (isDevPlaygroundRequest(path, method, getHeader, authConfig, customRouteAuthConfig)) {
-    return next();
-  }
-  if (!isProtectedPath(c.req.path, c.req.method, authConfig, customRouteAuthConfig)) {
-    return next();
-  }
-  if (canAccessPublicly(path, method, authConfig)) {
-    return next();
-  }
-  const user = c.get("requestContext").get("user");
-  if ("authorizeUser" in authConfig && typeof authConfig.authorizeUser === "function") {
-    try {
-      const isAuthorized = await authConfig.authorizeUser(user, c.req);
-      if (isAuthorized) {
-        return next();
-      }
-      return c.json({ error: "Access denied" }, 403);
-    } catch (err) {
-      mastra.getLogger()?.error("Authorization error in authorizeUser", {
-        error: err instanceof Error ? { message: err.message, stack: err.stack } : err
-      });
-      return c.json({ error: "Authorization error" }, 500);
-    }
-  }
-  if ("authorize" in authConfig && typeof authConfig.authorize === "function") {
-    try {
-      const isAuthorized = await authConfig.authorize(path, method, user, c);
-      if (isAuthorized) {
-        return next();
-      }
-      return c.json({ error: "Access denied" }, 403);
-    } catch (err) {
-      mastra.getLogger()?.error("Authorization error in authorize", {
-        error: err instanceof Error ? { message: err.message, stack: err.stack } : err,
-        path,
-        method
-      });
-      return c.json({ error: "Authorization error" }, 500);
-    }
-  }
-  if ("rules" in authConfig && authConfig.rules && authConfig.rules.length > 0) {
-    const isAuthorized = await checkRules(authConfig.rules, path, method, user);
-    if (isAuthorized) {
-      return next();
-    }
-    return c.json({ error: "Access denied" }, 403);
-  }
-  if (defaultAuthConfig.rules && defaultAuthConfig.rules.length > 0) {
-    const isAuthorized = await checkRules(defaultAuthConfig.rules, path, method, user);
-    if (isAuthorized) {
-      return next();
-    }
-  }
-  return c.json({ error: "Access denied" }, 403);
-};
+  return _hasPermissionPromise;
+}
 var MastraServer = class extends MastraServer$1 {
   createContextMiddleware() {
     return async (c, next) => {
@@ -3185,7 +3087,8 @@ var MastraServer = class extends MastraServer$1 {
       let paramsRequestContext;
       if (c.req.method === "POST" || c.req.method === "PUT") {
         const contentType = c.req.header("content-type");
-        if (contentType?.includes("application/json")) {
+        const contentLength = c.req.header("content-length");
+        if (contentType?.includes("application/json") && contentLength !== "0") {
           try {
             const body = await c.req.raw.clone().json();
             if (body.requestContext) {
@@ -3411,7 +3314,9 @@ var MastraServer = class extends MastraServer$1 {
           method: c.req.method,
           getHeader: (name) => c.req.header(name),
           getQuery: (name) => c.req.query(name),
-          requestContext: c.get("requestContext")
+          requestContext: c.get("requestContext"),
+          request: c.req.raw,
+          buildAuthorizeContext: () => c
         });
         if (authError) {
           return c.json({ error: authError.error }, authError.status);
@@ -3492,8 +3397,27 @@ var MastraServer = class extends MastraServer$1 {
           registeredTools: c.get("registeredTools"),
           taskStore: c.get("taskStore"),
           abortSignal: c.get("abortSignal"),
-          routePrefix: prefix
+          routePrefix: prefix,
+          request: c.req.raw
+          // Standard Request object with headers/cookies
         };
+        const authConfig = this.mastra.getServer()?.auth;
+        if (authConfig) {
+          const hasPermission = await loadHasPermission();
+          if (hasPermission) {
+            const userPermissions = c.get("requestContext").get("userPermissions");
+            const permissionError = this.checkRoutePermission(route, userPermissions, hasPermission);
+            if (permissionError) {
+              return c.json(
+                {
+                  error: permissionError.error,
+                  message: permissionError.message
+                },
+                permissionError.status
+              );
+            }
+          }
+        }
         try {
           const result = await route.handler(handlerParams);
           return this.sendResponse(route, c, result, prefix);
@@ -3539,6 +3463,43 @@ var MastraServer = class extends MastraServer$1 {
       const handler = "handler" in route && route.handler ? route.handler : "createHandler" in route ? await route.createHandler({ mastra: this.mastra }) : void 0;
       if (!handler) continue;
       const middlewares = [];
+      const serverRoute = {
+        method: route.method,
+        path: route.path,
+        responseType: "json",
+        handler: async () => {
+        },
+        requiresAuth: route.requiresAuth
+      };
+      middlewares.push(async (c, next) => {
+        const authError = await this.checkRouteAuth(serverRoute, {
+          path: c.req.path,
+          method: c.req.method,
+          getHeader: (name) => c.req.header(name),
+          getQuery: (name) => c.req.query(name),
+          requestContext: c.get("requestContext"),
+          request: c.req.raw,
+          buildAuthorizeContext: () => c
+        });
+        if (authError) {
+          return c.json({ error: authError.error }, authError.status);
+        }
+        const authConfig = this.mastra.getServer()?.auth;
+        if (authConfig) {
+          const hasPermission = await loadHasPermission();
+          if (hasPermission) {
+            const userPermissions = c.get("requestContext").get("userPermissions");
+            const permissionError = this.checkRoutePermission(serverRoute, userPermissions, hasPermission);
+            if (permissionError) {
+              return c.json(
+                { error: permissionError.error, message: permissionError.message },
+                permissionError.status
+              );
+            }
+          }
+        }
+        return next();
+      });
       if (route.middleware) {
         middlewares.push(...Array.isArray(route.middleware) ? route.middleware : [route.middleware]);
       }
@@ -3551,12 +3512,44 @@ var MastraServer = class extends MastraServer$1 {
     this.app.use("*", this.createContextMiddleware());
   }
   registerAuthMiddleware() {
-    const authConfig = this.mastra.getServer()?.auth;
-    if (!authConfig) {
+  }
+  registerHttpLoggingMiddleware() {
+    if (!this.httpLoggingConfig?.enabled) {
       return;
     }
-    this.app.use("*", authenticationMiddleware);
-    this.app.use("*", authorizationMiddleware);
+    this.app.use("*", async (c, next) => {
+      if (!this.shouldLogRequest(c.req.path)) {
+        return next();
+      }
+      const start = Date.now();
+      const method = c.req.method;
+      const path = c.req.path;
+      await next();
+      const duration = Date.now() - start;
+      const status = c.res.status;
+      const level = this.httpLoggingConfig?.level || "info";
+      const logData = {
+        method,
+        path,
+        status,
+        duration: `${duration}ms`
+      };
+      if (this.httpLoggingConfig?.includeQueryParams) {
+        logData.query = c.req.query();
+      }
+      if (this.httpLoggingConfig?.includeHeaders) {
+        const headers = Object.fromEntries(c.req.raw.headers.entries());
+        const redactHeaders = this.httpLoggingConfig.redactHeaders || [];
+        redactHeaders.forEach((h) => {
+          const key = h.toLowerCase();
+          if (headers[key] !== void 0) {
+            headers[key] = "[REDACTED]";
+          }
+        });
+        logData.headers = headers;
+      }
+      this.logger[level](`${method} ${path} ${status} ${duration}ms`, logData);
+    });
   }
 };
 
@@ -3917,9 +3910,16 @@ async function createHonoServer(mastra, options = {
   const server = mastra.getServer();
   const a2aTaskStore = new InMemoryTaskStore();
   const routes = server?.apiRoutes;
+  const processedRoutes = routes?.map((route) => {
+    if ("openapi" in route && route.openapi) {
+      const existingMiddleware = route.middleware ? Array.isArray(route.middleware) ? route.middleware : [route.middleware] : [];
+      return { ...route, middleware: [describeRoute(route.openapi), ...existingMiddleware] };
+    }
+    return route;
+  });
   const customRouteAuthConfig = /* @__PURE__ */ new Map();
-  if (routes) {
-    for (const route of routes) {
+  if (processedRoutes) {
+    for (const route of processedRoutes) {
       const requiresAuth = route.requiresAuth !== false;
       const routeKey = `${route.method}:${route.path}`;
       customRouteAuthConfig.set(routeKey, requiresAuth);
@@ -3945,7 +3945,7 @@ async function createHonoServer(mastra, options = {
     bodyLimitOptions,
     openapiPath: options?.isDev || server?.build?.openAPIDocs ? "/openapi.json" : void 0,
     customRouteAuthConfig,
-    customApiRoutes: routes
+    customApiRoutes: processedRoutes
   });
   honoServerAdapter.registerContextMiddleware();
   const serverMiddleware = mastra.getServerMiddleware?.();
@@ -3957,10 +3957,20 @@ async function createHonoServer(mastra, options = {
   if (server?.cors === false) {
     app.use("*", timeout(server?.timeout ?? 3 * 60 * 1e3));
   } else {
+    const hasAuth = !!server?.auth;
+    let corsOrigin;
+    if (server?.cors && typeof server.cors === "object" && "origin" in server.cors && server.cors.origin) {
+      corsOrigin = server.cors.origin;
+    } else if (hasAuth) {
+      corsOrigin = (origin) => origin || void 0;
+    } else {
+      corsOrigin = "*";
+    }
     const corsConfig = {
-      origin: "*",
+      origin: corsOrigin,
       allowMethods: ["GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"],
-      credentials: false,
+      // Enable credentials for cookie-based auth (e.g., Better Auth sessions)
+      credentials: hasAuth ? true : false,
       maxAge: 3600,
       ...server?.cors,
       allowHeaders: ["Content-Type", "Authorization", "x-mastra-client-type", ...server?.cors?.allowHeaders ?? []],
@@ -3996,6 +4006,7 @@ async function createHonoServer(mastra, options = {
       rootHandler
     );
   }
+  await honoServerAdapter.validateEELicense();
   honoServerAdapter.registerAuthMiddleware();
   if (server?.middleware) {
     const normalizedMiddlewares = Array.isArray(server.middleware) ? server.middleware : [server.middleware];
@@ -4012,24 +4023,7 @@ async function createHonoServer(mastra, options = {
       app.use(middleware2.path, middleware2.handler);
     }
   }
-  if (routes) {
-    for (const route of routes) {
-      const middlewares = [];
-      if (route.middleware) {
-        middlewares.push(...Array.isArray(route.middleware) ? route.middleware : [route.middleware]);
-      }
-      if (route.openapi) {
-        middlewares.push(describeRoute(route.openapi));
-      }
-      const handler = "handler" in route ? route.handler : await route.createHandler({ mastra });
-      const allHandlers = [...middlewares, handler];
-      if (route.method === "ALL") {
-        app.all(route.path, allHandlers[0], ...allHandlers.slice(1));
-      } else {
-        app.on(route.method, route.path, allHandlers[0], ...allHandlers.slice(1));
-      }
-    }
-  }
+  await honoServerAdapter.registerCustomApiRoutes();
   if (server?.build?.apiReqLogs) {
     app.use(logger());
   }
@@ -4129,18 +4123,20 @@ async function createHonoServer(mastra, options = {
       const escapeForHtml = (json) => {
         return json.replace(/\\/g, "\\\\").replace(/'/g, "\\'").replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/</g, "\\u003c").replace(/>/g, "\\u003e").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
       };
-      indexHtml = indexHtml.replace(`'%%MASTRA_SERVER_HOST%%'`, `'${host}'`);
-      indexHtml = indexHtml.replace(`'%%MASTRA_SERVER_PORT%%'`, `'${port}'`);
-      indexHtml = indexHtml.replace(`'%%MASTRA_API_PREFIX%%'`, `'${serverOptions?.apiPrefix ?? "/api"}'`);
-      indexHtml = indexHtml.replace(`'%%MASTRA_HIDE_CLOUD_CTA%%'`, `'${hideCloudCta}'`);
-      indexHtml = indexHtml.replace(`'%%MASTRA_SERVER_PROTOCOL%%'`, `'${protocol}'`);
-      indexHtml = indexHtml.replace(`'%%MASTRA_CLOUD_API_ENDPOINT%%'`, `'${cloudApiEndpoint}'`);
-      indexHtml = indexHtml.replace(`'%%MASTRA_EXPERIMENTAL_FEATURES%%'`, `'${experimentalFeatures}'`);
-      indexHtml = indexHtml.replace(
-        `'%%MASTRA_REQUEST_CONTEXT_PRESETS%%'`,
-        `'${escapeForHtml(requestContextPresets)}'`
-      );
-      indexHtml = indexHtml.replaceAll("%%MASTRA_STUDIO_BASE_PATH%%", studioBasePath);
+      const autoDetectUrl = process.env.MASTRA_AUTO_DETECT_URL === "true";
+      indexHtml = injectStudioHtmlConfig(indexHtml, {
+        host: `'${host}'`,
+        port: `'${port}'`,
+        protocol: `'${protocol}'`,
+        apiPrefix: `'${serverOptions?.apiPrefix ?? "/api"}'`,
+        basePath: studioBasePath,
+        hideCloudCta: `'${hideCloudCta}'`,
+        cloudApiEndpoint: `'${cloudApiEndpoint}'`,
+        experimentalFeatures: `'${experimentalFeatures}'`,
+        telemetryDisabled: `''`,
+        requestContextPresets: `'${escapeForHtml(requestContextPresets)}'`,
+        autoDetectUrl: `'${autoDetectUrl}'`
+      });
       return c.newResponse(indexHtml, 200, { "Content-Type": "text/html" });
     }
     return c.newResponse(html2, 200, { "Content-Type": "text/html" });