re-org source tree slightly

network layer is net/
protocol is protocol/

cvmts/src/CollabVMServer.ts

@@ -17,7 +17,7 @@ import { ReaderModel } from '@maxmind/geoip2-node';
 import { Size, Rect } from './Utilities.js';
 import pino from 'pino';
 import { BanManager } from './BanManager.js';
-import { IProtocolHandlers, ListEntry, ProtocolAddUser, ProtocolFlag, ProtocolRenameStatus, ProtocolUpgradeCapability, TheProtocolManager } from './Protocol.js';
+import { IProtocolHandlers, ListEntry, ProtocolAddUser, ProtocolFlag, ProtocolRenameStatus, ProtocolUpgradeCapability, TheProtocolManager } from './protocol/Protocol.js';
 
 // Instead of strange hacks we can just use nodejs provided
 // import.meta properties, which have existed since LTS if not before

cvmts/src/User.ts

@@ -4,11 +4,11 @@ import { IPData } from './IPData.js';
 import IConfig from './IConfig.js';
 import RateLimiter from './RateLimiter.js';
 import { execa, execaCommand, ExecaSyncError } from 'execa';
-import NetworkClient from './NetworkClient.js';
+import { NetworkClient } from './net/NetworkClient.js';
 import { CollabVMCapabilities } from '@cvmts/collab-vm-1.2-binary-protocol';
 import pino from 'pino';
 import { BanManager } from './BanManager.js';
-import { IProtocol, TheProtocolManager } from './Protocol.js';
+import { IProtocol, TheProtocolManager } from './protocol/Protocol.js';
 
 export class User {
 	socket: NetworkClient;

cvmts/src/index.ts

@@ -6,9 +6,9 @@ import CollabVMServer from './CollabVMServer.js';
 import { QemuVmDefinition } from '@computernewb/superqemu';
 
 import AuthManager from './AuthManager.js';
-import WSServer from './WebSocket/WSServer.js';
+import WSServer from './net/ws/WSServer.js';
 import { User } from './User.js';
-import TCPServer from './TCP/TCPServer.js';
+import TCPServer from './net/tcp/TCPServer.js';
 import VM from './vm/interface.js';
 import VNCVM from './vm/vnc/VNCVM.js';
 import GeoIPDownloader from './GeoIPDownloader.js';
@@ -16,9 +16,9 @@ import pino from 'pino';
 import { Database } from './Database.js';
 import { BanManager } from './BanManager.js';
 import { QemuVMShim } from './vm/qemu.js';
-import { TheProtocolManager } from './Protocol.js';
-import { GuacamoleProtocol } from './GuacamoleProtocol.js';
-import { BinRectsProtocol } from './BinRectsProtocol.js';
+import { TheProtocolManager } from './protocol/Protocol.js';
+import { GuacamoleProtocol } from './protocol/GuacamoleProtocol.js';
+import { BinRectsProtocol } from './protocol/BinRectsProtocol.js';
 
 let logger = pino();
 

cvmts/src/net/NetworkServer.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from "stream";
-import { User } from "./User";
+import { User } from "../User";
 
 interface NetworkServerEvents extends EventEmitter {
 	on(event: 'connect', listener: (user: User) => void): this;

cvmts/src/net/tcp/TCPServer.ts

@@ -4,12 +4,12 @@
 import EventEmitter from 'events';
 import { NetworkServer } from '../NetworkServer.js';
 import { Server, Socket } from 'net';
-import IConfig from '../IConfig.js';
+import IConfig from '../../IConfig.js';
 import TCPClient from './TCPClient.js';
-import { IPDataManager } from '../IPData.js';
-import { User } from '../User.js';
+import { IPDataManager } from '../../IPData.js';
+import { User } from '../../User.js';
 import pino from 'pino';
-import { BanManager } from '../BanManager.js';
+import { BanManager } from '../../BanManager.js';
 
 export default class TCPServer extends EventEmitter implements NetworkServer {
 	listener: Server;

cvmts/src/net/ws/WSServer.ts

@@ -3,13 +3,13 @@ import { NetworkServer } from '../NetworkServer.js';
 import EventEmitter from 'events';
 import { WebSocketServer, WebSocket } from 'ws';
 import internal from 'stream';
-import IConfig from '../IConfig.js';
+import IConfig from '../../IConfig.js';
 import { isIP } from 'net';
-import { IPDataManager } from '../IPData.js';
+import { IPDataManager } from '../../IPData.js';
 import WSClient from './WSClient.js';
-import { User } from '../User.js';
+import { User } from '../../User.js';
 import pino from 'pino';
-import { BanManager } from '../BanManager.js';
+import { BanManager } from '../../BanManager.js';
 
 export default class WSServer extends EventEmitter implements NetworkServer {
 	private httpServer: http.Server;

cvmts/src/protocol/GuacamoleProtocol.ts

@@ -1,6 +1,6 @@
 import pino from 'pino';
 import { IProtocol, IProtocolHandlers, ListEntry, ProtocolAddUser, ProtocolBase, ProtocolChatHistory, ProtocolFlag, ProtocolRenameStatus, ProtocolUpgradeCapability, ScreenRect } from './Protocol.js';
-import { Rank, User } from './User';
+import { Rank, User } from '../User.js';
 
 import * as cvm from '@cvmts/cvm-rs';
 

cvmts/src/protocol/Protocol.ts

@@ -1,4 +1,4 @@
-import { Rank, User } from './User';
+import { Rank, User } from '../User';
 
 // We should probably put this in the binproto repository or something
 export enum ProtocolUpgradeCapability {