diff --git a/packages/parsers/src/assetResolution.ts b/packages/parsers/src/assetResolution.ts index cc51c65a03..0be3767a53 100644 --- a/packages/parsers/src/assetResolution.ts +++ b/packages/parsers/src/assetResolution.ts @@ -235,7 +235,9 @@ export function resolveProjectRelativeSrc( const cleanSrc = fileUrlAsPath(cleanAssetUrl(src)); // A leading slash is an origin-root URL served from the project root, unless the absolute path exists. - if (isAbsolute(cleanSrc) && existsSync(cleanSrc)) return cleanSrc; + if (isAbsolute(cleanSrc) && !namesAnotherNetworkRoot(baseDir, cleanSrc) && existsSync(cleanSrc)) { + return cleanSrc; + } const candidates = new Set(); for (const variant of decodeUrlPathVariants(cleanSrc)) { diff --git a/packages/parsers/src/assetResolution.win32.test.ts b/packages/parsers/src/assetResolution.win32.test.ts index a00fd7dd7b..0b6c23d3cd 100644 --- a/packages/parsers/src/assetResolution.win32.test.ts +++ b/packages/parsers/src/assetResolution.win32.test.ts @@ -15,6 +15,12 @@ vi.mock("node:fs", async () => { }; return { ...fs, existsSync, default: { ...fs, existsSync } }; }); +// file: URLs read as Windows reads them: file://host/share/x is \\host\share\x. +vi.mock("node:url", async () => { + const url = await vi.importActual("node:url"); + const fileURLToPath = (href: string | URL) => url.fileURLToPath(href, { windows: true }); + return { ...url, fileURLToPath, default: { ...url, fileURLToPath } }; +}); const { localAbsoluteAssetFile, @@ -22,6 +28,7 @@ const { resolveAuthoredAssetFile, resolveCompositionSrc, resolveLocalAssetCandidates, + resolveProjectRelativeSrc, srcOnAnotherNetworkRoot, } = await import("./assetResolution.js"); const { resolve } = await import("node:path"); @@ -167,3 +174,42 @@ describe("srcOnAnotherNetworkRoot under Windows rules", () => { expect(srcOnAnotherNetworkRoot("\\\\nas\\films\\project", "//NAS/films/voice.wav")).toBe(false); }); }); + +describe("resolveProjectRelativeSrc under Windows rules", () => { + const COMPILED = "C:\\project\\.hyperframes\\compiled"; + const onAShare = (path: string) => /^[\\/]{2}/.test(path); + + it.each([ + ["\\\\attacker.example\\share\\x.mp4", "\\\\attacker.example\\share\\x.mp4"], + ["//attacker.example/share/x.mp4", "//attacker.example/share/x.mp4"], + ["/\\attacker.example\\share\\x.mp4", "/\\attacker.example\\share\\x.mp4"], + ["file://attacker.example/share/x.mp4", "\\\\attacker.example\\share\\x.mp4"], + ["\\\\.\\pipe\\x", "\\\\.\\pipe\\x"], + ])("never looks at another computer's share for %s, even when it answers", (src, share) => { + present.clear(); + present.add(share); + touched.length = 0; + const path = resolveProjectRelativeSrc(src, PROJECT, COMPILED); + expect(touched.filter(onAShare)).toEqual([]); + expect(onAShare(path)).toBe(false); + }); + + it("finds a file on the share the project itself lives on", () => { + present.clear(); + present.add("//NAS/films/shared/clip.mp4"); + expect( + resolveProjectRelativeSrc("//NAS/films/shared/clip.mp4", "\\\\nas\\films\\project"), + ).toBe("//NAS/films/shared/clip.mp4"); + }); + + it("still finds a local absolute file", () => { + present.clear(); + present.add("D:\\media\\clip.mp4"); + expect(resolveProjectRelativeSrc("D:\\media\\clip.mp4", PROJECT, COMPILED)).toBe( + "D:\\media\\clip.mp4", + ); + expect(resolveProjectRelativeSrc("file:///D:/media/clip.mp4", PROJECT)).toBe( + "D:\\media\\clip.mp4", + ); + }); +});