fix: respect backpressure when resolving Git LFS pointers

This commit is contained in:
tdurieux
2026-09-06 09:18:24 +02:00
parent 9c18526d52
commit 8d2921b406
2 changed files with 59 additions and 49 deletions
+35 -49
View File
@@ -177,57 +177,43 @@ export default class GitHubStream extends GitHubBase {
filePath: string
): stream.Readable {
const out = new stream.PassThrough();
let probe = Buffer.alloc(0);
let decided = false;
const PROBE_BYTES = 150;
const LFS_PREFIX = "version https://git-lfs.github.com/spec/";
const decide = (extra?: Buffer, sourceEnded = false) => {
if (decided) return;
decided = true;
const head = probe.toString(
"utf8",
0,
Math.min(probe.length, LFS_PREFIX.length)
);
if (head === LFS_PREFIX) {
blobStream.destroy();
const lfsStream = this.downloadFileViaRaw(token, filePath);
lfsStream.on("error", (err) => out.destroy(err));
lfsStream.pipe(out);
return;
let active = blobStream;
out.once("close", () => active.destroy());
// The generator only reads upstream when the output has capacity.
const downloadRaw = () => this.downloadFileViaRaw(token, filePath);
async function* resolve() {
let probe = Buffer.alloc(0);
let decided = false;
for await (const chunk of blobStream) {
const bytes = Buffer.from(chunk);
if (decided) {
yield bytes;
continue;
}
probe = Buffer.concat([probe, bytes]);
if (probe.length < 150) continue;
decided = true;
if (probe.toString("utf8", 0, 39) === "version https://git-lfs.github.com/spec/") {
active = downloadRaw();
for await (const raw of active) yield raw;
return;
}
yield probe;
probe = Buffer.alloc(0);
}
out.write(probe);
if (extra && extra.length) out.write(extra);
if (sourceEnded) {
out.end();
return;
if (!decided) {
if (probe.toString("utf8").startsWith("version https://git-lfs.github.com/spec/")) {
active = downloadRaw();
for await (const raw of active) yield raw;
} else if (probe.length) {
yield probe;
}
}
blobStream.on("data", (c) => out.write(c));
blobStream.on("end", () => out.end());
blobStream.on("error", (err) => out.destroy(err));
};
blobStream.on("data", (chunk: Buffer) => {
if (decided) return;
const remaining = PROBE_BYTES - probe.length;
if (chunk.length <= remaining) {
probe = Buffer.concat([probe, chunk]);
if (probe.length >= PROBE_BYTES) decide();
} else {
probe = Buffer.concat([probe, chunk.slice(0, remaining)]);
decide(chunk.slice(remaining));
}
});
blobStream.on("end", () => decide(undefined, true));
blobStream.on("error", (err) => {
// Always propagate — pre-decision this is the only listener; once a
// non-LFS decision is made, the inner branch attaches its own
// listener that will also fire, but we shouldn't rely on that being
// there if the code is later refactored.
decided = true;
out.destroy(err);
});
}
const resolved = stream.Readable.from(resolve());
out.once("close", () => resolved.destroy());
resolved.on("error", (error) => out.destroy(error));
resolved.pipe(out);
return out;
}
+24
View File
@@ -55,6 +55,30 @@ describe("production regressions", function () {
expect(emitted).to.equal(false);
});
it("propagates backpressure and cancellation through the blob probe", async function () {
let generated = 0;
const input = new Readable({ read() { generated++; this.push(Buffer.alloc(65536, 65)); } });
const source = Object.create(GitHubStream.prototype);
const output = source.resolveLfsPointer(input, "token", "file.bin");
await new Promise(resolve => setTimeout(resolve, 20));
expect(generated).to.be.lessThan(10);
expect(output.readableLength).to.be.lessThan(300000);
output.destroy();
await new Promise(resolve => setImmediate(resolve));
expect(input.destroyed).to.equal(true);
});
for (const chunkSize of [1, 200]) {
it(`resolves LFS pointers using ${chunkSize}-byte chunks`, async function () {
const source = Object.create(GitHubStream.prototype);
source.downloadFileViaRaw = () => Readable.from(["complete LFS file"]);
const pointer = "version https://git-lfs.github.com/spec/v1\noid sha256:" + "a".repeat(64) + "\nsize 1024\n";
const chunks = [];
for (let i = 0; i < pointer.length; i += chunkSize) chunks.push(Buffer.from(pointer.slice(i, i + chunkSize)));
expect(await collect(source.resolveLfsPointer(Readable.from(chunks), "token", "file"))).to.equal("complete LFS file");
});
}
for (const status of ["removing", "removed", "expiring", "expired"]) {
it(`ignores delayed downloads for ${status} repositories`, async function () {
stub(db, "connect", async () => {});