From 5ebe3b25044efac959c4d8f208dd17d6f1e5ce8a Mon Sep 17 00:00:00 2001
From: Nathanael Santoso <73165142+nart4hire@users.noreply.github.com>
Date: Tue, 4 Apr 2023 06:50:29 +0000
Subject: Added guard clause to prevent multiple tunnel creations

---
 modules/ngrok.py | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'modules/ngrok.py')

diff --git a/modules/ngrok.py b/modules/ngrok.py
index 3df2c06b..90268bf1 100644
--- a/modules/ngrok.py
+++ b/modules/ngrok.py
@@ -1,6 +1,14 @@
 from pyngrok import ngrok, conf, exception
 
 def connect(token, port, region):
+    # Guard for existing tunnels
+    existing = ngrok.get_tunnels()
+    if existing:
+        public_url = existing[0].public_url
+        print(f'ngrok connected to localhost:{port}! URL: {public_url}\n'
+               'You can use this link after the launch is complete.')
+        return
+
     account = None
     if token is None:
         token = 'None'
-- 
cgit v1.2.1


From 2edf73b38fbea4ce67c38edafea8a8983b9435b5 Mon Sep 17 00:00:00 2001
From: Nathanael Santoso <73165142+nart4hire@users.noreply.github.com>
Date: Tue, 4 Apr 2023 06:57:39 +0000
Subject: Improved message clarity

---
 modules/ngrok.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/ngrok.py')

diff --git a/modules/ngrok.py b/modules/ngrok.py
index 90268bf1..5302b6a8 100644
--- a/modules/ngrok.py
+++ b/modules/ngrok.py
@@ -5,7 +5,7 @@ def connect(token, port, region):
     existing = ngrok.get_tunnels()
     if existing:
         public_url = existing[0].public_url
-        print(f'ngrok connected to localhost:{port}! URL: {public_url}\n'
+        print(f'ngrok has already been connected to localhost:{port}! URL: {public_url}\n'
                'You can use this link after the launch is complete.')
         return
 
-- 
cgit v1.2.1


From 3158d17ccf6adfe974691f46526773df2f4028f5 Mon Sep 17 00:00:00 2001
From: Nathanael Santoso <73165142+nart4hire@users.noreply.github.com>
Date: Tue, 4 Apr 2023 07:41:55 +0000
Subject: fixed an issue with using ngrok for other connections and also ngrok
 not using auth_token

---
 modules/ngrok.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'modules/ngrok.py')

diff --git a/modules/ngrok.py b/modules/ngrok.py
index 5302b6a8..1ad7989b 100644
--- a/modules/ngrok.py
+++ b/modules/ngrok.py
@@ -1,14 +1,6 @@
 from pyngrok import ngrok, conf, exception
 
 def connect(token, port, region):
-    # Guard for existing tunnels
-    existing = ngrok.get_tunnels()
-    if existing:
-        public_url = existing[0].public_url
-        print(f'ngrok has already been connected to localhost:{port}! URL: {public_url}\n'
-               'You can use this link after the launch is complete.')
-        return
-
     account = None
     if token is None:
         token = 'None'
@@ -21,6 +13,18 @@ def connect(token, port, region):
     config = conf.PyngrokConfig(
         auth_token=token, region=region
     )
+    
+    # Guard for existing tunnels
+    existing = ngrok.get_tunnels(pyngrok_config=config)
+    if existing:
+        for established in existing:
+            # Extra configuration in the case that the user is also using ngrok for other tunnels
+            if established.config['addr'][-4:] == str(port):
+                public_url = existing[0].public_url
+                print(f'ngrok has already been connected to localhost:{port}! URL: {public_url}\n'
+                    'You can use this link after the launch is complete.')
+                return
+    
     try:
         if account is None:
             public_url = ngrok.connect(port, pyngrok_config=config, bind_tls=True).public_url
-- 
cgit v1.2.1


From 3ba6c3c83c0983a025c7bddc08bb7f49481b3cbb Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Tue, 9 May 2023 22:17:58 +0300
Subject: Fix up string formatting/concatenation to f-strings where feasible

---
 modules/ngrok.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/ngrok.py')

diff --git a/modules/ngrok.py b/modules/ngrok.py
index 1ad7989b..7a7b4b26 100644
--- a/modules/ngrok.py
+++ b/modules/ngrok.py
@@ -7,8 +7,8 @@ def connect(token, port, region):
     else:
         if ':' in token:
             # token = authtoken:username:password
-            account = token.split(':')[1] + ':' + token.split(':')[-1]
-            token = token.split(':')[0]
+            token, username, password = token.split(':', 2)
+            account = f"{username}:{password}"
 
     config = conf.PyngrokConfig(
         auth_token=token, region=region
-- 
cgit v1.2.1


From 49a55b410b66b7dd9be9335d8a2e3a71e4f8b15c Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Thu, 11 May 2023 18:28:15 +0300
Subject: Autofix Ruff W (not W605) (mostly whitespace)

---
 modules/ngrok.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/ngrok.py')

diff --git a/modules/ngrok.py b/modules/ngrok.py
index 7a7b4b26..67a74e85 100644
--- a/modules/ngrok.py
+++ b/modules/ngrok.py
@@ -13,7 +13,7 @@ def connect(token, port, region):
     config = conf.PyngrokConfig(
         auth_token=token, region=region
     )
-    
+
     # Guard for existing tunnels
     existing = ngrok.get_tunnels(pyngrok_config=config)
     if existing:
@@ -24,7 +24,7 @@ def connect(token, port, region):
                 print(f'ngrok has already been connected to localhost:{port}! URL: {public_url}\n'
                     'You can use this link after the launch is complete.')
                 return
-    
+
     try:
         if account is None:
             public_url = ngrok.connect(port, pyngrok_config=config, bind_tls=True).public_url
-- 
cgit v1.2.1