diff options
| author | papuSpartan <30642826+papuSpartan@users.noreply.github.com> | 2022-12-10 08:02:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-10 08:02:39 +0000 |
| commit | 6387043fd2c3311d66690ff27d7da0e030b29cd8 (patch) | |
| tree | 075559ce3e52511cdd459da2b4cc33360d6eb258 /modules/ngrok.py | |
| parent | 00ebc26c4e2962a31e067539d89cd695d999539a (diff) | |
| parent | 1d01404c5615debfca24f7fbe429ddd2f5b11eb9 (diff) | |
| download | stable-diffusion-webui-gfx803-6387043fd2c3311d66690ff27d7da0e030b29cd8.tar.gz stable-diffusion-webui-gfx803-6387043fd2c3311d66690ff27d7da0e030b29cd8.tar.bz2 stable-diffusion-webui-gfx803-6387043fd2c3311d66690ff27d7da0e030b29cd8.zip | |
Merge branch 'AUTOMATIC1111:master' into master
Diffstat (limited to 'modules/ngrok.py')
| -rw-r--r-- | modules/ngrok.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/modules/ngrok.py b/modules/ngrok.py index 5c5f349a..64c9a3c2 100644 --- a/modules/ngrok.py +++ b/modules/ngrok.py @@ -1,14 +1,23 @@ from pyngrok import ngrok, conf, exception - def connect(token, port, region): + account = None if token == None: token = 'None' + else: + if ':' in token: + # token = authtoken:username:password + account = token.split(':')[1] + ':' + token.split(':')[-1] + token = token.split(':')[0] + config = conf.PyngrokConfig( auth_token=token, region=region ) try: - public_url = ngrok.connect(port, pyngrok_config=config).public_url + if account == None: + public_url = ngrok.connect(port, pyngrok_config=config, bind_tls=True).public_url + else: + public_url = ngrok.connect(port, pyngrok_config=config, bind_tls=True, auth=account).public_url except exception.PyngrokNgrokError: print(f'Invalid ngrok authtoken, ngrok connection aborted.\n' f'Your token: {token}, get the right one on https://dashboard.ngrok.com/get-started/your-authtoken') |