Skip to content

Commit

Permalink
chore: fix linting
Browse files Browse the repository at this point in the history
  • Loading branch information
achingbrain committed Sep 29, 2023
1 parent 3e55899 commit 961d505
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 40 deletions.
54 changes: 27 additions & 27 deletions src/health-check.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* eslint-disable no-console */

/**
* @packageDoc
* @packageDocumentation
* Health-check that ensures the bootstrapper is running and dialable.
*
* This binary can be executed via the docker --health-cmd option, but we automatically execute it
Expand All @@ -11,22 +11,22 @@
* See https://github.com/libp2p/rust-libp2p/tree/master/misc/server for more information
*
* - need to execute functionality similar to https://github.com/mxinden/libp2p-lookup/
* as used by https://github.com/libp2p/rust-libp2p/tree/master/misc/server
* as used by https://github.com/libp2p/rust-libp2p/tree/master/misc/server
*/
import { parseArgs } from 'node:util'
import { createLibp2p } from 'libp2p'
import { webSockets } from '@libp2p/websockets'
import { tcp } from '@libp2p/tcp'
import { noise } from '@chainsafe/libp2p-noise'
import { yamux } from '@chainsafe/libp2p-yamux'
import { kadDHT } from '@libp2p/kad-dht'
import { mplex } from '@libp2p/mplex'
import { noise } from '@chainsafe/libp2p-noise'
import { multiaddr, type Multiaddr } from '@multiformats/multiaddr'
import { peerIdFromString } from '@libp2p/peer-id'
import { kadDHT } from '@libp2p/kad-dht'
import { tcp } from '@libp2p/tcp'
import { webSockets } from '@libp2p/websockets'
import { multiaddr, type Multiaddr } from '@multiformats/multiaddr'
import { createLibp2p } from 'libp2p'

// // @ts-expect-error unused
const { positionals } = parseArgs({
allowPositionals: true,
allowPositionals: true
})

if (positionals.length > 1) {
Expand All @@ -38,23 +38,23 @@ let multiaddrs: Multiaddr[] = []
let peerId = null

try {
multiaddrs = [
multiaddr(multiaddrOrPeerId)
]
multiaddrs = [
multiaddr(multiaddrOrPeerId)
]
} catch (e) {
// don't care about error, try peerId
console.error('Could not convert input into multiaddr')
// don't care about error, try peerId
console.error('Could not convert input into multiaddr')
}

try {
peerId = peerIdFromString(multiaddrOrPeerId)
peerId = peerIdFromString(multiaddrOrPeerId)
} catch {
// peer id failed, maybe multiaddr didn't?
console.error('Could not convert input into PeerId')
// peer id failed, maybe multiaddr didn't?
console.error('Could not convert input into PeerId')
}

if (multiaddr == null && peerId == null) {
throw new Error('Could not convert input into valid dialable artifact.')
throw new Error('Could not convert input into valid dialable artifact.')
}

const node = await createLibp2p({
Expand All @@ -75,15 +75,15 @@ const node = await createLibp2p({
})

if (peerId != null) {
// if we receive a PeerId (which would be a string because its from command line) we need to do:
// * dht lookup
// * dial
try {
const resolvedPeer = await node.peerRouting.findPeer(peerId)
multiaddrs = resolvedPeer.multiaddrs
} catch (e) {
console.error('Could not find peer via dht lookup')
}
// if we receive a PeerId (which would be a string because its from command line) we need to do:
// * dht lookup
// * dial
try {
const resolvedPeer = await node.peerRouting.findPeer(peerId)
multiaddrs = resolvedPeer.multiaddrs
} catch (e) {
console.error('Could not find peer via dht lookup')
}
}

// if we receive a Multiaddr, dial it immediately
Expand Down
25 changes: 12 additions & 13 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
#! /usr/bin/env node --trace-warnings
/* eslint-disable no-console */

import { parseArgs } from 'node:util'
import { createServer } from 'node:http'
import { createLibp2p } from 'libp2p'
import { circuitRelayServer } from 'libp2p/circuit-relay'
import { webSockets } from '@libp2p/websockets'
import { tcp } from '@libp2p/tcp'
import { kadDHT } from '@libp2p/kad-dht'
import { autoNATService } from 'libp2p/autonat'
import { parseArgs } from 'node:util'
import { noise } from '@chainsafe/libp2p-noise'
import { yamux } from '@chainsafe/libp2p-yamux'
import { kadDHT } from '@libp2p/kad-dht'
import { mplex } from '@libp2p/mplex'
import { noise } from '@chainsafe/libp2p-noise'
import { prometheusMetrics } from '@libp2p/prometheus-metrics'
import { tcp } from '@libp2p/tcp'
import { webSockets } from '@libp2p/websockets'
import { createLibp2p } from 'libp2p'
import { autoNATService } from 'libp2p/autonat'
import { circuitRelayServer } from 'libp2p/circuit-relay'
import { register } from 'prom-client'

async function main (): Promise<void> {
Expand Down Expand Up @@ -49,7 +49,7 @@ async function main (): Promise<void> {
}
})

if (args.values.help) {
if (args.values.help === true) {
console.info('Help!')
return
}
Expand All @@ -60,11 +60,11 @@ async function main (): Promise<void> {
})
}

if (args.values.enableKademlia) {
if (args.values.enableKademlia === true) {
services.dht = kadDHT()
}

if (args.values.enableAutonat) {
if (args.values.enableAutonat === true) {
services.autonat = autoNATService()
}

Expand All @@ -90,7 +90,7 @@ async function main (): Promise<void> {
const metricsServer = createServer((req, res) => {
if (req.url === args.values.metricsPath && req.method === 'GET') {
res.writeHead(200, { 'Content-Type': 'text/plain' })
register.metrics().then((metrics) => res.end(metrics))
void register.metrics().then((metrics) => res.end(metrics))
} else {
res.writeHead(404, { 'Content-Type': 'text/plain' })
res.end('Not Found')
Expand All @@ -99,7 +99,6 @@ async function main (): Promise<void> {
await new Promise<void>((resolve) => metricsServer.listen(parseInt(args.values.metricsPort ?? '8888', 10), '0.0.0.0', resolve))

console.info('Metrics server listening', `0.0.0.0:${args.values.metricsPort}/${args.values.metricsPath}`)

}

main().catch(err => {
Expand Down

0 comments on commit 961d505

Please sign in to comment.