@graphql-tools/url-loader 7.9.12 → 7.9.13

package/index.d.ts

@@ -3,7 +3,6 @@
 import { IntrospectionOptions } from 'graphql';
 import { AsyncExecutor, Executor, SyncExecutor, Source, Loader, BaseLoaderOptions } from '@graphql-tools/utils';
 import { ClientOptions } from 'graphql-ws';
-import { ClientOptions as GraphQLSSEClientOptions } from 'graphql-sse';
 import WebSocket from 'isomorphic-ws';
 import { AsyncFetchFn } from './defaultAsyncFetch';
 import { SyncFetchFn } from './defaultSyncFetch';
@@ -77,9 +76,9 @@ export interface LoadFromUrlOptions extends BaseLoaderOptions, Partial<Introspec
      */
     subscriptionsProtocol?: SubscriptionProtocol;
     /**
-     * Additional options to pass to the graphql-sse client.
+     * @deprecated This is no longer used. Will be removed in the next release
      */
-    graphqlSseOptions?: Omit<GraphQLSSEClientOptions, 'url' | 'headers' | 'fetchFn' | 'abortControllerImpl'>;
+    graphqlSseOptions?: any;
     /**
      * Retry attempts
      */
@@ -123,7 +122,6 @@ export declare class UrlLoader implements Loader<LoadFromUrlOptions> {
     buildHTTPExecutor(endpoint: string, fetch: AsyncFetchFn, options?: LoadFromUrlOptions): AsyncExecutor<any, ExecutionExtensions>;
     buildWSExecutor(subscriptionsEndpoint: string, webSocketImpl: typeof WebSocket, connectionParams?: ClientOptions['connectionParams']): Executor;
     buildWSLegacyExecutor(subscriptionsEndpoint: string, WebSocketImpl: typeof WebSocket, options?: LoadFromUrlOptions): Executor;
-    buildGraphQLSSEExecutor(endpoint: string, fetch: AsyncFetchFn, options?: Omit<LoadFromUrlOptions, 'subscriptionEndpoint'>): AsyncExecutor;
     getFetch(customFetch: LoadFromUrlOptions['customFetch'], importFn: AsyncImportFn): PromiseLike<AsyncFetchFn> | AsyncFetchFn;
     getFetch(customFetch: LoadFromUrlOptions['customFetch'], importFn: SyncImportFn): SyncFetchFn;
     private getDefaultMethodFromOptions;

package/index.js

@@ -27,7 +27,6 @@ const graphql = require('graphql');
 const utils = require('@graphql-tools/utils');
 const wrap = require('@graphql-tools/wrap');
 const graphqlWs = require('graphql-ws');
-const graphqlSse = require('graphql-sse');
 const WebSocket = _interopDefault(require('isomorphic-ws'));
 const extractFiles = require('extract-files');
 const valueOrPromise = require('value-or-promise');
@@ -98,10 +97,17 @@ async function handleMultipartMixedResponse(response) {
 }
 
 /* eslint-disable no-labels */
+let decodeUint8Array;
+if (globalThis.Buffer) {
+    decodeUint8Array = uint8Array => globalThis.Buffer.from(uint8Array).toString('utf-8');
+}
+else {
+    const textDecoder = new TextDecoder();
+    decodeUint8Array = uint8Array => textDecoder.decode(uint8Array);
+}
 async function* handleReadable(readable) {
-    const decoder = new TextDecoder();
     outer: for await (const chunk of readable) {
-        const chunkStr = typeof chunk === 'string' ? chunk : decoder.decode(chunk);
+        const chunkStr = typeof chunk === 'string' ? chunk : decodeUint8Array(chunk);
         for (const part of chunkStr.split('\n\n')) {
             if (part) {
                 const eventStr = part.split('event: ')[1];
@@ -423,23 +429,18 @@ class UrlLoader {
             var _a, _b;
             const controller = new crossUndiciFetch.AbortController();
             let method = defaultMethod;
-            if (options === null || options === void 0 ? void 0 : options.useGETForQueries) {
-                const operationAst = utils.getOperationASTFromRequest(request);
-                const operationType = operationAst.operation;
-                if (operationType === 'query') {
-                    method = 'GET';
-                }
+            const operationAst = utils.getOperationASTFromRequest(request);
+            const operationType = operationAst.operation;
+            if ((options === null || options === void 0 ? void 0 : options.useGETForQueries) && operationType === 'query') {
+                method = 'GET';
+            }
+            let accept = 'application/json, multipart/mixed';
+            if (operationType === 'subscription') {
+                method = 'GET';
+                accept = 'text/event-stream';
             }
             const endpoint = ((_a = request.extensions) === null || _a === void 0 ? void 0 : _a.endpoint) || HTTP_URL;
             const headers = Object.assign({}, options === null || options === void 0 ? void 0 : options.headers, ((_b = request.extensions) === null || _b === void 0 ? void 0 : _b.headers) || {});
-            const acceptedProtocols = [`application/json`];
-            if (method === 'GET' && (options === null || options === void 0 ? void 0 : options.subscriptionsProtocol) === exports.SubscriptionProtocol.SSE) {
-                acceptedProtocols.push('text/event-stream');
-            }
-            else {
-                acceptedProtocols.push('multipart/mixed');
-            }
-            const accept = acceptedProtocols.join(', ');
             const query = graphql.print(request.document);
             const requestBody = {
                 query,
@@ -521,7 +522,9 @@ class UrlLoader {
             })
                 .then(result => {
                 if (typeof result === 'string') {
-                    return JSON.parse(result);
+                    if (result) {
+                        return JSON.parse(result);
+                    }
                 }
                 else {
                     return result;
@@ -668,31 +671,6 @@ class UrlLoader {
             });
         };
     }
-    buildGraphQLSSEExecutor(endpoint, fetch, options = {}) {
-        const { headers } = options;
-        const client = graphqlSse.createClient({
-            ...options.graphqlSseOptions,
-            url: endpoint,
-            fetchFn: fetch,
-            abortControllerImpl: crossUndiciFetch.AbortController,
-            headers,
-        });
-        return async ({ document, variables, operationName, extensions }) => {
-            return utils.observableToAsyncIterable({
-                subscribe: observer => {
-                    const unsubscribe = client.subscribe({
-                        query: document,
-                        variables: variables,
-                        operationName,
-                        extensions,
-                    }, observer);
-                    return {
-                        unsubscribe,
-                    };
-                },
-            });
-        };
-    }
     getFetch(customFetch, importFn) {
         if (customFetch) {
             if (typeof customFetch === 'string') {
@@ -732,10 +710,7 @@ class UrlLoader {
     }
     buildSubscriptionExecutor(subscriptionsEndpoint, fetch, importFn, options) {
         if ((options === null || options === void 0 ? void 0 : options.subscriptionsProtocol) === exports.SubscriptionProtocol.SSE) {
-            return this.buildHTTPExecutor(subscriptionsEndpoint, fetch, {
-                ...options,
-                method: 'GET',
-            });
+            return this.buildHTTPExecutor(subscriptionsEndpoint, fetch, options);
         }
         else if ((options === null || options === void 0 ? void 0 : options.subscriptionsProtocol) === exports.SubscriptionProtocol.GRAPHQL_SSE) {
             if (!(options === null || options === void 0 ? void 0 : options.subscriptionsEndpoint)) {
@@ -743,7 +718,7 @@ class UrlLoader {
                 // graphql-sse is recommended to be used on `/graphql/stream`
                 subscriptionsEndpoint += '/stream';
             }
-            return this.buildGraphQLSSEExecutor(subscriptionsEndpoint, fetch, options);
+            return this.buildHTTPExecutor(subscriptionsEndpoint, fetch, options);
         }
         else {
             const webSocketImpl$ = new valueOrPromise.ValueOrPromise(() => this.getWebSocketImpl(importFn, options));

package/index.mjs

@@ -2,12 +2,11 @@ import { print, buildASTSchema, buildSchema } from 'graphql';
 import { mapAsyncIterator, isAsyncIterable, inspect, withCancel, observableToAsyncIterable, parseGraphQLSDL, getOperationASTFromRequest } from '@graphql-tools/utils';
 import { introspectSchema, wrapSchema } from '@graphql-tools/wrap';
 import { createClient } from 'graphql-ws';
-import { createClient as createClient$1 } from 'graphql-sse';
 import WebSocket from 'isomorphic-ws';
 import { extractFiles, isExtractableFile } from 'extract-files';
 import { ValueOrPromise } from 'value-or-promise';
 import { isLiveQueryOperationDefinitionNode } from '@n1ru4l/graphql-live-query';
-import { fetch, FormData, AbortController, File } from 'cross-undici-fetch';
+import { fetch, FormData, File, AbortController } from 'cross-undici-fetch';
 import syncFetchImported from 'sync-fetch';
 import { meros } from 'meros/node';
 import { meros as meros$1 } from 'meros/browser';
@@ -73,10 +72,17 @@ async function handleMultipartMixedResponse(response) {
 }
 
 /* eslint-disable no-labels */
+let decodeUint8Array;
+if (globalThis.Buffer) {
+    decodeUint8Array = uint8Array => globalThis.Buffer.from(uint8Array).toString('utf-8');
+}
+else {
+    const textDecoder = new TextDecoder();
+    decodeUint8Array = uint8Array => textDecoder.decode(uint8Array);
+}
 async function* handleReadable(readable) {
-    const decoder = new TextDecoder();
     outer: for await (const chunk of readable) {
-        const chunkStr = typeof chunk === 'string' ? chunk : decoder.decode(chunk);
+        const chunkStr = typeof chunk === 'string' ? chunk : decodeUint8Array(chunk);
         for (const part of chunkStr.split('\n\n')) {
             if (part) {
                 const eventStr = part.split('event: ')[1];
@@ -399,23 +405,18 @@ class UrlLoader {
             var _a, _b;
             const controller = new AbortController();
             let method = defaultMethod;
-            if (options === null || options === void 0 ? void 0 : options.useGETForQueries) {
-                const operationAst = getOperationASTFromRequest(request);
-                const operationType = operationAst.operation;
-                if (operationType === 'query') {
-                    method = 'GET';
-                }
+            const operationAst = getOperationASTFromRequest(request);
+            const operationType = operationAst.operation;
+            if ((options === null || options === void 0 ? void 0 : options.useGETForQueries) && operationType === 'query') {
+                method = 'GET';
+            }
+            let accept = 'application/json, multipart/mixed';
+            if (operationType === 'subscription') {
+                method = 'GET';
+                accept = 'text/event-stream';
             }
             const endpoint = ((_a = request.extensions) === null || _a === void 0 ? void 0 : _a.endpoint) || HTTP_URL;
             const headers = Object.assign({}, options === null || options === void 0 ? void 0 : options.headers, ((_b = request.extensions) === null || _b === void 0 ? void 0 : _b.headers) || {});
-            const acceptedProtocols = [`application/json`];
-            if (method === 'GET' && (options === null || options === void 0 ? void 0 : options.subscriptionsProtocol) === SubscriptionProtocol.SSE) {
-                acceptedProtocols.push('text/event-stream');
-            }
-            else {
-                acceptedProtocols.push('multipart/mixed');
-            }
-            const accept = acceptedProtocols.join(', ');
             const query = print(request.document);
             const requestBody = {
                 query,
@@ -497,7 +498,9 @@ class UrlLoader {
             })
                 .then(result => {
                 if (typeof result === 'string') {
-                    return JSON.parse(result);
+                    if (result) {
+                        return JSON.parse(result);
+                    }
                 }
                 else {
                     return result;
@@ -644,31 +647,6 @@ class UrlLoader {
             });
         };
     }
-    buildGraphQLSSEExecutor(endpoint, fetch, options = {}) {
-        const { headers } = options;
-        const client = createClient$1({
-            ...options.graphqlSseOptions,
-            url: endpoint,
-            fetchFn: fetch,
-            abortControllerImpl: AbortController,
-            headers,
-        });
-        return async ({ document, variables, operationName, extensions }) => {
-            return observableToAsyncIterable({
-                subscribe: observer => {
-                    const unsubscribe = client.subscribe({
-                        query: document,
-                        variables: variables,
-                        operationName,
-                        extensions,
-                    }, observer);
-                    return {
-                        unsubscribe,
-                    };
-                },
-            });
-        };
-    }
     getFetch(customFetch, importFn) {
         if (customFetch) {
             if (typeof customFetch === 'string') {
@@ -708,10 +686,7 @@ class UrlLoader {
     }
     buildSubscriptionExecutor(subscriptionsEndpoint, fetch, importFn, options) {
         if ((options === null || options === void 0 ? void 0 : options.subscriptionsProtocol) === SubscriptionProtocol.SSE) {
-            return this.buildHTTPExecutor(subscriptionsEndpoint, fetch, {
-                ...options,
-                method: 'GET',
-            });
+            return this.buildHTTPExecutor(subscriptionsEndpoint, fetch, options);
         }
         else if ((options === null || options === void 0 ? void 0 : options.subscriptionsProtocol) === SubscriptionProtocol.GRAPHQL_SSE) {
             if (!(options === null || options === void 0 ? void 0 : options.subscriptionsEndpoint)) {
@@ -719,7 +694,7 @@ class UrlLoader {
                 // graphql-sse is recommended to be used on `/graphql/stream`
                 subscriptionsEndpoint += '/stream';
             }
-            return this.buildGraphQLSSEExecutor(subscriptionsEndpoint, fetch, options);
+            return this.buildHTTPExecutor(subscriptionsEndpoint, fetch, options);
         }
         else {
             const webSocketImpl$ = new ValueOrPromise(() => this.getWebSocketImpl(importFn, options));

package/package.json

@@ -1,24 +1,21 @@
 {
   "name": "@graphql-tools/url-loader",
-  "version": "7.9.12",
+  "version": "7.9.13",
   "description": "A set of utils for faster development of GraphQL tools",
   "sideEffects": false,
   "peerDependencies": {
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@envelop/live-query": "3.3.1",
-    "@graphql-tools/delegate": "8.7.5",
+    "@graphql-tools/delegate": "8.7.6",
     "@graphql-tools/utils": "8.6.8",
-    "@graphql-tools/wrap": "8.4.14",
+    "@graphql-tools/wrap": "8.4.15",
     "@graphql-yoga/node": "2.3.0",
     "@n1ru4l/graphql-live-query": "^0.9.0",
-    "@types/websocket": "^1.0.4",
     "@types/ws": "^8.0.0",
     "cross-undici-fetch": "^0.2.4",
     "dset": "^3.1.0",
     "extract-files": "^11.0.0",
-    "graphql-sse": "^1.0.1",
     "graphql-ws": "^5.4.1",
     "isomorphic-ws": "^4.0.1",
     "meros": "^1.1.4",