Merge pull request #1462 from solaris-games/dev

Fixes for 252

Author: SpacialCircumstances

client/src/game/map.ts

@@ -636,6 +636,10 @@ export class Map {
 
   drawWormHoles () {
     if (this._isWormHolesEnabled()) {
+      if (!this.wormHoleLayer) {
+        this.wormHoleLayer = new WormHoleLayer();
+      }
+
       this.wormHoleLayer!.setup(this.game)
       this.wormHoleLayer!.draw()
     }
@@ -948,8 +952,6 @@ export class Map {
   }
 
   onRulerPointCreated (e) {
-    console.log(e);
-
     this.eventBus.emit(MapEventBusEventNames.MapOnRulerPointCreated, { rulerPoint: e });
   }
 

client/src/game/tooltip.ts

@@ -21,8 +21,8 @@ export default class {
   }
 
   destroy() {
-    this.clear();
     this.game = undefined;
+    this.clear();
   }
 
   clear() {
@@ -37,6 +37,10 @@ export default class {
   _drawTooltip(tooltipData) {
     this.container.removeChildren()
 
+    if (!this.game) {
+      return;
+    }
+
     const player = GameHelper.getPlayerById(this.game!, tooltipData.playerId)!
 
     const paddingX = 2

client/src/services/typedapi/spectator.ts

@@ -13,7 +13,7 @@ export const inviteSpectators = (axios: Axios) => async (gameId: string, usernam
 }
 
 export const uninviteSpectator = (axios: Axios) => async (gameId: string, userId: string): Promise<ResponseResult<{}>> => {
-  return doPut(axios)(routes.uninviteSpectator, { gameId }, {}, {}, { withCredentials: true });
+  return doPut(axios)(routes.uninviteSpectator, { gameId, userId }, {}, {}, { withCredentials: true });
 }
 
 export const clearSpectators = (axios: Axios) => async (gameId: string): Promise<ResponseResult<{}>> => {

client/src/views/game/Create.vue

@@ -989,7 +989,7 @@ export default {
       e.preventDefault();
 
       const template = await import(`../../config/gamesettings/${this.settingsTemplateName}.json`);
-      this.settings = template;
+      this.settings = JSON.parse(JSON.stringify(template)); // deep clone
     },
     async handleSubmit (e) {
       e.preventDefault();

client/src/views/game/components/GameContainer.vue

@@ -36,6 +36,8 @@ const polling = ref(0);
 const el: Ref<HTMLElement | null> = ref(null);
 
 onMounted(() => {
+  let unsubscribe;
+
   createGameContainer(store, (msg) => toast.error(msg), eventBus).then((gameContainer) => {
     const checkPerformance = () => {
       const webGLSupport = gameContainer.checkPerformance();
@@ -100,7 +102,9 @@ onMounted(() => {
       emit("onObjectsClicked", objects);
     };
 
-    watch(computed(() => store.state.game), (newGame) => updateGame(newGame));
+    const unwatch = watch(computed(() => store.state.game), (newGame) => {
+      updateGame(newGame)
+    }); // watcher is created async, so we have to do the cleanup ourselves
 
     window.addEventListener('resize', handleResize)
 
@@ -125,7 +129,11 @@ onMounted(() => {
       touchPlayer();
     }
 
-    onBeforeUnmount(() => {
+    unsubscribe = () => {
+      unwatch();
+
+      window.removeEventListener('resize', handleResize);
+
       clearInterval(polling.value);
 
       gameContainer.destroy();
@@ -136,7 +144,13 @@ onMounted(() => {
       eventBus.off(MapEventBusEventNames.MapOnCarrierRightClicked, onCarrierRightClickedHandler);
       eventBus.off(MapEventBusEventNames.MapOnWaypointCreated, onWaypointCreatedHandler);
       eventBus.off(MapEventBusEventNames.MapOnObjectsClicked, onObjectsClickedHandler);
-    });
+    };
+  });
+
+  onBeforeUnmount(() => {
+    if (unsubscribe) {
+      unsubscribe();
+    }
   });
 });
 </script>

client/src/views/game/components/carrier/CarrierWaypoints.vue

@@ -216,7 +216,7 @@ export default {
       this.recalculateTotalEta()
       this.recalculateLooped()
     },
-    onWaypointOutOfRange ({ waypoint }) {
+    onWaypointOutOfRange () {
       this.$toast.error(`This waypoint is out of hyperspace range.`)
     },
     recalculateTotalEta () {

client/src/views/game/components/spectators/InviteSpectator.vue

@@ -74,15 +74,14 @@ const handleSubmit = async e => {
 
   if (isOk(response)) {
     toast.success(`You invited ${usernamesText} to spectate you in this game.`);
-
-    emit('onSpectatorsInvited');
-
-    usernames.value = '';
   } else {
     console.log(formatError(response));
     errors.value = extractErrors(response)
   }
 
+  usernames.value = '';
+  emit('onSpectatorsInvited');
+
   isLoading.value = false;
 }
 </script>

common/src/api/controllers/spectator.ts

@@ -4,6 +4,6 @@ import {type GameSpectator} from "../types/common/game";
 export const createSpectatorRoutes = <ID>() => ({
     listSpectators: new GetRoute<{ gameId: string }, {}, GameSpectator<ID>[] | null>("/api/game/:gameId/spectators"),
     inviteSpectators: new PutRoute<{ gameId: string }, {}, { usernames: string[] }, {}>("/api/game/:gameId/spectators/invite"),
-    uninviteSpectator: new PutRoute<{ gameId: string }, {}, {}, {}>("/api/game/:gameId/spectators/uninvite/:userId"),
+    uninviteSpectator: new PutRoute<{ gameId: string, userId: string }, {}, {}, {}>("/api/game/:gameId/spectators/uninvite/:userId"),
     clearSpectators: new DeleteRoute<{ gameId: string }, {}, {}>("/api/game/:gameId/spectators"),
 });

server/services/spectator.ts

@@ -6,6 +6,7 @@ import { Game, GameSpectator } from "./types/Game";
 import { Player } from "./types/Player";
 import UserService from "./user";
 import {notNull} from "./utils";
+import {User} from "./types/User";
 
 export default class SpectatorService {
     gameRepo: Repository<Game>;
@@ -31,11 +32,29 @@ export default class SpectatorService {
             throw new ValidationError(`Spectating is not enabled in this game.`);
         }
 
-        const users = (await Promise.all(usernames.map(username => this.userService.getByUsername(username, { _id: 1 })))).filter(notNull);
+        const requestUser = async (username: string): Promise<{ username: string, user: User | null }> => {
+            const user = await this.userService.getByUsername(username, { _id: 1 });
+            return {
+                username,
+                user
+            };
+        };
+
+        const attemptedUsers: { username: string, user: User | null }[] = await Promise.all(usernames.map((username) => requestUser(username)));
 
-        if (users.length !== usernames.length) {
-            const missingUsernames = usernames.filter(username => !users.find(user => user.username === username));
-            throw new ValidationError(`The following users do not exist: ${missingUsernames.join(', ')}`);
+        const users: User[] = [];
+        const missingUsernames: string[] = [];
+
+        for (const { username, user } of attemptedUsers) {
+            if (user) {
+                users.push(user);
+            } else {
+                missingUsernames.push(username);
+            }
+        }
+
+        if (!users.length) {
+            throw new ValidationError(`No users found for the provided usernames: ${missingUsernames.join(', ')}`);
         }
 
         await this.gameRepo.updateOne({
@@ -48,6 +67,10 @@ export default class SpectatorService {
                 }
             }
         });
+
+        if (missingUsernames.length !== 0) {
+            throw new ValidationError(`The following usernames were not found: ${missingUsernames.join(', ')}`);
+        }
     }
 
     async uninvite(game: Game, player: Player, userId: DBObjectId) {