Skip to content

Commit 5172591

Browse files
authored
Fix socket dial on non-macs (#236)
1 parent 709aeb5 commit 5172591

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

src/viam/module/module.py

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import asyncio
21
from inspect import iscoroutinefunction
32
from threading import Lock
43
from typing import List, Mapping, Optional, Sequence, Tuple
@@ -53,22 +52,20 @@ def __init__(self, address: str, *, log_level: int = logging.DEBUG) -> None:
5352
self._ready = True
5453
self._lock = Lock()
5554

56-
def _connect_to_parent(self):
55+
async def _connect_to_parent(self):
5756
if self.parent is None:
5857
if self._parent_address is None:
5958
raise ValueError("Parent address not found")
60-
self.parent = asyncio.run(
61-
RobotClient.at_address(
62-
self._parent_address,
63-
RobotClient.Options(
64-
dial_options=DialOptions(disable_webrtc=True, allow_insecure_with_creds_downgrade=True),
65-
log_level=self._log_level,
66-
),
67-
)
59+
self.parent = await RobotClient.at_address(
60+
self._parent_address,
61+
RobotClient.Options(
62+
dial_options=DialOptions(disable_webrtc=True, insecure=True),
63+
log_level=self._log_level,
64+
),
6865
)
6966

7067
async def _get_component(self, name: ResourceName) -> ComponentBase:
71-
self._connect_to_parent()
68+
await self._connect_to_parent()
7269
assert self.parent is not None
7370
await self.parent.refresh()
7471
return self.parent.get_component(name)

src/viam/rpc/dial.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,9 @@ async def _dial_direct(address: str, options: Optional[DialOptions] = None) -> C
224224
opts = options if options else DialOptions()
225225
insecure = opts.insecure
226226

227+
if pathlib.Path(address).is_socket():
228+
return Channel(path=address)
229+
227230
host, port = _host_port_from_url(address)
228231
if not port:
229232
port = 80 if insecure else 443

0 commit comments

Comments
 (0)