From 74d7b17d8b6a5e1f766d4bc2fee1f7b9c4f582e3 Mon Sep 17 00:00:00 2001 From: modeco80 Date: Thu, 22 Aug 2024 04:26:17 -0400 Subject: [PATCH] re-org source tree slightly network layer is net/ protocol is protocol/ --- cvmts/src/CollabVMServer.ts | 2 +- cvmts/src/User.ts | 4 ++-- cvmts/src/index.ts | 10 +++++----- cvmts/src/{ => net}/NetworkClient.ts | 0 cvmts/src/{ => net}/NetworkServer.ts | 2 +- cvmts/src/{TCP => net/tcp}/TCPClient.ts | 0 cvmts/src/{TCP => net/tcp}/TCPServer.ts | 8 ++++---- cvmts/src/{WebSocket => net/ws}/WSClient.ts | 0 cvmts/src/{WebSocket => net/ws}/WSServer.ts | 8 ++++---- cvmts/src/{ => protocol}/BinRectsProtocol.ts | 0 cvmts/src/{ => protocol}/GuacamoleProtocol.ts | 2 +- cvmts/src/{ => protocol}/Protocol.ts | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) rename cvmts/src/{ => net}/NetworkClient.ts (100%) rename cvmts/src/{ => net}/NetworkServer.ts (88%) rename cvmts/src/{TCP => net/tcp}/TCPClient.ts (100%) rename cvmts/src/{TCP => net/tcp}/TCPServer.ts (88%) rename cvmts/src/{WebSocket => net/ws}/WSClient.ts (100%) rename cvmts/src/{WebSocket => net/ws}/WSServer.ts (96%) rename cvmts/src/{ => protocol}/BinRectsProtocol.ts (100%) rename cvmts/src/{ => protocol}/GuacamoleProtocol.ts (99%) rename cvmts/src/{ => protocol}/Protocol.ts (99%) diff --git a/cvmts/src/CollabVMServer.ts b/cvmts/src/CollabVMServer.ts index a1b4c17..019e333 100644 --- a/cvmts/src/CollabVMServer.ts +++ b/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 diff --git a/cvmts/src/User.ts b/cvmts/src/User.ts index 0804f68..8a539a0 100644 --- a/cvmts/src/User.ts +++ b/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; diff --git a/cvmts/src/index.ts b/cvmts/src/index.ts index d24541a..5cad003 100644 --- a/cvmts/src/index.ts +++ b/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(); diff --git a/cvmts/src/NetworkClient.ts b/cvmts/src/net/NetworkClient.ts similarity index 100% rename from cvmts/src/NetworkClient.ts rename to cvmts/src/net/NetworkClient.ts diff --git a/cvmts/src/NetworkServer.ts b/cvmts/src/net/NetworkServer.ts similarity index 88% rename from cvmts/src/NetworkServer.ts rename to cvmts/src/net/NetworkServer.ts index 1719354..2c767d3 100644 --- a/cvmts/src/NetworkServer.ts +++ b/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; diff --git a/cvmts/src/TCP/TCPClient.ts b/cvmts/src/net/tcp/TCPClient.ts similarity index 100% rename from cvmts/src/TCP/TCPClient.ts rename to cvmts/src/net/tcp/TCPClient.ts diff --git a/cvmts/src/TCP/TCPServer.ts b/cvmts/src/net/tcp/TCPServer.ts similarity index 88% rename from cvmts/src/TCP/TCPServer.ts rename to cvmts/src/net/tcp/TCPServer.ts index 0277269..58a12be 100644 --- a/cvmts/src/TCP/TCPServer.ts +++ b/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; diff --git a/cvmts/src/WebSocket/WSClient.ts b/cvmts/src/net/ws/WSClient.ts similarity index 100% rename from cvmts/src/WebSocket/WSClient.ts rename to cvmts/src/net/ws/WSClient.ts diff --git a/cvmts/src/WebSocket/WSServer.ts b/cvmts/src/net/ws/WSServer.ts similarity index 96% rename from cvmts/src/WebSocket/WSServer.ts rename to cvmts/src/net/ws/WSServer.ts index b549eb9..7660424 100644 --- a/cvmts/src/WebSocket/WSServer.ts +++ b/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; diff --git a/cvmts/src/BinRectsProtocol.ts b/cvmts/src/protocol/BinRectsProtocol.ts similarity index 100% rename from cvmts/src/BinRectsProtocol.ts rename to cvmts/src/protocol/BinRectsProtocol.ts diff --git a/cvmts/src/GuacamoleProtocol.ts b/cvmts/src/protocol/GuacamoleProtocol.ts similarity index 99% rename from cvmts/src/GuacamoleProtocol.ts rename to cvmts/src/protocol/GuacamoleProtocol.ts index be41f01..7dfb551 100644 --- a/cvmts/src/GuacamoleProtocol.ts +++ b/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'; diff --git a/cvmts/src/Protocol.ts b/cvmts/src/protocol/Protocol.ts similarity index 99% rename from cvmts/src/Protocol.ts rename to cvmts/src/protocol/Protocol.ts index 0f45fcb..c7da3f8 100644 --- a/cvmts/src/Protocol.ts +++ b/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 {