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: [PATCH 1/3] Added guard clause to prevent multiple tunnel creations

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

diff --git a/modules/ngrok.py b/modules/ngrok.py
index 3df2c06bf..90268bf1c 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'

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: [PATCH 2/3] Improved message clarity

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

diff --git a/modules/ngrok.py b/modules/ngrok.py
index 90268bf1c..5302b6a84 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
 

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: [PATCH 3/3] 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(-)

diff --git a/modules/ngrok.py b/modules/ngrok.py
index 5302b6a84..1ad7989bb 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