improve return types
This commit is contained in:
Andre Staltz
parent
9446faa823
commit
e759e76299
|
|
@ -8,6 +8,7 @@ const { ErrorDuplex } = require('./utils')
|
||||||
const HUBS_SUBDOMAIN = 'hubs'
|
const HUBS_SUBDOMAIN = 'hubs'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* @typedef {`/${string}/${string}/${string}/${string}/${string}/${string}`} HubMultiaddr
|
||||||
* @typedef {ReturnType<import('ppppp-net').init>} PPPPPNet
|
* @typedef {ReturnType<import('ppppp-net').init>} PPPPPNet
|
||||||
* @typedef {ReturnType<import('ppppp-set').init>} PPPPPSet
|
* @typedef {ReturnType<import('ppppp-set').init>} PPPPPSet
|
||||||
* @typedef {import('ppppp-net').Info} Info
|
* @typedef {import('ppppp-net').Info} Info
|
||||||
|
|
@ -52,76 +53,77 @@ function initHubClient(peer, config) {
|
||||||
fn.apply(this, args)
|
fn.apply(this, args)
|
||||||
})
|
})
|
||||||
|
|
||||||
return {
|
/**
|
||||||
/**
|
* @param {HubMultiaddr} multiaddr
|
||||||
* @param {`/${string}`} multiaddr
|
* @param {CB<void>} cb
|
||||||
* @param {CB<void>} cb
|
*/
|
||||||
*/
|
function addHub(multiaddr, cb) {
|
||||||
addHub(multiaddr, cb) {
|
peer.set.add(HUBS_SUBDOMAIN, multiaddr, (err, _) => {
|
||||||
peer.set.add(HUBS_SUBDOMAIN, multiaddr, (err, _) => {
|
// prettier-ignore
|
||||||
|
if (err) return cb(new Error('Failed to add Hub to my Set feed', {cause: err}))
|
||||||
|
peer.net.connect(multiaddr, (err, rpc) => {
|
||||||
// prettier-ignore
|
// prettier-ignore
|
||||||
if (err) return cb(new Error('Failed to add Hub to my Set feed', {cause: err}))
|
if (err) return cb(new Error('Failed to connect to Hub after adding it to my Set feed', {cause: err}))
|
||||||
peer.net.connect(multiaddr, (err, rpc) => {
|
cb(null, void 0)
|
||||||
// prettier-ignore
|
|
||||||
if (err) return cb(new Error('Failed to connect to Hub after adding it to my Set feed', {cause: err}))
|
|
||||||
cb(null, void 0)
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
},
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {number} amount
|
* @param {number} amount
|
||||||
* @param {CB<Array<`/${string}`>>} cb
|
* @param {CB<Array<HubMultiaddr>>} cb
|
||||||
*/
|
*/
|
||||||
getHubs(amount, cb) {
|
function getHubs(amount, cb) {
|
||||||
const source = peer.net.peers()
|
const source = peer.net.peers()
|
||||||
source(null, (err, peers) => {
|
source(null, (err, peers) => {
|
||||||
if (err === true || !peers) return cb(null, [])
|
if (err === true || !peers) return cb(null, [])
|
||||||
// prettier-ignore
|
// prettier-ignore
|
||||||
if (err) return cb(new Error('Failed to get hubs', { cause: err }))
|
if (err) return cb(new Error('Failed to get hubs', { cause: err }))
|
||||||
// @ts-ignore
|
|
||||||
const infoMap = /**@type {Map<`/${string}`, Info>}*/ (new Map(peers))
|
|
||||||
const multiaddrs = /**@type {Array<`/${string}`>}*/ (
|
|
||||||
peer.set.values(HUBS_SUBDOMAIN)
|
|
||||||
)
|
|
||||||
const hubs = []
|
|
||||||
for (const multiaddr of multiaddrs) {
|
|
||||||
const stats = infoMap.get(multiaddr)?.stats ?? { failure: 1 }
|
|
||||||
hubs.push({ multiaddr, stats })
|
|
||||||
}
|
|
||||||
hubs.sort((a, b) => (a.stats.failure ?? 1) - (b.stats.failure ?? 1))
|
|
||||||
hubs.splice(amount)
|
|
||||||
const returnable = hubs.map((h) => h.multiaddr)
|
|
||||||
cb(null, returnable)
|
|
||||||
})
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param {string} origin
|
|
||||||
* @returns {import('pull-stream').Duplex<unknown, unknown>}
|
|
||||||
*/
|
|
||||||
connect(origin) {
|
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
const hub = this.shse.pubkey
|
const infoMap = new Map(peers)
|
||||||
debug('received hubClient.connect(%s) via hub %s', origin, hub)
|
const multiaddrs = peer.set.values(HUBS_SUBDOMAIN)
|
||||||
if (hubs.has(hub) && origin) {
|
const hubs = []
|
||||||
debug('connect() will resolve because handler exists')
|
for (const multiaddr of multiaddrs) {
|
||||||
const handler = hubs.get(hub).handler
|
const stats = infoMap.get(multiaddr)?.stats ?? { failure: 1 }
|
||||||
const [ins, outs] = DuplexPair()
|
hubs.push({ multiaddr, stats })
|
||||||
handler(ins, origin)
|
|
||||||
return outs
|
|
||||||
} else {
|
|
||||||
return ErrorDuplex(`Could not connect to ${origin} via ${hub}`)
|
|
||||||
}
|
}
|
||||||
},
|
hubs.sort((a, b) => (a.stats.failure ?? 1) - (b.stats.failure ?? 1))
|
||||||
|
hubs.splice(amount)
|
||||||
|
const returnable = hubs.map((h) => h.multiaddr)
|
||||||
|
cb(null, returnable)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// Internal method, needed for api-plugin.ts
|
/**
|
||||||
getHubsMap() {
|
* @param {string} origin
|
||||||
return hubs
|
* @returns {import('pull-stream').Duplex<unknown, unknown>}
|
||||||
},
|
*/
|
||||||
|
function connect(origin) {
|
||||||
|
// @ts-ignore
|
||||||
|
const hub = this.shse.pubkey
|
||||||
|
debug('received hubClient.connect(%s) via hub %s', origin, hub)
|
||||||
|
if (hubs.has(hub) && origin) {
|
||||||
|
debug('connect() will resolve because handler exists')
|
||||||
|
const handler = hubs.get(hub).handler
|
||||||
|
const [ins, outs] = DuplexPair()
|
||||||
|
handler(ins, origin)
|
||||||
|
return outs
|
||||||
|
} else {
|
||||||
|
return ErrorDuplex(`Could not connect to ${origin} via ${hub}`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Internal method
|
||||||
|
function getHubsMap() {
|
||||||
|
return hubs
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
addHub,
|
||||||
|
getHubs,
|
||||||
|
connect,
|
||||||
|
getHubsMap,
|
||||||
discoveredAttendants,
|
discoveredAttendants,
|
||||||
|
|
||||||
// underscore so other modules IN THIS LIBRARY can use it
|
// underscore so other modules IN THIS LIBRARY can use it
|
||||||
_notifyDiscoveredAttendant,
|
_notifyDiscoveredAttendant,
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue