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

fix: use pipeline instead of pipe

Browse Source
This commit is contained in:
tdurieux
2021-09-07 17:31:34 +02:00
parent 924990b3cb
commit 1fbd7be949
4 changed files with 42 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/storage/FileSystem.ts
View File

@@ -1,12 +1,14 @@
import { StorageBase, Tree } from "../types";
import config from "../../config";
import * as fs from "fs";
import * as tar from "tar-fs";
import * as path from "path";
import * as express from "express";
import config from "../../config";
import * as stream from "stream";
import * as gunzip from "gunzip-maybe";
import * as archiver from "archiver";
import { promisify } from "util";
export default class FileSystem implements StorageBase {
type = "FileSystem";
@@ -92,20 +94,17 @@ export default class FileSystem implements StorageBase {
/** @override */
async extractTar(p: string, data: stream.Readable): Promise<void> {
return new Promise((resolve, reject) => {
data
.pipe(gunzip())
.pipe(
tar.extract(path.join(config.FOLDER, p), {
map: (header) => {
header.name = header.name.substr(header.name.indexOf("/") + 1);
return header;
},
})
)
.on("finish", resolve)
.on("error", reject);
});
const pipeline = promisify(stream.pipeline);
return pipeline(
data,
gunzip(),
tar.extract(path.join(config.FOLDER, p), {
map: (header) => {
header.name = header.name.substr(header.name.indexOf("/") + 1);
return header;
},
})
);
}
/** @override */

40
src/storage/S3.ts
View File

@@ -2,6 +2,7 @@ import { StorageBase, Tree, TreeFile } from "../types";
import { S3 } from "aws-sdk";
import config from "../../config";
import * as stream from "stream";
import { promisify } from "util";
import { ArchiveStreamToS3 } from "archive-stream-to-s3";
import * as express from "express";
import * as mime from "mime-types";
@@ -101,9 +102,10 @@ export default class S3Storage implements StorageBase {
res.set("Content-Length", headers["content-length"]);
res.set("Content-Type", headers["content-type"]);
}
(
response.httpResponse.createUnbufferedStream() as stream.Readable
).pipe(res);
stream.pipeline(
response.httpResponse.createUnbufferedStream() as stream.Readable,
res
);
});
s.send();
@@ -167,28 +169,22 @@ export default class S3Storage implements StorageBase {
/** @override */
async extractTar(p: string, data: stream.Readable): Promise<void> {
return new Promise<void>((resolve, reject) => {
let toS3: ArchiveStreamToS3;
const pipeline = promisify(stream.pipeline);
(ArchiveStreamToS3 as any).prototype.onEntry = function (
header: any,
stream: any,
next: any
) {
header.name = header.name.substr(header.name.indexOf("/") + 1);
originalArchiveStreamToS3Entry.call(toS3, header, stream, next);
};
let toS3: ArchiveStreamToS3;
toS3 = new ArchiveStreamToS3(config.S3_BUCKET, p, this.client);
(ArchiveStreamToS3 as any).prototype.onEntry = function (
header: any,
stream: any,
next: any
) {
header.name = header.name.substr(header.name.indexOf("/") + 1);
originalArchiveStreamToS3Entry.call(toS3, header, stream, next);
};
toS3.on("finish", (result) => {
resolve(result);
});
toS3.on("error", (e) => {
reject(e);
});
data.pipe(gunzip()).pipe(toS3);
});
toS3 = new ArchiveStreamToS3(config.S3_BUCKET, p, this.client);
return pipeline(data, gunzip(), toS3);
}
/** @override */