cthrace/collabvm-1.2.ts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Let's try this again.

Browse Source
This commit is contained in:
MDMCK10
2023-04-06 21:59:37 +02:00
parent 3f2c814f1b
commit 432b8204f1
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/QEMUVM.ts
View File

@@ -46,7 +46,7 @@ export default class QEMUVM extends VM {
this.qmpSock = `${Config.vm.qmpSockDir}collab-vm-qmp-${Config.collabvm.node}.sock`;
}
this.vncPort = Config.vm.vncPort;
this.qemuCmd = `${Config.vm.qemuArgs} -no-shutdown -vnc 127.0.0.1:${this.vncPort - 5900} -qmp ${this.qmpType}${this.qmpSock},server`;
this.qemuCmd = `${Config.vm.qemuArgs} -no-shutdown -vnc 127.0.0.1:${this.vncPort - 5900} -qmp ${this.qmpType}${this.qmpSock},server,nowait`;
if (Config.vm.snapshots) this.qemuCmd += " -snapshot"
this.qmpErrorLevel = 0;
this.vncErrorLevel = 0;

23
src/QMPClient.ts
View File

@@ -2,6 +2,7 @@ import EventEmitter from "events";
import { Socket } from "net";
import { Mutex } from "async-mutex";
import log from "./log.js";
import { EOL } from "os";
export default class QMPClient extends EventEmitter {
socketfile : string;
@@ -34,7 +35,9 @@ export default class QMPClient extends EventEmitter {
}
this.connected = true;
this.socket.on('error', () => false); // Disable throwing if QMP errors
this.socket.on('data', (data) => this.onData(data));
this.socket.on('data', (data) => {
data.toString().split(EOL).forEach(instr => this.onData(instr));
});
this.socket.on('close', () => this.onClose());
this.once('connected', () => {res();});
})
@@ -45,12 +48,11 @@ export default class QMPClient extends EventEmitter {
this.socket.destroy();
}
private async onData(data : Buffer) {
let msgraw = data.toString();
private async onData(data : string) {
let msg;
try {
msg = JSON.parse(msgraw);
msg = JSON.parse(data);
} catch {
return;
}
@@ -64,7 +66,7 @@ export default class QMPClient extends EventEmitter {
this.emit('connected');
this.sentConnected = true;
}
if (msg.return !== undefined)
if (msg.return !== undefined && Object.keys(msg.return).length)
this.emit("qmpreturn", msg.return);
else if(msg.event !== undefined) {
switch(msg.event) {
@@ -76,14 +78,13 @@ export default class QMPClient extends EventEmitter {
}
case "RESET":
{
log("INFO", "QEMU reset event occured");
this.resume();
if(msg.data.reason == "host-qmp-system-reset") {
log("INFO", "QEMU reset event occured");
this.resume();
}
break;
};
default: {
this.emit("qmpreturn", '');
break;
}
default: break;
}
}else
// for now just return an empty string.