albert/mrfrys-node-server
1
0
Fork 0
mirror of https://gitlab.com/MrFry/mrfrys-node-server synced 2025-04-01 20:24:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed pw from self info, checking if third party peers file exists, minor logging fix

Browse source
This commit is contained in:
mrfry 2023-04-11 10:48:41 +02:00
parent 5106614088
commit 5ce0c2d71c
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/api/submodules/p2p.ts
View file

@ -96,8 +96,10 @@ interface SyncDataRes {
function updateThirdPartyPeers(
newVal: Omit<PeerInfo, 'publicKey' | 'name' | 'contact'>[]
) {
// TODO: check if thirdPartyPeersFile exists!
const prevVal = utils.ReadJSON<PeerInfo[]>(paths.thirdPartyPeersFile)
const prevVal = utils.FileExists(paths.thirdPartyPeersFile)
? utils.ReadJSON<PeerInfo[]>(paths.thirdPartyPeersFile)
: []
const dataToWrite = newVal.reduce((acc, peer) => {
const isIncluded = acc.find((x) => {
return peerToString(x) === peerToString(peer)
@ -466,7 +468,11 @@ function setup(data: SubmoduleData): Submodule {
function getSelfInfo(includeVerboseInfo?: boolean) {
const result: RemotePeerInfo = {
selfInfo: { ...selfInfo, publicKey: publicKey },
myPeers: peers,
myPeers: peers.map((peer) => {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const { pw, ...restOfPeer } = peer
return restOfPeer
}),
}
if (includeVerboseInfo) {
@ -964,8 +970,7 @@ function setup(data: SubmoduleData): Submodule {
remoteInfo: getSelfInfo(),
}
// TODO: hostname is invalid, should be remote host?
let hostToLog = req.hostname
let hostToLog = remoteHost || 'Unknown host'
if (remoteHost) {
const remotePeerInfo = peers.find((peer) => {
return peerToString(peer) === remoteHost
@ -1000,7 +1005,6 @@ function setup(data: SubmoduleData): Submodule {
)
if (remoteHost.includes(':')) {
const [host, port] = remoteHost.split(':')
// TODO: add public key
updateThirdPartyPeers([
{
host: host,