From eaf33bc658fbd2612753a48574fed6f9e376a511 Mon Sep 17 00:00:00 2001 From: Michael Wang Date: Sun, 15 Nov 2026 10:15:05 +0000 Subject: [PATCH] fix(cli): hyperframes audio never looks up media on another computer's share (#7826) A film clip whose src resolves to a UNC or device path outside the project's own share is now reported as "network share paths are not analyzed". The clip is never stat'ed, probed, or decoded. Relative and local absolute srcs resolve as before. --- packages/cli/src/audio/analysis/run.ts | 1 + packages/cli/src/audio/analysis/targets.ts | 18 ++- .../src/audio/analysis/targets.win32.test.ts | 140 ++++++++++++++++++ 3 files changed, 154 insertions(+), 5 deletions(-) create mode 100644 packages/cli/src/audio/analysis/targets.win32.test.ts diff --git a/packages/cli/src/audio/analysis/run.ts b/packages/cli/src/audio/analysis/run.ts index c329f39cfb..aa7dca3b0c 100644 --- a/packages/cli/src/audio/analysis/run.ts +++ b/packages/cli/src/audio/analysis/run.ts @@ -99,6 +99,7 @@ const emptyItem = (target: AudioTarget): AudioItem => ({ function unreadable(target: AudioTarget): string | null { if (/^[a-z][a-z\d+.-]*:\/\//i.test(target.file)) return "remote sources are not analyzed"; + if (target.onAnotherNetworkRoot) return "network share paths are not analyzed"; if (!existsSync(target.path)) return "file not found"; return null; } diff --git a/packages/cli/src/audio/analysis/targets.ts b/packages/cli/src/audio/analysis/targets.ts index 11730c0687..1a3bc1c2d5 100644 --- a/packages/cli/src/audio/analysis/targets.ts +++ b/packages/cli/src/audio/analysis/targets.ts @@ -1,5 +1,8 @@ import { dirname, join, resolve } from "node:path"; -import { resolveAuthoredAssetFile } from "@hyperframes/parsers/asset-resolution"; +import { + namesAnotherNetworkRoot, + resolveAuthoredAssetFile, +} from "@hyperframes/parsers/asset-resolution"; import type { ProjectTimeline, TimelineRow } from "../../timeline/describeProject.js"; /** Where a file sits in the film: film time = start + (file time − mediaStart) / playbackRate. */ @@ -20,6 +23,7 @@ export interface AudioTarget { file: string; ref: string | null; kind: "audio" | "video" | "file"; + onAnotherNetworkRoot?: true; placement: Placement | null; /** The part of the file to analyze, in file seconds; the whole file when absent. */ window?: { from: number; seconds: number }; @@ -76,13 +80,17 @@ function targetOf(projectDir: string, row: TimelineRow, query: FilmQuery): Audio const placement = placementOf(row); const from = query.by === "range" ? Math.max(placement.start, query.start) : placement.start; const to = query.by === "range" ? Math.min(placement.end, query.end) : placement.end; + const src = row.src!; + const asWritten = resolve(dirname(join(projectDir, row.file)), src); + const onAnotherNetworkRoot = namesAnotherNetworkRoot(projectDir, asWritten); return { - path: - resolveAuthoredAssetFile(projectDir, row.file, row.src!) ?? - resolve(dirname(join(projectDir, row.file)), row.src!), - file: row.src!, + path: onAnotherNetworkRoot + ? asWritten + : (resolveAuthoredAssetFile(projectDir, row.file, src) ?? asWritten), + file: src, ref: row.ref || null, kind: row.kind as "audio" | "video", + ...(onAnotherNetworkRoot ? { onAnotherNetworkRoot } : {}), placement, window: { from: fileTime(placement, from), diff --git a/packages/cli/src/audio/analysis/targets.win32.test.ts b/packages/cli/src/audio/analysis/targets.win32.test.ts new file mode 100644 index 0000000000..f9cb7b848a --- /dev/null +++ b/packages/cli/src/audio/analysis/targets.win32.test.ts @@ -0,0 +1,140 @@ +import { describe, expect, it, vi } from "vitest"; +import type { ProjectTimeline, TimelineRow } from "../../timeline/describeProject.js"; +import type { FilmQuery } from "./targets.js"; + +// Windows path rules on any host, and a disk and decoder that record every path they are given. +const touched = vi.hoisted(() => [] as string[]); +const present = vi.hoisted(() => new Set()); +vi.mock("node:path", async () => { + const path = await vi.importActual("node:path"); + return { ...path.win32, default: path.win32 }; +}); +vi.mock("node:fs", async () => { + const fs = await vi.importActual("node:fs"); + const existsSync = (path: string) => { + touched.push(path); + return present.has(path); + }; + const statSync = (path: string) => { + touched.push(path); + throw new Error(`no stat in this test: ${path}`); + }; + return { ...fs, existsSync, statSync, default: { ...fs, existsSync, statSync } }; +}); +vi.mock("./decode.js", () => ({ + probeAudio: async (path: string) => { + touched.push(path); + return null; + }, + decodeAudio: async (path: string) => { + touched.push(path); + return null; + }, +})); + +const { filmTargets } = await import("./targets.js"); +const { analyzeTargets } = await import("./run.js"); + +const PROJECT = "C:\\project"; +const SHARES = [ + "\\\\host\\share\\a.wav", + "//host/share/a.wav", + "\\\\?\\UNC\\host\\share\\a.wav", + "/\\host\\share\\a.wav", + "\\\\host\\share\\a.wav?v=2", +]; + +function row(ref: string, src: string, absStart: number): TimelineRow { + return { + warnings: [], + id: ref.slice(1), + ref, + kind: "audio", + label: null, + trackKind: "audio", + absStart, + absEnd: absStart + 2, + start: absStart, + duration: 2, + end: absStart + 2, + file: "index.html", + index: 0, + nested: false, + host: null, + hostRow: null, + children: [], + parentRow: null, + trackIndex: 0, + src, + sourceFile: null, + volume: null, + lanes: [], + playbackRate: null, + audioGroup: null, + role: null, + durationAuthored: true, + durationSource: "authored", + pendingReason: null, + laneError: null, + syncOffsetFrames: null, + mediaStart: 0, + }; +} + +const film = (rows: TimelineRow[]): ProjectTimeline => ({ + duration: 20, + tracks: [{ kind: "audio", rows }], +}); + +const onAShare = (path: string) => /^[\\/]{2}/.test(path); + +describe("hyperframes audio with a src on another computer's share", () => { + const timeline = film(SHARES.map((src, i) => row(`#s${i}`, src, i * 2))); + const queries: FilmQuery[] = [ + { by: "all" }, + { by: "at", t: 5 }, + { by: "range", start: 0, end: 10 }, + ...SHARES.map((_, i): FilmQuery => ({ by: "element", ref: `#s${i}` })), + ]; + + it.each(queries)("reports the clip and never looks it up (%o)", async (query) => { + touched.length = 0; + const targets = filmTargets(PROJECT, timeline, query); + const report = await analyzeTargets(targets, { capabilities: ["moments"] }); + expect(touched.filter(onAShare)).toEqual([]); + expect(report.items.length).toBeGreaterThan(0); + for (const item of report.items) + expect(item.error).toBe("network share paths are not analyzed"); + }); +}); + +describe("hyperframes audio with a local src under Windows rules", () => { + it("resolves a relative src in the project as before", () => { + present.clear(); + present.add("C:\\project\\audio\\a.wav"); + const [target] = filmTargets(PROJECT, film([row("#a", "audio/a.wav", 0)]), { by: "all" }); + expect(target).toMatchObject({ path: "C:\\project\\audio\\a.wav" }); + expect(target).not.toHaveProperty("onAnotherNetworkRoot"); + }); + + it("keeps an absolute src in the project as written and looks it up", async () => { + touched.length = 0; + present.clear(); + const [target] = filmTargets(PROJECT, film([row("#a", "C:\\project\\gone.wav", 0)]), { + by: "all", + }); + expect(target).toMatchObject({ path: "C:\\project\\gone.wav" }); + const report = await analyzeTargets([target!], { capabilities: ["moments"] }); + expect(report.items[0]?.error).toBe("file not found"); + expect(touched).toContain("C:\\project\\gone.wav"); + }); + + it("reads a src on the share the project itself lives on", () => { + const [target] = filmTargets( + "\\\\nas\\films\\project", + film([row("#a", "//NAS/films/voice.wav", 0)]), + { by: "all" }, + ); + expect(target).not.toHaveProperty("onAnotherNetworkRoot"); + }); +});