checkpoint

FuelLabs · nedsalk · Jan 3, 2024 · Oct 20, 2023 · Oct 22, 2023 · Oct 23, 2023
commit 450cfef8f52d0c31e9d8f6d35f329e828d1c4adc
diff --git a/packages/providers/src/provider.ts b/packages/providers/src/provider.ts
@@ -360,7 +360,7 @@ export default class Provider {
           ?.operation === 'subscription';
 
       return isSubscription
-        ? new Subscriber(this.url, query, vars as Record<string, unknown>, fetchFn).subscribe()
+        ? new Subscriber({url: this.url, query, variables: vars as Record<string, unknown>, fetchFn}).subscribe()
         : gqlClient.request(query, vars);
     });
   }

diff --git a/packages/providers/src/subscriber.ts b/packages/providers/src/subscriber.ts
@@ -2,24 +2,33 @@ import { FuelError } from '@fuel-ts/errors';
 import type { DocumentNode } from 'graphql';
 import { print } from 'graphql';
 
+type SubscriberOptions = {
+  url: string;
+  query: DocumentNode;
+  variables?: Record<string, unknown>;
+  fetchFn: typeof fetch;
+  abortController?: AbortController;
+};
 export class Subscriber {
   private request: Promise<Response>;
   private reader?: ReadableStreamDefaultReader<Uint8Array>;
-
-  constructor(
-    url: string,
-    query: DocumentNode,
-    variables: Record<string, unknown> | undefined,
-    fetchFn: typeof fetch
-  ) {
+  private abortController: AbortController;
+  constructor({
+    url,
+    query,
+    variables,
+    fetchFn,
+    abortController = new AbortController(),
+  }: SubscriberOptions) {
     const queryString = print(query);
     const requestBody = {
       query: queryString,
       variables,
     };
-
+    this.abortController = abortController;
     this.request = fetchFn(`${url}-sub`, {
       method: 'POST',
+      signal: this.abortController.signal,
       body: JSON.stringify(requestBody),
       keepalive: true,
       headers: {
@@ -28,6 +37,10 @@ export class Subscriber {
       },
     });
   }
+  async sub() {
+    const generator = this.subscribe();
+    generator.return = () => {};
+  }
 
   async *subscribe() {
     if (this.reader === undefined) {
@@ -41,8 +54,12 @@ export class Subscriber {
       if (text.startsWith('data:')) {
         const { data, errors } = JSON.parse(text.split('data:')[1]);
         if (Array.isArray(errors)) {
-          this.reader.releaseLock();
           await this.reader.cancel();
+          // @ts-expect-error to dispose
+          this.request = null;
+          this.reader = undefined;
+
+          this.abortController.abort();
           throw new FuelError(
             FuelError.CODES.INVALID_REQUEST,
             errors.map((x) => x.message).join('\n\n')