RSDK-8989 - Always provide error on base channel close (#391)

viamrobotics · Oct 15, 2024 · 203fecd · 203fecd
1 parent 59b2ba3
commit 203fecd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/src/rpc/base-channel.ts b/src/rpc/base-channel.ts
@@ -40,10 +40,6 @@ export class BaseChannel {
     });
   }
 
-  public close() {
-    this.closeWithReason(undefined);
-  }
-
   public isClosed() {
     return this.closed;
   }
@@ -52,7 +48,7 @@ export class BaseChannel {
     return this.closedReason;
   }
 
-  protected closeWithReason(err?: Error) {
+  public closeWithReason(err: Error) {
     if (this.closed) {
       return;
     }

diff --git a/src/rpc/dial.ts b/src/rpc/dial.ts
@@ -402,7 +402,7 @@ export const dialWebRTC = async (
     if (dialOpts?.dialTimeout !== undefined) {
       setTimeout(() => {
         if (!successful) {
-          exchange.terminate();
+          exchange.terminate(new Error('timed out'));
         }
       }, dialOpts.dialTimeout);
     }

diff --git a/src/rpc/signaling-exchange.ts b/src/rpc/signaling-exchange.ts
@@ -73,7 +73,7 @@ export class SignalingExchange {
       .then(() => {
         this.exchangeDone = true;
       })
-      .catch(console.error); // eslint-disable-line no-console
+      .catch(console.error);
 
     // Initiate now the call now that all of our handlers are setup.
     const callResponses = this.signalingClient.call(callRequest, this.callOpts);
@@ -127,8 +127,8 @@ export class SignalingExchange {
     }
   }
 
-  public terminate() {
-    this.clientChannel.close();
+  public terminate(err: Error) {
+    this.clientChannel.closeWithReason(err);
   }
 
   private async processCallResponses(