@graphql-tools/executor-http - npm Package Compare versions

Comparing version 1.0.2 to 1.0.3-alpha-20230808125213-924680a6

cjs/handleAsyncIterable.js

@@ -12,4 +12,4 @@ "use strict";
             if (part) {
-                const eventStr = part.split('event: ')[1];
-                const dataStr = part.split('data: ')[1];
+                const eventStr = part.split('event:')[1]?.trim();
+                const dataStr = part.split('data:')[1]?.trim();
                 if (eventStr === 'complete') {
@@ -16,0 +16,0 @@ break outer;

cjs/handleEventStreamResponse.js

@@ -18,8 +18,3 @@ "use strict";
             const resultStream = (0, handleAsyncIterable_js_1.handleAsyncIterable)(body);
-            if (controller) {
-                return (0, addCancelToResponseStream_js_1.addCancelToResponseStream)(resultStream, controller);
-            }
-            else {
-                return resultStream;
-            }
+            return (0, addCancelToResponseStream_js_1.addCancelToResponseStream)(resultStream, controller);
         }
@@ -26,0 +21,0 @@ if (isReadableStream(body)) {

cjs/handleMultipartMixedResponse.js

@@ -47,7 +47,4 @@ "use strict";
     });
-    if (controller) {
-        return (0, addCancelToResponseStream_js_1.addCancelToResponseStream)(resultStream, controller);
-    }
-    return resultStream;
+    return (0, addCancelToResponseStream_js_1.addCancelToResponseStream)(resultStream, controller);
 }
 exports.handleMultipartMixedResponse = handleMultipartMixedResponse;

cjs/index.js

@@ -17,3 +17,3 @@ "use strict";
         const fetchFn = request.extensions?.fetch ?? options?.fetch ?? fetch_1.fetch;
-        let controller;
+        const controller = new AbortController();
         let method = request.extensions?.method || options?.method || 'POST';
@@ -38,6 +38,5 @@ const operationAst = (0, utils_1.getOperationASTFromRequest)(request);
         if (options?.timeout) {
-            controller = new AbortController();
             timeoutId = setTimeout(() => {
-                if (!controller?.signal.aborted) {
-                    controller?.abort('timeout');
+                if (!controller.signal.aborted) {
+                    controller.abort('timeout');
                 }
@@ -60,3 +59,3 @@ }, options.timeout);
                         headers,
-                        signal: controller?.signal,
+                        signal: controller.signal,
                     };
@@ -86,3 +85,3 @@ if (options?.credentials != null) {
                             headers,
-                            signal: controller?.signal,
+                            signal: controller.signal,
                         };
@@ -181,3 +180,3 @@ if (options?.credentials != null) {
             }
-            else if (e.name === 'AbortError' && controller?.signal?.reason) {
+            else if (e.name === 'AbortError' && controller.signal?.reason) {
                 return {
@@ -184,0 +183,0 @@ errors: [

esm/handleAsyncIterable.js

@@ -9,4 +9,4 @@ /* eslint-disable no-labels */
             if (part) {
-                const eventStr = part.split('event: ')[1];
-                const dataStr = part.split('data: ')[1];
+                const eventStr = part.split('event:')[1]?.trim();
+                const dataStr = part.split('data:')[1]?.trim();
                 if (eventStr === 'complete') {
@@ -13,0 +13,0 @@ break outer;

esm/handleEventStreamResponse.js

@@ -14,8 +14,3 @@ import { inspect, isAsyncIterable } from '@graphql-tools/utils';
             const resultStream = handleAsyncIterable(body);
-            if (controller) {
-                return addCancelToResponseStream(resultStream, controller);
-            }
-            else {
-                return resultStream;
-            }
+            return addCancelToResponseStream(resultStream, controller);
         }
@@ -22,0 +17,0 @@ if (isReadableStream(body)) {

esm/handleMultipartMixedResponse.js

@@ -44,6 +44,3 @@ import { meros as merosReadableStream } from 'meros/browser';
     });
-    if (controller) {
-        return addCancelToResponseStream(resultStream, controller);
-    }
-    return resultStream;
+    return addCancelToResponseStream(resultStream, controller);
 }

esm/index.js

@@ -13,3 +13,3 @@ import { print } from 'graphql';
         const fetchFn = request.extensions?.fetch ?? options?.fetch ?? defaultFetch;
-        let controller;
+        const controller = new AbortController();
         let method = request.extensions?.method || options?.method || 'POST';
@@ -34,6 +34,5 @@ const operationAst = getOperationASTFromRequest(request);
         if (options?.timeout) {
-            controller = new AbortController();
             timeoutId = setTimeout(() => {
-                if (!controller?.signal.aborted) {
-                    controller?.abort('timeout');
+                if (!controller.signal.aborted) {
+                    controller.abort('timeout');
                 }
@@ -56,3 +55,3 @@ }, options.timeout);
                         headers,
-                        signal: controller?.signal,
+                        signal: controller.signal,
                     };
@@ -82,3 +81,3 @@ if (options?.credentials != null) {
                             headers,
-                            signal: controller?.signal,
+                            signal: controller.signal,
                         };
@@ -177,3 +176,3 @@ if (options?.credentials != null) {
             }
-            else if (e.name === 'AbortError' && controller?.signal?.reason) {
+            else if (e.name === 'AbortError' && controller.signal?.reason) {
                 return {
@@ -180,0 +179,0 @@ errors: [

package.json

 {
   "name": "@graphql-tools/executor-http",
-  "version": "1.0.2",
+  "version": "1.0.3-alpha-20230808125213-924680a6",
   "description": "A set of utils for faster development of GraphQL tools",
@@ -5,0 +5,0 @@ "sideEffects": false,

typings/handleEventStreamResponse.d.ts

 import { ExecutionResult } from '@graphql-tools/utils';
 export declare function isReadableStream(value: any): value is ReadableStream;
-export declare function handleEventStreamResponse(response: Response, controller?: AbortController): AsyncIterable<ExecutionResult>;
+export declare function handleEventStreamResponse(response: Response, controller: AbortController): AsyncIterable<ExecutionResult>;

typings/handleMultipartMixedResponse.d.ts

 import { ExecutionResult } from '@graphql-tools/utils';
-export declare function handleMultipartMixedResponse(response: Response, controller?: AbortController): Promise<ExecutionResult<any, any> | AsyncIterable<ExecutionResult<any, any> | undefined>>;
+export declare function handleMultipartMixedResponse(response: Response, controller: AbortController): Promise<ExecutionResult<any, any> | AsyncIterable<ExecutionResult<any, any> | undefined>>;

New alerts

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

53451

decreased by-0.65%

Lines of code

1106

decreased by-1.6%

Number of low quality alerts

2

increased by100%

No dependency changes