dist/network.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../src/network.ts"],"names":[],"mappings":"AAEA,OAAO,sBAAsB,MAAM,kBAAkB,CAAC;AAItD,MAAM,CAAC,OAAO,OAAO,UAAU;IAC7B,OAAO,CAAC,uBAAuB,CAAC,CAAgB;IAChD,OAAO,CAAC,uBAAuB,CAAC,CAAW;gBAC/B,KAAK,MAAmB;IAKpC,OAAO,CAAC,QAAQ,CAA4D;IAE5E,IAAI,OAAO,IAAI,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAEtC;IAED,OAAO,CAAC,QAAQ,CAAoC;IAEpD,IAAI,OAAO,IAAI,sBAAsB,CAEpC;IAED,OAAO,CAAC,MAAM,CAAoB;IAElC,IAAI,KAAK,QAER;IAED,OAAO,CAAC,kBAAkB,CAAQ;IAElC,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAElC;IAED,OAAO,CAAC,aAAa,CAAM;IAE3B,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,YAAY,CAAC,KAAK,EAAE,MAAM,EAE7B;IAED,OAAO,CAAC,aAAa,CAAK;IAE1B,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,YAAY,CAAC,KAAK,EAAE,MAAM,EAE7B;IAED,OAAO,CAAC,OAAO,CAAiD;IAEhE,IAAI,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAElC;IAED,OAAO,CAAC,MAAM,CAAC,CAAgB;IAE/B,IAAI,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAMzB;IAED,IAAI,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAEnC;IAED,OAAO,CAAC,YAAY,CAAkB;IAEtC,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,IAAI,WAAW,CAAC,KAAK,EAAE,OAAO,EAE7B;IAEM,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAYhD,QAAQ,CAAC,MAAM,EAAE,MAAM;IAQ9B,OAAO,CAAC,IAAI;IAwCZ,OAAO,CAAC,iBAAiB;CAK1B"}
+{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../src/network.ts"],"names":[],"mappings":"AAEA,OAAO,sBAAsB,MAAM,kBAAkB,CAAC;AAItD,MAAM,CAAC,OAAO,OAAO,UAAU;IAC7B,OAAO,CAAC,uBAAuB,CAAC,CAAgB;IAChD,OAAO,CAAC,uBAAuB,CAAC,CAAW;gBAC/B,KAAK,MAAmB;IAKpC,OAAO,CAAC,QAAQ,CAA4D;IAE5E,IAAI,OAAO,IAAI,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAEtC;IAED,OAAO,CAAC,QAAQ,CAAoC;IAEpD,IAAI,OAAO,IAAI,sBAAsB,CAEpC;IAED,OAAO,CAAC,MAAM,CAAoB;IAElC,IAAI,KAAK,QAER;IAED,OAAO,CAAC,kBAAkB,CAAQ;IAElC,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAElC;IAED,OAAO,CAAC,aAAa,CAAM;IAE3B,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,YAAY,CAAC,KAAK,EAAE,MAAM,EAE7B;IAED,OAAO,CAAC,aAAa,CAAK;IAE1B,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,IAAI,YAAY,CAAC,KAAK,EAAE,MAAM,EAE7B;IAED,OAAO,CAAC,OAAO,CAAiD;IAEhE,IAAI,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAElC;IAED,OAAO,CAAC,MAAM,CAAC,CAAgB;IAE/B,IAAI,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAMzB;IAED,IAAI,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC,CAEnC;IAED,OAAO,CAAC,YAAY,CAAkB;IAEtC,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,IAAI,WAAW,CAAC,KAAK,EAAE,OAAO,EAE7B;IAEM,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAYhD,QAAQ,CAAC,MAAM,EAAE,MAAM;IAQ9B,OAAO,CAAC,IAAI;IAyCZ,OAAO,CAAC,iBAAiB;CAK1B"}

dist/network.js

@@ -82,8 +82,22 @@ export default class RpcNetwork {
         this._swarm.join(createHash("lumeweb"));
         this.setupRelayPromise();
         this._swarm.on("connection", async (relay) => {
+            const query = this._factory.simple({
+                relay,
+                query: { module: "core", method: "get_methods", data: null },
+            });
+            const resp = await query.result;
             const pubkey = b4a.from(relay.remotePublicKey).toString("hex");
-            relay.once("close", () => {
+            if (resp.data) {
+                this._relays.set(pubkey, relay);
+                resp.data.forEach((item) => {
+                    const methods = this._methods.get(item) ?? new Set();
+                    methods.add(pubkey);
+                    this._methods.set(item, methods);
+                });
+                this._relaysAvailableResolve?.();
+            }
+            relay.on("close", () => {
                 this._methods.forEach((item) => {
                     if (item.has(pubkey)) {
                         item.delete(pubkey);
@@ -94,20 +108,6 @@ export default class RpcNetwork {
                     this.setupRelayPromise();
                 }
             });
-            const query = this._factory.simple({
-                relay,
-                query: { module: "core", method: "get_methods", data: null },
-            });
-            const resp = await query.result;
-            if (resp.data) {
-                this._relays.set(pubkey, relay);
-                resp.data.forEach((item) => {
-                    const methods = this._methods.get(item) ?? new Set();
-                    methods.add(pubkey);
-                    this._methods.set(item, methods);
-                });
-                this._relaysAvailableResolve?.();
-            }
         });
     }
     setupRelayPromise() {

src/network.ts

@@ -115,26 +115,14 @@ export default class RpcNetwork {
     this.setupRelayPromise();
 
     this._swarm.on("connection", async (relay: any) => {
-      const pubkey = b4a.from(relay.remotePublicKey).toString("hex");
-      relay.once("close", () => {
-        this._methods.forEach((item) => {
-          if (item.has(pubkey)) {
-            item.delete(pubkey);
-          }
-        });
-        this.relays.delete(pubkey);
-
-        if (!this._relays.size) {
-          this.setupRelayPromise();
-        }
-      });
-
       const query = this._factory.simple({
         relay,
         query: { module: "core", method: "get_methods", data: null },
       });
       const resp = await query.result;
 
+      const pubkey = b4a.from(relay.remotePublicKey).toString("hex");
+
       if (resp.data) {
         this._relays.set(pubkey, relay);
 
@@ -147,6 +135,19 @@ export default class RpcNetwork {
         });
         this._relaysAvailableResolve?.();
       }
+
+      relay.on("close", () => {
+        this._methods.forEach((item) => {
+          if (item.has(pubkey)) {
+            item.delete(pubkey);
+          }
+        });
+        this.relays.delete(pubkey);
+
+        if (!this._relays.size) {
+          this.setupRelayPromise();
+        }
+      });
     });
   }