handle error

shinyoshiaki · Nov 10, 2023 · ba4ae2b · ba4ae2b
1 parent 2ec055b
commit ba4ae2b
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 11 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/ice/src/ice.ts b/packages/ice/src/ice.ts
@@ -633,7 +633,9 @@ export class Connection {
       .setAttribute("XOR-MAPPED-ADDRESS", addr)
       .addMessageIntegrity(Buffer.from(this.localPassword, "utf8"))
       .addFingerprint();
-    protocol.sendStun(response, addr);
+    protocol.sendStun(response, addr).catch((e) => {
+      log("sendStun error", e);
+    });
 
     // todo fix
     // if (this.checkList.length === 0) {
@@ -996,7 +998,9 @@ export class Connection {
       .setAttribute("ERROR-CODE", errorCode)
       .addMessageIntegrity(Buffer.from(this.localPassword, "utf8"))
       .addFingerprint();
-    protocol.sendStun(response, addr);
+    protocol.sendStun(response, addr).catch((e) => {
+      log("sendStun error", e);
+    });
   }
 }
 

diff --git a/packages/ice/src/stun/transaction.ts b/packages/ice/src/stun/transaction.ts
@@ -62,7 +62,9 @@ export class Transaction {
       this.onResponse.error(new TransactionTimeout());
       return;
     }
-    this.protocol.sendStun(this.request, this.addr);
+    this.protocol.sendStun(this.request, this.addr).catch((e) => {
+      log("send stun failed", e);
+    });
     this.timeoutHandle = setTimeout(this.retry, this.timeoutDelay);
     this.timeoutDelay *= 2;
     this.tries++;

diff --git a/packages/ice/src/turn/protocol.ts b/packages/ice/src/turn/protocol.ts
@@ -266,7 +266,10 @@ class TurnClient implements Protocol {
       this.channel = { number: this.channelNumber++, address: addr };
 
       this.channelBinding = this.channelBind(this.channel.number, addr);
-      await this.channelBinding;
+      await this.channelBinding.catch((e) => {
+        log("channelBind error", e);
+        throw e;
+      });
       this.channelBinding = undefined;
       log("channelBind", this.channel);
     }
@@ -284,8 +287,8 @@ class TurnClient implements Protocol {
     }
   }
 
-  sendStun(message: Message, addr: Address) {
-    this.transport.send(message.bytes, addr);
+  async sendStun(message: Message, addr: Address) {
+    await this.transport.send(message.bytes, addr);
   }
 }
 

diff --git a/packages/ice/src/types/model.ts b/packages/ice/src/types/model.ts
@@ -17,6 +17,6 @@ export interface Protocol {
   responseMessage?: string;
   close?: () => Promise<void>;
   connectionMade: (...args: any) => Promise<void>;
-  sendStun: (message: Message, addr: Address) => void;
+  sendStun: (message: Message, addr: Address) => Promise<void>;
   sendData: (data: Buffer, addr: Address) => Promise<void>;
 }
diff --git a/packages/ice/tests/ice/ice.test.ts b/packages/ice/tests/ice/ice.test.ts
@@ -24,7 +24,7 @@ class ProtocolMock implements Protocol {
   request = async () => {
     return null as any;
   };
-  sendStun = (message: Message) => {
+  sendStun = async (message: Message) => {
     this.sentMessage = message;
   };
   async connectionMade() {}

diff --git a/packages/ice/tests/stun/stun.test.ts b/packages/ice/tests/stun/stun.test.ts
@@ -122,7 +122,7 @@ describe("stun", () => {
   test(
     "test_timeout",
     async () => {
-      const DummyProtocol: any = { sendStun: () => {} };
+      const DummyProtocol: any = { sendStun: async () => {} };
       const request = new Message(methods.BINDING, classes.REQUEST);
       const transaction = new Transaction(
         request,

diff --git a/packages/webrtc/package.json b/packages/webrtc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "werift",
-  "version": "0.18.11",
+  "version": "0.18.13",
   "description": "WebRTC Implementation for TypeScript (Node.js)",
   "keywords": [
     "WebRTC",