add subscription upgrade plan

apps/dashboard/src/lib/api.test.ts

@@ -184,12 +184,12 @@ describe('dashboard apiFetch', () => {
       credentials: 'include',
     }))
     expect(resolveRealtimeSocketTarget()).toEqual({
-      origin: 'http://localhost:3000',
-      path: '/dashboard/socket.io',
+      origin: 'http://localhost:4000',
+      path: '/socket.io',
     })
   })
 
-  it('routes proxied realtime connections through the dashboard socket path', async () => {
+  it('routes realtime connections to the configured API origin instead of the dashboard proxy path', async () => {
     installBrowser()
     setBrowserHostname('rentaldrivego.ma')
     ;(globalThis.window as any).location.origin = 'https://rentaldrivego.ma'
@@ -198,8 +198,8 @@ describe('dashboard apiFetch', () => {
     const api = await import('./api')
 
     expect(api.resolveRealtimeSocketTarget()).toEqual({
-      origin: 'https://rentaldrivego.ma',
-      path: '/dashboard/socket.io',
+      origin: 'https://api.rentaldrivego.ma',
+      path: '/socket.io',
     })
   })
 

apps/dashboard/src/lib/api.ts

@@ -55,14 +55,29 @@ export function resolveApiOrigin(): string | null {
 export function resolveRealtimeSocketTarget(): { origin: string; path: string } | null {
   if (typeof window === 'undefined') return null
 
-  const apiBase = resolveApiBase()
-  const isDashboardProxy = apiBase === DASHBOARD_PROXY_API_BASE || apiBase.startsWith(`${DASHBOARD_PROXY_API_BASE}/`)
-  const origin = isDashboardProxy ? window.location.origin : resolveApiOrigin()
-  if (!origin) return null
+  const configuredApiBase = process.env.NEXT_PUBLIC_API_URL
+  if (configuredApiBase && !configuredApiBase.startsWith('/')) {
+    try {
+      return {
+        origin: new URL(normalizeApiBase(configuredApiBase)).origin,
+        path: '/socket.io',
+      }
+    } catch {
+      return null
+    }
+  }
+
+  const currentHostname = window.location?.hostname
+  if (currentHostname && isLocalBrowserHost(currentHostname)) {
+    return {
+      origin: 'http://localhost:4000',
+      path: '/socket.io',
+    }
+  }
 
   return {
-    origin,
-    path: isDashboardProxy ? '/dashboard/socket.io' : '/socket.io',
+    origin: resolveApiOrigin() ?? window.location.origin,
+    path: '/socket.io',
   }
 }