*Ensure we use Protomux pair for the RPC service

This commit is contained in:
Derrick Hammer 2023-04-07 20:52:23 -04:00
parent a003da1606
commit 556373c5bc
Signed by: pcfreak30
GPG Key ID: C997C339BE476FF2
2 changed files with 12 additions and 4 deletions

View File

@ -7,16 +7,24 @@ import { errorExit } from "../lib/error.js";
import stringify from "json-stable-stringify"; import stringify from "json-stable-stringify";
import { import {
getRpcServer, getRpcServer,
RPC_PROTOCOL_ID,
RPC_PROTOCOL_SYMBOL, RPC_PROTOCOL_SYMBOL,
setupStream, setupStream,
} from "./rpc/server.js"; } from "./rpc/server.js";
import { get as getSwarm, SecretStream } from "./swarm.js"; import { get as getSwarm, SecretStream } from "./swarm.js";
import b4a from "b4a"; import b4a from "b4a";
// @ts-ignore
import Protomux from "protomux";
export async function start() { 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) { export async function getRpcByPeer(peer: Buffer | string) {

View File

@ -23,7 +23,7 @@ import config from "../../config";
const sodium = require("sodium-universal"); const sodium = require("sodium-universal");
let server: RPCServer; 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 const RPC_PROTOCOL_SYMBOL = Symbol.for(RPC_PROTOCOL_ID.toString());
export function getRpcServer(): RPCServer { export function getRpcServer(): RPCServer {