Made changes to work with modified CARTA-2.0 AppImage

apps/cli/executables/pexable/carta_envoy/carta_envoy/connect.py

@@ -147,21 +147,24 @@ class RedisConnect:
         """
         self.logger.info("Determining values for Redis...")
         service_name = generate_random_str()
-        session = f"carta-{service_name}"
+        front_end = f"carta-front-{service_name}"
+        back_end = f"carta-back-{service_name}"
         carta_wrapper = f"carta-wrapper-{service_name}"
         hostname = socket.getfqdn()
         values = {
             # FRONT END
-            # f"traefik/http/routers/{front_end}/rule": f"Host(`{reverse_proxy_host}`) && PathPrefix(`/{front_end_id}/`)",
-            # f"traefik/http/routers/{front_end}/service": front_end,
-            # f"traefik/http/services/{front_end}/loadbalancer/servers/0/url": f"http://{hostname}:{front_end_port}/",
-            # f"traefik/http/routers/{front_end}/middlewares/0": "stripPrefixFE@file",
+            f"traefik/http/routers/{front_end}/rule": f"Host(`{reverse_proxy_host}`) && PathPrefix(`/{session_id}/`)",
+            f"traefik/http/routers/{front_end}/service": front_end,
+            f"traefik/http/services/{front_end}/loadbalancer/servers/0/url": f"http://{hostname}:{session_port}/",
+            f"traefik/http/routers/{front_end}/middlewares/0": "stripPrefixFE@file",
             # BACK END
-            f"traefik/http/routers/{session}/rule": f"Host(`{reverse_proxy_host}`) && PathPrefix(`/{session_id}/`)",
-            f"traefik/http/routers/{session}/service": session,
-            f"traefik/http/services/{session}/loadbalancer/servers/0/url": f"http://{hostname}:{session_port}/",
-            f"traefik/http/routers/{session}/middlewares/0": "upgradeWSHeader@file",
-            f"traefik/http/routers/{session}/middlewares/1": "stripPrefixFE@file",
+            # Both sets of rules are very similar; small difference is with the missing / at end of PathPrefix
+            # This is needed to successfully connect to the web socket because CARTA says so
+            f"traefik/http/routers/{back_end}/rule": f"Host(`{reverse_proxy_host}`) && PathPrefix(`/{session_id}`)",
+            f"traefik/http/routers/{back_end}/service": back_end,
+            f"traefik/http/services/{back_end}/loadbalancer/servers/0/url": f"http://{hostname}:{session_port}/",
+            f"traefik/http/routers/{back_end}/middlewares/0": "upgradeWSHeader@file",
+            f"traefik/http/routers/{back_end}/middlewares/1": "stripPrefixFE@file",
             # WRAPPER
             f"traefik/http/routers/{carta_wrapper}/rule": f"Host(`{reverse_proxy_host}`) && PathPrefix(`/{carta_wrapper_id}/`)",
             f"traefik/http/routers/{carta_wrapper}/service": carta_wrapper,
@@ -177,9 +180,7 @@ class RedisConnect:
         self.logger.info("Checking for duplicate values on server...")
         for key in redis_values:
             if self.conn.get(key):
-                self.logger.warning(
-                    "WARNING: Redis value collision found. Generating new random IDs."
-                )
+                self.logger.warning("WARNING: Redis value collision found. Generating new random IDs.")
                 self.generated_ids = self.generate_ids()
                 new_values = self.get_redis_values(
                     self.settings["reverse_proxy"],
@@ -225,7 +226,9 @@ class ArchiveConnect:
 
         :param url: URL generated to allow user access to this running CARTA instance
         """
-        send_archive_msg_url = f"{self.settings['workflow_url']}/workflows/carta/requests/{self.settings['wf_request_id']}/send-url-to-aat"
+        send_archive_msg_url = (
+            f"{self.settings['workflow_url']}/workflows/carta/requests/{self.settings['wf_request_id']}/send-url-to-aat"
+        )
         payload = {"carta_url": url}
         self.logger.info("Sending REST call to workflow service for AAT messaging.")
         requests.post(send_archive_msg_url, json=payload)