From daca6819e1f4ea7c45b0d93d5d35823e4bc11430 Mon Sep 17 00:00:00 2001 From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com> Date: Fri, 8 Aug 2025 13:03:20 +0530 Subject: [PATCH 1/2] =?UTF-8?q?fix:cross=E2=80=91region=20realtime=20for?= =?UTF-8?q?=20deployment=20logs=20(NYC);=20align=20with=20Functions=20patt?= =?UTF-8?q?ern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sites/create-site/deploying/+page.svelte | 15 +++++++++------ .../deployment-[deployment]/+page.svelte | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte index 3685e4120..9630dbaa8 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte @@ -7,7 +7,7 @@ import Aside from '../aside.svelte'; import Logs from '../../(components)/logs.svelte'; import { Copy, SvgIcon } from '$lib/components'; - import { sdk } from '$lib/stores/sdk'; + import { realtime } from '$lib/stores/sdk'; import { goto } from '$app/navigation'; import { onMount } from 'svelte'; import { getFrameworkIcon } from '$lib/stores/sites'; @@ -18,9 +18,9 @@ let deployment = $state(data.deployment); onMount(() => { - return sdk.forConsole.client.subscribe( - 'console', - async (response: RealtimeResponseEvent) => { + const unsubscribe = realtime + .forProject(page.params.region, page.params.project) + .subscribe('console', async (response: RealtimeResponseEvent) => { if ( response.events.includes( `sites.${data.site.$id}.deployments.${data.deployment.$id}.update` @@ -33,8 +33,11 @@ ); } } - } - ); + }); + + return () => { + unsubscribe(); + }; }); diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte index 4e5651181..8a9f7af58 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte @@ -1,6 +1,6 @@ From 71eea341f6811984da5be4c96ab91d02c7a47b64 Mon Sep 17 00:00:00 2001 From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com> Date: Fri, 8 Aug 2025 16:03:13 +0530 Subject: [PATCH 2/2] fix: use region-scoped console realtime for deployments; no manual reloads --- .../sites/create-site/deploying/+page.svelte | 37 +++++++++---------- .../deployment-[deployment]/+page.svelte | 29 +++++++-------- 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte index 9630dbaa8..08f4f1047 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/create-site/deploying/+page.svelte @@ -7,7 +7,7 @@ import Aside from '../aside.svelte'; import Logs from '../../(components)/logs.svelte'; import { Copy, SvgIcon } from '$lib/components'; - import { realtime } from '$lib/stores/sdk'; + import { sdk } from '$lib/stores/sdk'; import { goto } from '$app/navigation'; import { onMount } from 'svelte'; import { getFrameworkIcon } from '$lib/stores/sites'; @@ -18,26 +18,25 @@ let deployment = $state(data.deployment); onMount(() => { - const unsubscribe = realtime - .forProject(page.params.region, page.params.project) - .subscribe('console', async (response: RealtimeResponseEvent) => { - if ( - response.events.includes( - `sites.${data.site.$id}.deployments.${data.deployment.$id}.update` - ) - ) { - deployment = response.payload; - if (response.payload.status === 'ready') { - goto( - `${base}/project-${page.params.region}-${page.params.project}/sites/create-site/finish?site=${data.site.$id}` - ); + return sdk + .forConsoleIn(page.params.region) + .client.subscribe( + 'console', + async (response: RealtimeResponseEvent) => { + if ( + response.events.includes( + `sites.${data.site.$id}.deployments.${data.deployment.$id}.update` + ) + ) { + deployment = response.payload; + if (response.payload.status === 'ready') { + goto( + `${base}/project-${page.params.region}-${page.params.project}/sites/create-site/finish?site=${data.site.$id}` + ); + } } } - }); - - return () => { - unsubscribe(); - }; + ); }); diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte index 8a9f7af58..cf798ba1e 100644 --- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte +++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/deployments/deployment-[deployment]/+page.svelte @@ -1,6 +1,6 @@