Refactor out a convenient streamToBuffer util method

Author: pimterry

src/interceptors/android/adb-commands.ts

@@ -5,6 +5,7 @@ import { reportError } from '../../error-tracking';
 import { isErrorLike } from '../../util/error';
 import { delay, waitUntil } from '../../util/promise';
 import { getCertificateFingerprint, parseCert } from '../../certificates';
+import { streamToBuffer } from '../../util/stream';
 
 export const ANDROID_TEMP = '/data/local/tmp';
 export const SYSTEM_CA_PATH = '/system/etc/security/cacerts';
@@ -239,14 +240,7 @@ export async function hasCertInstalled(
         const certStream = await adbClient.pull(certPath);
 
         // Wait until it's clear that the read is successful
-        const data = await new Promise<Buffer>((resolve, reject) => {
-            const data: Buffer[] = [];
-            certStream.on('data', (d: Buffer) => data.push(d));
-            certStream.on('end', () => resolve(Buffer.concat(data)));
-
-            certStream.on('error', reject);
-        });
-
+        const data = await streamToBuffer(certStream);
 
         // The device already has an HTTP Toolkit cert. But is it the right one?
         const existingCert = parseCert(data.toString('utf8'));

src/interceptors/docker/docker-proxy.ts

@@ -7,10 +7,11 @@ import * as http from 'http';
 import Dockerode from 'dockerode';
 import getRawBody from 'raw-body';
 import { AbortController } from 'node-abort-controller';
+import { makeDestroyable, DestroyableServer } from 'destroyable-server';
 
 import { chmod, deleteFile, readDir } from '../../util/fs';
 import { rawHeadersToHeaders } from '../../util/http';
-import { makeDestroyable, DestroyableServer } from 'destroyable-server';
+import { streamToBuffer } from '../../util/stream';
 import { reportError } from '../../error-tracking';
 import { addShutdownHandler } from '../../shutdown';
 
@@ -212,12 +213,7 @@ async function createDockerProxy(
                 dockerRes.pipe(getBuildOutputPipeline(await extraDockerCommandCount!)).pipe(res);
             } else if (shouldRemapContainerData) {
                 // We need to remap container data, to hook all docker-compose behaviour:
-                const data = await new Promise<Buffer>((resolve, reject) => {
-                    const dataChunks: Buffer[] = [];
-                    dockerRes.on('data', (d) => dataChunks.push(d));
-                    dockerRes.on('end', () => resolve(Buffer.concat(dataChunks)));
-                    dockerRes.on('error', reject);
-                });
+                const data = await streamToBuffer(dockerRes);
 
                 try {
                     if (isComposeContainerQuery) {

src/util/stream.ts

@@ -0,0 +1,10 @@
+import * as stream from 'stream';
+
+export function streamToBuffer(input: stream.Readable) {
+    return new Promise<Buffer>((resolve, reject) => {
+        const chunks: Uint8Array[] = [];
+        input.on('data', (d) => chunks.push(d));
+        input.on('end', () => resolve(Buffer.concat(chunks)));
+        input.on('error', reject);
+    });
+};