catch wrong daemon error mapping workaround

nymtech · Jan 22, 2025 · 611b488 · 611b488
1 parent db86a19
commit 611b488
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/nym-vpn-app/src/state/init.ts b/nym-vpn-app/src/state/init.ts
@@ -77,6 +77,20 @@ export async function initFirstBatch(
     onFulfilled: ({ state, error }) => {
       dispatch({ type: 'update-connection-state', state });
       if (error) {
+        // TODO remove this dirty hack once switched to the new tunnel API
+        if (
+          error.key === 'CSDaemonInternal' &&
+          error.data?.reason.includes('SameEntryAndExitGateway')
+        ) {
+          dispatch({
+            type: 'set-error',
+            error: {
+              key: 'CStateGwDirSameEntryAndExitGw',
+              message: 'Cannot connect to the same entry and exit gateway',
+            },
+          });
+          return;
+        }
         dispatch({ type: 'set-error', error });
       }
     },

diff --git a/nym-vpn-app/src/state/useTauriEvents.ts b/nym-vpn-app/src/state/useTauriEvents.ts
@@ -32,6 +32,20 @@ function handleError(dispatch: StateDispatch, error?: BackendError | null) {
     return;
   }
   console.log('received backend error:', error);
+  // TODO remove this dirty hack once switched to the new tunnel API
+  if (
+    error.key === 'CSDaemonInternal' &&
+    error.data?.reason.includes('SameEntryAndExitGateway')
+  ) {
+    dispatch({
+      type: 'set-error',
+      error: {
+        key: 'CStateGwDirSameEntryAndExitGw',
+        message: 'Cannot connect to the same entry and exit gateway',
+      },
+    });
+    return;
+  }
   dispatch({ type: 'set-error', error });
 }