소스 검색

fix ts errors and tests

afrokick 5 년 전
부모
커밋
1057526897
4개의 변경된 파일13개의 추가작업 그리고 18개의 파일을 삭제
  1. 0 8
      lib/dataconnection.ts
  2. 7 3
      lib/peer.ts
  3. 1 1
      lib/socket.ts
  4. 5 6
      test/peer.ts

+ 0 - 8
lib/dataconnection.ts

@@ -39,7 +39,6 @@ export class DataConnection extends BaseConnection {
     }
     }
   } = {};
   } = {};
 
 
-  private _peerBrowser: any;
   private _dc: RTCDataChannel;
   private _dc: RTCDataChannel;
   private _encodingQueue = new EncodingQueue();
   private _encodingQueue = new EncodingQueue();
 
 
@@ -59,10 +58,6 @@ export class DataConnection extends BaseConnection {
     this.serialization = this.options.serialization || SerializationType.Binary;
     this.serialization = this.options.serialization || SerializationType.Binary;
     this.reliable = !!this.options.reliable;
     this.reliable = !!this.options.reliable;
 
 
-    if (this.options._payload) {
-      this._peerBrowser = this.options._payload.browser;
-    }
-
     this._encodingQueue.on('done', (ab: ArrayBuffer) => {
     this._encodingQueue.on('done', (ab: ArrayBuffer) => {
       this._bufferedSend(ab);
       this._bufferedSend(ab);
     });
     });
@@ -319,9 +314,6 @@ export class DataConnection extends BaseConnection {
 
 
     switch (message.type) {
     switch (message.type) {
       case ServerMessageType.Answer:
       case ServerMessageType.Answer:
-        this._peerBrowser = payload.browser;
-
-        // Forward to negotiator
         this._negotiator.handleSDP(message.type, payload.sdp);
         this._negotiator.handleSDP(message.type, payload.sdp);
         break;
         break;
       case ServerMessageType.Candidate:
       case ServerMessageType.Candidate:

+ 7 - 3
lib/peer.ts

@@ -453,13 +453,17 @@ export class Peer extends EventEmitter {
   emitError(type: PeerErrorType, err: string | Error): void {
   emitError(type: PeerErrorType, err: string | Error): void {
     logger.error("Error:", err);
     logger.error("Error:", err);
 
 
+    let error: Error & { type?: PeerErrorType };
+
     if (typeof err === "string") {
     if (typeof err === "string") {
-      err = new Error(err);
+      error = new Error(err);
+    } else {
+      error = err as Error;
     }
     }
 
 
-    err.type = type;
+    error.type = type;
 
 
-    this.emit(PeerEventType.Error, err);
+    this.emit(PeerEventType.Error, error);
   }
   }
 
 
   /**
   /**

+ 1 - 1
lib/socket.ts

@@ -11,7 +11,7 @@ export class Socket extends EventEmitter {
   private _id?: string;
   private _id?: string;
   private _messagesQueue: Array<object> = [];
   private _messagesQueue: Array<object> = [];
   private _socket?: WebSocket;
   private _socket?: WebSocket;
-  private _wsPingTimer?: NodeJS.Timeout;
+  private _wsPingTimer?: any;
   private readonly _baseUrl: string;
   private readonly _baseUrl: string;
 
 
   constructor(
   constructor(

+ 5 - 6
test/peer.ts

@@ -10,7 +10,7 @@ describe("Peer", function () {
             const peer = new Peer();
             const peer = new Peer();
 
 
             expect(peer.connections).to.deep.eq({});
             expect(peer.connections).to.deep.eq({});
-            expect(peer.id).to.be.undefined;
+            expect(peer.id).to.be.null;
             expect(peer.disconnected).to.be.false;
             expect(peer.disconnected).to.be.false;
             expect(peer.destroyed).to.be.false;
             expect(peer.destroyed).to.be.false;
 
 
@@ -75,12 +75,11 @@ describe("Peer", function () {
 
 
             peer1.destroy();
             peer1.destroy();
 
 
-            setTimeout(() => {
-                expect(peer1.disconnected).to.be.true;
-                expect(peer1.open).to.be.false;
+            expect(peer1.disconnected).to.be.true;
+            expect(peer1.destroyed).to.be.true;
+            expect(peer1.open).to.be.false;
 
 
-                done();
-            }, 0);
+            done();
         });
         });
 
 
         after(function () {
         after(function () {