@signe/room 2.4.0 → 2.4.2

package/dist/index.d.ts

@@ -562,12 +562,16 @@ declare class MockPartyClient {
     _trigger(event: any, data: any): void;
     send(data: any): Promise<void>;
 }
+interface MockContextOptions {
+    parties?: any;
+    partyFn?: (room: MockPartyRoom) => any;
+}
 declare class MockContext {
     room: MockPartyRoom;
     parties: {
-        main: Map<string, any>;
+        main: any;
     };
-    constructor(room: MockPartyRoom, options?: any);
+    constructor(room: MockPartyRoom, options?: MockContextOptions);
 }
 declare class MockPartyRoom {
     id?: string;
@@ -576,7 +580,10 @@ declare class MockPartyRoom {
     context: MockContext;
     env: {};
     constructor(id?: string, options?: any);
-    connection(server: Server, id?: string): Promise<MockPartyClient>;
+    connection(server: Server, id?: string, opts?: {
+        query?: Record<string, string>;
+        headers?: Record<string, string>;
+    }): Promise<MockPartyClient>;
     broadcast(data: any): void;
     getConnection(id: string): MockPartyClient;
     getConnections(): MockConnection[];
@@ -668,10 +675,15 @@ declare function testRoom(Room: any, options?: {
     hibernate?: boolean;
     shard?: boolean;
     env?: Record<string, string>;
+    parties?: Record<string, (io: any) => any>;
+    partyFn?: (io: any) => any;
 }): Promise<{
     server: Server | Shard;
     room: any;
-    createClient: (id?: string) => Promise<MockPartyClient>;
+    createClient: (id?: string, opts?: {
+        query?: Record<string, string>;
+        headers?: Record<string, string>;
+    }) => Promise<MockPartyClient>;
 }>;
 declare function request(room: Server | Shard, path: string, options?: {
     method: 'GET' | 'POST' | 'PUT' | 'DELETE';

package/dist/index.js

@@ -686,7 +686,7 @@ var Server = class {
         publicId
       };
       try {
-        const targetRoomParty = this.room.context.parties.main.get(targetRoomId);
+        const targetRoomParty = await this.room.context.parties.main.get(targetRoomId);
         const response2 = await targetRoomParty.fetch("/session-transfer", {
           method: "POST",
           body: JSON.stringify(transferData),
@@ -1755,10 +1755,14 @@ async function testRoom(Room3, options = {}) {
   const isShard = options.shard || false;
   const io = new ServerIo(Room3.path, isShard ? {
     parties: {
-      game: createServer
+      game: createServer,
+      ...options.parties || {}
     },
+    partyFn: options.partyFn,
     env: options.env
   } : {
+    parties: options.parties,
+    partyFn: options.partyFn,
     env: options.env
   });
   Room3.prototype.throttleSync = 0;
@@ -1769,18 +1773,27 @@ async function testRoom(Room3, options = {}) {
     const shardServer = new Shard(io);
     shardServer.subRoom = null;
     server = shardServer;
-    for (const lobby of io.context.parties.main.values()) {
-      await lobby.server.onStart();
+    if (io.context.parties.main instanceof Map) {
+      for (const lobby of io.context.parties.main.values()) {
+        await lobby.server.onStart();
+      }
     }
   } else {
     server = await createServer(io);
+    if (io.context.parties.main instanceof Map) {
+      for (const lobby of io.context.parties.main.values()) {
+        if (lobby.server && lobby.server !== server) {
+          await lobby.server.onStart();
+        }
+      }
+    }
   }
   await server.onStart();
   return {
     server,
     room: server.subRoom,
-    createClient: /* @__PURE__ */ __name(async (id2) => {
-      const client = await io.connection(server, id2);
+    createClient: /* @__PURE__ */ __name(async (id2, opts) => {
+      const client = await io.connection(server, id2, opts);
       return client;
     }, "createClient")
   };
@@ -1845,14 +1858,22 @@ var MockLobby = class MockLobby2 {
     __name(this, "MockLobby");
   }
   server;
-  constructor(server) {
+  lobbyId;
+  constructor(server, lobbyId) {
     this.server = server;
+    this.lobbyId = lobbyId;
   }
-  socket() {
+  socket(_init) {
     return new MockPartyClient(this.server);
   }
+  async connection(idOrOptions, maybeOptions) {
+    const id2 = typeof idOrOptions === "string" ? idOrOptions : idOrOptions?.id;
+    const options = (typeof idOrOptions === "string" ? maybeOptions : idOrOptions) || {};
+    return this.server.room.connection(this.server, id2, options);
+  }
   fetch(url, options) {
-    return request(this.server, url, options);
+    const baseUrl = url.includes("shard") ? "" : "/parties/main/" + this.lobbyId;
+    return request(this.server, baseUrl + url, options);
   }
 };
 var MockContext = class MockContext2 {
@@ -1867,8 +1888,29 @@ var MockContext = class MockContext2 {
       main: /* @__PURE__ */ new Map()
     };
     const parties = options.parties || {};
-    for (let lobbyId in parties) {
-      this.parties.main.set(lobbyId, new MockLobby(parties[lobbyId](room)));
+    if (options.partyFn) {
+      const serverCache = /* @__PURE__ */ new Map();
+      this.parties.main = {
+        get: /* @__PURE__ */ __name(async (lobbyId) => {
+          if (!serverCache.has(lobbyId)) {
+            const io = new MockPartyRoom(lobbyId, {
+              env: this.room.env
+            });
+            const server2 = options.partyFn(io);
+            if (typeof server2.onStart === "function") {
+              await server2.onStart();
+            }
+            serverCache.set(lobbyId, server2);
+          }
+          const server = serverCache.get(lobbyId);
+          return new MockLobby(server, lobbyId);
+        }, "get")
+      };
+    } else {
+      for (let lobbyId in parties) {
+        const server = parties[lobbyId](room);
+        this.parties.main.set(lobbyId, new MockLobby(server, lobbyId));
+      }
     }
   }
 };
@@ -1888,17 +1930,24 @@ var MockPartyRoom = class MockPartyRoom2 {
     this.env = {};
     this.id = id2 || generateShortUUID();
     this.context = new MockContext(this, {
-      parties: options.parties || {}
+      parties: options.parties,
+      partyFn: options.partyFn
     });
     this.env = options.env || {};
   }
-  async connection(server, id2) {
+  async connection(server, id2, opts) {
     const socket = new MockPartyClient(server, id2);
     const url = new URL("http://localhost");
+    if (opts?.query) {
+      for (const [key, value] of Object.entries(opts.query)) {
+        url.searchParams.set(key, String(value));
+      }
+    }
     const request2 = new Request(url.toString(), {
       method: "GET",
       headers: {
-        "Content-Type": "application/json"
+        "Content-Type": "application/json",
+        ...opts?.headers || {}
       }
     });
     await server.onConnect(socket.conn, {