mirror of https://codeberg.org/pzp/pzp-net.git
preliminary scheduler
This commit is contained in:
parent
ee34cc6d14
commit
f5545fd7d9
|
@ -0,0 +1,4 @@
|
||||||
|
declare module 'pull-awaitable' {
|
||||||
|
function awaitable<T>(pullStream: any): AsyncIterableIterator<T>
|
||||||
|
export = awaitable
|
||||||
|
}
|
|
@ -75,7 +75,7 @@ function initNet(peer, config) {
|
||||||
const infos = new Infos()
|
const infos = new Infos()
|
||||||
const stats = new Stats(netDir, infos, config.net?.persistTimeout)
|
const stats = new Stats(netDir, infos, config.net?.persistTimeout)
|
||||||
const connections = new Connections(peer, infos)
|
const connections = new Connections(peer, infos)
|
||||||
const scheduler = new Scheduler()
|
const scheduler = new Scheduler(peer, connections)
|
||||||
|
|
||||||
peer.close.hook(function (fn, args) {
|
peer.close.hook(function (fn, args) {
|
||||||
scheduler.stop()
|
scheduler.stop()
|
||||||
|
|
|
@ -1,10 +1,76 @@
|
||||||
|
const awaitable = require('pull-awaitable')
|
||||||
|
const run = require('promisify-tuple')
|
||||||
|
const debug = require('debug')('ppppp:net:scheduler')
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @typedef {ReturnType<import('ppppp-db').init>} PPPPPDB
|
||||||
|
* @typedef {ReturnType<import('ppppp-set').init>} PPPPPSet
|
||||||
|
* @typedef {`/${string}`} Multiaddr
|
||||||
|
* @typedef {import('./infos')} Infos
|
||||||
|
* @typedef {import('./connections')} Connections
|
||||||
|
* @typedef {{
|
||||||
|
* db?: PPPPPDB;
|
||||||
|
* set?: PPPPPSet;
|
||||||
|
* shse: {
|
||||||
|
* pubkey: string;
|
||||||
|
* }
|
||||||
|
* }} Peer
|
||||||
|
*/
|
||||||
|
|
||||||
class Scheduler {
|
class Scheduler {
|
||||||
constructor() {
|
/** @type {Peer} */
|
||||||
// FIXME: implement
|
#peer
|
||||||
|
/** @type {Connections} */
|
||||||
|
#connections
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {Peer} peer
|
||||||
|
* @param {Connections} connections
|
||||||
|
*/
|
||||||
|
constructor(peer, connections) {
|
||||||
|
this.#peer = peer
|
||||||
|
this.#connections = connections
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {Multiaddr} multiaddr
|
||||||
|
*/
|
||||||
|
async #scheduleWithHub(multiaddr) {
|
||||||
|
/** @type {[Error, null] | [null, any]} */
|
||||||
|
const [err, hubRPC] = await run(this.#connections.connect)(multiaddr)
|
||||||
|
if (err) {
|
||||||
|
debug('Failed to connect to hub at "%s" because %o', multiaddr, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const attendantsStream = awaitable(hubRPC.hub.attendants())
|
||||||
|
const hubPubkey = hubRPC.shse.pubkey
|
||||||
|
for await (const attendants of attendantsStream) {
|
||||||
|
for (const attendant of attendants) {
|
||||||
|
if (attendant !== this.#peer.shse.pubkey) {
|
||||||
|
const tunnelMultiaddr = /** @type {Multiaddr} */ (
|
||||||
|
`/tunnel/${hubPubkey}.${attendant}/shse/${attendant}`
|
||||||
|
)
|
||||||
|
this.#connections.connect(tunnelMultiaddr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#setupHubDiscovery() {
|
||||||
|
/** @type {Array<Multiaddr> | undefined} */
|
||||||
|
const multiaddrs = this.#peer.set?.values('hubs')
|
||||||
|
if (!multiaddrs) return
|
||||||
|
for (const multiaddr of multiaddrs) {
|
||||||
|
this.#scheduleWithHub(multiaddr)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
start() {
|
start() {
|
||||||
// FIXME: implement
|
if (!this.closed) return
|
||||||
|
this.closed = false
|
||||||
|
|
||||||
|
this.#setupHubDiscovery();
|
||||||
}
|
}
|
||||||
|
|
||||||
stop() {
|
stop() {
|
||||||
|
|
|
@ -35,6 +35,7 @@
|
||||||
"on-change-network-strict": "1.0.0",
|
"on-change-network-strict": "1.0.0",
|
||||||
"on-wakeup": "^1.0.1",
|
"on-wakeup": "^1.0.1",
|
||||||
"promisify-tuple": "^1.0.1",
|
"promisify-tuple": "^1.0.1",
|
||||||
|
"pull-awaitable": "1.0.0",
|
||||||
"pull-cat": "~1.1.11",
|
"pull-cat": "~1.1.11",
|
||||||
"pull-notify": "^0.1.2",
|
"pull-notify": "^0.1.2",
|
||||||
"pull-pause": "~0.0.2",
|
"pull-pause": "~0.0.2",
|
||||||
|
@ -50,7 +51,9 @@
|
||||||
"bs58": "^5.0.0",
|
"bs58": "^5.0.0",
|
||||||
"c8": "7",
|
"c8": "7",
|
||||||
"ppppp-caps": "github:staltz/ppppp-caps#93fa810b9a40b78aef4872d4c2a8412cccb52929",
|
"ppppp-caps": "github:staltz/ppppp-caps#93fa810b9a40b78aef4872d4c2a8412cccb52929",
|
||||||
|
"ppppp-db": "github:staltz/ppppp-db#667b33779d98aff12a9b0cd2d7c80469a95cd04e",
|
||||||
"ppppp-keypair": "github:staltz/ppppp-keypair#61ef4420578f450dc2cc7b1efc1c5a691a871c74",
|
"ppppp-keypair": "github:staltz/ppppp-keypair#61ef4420578f450dc2cc7b1efc1c5a691a871c74",
|
||||||
|
"ppppp-set": "github:staltz/ppppp-set#8983ba29f03db95a76b4bd9a55aa4392b350fdbb",
|
||||||
"prettier": "^2.6.2",
|
"prettier": "^2.6.2",
|
||||||
"pretty-quick": "^3.1.3",
|
"pretty-quick": "^3.1.3",
|
||||||
"rimraf": "^4.4.0",
|
"rimraf": "^4.4.0",
|
||||||
|
|
Loading…
Reference in New Issue