Structure change (#4220)

* Structure change

* Remove duplicate folders from previous structure

* Cleanup websocket protocol

* Updating from based off PR

* Fixup - remove wrong files during conflict and get the websocket working

* renaming tsx to ts

Co-authored-by: Jeremy Letto <jeremy.letto@datasite.com>

webclient/src/websocket/commands/RoomCommands.tsx

@@ -0,0 +1,27 @@
+import * as _ from 'lodash';
+
+import { WebClient } from "../WebClient"; 
+
+export default class RoomCommands {
+  private webClient: WebClient;
+
+  constructor(webClient) {
+    this.webClient = webClient;
+  }
+
+  roomSay(roomId, message) {
+    const trimmed = _.trim(message);
+    
+    if (!trimmed) return;
+
+    var CmdRoomSay = this.webClient.pb.Command_RoomSay.create({
+      "message" : trimmed
+    });
+
+    var rc = this.webClient.pb.RoomCommand.create({
+      ".Command_RoomSay.ext" : CmdRoomSay
+    });
+
+    this.webClient.sendRoomCommand(roomId, rc);
+  }
+}

webclient/src/websocket/commands/SessionCommands.tsx

@@ -0,0 +1,234 @@
+import { StatusEnum } from "types";
+
+import { WebClient } from "../WebClient"; 
+import { guid } from "../utils";
+
+export default class SessionCommands {
+  private webClient: WebClient;
+
+  constructor(webClient) {
+    this.webClient = webClient;
+  }
+
+  login() {
+    const loginConfig = {
+      ...this.webClient.clientConfig,
+      "userName" : this.webClient.options.user,
+      "password" : this.webClient.options.pass,
+      "clientid" : guid()
+    };
+
+    const CmdLogin = this.webClient.pb.Command_Login.create(loginConfig);
+
+    const command = this.webClient.pb.SessionCommand.create({
+      ".Command_Login.ext" : CmdLogin
+    });
+
+    this.webClient.sendSessionCommand(command, raw => {
+      const resp = raw[".Response_Login.ext"];
+
+      this.webClient.debug(() =>  console.log(".Response_Login.ext", resp));
+
+      switch(raw.responseCode) {
+        case this.webClient.pb.Response.ResponseCode.RespOk:
+          const { buddyList, ignoreList, userInfo } = resp;
+
+          this.webClient.services.session.updateBuddyList(buddyList);
+          this.webClient.services.session.updateIgnoreList(ignoreList);
+          this.webClient.services.session.updateUser(userInfo);
+
+          this.webClient.commands.session.listUsers();
+          this.webClient.commands.session.listRooms();
+
+          this.webClient.updateStatus(StatusEnum.LOGGEDIN, "Logged in.");
+          this.webClient.startPingLoop();
+          break;
+
+        case this.webClient.pb.Response.ResponseCode.RespClientUpdateRequired:
+          this.webClient.updateStatus(StatusEnum.DISCONNECTED, "Login failed: missing features");
+          break;
+
+        case this.webClient.pb.Response.ResponseCode.RespWrongPassword:
+        case this.webClient.pb.Response.ResponseCode.RespUsernameInvalid:
+          this.webClient.updateStatus(StatusEnum.DISCONNECTED, "Login failed: incorrect username or password");
+          break;
+
+        case this.webClient.pb.Response.ResponseCode.RespWouldOverwriteOldSession:
+          this.webClient.updateStatus(StatusEnum.DISCONNECTED, "Login failed: duplicated user session");
+          break;
+
+        case this.webClient.pb.Response.ResponseCode.RespUserIsBanned:
+          this.webClient.updateStatus(StatusEnum.DISCONNECTED, "Login failed: banned user");
+          break;
+
+        case this.webClient.pb.Response.ResponseCode.RespRegistrationRequired:
+          this.webClient.updateStatus(StatusEnum.DISCONNECTED, "Login failed: registration required");
+          break;
+
+        case this.webClient.pb.Response.ResponseCode.RespClientIdRequired:
+          this.webClient.updateStatus(StatusEnum.DISCONNECTED, "Login failed: missing client ID");
+          break;
+
+        case this.webClient.pb.Response.ResponseCode.RespContextError:
+          this.webClient.updateStatus(StatusEnum.DISCONNECTED, "Login failed: server error");
+          break;
+
+        case this.webClient.pb.Response.ResponseCode.RespAccountNotActivated:
+          this.webClient.updateStatus(StatusEnum.DISCONNECTED, "Login failed: account not activated");
+          break;
+
+        default:
+          this.webClient.updateStatus(StatusEnum.DISCONNECTED, "Login failed: unknown error " + raw.responseCode);
+      }
+    });
+  }
+
+  listUsers() {
+    const CmdListUsers = this.webClient.pb.Command_ListUsers.create();
+
+    const sc = this.webClient.pb.SessionCommand.create({
+      ".Command_ListUsers.ext" : CmdListUsers
+    });
+
+    this.webClient.sendSessionCommand(sc, raw => {
+      const { responseCode } = raw;
+      const response = raw[".Response_ListUsers.ext"];
+
+      if (response) {
+        switch (responseCode) {
+          case this.webClient.pb.Response.ResponseCode.RespOk:
+            this.webClient.services.session.updateUsers(response.userList);
+            break;
+          default:
+            console.log(`Failed to fetch Server Rooms [${responseCode}] : `, raw);
+        }
+      }
+
+    });
+  }
+
+  listRooms() {
+    const CmdListRooms = this.webClient.pb.Command_ListRooms.create();
+
+    const sc = this.webClient.pb.SessionCommand.create({
+      ".Command_ListRooms.ext" : CmdListRooms
+    });
+
+    this.webClient.sendSessionCommand(sc);
+  }
+
+  joinRoom(roomId: string) {
+    const CmdJoinRoom = this.webClient.pb.Command_JoinRoom.create({
+      "roomId" : roomId
+    });
+
+    const sc = this.webClient.pb.SessionCommand.create({
+      ".Command_JoinRoom.ext" : CmdJoinRoom
+    });
+
+    this.webClient.sendSessionCommand(sc, (raw) => {
+      const { responseCode } = raw;
+
+      let error;
+
+      switch(responseCode) {
+        case this.webClient.pb.Response.ResponseCode.RespOk:
+          const { roomInfo } = raw[".Response_JoinRoom.ext"];
+
+          this.webClient.services.room.joinRoom(roomInfo);
+          this.webClient.debug(() => console.log("Join Room: ", roomInfo.name));
+          return;
+        case this.webClient.pb.Response.ResponseCode.RespNameNotFound:
+          error = "Failed to join the room: it doesn\"t exist on the server.";
+          break;
+        case this.webClient.pb.Response.ResponseCode.RespContextError:
+          error = "The server thinks you are in the room but Cockatrice is unable to display it. Try restarting Cockatrice.";
+          break;
+        case this.webClient.pb.Response.ResponseCode.RespUserLevelTooLow:
+          error = "You do not have the required permission to join this room.";
+          break;
+        default:
+          error = "Failed to join the room due to an unknown error.";
+          break;
+      }
+      
+      if (error) {
+        console.error(responseCode, error);
+      }
+    });
+  }
+
+  addToBuddyList(userName) {
+    this.addToList('buddy', userName);
+  }
+
+  removeFromBuddyList(userName) {
+    this.removeFromList('buddy', userName);
+  }
+
+  addToIgnoreList(userName) {
+    this.addToList('ignore', userName);
+  }
+
+  removeFromIgnoreList(userName) {
+    this.removeFromList('ignore', userName);
+  }
+
+  addToList(list: string, userName: string) {
+    const CmdAddToList = this.webClient.pb.Command_AddToList.create({ list, userName });
+
+    const sc = this.webClient.pb.SessionCommand.create({
+      ".Command_AddToList.ext" : CmdAddToList
+    });
+
+    this.webClient.sendSessionCommand(sc, ({ responseCode }) => {
+      // @TODO: filter responseCode, pop snackbar for error
+      this.webClient.debug(() => console.log('Added to List Response: ', responseCode));
+    });
+  }
+
+  removeFromList(list: string, userName: string) {
+    const CmdRemoveFromList = this.webClient.pb.Command_RemoveFromList.create({ list, userName });
+
+    const sc = this.webClient.pb.SessionCommand.create({
+      ".Command_RemoveFromList.ext" : CmdRemoveFromList
+    });
+
+    this.webClient.sendSessionCommand(sc, ({ responseCode }) => {
+      // @TODO: filter responseCode, pop snackbar for error
+      this.webClient.debug(() => console.log('Removed from List Response: ', responseCode));
+    });
+  }
+
+  viewLogHistory(filters) {
+    const CmdViewLogHistory = this.webClient.pb.Command_ViewLogHistory.create(filters);
+
+    const sc = this.webClient.pb.ModeratorCommand.create({
+      ".Command_ViewLogHistory.ext" : CmdViewLogHistory
+    });
+
+    this.webClient.sendModeratorCommand(sc, (raw) => {
+      const { responseCode } = raw;
+
+      let error;
+
+      switch(responseCode) {
+        case this.webClient.pb.Response.ResponseCode.RespOk:
+          const { logMessage } = raw[".Response_ViewLogHistory.ext"];
+
+          console.log("Response_ViewLogHistory: ", logMessage)
+          this.webClient.services.session.viewLogs(logMessage)
+
+          this.webClient.debug(() => console.log("View Log History: ", logMessage));
+          return;
+        default:
+          error = "Failed to retrieve log history.";
+          break;
+      }
+      
+      if (error) {
+        console.error(responseCode, error);
+      }
+    });
+  }
+}

webclient/src/websocket/commands/index.tsx

@@ -0,0 +1,2 @@
+export { default as RoomCommand } from "./RoomCommands";
+export { default as SessionCommands } from "./SessionCommands";