mr.zeroandClaude Opus 5
06f3f2a3b1
Reading the catalog, choosing the release that fits this machine, unpacking it,
writing the menu entry and remembering what went where all happen in process now.
There is no interpreter to find, no child process, and no JSON-lines protocol
between the two halves — `PythonEngineProcessRunner`, the runtime locator, the two
engine mappers and the version negotiation are all gone, and with them the one
unchecked cast this codebase had (engine stdout to a typed event).
What that buys a person: on Windows and on a fresh Mac the app simply works. It
used to look for `python3`, `python` and `py -3` and draw a link to python.org
where none answered.
What lands on disk is unchanged, deliberately. `config.json` and `state.json` keep
the shell engine's snake_case shape, its `<scope>:<name>` keys and its file modes,
so a machine whose library was installed by the CLI keeps it — verified against the
Python engine on the same catalog: the same 13-title listing with zero field
differences, byte-identical payloads, identical modes and an identical Info.plist,
and a re-sync over a Python-installed home that writes nothing. Remove, prune,
prune-suppression on a named sync and the v1 state migration were each exercised.
Three things worth knowing about the new code:
- the zip reader is ~150 lines over `node:zlib`, because Node has none and this
application has no runtime dependencies. It restores the executable bit from
each entry's external attributes, without which nothing installed can start,
and it refuses zip64, unknown compression and paths that escape the
destination rather than guessing;
- `SUPPORTED_WARP_ENGINE_VERSIONS` names the engine versions this client is
written against, checked against the `WarpEngine-Version` header every
response carries. `selectCatalogDialect` switches over that list exhaustively,
so adding a version fails the build — type checker and linter both — until
somebody says what its catalog reads like. An absent header is read as the
oldest version, which is what an engine before 0.4.0 is;
- refresh and the language picker are icons at the foot of the side menu now,
both named for a tooltip and a screen reader, the picker still a real
`<select>` under its glyph.
The repository is free of Python as well: the Makefile, the CI check and the
release script read package.json and the forge's JSON with Node.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
86 lines
3.7 KiB
TypeScript
86 lines
3.7 KiB
TypeScript
import { spawnSync } from 'node:child_process'
|
|
import path from 'node:path'
|
|
import type { DesktopLayout } from '../../../domain/models/DesktopLayout'
|
|
import { toSafeFileName } from '../../../domain/models/DesktopLayout'
|
|
import type { InstalledRecord } from '../../../domain/models/InstalledRecord'
|
|
import type { SelectedGame } from '../../../domain/models/SelectedGame'
|
|
import type { StoreConfiguration } from '../../../domain/models/StoreConfiguration'
|
|
import type { StoreFileSystem } from '../../files/StoreFileSystem'
|
|
import type { DesktopLayoutResolver } from '../DesktopLayoutResolver'
|
|
import { DesktopEntryWriter } from './DesktopEntryWriter'
|
|
import { MacBundleWriter } from './MacBundleWriter'
|
|
import { WindowsShortcutWriter } from './WindowsShortcutWriter'
|
|
|
|
const REFRESH_TIMEOUT_MS = 30_000
|
|
|
|
/**
|
|
* The menu entry, in whichever form this machine's desktop understands.
|
|
*
|
|
* This is the whole point of a desktop store, and the one place where the three
|
|
* hosts genuinely differ rather than merely differing in paths.
|
|
*/
|
|
export class LauncherWriter {
|
|
private readonly desktopEntries: DesktopEntryWriter
|
|
private readonly macBundles: MacBundleWriter
|
|
private readonly windowsShortcuts: WindowsShortcutWriter
|
|
|
|
public constructor (
|
|
private readonly configuration: StoreConfiguration,
|
|
private readonly layouts: DesktopLayoutResolver,
|
|
files: StoreFileSystem,
|
|
private readonly log: (line: string) => void
|
|
) {
|
|
this.desktopEntries = new DesktopEntryWriter(configuration.store.id, files)
|
|
this.macBundles = new MacBundleWriter(configuration.store.id, files, log)
|
|
this.windowsShortcuts = new WindowsShortcutWriter(files, log)
|
|
}
|
|
|
|
/**
|
|
* The published page of a browser build.
|
|
*
|
|
* The catalog serves these as a directory rather than an archive, so the entry is
|
|
* a link to it — which also means a web title needs the network.
|
|
*/
|
|
public webUrl (game: SelectedGame | InstalledRecord): string {
|
|
const assetPath = game.assetPath.length > 0 ? game.assetPath : `/file/${game.asset}`
|
|
return `${this.configuration.store.baseUrl}/${assetPath.replace(/^\/+|\/+$/g, '')}/`
|
|
}
|
|
|
|
public launcherPath (layout: DesktopLayout, game: SelectedGame | InstalledRecord): string {
|
|
const group = this.layouts.menuGroup(layout)
|
|
if (layout.operatingSystem === 'linux') {
|
|
return path.join(group, `${this.configuration.store.id}-${game.name}.desktop`)
|
|
}
|
|
if (layout.operatingSystem === 'darwin') {
|
|
return path.join(group, `${toSafeFileName(game.title)}.app`)
|
|
}
|
|
return path.join(group, `${toSafeFileName(game.title)}.lnk`)
|
|
}
|
|
|
|
/**
|
|
* Write the menu entry. Returns the path actually written.
|
|
*
|
|
* Not always the path we intended: on Windows a `.lnk` can fall back to a `.cmd`,
|
|
* and the state has to record what really exists or an uninstall would leave it
|
|
* behind.
|
|
*/
|
|
public writeLauncher (layout: DesktopLayout, record: InstalledRecord): string {
|
|
const entryPath = this.launcherPath(layout, record)
|
|
const url = this.webUrl(record)
|
|
if (layout.operatingSystem === 'linux') return this.desktopEntries.write(record, entryPath, url)
|
|
if (layout.operatingSystem === 'darwin') return this.macBundles.write(record, entryPath, url)
|
|
return this.windowsShortcuts.write(record, entryPath, url)
|
|
}
|
|
|
|
/** Ask the desktop to notice the change, where that is a thing we can do. */
|
|
public refreshMenu (layout: DesktopLayout): void {
|
|
if (layout.operatingSystem !== 'linux') return
|
|
try {
|
|
spawnSync('update-desktop-database', [layout.menuDirectory], { timeout: REFRESH_TIMEOUT_MS })
|
|
} catch {
|
|
// Not every Linux has it, and a menu that updates on next login is fine.
|
|
this.log('update-desktop-database is not available — the menu may need a re-login')
|
|
}
|
|
}
|
|
}
|