From 01d825ba28ebb63aecf7c1feb0c7f2275036a749 Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 21 Jul 2022 16:31:02 +0200 Subject: [PATCH] chore: finish piping and stuff and making it lovely Signed-off-by: blam --- .../backend-common/src/reading/tree/ZipArchiveResponse.test.ts | 1 + packages/backend-common/src/reading/tree/ZipArchiveResponse.ts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts b/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts index c67dcf75d7..f1915cf99b 100644 --- a/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts +++ b/packages/backend-common/src/reading/tree/ZipArchiveResponse.test.ts @@ -59,6 +59,7 @@ describe('ZipArchiveResponse', () => { content: expect.any(Function), }, ]); + const contents = await Promise.all(files.map(f => f.content())); expect(contents.map(c => c.toString('utf8').trim())).toEqual([ 'site_name: Test', diff --git a/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts b/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts index 8126d1fcdc..b25f6ad24e 100644 --- a/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts +++ b/packages/backend-common/src/reading/tree/ZipArchiveResponse.ts @@ -190,8 +190,9 @@ export class ZipArchiveResponse implements ReadTreeResponse { } return new Promise(async (resolve, reject) => { const file = fs.createWriteStream(platformPath.join(dir, entryPath)); - file.on('error', reject); file.on('finish', resolve); + + content.on('error', reject); content.pipe(file); }); });