@fluojs/graphql 1.0.3 → 1.0.4

package/dist/service.d.ts

@@ -21,6 +21,7 @@ export declare class GraphqlLifecycleService implements OnApplicationBootstrap,
     private graphQLErrorConstructor;
     private middlewareRegistered;
     private readonly operationContainers;
+    private readonly requestContexts;
     private readonly websocketOperationContainers;
     private websocketDisposable;
     private websocketServer;

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,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AA2BxH,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;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAhE1B,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,EAC/B,OAAO,EAAE,oBAAoB;IAG1C,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAgDvC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;YAI9B,wBAAwB;IAYtC,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":"AAGA,OAAO,EAAgD,KAAK,sBAAsB,EAAsD,MAAM,cAAc,CAAC;AAE7J,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AA0BxH,OAAO,KAAK,EAEV,oBAAoB,EAGrB,MAAM,YAAY,CAAC;AAsIpB;;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;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAhE1B,OAAO,CAAC,uBAAuB,CAAsC;IACrE,OAAO,CAAC,oBAAoB,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAqC;IACzE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiD;IACjF,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,CA2CzB;gBAGiB,gBAAgB,EAAE,SAAS,EAC3B,eAAe,EAAE,SAAS,cAAc,EAAE,EAC1C,MAAM,EAAE,iBAAiB,EACzB,OAAO,EAAE,sBAAsB,EAC/B,OAAO,EAAE,oBAAoB;IAG1C,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAgDvC,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;YAI9B,wBAAwB;IAYtC,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;YAyBb,0BAA0B;YA4E1B,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

@@ -4,14 +4,9 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _setFunctionName(e, t, n) { "symbol" == typeof t && (t = (t = t.description) ? "[" + t + "]" : ""); try { Object.defineProperty(e, "name", { configurable: !0, value: n ? n + " " + t : t }); } catch (e) {} return e; }
 function _checkInRHS(e) { if (Object(e) !== e) throw TypeError("right-hand side of 'in' should be an object, got " + (null !== e ? typeof e : "null")); return e; }
-import { AsyncLocalStorage } from 'node:async_hooks';
-import { createRequire } from 'node:module';
 import { Controller, Get, Post } from '@fluojs/http';
 import { Inject } from '@fluojs/core';
 import { APPLICATION_LOGGER, COMPILED_MODULES, HTTP_APPLICATION_ADAPTER, RUNTIME_CONTAINER } from '@fluojs/runtime/internal';
-import { handleProtocols } from 'graphql-ws';
-import { useServer } from 'graphql-ws/lib/use/ws';
-import { WebSocketServer } from 'ws';
 import { discoverResolverDescriptors } from './discovery.js';
 import { createGraphqlValidationPlugin, resolveGraphqlRequestLimits } from './guardrails.js';
 import { GRAPHQL_INTERNAL_MODULE_OPTIONS_TOKEN } from './internal-tokens.js';
@@ -76,8 +71,6 @@ function closeWebSocketServer(server) {
     });
   });
 }
-const graphqlRequestContextStorage = new AsyncLocalStorage();
-const runtimeRequire = createRequire(import.meta.url);
 let graphqlInstanceOfPatchRefCount = 0;
 let restoreGraphqlInstanceOfPatch;
 const allowedCrossRealmGraphqlObjects = new WeakSet();
@@ -150,8 +143,7 @@ function isAllowedCrossRealmGraphqlObject(value, constructor) {
   }
   return allowedCrossRealmGraphqlObjects.has(value) && getCrossRealmGraphqlTag(value, constructor) !== undefined;
 }
-function installGraphqlInstanceOfPatch() {
-  const instanceOfModule = runtimeRequire('graphql/jsutils/instanceOf.js');
+function installGraphqlInstanceOfPatch(instanceOfModule) {
   if (restoreGraphqlInstanceOfPatch) {
     graphqlInstanceOfPatchRefCount += 1;
     return releaseGraphqlInstanceOfPatch;
@@ -192,8 +184,13 @@ function releaseGraphqlInstanceOfPatch() {
   restoreGraphqlInstanceOfPatch = undefined;
 }
 async function loadGraphqlDeps() {
+  const {
+    createRequire
+  } = await import('node:module');
+  const runtimeRequire = createRequire(import.meta.url);
   const graphqlMod = runtimeRequire('graphql');
   const yogaMod = runtimeRequire('graphql-yoga');
+  const instanceOfModule = runtimeRequire('graphql/jsutils/instanceOf.js');
   return {
     GraphQLError: graphqlMod.GraphQLError,
     GraphQLBoolean: graphqlMod.GraphQLBoolean,
@@ -208,6 +205,7 @@ async function loadGraphqlDeps() {
     buildSchema: graphqlMod.buildSchema,
     createYoga: yogaMod.createYoga,
     execute: graphqlMod.execute,
+    instanceOfModule,
     subscribe: graphqlMod.subscribe
   };
 }
@@ -223,6 +221,7 @@ class GraphqlLifecycleService {
   graphQLErrorConstructor;
   middlewareRegistered = false;
   operationContainers = new WeakMap();
+  requestContexts = new WeakMap();
   websocketOperationContainers = new Map();
   websocketDisposable;
   websocketServer;
@@ -251,13 +250,15 @@ class GraphqlLifecycleService {
       }
       try {
         const fetchRequest = toFetchRequest(context.request);
+        this.requestContexts.set(fetchRequest, {
+          principal: context.requestContext.principal,
+          request: context.request
+        });
         try {
-          const fetchResponse = await graphqlRequestContextStorage.run({
-            principal: context.requestContext.principal,
-            request: context.request
-          }, () => yoga.fetch(fetchRequest));
+          const fetchResponse = await yoga.fetch(fetchRequest);
           await writeFetchResponse(fetchResponse, context.response);
         } finally {
+          this.requestContexts.delete(fetchRequest);
           await this.disposeOperationContainer(fetchRequest);
         }
       } catch (error) {
@@ -304,7 +305,7 @@ class GraphqlLifecycleService {
         } : {}),
         schema
       });
-      this.registerWebSocketTransport();
+      await this.registerWebSocketTransport();
       this.registerMiddleware();
       this.middlewareRegistered = true;
     } catch (error) {
@@ -348,7 +349,7 @@ class GraphqlLifecycleService {
     };
   }
   resolveSchema(deps) {
-    this.releaseGraphqlInstanceOfPatch ??= installGraphqlInstanceOfPatch();
+    this.releaseGraphqlInstanceOfPatch ??= installGraphqlInstanceOfPatch(deps.instanceOfModule);
     return resolveSchema(deps, this.options.schema, () => this.createCodeFirstSchema(deps), markAllowedCrossRealmGraphqlObjects);
   }
   createCodeFirstSchema(deps) {
@@ -386,7 +387,7 @@ class GraphqlLifecycleService {
     }
   }
   buildGraphqlContext(request, requestContextOverride, operationContainerOverride) {
-    const storedContext = graphqlRequestContextStorage.getStore();
+    const storedContext = this.requestContexts.get(request);
     const requestContext = {
       connectionParams: requestContextOverride?.connectionParams,
       principal: requestContextOverride?.principal ?? storedContext?.principal,
@@ -404,10 +405,17 @@ class GraphqlLifecycleService {
       [GRAPHQL_OPERATION_CONTAINER]: operationContainer
     };
   }
-  registerWebSocketTransport() {
+  async registerWebSocketTransport() {
     if (!this.isWebSocketTransportEnabled() || this.yoga === undefined || this.websocketUpgradeListener !== undefined) {
       return;
     }
+    const [{
+      handleProtocols
+    }, {
+      useServer
+    }, {
+      WebSocketServer
+    }] = await Promise.all([import('graphql-ws'), import('graphql-ws/lib/use/ws'), import('ws')]);
     const upgradeServer = this.resolveUpgradeServer();
     const websocketLimits = this.resolveWebSocketLimits();
     const websocketServer = new WebSocketServer({
@@ -566,7 +574,7 @@ class GraphqlLifecycleService {
       return;
     }
     const body = `${message}\n`;
-    socket.write([`HTTP/1.1 ${String(statusCode)} ${statusCode === 503 ? 'Service Unavailable' : 'Bad Request'}`, 'Connection: close', 'Content-Type: text/plain; charset=utf-8', `Content-Length: ${String(Buffer.byteLength(body))}`, '', body].join('\r\n'));
+    socket.write([`HTTP/1.1 ${String(statusCode)} ${statusCode === 503 ? 'Service Unavailable' : 'Bad Request'}`, 'Connection: close', 'Content-Type: text/plain; charset=utf-8', `Content-Length: ${String(new TextEncoder().encode(body).byteLength)}`, '', body].join('\r\n'));
     socket.destroy();
   }
   getOrCreateWebSocketOperationContainer(socketKey, operationId) {

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;AAgGD;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,aAAa,EAAE,QAAQ,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BrH"}
+{"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;AA6ED;;;;;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

@@ -34,13 +34,18 @@ function createFetchHeaders(request) {
   }
   return headers;
 }
+function copyBytesToArrayBuffer(bytes) {
+  const body = new ArrayBuffer(bytes.byteLength);
+  new Uint8Array(body).set(bytes);
+  return body;
+}
 function createFetchBody(request, headers) {
   const method = request.method.toUpperCase();
   if (method === 'GET' || method === 'HEAD') {
     return undefined;
   }
   if (request.rawBody) {
-    return Buffer.from(request.rawBody);
+    return copyBytesToArrayBuffer(request.rawBody);
   }
   if (request.body === undefined) {
     return undefined;
@@ -49,10 +54,10 @@ function createFetchBody(request, headers) {
     return request.body;
   }
   if (request.body instanceof Uint8Array) {
-    return Buffer.from(request.body);
+    return copyBytesToArrayBuffer(request.body);
   }
   if (request.body instanceof ArrayBuffer) {
-    return Buffer.from(request.body);
+    return request.body;
   }
   if (!headers.has('content-type')) {
     headers.set('content-type', 'application/json; charset=utf-8');

package/package.json

@@ -9,7 +9,7 @@
     "yoga",
     "api"
   ],
-  "version": "1.0.3",
+  "version": "1.0.4",
   "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.3",
-    "@fluojs/di": "^1.0.3",
-    "@fluojs/http": "^1.1.0",
-    "@fluojs/runtime": "^1.1.1",
-    "@fluojs/validation": "^1.0.4"
+    "@fluojs/di": "^1.1.0",
+    "@fluojs/validation": "^1.0.5",
+    "@fluojs/http": "^1.1.1",
+    "@fluojs/runtime": "^1.1.7",
+    "@fluojs/core": "^1.0.3"
   },
   "devDependencies": {
     "@types/ws": "^8.18.1",