ts-proto 1.164.1 → 1.164.2

package/build/generate-grpc-web.js

@@ -301,13 +301,6 @@ function createObservableUnaryMethod(ctx) {
 function createInvokeMethod(ctx) {
     const { options } = ctx;
     const { useAbortSignal } = options;
-    const maybeAbortSignal = useAbortSignal
-        ? `
-      if (abortSignal) abortSignal.addEventListener("abort", () => {
-        observer.error(abortSignal.reason);
-        client.close();
-      });`
-        : "";
     return (0, ts_poet_1.code) `
     invoke<T extends UnaryMethodDefinitionish>(
       methodDesc: T,
@@ -344,14 +337,27 @@ function createInvokeMethod(ctx) {
               }
             },
           });
-          observer.add(() => {
-           ${!useAbortSignal
-        ? `return client.close();`
-        : `if (!abortSignal || !abortSignal.aborted) 
-              return client.close();`}
-          });
+          ${useAbortSignal
+        ? `
+          if (abortSignal) {
+            const abort = () => {
+              observer.error(abortSignal.reason);
+              client.close();
+            };
+            abortSignal.addEventListener("abort", abort);
+            observer.add(() => {
+              if (abortSignal.aborted) {
+                return;
+              }
 
-          ${maybeAbortSignal}
+              abortSignal.removeEventListener('abort', abort); 
+              client.close();
+            });
+          } else {
+            observer.add(() => client.close());
+          }
+          `
+        : `observer.add(() => client.close());`}
         });
         upStream();
       }).pipe(${share}());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-proto",
-  "version": "1.164.1",
+  "version": "1.164.2",
   "description": "",
   "main": "build/plugin.js",
   "repository": "github:stephenh/ts-proto",