From 60265932874868d4bd3573022a44d5b6d48cb111 Mon Sep 17 00:00:00 2001
From: Malloc of Kuzkycyziklistan <aleco@aroltd.com>
Date: Thu, 14 Sep 2017 16:00:24 -0500
Subject: [PATCH] having a static class to drive socket comms is dumb

why did i do this
---
 client/index.html             |  6 +---
 client/src/Entrypoint.ts      |  6 ++--
 client/src/FileCache.ts       |  4 +++
 client/src/sock/Connection.ts | 66 +++++++++++++++++------------------
 client/src/sock/Crypto.ts     |  2 +-
 client/src/sock/Packet.ts     | 17 +++++----
 6 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/client/index.html b/client/index.html
index 152f81c..4db4f1b 100644
--- a/client/index.html
+++ b/client/index.html
@@ -5,10 +5,6 @@
         <link rel="stylesheet" type="text/css" href="style.css" />
         <meta charset="UTF-8" />
 
-        <!-- LOGIN AND REGISTER SCRIPT -->
-        <script type="text/javascript" src="lib/loginstration.js"></script>
-        <!-- END -->
-
         <script type="text/javascript" src="bin/lib.js"></script>
         <script type="text/javascript" src="bin/scape.js"></script>
 
@@ -25,7 +21,7 @@
 
         </div>
 
-        <!-- THUGGINOMICS LOGIN CODE VERY FRAGILE -->
+        <!-- THUGGINOMICS LOGIN CODE VERY FRAGILE
 
         <div id="loginstration-wrap">
           <h1 id="loginstration-header" class="loginstration-header">
diff --git a/client/src/Entrypoint.ts b/client/src/Entrypoint.ts
index 6e17cf6..aee6a1c 100644
--- a/client/src/Entrypoint.ts
+++ b/client/src/Entrypoint.ts
@@ -20,18 +20,16 @@ class Entrypoint {
             () => { 
                 Entrypoint.initStatus.fileCache = true;
                 this.initCheck();
-            },         
+            },
 
             // FAILURE
             (error: string) => { 
                 CriticalStop.redirect(error);
             } 
         ); 
-        
-        Connection.open();
     }
 
     private static ready(): void {
-
+        
     }
 }
\ No newline at end of file
diff --git a/client/src/FileCache.ts b/client/src/FileCache.ts
index bfd4570..6543138 100644
--- a/client/src/FileCache.ts
+++ b/client/src/FileCache.ts
@@ -69,6 +69,10 @@ class FileCache {
         var store = query.objectStore("files");
         store.put({name: fileName, data: data});
     }
+
+    public static deleteFile(fileName: string) {
+        
+    }
 }
 
 class FileMeta {
diff --git a/client/src/sock/Connection.ts b/client/src/sock/Connection.ts
index 8c81704..126e7d5 100644
--- a/client/src/sock/Connection.ts
+++ b/client/src/sock/Connection.ts
@@ -1,38 +1,38 @@
 class Connection {
-    private static sock: WebSocket = null;
-    private static _isOpen: boolean = false;
-    private static onOpenFunc: () => void = null;
-    private static onCloseFunc: () => void = null;
-    public static get isOpen(): boolean {
-        return Connection._isOpen;
+    private sock: WebSocket = null;
+    private _isOpen: boolean = false;
+    private onOpenFunc: () => void = null;
+    private onCloseFunc: () => void = null;
+    public get isOpen(): boolean {
+        return this._isOpen;
     }
 
-    public static open(onOpen: () => void = null): void {
-        if(Connection._isOpen)
+    public open(onOpen: () => void = null): void {
+        if(this._isOpen)
             return;
 
         // FLAG replace hard coded url with one loaded from a config file
-        Connection.sock = new WebSocket("ws://localhost:6770");
-        Connection.sock.binaryType = "arraybuffer";
+        this.sock = new WebSocket("ws://localhost:6770");
+        this.sock.binaryType = "arraybuffer";
 
-        Connection.onOpenFunc = onOpen;
-        Connection.sock.onopen = Connection.onOpen;
-        Connection.sock.onmessage = Connection.onMessage;
-        Connection.sock.onclose = Connection.onClose;
+        this.onOpenFunc = onOpen;
+        this.sock.onopen = this.onOpen;
+        this.sock.onmessage = this.onMessage;
+        this.sock.onclose = this.onClose;
     }
 
-    public static send(msg: Packet) {
-        Connection.sock.send(msg.getBytes());
+    public send(msg: Packet) {
+        this.sock.send(msg.getBytes());
     }
 
-    private static onOpen(event: any): void {
-        Connection._isOpen = true;
+    private onOpen(event: any): void {
+        this._isOpen = true;
         
-        if(Connection.onOpenFunc)
-            Connection.onOpenFunc();
+        if(this.onOpenFunc)
+            this.onOpenFunc();
     }
 
-    private static onMessage(event: any): void {
+    private onMessage(event: any): void {
         var raw = new Uint8Array(event.data);
         var msg: Packet;
         try { 
@@ -45,36 +45,36 @@ class Connection {
 
         console.log(msg);
         switch(msg.id) {
-            case kPacketId.KeyExchange:
+            case kMasterId.KeyExchange:
                 var response = Key.generateResponsePacket(msg);
                 if(Key.succeeded) {
                     Cipher.init(Key.privateKey);
-                    Connection.send(response);
+                    this.send(response);
                 } else
                     CriticalStop.redirect("Could not establish an encrypted connection with the server.");
                 break;
-            case kPacketId.LoginAttempt:
+            case kMasterId.LoginAttempt:
                 
                 break;
-            case kPacketId.RegistrationAttempt:
+            case kMasterId.RegistrationAttempt:
 
                 break;
         }
     }
 
-    private static onClose(event: any): void {
-        Connection._isOpen = false;
+    private onClose(event: any): void {
+        this._isOpen = false;
         Cipher.close();
 
-        if(Connection.onCloseFunc)
-            Connection.onCloseFunc();
+        if(this.onCloseFunc)
+            this.onCloseFunc();
     }
 
-    public static close(onClose: () => void = null): void {
-        if(!Connection._isOpen)
+    public close(onClose: () => void = null): void {
+        if(!this._isOpen)
             return;
 
-        Connection.onCloseFunc = onClose;
-        Connection.sock.close();
+        this.onCloseFunc = onClose;
+        this.sock.close();
     }
 }
\ No newline at end of file
diff --git a/client/src/sock/Crypto.ts b/client/src/sock/Crypto.ts
index b1e5252..30973f9 100644
--- a/client/src/sock/Crypto.ts
+++ b/client/src/sock/Crypto.ts
@@ -20,7 +20,7 @@ class Key {
         var clientKey = generator.modPow(Key.secret, modulus);
 
         Key._privateKey = serverKey.modPow(Key.secret, modulus);
-        return Packet.create(kPacketId.KeyExchange, [clientKey.toString(16)]);
+        return Packet.create(kMasterId.KeyExchange, [clientKey.toString(16)]);
     }
 }
 
diff --git a/client/src/sock/Packet.ts b/client/src/sock/Packet.ts
index 7a09214..4b9bdc3 100644
--- a/client/src/sock/Packet.ts
+++ b/client/src/sock/Packet.ts
@@ -1,14 +1,19 @@
-const enum kPacketId {
-    KeyExchange = 0,
+const enum kMasterId {
+    KeyExchange = 1,
     LoginAttempt,
-    RegistrationAttempt
+    RegistrationAttempt,
+    ServerListing
+}
+
+const enum kSlaveId {
+    
 }
 
 class Packet {
     private static magicNumber: Uint8Array = new Uint8Array([0xF0, 0x9F, 0xA6, 0x91]);
 
-    private _id: kPacketId;
-    public get id(): kPacketId {
+    private _id: number;
+    public get id(): number {
         return this._id;
     }
 
@@ -37,7 +42,7 @@ class Packet {
 
     private constructor() {}
 
-    public static create(id: kPacketId, regions: any[]): Packet {
+    public static create(id: number, regions: any[]): Packet {
         var packet = new Packet;
         packet._id = id;
         regions.forEach(region => {