From 9d919d0bb8d6a2d561464201713117e2d0c588ad Mon Sep 17 00:00:00 2001 From: Julius Marminge Date: Thu, 7 May 2026 21:25:33 -0700 Subject: [PATCH] Move desktop server exposure logic into backend (#2591) --- apps/desktop/src/app/DesktopApp.ts | 2 +- apps/desktop/src/backend/DesktopBackendConfiguration.test.ts | 2 +- apps/desktop/src/backend/DesktopBackendConfiguration.ts | 2 +- .../{serverExposure => backend}/DesktopServerExposure.test.ts | 0 .../src/{serverExposure => backend}/DesktopServerExposure.ts | 0 .../tailscaleEndpointProvider.test.ts | 0 .../{serverExposure => backend}/tailscaleEndpointProvider.ts | 0 apps/desktop/src/ipc/methods/serverExposure.ts | 2 +- apps/desktop/src/main.ts | 2 +- apps/desktop/src/window/DesktopWindow.test.ts | 2 +- apps/desktop/src/window/DesktopWindow.ts | 2 +- 11 files changed, 7 insertions(+), 7 deletions(-) rename apps/desktop/src/{serverExposure => backend}/DesktopServerExposure.test.ts (100%) rename apps/desktop/src/{serverExposure => backend}/DesktopServerExposure.ts (100%) rename apps/desktop/src/{serverExposure => backend}/tailscaleEndpointProvider.test.ts (100%) rename apps/desktop/src/{serverExposure => backend}/tailscaleEndpointProvider.ts (100%) diff --git a/apps/desktop/src/app/DesktopApp.ts b/apps/desktop/src/app/DesktopApp.ts index e13ae08d5ff103ce23622ec3a01dd8ac45cb3f77..b9817552969fd57f3e10fe8e6db21d580a09f3f4 100644 --- a/apps/desktop/src/app/DesktopApp.ts +++ b/apps/desktop/src/app/DesktopApp.ts @@ -16,7 +16,7 @@ import * as DesktopBackendManager from "../backend/DesktopBackendManager.ts"; import * as DesktopEnvironment from "./DesktopEnvironment.ts"; import * as DesktopLifecycle from "./DesktopLifecycle.ts"; import * as DesktopObservability from "./DesktopObservability.ts"; -import * as DesktopServerExposure from "../serverExposure/DesktopServerExposure.ts"; +import * as DesktopServerExposure from "../backend/DesktopServerExposure.ts"; import * as DesktopAppSettings from "../settings/DesktopAppSettings.ts"; import * as DesktopShellEnvironment from "../shell/DesktopShellEnvironment.ts"; import * as DesktopState from "./DesktopState.ts"; diff --git a/apps/desktop/src/backend/DesktopBackendConfiguration.test.ts b/apps/desktop/src/backend/DesktopBackendConfiguration.test.ts index de336ffb89c1da999ef279dc5301696718b8bf27..96e56a87c9dacac03d3667c1d0a79acc1883e63e 100644 --- a/apps/desktop/src/backend/DesktopBackendConfiguration.test.ts +++ b/apps/desktop/src/backend/DesktopBackendConfiguration.test.ts @@ -8,7 +8,7 @@ import * as Schema from "effect/Schema"; import * as DesktopEnvironment from "../app/DesktopEnvironment.ts"; import * as DesktopBackendConfiguration from "./DesktopBackendConfiguration.ts"; import * as DesktopConfig from "../app/DesktopConfig.ts"; -import * as DesktopServerExposure from "../serverExposure/DesktopServerExposure.ts"; +import * as DesktopServerExposure from "./DesktopServerExposure.ts"; const PersistedServerObservabilitySettingsDocument = Schema.Struct({ observability: Schema.Struct({ diff --git a/apps/desktop/src/backend/DesktopBackendConfiguration.ts b/apps/desktop/src/backend/DesktopBackendConfiguration.ts index 45103bee92e148b0ac03bb4ed60287a7d8aea53e..42e4ada438b6a5128ed582fcb8fcf4e55b464aef 100644 --- a/apps/desktop/src/backend/DesktopBackendConfiguration.ts +++ b/apps/desktop/src/backend/DesktopBackendConfiguration.ts @@ -10,7 +10,7 @@ import * as Ref from "effect/Ref"; import * as DesktopBackendManager from "./DesktopBackendManager.ts"; import * as DesktopEnvironment from "../app/DesktopEnvironment.ts"; import * as DesktopObservability from "../app/DesktopObservability.ts"; -import * as DesktopServerExposure from "../serverExposure/DesktopServerExposure.ts"; +import * as DesktopServerExposure from "./DesktopServerExposure.ts"; export interface DesktopBackendConfigurationShape { readonly resolve: Effect.Effect; diff --git a/apps/desktop/src/serverExposure/DesktopServerExposure.test.ts b/apps/desktop/src/backend/DesktopServerExposure.test.ts similarity index 100% rename from apps/desktop/src/serverExposure/DesktopServerExposure.test.ts rename to apps/desktop/src/backend/DesktopServerExposure.test.ts diff --git a/apps/desktop/src/serverExposure/DesktopServerExposure.ts b/apps/desktop/src/backend/DesktopServerExposure.ts similarity index 100% rename from apps/desktop/src/serverExposure/DesktopServerExposure.ts rename to apps/desktop/src/backend/DesktopServerExposure.ts diff --git a/apps/desktop/src/serverExposure/tailscaleEndpointProvider.test.ts b/apps/desktop/src/backend/tailscaleEndpointProvider.test.ts similarity index 100% rename from apps/desktop/src/serverExposure/tailscaleEndpointProvider.test.ts rename to apps/desktop/src/backend/tailscaleEndpointProvider.test.ts diff --git a/apps/desktop/src/serverExposure/tailscaleEndpointProvider.ts b/apps/desktop/src/backend/tailscaleEndpointProvider.ts similarity index 100% rename from apps/desktop/src/serverExposure/tailscaleEndpointProvider.ts rename to apps/desktop/src/backend/tailscaleEndpointProvider.ts diff --git a/apps/desktop/src/ipc/methods/serverExposure.ts b/apps/desktop/src/ipc/methods/serverExposure.ts index 2bbb08c3f752892e73cdb00fa47bc2455733435b..cd0f215e1938853b6af695db7d1cb5d5cd26ba5f 100644 --- a/apps/desktop/src/ipc/methods/serverExposure.ts +++ b/apps/desktop/src/ipc/methods/serverExposure.ts @@ -7,7 +7,7 @@ import * as Effect from "effect/Effect"; import * as Schema from "effect/Schema"; import * as DesktopLifecycle from "../../app/DesktopLifecycle.ts"; -import * as DesktopServerExposure from "../../serverExposure/DesktopServerExposure.ts"; +import * as DesktopServerExposure from "../../backend/DesktopServerExposure.ts"; import * as IpcChannels from "../channels.ts"; import { makeIpcMethod } from "../DesktopIpc.ts"; diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts index 576c40ddd884a4c46edb1fa2d1eb5f938e83d8a6..f71ff1fbe67871c878e5d43e9de9eed7b61e3fc4 100644 --- a/apps/desktop/src/main.ts +++ b/apps/desktop/src/main.ts @@ -32,7 +32,7 @@ import * as DesktopBackendManager from "./backend/DesktopBackendManager.ts"; import * as DesktopEnvironment from "./app/DesktopEnvironment.ts"; import * as DesktopLifecycle from "./app/DesktopLifecycle.ts"; import * as DesktopObservability from "./app/DesktopObservability.ts"; -import * as DesktopServerExposure from "./serverExposure/DesktopServerExposure.ts"; +import * as DesktopServerExposure from "./backend/DesktopServerExposure.ts"; import * as DesktopClientSettings from "./settings/DesktopClientSettings.ts"; import * as DesktopSavedEnvironments from "./settings/DesktopSavedEnvironments.ts"; import * as DesktopAppSettings from "./settings/DesktopAppSettings.ts"; diff --git a/apps/desktop/src/window/DesktopWindow.test.ts b/apps/desktop/src/window/DesktopWindow.test.ts index e53a02f539489822e79177cf3153f1007eb21fa9..fbcc60934aa91147b912b29ab63aa165b4cec961 100644 --- a/apps/desktop/src/window/DesktopWindow.test.ts +++ b/apps/desktop/src/window/DesktopWindow.test.ts @@ -16,7 +16,7 @@ import * as ElectronMenu from "../electron/ElectronMenu.ts"; import * as ElectronShell from "../electron/ElectronShell.ts"; import * as ElectronTheme from "../electron/ElectronTheme.ts"; import * as ElectronWindow from "../electron/ElectronWindow.ts"; -import * as DesktopServerExposure from "../serverExposure/DesktopServerExposure.ts"; +import * as DesktopServerExposure from "../backend/DesktopServerExposure.ts"; import * as DesktopWindow from "./DesktopWindow.ts"; const environmentInput = { diff --git a/apps/desktop/src/window/DesktopWindow.ts b/apps/desktop/src/window/DesktopWindow.ts index 2cf69ae8b7c48efbb4a51a1a5dff345b5092912d..8ebd1041c6bc027ee64e33dda66044f247f498bf 100644 --- a/apps/desktop/src/window/DesktopWindow.ts +++ b/apps/desktop/src/window/DesktopWindow.ts @@ -16,7 +16,7 @@ import * as ElectronShell from "../electron/ElectronShell.ts"; import * as ElectronTheme from "../electron/ElectronTheme.ts"; import * as ElectronWindow from "../electron/ElectronWindow.ts"; import * as IpcChannels from "../ipc/channels.ts"; -import * as DesktopServerExposure from "../serverExposure/DesktopServerExposure.ts"; +import * as DesktopServerExposure from "../backend/DesktopServerExposure.ts"; const TITLEBAR_HEIGHT = 40; const TITLEBAR_COLOR = "#01000000"; // #00000000 does not work correctly on Linux -- 2.54.0