@fluojs/platform-bun 1.0.6 → 2.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.ko.md +8 -7
- package/README.md +8 -7
- package/dist/adapter.d.ts +10 -9
- package/dist/adapter.d.ts.map +1 -1
- package/dist/adapter.js +36 -37
- package/dist/testing-web-runtime-adapter-portability.d.js +0 -0
- package/package.json +5 -4
package/README.ko.md
CHANGED
|
@@ -28,7 +28,7 @@ npm install @fluojs/platform-bun
|
|
|
28
28
|
|
|
29
29
|
fluo 애플리케이션을 [Bun](https://bun.sh/) 런타임에서 실행할 때 이 패키지를 사용합니다. 이 어댑터는 Bun의 고성능 `Request`/`Response` 브리지와 네이티브 `fetch` 방식의 아키텍처를 활용하여 Bun 사용자에게 원활하고 빠른 경험을 제공합니다.
|
|
30
30
|
|
|
31
|
-
애플리케이션 종료 중에는 websocket upgrade 시도를 포함한 모든 새 유입을 `503` shutdown 응답으로 중단하고, Bun이 서버를 강제로 내리기 전에
|
|
31
|
+
애플리케이션 종료 중에는 websocket upgrade 시도를 포함한 모든 새 유입을 `503` shutdown 응답으로 중단하고, Bun이 서버를 강제로 내리기 전에 수락된 모든 요청이 realtime binding 평가부터 HTTP 응답 또는 upgrade 결과까지 bounded drain window 안에서 마무리될 수 있도록 동작합니다. 시그널 기반 종료가 `forceExitTimeoutMs`를 넘기거나 실패하면 fluo는 그 상태를 로그와 `process.exitCode`로 보고하고, 최종 프로세스 종료는 Bun 또는 주변 호스트에 맡깁니다.
|
|
32
32
|
|
|
33
33
|
## 빠른 시작
|
|
34
34
|
|
|
@@ -48,12 +48,12 @@ await app.listen();
|
|
|
48
48
|
|
|
49
49
|
### 수동 Fetch 처리
|
|
50
50
|
Bun 서버를 직접 관리하려는 경우 fetch 핸들러를 직접 사용할 수 있습니다.
|
|
51
|
-
`dispatcher`는 이미 bootstrap된 application의 `app.getHttpDispatcher()`에서 가져와야 합니다.
|
|
51
|
+
`dispatcher`는 이미 bootstrap된 application의 `app.getHttpDispatcher()`에서 가져와야 합니다. `createBunFetchHandler(...)`는 동기적으로 fetch bridge를 만들고 raw-body와 multipart request parsing을 보존하지만, shutdown ownership, websocket upgrade, native `routes` acceleration은 주변 `Bun.serve(...)` host 또는 managed adapter 경로가 소유합니다.
|
|
52
52
|
|
|
53
53
|
```typescript
|
|
54
54
|
import { createBunFetchHandler } from '@fluojs/platform-bun';
|
|
55
55
|
|
|
56
|
-
const handler =
|
|
56
|
+
const handler = createBunFetchHandler({
|
|
57
57
|
dispatcher: app.getHttpDispatcher(),
|
|
58
58
|
});
|
|
59
59
|
|
|
@@ -91,7 +91,7 @@ Native handoff가 붙은 뒤 app middleware가 framework request의 method 또
|
|
|
91
91
|
- `BunHttpApplicationAdapter`: `Bun.serve()`를 기반으로 동작하는 `HttpApplicationAdapter` 구현체입니다.
|
|
92
92
|
- `BunAdapterOptions`: `createBunAdapter()`가 받는 host, port, TLS, raw-body, multipart, shutdown 옵션입니다.
|
|
93
93
|
- `BootstrapBunApplicationOptions` 및 `RunBunApplicationOptions`: Bun 호스팅 애플리케이션의 bootstrap/run 옵션입니다.
|
|
94
|
-
- `BunWebSocketBinding` 및 `BunRealtimeBindingHost`: 일반 HTTP dispatch 전에 `@fluojs/websockets/bun`이 사용하는 binding 계약입니다.
|
|
94
|
+
- `BunWebSocketBinding`, `BunWebSocketUpgradeHost` 및 `BunRealtimeBindingHost`: 일반 HTTP dispatch 전에 `@fluojs/websockets/bun`이 사용하는 binding 계약입니다. Binding은 upgrade 가능한 host만 받으며 adapter가 소유하는 Bun server lifecycle이나 raw fetch handler는 받지 않습니다.
|
|
95
95
|
- `BunWebSocketBindingHost`: Bun realtime binding 설정을 위한 backward-compatible alias입니다.
|
|
96
96
|
- `BunServeOptions`, `BunServerLike`, `BunWebSocketHandler`, `BunServerWebSocket`, `BunWebSocketMessage`, `BunApplicationSignal`, `BunCorsInput`, `BunTlsOptions`, `CreateBunFetchHandlerOptions`: 저수준 Bun host, websocket, signal, CORS, TLS, fetch-handler integration type입니다.
|
|
97
97
|
|
|
@@ -103,13 +103,14 @@ Native handoff가 붙은 뒤 app middleware가 framework request의 method 또
|
|
|
103
103
|
- **네이티브 route gate**: Native route는 Bun `>=1.2.3`에서만 활성화됩니다. Adapter는 안전한 native-route entry가 실제로 활성화될 때만 `routes` 옵션을 전달하고, 그 외에는 `routes` 옵션 자체를 생략합니다. Versioned route, `ALL` handler, same-shape conflict, normalization-sensitive path, `OPTIONS`/CORS preflight는 fetch/shared-dispatch path에 남습니다.
|
|
104
104
|
- **Multipart 동작**: Multipart 요청은 `rawBody`를 노출하지 않으며 multipart limit은 shared runtime parser를 통해 계속 적용됩니다.
|
|
105
105
|
- **시작 target**: `hostname`, `port`, `tls`는 `Bun.serve()`로 전달됩니다. 시작 로그는 설정된 HTTP 또는 HTTPS listen URL을 보고합니다.
|
|
106
|
-
-
|
|
107
|
-
-
|
|
106
|
+
- **Lifecycle guard**: 이미 시작된 adapter에서 `listen()`을 다시 호출해도 원래 live dispatcher binding을 유지합니다. Realtime/websocket binding은 `listen()`이 시작되기 전에만 구성할 수 있으며, 이후 binding을 설정하거나 지우려는 시도는 live wiring에 영향을 주지 않은 채 수락되지 않고 빠르게 실패합니다.
|
|
107
|
+
- **종료 소유권**: `close()`는 새 HTTP 및 websocket-upgrade 유입을 `503` shutdown 응답으로 중단하고, 수락된 모든 요청을 realtime binding 평가부터 HTTP 응답 또는 upgrade 완료까지 기다린 뒤, drain이 끝나면 adapter state를 정리하며 `runBunApplication()`이 등록한 signal listener를 제거합니다.
|
|
108
|
+
- **Realtime seam**: Bun websocket binding은 서버를 시작하는 `listen()` 전에 구성해야 합니다. Adapter가 새 유입을 받는 동안 Upgrade 요청은 HTTP dispatch로 넘어가기 전에 구성된 binding에 먼저 전달되며, 비동기 binding 평가 도중 shutdown이 시작되어도 이미 수락된 요청에는 dispatcher가 유지되고, binding이 response를 반환하거나 요청 업그레이드에 성공한 경우에만 HTTP fallback을 억제합니다. Binding host는 `upgrade(...)`만 노출하므로 adapter가 소유하는 `stop()`과 raw `fetch()` 제어는 realtime seam 밖에 남습니다.
|
|
108
109
|
- **Adapter instance helper**: `BunHttpApplicationAdapter`는 `getServer()`, `getListenTarget()`, `getRealtimeCapability()`, `configureRealtimeBinding()`, `configureWebSocketBinding()`, `listen()`, `close()`를 노출합니다.
|
|
109
110
|
|
|
110
111
|
## Conformance 커버리지
|
|
111
112
|
|
|
112
|
-
`packages/platform-bun/src/adapter.test.ts`는 문서화된 계약을 검증하는 package-local regression 대상입니다. 이 파일은 malformed cookie, JSON/text raw-body 보존, multipart raw-body 제외, SSE framing, native-route param parity, same-path multi-method handoff, versioning fallback, normalization-sensitive fallback, OPTIONS/CORS ownership, same-shape route fallback, TLS listen-target reporting을 검증하는 Bun fetch-style portability assertion과 startup logging, shutdown listener cleanup, in-flight drain, timeout reporting, shutdown 503 ingress rejection, websocket binding delegation
|
|
113
|
+
`packages/platform-bun/src/adapter.test.ts`는 문서화된 계약을 검증하는 package-local regression 대상입니다. 이 파일은 malformed cookie, byte-exact JSON/text raw-body 보존, managed/custom fetch handler의 multipart raw-body 제외, SSE framing, native-route param parity, same-path multi-method handoff, middleware가 request path 또는 method를 rewrite한 뒤의 stale native handoff rematch, versioning fallback, normalization-sensitive fallback, OPTIONS/CORS ownership, same-shape route fallback, TLS listen-target reporting을 검증하는 Bun fetch-style portability assertion과 startup logging, duplicate listen idempotency, shutdown listener cleanup, in-flight drain, 비동기 realtime binding 평가 중 close, binding 완료 후 HTTP fallback, timeout validation/reporting, shutdown 503 ingress rejection, signal-driven close rejection reporting, upgrade-only host를 통한 websocket binding delegation/short-circuit 동작을 검증하는 집중 테스트를 포함합니다.
|
|
113
114
|
|
|
114
115
|
저장소의 더 넓은 suite도 `packages/testing/src/portability/web-runtime-adapter-portability.test.ts`에서 `createWebRuntimeHttpAdapterPortabilityHarness(...)`로 Bun을 Deno 및 Cloudflare Workers와 함께 실행해 fetch-style platform 간 shared web-runtime portability baseline을 맞춥니다.
|
|
115
116
|
|
package/README.md
CHANGED
|
@@ -28,7 +28,7 @@ This package is intended to run on Bun. The published manifest intentionally doe
|
|
|
28
28
|
|
|
29
29
|
Use this package when running fluo applications on the [Bun](https://bun.sh/) runtime. This adapter leverages Bun's high-performance `Request`/`Response` bridge and native `fetch`-style architecture, providing a seamless and fast experience for Bun users.
|
|
30
30
|
|
|
31
|
-
During application shutdown, the adapter stops all new ingress, including websocket upgrade attempts, with a `503` shutdown response and gives
|
|
31
|
+
During application shutdown, the adapter stops all new ingress, including websocket upgrade attempts, with a `503` shutdown response and gives every accepted request a bounded drain window that covers realtime binding evaluation through its HTTP response or upgrade outcome before Bun forcefully tears the server down. If signal-driven shutdown exceeds `forceExitTimeoutMs` or fails, fluo reports that condition through logging and `process.exitCode` while leaving final process termination to Bun or the surrounding host.
|
|
32
32
|
|
|
33
33
|
## Quick Start
|
|
34
34
|
|
|
@@ -48,12 +48,12 @@ await app.listen();
|
|
|
48
48
|
|
|
49
49
|
### Manual Fetch Handling
|
|
50
50
|
If you prefer to manage the Bun server yourself, you can use the fetch handler directly.
|
|
51
|
-
The `dispatcher` should come from the already bootstrapped application via `app.getHttpDispatcher()`.
|
|
51
|
+
The `dispatcher` should come from the already bootstrapped application via `app.getHttpDispatcher()`. `createBunFetchHandler(...)` synchronously creates the fetch bridge and preserves raw-body and multipart request parsing, while shutdown ownership, websocket upgrades, and native `routes` acceleration remain responsibilities of the surrounding `Bun.serve(...)` host or the managed adapter path.
|
|
52
52
|
|
|
53
53
|
```typescript
|
|
54
54
|
import { createBunFetchHandler } from '@fluojs/platform-bun';
|
|
55
55
|
|
|
56
|
-
const handler =
|
|
56
|
+
const handler = createBunFetchHandler({
|
|
57
57
|
dispatcher: app.getHttpDispatcher(),
|
|
58
58
|
});
|
|
59
59
|
|
|
@@ -91,7 +91,7 @@ The adapter also exports the typed Bun integration seams used by realtime packag
|
|
|
91
91
|
- `BunHttpApplicationAdapter`: `HttpApplicationAdapter` implementation backed by `Bun.serve()`.
|
|
92
92
|
- `BunAdapterOptions`: host, port, TLS, raw-body, multipart, and shutdown options accepted by `createBunAdapter()`.
|
|
93
93
|
- `BootstrapBunApplicationOptions` and `RunBunApplicationOptions`: application bootstrap/run options for Bun-hosted apps.
|
|
94
|
-
- `BunWebSocketBinding` and `BunRealtimeBindingHost`: binding contracts used by `@fluojs/websockets/bun` before normal HTTP dispatch.
|
|
94
|
+
- `BunWebSocketBinding`, `BunWebSocketUpgradeHost`, and `BunRealtimeBindingHost`: binding contracts used by `@fluojs/websockets/bun` before normal HTTP dispatch. Bindings receive only an upgrade-capable host, not the adapter-owned Bun server lifecycle or raw fetch handler.
|
|
95
95
|
- `BunWebSocketBindingHost`: Backward-compatible alias for configuring Bun realtime bindings.
|
|
96
96
|
- `BunServeOptions`, `BunServerLike`, `BunWebSocketHandler`, `BunServerWebSocket`, `BunWebSocketMessage`, `BunApplicationSignal`, `BunCorsInput`, `BunTlsOptions`, and `CreateBunFetchHandlerOptions`: Lower-level Bun host, websocket, signal, CORS, TLS, and fetch-handler integration types.
|
|
97
97
|
|
|
@@ -103,13 +103,14 @@ The adapter also exports the typed Bun integration seams used by realtime packag
|
|
|
103
103
|
- **Native route gate**: Native routes are enabled only on Bun `>=1.2.3`; the adapter omits the `routes` option entirely unless safe native-route entries are concretely enabled. Versioned routes, `ALL` handlers, same-shape conflicts, normalization-sensitive paths, and `OPTIONS`/CORS preflight stay on the fetch/shared-dispatch path.
|
|
104
104
|
- **Multipart behavior**: Multipart requests never expose `rawBody`, and multipart limits continue to flow through the shared runtime parser.
|
|
105
105
|
- **Startup target**: `hostname`, `port`, and `tls` are forwarded to `Bun.serve()`. Startup logs report the configured HTTP or HTTPS listen URL.
|
|
106
|
-
- **
|
|
107
|
-
- **
|
|
106
|
+
- **Lifecycle guards**: `listen()` is idempotent for an already-started adapter and keeps the original live dispatcher binding. Realtime/websocket bindings must be configured before `listen()` starts; later attempts to set or clear the binding fail fast instead of being accepted without affecting live wiring.
|
|
107
|
+
- **Shutdown ownership**: `close()` stops new HTTP and websocket-upgrade ingress with a `503` shutdown response, waits for every accepted request from realtime binding evaluation through HTTP response or upgrade completion, clears adapter state after drain settles, and removes signal listeners registered by `runBunApplication()`.
|
|
108
|
+
- **Realtime seam**: Bun websocket bindings must be configured before `listen()` starts the server. Upgrade requests are offered to the configured binding before falling back to HTTP dispatch while the adapter is accepting new ingress; an accepted request keeps its dispatcher available if shutdown begins during asynchronous binding evaluation, and HTTP fallback is suppressed only after the binding returns a response or successfully upgrades the request. The binding host exposes only `upgrade(...)`, so adapter-owned `stop()` and raw `fetch()` control remain outside the realtime seam.
|
|
108
109
|
- **Adapter instance helpers**: `BunHttpApplicationAdapter` exposes `getServer()`, `getListenTarget()`, `getRealtimeCapability()`, `configureRealtimeBinding()`, `configureWebSocketBinding()`, `listen()`, and `close()`.
|
|
109
110
|
|
|
110
111
|
## Conformance Coverage
|
|
111
112
|
|
|
112
|
-
`packages/platform-bun/src/adapter.test.ts` is the package-local regression target for the documented contract. It includes Bun fetch-style portability assertions for malformed cookies, JSON/text raw-body preservation, multipart raw-body exclusion, SSE framing, native-route param parity, same-path multi-method handoff, versioning fallback, normalization-sensitive fallback, OPTIONS/CORS ownership, same-shape route fallback, and TLS listen-target reporting, plus focused tests for startup logging, shutdown listener cleanup, in-flight drain behavior, timeout reporting, shutdown 503 ingress rejection, and websocket binding delegation.
|
|
113
|
+
`packages/platform-bun/src/adapter.test.ts` is the package-local regression target for the documented contract. It includes Bun fetch-style portability assertions for malformed cookies, byte-exact JSON/text raw-body preservation, multipart raw-body exclusion for managed and custom fetch handlers, SSE framing, native-route param parity, same-path multi-method handoff, stale native handoff rematching after middleware rewrites the request path or method, versioning fallback, normalization-sensitive fallback, OPTIONS/CORS ownership, same-shape route fallback, and TLS listen-target reporting, plus focused tests for startup logging, duplicate listen idempotency, shutdown listener cleanup, in-flight drain behavior, close during asynchronous realtime binding evaluation, HTTP fallback after binding completion, timeout validation/reporting, shutdown 503 ingress rejection, signal-driven close rejection reporting, and websocket binding delegation/short-circuit behavior through an upgrade-only host.
|
|
113
114
|
|
|
114
115
|
The broader repository suite also exercises Bun through `createWebRuntimeHttpAdapterPortabilityHarness(...)` alongside Deno and Cloudflare Workers in `packages/testing/src/portability/web-runtime-adapter-portability.test.ts`, keeping the shared web-runtime portability baseline aligned across fetch-style platforms.
|
|
115
116
|
|
package/dist/adapter.d.ts
CHANGED
|
@@ -1,12 +1,6 @@
|
|
|
1
1
|
import type { CorsOptions, Dispatcher, HttpApplicationAdapter, HttpMethod, MiddlewareLike, SecurityHeadersOptions } from '@fluojs/http';
|
|
2
|
-
import type { Application, CreateApplicationOptions, ModuleType, MultipartOptions
|
|
2
|
+
import type { Application, CreateApplicationOptions, ModuleType, MultipartOptions } from '@fluojs/runtime';
|
|
3
3
|
import { type HttpAdapterListenTarget } from '@fluojs/runtime/internal/http-adapter';
|
|
4
|
-
declare module '@fluojs/http' {
|
|
5
|
-
interface FrameworkRequest {
|
|
6
|
-
files?: UploadedFile[];
|
|
7
|
-
rawBody?: Uint8Array;
|
|
8
|
-
}
|
|
9
|
-
}
|
|
10
4
|
type BunHostname = string;
|
|
11
5
|
type BunRequestLike = Request & {
|
|
12
6
|
params?: Readonly<Record<string, string>>;
|
|
@@ -58,11 +52,18 @@ export interface BunWebSocketHandler<TData = unknown> {
|
|
|
58
52
|
}
|
|
59
53
|
/** Fetch-style websocket binding consumed before normal HTTP dispatch. */
|
|
60
54
|
export interface BunWebSocketBinding<TData = unknown> {
|
|
61
|
-
fetch(request: Request, server:
|
|
55
|
+
fetch(request: Request, server: BunWebSocketUpgradeHost): Response | Promise<Response> | undefined | Promise<Response | undefined>;
|
|
62
56
|
idleTimeout?: number;
|
|
63
57
|
maxRequestBodySize?: number;
|
|
64
58
|
websocket: BunWebSocketHandler<TData>;
|
|
65
59
|
}
|
|
60
|
+
/** Upgrade-only Bun host exposed to websocket bindings before normal HTTP dispatch. */
|
|
61
|
+
export interface BunWebSocketUpgradeHost {
|
|
62
|
+
upgrade<TData = unknown>(request: Request, options?: {
|
|
63
|
+
data?: TData;
|
|
64
|
+
headers?: HeadersInit;
|
|
65
|
+
}): boolean;
|
|
66
|
+
}
|
|
66
67
|
/** Host contract exposed by Bun adapters that can install a realtime binding. */
|
|
67
68
|
export interface BunRealtimeBindingHost {
|
|
68
69
|
configureRealtimeBinding<TData>(binding: BunWebSocketBinding<TData> | undefined): void;
|
|
@@ -177,6 +178,7 @@ export declare class BunHttpApplicationAdapter implements HttpApplicationAdapter
|
|
|
177
178
|
private server?;
|
|
178
179
|
private realtimeBinding?;
|
|
179
180
|
private readonly options;
|
|
181
|
+
private readonly shutdownTimeoutMs;
|
|
180
182
|
private readonly webRequestResponseFactory;
|
|
181
183
|
constructor(options?: BunAdapterOptions);
|
|
182
184
|
/** Returns the active Bun server handle after `listen()` starts. */
|
|
@@ -193,7 +195,6 @@ export declare class BunHttpApplicationAdapter implements HttpApplicationAdapter
|
|
|
193
195
|
listen(dispatcher: Dispatcher): Promise<void>;
|
|
194
196
|
/** Stops ingress, waits for in-flight HTTP handlers, and releases adapter state. */
|
|
195
197
|
close(): Promise<void>;
|
|
196
|
-
private dispatchHttpRequest;
|
|
197
198
|
private trackInFlightRequest;
|
|
198
199
|
private waitForInFlightRequests;
|
|
199
200
|
}
|
package/dist/adapter.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,UAAU,EAEV,sBAAsB,EACtB,UAAU,EACV,cAAc,EACd,sBAAsB,EACvB,MAAM,cAAc,CAAC;AAMtB,OAAO,KAAK,EACV,WAAW,EAEX,wBAAwB,EACxB,UAAU,EACV,gBAAgB,
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../src/adapter.ts"],"names":[],"mappings":"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"}
|
package/dist/adapter.js
CHANGED
|
@@ -16,6 +16,8 @@ import { createWebRequestResponseFactory, dispatchWebRequest } from '@fluojs/run
|
|
|
16
16
|
|
|
17
17
|
/** Fetch-style websocket binding consumed before normal HTTP dispatch. */
|
|
18
18
|
|
|
19
|
+
/** Upgrade-only Bun host exposed to websocket bindings before normal HTTP dispatch. */
|
|
20
|
+
|
|
19
21
|
/** Host contract exposed by Bun adapters that can install a realtime binding. */
|
|
20
22
|
|
|
21
23
|
/** Backward-compatible host contract for Bun websocket-specific bindings. */
|
|
@@ -38,8 +40,8 @@ const DEFAULT_SHUTDOWN_TIMEOUT_MS = 10_000;
|
|
|
38
40
|
const DEFAULT_FORCE_EXIT_TIMEOUT_MS = 30_000;
|
|
39
41
|
const MINIMUM_BUN_NATIVE_ROUTES_VERSION = '1.2.3';
|
|
40
42
|
const EMPTY_NATIVE_ROUTE_PARAMS = Object.freeze({});
|
|
43
|
+
const BUN_ADAPTER_CLOSE_TIMEOUT_MS = Symbol('fluo.bunAdapterCloseTimeoutMs');
|
|
41
44
|
const BUN_WEBSOCKET_SUPPORT_REASON = 'Bun exposes Bun.serve() + server.upgrade() request-upgrade hosting. Use @fluojs/websockets/bun for the official raw websocket binding.';
|
|
42
|
-
|
|
43
45
|
/** HTTP application adapter backed by native `Bun.serve()`. */
|
|
44
46
|
export class BunHttpApplicationAdapter {
|
|
45
47
|
closeInFlight;
|
|
@@ -49,12 +51,16 @@ export class BunHttpApplicationAdapter {
|
|
|
49
51
|
server;
|
|
50
52
|
realtimeBinding;
|
|
51
53
|
options;
|
|
54
|
+
shutdownTimeoutMs;
|
|
52
55
|
webRequestResponseFactory;
|
|
53
56
|
constructor(options = {}) {
|
|
57
|
+
const internalOptions = options;
|
|
54
58
|
validateNonNegativeIntegerOption('idleTimeout', options.idleTimeout);
|
|
55
59
|
validateNonNegativeIntegerOption('maxBodySize', options.maxBodySize);
|
|
60
|
+
validateNonNegativeIntegerOption('shutdownTimeoutMs', internalOptions[BUN_ADAPTER_CLOSE_TIMEOUT_MS]);
|
|
56
61
|
validatePortOption(options.port);
|
|
57
62
|
this.options = options;
|
|
63
|
+
this.shutdownTimeoutMs = internalOptions[BUN_ADAPTER_CLOSE_TIMEOUT_MS] ?? DEFAULT_SHUTDOWN_TIMEOUT_MS;
|
|
58
64
|
this.webRequestResponseFactory = createWebRequestResponseFactory({
|
|
59
65
|
consumeOriginalBody: true,
|
|
60
66
|
maxBodySize: options.maxBodySize,
|
|
@@ -91,7 +97,7 @@ export class BunHttpApplicationAdapter {
|
|
|
91
97
|
|
|
92
98
|
/** Configures the official realtime binding before the Bun server starts. */
|
|
93
99
|
configureRealtimeBinding(binding) {
|
|
94
|
-
if (this.server
|
|
100
|
+
if (this.server) {
|
|
95
101
|
throw new Error('Bun websocket binding must be configured before Bun adapter listen() starts the server.');
|
|
96
102
|
}
|
|
97
103
|
this.realtimeBinding = binding;
|
|
@@ -104,10 +110,10 @@ export class BunHttpApplicationAdapter {
|
|
|
104
110
|
|
|
105
111
|
/** Starts the Bun server and binds framework dispatch to native fetch requests. */
|
|
106
112
|
async listen(dispatcher) {
|
|
107
|
-
this.dispatcher = dispatcher;
|
|
108
113
|
if (this.server) {
|
|
109
114
|
return;
|
|
110
115
|
}
|
|
116
|
+
this.dispatcher = dispatcher;
|
|
111
117
|
const bun = requireBunGlobal();
|
|
112
118
|
const realtimeBinding = this.realtimeBinding;
|
|
113
119
|
const handleRequest = async (request, server) => {
|
|
@@ -117,13 +123,23 @@ export class BunHttpApplicationAdapter {
|
|
|
117
123
|
if (this.closeInFlight) {
|
|
118
124
|
return createShutdownResponse();
|
|
119
125
|
}
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
if (
|
|
123
|
-
|
|
126
|
+
const release = this.trackInFlightRequest();
|
|
127
|
+
try {
|
|
128
|
+
if (realtimeBinding) {
|
|
129
|
+
const realtimeResult = await dispatchRealtimeBindingRequest(realtimeBinding, request, server);
|
|
130
|
+
if (realtimeResult.handled !== undefined || realtimeResult.upgraded) {
|
|
131
|
+
return realtimeResult.handled;
|
|
132
|
+
}
|
|
124
133
|
}
|
|
134
|
+
return await dispatchWebRequest({
|
|
135
|
+
dispatcher: this.dispatcher,
|
|
136
|
+
dispatcherNotReadyMessage: DEFAULT_DISPATCHER_NOT_READY_MESSAGE,
|
|
137
|
+
factory: this.webRequestResponseFactory,
|
|
138
|
+
request
|
|
139
|
+
});
|
|
140
|
+
} finally {
|
|
141
|
+
release();
|
|
125
142
|
}
|
|
126
|
-
return await this.dispatchHttpRequest(request);
|
|
127
143
|
};
|
|
128
144
|
const nativeRoutes = createBunNativeRoutes(dispatcher, handleRequest, bun);
|
|
129
145
|
const serveOptions = {
|
|
@@ -145,7 +161,7 @@ export class BunHttpApplicationAdapter {
|
|
|
145
161
|
/** Stops ingress, waits for in-flight HTTP handlers, and releases adapter state. */
|
|
146
162
|
async close() {
|
|
147
163
|
if (this.closeInFlight) {
|
|
148
|
-
await waitForCloseWithTimeout(this.closeInFlight,
|
|
164
|
+
await waitForCloseWithTimeout(this.closeInFlight, this.shutdownTimeoutMs);
|
|
149
165
|
return;
|
|
150
166
|
}
|
|
151
167
|
if (!this.server) {
|
|
@@ -163,23 +179,7 @@ export class BunHttpApplicationAdapter {
|
|
|
163
179
|
});
|
|
164
180
|
this.closeInFlight = closeInFlight;
|
|
165
181
|
void closeInFlight.catch(() => {});
|
|
166
|
-
await waitForCloseWithTimeout(closeInFlight,
|
|
167
|
-
}
|
|
168
|
-
async dispatchHttpRequest(request) {
|
|
169
|
-
if (this.closeInFlight) {
|
|
170
|
-
return createShutdownResponse();
|
|
171
|
-
}
|
|
172
|
-
const release = this.trackInFlightRequest();
|
|
173
|
-
try {
|
|
174
|
-
return await dispatchWebRequest({
|
|
175
|
-
dispatcher: this.dispatcher,
|
|
176
|
-
dispatcherNotReadyMessage: DEFAULT_DISPATCHER_NOT_READY_MESSAGE,
|
|
177
|
-
factory: this.webRequestResponseFactory,
|
|
178
|
-
request
|
|
179
|
-
});
|
|
180
|
-
} finally {
|
|
181
|
-
release();
|
|
182
|
-
}
|
|
182
|
+
await waitForCloseWithTimeout(closeInFlight, this.shutdownTimeoutMs);
|
|
183
183
|
}
|
|
184
184
|
trackInFlightRequest() {
|
|
185
185
|
this.inFlightRequestCount += 1;
|
|
@@ -276,8 +276,9 @@ export async function bootstrapBunApplication(rootModule, options) {
|
|
|
276
276
|
* @returns The running application instance.
|
|
277
277
|
*/
|
|
278
278
|
export async function runBunApplication(rootModule, options) {
|
|
279
|
+
validateNonNegativeIntegerOption('forceExitTimeoutMs', options.forceExitTimeoutMs);
|
|
279
280
|
const logger = createDefaultApplicationLogger();
|
|
280
|
-
const
|
|
281
|
+
const adapterOptions = {
|
|
281
282
|
development: options.development,
|
|
282
283
|
hostname: options.hostname,
|
|
283
284
|
idleTimeout: options.idleTimeout,
|
|
@@ -286,8 +287,10 @@ export async function runBunApplication(rootModule, options) {
|
|
|
286
287
|
port: options.port,
|
|
287
288
|
rawBody: options.rawBody,
|
|
288
289
|
stopActiveConnections: options.stopActiveConnections,
|
|
289
|
-
tls: options.tls
|
|
290
|
-
|
|
290
|
+
tls: options.tls,
|
|
291
|
+
[BUN_ADAPTER_CLOSE_TIMEOUT_MS]: options.forceExitTimeoutMs ?? DEFAULT_FORCE_EXIT_TIMEOUT_MS
|
|
292
|
+
};
|
|
293
|
+
const adapter = new BunHttpApplicationAdapter(adapterOptions);
|
|
291
294
|
return runHttpAdapterApplication(rootModule, {
|
|
292
295
|
...options,
|
|
293
296
|
shutdownRegistration: createBunShutdownSignalRegistration(options.shutdownSignals ?? defaultBunShutdownSignals())
|
|
@@ -298,6 +301,7 @@ function defaultBunShutdownSignals() {
|
|
|
298
301
|
}
|
|
299
302
|
function createBunShutdownSignalRegistration(signals) {
|
|
300
303
|
return (app, logger, forceExitTimeoutMs = DEFAULT_FORCE_EXIT_TIMEOUT_MS) => {
|
|
304
|
+
validateNonNegativeIntegerOption('forceExitTimeoutMs', forceExitTimeoutMs);
|
|
301
305
|
if (signals === false) {
|
|
302
306
|
return () => {};
|
|
303
307
|
}
|
|
@@ -372,19 +376,14 @@ function validateNonNegativeIntegerOption(name, value) {
|
|
|
372
376
|
}
|
|
373
377
|
async function dispatchRealtimeBindingRequest(binding, request, server) {
|
|
374
378
|
let upgraded = false;
|
|
375
|
-
const
|
|
376
|
-
fetch: server.fetch ? trackedRequest => server.fetch?.(trackedRequest) : undefined,
|
|
377
|
-
hostname: server.hostname,
|
|
378
|
-
port: server.port,
|
|
379
|
-
stop: closeActiveConnections => server.stop(closeActiveConnections),
|
|
379
|
+
const upgradeHost = {
|
|
380
380
|
upgrade(upgradeRequest, options) {
|
|
381
381
|
const didUpgrade = server.upgrade(upgradeRequest, options);
|
|
382
382
|
upgraded ||= didUpgrade;
|
|
383
383
|
return didUpgrade;
|
|
384
|
-
}
|
|
385
|
-
url: server.url
|
|
384
|
+
}
|
|
386
385
|
};
|
|
387
|
-
const handled = await binding.fetch(request,
|
|
386
|
+
const handled = await binding.fetch(request, upgradeHost);
|
|
388
387
|
return {
|
|
389
388
|
handled,
|
|
390
389
|
upgraded
|
|
File without changes
|
package/package.json
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"platform",
|
|
9
9
|
"server"
|
|
10
10
|
],
|
|
11
|
-
"version": "
|
|
11
|
+
"version": "2.0.0",
|
|
12
12
|
"private": false,
|
|
13
13
|
"license": "MIT",
|
|
14
14
|
"repository": {
|
|
@@ -32,11 +32,12 @@
|
|
|
32
32
|
"dist"
|
|
33
33
|
],
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@fluojs/http": "^
|
|
36
|
-
"@fluojs/runtime": "^
|
|
35
|
+
"@fluojs/http": "^2.0.1",
|
|
36
|
+
"@fluojs/runtime": "^2.0.1"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
|
-
"vitest": "^3.2.4"
|
|
39
|
+
"vitest": "^3.2.4",
|
|
40
|
+
"@fluojs/testing": "^2.0.0"
|
|
40
41
|
},
|
|
41
42
|
"scripts": {
|
|
42
43
|
"prebuild": "node ../../tooling/scripts/clean-dist.mjs",
|