@leofcoin/peernet 0.14.16 → 0.14.17

package/dist/browser/peernet.js

@@ -6637,23 +6637,12 @@ var debug_debug = __webpack_require__(307);
 
 class Peer {
   #connection
-  #connecting = false
   #connected = false
-  #channelReady = false
-  #destroying = false
-  #destroyed = false
-  #isNegotiating = false
-  #firstNegotiation = true
-  #iceComplete = false
-  #remoteTracks = []
-  #remoteStreams = []
-  #pendingCandidates = []
-  #senderMap = new Map()
   #messageQue = []
   #chunksQue = {}
-  #iceCompleteTimer
   #channel
   #peerId
+  #channelName
   #chunkSize = 16 * 1024 // 16384
   #queRunning = false
   #MAX_BUFFERED_AMOUNT = 16 * 1024 * 1024
@@ -6667,7 +6656,7 @@ class Peer {
   }
 
   get readyState() {
-    return this.channel?.readyState
+    return this.#channel?.readyState
   }
 
 /**
@@ -6687,7 +6676,7 @@ class Peer {
       down: 0
     }
 
-    this.channelName = options.channelName
+    this.#channelName = options.channelName
 
     this.#peerId = options.peerId
     this.options = options
@@ -6728,12 +6717,12 @@ class Peer {
 
    async #runQue() {
      this.#queRunning = true
-     if (this.#messageQue.length > 0 && this.channel?.bufferedAmount + this.#messageQue[0]?.length < this.#MAX_BUFFERED_AMOUNT) {
+     if (this.#messageQue.length > 0 && this.#channel?.bufferedAmount + this.#messageQue[0]?.length < this.#MAX_BUFFERED_AMOUNT) {
        const message = this.#messageQue.shift()
 
-       switch (this.channel?.readyState) {
+       switch (this.#channel?.readyState) {
          case 'open':
-          await this.channel.send(message);
+          await this.#channel.send(message);
           if (this.#messageQue.length > 0) return this.#runQue()
           else this.#queRunning = false
          break;
@@ -6842,19 +6831,19 @@ class Peer {
          message.channel.onmessage = (message) => {
            this._handleMessage(this.id, message)
          }
-         this.channel = message.channel
+         this.#channel = message.channel
        }
       if (this.initiator) {
 
-        this.channel = this.#connection.createDataChannel('messageChannel')
-        this.channel.onopen = () => {
+        this.#channel = this.#connection.createDataChannel('messageChannel')
+        this.#channel.onopen = () => {
           this.#connected = true
           pubsub.publish('peer:connected', this)
-          // this.channel.send('hi')
+          // this.#channel.send('hi')
         }
-        this.channel.onclose = () => this.close.bind(this)
+        this.#channel.onclose = () => this.close.bind(this)
 
-        this.channel.onmessage = (message) => {
+        this.#channel.onmessage = (message) => {
           this._handleMessage(this.peerId, message)
         }
 
@@ -6904,31 +6893,39 @@ class Peer {
      }})
    }
 
+   isReallyStable(signalinState) {
+    if (signalinState !== 'stable') return false
+    // remoteDescription & localDescription are null when the connection is just made
+    if (this.#connection.remoteDescription === null && this.#connection.localDescription === null) return false
+    return true
+   }
+
    async _in(message, data) {
     // message = JSON.parse(message);
     if (message.to !== this.id) return
     // if (data.videocall) return this._startStream(true, false); // start video and audio stream
     // if (data.call) return this._startStream(true, true); // start audio stream
     if (message.candidate) {
-      debug(`incoming candidate ${this.channelName}`)
+      debug(`incoming candidate ${this.#channelName}`)
       debug(message.candidate.candidate)
       this.remoteAddress = message.candidate.address
       this.remotePort = message.candidate.port
       this.remoteProtocol = message.candidate.protocol
       this.remoteIpFamily = this.remoteAddress?.includes('::') ? 'ipv6': 'ipv4'
-      return this.#connection.addIceCandidate(new wrtc.RTCIceCandidate(message.candidate));
+      const signalinState = this.#connection.signalinState
+      if (signalinState !== 'closed' && this.isReallyStable(signalinState)) return this.#connection.addIceCandidate(new wrtc.RTCIceCandidate(message.candidate));
     }
     try {
       if (message.sdp) {
         if (message.sdp.type === 'offer') {
-          debug(`incoming offer ${this.channelName}`)
+          debug(`incoming offer ${this.#channelName}`)
           await this.#connection.setRemoteDescription(new wrtc.RTCSessionDescription(message.sdp))
           const answer = await this.#connection.createAnswer();
           await this.#connection.setLocalDescription(answer)
           this._sendMessage({'sdp': this.#connection.localDescription})
         }
         if (message.sdp.type === 'answer') {
-          debug(`incoming answer ${this.channelName}`)
+          debug(`incoming answer ${this.#channelName}`)
           await this.#connection.setRemoteDescription(new wrtc.RTCSessionDescription(message.sdp))
         }
      }
@@ -6940,7 +6937,7 @@ class Peer {
  close() {
    debug(`closing ${this.peerId}`)
    this.#connected = false
-   this.channel?.close()
+   this.#channel?.close()
    this.#connection?.close()
 
    this.socketClient.pubsub.unsubscribe('signal', this._in)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leofcoin/peernet",
-  "version": "0.14.16",
+  "version": "0.14.17",
   "description": "",
   "source": "src/peernet.js",
   "main": "dist/commonjs/peernet.js",