@dxos/network-manager 0.1.21 → 0.1.23

package/dist/lib/node/index.cjs

@@ -770,7 +770,7 @@ var Swarm = class {
       peerId: _ownPeerId
     }, {
       file: "swarm.ts",
-      line: 80,
+      line: 83,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -787,7 +787,7 @@ var Swarm = class {
       onMessage: async (message) => await this._swarmMessenger.receiveMessage(message)
     }).catch((error) => import_log4.log.catch(error, {}, {
       file: "swarm.ts",
-      line: 96,
+      line: 99,
       scope: this,
       callSite: (f, a) => f(...a)
     }));
@@ -811,7 +811,7 @@ var Swarm = class {
   async destroy() {
     (0, import_log4.log)("destroying...", {}, {
       file: "swarm.ts",
-      line: 124,
+      line: 127,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -820,7 +820,7 @@ var Swarm = class {
     await Promise.all(Array.from(this._peers.keys()).map((key) => this._destroyPeer(key)));
     (0, import_log4.log)("destroyed", {}, {
       file: "swarm.ts",
-      line: 128,
+      line: 131,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -835,7 +835,7 @@ var Swarm = class {
       topology: getClassName(topology)
     }, {
       file: "swarm.ts",
-      line: 136,
+      line: 139,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -845,30 +845,31 @@ var Swarm = class {
     this._topology.update();
   }
   onSwarmEvent(swarmEvent) {
+    var _a;
     (0, import_log4.log)("swarm event", {
       swarmEvent
     }, {
       file: "swarm.ts",
-      line: 149,
+      line: 152,
       scope: this,
       callSite: (f, a) => f(...a)
     });
+    if (this._ctx.disposed) {
+      import_log4.log.warn("ignored for offline swarm", {}, {
+        file: "swarm.ts",
+        line: 155,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+      return;
+    }
     if (swarmEvent.peerAvailable) {
-      if (this._ctx.disposed) {
-        import_log4.log.warn("ignored for offline swarm", {}, {
-          file: "swarm.ts",
-          line: 153,
-          scope: this,
-          callSite: (f, a) => f(...a)
-        });
-        return;
-      }
       const peerId = import_keys3.PublicKey.from(swarmEvent.peerAvailable.peer);
       (0, import_log4.log)("new peer", {
         peerId
       }, {
         file: "swarm.ts",
-        line: 157,
+        line: 161,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -880,10 +881,10 @@ var Swarm = class {
       const peer1 = this._peers.get(import_keys3.PublicKey.from(swarmEvent.peerLeft.peer));
       if (peer1) {
         peer1.advertizing = false;
-        if (!peer1.connection || peer1.connection.state !== ConnectionState.CONNECTED) {
+        if (((_a = peer1.connection) == null ? void 0 : _a.state) !== ConnectionState.CONNECTED) {
           void this._destroyPeer(peer1.id).catch((err) => import_log4.log.catch(err, {}, {
             file: "swarm.ts",
-            line: 168,
+            line: 172,
             scope: this,
             callSite: (f, a) => f(...a)
           }));
@@ -898,14 +899,14 @@ var Swarm = class {
       message
     }, {
       file: "swarm.ts",
-      line: 178,
+      line: 182,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       import_log4.log.info("ignored for offline swarm", {}, {
         file: "swarm.ts",
-        line: 180,
+        line: 184,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -919,7 +920,7 @@ var Swarm = class {
         message
       }, {
         file: "swarm.ts",
-        line: 187,
+        line: 191,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -932,7 +933,7 @@ var Swarm = class {
         message
       }, {
         file: "swarm.ts",
-        line: 191,
+        line: 195,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -951,14 +952,14 @@ var Swarm = class {
       message
     }, {
       file: "swarm.ts",
-      line: 202,
+      line: 207,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       import_log4.log.info("ignored for offline swarm", {}, {
         file: "swarm.ts",
-        line: 204,
+        line: 209,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -973,24 +974,13 @@ var Swarm = class {
   // For debug purposes
   async goOffline() {
     await this._ctx.dispose();
-    [
-      ...this._peers.values()
-    ].forEach((peer) => {
-      peer.advertizing = false;
-    });
     await Promise.all([
       ...this._peers.keys()
-    ].map((peerId) => this._closeConnection(peerId)));
+    ].map((peerId) => this._destroyPeer(peerId)));
   }
   // For debug purposes
   async goOnline() {
     this._ctx = new import_context.Context();
-    [
-      ...this._peers.values()
-    ].forEach((peer) => {
-      peer.advertizing = true;
-    });
-    this._topology.update();
   }
   _getOrCreatePeer(peerId) {
     let peer = this._peers.get(peerId);
@@ -1047,7 +1037,7 @@ var Swarm = class {
           } catch (err) {
             import_log4.log.warn("initiation error", err, {
               file: "swarm.ts",
-              line: 311,
+              line: 309,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1069,6 +1059,7 @@ var Swarm = class {
   * Creates a connection then sends message over signal network.
   */
   async _initiateConnection(remoteId) {
+    const ctx = this._ctx;
     if (remoteId.toHex() < this._ownPeerId.toHex()) {
       (0, import_log4.log)("initiation delay", {
         remoteId
@@ -1080,7 +1071,7 @@ var Swarm = class {
       });
       await (0, import_async3.sleep)(INITIATION_DELAY);
     }
-    if (this._ctx.disposed) {
+    if (ctx.disposed) {
       return;
     }
     const peer = this._getOrCreatePeer(remoteId);
@@ -1129,6 +1120,12 @@ __decorate3([
 __decorate3([
   import_async3.synchronized
 ], Swarm.prototype, "onOffer", null);
+__decorate3([
+  import_async3.synchronized
+], Swarm.prototype, "onSignal", null);
+__decorate3([
+  import_async3.synchronized
+], Swarm.prototype, "goOffline", null);
 __decorate3([
   import_async3.synchronized
 ], Swarm.prototype, "goOnline", null);
@@ -1447,20 +1444,20 @@ var NetworkManager = class {
     switch (state) {
       case import_services.ConnectionState.OFFLINE: {
         this._connectionState = state;
-        await this._messenger.close();
-        await this._signalManager.close();
         await Promise.all([
           ...this._swarms.values()
         ].map((swarm) => swarm.goOffline()));
+        await this._messenger.close();
+        await this._signalManager.close();
         break;
       }
       case import_services.ConnectionState.ONLINE: {
         this._connectionState = state;
-        this._messenger.open();
-        await this._signalManager.open();
         await Promise.all([
           ...this._swarms.values()
         ].map((swarm) => swarm.goOnline()));
+        this._messenger.open();
+        await this._signalManager.open();
         break;
       }
     }