@mastra/deployer 1.61.0-alpha.2 → 1.61.0-alpha.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @mastra/deployer
 
+## 1.61.0-alpha.3
+
+### Minor Changes
+
+- Improved generated server shutdown to drain in-flight HTTP requests before closing Mastra resources ([#20678](https://github.com/mastra-ai/mastra/issues/20678)). Refresh streams now close during shutdown, drain failures no longer skip resource cleanup, and a second shutdown signal exits immediately. ([#21990](https://github.com/mastra-ai/mastra/pull/21990))
+
+### Patch Changes
+
+- Updated dependencies [[`9267e9b`](https://github.com/mastra-ai/mastra/commit/9267e9b3d9c2fcf16936050495a787054c2431ab), [`acc3471`](https://github.com/mastra-ai/mastra/commit/acc3471de5f3fde8027ee4e355af292b2bc1bc30), [`b6a771e`](https://github.com/mastra-ai/mastra/commit/b6a771ef23d203ddb348efca8065eff65def8191), [`9267e9b`](https://github.com/mastra-ai/mastra/commit/9267e9b3d9c2fcf16936050495a787054c2431ab), [`26d4016`](https://github.com/mastra-ai/mastra/commit/26d40160ff7f7d8bf95fee2039a52cbc83863533), [`9267e9b`](https://github.com/mastra-ai/mastra/commit/9267e9b3d9c2fcf16936050495a787054c2431ab), [`9267e9b`](https://github.com/mastra-ai/mastra/commit/9267e9b3d9c2fcf16936050495a787054c2431ab), [`57c5103`](https://github.com/mastra-ai/mastra/commit/57c51035a2a36e3df3c4f32f46bb789a66ed5946)]:
+  - @mastra/server@1.61.0-alpha.3
+  - @mastra/core@1.61.0-alpha.3
+
 ## 1.61.0-alpha.2
 
 ### Patch Changes

package/dist/docs/SKILL.md

@@ -3,7 +3,7 @@ name: mastra-deployer
 description: Documentation for @mastra/deployer. Use when working with @mastra/deployer APIs, configuration, or implementation.
 metadata:
   package: "@mastra/deployer"
-  version: "1.61.0-alpha.2"
+  version: "1.61.0-alpha.3"
 ---
 
 ## When to use

package/dist/docs/assets/SOURCE_MAP.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.61.0-alpha.2",
+  "version": "1.61.0-alpha.3",
   "package": "@mastra/deployer",
   "exports": {},
   "modules": {}

package/dist/server/handlers/client.d.ts

@@ -1,5 +1,12 @@
 import type { Context } from 'hono';
 export declare function handleClientsRefresh(c: Context): Response;
+/**
+ * End every open refresh SSE stream. Studio keeps one of these connections
+ * open for its whole lifetime, so without this the graceful-shutdown drain
+ * would wait on them until the drain deadline (stalling `mastra dev` hot
+ * reloads while Studio is open).
+ */
+export declare function closeRefreshStreams(): void;
 export declare function handleTriggerClientsRefresh(c: Context): Response & import("hono").TypedResponse<{
     success: true;
     clients: number;

package/dist/server/handlers/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/server/handlers/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAKpC,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,OAAO,GAAG,QAAQ,CAoBzD;AAED,wBAAgB,2BAA2B,CAAC,CAAC,EAAE,OAAO;;;kEASrD;AAGD,wBAAgB,gBAAgB,SAG/B;AAED,wBAAgB,eAAe,SAG9B;AAED,wBAAgB,mBAAmB,IAAI,OAAO,CAE7C"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/server/handlers/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAKpC,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,OAAO,GAAG,QAAQ,CAoBzD;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,SASlC;AAED,wBAAgB,2BAA2B,CAAC,CAAC,EAAE,OAAO;;;kEASrD;AAGD,wBAAgB,gBAAgB,SAG/B;AAED,wBAAgB,eAAe,SAG9B;AAED,wBAAgB,mBAAmB,IAAI,OAAO,CAE7C"}

package/dist/server/index.cjs

@@ -3768,6 +3768,20 @@ function handleClientsRefresh(c) {
 		"Access-Control-Allow-Origin": "*"
 	} });
 }
+/**
+* End every open refresh SSE stream. Studio keeps one of these connections
+* open for its whole lifetime, so without this the graceful-shutdown drain
+* would wait on them until the drain deadline (stalling `mastra dev` hot
+* reloads while Studio is open).
+*/
+function closeRefreshStreams() {
+	clients.forEach((controller) => {
+		try {
+			controller.close();
+		} catch {}
+	});
+	clients.clear();
+}
 function handleTriggerClientsRefresh(c) {
 	clients.forEach((controller) => {
 		try {
@@ -4633,6 +4647,8 @@ async function createNodeServer(mastra, options = { tools: {} }) {
 	const injectWebSocket = app.injectWebSocket;
 	const serverOptions = mastra.getServer();
 	const apiPrefix = serverOptions?.apiPrefix ?? "/api";
+	const drainTimeoutMs = serverOptions?.drainTimeout ?? 5e3;
+	if (serverOptions?.handleShutdownSignals !== false && (!Number.isFinite(drainTimeoutMs) || drainTimeoutMs < 0 || drainTimeoutMs > 2147483647)) throw new RangeError("server.drainTimeout must be a finite number between 0 and 2147483647 milliseconds");
 	const key = serverOptions?.https?.key ?? (process.env.MASTRA_HTTPS_KEY ? Buffer.from(process.env.MASTRA_HTTPS_KEY, "base64") : void 0);
 	const cert = serverOptions?.https?.cert ?? (process.env.MASTRA_HTTPS_CERT ? Buffer.from(process.env.MASTRA_HTTPS_CERT, "base64") : void 0);
 	const isHttpsEnabled = Boolean(key && cert);
@@ -4674,33 +4690,55 @@ async function createNodeServer(mastra, options = { tools: {} }) {
 	else await workerLifecycle.startEventEngine();
 	import("@mastra/core/telemetry").then(({ syncUsageTelemetry }) => syncUsageTelemetry(mastra)).catch(() => {});
 	import("@mastra/core/telemetry").then(({ syncFeatureUsageTelemetry }) => syncFeatureUsageTelemetry(mastra)).catch(() => {});
-	const SHUTDOWN_TIMEOUT_MS = 5e3;
-	let shuttingDown = false;
-	const shutdown = async (signal) => {
-		if (shuttingDown) return;
-		shuttingDown = true;
-		const logger = mastra.getLogger();
-		logger.info("Shutting down Mastra server", { signal });
-		server.close();
-		const lifecycle = mastra;
-		if (typeof lifecycle.shutdown === "function") {
+	if (serverOptions?.handleShutdownSignals !== false) {
+		const CORE_SHUTDOWN_TIMEOUT_MS = 5e3;
+		const timedOut = Symbol("shutdown-timeout");
+		const race = async (work, ms) => {
 			let timeout;
-			const timedOut = Symbol("shutdown-timeout");
 			const timeoutPromise = new Promise((resolve) => {
-				timeout = setTimeout(() => resolve(timedOut), SHUTDOWN_TIMEOUT_MS);
+				timeout = setTimeout(() => resolve(timedOut), ms);
 			});
 			try {
-				if (await Promise.race([lifecycle.shutdown(), timeoutPromise]) === timedOut) logger.warn("Mastra shutdown timed out; forcing exit", { timeoutMs: SHUTDOWN_TIMEOUT_MS });
-			} catch (error) {
-				logger.error("Error during Mastra shutdown", { error });
+				return await Promise.race([work, timeoutPromise]);
 			} finally {
 				clearTimeout(timeout);
 			}
-		}
-		process.exit(0);
-	};
-	process.once("SIGINT", () => void shutdown("SIGINT"));
-	process.once("SIGTERM", () => void shutdown("SIGTERM"));
+		};
+		let shuttingDown = false;
+		const shutdown = async (signal) => {
+			if (shuttingDown) {
+				process.exit(1);
+				return;
+			}
+			shuttingDown = true;
+			const logger = mastra.getLogger();
+			logger.info("Shutting down Mastra server", { signal });
+			try {
+				const drained = new Promise((resolve) => {
+					server.close(() => resolve());
+				});
+				closeRefreshStreams();
+				server.closeIdleConnections?.();
+				if (await race(drained, drainTimeoutMs) === timedOut) {
+					logger.warn("Mastra server drain timed out; closing remaining HTTP connections", { timeoutMs: drainTimeoutMs });
+					server.closeAllConnections?.();
+				}
+			} catch (error) {
+				logger.error("Error while draining Mastra server", { error });
+			}
+			try {
+				const lifecycle = mastra;
+				if (typeof lifecycle.shutdown === "function") {
+					if (await race(lifecycle.shutdown(), CORE_SHUTDOWN_TIMEOUT_MS) === timedOut) logger.warn("Mastra shutdown timed out; forcing exit", { timeoutMs: CORE_SHUTDOWN_TIMEOUT_MS });
+				}
+			} catch (error) {
+				logger.error("Error during Mastra shutdown", { error });
+			}
+			process.exit(0);
+		};
+		process.on("SIGINT", () => void shutdown("SIGINT"));
+		process.on("SIGTERM", () => void shutdown("SIGTERM"));
+	}
 	return server;
 }
 //#endregion