fix: set canonical userData path during startup

This commit is contained in:
2026-03-09 23:52:50 -07:00
parent fed60c265d
commit 618727d8e8
5 changed files with 134 additions and 0 deletions

View File

@@ -1,6 +1,7 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import {
configureEarlyAppPaths,
normalizeStartupArgv,
normalizeLaunchMpvTargets,
sanitizeHelpEnv,
@@ -115,3 +116,30 @@ test('shouldDetachBackgroundLaunch only for first background invocation', () =>
);
assert.equal(shouldDetachBackgroundLaunch(['--start'], {}), false);
});
test('configureEarlyAppPaths pins userData to canonical SubMiner config dir', () => {
const calls: string[] = [];
const userDataPath = configureEarlyAppPaths(
{
setName: (name) => {
calls.push(`name:${name}`);
},
setPath: (key, value) => {
calls.push(`path:${key}:${value}`);
},
},
{
platform: 'linux',
homeDir: '/home/tester',
xdgConfigHome: '/tmp/xdg',
existsSync: (candidate) => candidate === '/tmp/xdg/subminer/config.jsonc',
},
);
assert.equal(userDataPath, '/tmp/xdg/SubMiner');
assert.deepEqual(calls, [
'name:SubMiner',
'path:userData:/tmp/xdg/SubMiner',
]);
});

View File

@@ -1,9 +1,26 @@
import fs from 'node:fs';
import os from 'node:os';
import { CliArgs, parseArgs, shouldStartApp } from './cli/args';
import { resolveConfigDir } from './config/path-resolution';
const BACKGROUND_ARG = '--background';
const START_ARG = '--start';
const PASSWORD_STORE_ARG = '--password-store';
const BACKGROUND_CHILD_ENV = 'SUBMINER_BACKGROUND_CHILD';
const APP_NAME = 'SubMiner';
type EarlyAppLike = {
setName: (name: string) => void;
setPath: (name: 'userData', value: string) => void;
};
type EarlyAppPathOptions = {
platform?: NodeJS.Platform;
appDataDir?: string;
xdgConfigHome?: string;
homeDir?: string;
existsSync?: (candidate: string) => boolean;
};
function removeLsfgLayer(env: NodeJS.ProcessEnv): void {
if (typeof env.VK_INSTANCE_LAYERS === 'string' && /lsfg/i.test(env.VK_INSTANCE_LAYERS)) {
@@ -62,6 +79,24 @@ export function normalizeStartupArgv(argv: string[], env: NodeJS.ProcessEnv): st
return argv;
}
export function configureEarlyAppPaths(
app: EarlyAppLike,
options?: EarlyAppPathOptions,
): string {
const userDataPath = resolveConfigDir({
platform: options?.platform ?? process.platform,
appDataDir: options?.appDataDir ?? process.env.APPDATA,
xdgConfigHome: options?.xdgConfigHome ?? process.env.XDG_CONFIG_HOME,
homeDir: options?.homeDir ?? os.homedir(),
existsSync: options?.existsSync ?? fs.existsSync,
});
app.setName(APP_NAME);
app.setPath('userData', userDataPath);
return userDataPath;
}
export function shouldDetachBackgroundLaunch(argv: string[], env: NodeJS.ProcessEnv): boolean {
if (env.ELECTRON_RUN_AS_NODE === '1') return false;
if (!argv.includes(BACKGROUND_ARG)) return false;

View File

@@ -2,6 +2,7 @@ import { spawn } from 'node:child_process';
import { app, dialog } from 'electron';
import { printHelp } from './cli/help';
import {
configureEarlyAppPaths,
normalizeLaunchMpvTargets,
normalizeStartupArgv,
sanitizeStartupEnv,
@@ -31,6 +32,7 @@ function applySanitizedEnv(sanitizedEnv: NodeJS.ProcessEnv): void {
process.argv = normalizeStartupArgv(process.argv, process.env);
applySanitizedEnv(sanitizeStartupEnv(process.env));
configureEarlyAppPaths(app);
if (shouldDetachBackgroundLaunch(process.argv, process.env)) {
const child = spawn(process.execPath, process.argv.slice(1), {