@fluojs/graphql 1.0.0-beta.4 → 1.0.0-beta.5

package/README.ko.md

@@ -133,7 +133,7 @@ class RequestResolver {
 ### 프로토콜 지원
 - **HTTP**: 표준 GET/POST 쿼리 및 뮤테이션.
 - **SSE**: Server-Sent Events를 통한 구독(기본값).
-- **WebSockets**: 실시간 구독을 위한 선택적 `graphql-ws` 지원.
+- **WebSockets**: 활성 adapter가 upgrade listener를 지원하는 Node HTTP/S 서버를 노출할 때(예: Node HTTP adapter) 사용할 수 있는 선택적 `graphql-ws` 실시간 구독 지원.
 
 ```typescript
 GraphqlModule.forRoot({
@@ -154,6 +154,7 @@ GraphqlModule.forRoot({
 
 - `graphiql`을 명시적으로 켜거나 `introspection: true`를 설정하지 않으면 스키마 introspection은 기본적으로 비활성화됩니다.
 - 문서 depth, field complexity, aggregate query cost에 대한 request validation budget이 기본적으로 보수적인 값으로 활성화됩니다.
+- Streaming GraphQL 응답은 downstream response stream이 닫히거나 오류를 내면 upstream fetch body를 cancel하므로 SSE subscription 리소스를 즉시 해제합니다.
 - WebSocket 구독 경로에는 별도의 전송 budget이 기본 적용됩니다: 동시 연결 `100`, 최대 payload 크기 `64 KiB`, 연결당 활성 operation `25`개입니다.
 - 무제한 WebSocket 동작이 정말 필요할 때만 `subscriptions.websocket.limits = false`를 사용하고, 그 경우에도 동일한 수준의 외부 제어 수단을 마련해야 합니다.
 - 무제한 동작이 꼭 필요할 때만 `limits: false`를 사용하고, 그 경우에는 외부 제어 수단을 함께 두어야 합니다.

package/README.md

@@ -133,7 +133,7 @@ class RequestResolver {
 ### Protocol Support
 - **HTTP**: Standard GET/POST queries and mutations.
 - **SSE**: Subscriptions over Server-Sent Events (default).
-- **WebSockets**: Optional `graphql-ws` support for real-time subscriptions.
+- **WebSockets**: Optional `graphql-ws` support for real-time subscriptions when the active adapter exposes a Node HTTP/S server with upgrade listeners (for example, the Node HTTP adapter).
 
 ```typescript
 GraphqlModule.forRoot({
@@ -154,6 +154,7 @@ GraphqlModule.forRoot({
 
 - Schema introspection is disabled by default unless you explicitly enable `graphiql` or set `introspection: true`.
 - Request validation budgets are enabled by default with conservative limits for document depth, field complexity, and aggregate query cost.
+- Streaming GraphQL responses cancel the upstream fetch body when the downstream response stream closes or errors, so SSE subscription resources are released promptly.
 - WebSocket subscriptions use separate transport budgets by default: `100` concurrent connections, `64 KiB` maximum payload size, and `25` active operations per connection.
 - Set `subscriptions.websocket.limits = false` only when you intentionally need unbounded websocket behavior and can enforce equivalent controls elsewhere.
 - Pass `limits: false` only when you intentionally need unbounded behavior and can compensate with external controls.

package/dist/service.d.ts

@@ -27,6 +27,7 @@ export declare class GraphqlLifecycleService implements OnApplicationBootstrap,
     private websocketUpgradeListener;
     private websocketUpgradeServer;
     private executeGraphqlOperation;
+    private releaseGraphqlInstanceOfPatch;
     private subscribeGraphqlOperation;
     private yoga;
     private readonly middleware;

package/dist/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAgD,KAAK,sBAAsB,EAAsD,MAAM,cAAc,CAAC;AAE7J,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC3B,MAAM,iBAAiB,CAAC;AA2BzB,OAAO,KAAK,EAEV,oBAAoB,EAGrB,MAAM,YAAY,CAAC;AAkIpB;;GAEG;AACH,qBACa,yBAAyB;IAEpC,SAAS,IAAI,SAAS;IAKtB,UAAU,IAAI,SAAS;CAGxB;AAoHD;;GAEG;AACH,qBACa,uBAAwB,YAAW,sBAAsB,EAAE,qBAAqB;IA4DzF,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IA/DxB,OAAO,CAAC,uBAAuB,CAAsC;IACrE,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqC;IACzE,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAA6C;IAC1F,OAAO,CAAC,mBAAmB,CAAkD;IAC7E,OAAO,CAAC,eAAe,CAA8B;IACrD,OAAO,CAAC,wBAAwB,CAAkC;IAClE,OAAO,CAAC,sBAAsB,CAAgC;IAC9D,OAAO,CAAC,uBAAuB,CAAyD;IACxF,OAAO,CAAC,yBAAyB,CAAyD;IAC1F,OAAO,CAAC,IAAI,CAAuB;IAEnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CA4CzB;gBAGiB,gBAAgB,EAAE,SAAS,EAC3B,eAAe,EAAE,SAAS,cAAc,EAAE,EAC1C,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,sBAAsB,EACjC,OAAO,EAAE,oBAAoB;IAGxC,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAsCvC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAU5C,OAAO,CAAC,sBAAsB;IAI9B,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,sBAAsB;IAe9B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,kBAAkB;IAiB1B,OAAO,CAAC,oBAAoB;IAmB5B,OAAO,CAAC,mBAAmB;IAyB3B,OAAO,CAAC,0BAA0B;YAuEpB,4BAA4B;IAuC1C,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,oBAAoB;YAkBd,wBAAwB;IAwDtC,OAAO,CAAC,kCAAkC;IAwB1C,OAAO,CAAC,sBAAsB;IAoB9B,OAAO,CAAC,sCAAsC;YAchC,kCAAkC;YAqBlC,sCAAsC;IAkBpD,OAAO,CAAC,6BAA6B;YAYvB,yBAAyB;CAexC"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAgD,KAAK,sBAAsB,EAAsD,MAAM,cAAc,CAAC;AAE7J,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC3B,MAAM,iBAAiB,CAAC;AA2BzB,OAAO,KAAK,EAEV,oBAAoB,EAGrB,MAAM,YAAY,CAAC;AAmIpB;;GAEG;AACH,qBACa,yBAAyB;IAEpC,SAAS,IAAI,SAAS;IAKtB,UAAU,IAAI,SAAS;CAGxB;AA+ID;;GAEG;AACH,qBACa,uBAAwB,YAAW,sBAAsB,EAAE,qBAAqB;IA6DzF,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAhExB,OAAO,CAAC,uBAAuB,CAAsC;IACrE,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqC;IACzE,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAA6C;IAC1F,OAAO,CAAC,mBAAmB,CAAkD;IAC7E,OAAO,CAAC,eAAe,CAA8B;IACrD,OAAO,CAAC,wBAAwB,CAAkC;IAClE,OAAO,CAAC,sBAAsB,CAAgC;IAC9D,OAAO,CAAC,uBAAuB,CAAyD;IACxF,OAAO,CAAC,6BAA6B,CAA2B;IAChE,OAAO,CAAC,yBAAyB,CAAyD;IAC1F,OAAO,CAAC,IAAI,CAAuB;IAEnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CA4CzB;gBAGiB,gBAAgB,EAAE,SAAS,EAC3B,eAAe,EAAE,SAAS,cAAc,EAAE,EAC1C,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,sBAAsB,EACjC,OAAO,EAAE,oBAAoB;IAGxC,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAsCvC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAY5C,OAAO,CAAC,sBAAsB;IAI9B,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,sBAAsB;IAe9B,OAAO,CAAC,aAAa;IAMrB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,kBAAkB;IAiB1B,OAAO,CAAC,oBAAoB;IAmB5B,OAAO,CAAC,mBAAmB;IAyB3B,OAAO,CAAC,0BAA0B;YAuEpB,4BAA4B;IAuC1C,OAAO,CAAC,2BAA2B;IAInC,OAAO,CAAC,oBAAoB;YAkBd,wBAAwB;IAwDtC,OAAO,CAAC,kCAAkC;IAwB1C,OAAO,CAAC,sBAAsB;IAoB9B,OAAO,CAAC,sCAAsC;YAchC,kCAAkC;YAqBlC,sCAAsC;IAkBpD,OAAO,CAAC,6BAA6B;YAYvB,yBAAyB;CAexC"}

package/dist/service.js

@@ -78,7 +78,8 @@ function closeWebSocketServer(server) {
 }
 const graphqlRequestContextStorage = new AsyncLocalStorage();
 const runtimeRequire = createRequire(import.meta.url);
-let graphqlInstanceOfPatched = false;
+let graphqlInstanceOfPatchRefCount = 0;
+let restoreGraphqlInstanceOfPatch;
 const allowedCrossRealmGraphqlObjects = new WeakSet();
 
 /**
@@ -149,15 +150,16 @@ function isAllowedCrossRealmGraphqlObject(value, constructor) {
   }
   return allowedCrossRealmGraphqlObjects.has(value) && getCrossRealmGraphqlTag(value, constructor) !== undefined;
 }
-function patchGraphqlInstanceOf() {
-  if (graphqlInstanceOfPatched) {
-    return;
-  }
+function installGraphqlInstanceOfPatch() {
   const instanceOfModule = runtimeRequire('graphql/jsutils/instanceOf.js');
-  const originalInstanceOf = instanceOfModule.instanceOf;
-  instanceOfModule.instanceOf = (value, constructor) => {
+  if (restoreGraphqlInstanceOfPatch) {
+    graphqlInstanceOfPatchRefCount += 1;
+    return releaseGraphqlInstanceOfPatch;
+  }
+  const patchedFrom = instanceOfModule.instanceOf;
+  const patchedInstanceOf = (value, constructor) => {
     try {
-      if (originalInstanceOf(value, constructor)) {
+      if (patchedFrom(value, constructor)) {
         return true;
       }
     } catch (error) {
@@ -168,7 +170,26 @@ function patchGraphqlInstanceOf() {
     }
     return isAllowedCrossRealmGraphqlObject(value, constructor);
   };
-  graphqlInstanceOfPatched = true;
+  instanceOfModule.instanceOf = patchedInstanceOf;
+  graphqlInstanceOfPatchRefCount = 1;
+  restoreGraphqlInstanceOfPatch = () => {
+    if (instanceOfModule.instanceOf !== patchedInstanceOf) {
+      return;
+    }
+    instanceOfModule.instanceOf = patchedFrom;
+  };
+  return releaseGraphqlInstanceOfPatch;
+}
+function releaseGraphqlInstanceOfPatch() {
+  if (graphqlInstanceOfPatchRefCount === 0) {
+    return;
+  }
+  graphqlInstanceOfPatchRefCount -= 1;
+  if (graphqlInstanceOfPatchRefCount > 0) {
+    return;
+  }
+  restoreGraphqlInstanceOfPatch?.();
+  restoreGraphqlInstanceOfPatch = undefined;
 }
 async function loadGraphqlDeps() {
   const graphqlMod = runtimeRequire('graphql');
@@ -208,6 +229,7 @@ class GraphqlLifecycleService {
   websocketUpgradeListener;
   websocketUpgradeServer;
   executeGraphqlOperation;
+  releaseGraphqlInstanceOfPatch;
   subscribeGraphqlOperation;
   yoga;
   middleware = {
@@ -291,6 +313,8 @@ class GraphqlLifecycleService {
     this.middlewareRegistered = false;
     this.executeGraphqlOperation = undefined;
     this.graphQLErrorConstructor = undefined;
+    this.releaseGraphqlInstanceOfPatch?.();
+    this.releaseGraphqlInstanceOfPatch = undefined;
     this.subscribeGraphqlOperation = undefined;
     this.yoga = undefined;
   }
@@ -312,7 +336,7 @@ class GraphqlLifecycleService {
     };
   }
   resolveSchema(deps) {
-    patchGraphqlInstanceOf();
+    this.releaseGraphqlInstanceOfPatch ??= installGraphqlInstanceOfPatch();
     return resolveSchema(deps, this.options.schema, () => this.createCodeFirstSchema(deps), markAllowedCrossRealmGraphqlObjects);
   }
   createCodeFirstSchema(deps) {

package/dist/transport/transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../src/transport/transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAA2B,MAAM,cAAc,CAAC;AAEjG;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEnD;AAsED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAUjE;AAsBD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,aAAa,EAAE,QAAQ,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqDrH"}
+{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../src/transport/transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAA2B,MAAM,cAAc,CAAC;AAEjG;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEnD;AAsED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAUjE;AAgGD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,aAAa,EAAE,QAAQ,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BrH"}

package/dist/transport/transport.js

@@ -89,6 +89,71 @@ function readSetCookieValues(headers) {
   }
   return values;
 }
+async function writeFetchResponseStream(body, stream) {
+  const reader = body.getReader();
+  let readerDone = false;
+  let cancelPromise;
+  let notifyCancellation;
+  const cancellationStarted = new Promise(resolve => {
+    notifyCancellation = resolve;
+  });
+  const removeCloseListener = stream.onClose?.(() => {
+    if (!readerDone) {
+      void cancelUnreadBody().catch(() => {});
+    }
+  });
+  const cancelUnreadBody = () => {
+    if (!cancelPromise) {
+      readerDone = true;
+      notifyCancellation?.();
+      cancelPromise = reader.cancel();
+    }
+    return cancelPromise;
+  };
+  const readNextChunk = async () => {
+    const readPromise = reader.read();
+    readPromise.catch(() => {});
+    return await Promise.race([readPromise, cancellationStarted.then(async () => {
+      await cancelPromise;
+      return {
+        done: true,
+        value: undefined
+      };
+    })]);
+  };
+  try {
+    while (true) {
+      if (stream.closed) {
+        await cancelUnreadBody();
+        break;
+      }
+      const {
+        done,
+        value
+      } = await readNextChunk();
+      if (done) {
+        readerDone = true;
+        break;
+      }
+      if (stream.closed) {
+        await cancelUnreadBody();
+        break;
+      }
+      const canContinue = stream.write(value);
+      if (!canContinue && !stream.closed) {
+        await stream.waitForDrain?.();
+      }
+    }
+  } catch (error) {
+    await cancelUnreadBody();
+    throw error;
+  } finally {
+    removeCloseListener?.();
+  }
+  if (!stream.closed) {
+    stream.close();
+  }
+}
 
 /**
  * Write fetch response.
@@ -113,26 +178,7 @@ export async function writeFetchResponse(fetchResponse, frameworkResponse) {
   if (fetchResponse.body && stream) {
     frameworkResponse.committed = true;
     stream.flush?.();
-    const reader = fetchResponse.body.getReader();
-    while (true) {
-      const {
-        done,
-        value
-      } = await reader.read();
-      if (done) {
-        break;
-      }
-      if (stream.closed) {
-        break;
-      }
-      const canContinue = stream.write(value);
-      if (!canContinue && !stream.closed) {
-        await stream.waitForDrain?.();
-      }
-    }
-    if (!stream.closed) {
-      stream.close();
-    }
+    await writeFetchResponseStream(fetchResponse.body, stream);
     return;
   }
   const buffer = await fetchResponse.arrayBuffer();

package/package.json

@@ -9,7 +9,7 @@
     "yoga",
     "api"
   ],
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.5",
   "private": false,
   "license": "MIT",
   "repository": {
@@ -41,11 +41,11 @@
     "graphql-ws": "^5.16.2",
     "graphql-yoga": "^5.18.1",
     "ws": "^8.18.3",
-    "@fluojs/core": "^1.0.0-beta.2",
-    "@fluojs/di": "^1.0.0-beta.5",
-    "@fluojs/http": "^1.0.0-beta.4",
-    "@fluojs/runtime": "^1.0.0-beta.5",
-    "@fluojs/validation": "^1.0.0-beta.1"
+    "@fluojs/core": "^1.0.0-beta.3",
+    "@fluojs/di": "^1.0.0-beta.6",
+    "@fluojs/http": "^1.0.0-beta.9",
+    "@fluojs/runtime": "^1.0.0-beta.9",
+    "@fluojs/validation": "^1.0.0-beta.2"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",