qemu: fix qmp disconnection semi properly

this is actually something i need to push to crusttest as well, because
this will affect it as well, though not as badly because it will only break certain buttons

qemu/src/QemuVM.ts

@@ -207,21 +207,26 @@ export class QemuVM extends EventEmitter {
 		if (!this.qmpConnected) {
 			self.qmpInstance = new QmpClient();
 
-			self.qmpInstance.on('close', async () => {
+			let onQmpError = async (err: Error|undefined) => {
 				self.qmpConnected = false;
 
 				// If we aren't stopping, then we do actually need to care QMP disconnected
 				if (self.state != VMState.Stopping) {
+					//if(err !== undefined) // This doesn't show anything useful or maybe I'm just stupid idk
+					//	self.VMLog().Error(`Error: ${err!}`)
 					if (self.qmpFailCount++ < kMaxFailCount) {
-						this.VMLog().Error(`Failed to connect to QMP ${self.qmpFailCount} times`);
+						self.VMLog().Error(`Failed to connect to QMP ${self.qmpFailCount} times.`);
 						await Shared.Sleep(500);
 						await self.ConnectQmp();
 					} else {
-						this.VMLog().Error(`Failed to connect to QMP ${self.qmpFailCount} times, giving up`);
+						self.VMLog().Error(`Reached max retries, giving up.`);
 						await self.Stop();
 					}
 				}
-			});
+			};
+
+			self.qmpInstance.on('close', onQmpError);
+			self.qmpInstance.on('error', onQmpError);
 
 			self.qmpInstance.on('event', async (ev) => {
 				switch (ev.event) {

qemu/src/QmpClient.ts

@@ -22,6 +22,12 @@ export default class QmpClient extends Socket {
 	private commandEntries: QmpCommandEntry[] = [];
 	private lastID = 0;
 
+	constructor() {
+		super();
+
+		this.assignHandlers();
+	}
+
 	private ExecuteSync(command: string, args: any | null, callback: QmpCallback | null) {
 		let cmd: QmpCommandEntry = {
 			callback: callback,
@@ -65,20 +71,11 @@ export default class QmpClient extends Socket {
 	}
 
 	// this can probably be made async
-	private ConnectImpl() {
+	private assignHandlers() {
 		let self = this;
 
-		this.once('connect', () => {
-			this.removeAllListeners('error');
-		});
-
-		this.once('error', (err) => {
-			// just rethrow lol
-			//throw err;
-
-			console.log('you have pants: rules,', err);
-		});
-
+		this.on('connect', () => {
+			// this should be more correct?
 			this.once('data', (data) => {
 				// Handshake QMP with the server.
 				self.qmpHandshakeData = JSON.parse(data.toString('utf8')).QMP;
@@ -116,20 +113,18 @@ export default class QmpClient extends Socket {
 					this.emit('qmp-ready');
 				});
 			});
+		});
 
-		this.once('close', () => {
+		this.on('close', () => {
 			this.end();
-			this.removeAllListeners('data'); // wow. good job bud. cool memory leak
 		});
 	}
 
 	Connect(host: string, port: number) {
 		super.connect(port, host);
-		this.ConnectImpl();
 	}
 
 	ConnectUNIX(path: string) {
 		super.connect(path);
-		this.ConnectImpl();
 	}
 }