@yz-social/webrtc 0.0.3 → 0.0.5

package/lib/datachannels.js

@@ -17,11 +17,6 @@ export class WebRTCDataChannels extends WebRTCPeerEvents {
   get hasStartedConnecting() {
     return this.channelId > this.constructor.BASE_CHANNEL_ID;
   }
-  close(removeConnection = true) {
-    this.channelId = this.constructor.BASE_CHANNEL_ID;
-    super.close();
-    if (removeConnection) this.constructor.connections.delete(this.serviceLabel);
-  }
   async ensureDataChannel(channelName, channelOptions = {}, signals = null) { // Return a promise for an open data channel on this connection.
     // Much of this machinery is for ealing with the first data channel on either side in the case that the connection as a whole
     // has not yet been made. 
@@ -132,12 +127,14 @@ export class WebRTCDataChannels extends WebRTCPeerEvents {
     });
     return channel;
   }
-  close() {
+  close(removeConnection = true) {
+    this.channelId = this.constructor.BASE_CHANNEL_ID;
     super.close();
+    if (removeConnection) this.constructor.connections.delete(this.serviceLabel);
     // If the webrtc implementation closes the data channels before the peer itself, then this.dataChannels will be empty.
     // But if not (e.g., status 'failed' or 'disconnected' on Safari), then let us explicitly close them so that Synchronizers know to clean up.
     for (const channel of this.dataChannels.values()) {
-      if (channel.readyState !== 'open') continue; // Keep debugging sanity.
+      if (channel.readyState !== 'open') continue;
       // It appears that in Safari (18.5) for a call to channel.close() with the connection already internally closed, Safari
       // will set channel.readyState to 'closing', but NOT fire the closed or closing event. So we have to dispatch it ourselves.
       //channel.close();

package/lib/webrtc.js

@@ -16,6 +16,7 @@ export class WebRTC extends WebRTCBase {
     
     const returning = await responder(this.signals); // this.signals might be an empty list.
     if (!returning?.length) return;
+    if (this.peer.iceGatheringState !== 'gathering') return; // All done.
     this.signals = returning;
     await this.connectVia(responder); // Keep "long-polling" the other side until it has nothing left to say.
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yz-social/webrtc",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Streamlined portable webrtc management of p2p and client2server.",
   "keywords": [
     "webrtc",

package/spec/webrtcSpec.js

@@ -25,7 +25,7 @@ describe("WebRTC", function () {
     const channelName = 'test';
     function test(Kind, connect) {
       describe(Kind.name, function () {
-	let a = {}, b = {};
+	let a = {}, b = {}; let calledCloseA = 0, calledCloseB = 0;
 	beforeAll(async function () {
 	  const debug = false;
 	  a.connection = Kind.ensure({serviceLabel: 'A'+Kind.name, debug});
@@ -35,6 +35,8 @@ describe("WebRTC", function () {
 
 	  a.testChannel = await a.dataChannelPromise;
 	  b.testChannel = await b.dataChannelPromise;
+	  a.testChannel.addEventListener('close', () => { calledCloseA++; });
+	  b.testChannel.addEventListener('close', () => { calledCloseB++; });
 
 	  await a.connection.reportConnection();
 	  await b.connection.reportConnection();
@@ -44,6 +46,8 @@ describe("WebRTC", function () {
 	  expect(a.connection.peer.connectionState).toBe('new');
 	  await delay(10); // Yield to allow the other side to close.
 	  expect(b.connection.peer.connectionState).toBe('new');
+	  expect(calledCloseA).toBe(1);
+	  expect(calledCloseB).toBe(1);
 	});
 	it("changes state appropriately.", async function () {
 	  expect(await a.dataChannelPromise).toBeTruthy();