mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-11-16 19:36:54 +00:00
The hermes-media://stream resolveLocalFile boundary ran
resolveMediaRequestPath on the path the protocol handler had already
percent-decoded and slash-stripped (parseMediaProtocolTarget), so the
second decode+strip turned every absolute POSIX media path
(/home/.../.hermes/...) into a cwd-relative one. The resolver then
pinned it under the app's cwd and the file ENOENTed into the handler's
silent 404 — inline TTS/audio playback dead with no log line, which is
the Linux symptom in hermes-agent 123823. A second decodeURIComponent
also threw URIError on filenames containing a literal %.
Restore the single decode at the protocol layer: the boundary now only
bridges (resolveMediaStreamFile), matching what 7722761581 intended as
byte-for-byte behavior but broke when it rewired main.ts.
Fixes https://github.com/NousResearch/hermes-agent/issues/123823
38 lines
1.8 KiB
TypeScript
38 lines
1.8 KiB
TypeScript
import { resolveLocalReadPath } from './wsl-path-bridge'
|
|
|
|
// Path preparation shared by the file-read boundaries that hand a backend-
|
|
// reported target to the hardening resolvers. On a Windows host with a WSL
|
|
// backend the target is a WSL/POSIX path (`/home/...`, `/mnt/c/...`) the
|
|
// Windows fs can't open as-is, so each boundary must route the raw path
|
|
// through resolveLocalReadPath (a no-op off Windows / for already-Windows
|
|
// paths) before it reaches the resolver. Kept here — mirroring fs-read-dir —
|
|
// so the wiring is exercised in isolation instead of buried in main.ts.
|
|
|
|
/**
|
|
* hermes-media:// stream handler's `resolveLocalFile` dependency: the protocol
|
|
* handler already percent-decoded the request pathname into `filePath`
|
|
* (`parseMediaProtocolTarget` in media-protocol.ts), so this boundary only
|
|
* bridges. Decoding or stripping leading slashes again would turn an absolute
|
|
* POSIX path (`/home/...`) into a cwd-relative one that ENOENTs into the
|
|
* handler's silent 404, and a second `decodeURIComponent` throws on filenames
|
|
* containing a literal `%`.
|
|
*/
|
|
export function resolveMediaStreamFile(filePath: unknown): string {
|
|
return resolveLocalReadPath(String(filePath ?? ''))
|
|
}
|
|
|
|
/**
|
|
* hermes:readFileDataUrl / hermes:readFileDataUrlForAttach / hermes:readFileText
|
|
* IPC handlers: a renderer-supplied path → a bridged fs path.
|
|
*/
|
|
export function resolveIpcFileReadPath(filePath: unknown): string {
|
|
return resolveLocalReadPath(String(filePath ?? ''))
|
|
}
|
|
|
|
/**
|
|
* previewFileTarget: `file:` URLs pass through untouched, plain targets get `~`
|
|
* expanded, and the result is bridged before it reaches resolveRequestedPathForIpc.
|
|
*/
|
|
export function resolvePreviewTargetPath(rawTarget: string, expandUserPath: (value: string) => string): string {
|
|
return resolveLocalReadPath(/^file:/i.test(rawTarget) ? rawTarget : expandUserPath(rawTarget))
|
|
}
|