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/events/RoomEvents/JoinRoom.tsx

@@ -0,0 +1,7 @@
+export const JoinRoom = {
+  id: ".Event_JoinRoom.ext",
+  action: ({ userInfo }, webClient, { roomEvent }) => {
+    const { roomId } = roomEvent;
+    webClient.services.room.userJoined(roomId, userInfo);
+  }
+};

webclient/src/websocket/events/RoomEvents/LeaveRoom.tsx

@@ -0,0 +1,7 @@
+export const LeaveRoom = {
+  id: ".Event_LeaveRoom.ext",
+  action: ({ name }, webClient, { roomEvent }) => {
+    const { roomId } = roomEvent;
+    webClient.services.room.userLeft(roomId, name);
+  }
+};

webclient/src/websocket/events/RoomEvents/ListGames.tsx

@@ -0,0 +1,7 @@
+export const ListGames = {
+  id: ".Event_ListGames.ext",
+  action: ({ gameList }, webClient, { roomEvent }) => {
+    const { roomId } = roomEvent;
+    webClient.services.room.updateGames(roomId, gameList);
+  }
+};

webclient/src/websocket/events/RoomEvents/RoomSay.tsx

@@ -0,0 +1,7 @@
+export const RoomSay = {
+  id: ".Event_RoomSay.ext",
+  action: (message, webClient, { roomEvent }) => {
+    const { roomId } = roomEvent;
+    webClient.services.room.addMessage(roomId, message);
+  }
+};

webclient/src/websocket/events/RoomEvents/index.tsx

@@ -0,0 +1,4 @@
+export { JoinRoom } from "./JoinRoom";
+export { LeaveRoom } from "./LeaveRoom";
+export { ListGames } from "./ListGames";
+export { RoomSay } from "./RoomSay";

webclient/src/websocket/events/SessionEvents/AddToList.tsx

@@ -0,0 +1,18 @@
+export const AddToList = {
+  id: ".Event_AddToList.ext",
+  action: ({ listName, userInfo}, webClient) => {
+    switch (listName) {
+      case 'buddy': {
+        webClient.services.session.addToBuddyList(userInfo);
+        break;
+      }
+      case 'ignore': {
+        webClient.services.session.addToIgnoreList(userInfo);
+        break;
+      }
+      default: {
+        webClient.debug(() => console.log('Attempted to add to unknown list: ', listName));
+      }
+    }
+  }
+};

webclient/src/websocket/events/SessionEvents/ConnectionClosed.tsx

@@ -0,0 +1,39 @@
+import { StatusEnum } from "types";
+
+export const ConnectionClosed = {
+  id: ".Event_ConnectionClosed.ext",
+  action: ({ reason }, webClient) => {
+    let message = "";
+
+    // @TODO (5)
+    switch(reason) {
+      case webClient.pb.Event_ConnectionClosed.CloseReason.USER_LIMIT_REACHED:
+        message = "The server has reached its maximum user capacity";
+        break;
+      case webClient.pb.Event_ConnectionClosed.CloseReason.TOO_MANY_CONNECTIONS:
+        message = "There are too many concurrent connections from your address";
+        break;
+      case webClient.pb.Event_ConnectionClosed.CloseReason.BANNED:
+        message = "You are banned";
+        break;
+      case webClient.pb.Event_ConnectionClosed.CloseReason.DEMOTED:
+        message = "You were demoted";
+        break;
+      case webClient.pb.Event_ConnectionClosed.CloseReason.SERVER_SHUTDOWN:
+        message = "Scheduled server shutdown";
+        break;
+      case webClient.pb.Event_ConnectionClosed.CloseReason.USERNAMEINVALID:
+        message = "Invalid username";
+        break;
+      case webClient.pb.Event_ConnectionClosed.CloseReason.LOGGEDINELSEWERE:
+        message = "You have been logged out due to logging in at another location";
+        break;
+      case webClient.pb.Event_ConnectionClosed.CloseReason.OTHER:
+      default:
+        message = "Unknown reason";
+        break;
+    }
+
+    webClient.updateStatus(StatusEnum.DISCONNECTED, message);
+  }
+};

webclient/src/websocket/events/SessionEvents/ListRooms.tsx

@@ -0,0 +1,16 @@
+import * as _ from "lodash";
+
+export const ListRooms = {
+  id: ".Event_ListRooms.ext",
+  action: ({ roomList }, webClient) => {
+    webClient.services.room.updateRooms(roomList);
+
+    if (webClient.options.autojoinrooms) {
+      _.each(roomList, ({ autoJoin, roomId }) => {
+        if (autoJoin) {
+          webClient.commands.session.joinRoom(roomId);
+        }
+      });
+    }
+  }
+};

webclient/src/websocket/events/SessionEvents/NotifyUser.tsx

@@ -0,0 +1,6 @@
+export const NotifyUser = {
+  id: ".Event_NotifyUser.ext",
+  action: (payload) => {
+    // console.info("Event_NotifyUser", payload);
+  }
+};

webclient/src/websocket/events/SessionEvents/PlayerPropertiesChanges.tsx

@@ -0,0 +1,6 @@
+export const PlayerPropertiesChanges = {
+  id: ".Event_PlayerPropertiesChanges.ext",
+  action: (payload) => {
+    // console.info("Event_PlayerPropertiesChanges", payload);
+  }
+};

webclient/src/websocket/events/SessionEvents/RemoveFromList.tsx

@@ -0,0 +1,18 @@
+export const RemoveFromList = {
+  id: ".Event_RemoveFromList.ext",
+  action: ({ listName, userName }, webClient) => {
+    switch (listName) {
+      case 'buddy': {
+        webClient.services.session.removeFromBuddyList(userName);
+        break;
+      }
+      case 'ignore': {
+        webClient.services.session.removeFromIgnoreList(userName);
+        break;
+      }
+      default: {
+        webClient.debug(() => console.log('Attempted to remove from unknown list: ', listName));
+      }
+    }
+  }
+};

webclient/src/websocket/events/SessionEvents/ServerIdentification.tsx

@@ -0,0 +1,19 @@
+import { StatusEnum } from "types";
+
+export const ServerIdentification = {
+  id: ".Event_ServerIdentification.ext",
+  action: (info, webClient, _raw) => {
+    const { serverName, serverVersion, protocolVersion } = info;
+
+    if (protocolVersion !== webClient.protocolVersion) {
+      webClient.disconnect();
+      webClient.updateStatus(StatusEnum.DISCONNECTED, "Protocol version mismatch: " + protocolVersion);
+      return;
+    }
+
+    webClient.resetConnectionvars();
+    webClient.updateStatus(StatusEnum.LOGGINGIN, "Logging in...");
+    webClient.services.session.updateInfo(serverName, serverVersion);
+    webClient.commands.session.login();
+  }
+};

webclient/src/websocket/events/SessionEvents/ServerMessage.tsx

@@ -0,0 +1,6 @@
+export const ServerMessage = {
+  id: ".Event_ServerMessage.ext",
+  action: ({ message }, webClient) => {
+    webClient.services.session.serverMessage(message);
+  }
+};

webclient/src/websocket/events/SessionEvents/ServerShutdown.tsx

@@ -0,0 +1,6 @@
+export const ServerShutdown = {
+  id: ".Event_ServerShutdown.ext",
+  action: (payload, webClient) => {
+    // console.info("Event_ServerShutdown", payload);
+  }
+};

webclient/src/websocket/events/SessionEvents/UserJoined.tsx

@@ -0,0 +1,6 @@
+export const UserJoined = {
+  id: ".Event_UserJoined.ext",
+  action: ({ userInfo }, webClient) => {
+    webClient.services.session.userJoined(userInfo);
+  }
+};

webclient/src/websocket/events/SessionEvents/UserLeft.tsx

@@ -0,0 +1,6 @@
+export const UserLeft = {
+  id: ".Event_UserLeft.ext",
+  action: ({ name }, webClient) => {
+    webClient.services.session.userLeft(name);
+  }
+};

webclient/src/websocket/events/SessionEvents/UserMessage.tsx

@@ -0,0 +1,6 @@
+export const UserMessage = {
+  id: ".Event_UserMessage.ext",
+  action: (payload) => {
+    // console.info("Event_UserMessage", payload);
+  }
+};

webclient/src/websocket/events/SessionEvents/index.ts

@@ -0,0 +1,12 @@
+export * from "./ConnectionClosed";
+export * from "./ListRooms";
+export * from "./AddToList";
+export * from "./RemoveFromList";
+export * from "./NotifyUser"; // @TODO
+export * from "./PlayerPropertiesChanges"; // @TODO
+export * from "./ServerIdentification";
+export * from "./ServerMessage";
+export * from "./ServerShutdown"; // @TODO
+export * from "./UserJoined";
+export * from "./UserLeft";
+export * from "./UserMessage"; // @TODO