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

prettier reformat for merge (and remove jpeg-turbo Again)

Browse Source
This commit is contained in:
modeco80
2024-06-22 21:26:49 -04:00
parent b0829d5bcf
commit 09d41617ed
16 changed files with 278 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cvmts/src/AuthManager.ts
View File

@@ -26,13 +26,11 @@ export default class AuthManager {
}); });
// Make sure the fetch returned okay // Make sure the fetch returned okay
if(!response.ok) if (!response.ok) throw new Error(`Failed to query quth server: ${response.statusText}`);
throw new Error(`Failed to query quth server: ${response.statusText}`)
let json = (await response.json()) as JoinResponse; let json = (await response.json()) as JoinResponse;
if (!json.success) if (!json.success) throw new Error(json.error);
throw new Error(json.error);
return json; return json;
} }

14
cvmts/src/CollabVMServer.ts
View File

@@ -23,8 +23,6 @@ const kCVMTSAssetsRoot = path.resolve(__dirname, '../../assets');
const kRestartTimeout = 5000; const kRestartTimeout = 5000;
type ChatHistory = { type ChatHistory = {
user: string; user: string;
msg: string; msg: string;
@@ -115,14 +113,14 @@ export default class CollabVMServer {
this.VM = vm; this.VM = vm;
// hack but whatever (TODO: less rickity) // hack but whatever (TODO: less rickity)
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.Stopped) { if (newState == VMState.Stopped) {
this.logger.Info("stopped ?"); this.logger.Info('stopped ?');
setTimeout(async () => { setTimeout(async () => {
this.logger.Info("restarting VM"); this.logger.Info('restarting VM');
await this.VM.Start(); await this.VM.Start();
}, kRestartTimeout) }, kRestartTimeout);
} }
}); });
} }
@@ -642,7 +640,7 @@ export default class CollabVMServer {
} }
} catch (err) { } catch (err) {
// No // No
this.logger.Error(`User ${user?.IP.address} ${user?.username ? `with username ${user?.username}` : ''} sent broken Guacamole: ${(err as Error)}`); this.logger.Error(`User ${user?.IP.address} ${user?.username ? `with username ${user?.username}` : ''} sent broken Guacamole: ${err as Error}`);
user?.kick(); user?.kick();
} }
} }

6
cvmts/src/IConfig.ts
View File

@@ -1,4 +1,4 @@
import VNCVMDef from "./VNCVM/VNCVMDef"; import VNCVMDef from './VNCVM/VNCVMDef';
export default interface IConfig { export default interface IConfig {
http: { http: {
@@ -13,7 +13,7 @@ export default interface IConfig {
enabled: boolean; enabled: boolean;
host: string; host: string;
port: number; port: number;
} };
auth: { auth: {
enabled: boolean; enabled: boolean;
apiEndpoint: string; apiEndpoint: string;
@@ -26,7 +26,7 @@ export default interface IConfig {
}; };
}; };
vm: { vm: {
type: "qemu" | "vncvm"; type: 'qemu' | 'vncvm';
}; };
qemu: { qemu: {
qemuArgs: string; qemuArgs: string;

12
cvmts/src/NetworkClient.ts
View File

@@ -1,8 +1,8 @@
export default interface NetworkClient { export default interface NetworkClient {
getIP() : string; getIP(): string;
send(msg: string) : Promise<void>; send(msg: string): Promise<void>;
close() : void; close(): void;
on(event: string, listener: (...args: any[]) => void) : void; on(event: string, listener: (...args: any[]) => void): void;
off(event: string, listener: (...args: any[]) => void) : void; off(event: string, listener: (...args: any[]) => void): void;
isOpen() : boolean; isOpen(): boolean;
} }

8
cvmts/src/NetworkServer.ts
View File

@@ -1,6 +1,6 @@
export default interface NetworkServer { export default interface NetworkServer {
start() : void; start(): void;
stop() : void; stop(): void;
on(event: string, listener: (...args: any[]) => void) : void; on(event: string, listener: (...args: any[]) => void): void;
off(event: string, listener: (...args: any[]) => void) : void; off(event: string, listener: (...args: any[]) => void): void;
} }

8
cvmts/src/TCP/TCPClient.ts
View File

@@ -1,6 +1,6 @@
import EventEmitter from "events"; import EventEmitter from 'events';
import NetworkClient from "../NetworkClient.js"; import NetworkClient from '../NetworkClient.js';
import { Socket } from "net"; import { Socket } from 'net';
export default class TCPClient extends EventEmitter implements NetworkClient { export default class TCPClient extends EventEmitter implements NetworkClient {
private socket: Socket; private socket: Socket;
@@ -12,7 +12,7 @@ export default class TCPClient extends EventEmitter implements NetworkClient {
this.cache = ''; this.cache = '';
this.socket.on('end', () => { this.socket.on('end', () => {
this.emit('disconnect'); this.emit('disconnect');
}) });
this.socket.on('data', (data) => { this.socket.on('data', (data) => {
var msg = data.toString('utf-8'); var msg = data.toString('utf-8');
if (msg[msg.length - 1] === '\n') msg = msg.slice(0, -1); if (msg[msg.length - 1] === '\n') msg = msg.slice(0, -1);

22
cvmts/src/TCP/TCPServer.ts
View File

@@ -1,11 +1,11 @@
import EventEmitter from "events"; import EventEmitter from 'events';
import NetworkServer from "../NetworkServer.js"; import NetworkServer from '../NetworkServer.js';
import { Server, Socket } from "net"; import { Server, Socket } from 'net';
import IConfig from "../IConfig.js"; import IConfig from '../IConfig.js';
import { Logger } from "@cvmts/shared"; import { Logger } from '@cvmts/shared';
import TCPClient from "./TCPClient.js"; import TCPClient from './TCPClient.js';
import { IPDataManager } from "../IPData.js"; import { IPDataManager } from '../IPData.js';
import { User } from "../User.js"; import { User } from '../User.js';
export default class TCPServer extends EventEmitter implements NetworkServer { export default class TCPServer extends EventEmitter implements NetworkServer {
listener: Server; listener: Server;
@@ -15,11 +15,11 @@ export default class TCPServer extends EventEmitter implements NetworkServer {
constructor(config: IConfig) { constructor(config: IConfig) {
super(); super();
this.logger = new Logger("CVMTS.TCPServer"); this.logger = new Logger('CVMTS.TCPServer');
this.Config = config; this.Config = config;
this.listener = new Server(); this.listener = new Server();
this.clients = []; this.clients = [];
this.listener.on('connection', socket => this.onConnection(socket)); this.listener.on('connection', (socket) => this.onConnection(socket));
} }
private onConnection(socket: Socket) { private onConnection(socket: Socket) {
@@ -32,7 +32,7 @@ export default class TCPServer extends EventEmitter implements NetworkServer {
start(): void { start(): void {
this.listener.listen(this.Config.tcp.port, this.Config.tcp.host, () => { this.listener.listen(this.Config.tcp.port, this.Config.tcp.host, () => {
this.logger.Info(`TCP server listening on ${this.Config.tcp.host}:${this.Config.tcp.port}`); this.logger.Info(`TCP server listening on ${this.Config.tcp.host}:${this.Config.tcp.port}`);
}) });
} }
stop(): void { stop(): void {
this.listener.close(); this.listener.close();

2
cvmts/src/VM.ts
View File

@@ -1,4 +1,4 @@
import VMDisplay from "./VMDisplay.js"; import VMDisplay from './VMDisplay.js';
export default interface VM { export default interface VM {
Start(): Promise<void>; Start(): Promise<void>;

4
cvmts/src/VMDisplay.ts
View File

@@ -1,5 +1,5 @@
import { Size } from "@cvmts/shared"; import { Size } from '@cvmts/shared';
import EventEmitter from "node:events"; import EventEmitter from 'node:events';
export default interface VMDisplay extends EventEmitter { export default interface VMDisplay extends EventEmitter {
Connect(): void; Connect(): void;

36
cvmts/src/VNCVM/VNCVM.ts
View File

@@ -1,26 +1,23 @@
import EventEmitter from "events"; import EventEmitter from 'events';
import VNCVMDef from "./VNCVMDef"; import VNCVMDef from './VNCVMDef';
import VM from "../VM"; import VM from '../VM';
import VMDisplay from "../VMDisplay"; import VMDisplay from '../VMDisplay';
import { Clamp, Logger, Rect, Size, Sleep } from "@cvmts/shared"; import { Clamp, Logger, Rect, Size, Sleep } from '@cvmts/shared';
import { VncClient } from '@computernewb/nodejs-rfb'; import { VncClient } from '@computernewb/nodejs-rfb';
import { BatchRects } from "@cvmts/qemu"; import { BatchRects } from '@cvmts/qemu';
import { execaCommand } from "execa"; import { execaCommand } from 'execa';
export default class VNCVM extends EventEmitter implements VM, VMDisplay { export default class VNCVM extends EventEmitter implements VM, VMDisplay {
def : VNCVMDef; def: VNCVMDef;
logger: Logger; logger: Logger;
private displayVnc = new VncClient({ private displayVnc = new VncClient({
debug: false, debug: false,
fps: 60, fps: 60,
encodings: [ encodings: [VncClient.consts.encodings.raw, VncClient.consts.encodings.pseudoDesktopSize]
VncClient.consts.encodings.raw,
VncClient.consts.encodings.pseudoDesktopSize
]
}); });
private vncShouldReconnect: boolean = false; private vncShouldReconnect: boolean = false;
constructor(def : VNCVMDef) { constructor(def: VNCVMDef) {
super(); super();
this.def = def; this.def = def;
this.logger = new Logger(`CVMTS.VNCVM/${this.def.vncHost}:${this.def.vncPort}`); this.logger = new Logger(`CVMTS.VNCVM/${this.def.vncHost}:${this.def.vncPort}`);
@@ -79,9 +76,8 @@ export default class VNCVM extends EventEmitter implements VM, VMDisplay {
}); });
} }
async Reset(): Promise<void> { async Reset(): Promise<void> {
if (this.def.restoreCmd) await execaCommand(this.def.restoreCmd, {shell: true}); if (this.def.restoreCmd) await execaCommand(this.def.restoreCmd, { shell: true });
else { else {
await this.Stop(); await this.Stop();
await Sleep(1000); await Sleep(1000);
@@ -100,29 +96,29 @@ export default class VNCVM extends EventEmitter implements VM, VMDisplay {
this.displayVnc.connect({ this.displayVnc.connect({
host: this.def.vncHost, host: this.def.vncHost,
port: this.def.vncPort, port: this.def.vncPort,
path: null, path: null
}); });
} }
async Start(): Promise<void> { async Start(): Promise<void> {
this.logger.Info('Connecting'); this.logger.Info('Connecting');
if (this.def.startCmd) await execaCommand(this.def.startCmd, {shell: true}); if (this.def.startCmd) await execaCommand(this.def.startCmd, { shell: true });
this.Connect(); this.Connect();
} }
async Stop(): Promise<void> { async Stop(): Promise<void> {
this.logger.Info('Disconnecting'); this.logger.Info('Disconnecting');
this.Disconnect(); this.Disconnect();
if (this.def.stopCmd) await execaCommand(this.def.stopCmd, {shell: true}); if (this.def.stopCmd) await execaCommand(this.def.stopCmd, { shell: true });
} }
async Reboot(): Promise<void> { async Reboot(): Promise<void> {
if (this.def.rebootCmd) await execaCommand(this.def.rebootCmd, {shell: true}); if (this.def.rebootCmd) await execaCommand(this.def.rebootCmd, { shell: true });
} }
async MonitorCommand(command: string): Promise<any> { async MonitorCommand(command: string): Promise<any> {
// TODO: This can maybe run a specified command? // TODO: This can maybe run a specified command?
return "This VM does not support monitor commands."; return 'This VM does not support monitor commands.';
} }
GetDisplay(): VMDisplay { GetDisplay(): VMDisplay {

12
cvmts/src/VNCVM/VNCVMDef.ts
View File

@@ -1,8 +1,8 @@
export default interface VNCVMDef { export default interface VNCVMDef {
vncHost : string; vncHost: string;
vncPort : number; vncPort: number;
startCmd : string | null; startCmd: string | null;
stopCmd : string | null; stopCmd: string | null;
rebootCmd : string | null; rebootCmd: string | null;
restoreCmd : string | null; restoreCmd: string | null;
} }

18
cvmts/src/WebSocket/WSClient.ts
View File

@@ -1,7 +1,7 @@
import { WebSocket } from "ws"; import { WebSocket } from 'ws';
import NetworkClient from "../NetworkClient.js"; import NetworkClient from '../NetworkClient.js';
import EventEmitter from "events"; import EventEmitter from 'events';
import { Logger } from "@cvmts/shared"; import { Logger } from '@cvmts/shared';
export default class WSClient extends EventEmitter implements NetworkClient { export default class WSClient extends EventEmitter implements NetworkClient {
socket: WebSocket; socket: WebSocket;
@@ -18,7 +18,7 @@ export default class WSClient extends EventEmitter implements NetworkClient {
return; return;
} }
this.emit('msg', buf.toString("utf-8")); this.emit('msg', buf.toString('utf-8'));
}); });
this.socket.on('close', () => { this.socket.on('close', () => {
@@ -34,9 +34,8 @@ export default class WSClient extends EventEmitter implements NetworkClient {
return this.ip; return this.ip;
} }
send(msg: string): Promise<void> { send(msg: string): Promise<void> {
return new Promise((res,rej) => { return new Promise((res, rej) => {
if(!this.isOpen()) if (!this.isOpen()) res();
res();
this.socket.send(msg, (err) => { this.socket.send(msg, (err) => {
if (err) { if (err) {
@@ -49,7 +48,7 @@ export default class WSClient extends EventEmitter implements NetworkClient {
} }
close(): void { close(): void {
if(this.isOpen()) { if (this.isOpen()) {
// While this seems counterintutive, do note that the WebSocket protocol // While this seems counterintutive, do note that the WebSocket protocol
// *sends* a data frame whilist closing a connection. Therefore, if the other end // *sends* a data frame whilist closing a connection. Therefore, if the other end
// has forcibly hung up (closed) their connection, the best way to handle that // has forcibly hung up (closed) their connection, the best way to handle that
@@ -58,5 +57,4 @@ export default class WSClient extends EventEmitter implements NetworkClient {
this.socket.close(); this.socket.close();
} }
} }
} }

6
cvmts/src/WebSocket/WSServer.ts
View File

@@ -17,11 +17,11 @@ export default class WSServer extends EventEmitter implements NetworkServer {
private Config: IConfig; private Config: IConfig;
private logger: Logger; private logger: Logger;
constructor(config : IConfig) { constructor(config: IConfig) {
super(); super();
this.Config = config; this.Config = config;
this.clients = []; this.clients = [];
this.logger = new Logger("CVMTS.WSServer"); this.logger = new Logger('CVMTS.WSServer');
this.httpServer = http.createServer(); this.httpServer = http.createServer();
this.wsServer = new WebSocketServer({ noServer: true }); this.wsServer = new WebSocketServer({ noServer: true });
this.httpServer.on('upgrade', (req: http.IncomingMessage, socket: internal.Duplex, head: Buffer) => this.httpOnUpgrade(req, socket, head)); this.httpServer.on('upgrade', (req: http.IncomingMessage, socket: internal.Duplex, head: Buffer) => this.httpOnUpgrade(req, socket, head));
@@ -121,7 +121,7 @@ export default class WSServer extends EventEmitter implements NetworkServer {
let ipdata = IPDataManager.GetIPDataMaybe(ip); let ipdata = IPDataManager.GetIPDataMaybe(ip);
if(ipdata != null) { if (ipdata != null) {
let connections = ipdata.refCount; let connections = ipdata.refCount;
if (connections + 1 > this.Config.collabvm.maxConnections) { if (connections + 1 > this.Config.collabvm.maxConnections) {
socket.write('HTTP/1.1 429 Too Many Requests\n\n429 Too Many Requests'); socket.write('HTTP/1.1 429 Too Many Requests\n\n429 Too Many Requests');

6
cvmts/src/index.ts
View File

@@ -34,7 +34,7 @@ try {
} }
let exiting = false; let exiting = false;
let VM : VM; let VM: VM;
async function stop() { async function stop() {
if (exiting) return; if (exiting) return;
@@ -47,7 +47,7 @@ async function start() {
// Init the auth manager if enabled // Init the auth manager if enabled
let auth = Config.auth.enabled ? new AuthManager(Config.auth.apiEndpoint, Config.auth.secretKey) : null; let auth = Config.auth.enabled ? new AuthManager(Config.auth.apiEndpoint, Config.auth.secretKey) : null;
switch (Config.vm.type) { switch (Config.vm.type) {
case "qemu": { case 'qemu': {
// Print a warning if qmpSockDir is set // Print a warning if qmpSockDir is set
// and the host OS is Windows, as this // and the host OS is Windows, as this
// configuration will very likely not work. // configuration will very likely not work.
@@ -67,7 +67,7 @@ async function start() {
VM = new QemuVM(def); VM = new QemuVM(def);
break; break;
} }
case "vncvm": { case 'vncvm': {
VM = new VNCVM(Config.vncvm); VM = new VNCVM(Config.vncvm);
break; break;
} }

1
jpeg-turbo

Submodule jpeg-turbo deleted from 6718ec1fc1