undo change in makeCall

deeplay-io · Oct 14, 2023 · 391d185 · 391d185
1 parent 629ed12
commit 391d185
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/packages/nice-grpc-web/src/client/makeCall.ts b/packages/nice-grpc-web/src/client/makeCall.ts
@@ -120,18 +120,6 @@ export async function* makeCall<Request, Response>(
 
   try {
     yield* response;
-
-    if (status != null && status !== Status.OK) {
-      throw new ClientError(definition.path, status, message ?? '');
-    }
-
-    if (status == null) {
-      throw new ClientError(
-        definition.path,
-        Status.UNKNOWN,
-        'Response stream closed without gRPC status',
-      );
-    }
   } catch (err) {
     if (requestError !== undefined) {
       throw requestError.err;
@@ -147,6 +135,17 @@ export async function* makeCall<Request, Response>(
   } finally {
     finished = true;
     signal.removeEventListener('abort', abortListener);
-    innerAbortController.abort();
+
+    if (status != null && status !== Status.OK) {
+      throw new ClientError(definition.path, status, message ?? '');
+    }
+  }
+
+  if (status == null) {
+    throw new ClientError(
+      definition.path,
+      Status.UNKNOWN,
+      'Response stream closed without gRPC status',
+    );
   }
 }