From d1b6e9e641db80dc16cf6d4d98e929f299ae5c0d Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Mon, 5 Oct 2020 18:58:11 +0100
Subject: [PATCH] Use GzipChildStream again

....spawn-stream appears to be causing issues in the new nimrod data
downloader
---
 package-lock.json                |  5 ---
 package.json                     |  1 -
 src/Helpers/GzipChildProcess.mjs | 61 ++++++++++++++++++++++++++++++++
 src/Subcommands/split/index.mjs  | 16 ++++++---
 4 files changed, 73 insertions(+), 10 deletions(-)
 create mode 100644 src/Helpers/GzipChildProcess.mjs

diff --git a/package-lock.json b/package-lock.json
index 95a0dca..59f4da9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -328,11 +328,6 @@
 			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
 			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
 		},
-		"spawn-stream": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/spawn-stream/-/spawn-stream-1.0.2.tgz",
-			"integrity": "sha1-W9VkENXISo7N6y5jEnEWytkQUMs="
-		},
 		"string-to-arraybuffer": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/string-to-arraybuffer/-/string-to-arraybuffer-1.0.2.tgz",
diff --git a/package.json b/package.json
index 43a2009..2c6e116 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,6 @@
 		"chroma-js": "^2.1.0",
 		"image-encode": "^1.3.0",
 		"nexline": "^1.2.1",
-		"spawn-stream": "^1.0.2",
 		"terrain50": "^1.8.2"
 	},
 	"bin": {
diff --git a/src/Helpers/GzipChildProcess.mjs b/src/Helpers/GzipChildProcess.mjs
new file mode 100644
index 0000000..9ef06ea
--- /dev/null
+++ b/src/Helpers/GzipChildProcess.mjs
@@ -0,0 +1,61 @@
+"use strict";
+
+import EventEmitter from 'events';
+import child_process from 'child_process';
+import { end_safe } from '../../helpers/StreamHelpers.mjs';
+
+/**
+ * Spawns and manages a gzip child process.
+ * @deprecated Use spawn-stream instead
+ * @extends EventEmitter
+ */
+class GzipChildProcess extends EventEmitter {
+	get stdin() { return this.child_process.stdin; }
+	get stdout() { return this.child_process.stdout; }
+	get stderr() { return this.child_process.stderr; }
+	
+	constructor(auto_start = true) {
+		super();
+		
+		this.child_process = null;
+		
+		this.has_exited = false;
+		
+		if(auto_start)
+			this.start();
+	}
+	
+	start() {
+		if(this.child_process != null)
+			throw new Error("Invalid Operation: Can't start the child process, since it's already been started.");
+		
+		this.child_process = child_process.spawn(
+			"gzip", [], {
+				// Pipe stdin + stdout; send error to the parent process
+				stdio: [ "pipe", "pipe", "inherit" ]
+			}
+		);
+		this.child_process.on("exit", () => {
+			this.has_exited = true;
+			this.emit("exit");
+		});
+		// FUTURE: Perhaps just throwing the error would be a better choice?
+		this.child_process.on("error", (error) => {
+			this.emit("error", error);
+		});
+		
+	}
+	
+	/**
+	 * Returns a Promise that resolves when the gzip process exits.
+	 * If the gzip child process has already exited, then it resolves immediately.
+	 * @return	{Promise}
+	 */
+	async end_gracefully() {
+		await end_safe(this.stdin);
+		if(this.has_exited) return;
+		await EventEmitter.once(this, "exit");
+	}
+}
+
+export default GzipChildProcess;
diff --git a/src/Subcommands/split/index.mjs b/src/Subcommands/split/index.mjs
index 15f8ffe..060348d 100644
--- a/src/Subcommands/split/index.mjs
+++ b/src/Subcommands/split/index.mjs
@@ -9,6 +9,9 @@ import SpawnStream from 'spawn-stream';
 import a from '../../Helpers/Ansi.mjs';
 import l from '../../Helpers/Log.mjs';
 
+import GzipChildProcess from '../../Helpers/GzipChildProcess.mjs';
+import { end_safe } from '../../Helpers/StreamHelpers.mjs';
+
 export default async function(settings) {
 	// 1: Parse settings
 	let stream_in = process.stdin;
@@ -39,15 +42,20 @@ export default async function(settings) {
 		
 		// Create the output stream
 		let stream_out = fs.createWriteStream(output_filename),
-			stream_gzip = null;
+			gzip = null;
 		if(!settings.cli.no_gzip) {
-			stream_gzip = SpawnStream("gzip");
-			stream_gzip.pipe(stream_out);
+			gzip = new GzipChildProcess();
+			gzip.stdout.pipe(stream_out);
 		}
 		
+		let init_stream = stream_out;
+		if(gzip !== null) init_stream = gzip.stdin;
 		
 		// Write it to the output
-		await next.serialise(stream_gzip || stream_out, true);
+		await next.serialise(init_stream || stream_out, false);
+		
+		if(gzip !== null) await gzip.end_gracefully();
+		await end_safe(stream_out);
 		
 		// Update the user
 		l.log(`Written ${i+1} objects so far`);