| author |  Julius Marminge <julius0216@outlook.com> 2026-06-19 21:17:56-07:00 |
| committer |  GitHub <noreply@github.com> 2026-06-19 21:17:56-07:00 |
| log | 93fd9721086d4325794830a29a7df0592d120683 |
| tree | a3cc79870cd7682171dcf0a46b2f25f2eb16dd0d |
| parent | df1540f3ac8fd70877a83e91bd0be182ebf5022c |
| signature | Signed by PGP key B5690EEEBB952194 |
[codex] Refactor desktop window and update Effect services (#3202)
Co-authored-by: codex <codex@users.noreply.github.com>4 files changed, 50 insertions(+), 52 deletions(-)
apps
desktop
apps/desktop/src/updates/DesktopUpdates.ts+30-29
| ... | @@ -7,7 +7,6 @@ import type { | ... | @@ -7,7 +7,6 @@ import type { |
| 7 | } from "@t3tools/contracts"; | 7 | } from "@t3tools/contracts"; |
| 8 | import * as Cause from "effect/Cause"; | 8 | import * as Cause from "effect/Cause"; |
| 9 | import * as Context from "effect/Context"; | 9 | import * as Context from "effect/Context"; |
| 10 | import * as Data from "effect/Data"; | ||
| 11 | import * as DateTime from "effect/DateTime"; | 10 | import * as DateTime from "effect/DateTime"; |
| 12 | import * as Duration from "effect/Duration"; | 11 | import * as Duration from "effect/Duration"; |
| 13 | import * as Effect from "effect/Effect"; | 12 | import * as Effect from "effect/Effect"; |
| ... | @@ -60,23 +59,26 @@ const decodeDownloadProgressInfo = Schema.decodeUnknownEffect(DownloadProgressIn | ... | @@ -60,23 +59,26 @@ const decodeDownloadProgressInfo = Schema.decodeUnknownEffect(DownloadProgressIn |
| 60 | 59 | ||
| 61 | const currentIsoTimestamp = DateTime.now.pipe(Effect.map(DateTime.formatIso)); | 60 | const currentIsoTimestamp = DateTime.now.pipe(Effect.map(DateTime.formatIso)); |
| 62 | 61 | ||
| 63 | export class DesktopUpdateActionInProgressError extends Data.TaggedError( | 62 | export class DesktopUpdateActionInProgressError extends Schema.TaggedErrorClass<DesktopUpdateActionInProgressError>()( |
| 64 | "DesktopUpdateActionInProgressError", | 63 | "DesktopUpdateActionInProgressError", |
| 65 | )<{ | 64 | { |
| 66 | readonly action: "check" | "download" | "install"; | 65 | action: Schema.Literals(["check", "download", "install"]), |
| 67 | }> { | 66 | }, |
| 68 | override get message() { | 67 | ) { |
| 68 | override get message(): string { | ||
| 69 | return `Cannot change update tracks while an update ${this.action} action is in progress.`; | 69 | return `Cannot change update tracks while an update ${this.action} action is in progress.`; |
| 70 | } | 70 | } |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | export class DesktopUpdatePersistenceError extends Data.TaggedError( | 73 | export class DesktopUpdatePersistenceError extends Schema.TaggedErrorClass<DesktopUpdatePersistenceError>()( |
| 74 | "DesktopUpdatePersistenceError", | 74 | "DesktopUpdatePersistenceError", |
| 75 | )<{ | 75 | { |
| 76 | readonly cause: DesktopAppSettings.DesktopSettingsWriteError; | 76 | cause: Schema.Defect(), |
| 77 | }> { | 77 | }, |
| 78 | override get message() { | 78 | ) { |
| 79 | return "Failed to persist desktop update settings."; | 79 | override get message(): string { |
| 80 | const detail = this.cause instanceof Error ? this.cause.message : String(this.cause); | ||
| 81 | return `Failed to persist desktop update settings: ${detail}`; | ||
| 80 | } | 82 | } |
| 81 | } | 83 | } |
| 82 | 84 | ||
| ... | @@ -86,22 +88,21 @@ export type DesktopUpdateSetChannelError = | ... | @@ -86,22 +88,21 @@ export type DesktopUpdateSetChannelError = |
| 86 | | DesktopUpdateActionInProgressError | 88 | | DesktopUpdateActionInProgressError |
| 87 | | DesktopUpdatePersistenceError; | 89 | | DesktopUpdatePersistenceError; |
| 88 | 90 | ||
| 89 | export interface DesktopUpdatesShape { | 91 | export class DesktopUpdates extends Context.Service< |
| 90 | readonly getState: Effect.Effect<DesktopUpdateState>; | 92 | DesktopUpdates, |
| 91 | readonly emitState: Effect.Effect<void>; | 93 | { |
| 92 | readonly disabledReason: Effect.Effect<Option.Option<string>>; | 94 | readonly getState: Effect.Effect<DesktopUpdateState>; |
| 93 | readonly configure: Effect.Effect<void, DesktopUpdateConfigureError, Scope.Scope>; | 95 | readonly emitState: Effect.Effect<void>; |
| 94 | readonly setChannel: ( | 96 | readonly disabledReason: Effect.Effect<Option.Option<string>>; |
| 95 | channel: DesktopUpdateChannel, | 97 | readonly configure: Effect.Effect<void, DesktopUpdateConfigureError, Scope.Scope>; |
| 96 | ) => Effect.Effect<DesktopUpdateState, DesktopUpdateSetChannelError>; | 98 | readonly setChannel: ( |
| 97 | readonly check: (reason: string) => Effect.Effect<DesktopUpdateCheckResult>; | 99 | channel: DesktopUpdateChannel, |
| 98 | readonly download: Effect.Effect<DesktopUpdateActionResult>; | 100 | ) => Effect.Effect<DesktopUpdateState, DesktopUpdateSetChannelError>; |
| 99 | readonly install: Effect.Effect<DesktopUpdateActionResult>; | 101 | readonly check: (reason: string) => Effect.Effect<DesktopUpdateCheckResult>; |
| 100 | } | 102 | readonly download: Effect.Effect<DesktopUpdateActionResult>; |
| 101 | 103 | readonly install: Effect.Effect<DesktopUpdateActionResult>; | |
| 102 | export class DesktopUpdates extends Context.Service<DesktopUpdates, DesktopUpdatesShape>()( | 104 | } |
| 103 | "@t3tools/desktop/updates/DesktopUpdates", | 105 | >()("@t3tools/desktop/updates/DesktopUpdates") {} |
| 104 | ) {} | ||
| 105 | 106 | ||
| 106 | const { | 107 | const { |
| 107 | logInfo: logUpdaterInfo, | 108 | logInfo: logUpdaterInfo, |
| ... | @@ -185,7 +186,7 @@ function isArm64HostRunningIntelBuild(runtimeInfo: DesktopRuntimeInfo): boolean | ... | @@ -185,7 +186,7 @@ function isArm64HostRunningIntelBuild(runtimeInfo: DesktopRuntimeInfo): boolean |
| 185 | return runtimeInfo.hostArch === "arm64" && runtimeInfo.appArch === "x64"; | 186 | return runtimeInfo.hostArch === "arm64" && runtimeInfo.appArch === "x64"; |
| 186 | } | 187 | } |
| 187 | 188 | ||
| 188 | const make = Effect.gen(function* () { | 189 | export const make = Effect.gen(function* () { |
| 189 | const config = yield* DesktopConfig.DesktopConfig; | 190 | const config = yield* DesktopConfig.DesktopConfig; |
| 190 | const backendManager = yield* DesktopBackendManager.DesktopBackendManager; | 191 | const backendManager = yield* DesktopBackendManager.DesktopBackendManager; |
| 191 | const desktopState = yield* DesktopState.DesktopState; | 192 | const desktopState = yield* DesktopState.DesktopState; |
apps/desktop/src/window/DesktopApplicationMenu.test.ts+2-2
| ... | @@ -64,7 +64,7 @@ const desktopUpdatesLayer = Layer.succeed(DesktopUpdates.DesktopUpdates, { | ... | @@ -64,7 +64,7 @@ const desktopUpdatesLayer = Layer.succeed(DesktopUpdates.DesktopUpdates, { |
| 64 | check: () => Effect.die("unexpected check"), | 64 | check: () => Effect.die("unexpected check"), |
| 65 | download: Effect.die("unexpected download"), | 65 | download: Effect.die("unexpected download"), |
| 66 | install: Effect.die("unexpected install"), | 66 | install: Effect.die("unexpected install"), |
| 67 | } satisfies DesktopUpdates.DesktopUpdatesShape); | 67 | } satisfies DesktopUpdates.DesktopUpdates["Service"]); |
| 68 | 68 | ||
| 69 | const makeDesktopWindowLayer = (selectedAction: Deferred.Deferred<string>) => | 69 | const makeDesktopWindowLayer = (selectedAction: Deferred.Deferred<string>) => |
| 70 | Layer.succeed(DesktopWindow.DesktopWindow, { | 70 | Layer.succeed(DesktopWindow.DesktopWindow, { |
| ... | @@ -76,7 +76,7 @@ const makeDesktopWindowLayer = (selectedAction: Deferred.Deferred<string>) => | ... | @@ -76,7 +76,7 @@ const makeDesktopWindowLayer = (selectedAction: Deferred.Deferred<string>) => |
| 76 | handleBackendReady: Effect.void, | 76 | handleBackendReady: Effect.void, |
| 77 | dispatchMenuAction: (action) => Deferred.succeed(selectedAction, action).pipe(Effect.asVoid), | 77 | dispatchMenuAction: (action) => Deferred.succeed(selectedAction, action).pipe(Effect.asVoid), |
| 78 | syncAppearance: Effect.void, | 78 | syncAppearance: Effect.void, |
| 79 | } satisfies DesktopWindow.DesktopWindowShape); | 79 | } satisfies DesktopWindow.DesktopWindow["Service"]); |
| 80 | 80 | ||
| 81 | const makeElectronMenuLayer = ( | 81 | const makeElectronMenuLayer = ( |
| 82 | applicationMenuTemplate: Deferred.Deferred<readonly Electron.MenuItemConstructorOptions[]>, | 82 | applicationMenuTemplate: Deferred.Deferred<readonly Electron.MenuItemConstructorOptions[]>, |
apps/desktop/src/window/DesktopApplicationMenu.ts+4-6
| ... | @@ -14,13 +14,11 @@ import * as DesktopEnvironment from "../app/DesktopEnvironment.ts"; | ... | @@ -14,13 +14,11 @@ import * as DesktopEnvironment from "../app/DesktopEnvironment.ts"; |
| 14 | import * as DesktopUpdates from "../updates/DesktopUpdates.ts"; | 14 | import * as DesktopUpdates from "../updates/DesktopUpdates.ts"; |
| 15 | import * as DesktopWindow from "./DesktopWindow.ts"; | 15 | import * as DesktopWindow from "./DesktopWindow.ts"; |
| 16 | 16 | ||
| 17 | export interface DesktopApplicationMenuShape { | ||
| 18 | readonly configure: Effect.Effect<void>; | ||
| 19 | } | ||
| 20 | |||
| 21 | export class DesktopApplicationMenu extends Context.Service< | 17 | export class DesktopApplicationMenu extends Context.Service< |
| 22 | DesktopApplicationMenu, | 18 | DesktopApplicationMenu, |
| 23 | DesktopApplicationMenuShape | 19 | { |
| 20 | readonly configure: Effect.Effect<void>; | ||
| 21 | } | ||
| 24 | >()("@t3tools/desktop/window/DesktopApplicationMenu") {} | 22 | >()("@t3tools/desktop/window/DesktopApplicationMenu") {} |
| 25 | 23 | ||
| 26 | type DesktopApplicationMenuRuntimeServices = | 24 | type DesktopApplicationMenuRuntimeServices = |
| ... | @@ -94,7 +92,7 @@ const handleCheckForUpdatesMenuClick: Effect.Effect< | ... | @@ -94,7 +92,7 @@ const handleCheckForUpdatesMenuClick: Effect.Effect< |
| 94 | yield* checkForUpdatesFromMenu; | 92 | yield* checkForUpdatesFromMenu; |
| 95 | }).pipe(Effect.withSpan("desktop.menu.handleCheckForUpdatesClick")); | 93 | }).pipe(Effect.withSpan("desktop.menu.handleCheckForUpdatesClick")); |
| 96 | 94 | ||
| 97 | const make = Effect.gen(function* () { | 95 | export const make = Effect.gen(function* () { |
| 98 | const electronApp = yield* ElectronApp.ElectronApp; | 96 | const electronApp = yield* ElectronApp.ElectronApp; |
| 99 | const electronMenu = yield* ElectronMenu.ElectronMenu; | 97 | const electronMenu = yield* ElectronMenu.ElectronMenu; |
| 100 | const environment = yield* DesktopEnvironment.DesktopEnvironment; | 98 | const environment = yield* DesktopEnvironment.DesktopEnvironment; |
apps/desktop/src/window/DesktopWindow.ts+14-15
| ... | @@ -42,20 +42,19 @@ export type DesktopWindowError = | ... | @@ -42,20 +42,19 @@ export type DesktopWindowError = |
| 42 | | ElectronWindow.ElectronWindowCreateError | 42 | | ElectronWindow.ElectronWindowCreateError |
| 43 | | PreviewManager.PreviewManagerError; | 43 | | PreviewManager.PreviewManagerError; |
| 44 | 44 | ||
| 45 | export interface DesktopWindowShape { | 45 | export class DesktopWindow extends Context.Service< |
| 46 | readonly createMain: Effect.Effect<Electron.BrowserWindow, DesktopWindowError>; | 46 | DesktopWindow, |
| 47 | readonly ensureMain: Effect.Effect<Electron.BrowserWindow, DesktopWindowError>; | 47 | { |
| 48 | readonly revealOrCreateMain: Effect.Effect<Electron.BrowserWindow, DesktopWindowError>; | 48 | readonly createMain: Effect.Effect<Electron.BrowserWindow, DesktopWindowError>; |
| 49 | readonly activate: Effect.Effect<void, DesktopWindowError>; | 49 | readonly ensureMain: Effect.Effect<Electron.BrowserWindow, DesktopWindowError>; |
| 50 | readonly createMainIfBackendReady: Effect.Effect<void, DesktopWindowError>; | 50 | readonly revealOrCreateMain: Effect.Effect<Electron.BrowserWindow, DesktopWindowError>; |
| 51 | readonly handleBackendReady: Effect.Effect<void, DesktopWindowError>; | 51 | readonly activate: Effect.Effect<void, DesktopWindowError>; |
| 52 | readonly dispatchMenuAction: (action: string) => Effect.Effect<void, DesktopWindowError>; | 52 | readonly createMainIfBackendReady: Effect.Effect<void, DesktopWindowError>; |
| 53 | readonly syncAppearance: Effect.Effect<void>; | 53 | readonly handleBackendReady: Effect.Effect<void, DesktopWindowError>; |
| 54 | } | 54 | readonly dispatchMenuAction: (action: string) => Effect.Effect<void, DesktopWindowError>; |
| 55 | 55 | readonly syncAppearance: Effect.Effect<void>; | |
| 56 | export class DesktopWindow extends Context.Service<DesktopWindow, DesktopWindowShape>()( | 56 | } |
| 57 | "@t3tools/desktop/window/DesktopWindow", | 57 | >()("@t3tools/desktop/window/DesktopWindow") {} |
| 58 | ) {} | ||
| 59 | 58 | ||
| 60 | const { logInfo: logWindowInfo, logWarning: logWindowWarning } = | 59 | const { logInfo: logWindowInfo, logWarning: logWindowWarning } = |
| 61 | DesktopObservability.makeComponentLogger("desktop-window"); | 60 | DesktopObservability.makeComponentLogger("desktop-window"); |
| ... | @@ -143,7 +142,7 @@ function bindFirstRevealTrigger( | ... | @@ -143,7 +142,7 @@ function bindFirstRevealTrigger( |
| 143 | } | 142 | } |
| 144 | } | 143 | } |
| 145 | 144 | ||
| 146 | const make = Effect.gen(function* () { | 145 | export const make = Effect.gen(function* () { |
| 147 | const environment = yield* DesktopEnvironment.DesktopEnvironment; | 146 | const environment = yield* DesktopEnvironment.DesktopEnvironment; |
| 148 | const assets = yield* DesktopAssets.DesktopAssets; | 147 | const assets = yield* DesktopAssets.DesktopAssets; |
| 149 | const electronMenu = yield* ElectronMenu.ElectronMenu; | 148 | const electronMenu = yield* ElectronMenu.ElectronMenu; |