goodboy
/
tractor
1
0
Fork 2
Code Issues 5 Pull Requests 7 Packages Projects Releases Wiki Activity

Add `uds` to `._multiaddr`, tweak typing

CONT_log_sys_testing
Gud Boi 2026-02-04 09:10:21 -05:00
parent bd4743e176
commit 8548eee0fd
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tractor/_multiaddr.py
View File

@ -38,6 +38,7 @@ prots: bidict[int, str] = {
'tcp': 4, 'tcp': 4,
'udp': 4, 'udp': 4,
'uds': 4,
# TODO: support the next-gen shite Bo # TODO: support the next-gen shite Bo
# 'quic': 4, # 'quic': 4,
@ -51,6 +52,7 @@ prot_params: dict[str, tuple[str]] = {
'tcp': ('port',), 'tcp': ('port',),
'udp': ('port',), 'udp': ('port',),
'uds': ('path',),
# 'quic': ('port',), # 'quic': ('port',),
# 'ssh': ('port',), # 'ssh': ('port',),
@ -75,7 +77,7 @@ def iter_prot_layers(
assert not root # there is a root '/' on LHS assert not root # there is a root '/' on LHS
itokens = iter(tokens) itokens = iter(tokens)
prot: str | None = None prot: str|None = None
params: list[str] = [] params: list[str] = []
for token in itokens: for token in itokens:
# every prot path should start with a known # every prot path should start with a known
@ -98,7 +100,10 @@ def iter_prot_layers(
def parse_maddr( def parse_maddr(
multiaddr: str, multiaddr: str,
) -> dict[str, str | int | dict]: ) -> dict[
str,
str|int|dict,
]:
''' '''
Parse a libp2p style "multiaddress" into its distinct protocol Parse a libp2p style "multiaddress" into its distinct protocol
segments where each segment is of the form: segments where each segment is of the form:
@ -122,14 +127,17 @@ def parse_maddr(
`'/wg/1.1.1.1/51820/<pubkey>'` `'/wg/1.1.1.1/51820/<pubkey>'`
''' '''
layers: dict[str, str | int | dict] = {} layers: dict[str, str|int|dict] = {}
for ( for (
prot_key, prot_key,
params, params,
) in iter_prot_layers(multiaddr): ) in iter_prot_layers(multiaddr):
layer: int = prots[prot_key] # OSI layer used for sorting layer: int = prots[prot_key] # OSI layer used for sorting
ep: dict[str, int | str] = {'layer': layer} ep: dict[str, int|str] = {
'layer': layer,
'proto': prot_key,
}
layers[prot_key] = ep layers[prot_key] = ep
# TODO; validation and resolving of names: # TODO; validation and resolving of names:
@ -139,7 +147,7 @@ def parse_maddr(
# any loaded network.resolv: dict[str, str] # any loaded network.resolv: dict[str, str]
rparams: list = list(reversed(params)) rparams: list = list(reversed(params))
for key in prot_params[prot_key]: for key in prot_params[prot_key]:
val: str | int = rparams.pop() val: str|int = rparams.pop()
# TODO: UGHH, dunno what we should do for validation # TODO: UGHH, dunno what we should do for validation
# here, put it in the params spec somehow? # here, put it in the params spec somehow?