fix: implement abort grpc web (#785)

* fix arguments order * update example --------- Co-authored-by: HERSENT <francois.hersent@hiventive.com>
stephenh · Mar 11, 2023 · 6a40d72 · 6a40d72
1 parent 1213ab1
commit 6a40d72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/integration/grpc-web-no-streaming-observable/example.ts b/integration/grpc-web-no-streaming-observable/example.ts
@@ -341,7 +341,7 @@ export class DashStateClientImpl implements DashState {
     metadata?: grpc.Metadata,
     abortSignal?: AbortSignal,
   ): Observable<DashUserSettingsState> {
-    return this.rpc.unary(DashStateUserSettingsDesc, Empty.fromPartial(request), abortSignal, metadata);
+    return this.rpc.unary(DashStateUserSettingsDesc, Empty.fromPartial(request), metadata, abortSignal);
   }
 }
 

diff --git a/src/generate-grpc-web.ts b/src/generate-grpc-web.ts
@@ -76,8 +76,8 @@ function generateRpcMethod(ctx: Context, serviceDesc: ServiceDescriptorProto, me
       return this.rpc.${method}(
         ${methodDescName(serviceDesc, methodDesc)},
         ${requestMessage}.fromPartial(request),
-        ${useAbortSignal ? "abortSignal," : ""}
         metadata,
+        ${useAbortSignal ? "abortSignal," : ""}
       );
     }
   `;