Merge remote-tracking branch 'origin/wip' into develop

src/modules/rpc.ts

@@ -7,16 +7,24 @@ import { errorExit } from "../lib/error.js";
 import stringify from "json-stable-stringify";
 import {
   getRpcServer,
+  RPC_PROTOCOL_ID,
   RPC_PROTOCOL_SYMBOL,
   setupStream,
 } from "./rpc/server.js";
 import { get as getSwarm, SecretStream } from "./swarm.js";
 import b4a from "b4a";
+// @ts-ignore
+import Protomux from "protomux";
 
 export async function start() {
-  getSwarm().on("connection", (stream: SecretStream) =>
+  getSwarm().on("connection", (stream: SecretStream) => {
-    getRpcServer().setup(stream)
+    Protomux.from(stream).pair(
+      { protocol: "protomux-rpc", id: RPC_PROTOCOL_ID },
+      async () => {
+        getRpcServer().setup(stream);
+      }
     );
+  });
 }
 
 export async function getRpcByPeer(peer: Buffer | string) {
@@ -30,15 +38,16 @@ export async function getRpcByPeer(peer: Buffer | string) {
   }
 
   return new Promise((resolve) => {
-    const listener = () => {};
+    const listener = (peer: any, info: any) => {
-    swarm.on("connection", (peer: any, info: any) => {
       if (info.publicKey.toString("hex") !== peer.toString("hex")) {
         return;
       }
       swarm.removeListener("connection", listener);
 
       resolve(setupStream(peer));
-    });
+    };
+
+    swarm.on("connection", listener);
 
     swarm.joinPeer(peer);
   });

src/modules/rpc/server.ts

@@ -21,7 +21,7 @@ import jsonStringify from "json-stringify-deterministic";
 const sodium = require("sodium-universal");
 let server: RPCServer;
 
-const RPC_PROTOCOL_ID = b4a.from("lumeweb");
+export const RPC_PROTOCOL_ID = b4a.from("lumeweb");
 export const RPC_PROTOCOL_SYMBOL = Symbol.for(RPC_PROTOCOL_ID.toString());
 
 export function getRpcServer(): RPCServer {

src/modules/swarm.ts

@@ -69,6 +69,9 @@ export class ProtocolManager {
     this._swarm = swarm;
 
     this._swarm.on("connection", (peer: any) => {
+      if (!peer.userData) {
+        peer.userData = null;
+      }
       for (const protocol of this._protocols) {
         Protomux.from(peer).pair(
           { protocol: protocol[0] },

src/plugins/core.ts

@@ -1,8 +1,17 @@
 import { Plugin, PluginAPI } from "@lumeweb/interface-relay";
 
+let pluginsLoadedResolve: () => void;
+let pluginsLoadedPromise = new Promise<void>((resolve) => {
+  pluginsLoadedResolve = resolve;
+});
+
 const plugin: Plugin = {
   name: "core",
   async plugin(api: PluginAPI): Promise<void> {
+    api.once("core.pluginsLoaded", () => {
+      pluginsLoadedResolve();
+    });
+
     api.registerMethod("ping", {
       cacheable: false,
       async handler(): Promise<any> {
@@ -13,6 +22,8 @@ const plugin: Plugin = {
     api.registerMethod("get_methods", {
       cacheable: false,
       async handler(): Promise<any> {
+        await pluginsLoadedPromise;
+
         return api.rpcServer.getMethods();
       },
     });