Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 70 additions & 0 deletions apps/desktop/src/electron/DesktopEarlyStartup.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
import { assert, describe, it } from "@effect/vitest";
import { vi } from "vite-plus/test";

import {
type DesktopEarlyStartupApp,
configureDesktopEarlyStartup,
} from "./DesktopEarlyStartup.ts";

function makeApp() {
const appendSwitch = vi.fn();
const exit = vi.fn();
const getVersion = vi.fn(() => "1.2.3");
const app: DesktopEarlyStartupApp = {
commandLine: { appendSwitch },
exit,
getVersion,
};

return { app, appendSwitch, exit, getVersion };
}

describe("configureDesktopEarlyStartup", () => {
it("forces the libsecret password store on Linux", () => {
const { app, appendSwitch } = makeApp();

configureDesktopEarlyStartup({
app,
argv: ["t3code"],
platform: "linux",
writeStdout: vi.fn(),
});

assert.deepStrictEqual(appendSwitch.mock.calls, [["password-store", "gnome-libsecret"]]);
});

it.each(["darwin", "win32"] as const)(
"does not override the password store on %s",
(platform: "darwin" | "win32") => {
const { app, appendSwitch } = makeApp();

configureDesktopEarlyStartup({
app,
argv: ["t3code"],
platform,
writeStdout: vi.fn(),
});

assert.strictEqual(appendSwitch.mock.calls.length, 0);
},
);

it.each(["--version", "-v"] as const)(
"prints the packaged version for %s",
(flag: "--version" | "-v") => {
const { app, exit, getVersion } = makeApp();
const writeStdout = vi.fn();

configureDesktopEarlyStartup({
app,
argv: ["t3code", flag],
platform: "linux",
writeStdout,
});

assert.strictEqual(getVersion.mock.calls.length, 1);
assert.deepStrictEqual(writeStdout.mock.calls, [["1.2.3\n"]]);
assert.deepStrictEqual(exit.mock.calls, [[0]]);
},
);
});
40 changes: 40 additions & 0 deletions apps/desktop/src/electron/DesktopEarlyStartup.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
export interface DesktopEarlyStartupApp {
readonly commandLine: {
readonly appendSwitch: (switchName: string, value?: string) => void;
};
readonly exit: (exitCode?: number) => void;
readonly getVersion: () => string;
}

export interface ConfigureDesktopEarlyStartupOptions {
readonly app: DesktopEarlyStartupApp;
readonly argv: ReadonlyArray<string>;
readonly platform: NodeJS.Platform;
readonly writeStdout: (value: string) => unknown;
}

/**
* Applies command-line behavior that Electron must receive before `app.whenReady()`.
*
* Keep this explicit: Electron's automatic password-store selection is unreliable
* in Linux desktop sessions such as Niri/UWSM, where Secret Service is available
* but Chromium can otherwise select an unusable backend.
*/
export function configureDesktopEarlyStartup({
app,
argv,
platform,
writeStdout,
}: ConfigureDesktopEarlyStartupOptions): void {
if (argv.includes("--version") || argv.includes("-v")) {
try {
writeStdout(`${app.getVersion()}\n`);
} finally {
app.exit(0);
}
}

if (platform === "linux") {
app.commandLine.appendSwitch("password-store", "gnome-libsecret");
}
}
8 changes: 8 additions & 0 deletions apps/desktop/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { resolveRemoteT3CliPackageSpec } from "@t3tools/ssh/command";
import type { RemoteT3RunnerOptions } from "@t3tools/ssh/tunnel";
import serverPackageJson from "../../server/package.json" with { type: "json" };

import { configureDesktopEarlyStartup } from "./electron/DesktopEarlyStartup.ts";
import * as DesktopIpc from "./ipc/DesktopIpc.ts";
import * as ElectronApp from "./electron/ElectronApp.ts";
import * as ElectronDialog from "./electron/ElectronDialog.ts";
Expand Down Expand Up @@ -62,6 +63,13 @@ import * as DesktopWindow from "./window/DesktopWindow.ts";
import * as DesktopWslBackend from "./wsl/DesktopWslBackend.ts";
import * as DesktopWslEnvironment from "./wsl/DesktopWslEnvironment.ts";

configureDesktopEarlyStartup({
app: Electron.app,
argv: process.argv,
platform: Effect.runSync(HostProcessPlatform),
writeStdout: (value) => process.stdout.write(value),
});

const desktopEnvironmentLayer = Layer.unwrap(
Effect.gen(function* () {
const metadata = yield* Effect.service(ElectronApp.ElectronApp).pipe(
Expand Down