converted tic-tac-toe to single room mode

Author: yiochen

common/config/rush/pnpm-lock.yaml

@@ -32,7 +32,7 @@
         "@prisel/monopoly-common": "^0.0.0",
         "@prisel/server": "^0.1.3",
         "@prisel/protos": "^0.1.3",
-        "@prisel/state": "~0.0.13",
+        "@prisel/state": "~0.0.14",
         "lowdb": "3.0.0"
     },
     "devDependencies": {

packages/monopoly/package.json

@@ -36,7 +36,7 @@
         "preset": "@prisel/jest-preset"
     },
     "dependencies": {
-        "@prisel/state": "~0.0.13",
+        "@prisel/state": "~0.0.14",
         "@prisel/protos": "^0.1.3",
         "@prisel/common": "^0.1.3",
         "debug": "^4.3.3",

packages/server/package.json

@@ -1,6 +1,6 @@
 import { Packet, Request, Response } from '@prisel/common';
 import { priselpb } from '@prisel/protos';
-import { getAmbient, hasAmbient, newEvent } from '@prisel/state';
+import { getAmbient, newEvent } from '@prisel/state';
 import { getPlayerAmbient, roomIdAmbient } from './ambients';
 import { Socket } from './objects';
 import { Player } from './player';
@@ -66,11 +66,17 @@ export const customActionPacketEvent = (action: string) =>
         .filter(isCustomAction(action));
 
 export function isInRoom(data: { player: Player }) {
-    return hasAmbient(roomIdAmbient) && data.player.getRoomId() === getAmbient(roomIdAmbient);
+    return data.player.getRoomId() === getAmbient(roomIdAmbient);
 }
 
 export function isSystemAction(systemActionType: priselpb.SystemActionType) {
     return ({ packet }: { packet: Packet }) => {
         return Request.isRequest(packet) && Packet.getSystemAction(packet) === systemActionType;
     };
 }
+
+const [playerExitEvent, _emitPlayerExitEvent] = newEvent<Player>('player-exit');
+export const emitPlayerExitEvent = _emitPlayerExitEvent;
+export const playerExitRoomEvent = playerExitEvent.filter(
+    (player) => player.getRoomId() === getAmbient(roomIdAmbient),
+);

packages/server/src/events.ts

@@ -9,6 +9,7 @@ export * as Messages from './message';
 export * from './objects/index';
 export { newPlayer } from './player';
 export type { Player, PlayerId, PlayerOption } from './player';
+export { newRoomEvent, playerJoinEvent, playerLeaveEvent } from './roomEvent';
 export type { CreateGame, RoomType } from './serverConfig';
 export { Server } from './serverState';
 export { broadcast } from './utils/broadcast';

packages/server/src/index.ts

@@ -0,0 +1,28 @@
+import { Emitter, Event, getAmbient, newEvent } from '@prisel/state';
+import { roomIdAmbient } from './ambients';
+import { Player } from './player';
+
+export function newRoomEvent<T = void>(name: string): [Event<T>, Emitter<T>] {
+    const [event, emitter] = newEvent<{ roomId: string; value: T }>(name);
+
+    return [
+        event.filter((e) => e.roomId === getAmbient(roomIdAmbient)).map((e) => e.value),
+        {
+            ref: event.ref,
+            send: ((event?: any) =>
+                emitter.send({
+                    roomId: getAmbient(roomIdAmbient),
+                    value: event,
+                })) as Emitter<T>['send'],
+        },
+    ];
+}
+
+/**
+ * Event fired when a player joins the room.
+ */
+export const [playerJoinEvent, emitPlayerJoinEvent] = newRoomEvent<Player>('player-join-room');
+/**
+ * Event fired when a player leaves the room.
+ */
+export const [playerLeaveEvent, emitPlayerLeaveEvent] = newRoomEvent<Player>('player-leave-room');