@mastra/deployer 1.79.0-alpha.1 → 1.79.0-alpha.3

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIlD,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAKhE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAmB5B,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;AA8CF,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;2CAmbhE;AAED,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAmC,mDAmMlG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAIlD,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAKhE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAmB5B,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;AA8CF,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;2CA4bhE;AAED,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAmC,mDAmMlG"}

package/dist/server/index.js

@@ -18,8 +18,8 @@ import util from "util";
 import { Buffer as Buffer$1 } from "buffer";
 import { bodyLimit } from "hono/body-limit";
 import { stream } from "hono/streaming";
-import "@mastra/core/request-context";
-import { findMatchingCustomRoute } from "@mastra/server/auth";
+import { RequestContext } from "@mastra/core/request-context";
+import { coreAuthMiddleware, findMatchingCustomRoute, isCustomRoutePublic } from "@mastra/server/auth";
 import { ViewerRegistry, handleInputMessage } from "@mastra/server/browser-stream";
 import { InMemoryTaskStore } from "@mastra/server/a2a/store";
 import { Hono } from "hono";
@@ -3196,6 +3196,191 @@ function propagateClientDisconnect(fetchResponse, res) {
 		headers: fetchResponse.headers
 	});
 }
+function createAuthMiddleware({ mastra, requiresAuth = true }) {
+	return async (c, next) => {
+		if (!requiresAuth) return next();
+		const authConfig = mastra.getServer()?.auth;
+		if (!authConfig) return next();
+		const requestContext = c.get("requestContext") ?? new RequestContext();
+		c.set("requestContext", requestContext);
+		c.set("mastra", c.get("mastra") ?? mastra);
+		const path = c.req.path;
+		const method = c.req.method;
+		const customRouteAuthConfig = new Map(c.get("customRouteAuthConfig") ?? []);
+		if (!isCustomRoutePublic(path, method, customRouteAuthConfig)) customRouteAuthConfig.set(`${method}:${path}`, true);
+		const authHeader = c.req.header("Authorization");
+		let token = authHeader ? authHeader.replace("Bearer ", "") : null;
+		if (!token) token = c.req.query("apiKey") || null;
+		const result = await coreAuthMiddleware({
+			path,
+			method,
+			getHeader: (name) => c.req.header(name),
+			mastra,
+			authConfig,
+			customRouteAuthConfig,
+			requestContext,
+			rawRequest: c.req.raw,
+			token,
+			buildAuthorizeContext: () => c
+		});
+		for (const [key, value] of Object.entries(result.headers ?? {})) c.header(key, value, key.toLowerCase() === "set-cookie" ? { append: true } : void 0);
+		if (result.action === "next") return next();
+		return c.json(result.body, result.status);
+	};
+}
+const TICKET_BYTES = 32;
+/**
+* How long an issued ticket stays valid. A ticket is minted immediately before
+* the socket is opened, so this only has to cover the round trip plus the
+* handshake — short enough that a ticket leaked from a log is useless by the
+* time anyone can act on it.
+*/
+const UPGRADE_TICKET_TTL_MS = 3e4;
+/**
+* Ceiling on tracked per-agent issuance counters, so the limiter can't grow
+* without bound as agent ids are invented. Counters are evicted oldest first.
+*/
+const MAX_TRACKED_AGENTS = 500;
+/** 256 bits of base64url, so the ticket can't be guessed or enumerated. */
+function createTicketValue() {
+	const bytes = new Uint8Array(TICKET_BYTES);
+	globalThis.crypto.getRandomValues(bytes);
+	return btoa(String.fromCharCode(...bytes)).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+}
+/**
+* Short-lived, single-use credentials for browser WebSocket upgrades.
+*
+* A browser cannot set an `Authorization` header on a WebSocket handshake, so a
+* deployment that authenticates with a header token would otherwise have to put
+* that reusable token in the handshake URL, where proxies and access logs can
+* retain it. Instead the client asks an authenticated HTTP route for a ticket,
+* and the ticket — worthless once spent, and scoped to one agent and thread —
+* travels in the URL instead.
+*
+* In-process, like the `ViewerRegistry` and the browser sessions it serves: a
+* screencast is bound to the process holding the browser, so a ticket store
+* shared across replicas would buy nothing. A ticket presented to a different
+* replica fails for the same reason the stream itself would.
+*
+* Issuance is bounded so the mint endpoint can't be turned into memory or CPU
+* exhaustion: tickets that are never spent live at most one TTL, a full store
+* rejects instead of growing, and each agent has a request allowance. Expiry is
+* swept from the front of the insertion-ordered map, so cleanup costs the
+* number of entries actually expired rather than a scan of every outstanding
+* ticket per request.
+*/
+var UpgradeTicketStore = class {
+	#tickets = /* @__PURE__ */ new Map();
+	#issuance = /* @__PURE__ */ new Map();
+	#now;
+	constructor(now = () => Date.now()) {
+		this.#now = now;
+	}
+	/**
+	* Issue a ticket bound to one agent and thread. Returns `{ ok: false }` when
+	* the agent exceeded its allowance or the store is at capacity.
+	*/
+	issue(agentId, threadId, ttlMs = UPGRADE_TICKET_TTL_MS) {
+		const now = this.#now();
+		this.#prune(now);
+		if (this.#tickets.size >= 500) return {
+			ok: false,
+			reason: "capacity"
+		};
+		const window = this.#issuance.get(agentId);
+		if (!window || now - window.windowStart >= 6e4) this.#trackIssuance(agentId, {
+			windowStart: now,
+			count: 0
+		});
+		else if (window.count >= 30) return {
+			ok: false,
+			reason: "rate-limited"
+		};
+		this.#issuance.get(agentId).count += 1;
+		const ticket = createTicketValue();
+		this.#tickets.set(ticket, {
+			agentId,
+			threadId,
+			expiresAt: now + ttlMs
+		});
+		return {
+			ok: true,
+			ticket,
+			expiresIn: Math.ceil(ttlMs / 1e3)
+		};
+	}
+	/**
+	* Spend a ticket. Returns `true` only when the ticket is unexpired and was
+	* issued for this exact agent and thread, in which case it is consumed and a
+	* second presentation fails.
+	*/
+	consume(ticket, agentId, threadId) {
+		const entry = this.#tickets.get(ticket);
+		if (!entry) return false;
+		if (entry.expiresAt <= this.#now()) return false;
+		if (entry.agentId !== agentId) return false;
+		if ((entry.threadId ?? void 0) !== (threadId ?? void 0)) return false;
+		this.#tickets.delete(ticket);
+		return true;
+	}
+	/**
+	* Drop expired tickets from the front of the insertion-ordered map. Tickets
+	* are inserted in issue order and share a TTL, so the entries after the first
+	* live one are live too and the sweep can stop there.
+	*/
+	#prune(now) {
+		for (const [ticket, entry] of this.#tickets) {
+			if (entry.expiresAt > now) break;
+			this.#tickets.delete(ticket);
+		}
+	}
+	/** Record an issuance window, evicting the oldest counter when at the cap. */
+	#trackIssuance(agentId, window) {
+		this.#issuance.delete(agentId);
+		this.#issuance.set(agentId, window);
+		if (this.#issuance.size > MAX_TRACKED_AGENTS) {
+			const oldest = this.#issuance.keys().next().value;
+			if (oldest !== void 0) this.#issuance.delete(oldest);
+		}
+	}
+};
+const TICKET_BODY_MAX_BYTES = 4 * 1024;
+/**
+* Resolve an `allowedOrigins` value against the request's `Origin` header.
+*
+* Mirrors Hono's `cors.origin` semantics so the same config value means the same
+* thing on the upgrade as it does on the HTTP routes: `'*'` allows everything,
+* array entries match literally, and a callback is only an approval when it
+* returns the request's own origin (the value Hono would echo back) or `'*'`.
+*/
+async function isOriginAllowed(allowedOrigins, origin, c) {
+	if (Array.isArray(allowedOrigins)) return allowedOrigins.includes(origin);
+	if (typeof allowedOrigins === "function") {
+		const allowed = await allowedOrigins(origin, c);
+		return allowed === origin || allowed === "*";
+	}
+	return allowedOrigins === "*" || allowedOrigins === origin;
+}
+/**
+* Is the `Origin` header the server's own origin?
+*
+* A Studio served by this server connects back to the same host, and operators
+* don't add their own origin to a CORS allowlist because same-origin requests
+* never needed CORS. Comparing hosts (rather than scheme + host) keeps that
+* working behind TLS-terminating proxies, where the server sees `http` while the
+* browser sends `https`.
+*/
+function isSameOrigin(origin, requestHost) {
+	if (!requestHost) return false;
+	let originHost;
+	try {
+		originHost = new URL(origin).host;
+	} catch {
+		return false;
+	}
+	const host = (requestHost.split(",")[0] ?? "").trim();
+	return originHost !== "" && originHost.toLowerCase() === host.toLowerCase();
+}
 /**
 * Set up WebSocket-based browser stream endpoint for real-time screencast viewing.
 *
@@ -3205,6 +3390,17 @@ function propagateClientDisconnect(fetchResponse, res) {
 * - Broadcasts frames to all connected viewers
 * - Stops screencast when last viewer disconnects
 *
+* All routes are authenticated with the server's auth configuration. Browsers
+* cannot attach an `Authorization` header to a WebSocket upgrade, so
+* session-cookie providers authenticate from the upgrade request's cookies.
+* Clients that authenticate with a header token instead request a short-lived,
+* single-use ticket from `POST ${apiPrefix}/agents/:agentId/browser/stream-ticket`
+* and pass it to the upgrade as `?ticket=`, which keeps the reusable credential
+* out of the URL. Non-browser clients can pass the token as the `apiKey` query
+* parameter — use a short-lived token, since a URL can be retained in proxy and
+* access logs, and prefer the `Authorization` header on the HTTP routes where the
+* client can set one.
+*
 * **Note**: Requires `ws` package to be installed. If not available, returns null
 * and logs a warning. Browser streaming will be disabled but everything else works.
 *
@@ -3220,6 +3416,7 @@ function propagateClientDisconnect(fetchResponse, res) {
 *
 * const app = new Hono();
 * const browserStream = await setupBrowserStream(app, {
+*   mastra,
 *   getToolset: (agentId) => browserToolsets.get(agentId),
 * });
 *
@@ -3242,7 +3439,24 @@ async function setupBrowserStream(app, config) {
 	const registry = new ViewerRegistry();
 	const rawPrefix = config.apiPrefix ?? "/api";
 	const apiPrefix = (rawPrefix.endsWith("/") ? rawPrefix.slice(0, -1) : rawPrefix) || "/api";
-	app.get("/browser/:agentId/stream", upgradeWebSocket((c) => {
+	const authenticate = createAuthMiddleware({ mastra: config.mastra });
+	const upgradeTickets = new UpgradeTicketStore();
+	const authorizeUpgrade = async (c, next) => {
+		const ticket = c.req.query("ticket");
+		if (!ticket) return authenticate(c, next);
+		const agentId = c.req.param("agentId");
+		if (!upgradeTickets.consume(ticket, agentId, c.req.query("threadId"))) return c.json({ error: "Invalid or expired upgrade ticket" }, 401);
+		return next();
+	};
+	const allowedOrigins = config.allowedOrigins;
+	const checkOrigin = async (c, next) => {
+		const origin = c.req.header("origin");
+		if (!allowedOrigins || !origin) return next();
+		if (isSameOrigin(origin, c.req.header("x-forwarded-host") ?? c.req.header("host"))) return next();
+		if (!await isOriginAllowed(allowedOrigins, origin, c)) return c.text("Forbidden", 403);
+		return next();
+	};
+	app.get("/browser/:agentId/stream", checkOrigin, authorizeUpgrade, upgradeWebSocket((c) => {
 		const agentId = c.req.param("agentId");
 		const threadId = c.req.query("threadId");
 		const viewerKey = threadId ? `${agentId}:${threadId}` : agentId;
@@ -3264,7 +3478,29 @@ async function setupBrowserStream(app, config) {
 			}
 		};
 	}));
-	app.get(`${apiPrefix}/agents/:agentId/browser/session`, async (c) => {
+	const ticketBodyLimit = bodyLimit({
+		maxSize: TICKET_BODY_MAX_BYTES,
+		onError: (c) => c.json({ error: "Request body too large" }, 413)
+	});
+	app.post(`${apiPrefix}/agents/:agentId/browser/stream-ticket`, authenticate, ticketBodyLimit, async (c) => {
+		const agentId = c.req.param("agentId");
+		if (!agentId) return c.json({ error: "Agent ID is required" }, 400);
+		let threadId = c.req.query("threadId");
+		try {
+			const body = await c.req.json();
+			if (!threadId && typeof body?.threadId === "string") threadId = body.threadId;
+		} catch {}
+		const issued = upgradeTickets.issue(agentId, threadId);
+		if (!issued.ok) {
+			const error = issued.reason === "capacity" ? "Too many outstanding browser stream upgrade tickets" : "Too many browser stream upgrade tickets requested";
+			return c.json({ error }, 429);
+		}
+		return c.json({
+			ticket: issued.ticket,
+			expiresIn: issued.expiresIn
+		});
+	});
+	app.get(`${apiPrefix}/agents/:agentId/browser/session`, authenticate, async (c) => {
 		const agentId = c.req.param("agentId");
 		if (!agentId) return c.json({ error: "Agent ID is required" }, 400);
 		const threadId = c.req.query("threadId");
@@ -3279,7 +3515,7 @@ async function setupBrowserStream(app, config) {
 			screencastAvailable: true
 		});
 	});
-	app.post(`${apiPrefix}/agents/:agentId/browser/close`, async (c) => {
+	app.post(`${apiPrefix}/agents/:agentId/browser/close`, authenticate, ticketBodyLimit, async (c) => {
 		const agentId = c.req.param("agentId");
 		if (!agentId) return c.json({ error: "Agent ID is required" }, 400);
 		const toolset = await config.getToolset(agentId);
@@ -4696,7 +4932,10 @@ async function createHonoServer(mastra, options = { tools: {} }) {
 	honoServerAdapter.registerContextMiddleware();
 	const serverMiddleware = mastra.getServerMiddleware?.();
 	if (serverMiddleware && serverMiddleware.length > 0) for (const m of serverMiddleware) app.use(m.path, skipIfFrameworkPublic(m.handler));
+	const browserStreamOrigins = server?.cors && typeof server.cors === "object" && "origin" in server.cors ? server.cors.origin : void 0;
 	const browserStreamSetup = options.browserStream === false ? null : await setupBrowserStream(app, {
+		mastra,
+		allowedOrigins: browserStreamOrigins,
 		getToolset: async (agentId) => {
 			const resolveBrowser = async (agent) => {
 				if (!agent) return void 0;