hermes-admin/hermes-agent
1
0
Fork 0
Code Issues Pull Requests Actions 31 Packages Projects Releases Wiki Activity

fix(e2e): isolate update window from Chromium state

Browse Source
This commit is contained in:
ethernet
2026-09-22 13:03:06 -04:00
parent ee21b2180a
commit 8b9ea624ef
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests-js/scripts/launch-from-spec.test.ts
View File

@@ -13,11 +13,12 @@ test('the update window pins its isolated route before Electron requests the sin
)).toEqual(['--user-data-dir=/isolated/route', '--no-sandbox', '--inspect=0'])
})
test('the update window clones userData without inheriting another Electron singleton', (): void => {
test('the update window carries Hermes connection state without cloning Chromium state', (): void => {
const root = fs.mkdtempSync(path.join(os.tmpdir(), 'update-window-userdata-'))
const userData = path.join(root, 'electron-user-data')
fs.mkdirSync(userData)
fs.writeFileSync(path.join(userData, 'connections.json'), '{"primary":"local"}\n')
fs.writeFileSync(path.join(userData, 'Local State'), 'chromium-owned\n')
for (const name of ['SingletonLock', 'SingletonSocket', 'SingletonCookie']) {
fs.symlinkSync(path.join(root, `${name}-target`), path.join(userData, name))
@@ -37,6 +38,7 @@ test('the update window clones userData without inheriting another Electron sing
expect(captured.HERMES_DESKTOP_USER_DATA_DIR).toBe(userData)
expect(isolated.HERMES_HOME).toBe(captured.HERMES_HOME)
expect(fs.readFileSync(path.join(isolatedUserData, 'connections.json'), 'utf8')).toBe('{"primary":"local"}\n')
expect(fs.existsSync(path.join(isolatedUserData, 'Local State'))).toBe(false)
for (const name of ['SingletonLock', 'SingletonSocket', 'SingletonCookie']) {
expect(() => fs.lstatSync(path.join(isolatedUserData, name))).toThrow()

19
tests/install/e2e-assets/smoke-env.mjs
View File

@@ -53,12 +53,14 @@ export function smokeEnvironment(inherited, home, userData) {
};
}
const SINGLETON_FILES = new Set(['SingletonLock', 'SingletonSocket', 'SingletonCookie']);
const UPDATE_WINDOW_STATE = ['connection.json', 'connections.json'];
/**
* Give the independently driven update window its own Electron instance route.
* The cloned state keeps the real connection and desktop preferences, while
* HERMES_HOME remains shared so the app updates the actual installed runtime.
* Copy only Hermes-owned connection contracts. Cloning Chromium's profile
* carries browser locks and process state from the prior app into a supposedly
* isolated launch. HERMES_HOME remains shared so the app updates the actual
* installed runtime.
*
* @template {Record<string, string>} T
* @param {T & {HERMES_DESKTOP_USER_DATA_DIR: string}} env
@@ -67,13 +69,10 @@ const SINGLETON_FILES = new Set(['SingletonLock', 'SingletonSocket', 'SingletonC
export function isolateUpdateWindowEnvironment(env) {
const source = env.HERMES_DESKTOP_USER_DATA_DIR;
const isolated = fs.mkdtempSync(path.join(path.dirname(source), `${path.basename(source)}-app-update-`));
fs.cpSync(source, isolated, {
recursive: true,
filter: (candidate) => {
const relative = path.relative(source, candidate);
return relative === '' || relative.includes(path.sep) || !SINGLETON_FILES.has(relative);
},
});
for (const filename of UPDATE_WINDOW_STATE) {
const from = path.join(source, filename);
if (fs.existsSync(from)) fs.copyFileSync(from, path.join(isolated, filename));
}
return { ...env, HERMES_DESKTOP_USER_DATA_DIR: isolated };
}