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

remove connect/view gating (for now)

Browse Source
This commit is contained in:
modeco80
2024-07-11 20:49:49 -04:00
parent ddf4d97511
commit e28bb3a9d7
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cvmts/src/CollabVMServer.ts
View File

@@ -106,7 +106,7 @@ export default class CollabVMServer {
this.indefiniteTurn = null; this.indefiniteTurn = null;
this.ModPerms = Utilities.MakeModPerms(this.Config.collabvm.moderatorPermissions); this.ModPerms = Utilities.MakeModPerms(this.Config.collabvm.moderatorPermissions);
// No size initially, since the // No size initially, since there usually won't be a display connected at all during initalization
this.OnDisplayResized({ this.OnDisplayResized({
width: 0, width: 0,
height: 0 height: 0
@@ -114,12 +114,14 @@ export default class CollabVMServer {
this.VM = vm; this.VM = vm;
// hack but whatever (TODO: less rickity) // this probably should be made general at some point,
// and the VM interface allowed to return a nullable display
// but i cba
let self = this; let self = this;
if (config.vm.type == 'qemu') { if (config.vm.type == 'qemu') {
(vm as QemuVM).on('statechange', (newState: VMState) => { (vm as QemuVM).on('statechange', (newState: VMState) => {
if (newState == VMState.Started) { if (newState == VMState.Started) {
self.logger.Info("VM started"); self.logger.Info('VM started');
// well aware this sucks but whatever // well aware this sucks but whatever
self.VM.GetDisplay().on('resize', (size: Size) => self.OnDisplayResized(size)); self.VM.GetDisplay().on('resize', (size: Size) => self.OnDisplayResized(size));
self.VM.GetDisplay().on('rect', (rect: Rect) => self.OnDisplayRectangle(rect)); self.VM.GetDisplay().on('rect', (rect: Rect) => self.OnDisplayRectangle(rect));
@@ -256,12 +258,6 @@ export default class CollabVMServer {
return; return;
} }
// Don't allow connecting if the VM hasn't started
if (this.VM.GetState() != VMState.Started) {
client.sendMsg(cvm.guacEncode('connect', '0'));
return;
}
client.connectedToNode = true; client.connectedToNode = true;
client.sendMsg(cvm.guacEncode('connect', '1', '1', this.VM.SnapshotsSupported() ? '1' : '0', '0')); client.sendMsg(cvm.guacEncode('connect', '1', '1', this.VM.SnapshotsSupported() ? '1' : '0', '0'));
if (this.ChatHistory.size !== 0) client.sendMsg(this.getChatHistoryMsg()); if (this.ChatHistory.size !== 0) client.sendMsg(this.getChatHistoryMsg());
@@ -284,12 +280,6 @@ export default class CollabVMServer {
return; return;
} }
// similar rationale to 'connect'
if (this.VM.GetState() != VMState.Started) {
client.sendMsg(cvm.guacEncode('connect', '0'));
return;
}
switch (msgArr[2]) { switch (msgArr[2]) {
case '0': case '0':
client.viewMode = 0; client.viewMode = 0;
@@ -865,6 +855,8 @@ export default class CollabVMServer {
private async SendFullScreenWithSize(client: User) { private async SendFullScreenWithSize(client: User) {
let display = this.VM.GetDisplay(); let display = this.VM.GetDisplay();
if (display == null) return;
let displaySize = display.Size(); let displaySize = display.Size();
let encoded = await this.MakeRectData({ let encoded = await this.MakeRectData({
@@ -893,11 +885,11 @@ export default class CollabVMServer {
private async MakeRectData(rect: Rect) { private async MakeRectData(rect: Rect) {
let display = this.VM.GetDisplay(); let display = this.VM.GetDisplay();
let displaySize = display.Size();
// TODO: actually throw an error here // TODO: actually throw an error here
if (displaySize.width == 0 && displaySize.height == 0) return Buffer.from('no'); if (display == null) return Buffer.from('no');
let displaySize = display.Size();
let encoded = await JPEGEncoder.Encode(display.Buffer(), displaySize, rect); let encoded = await JPEGEncoder.Encode(display.Buffer(), displaySize, rect);
return encoded; return encoded;