Muckin around with multiaddr unpacking in .cli; need to use actual lib not our stuff! Bp

multiaddrs
Gud Boi 2026-01-30 14:56:40 -05:00
parent 88353ffef8
commit 2ebb1e1019
1 changed files with 42 additions and 11 deletions

View File

@ -61,15 +61,15 @@ def load_trans_eps(
if ( if (
network network
and not maddrs and
not maddrs
): ):
# load network section and (attempt to) connect all endpoints # load network section and (attempt to) connect all endpoints
# which are reachable B) # which are reachable B)
for key, maddrs in network.items(): for key, maddrs in network.items():
match key: match key:
# TODO: resolve table across multiple discov # TODO: resolve table across multiple discov prots Bo
# prots Bo
case 'resolv': case 'resolv':
pass pass
@ -156,7 +156,8 @@ def pikerd(
network: dict = conf.get('network') network: dict = conf.get('network')
if ( if (
network is None network is None
and not maddr and
not maddr
): ):
regaddrs = [( regaddrs = [(
_default_registry_host, _default_registry_host,
@ -168,10 +169,40 @@ def pikerd(
network, network,
maddr, maddr,
) )
match eps:
case {
'pikerd': [
{
'ipv4': {
'layer': 3,
'addr': host,
'proto': l3_proto,
},
'tcp': {
'layer': 4,
'port': int(port),
'proto': l4_proto,
},
},
# | {
# 'uds': {
# 'layer': 4,
# 'port': int(port),
# },
# },
],
}:
assert l3_proto == 'ipv4'
assert l4_proto == 'tcp'
# breakpoint()
# XXX, for now always setup a localhost TCP registry addr.
for layers in eps['pikerd']: for layers in eps['pikerd']:
host: str = layers['ipv4']['addr']
port: int = layers['tcp']['port']
regaddrs.append(( regaddrs.append((
layers['ipv4']['addr'], host,
layers['tcp']['port'], port,
)) ))
from .. import service from .. import service
@ -183,8 +214,8 @@ def pikerd(
registry_addrs=regaddrs, registry_addrs=regaddrs,
loglevel=loglevel, loglevel=loglevel,
debug_mode=pdb, debug_mode=pdb,
# enable_transports=['uds'], enable_transports=[l4_proto],
enable_transports=['tcp'], # enable_transports=['tcp'],
) as service_mngr, ) as service_mngr,
): ):
assert service_mngr assert service_mngr