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>
66 lines
2.1 KiB
TypeScript
66 lines
2.1 KiB
TypeScript
/**
|
|
* The machine the store is running on, and how a config value depends on it.
|
|
*
|
|
* A native binary only starts on the architecture it was built for, so the release
|
|
* picker has to know: an x86_64 build installs on a Raspberry Pi and then does
|
|
* nothing, which is worse than not offering it at all.
|
|
*/
|
|
export interface HostMachine {
|
|
readonly operatingSystem: string
|
|
readonly architecture: string
|
|
}
|
|
|
|
/**
|
|
* A config value that may differ per machine.
|
|
*
|
|
* A plain value is the same everywhere — that is how a `cartridge` is described,
|
|
* being data for an emulator. Where it differs, the value is a map keyed by host.
|
|
*/
|
|
export type HostSpecific<TValue> = TValue | Readonly<Record<string, TValue>>
|
|
|
|
/**
|
|
* Resolve a host-specific value; the most specific key wins.
|
|
*
|
|
* {"linux-aarch64": …, "aarch64": …, "linux": …, "*": …}
|
|
*
|
|
* With no matching key and no `*` the answer is `null`, and the caller reports the
|
|
* title as unavailable rather than installing something that cannot run.
|
|
*/
|
|
export function resolveForHost<TValue> (
|
|
value: HostSpecific<TValue> | null | undefined,
|
|
host: HostMachine
|
|
): TValue | null {
|
|
if (value === null || value === undefined) return null
|
|
if (!isHostMap(value)) return value
|
|
for (const key of hostKeys(host)) {
|
|
const found = value[key]
|
|
if (found !== undefined) return found
|
|
}
|
|
return null
|
|
}
|
|
|
|
export function hostKeys (host: HostMachine): readonly string[] {
|
|
return [
|
|
`${host.operatingSystem}-${host.architecture}`,
|
|
host.architecture,
|
|
host.operatingSystem,
|
|
'*'
|
|
]
|
|
}
|
|
|
|
export function describeHost (host: HostMachine): string {
|
|
return `${host.operatingSystem}/${host.architecture}`
|
|
}
|
|
|
|
/**
|
|
* A host map, as opposed to a value that happens to be an object.
|
|
*
|
|
* Only plain objects are maps: an array is a value here — `kind` may be a list of
|
|
* asset kinds in order of preference, and that is not keyed by anything.
|
|
*/
|
|
function isHostMap<TValue> (
|
|
value: HostSpecific<TValue>
|
|
): value is Readonly<Record<string, TValue>> {
|
|
return typeof value === 'object' && value !== null && !Array.isArray(value)
|
|
}
|