src/modules/rpc.ts

@@ -7,24 +7,16 @@ 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) =>
-    Protomux.from(stream).pair(
+    getRpcServer().setup(stream)
-      { protocol: "protomux-rpc", id: RPC_PROTOCOL_ID },
-      async () => {
-        getRpcServer().setup(stream);
-      }
   );
-  });
 }
 
 export async function getRpcByPeer(peer: Buffer | string) {

src/modules/rpc/server.ts

@@ -23,7 +23,7 @@ import config from "../../config";
 const sodium = require("sodium-universal");
 let server: RPCServer;
 
-export const RPC_PROTOCOL_ID = b4a.from("lumeweb");
+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,9 +69,6 @@ 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] },