Compare commits

..

No commits in common. "d3d0f387b66148dcc202a3ef0cb2cd1b7fa5d571" and "90d8bfba63b089a61ea93a7dd4b84c712c21c2f5" have entirely different histories.

2 changed files with 8 additions and 6 deletions

View File

@ -32,10 +32,12 @@ class PluginAPI extends EventEmitter2 {
constructor({ constructor({
config, config,
logger,
server, server,
swarm, swarm,
}: { }: {
config: Config; config: Config;
logger: Logger;
server: RPCServer; server: RPCServer;
swarm: any; swarm: any;
}) { }) {
@ -45,6 +47,7 @@ class PluginAPI extends EventEmitter2 {
maxListeners: 0, maxListeners: 0,
}); });
this._config = config; this._config = config;
this._logger = logger;
this._server = server; this._server = server;
this._swarm = swarm; this._swarm = swarm;
} }
@ -71,8 +74,10 @@ class PluginAPI extends EventEmitter2 {
throw new Error("not implemented and should not be called"); throw new Error("not implemented and should not be called");
} }
private _logger: Logger;
get logger(): Logger { get logger(): Logger {
throw new Error("not implemented and should not be called"); return this._logger;
} }
get rpcServer(): RPCServer { get rpcServer(): RPCServer {
@ -110,6 +115,7 @@ export function getPluginAPI(): PluginAPI {
if (!pluginAPI) { if (!pluginAPI) {
pluginAPI = new PluginAPI({ pluginAPI = new PluginAPI({
config, config,
logger: log,
server: getRpcServer(), server: getRpcServer(),
swarm: getSwarm(), swarm: getSwarm(),
}); });
@ -206,10 +212,6 @@ export class PluginAPIManager {
}); });
} }
if (prop === "logger") {
return log.child({ plugin: plugin.name });
}
return (target as any)[prop]; return (target as any)[prop];
}, },
}) })

View File

@ -71,7 +71,7 @@ export class ProtocolManager {
this._swarm.on("connection", (peer: any) => { this._swarm.on("connection", (peer: any) => {
for (const protocol of this._protocols) { for (const protocol of this._protocols) {
Protomux.from(peer).pair( Protomux.from(peer).pair(
{ protocol: protocol[0] }, protocol[0],
this.handler.bind(this, protocol[0], peer) this.handler.bind(this, protocol[0], peer)
); );
} }