Skip to content

Commit 304aa0e

Browse files
committed
handle new pyngrok connect output
1 parent bc490de commit 304aa0e

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"numpy >= 1.14.0" if sys.version_info >= (3, 0) else "numpy >= 1.14.0, < 1.17",
2424
"tornado >= 4.0.0" if sys.version_info >= (3, 0) else "tornado >= 4.0.0, < 6.0",
2525
"pyzmq >= 17.0.0",
26-
"pyngrok >= 4.1.6"
26+
"pyngrok >= 4.1.6" if sys.version_info >= (3, 0) else "pyngrok >= 4.1.6, < 5.0.0"
2727
],
2828
zip_safe=False,
2929
include_package_data=True

src/meshcat/servers/zmqserver.py

+9-2
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,16 @@ def f(port):
218218
if sys.version_info.major >= 3:
219219
kwargs['start_new_session'] = True
220220
config = pyngrok.conf.PyngrokConfig(**kwargs)
221-
self.web_url = pyngrok.ngrok.connect(self.fileserver_port, "http", pyngrok_config=config) + "/static/"
222-
print("\n") # ensure any pyngrok output is properly terminated.
221+
self.web_url = pyngrok.ngrok.connect(self.fileserver_port, "http", pyngrok_config=config)
222+
223+
# pyngrok >= 5.0.0 returns an NgrokTunnel object instead of the string.
224+
if sys.version_info.major < 3:
225+
self.web_url = self.web_url.decode("utf-8")
226+
elif not isinstance(self.web_url, str):
227+
self.web_url = self.web_url.public_url
228+
self.web_url += "/static/"
223229

230+
print("\n") # ensure any pyngrok output is properly terminated.
224231
def cleanup():
225232
pyngrok.ngrok.kill()
226233

0 commit comments

Comments
 (0)