await stops + add timeout

Signed-off-by: LeTamanoir <[email protected]>

Author: LeTamanoir

src/adapter/bun/index.ts

@@ -17,7 +17,8 @@ import {
 	isNotEmpty,
 	isNumericString,
 	randomId,
-	supportPerMethodInlineHandler
+	supportPerMethodInlineHandler,
+	withTimeout
 } from '../../utils'
 
 import {
@@ -381,9 +382,20 @@ export const BunAdapter: ElysiaAdapter = {
 
 			if (callback) callback(app.server!)
 
-			process.on('beforeExit', () => {
+			process.on('beforeExit', async () => {
 				if (app.server) {
-					app.server.stop?.()
+					if (typeof options === 'object') {
+						await withTimeout(
+							() =>
+								app.server!.stop(
+									options.closeActiveConnections
+								),
+							options.stopTimeout ?? -1
+						)
+					} else {
+						await app.server!.stop()
+					}
+
 					app.server = null
 
 					if (app.event.stop)
@@ -414,9 +426,12 @@ export const BunAdapter: ElysiaAdapter = {
 			})
 		}
 	},
-	async stop(app, closeActiveConnections) {
+	async stop(app, { closeActiveConnections, timeout = -1 }) {
 		if (app.server) {
-			app.server.stop(closeActiveConnections)
+			await withTimeout(
+				() => app.server!.stop(closeActiveConnections),
+				timeout
+			)
 			app.server = null
 
 			if (app.event.stop?.length)

src/adapter/types.ts

@@ -9,10 +9,16 @@ import type { AnyWSLocalHook } from '../ws/types'
 
 export interface ElysiaAdapter {
 	name: string
-	listen(
-		app: AnyElysia
-	): (
-		options: string | number | Partial<Serve>,
+	listen(app: AnyElysia): (
+		options:
+			| string
+			| number
+			| Partial<
+					Serve & {
+						closeActiveConnections?: boolean
+						stopTimeout?: number
+					}
+			  >,
 		callback?: ListenCallback
 	) => void
 	/**
@@ -28,15 +34,15 @@ export interface ElysiaAdapter {
 	 * ```typescript
 	 * app.stop({ closeActiveConnections: true }) // Abruptly stop any requests inflight
 	 * ```
-	 * 
+	 *
 	 * @example
 	 * ```typescript
-	 * app.stop({ shutdownTimeout: 1000 }) // Wait for 1 second to stop the server
+	 * app.stop({ timeout: 1000 }) // Wait for 1 second to stop the server
 	 * ```
 	 */
 	stop?(
 		app: AnyElysia,
-		params: { closeActiveConnections?: boolean; shutdownTimeout?: number }
+		params: { closeActiveConnections?: boolean; timeout?: number }
 	): Promise<void>
 	isWebStandard?: boolean
 	handler: {

src/adapter/web-standard/index.ts

@@ -6,6 +6,7 @@ import {
 } from './handler'
 
 import type { ElysiaAdapter } from '../types'
+import { withTimeout } from '../../utils'
 
 export const WebStandardAdapter: ElysiaAdapter = {
 	name: 'web-standard',
@@ -59,14 +60,17 @@ export const WebStandardAdapter: ElysiaAdapter = {
 			}
 		}
 	},
-	async stop(app, closeActiveConnections) {
+	async stop(app, { closeActiveConnections, timeout = -1 }) {
 		if (!app.server)
 			throw new Error(
 				"Elysia isn't running. Call `app.listen` to start the server."
 			)
 
 		if (app.server) {
-			app.server.stop(closeActiveConnections)
+			await withTimeout(
+				() => app.server!.stop(closeActiveConnections),
+				timeout
+			)
 			app.server = null
 
 			if (app.event.stop?.length)

src/index.ts

@@ -12,11 +12,7 @@ import fastDecodeURIComponent from 'fast-decode-uri-component'
 import type { Context, PreContext } from './context'
 
 import { t } from './type-system'
-import {
-	mergeInference,
-	sucrose,
-	type Sucrose
-} from './sucrose'
+import { mergeInference, sucrose, type Sucrose } from './sucrose'
 
 import type { WSLocalHook } from './ws/types'
 
@@ -8157,14 +8153,17 @@ export default class Elysia<
 	 * app.stop(true) // Abruptly any requests inflight
 	 * ```
 	 */
-	stop = async (closeActiveConnections?: boolean) => {
-		await this['~adapter'].stop?.(this, closeActiveConnections)
+	stop = async (options: {
+		closeActiveConnections?: boolean
+		shutdownTimeout?: number
+	}) => {
+		await this['~adapter'].stop?.(this, options)
 
 		return this
 	};
 
 	[Symbol.dispose] = () => {
-		if (this.server) this.stop()
+		if (this.server) this.stop({})
 	}
 
 	/**