test

Author: Page-

lib/docker-event-stream.ts

@@ -1,4 +1,3 @@
-import * as es from 'event-stream';
 import JSONStream from 'JSONStream';
 import type Docker from 'dockerode';
 import { Stream } from 'node:stream';
@@ -64,8 +63,8 @@ export const parseEventStream = async (docker: Docker) => {
 		layerMtimes[image.Id] = 0;
 	}
 
-	return es.pipeline(
-		JSONStream.parse(undefined) as any as es.MapStream,
+	return [
+		JSONStream.parse(undefined),
 		new Stream.Transform({
 			objectMode: true,
 			transform(evt: DockerEvent, _encoding, cb) {
@@ -86,17 +85,15 @@ export const parseEventStream = async (docker: Docker) => {
 				}
 			},
 		}),
-	);
-};
-
-const noop = () => {
-	// noop
+	] as const;
 };
 
 export async function dockerMtimeStream(docker: Docker) {
 	const [stream, streamParser] = await Promise.all([
 		docker.getEvents(),
 		parseEventStream(docker),
 	]);
-	return Stream.pipeline(stream, streamParser, noop);
+	return Stream.pipeline(stream, ...streamParser, () => {
+		// noop
+	});
 }

package.json

@@ -15,12 +15,10 @@
   "description": "Automatically cleanup unused images based on various cache replacement algorithms",
   "dependencies": {
     "@types/dockerode": "^3.3.44",
-    "@types/event-stream": "^4.0.5",
     "@types/JSONStream": "npm:@types/jsonstream@^0.8.33",
     "@types/node": "^16.18.126",
     "docker-progress": "^5.3.1",
     "dockerode": "^4.0.9",
-    "event-stream": "^4.0.1",
     "eventemitter3": "^5.0.1",
     "JSONStream": "^1.3.5"
   },

test/docker-event-stream.ts

@@ -13,13 +13,15 @@ describe('parseEventStream', function () {
 
 	it('should return updated mtimes', async () => {
 		const docker = getDocker({});
-		const streamParser = await parseEventStream(docker);
+		const streamParsers = await parseEventStream(docker);
 		const data = await new Promise<LayerMtimes>(function (resolve, reject) {
 			let mtimes: LayerMtimes;
 
 			return fs
 				.createReadStream(__dirname + '/fixtures/docker-events.json')
-				.pipe(streamParser)
+				.pipe(streamParsers[0])
+				.on('error', reject)
+				.pipe(streamParsers[1])
 				.on('error', reject)
 				.pipe(
 					new Stream.Transform({

test/docker-image-tree.ts

@@ -10,12 +10,14 @@ import { getDocker } from '../build/docker';
 
 const getLayerMtimes = async () => {
 	const docker = getDocker({});
-	const streamParser = await parseEventStream(docker);
+	const streamParsers = await parseEventStream(docker);
 	return await new Promise<LayerMtimes>(function (resolve, reject) {
 		let mtimes: LayerMtimes;
 		return fs
 			.createReadStream(__dirname + '/fixtures/docker-events.json')
-			.pipe(streamParser)
+			.pipe(streamParsers[0])
+			.on('error', reject)
+			.pipe(streamParsers[1])
 			.on('error', reject)
 			.pipe(
 				new Stream.Transform({