CalvinBackup/anonymous_github
1
0
Fork 0
mirror of https://github.com/tdurieux/anonymous_github.git synced 2026-02-13 02:42:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(#199): stop content download when request is canceled and always define contentLength

Browse Source
This commit is contained in:
tdurieux
2023-04-20 23:20:08 +02:00
parent 0a021d6e61
commit 13e5e35d46
6 changed files with 74 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/AnonymizedFile.ts
View File

@@ -5,9 +5,10 @@ import Repository from "./Repository";
import { Tree, TreeElement, TreeFile } from "./types";
import storage from "./storage";
import config from "../config";
import { anonymizePath, anonymizeStream } from "./anonymize-utils";
import { anonymizePath, AnonymizeTransformer } from "./anonymize-utils";
import AnonymousError from "./AnonymousError";
import { handleError } from "./routes/route-utils";
import { tryCatch } from "bullmq";
/**
* Represent a file in a anonymized repository
@@ -177,7 +178,7 @@ export default class AnonymizedFile {
}
async anonymizedContent() {
return (await this.content()).pipe(anonymizeStream(this));
return (await this.content()).pipe(new AnonymizeTransformer(this));
}
get originalCachePath() {
@@ -204,15 +205,32 @@ export default class AnonymizedFile {
if (this.extension()) {
res.contentType(this.extension());
}
if (this.fileSize) {
res.set("Content-Length", this.fileSize.toString());
}
res.header("Accept-Ranges", "none");
return new Promise(async (resolve, reject) => {
try {
(await this.anonymizedContent())
const content = await this.content();
try {
const fileInfo = await storage.fileInfo(this.originalCachePath);
if (fileInfo.size) {
res.header("Content-Length", fileInfo.size.toString());
}
} catch (error) {
// unable to get file size
console.error(error);
}
content
.pipe(new AnonymizeTransformer(this))
.pipe(res)
.on("close", () => resolve())
.on("close", () => {
if (!content.closed && !content.destroyed) {
content.destroy();
}
resolve();
})
.on("error", (error) => {
if (!content.closed && !content.destroyed) {
content.destroy();
}
reject(error);
handleError(error, res);
});