subscription fix

Author: YOUR_NAME

examples/typescript-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript-node",
-  "version": "3.1.4",
+  "version": "3.1.5",
   "description": "",
   "private": true,
   "main": "index.js",

packages/graphql-zeus-core/TreeToTS/functions/apiSSESubscription/sse.ts

@@ -1,6 +1,5 @@
 import { chainOptions } from '@/TreeToTS/functions/new/models';
 
-
 export const apiSubscriptionSSE = (options: chainOptions) => (query: string, variables?: Record<string, unknown>) => {
   const url = options[0];
   const fetchOptions = options[1] || {};
@@ -105,12 +104,18 @@ export const apiSubscriptionSSE = (options: chainOptions) => (query: string, var
       startStream();
     },
     close: () => {
+      // Cancel the reader first (if it exists) to gracefully close the stream
+      if (reader) {
+        reader.cancel().catch(() => {
+          // Ignore cancel errors - stream may already be closed
+        });
+        reader = null;
+      }
+      // Then abort the controller
       if (abortController) {
         abortController.abort();
-      }
-      if (reader) {
-        reader.cancel();
+        abortController = null;
       }
     },
   };
-};
+};

packages/graphql-zeus-core/TreeToTS/functions/generated.ts

@@ -233,7 +233,8 @@ export const SubscriptionThunderSSE =
       Zeus(operation, o, {
         operationOptions: ops,
         scalars: options?.scalars,
-      }), ops?.variables
+      }),
+      ops?.variables,
     ) as SubscriptionToGraphQLSSE<Z, GraphQLTypes[R], CombinedSCLR>;
     if (returnedFunction?.on && options?.scalars) {
       const wrapped = returnedFunction.on;
@@ -474,7 +475,7 @@ export class GraphQLError extends Error {
     return 'GraphQL Response Error';
   }
 }
-export type GenericOperation<O> = O extends keyof typeof Ops ? typeof Ops[O] : never;
+export type GenericOperation<O> = O extends keyof typeof Ops ? (typeof Ops)[O] : never;
 export type ThunderGraphQLOptions<SCLR extends ScalarDefinition> = {
   scalars?: SCLR | ScalarCoders;
 };
@@ -1108,11 +1109,17 @@ export const sseFunctions = {
       startStream();
     },
     close: () => {
+      // Cancel the reader first (if it exists) to gracefully close the stream
+      if (reader) {
+        reader.cancel().catch(() => {
+          // Ignore cancel errors - stream may already be closed
+        });
+        reader = null;
+      }
+      // Then abort the controller
       if (abortController) {
         abortController.abort();
-      }
-      if (reader) {
-        reader.cancel();
+        abortController = null;
       }
     },
   };

packages/graphql-zeus-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-zeus-core",
-  "version": "7.1.5",
+  "version": "7.1.6",
   "private": false,
   "main": "./lib/index.js",
   "author": "GraphQL Editor, Artur Czemiel",

packages/graphql-zeus-jsonschema/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-zeus-jsonschema",
-  "version": "7.1.5",
+  "version": "7.1.6",
   "private": false,
   "main": "./lib/index.js",
   "author": "GraphQL Editor, Artur Czemiel",

packages/graphql-zeus/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-zeus",
-  "version": "7.1.5",
+  "version": "7.1.6",
   "private": false,
   "scripts": {
     "start": "ttsc --watch",
@@ -27,8 +27,8 @@
     "config-maker": "^0.0.6",
     "cross-fetch": "^3.0.4",
     "graphql-js-tree": "^3.0.4",
-    "graphql-zeus-core": "^7.1.5",
-    "graphql-zeus-jsonschema": "^7.1.5",
+    "graphql-zeus-core": "^7.1.6",
+    "graphql-zeus-jsonschema": "^7.1.6",
     "yargs": "^16.1.1"
   }
 }