More cleanign

tabs to space / added roadmap to readme

Author: codewar65

README.md

@@ -73,7 +73,8 @@ the same time.
 
 ## Running VTXServ
 
-Type vtxserv from the command line.
+Type vtxserv from the command line. Once the server is running you can enter
+commands like:
 
 START ALL : start up the web server, websocket server, and the bridge process.
 The bridge process redirects StdIn/StdOut back and forth between the 'node'
@@ -103,3 +104,20 @@ Sample node software is in the node directory. Actual BBS software is not in the
 scope of this project, but feel free to tinker, or retrofit existing packages
 to work with VTX.
 
+## Roadmap
+
+Stablize server software - fully crashproof and able to always terminate phantom
+nodes.
+
+Add additional tool to server console for convert SVG files to Base64 for use
+in node software. Possibly remove these tools to separate command line utilities.
+
+Clean up demo node software. Develop ncurses compatible functions and procedures.
+
+Add new escape sequences to define clickable hotspots for sending a key or string
+to the server. Additionally, define hotspot for external URLs links that open in 
+an new page.
+
+Investigate ability for websocket server to accept non-'user' connections from
+other VTX servers for passing private network information like mail or echo-style
+messages.

bclasses.pas

@@ -38,7 +38,7 @@   TBThread = class(TThread)
     fSyncLock: TCriticalSection;
     procedure Synchronize(AMethod: TThreadMethod);
   public
-    constructor Create(CreateSuspended: Boolean); 
+    constructor Create(CreateSuspended: Boolean);
     destructor Destroy; override;
   end;
 

customserver2.pas

@@ -31,7 +31,7 @@ interface
 //  Sockets,
   ssl_openssl,
   BClasses,
-	syncobjs;
+  syncobjs;
 
 type
   TCustomServer = class;
@@ -41,24 +41,24 @@   TCustomConnection = class;
   TTCPCustomConnectionSocket = class(TTCPBlockSocket)
 
   protected
-    fConnection : 					TCustomConnection;
-    fCurrentStatusReason : 	THookSocketReason;
-    fCurrentStatusValue : 	string;
-    fOnSyncStatus : 				THookSocketStatus;
+    fConnection :           TCustomConnection;
+    fCurrentStatusReason :  THookSocketReason;
+    fCurrentStatusValue :   string;
+    fOnSyncStatus :         THookSocketStatus;
 
-    procedure 	DoOnStatus(Sender: TObject; Reason: THookSocketReason; const Value: String);
-    procedure 	SyncOnStatus;
+    procedure   DoOnStatus(Sender: TObject; Reason: THookSocketReason; const Value: String);
+    procedure   SyncOnStatus;
 
   public
-    constructor 	Create;
+    constructor   Create;
 
-    destructor 		Destroy; override;
+    destructor    Destroy; override;
 
     {:Owner (@link(TCustomConnection))}
-    property 			Connection: TCustomConnection read fConnection;
+    property      Connection: TCustomConnection read fConnection;
 
     {:Socket status event (synchronized to main thread)}
-    property 			OnSyncStatus: THookSocketStatus read fOnSyncStatus write fOnSyncStatus;
+    property      OnSyncStatus: THookSocketStatus read fOnSyncStatus write fOnSyncStatus;
   end;
 
 
@@ -75,50 +75,50 @@   TCustomConnection = class(TBThread)
   private
 
   protected
-    fIndex : 			integer;
-    fParent : 		TCustomServer;
-    fSocket : 		TTCPCustomConnectionSocket;
-    fSSL : 				boolean;
-    procedure 		AfterConnectionExecute; virtual;
-    function 			BeforeExecuteConnection: boolean; virtual;
-    procedure 		ExecuteConnection; virtual;
-    function 			GetIsTerminated: boolean;
+    fIndex :      integer;
+    fParent :     TCustomServer;
+    fSocket :     TTCPCustomConnectionSocket;
+    fSSL :        boolean;
+    procedure     AfterConnectionExecute; virtual;
+    function      BeforeExecuteConnection: boolean; virtual;
+    procedure     ExecuteConnection; virtual;
+    function      GetIsTerminated: boolean;
 
   public
-    constructor 	Create(aSocket: TTCPCustomConnectionSocket); virtual;
-    destructor 		Destroy; override;
+    constructor   Create(aSocket: TTCPCustomConnectionSocket); virtual;
+    destructor    Destroy; override;
 
     {:Thread execute method}
-    procedure 		Execute; override;
+    procedure     Execute; override;
 
     {:Thread resume method}
-    procedure 		Start;
+    procedure     Start;
     {:Thread suspend method}
-    procedure 		Stop;
+    procedure     Stop;
 
     {:Temination procedure
       One should call this procedure to terminate thread,
       it internally calls Terminate, but can be overloaded,
       and can be used for clean um }
-    procedure 		TerminateThread; virtual;
+    procedure     TerminateThread; virtual;
 
     {:@Connection index.
       Automatically generated. }
-    property 			Index: integer read fIndex;
+    property      Index: integer read fIndex;
 
     {:@True if thread is not terminated and @link(Socket) exists}
-    property 			IsTerminated: boolean read GetIsTerminated;
+    property      IsTerminated: boolean read GetIsTerminated;
 
     {:@Connection parent
       If client connection, this property is always nil, if server
       connection, this property is @link(TCustomServer) that created this connection }
-    property 			Parent: TCustomServer read fParent;
+    property      Parent: TCustomServer read fParent;
 
     {:@Connection socket}
-    property 			Socket: TTCPCustomConnectionSocket read fSocket;
+    property      Socket: TTCPCustomConnectionSocket read fSocket;
 
     {:Whether SSL is used}
-    property 			SSL: boolean read fSSL write fSSL;
+    property      SSL: boolean read fSSL write fSSL;
   end;
 
 
@@ -243,7 +243,7 @@   TCustomServer = class(TBThread)
       This method should be called instead of Terminate to terminate thread,
       it internally calls Terminate, but can be overloaded,
       and can be used for data clean up
-    }   
+    }
     procedure TerminateThread; virtual;
 
 
@@ -704,7 +704,7 @@ procedure TTCPCustomConnectionSocket.DoOnStatus(Sender: TObject; Reason: THookSo
     fCurrentStatusReason := Reason;
     fCurrentStatusValue := value;
     fConnection.Synchronize(SyncOnStatus);
-    
+
     {
     if (fCurrentStatusReason = HR_Error) and (LastError = WSAECONNRESET) then
       fConnection.Terminate;
@@ -744,7 +744,7 @@ destructor TCustomConnection.Destroy;
     fSocket.OnStatus := nil;
     fSocket.Free;
   end;
-    
+
   inherited Destroy;
 end;
 
@@ -774,7 +774,7 @@ procedure TCustomConnection.Stop;
 procedure TCustomConnection.TerminateThread;
 begin
   if (terminated) then exit;
-  
+
   Socket.OnSyncStatus := nil;
   Socket.OnStatus := nil;
   Terminate;