@rpgjs/client 5.0.0-beta.22 → 5.0.0-beta.24

package/src/services/standalone.ts

@@ -8,6 +8,7 @@ import { RpgGui } from "../Gui/Gui";
 import { provideKeyboardControls } from "./keyboardControls";
 import { provideSaveClient } from "./save";
 import { normalizeStandaloneMessage } from "./standalone-message";
+import type { SocketQuery } from "./AbstractSocket";
 
 type ServerIo = any;
 type ClientIo = any;
@@ -22,6 +23,9 @@ class BridgeWebsocket extends AbstractWebsocket {
   private room: ServerIo;
   private socket: ClientIo;
   private socketRoom?: ServerIo;
+  private roomId = "lobby-1";
+  private query?: SocketQuery;
+  private readonly privateId = "player-client-id";
   private listeners: Array<{
     event: string;
     callback: (data: any) => void;
@@ -29,11 +33,10 @@ class BridgeWebsocket extends AbstractWebsocket {
   }> = [];
   private rooms = {
     partyFn: async (roomId: string) => {
-      this.room = new ServerIo(roomId, this.rooms);
-      const server = new this.server(this.room)
+      const room = new ServerIo(roomId, this.rooms);
+      const server = new this.server(room)
       await server.onStart();
       await server.subRoom.onStart()
-      this.context.set('server', server)
       return server
     },
     env: {}
@@ -57,22 +60,8 @@ class BridgeWebsocket extends AbstractWebsocket {
 
   private async _connection(listeners?: (data: any) => void) {
     this.detachCurrentSocket();
-    this.serverInstance = this.context.get('server')
-    this.socket = new ClientIo(this.serverInstance, 'player-client-id');
-    const url = new URL('http://localhost')
-    const request = new Request(url.toString(), {
-      method: 'GET',
-      headers: {
-        'Content-Type': 'application/json'
-      }
-    })
+    await this.connectToRoom();
     listeners?.(this.socket)
-    this.room.clients.set(this.socket.id, this.socket);
-    this.socketRoom = this.room;
-    this.listeners.forEach(({ handler }) => {
-      this.socket.addEventListener("message", handler);
-    });
-    await this.serverInstance.onConnect(this.socket.conn as any, { request } as any);
     return this.socket
   }
 
@@ -129,8 +118,9 @@ class BridgeWebsocket extends AbstractWebsocket {
    * await websocket.reconnect()
    * ```
    */
-  updateProperties(_params: SocketUpdateProperties) {
-    // empty
+  updateProperties({ room, query }: SocketUpdateProperties) {
+    this.roomId = room;
+    this.query = query;
   }
 
   /**
@@ -156,6 +146,49 @@ class BridgeWebsocket extends AbstractWebsocket {
     })
   }
 
+  private async connectToRoom() {
+    if (this.serverInstance?.room?.id !== this.roomId) {
+      const party = await this.room.context.parties.main.get(this.roomId);
+      this.serverInstance = party.server;
+      this.context.set('server', this.serverInstance);
+      this.room = this.serverInstance.room;
+    }
+    else {
+      this.serverInstance = this.context.get('server');
+    }
+
+    this.socket = new ClientIo(this.serverInstance, this.privateId);
+    const url = new URL('http://localhost');
+    const query = this.normalizeQuery(this.query);
+    if (query) {
+      for (const [key, value] of Object.entries(query)) {
+        url.searchParams.set(key, value);
+      }
+    }
+    const request = new Request(url.toString(), {
+      method: 'GET',
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    });
+    this.room.clients.set(this.socket.id, this.socket);
+    this.socketRoom = this.room;
+    this.listeners.forEach(({ handler }) => {
+      this.socket.addEventListener("message", handler);
+    });
+    await this.serverInstance.onConnect(this.socket.conn as any, { request } as any);
+  }
+
+  private normalizeQuery(query?: SocketQuery): Record<string, string> | undefined {
+    if (!query) {
+      return undefined;
+    }
+    return Object.fromEntries(
+      Object.entries(query)
+        .filter((entry): entry is [string, string] => typeof entry[1] === "string")
+    );
+  }
+
   private detachCurrentSocket() {
     if (!this.socket) return;
     this.listeners.forEach(({ handler }) => {

package/src/utils/syncHitbox.spec.ts

@@ -0,0 +1,79 @@
+import { signal } from "canvasengine";
+import { describe, expect, test, vi } from "vitest";
+import { load } from "@signe/sync";
+import { applySyncedHitboxPayload } from "./syncHitbox";
+
+const createObject = (id: string) => ({
+  id,
+  x: signal(10),
+  y: signal(20),
+  hitbox: signal({ w: 32, h: 32 }),
+});
+
+describe("applySyncedHitboxPayload", () => {
+  test("applies player hitboxes from sync object payloads", () => {
+    const player = createObject("player-1");
+    const sceneMap = {
+      players: () => ({ "player-1": player }),
+      events: () => ({}),
+      getObjectById: (id: string) => (id === "player-1" ? player : undefined),
+      updateHitbox: vi.fn(),
+    };
+    const payload = {
+      players: {
+        "player-1": {
+          hitbox: { w: 56, h: 50 },
+        },
+      },
+    };
+
+    load(sceneMap, payload, true);
+    expect(player.hitbox()).toEqual({ w: 32, h: 32 });
+
+    applySyncedHitboxPayload(sceneMap, payload);
+
+    expect(player.hitbox()).toEqual({ w: 56, h: 50 });
+    expect(sceneMap.updateHitbox).toHaveBeenCalledWith("player-1", 10, 20, 56, 50);
+  });
+
+  test("accepts Studio width and height hitbox payloads for events", () => {
+    const event = createObject("event-1");
+    const sceneMap = {
+      players: () => ({}),
+      events: () => ({ "event-1": event }),
+      getObjectById: (id: string) => (id === "event-1" ? event : undefined),
+      updateHitbox: vi.fn(),
+    };
+
+    applySyncedHitboxPayload(sceneMap, {
+      events: {
+        "event-1": {
+          hitbox: { width: "80", height: 40 },
+        },
+      },
+    });
+
+    expect(event.hitbox()).toEqual({ w: 80, h: 40 });
+    expect(sceneMap.updateHitbox).toHaveBeenCalledWith("event-1", 10, 20, 80, 40);
+  });
+
+  test("ignores invalid hitbox payloads", () => {
+    const player = createObject("player-1");
+    const sceneMap = {
+      players: () => ({ "player-1": player }),
+      events: () => ({}),
+      updateHitbox: vi.fn(),
+    };
+
+    applySyncedHitboxPayload(sceneMap, {
+      players: {
+        "player-1": {
+          hitbox: { w: 0, h: 40 },
+        },
+      },
+    });
+
+    expect(player.hitbox()).toEqual({ w: 32, h: 32 });
+    expect(sceneMap.updateHitbox).not.toHaveBeenCalled();
+  });
+});

package/src/utils/syncHitbox.ts

@@ -0,0 +1,104 @@
+interface HitboxSize {
+  width: number;
+  height: number;
+}
+
+const toPositiveNumber = (value: unknown): number | null => {
+  const numberValue = typeof value === "string" ? Number(value) : value;
+  return typeof numberValue === "number" && Number.isFinite(numberValue) && numberValue > 0
+    ? Math.round(numberValue)
+    : null;
+};
+
+const readSignalValue = (value: any): any => {
+  if (typeof value === "function") {
+    try {
+      return value();
+    }
+    catch {
+      return undefined;
+    }
+  }
+  return value;
+};
+
+const normalizeHitbox = (source: unknown): HitboxSize | null => {
+  if (!source || typeof source !== "object") {
+    return null;
+  }
+
+  const hitbox = source as any;
+  const width = toPositiveNumber(hitbox.w ?? hitbox.width);
+  const height = toPositiveNumber(hitbox.h ?? hitbox.height);
+
+  return width && height ? { width, height } : null;
+};
+
+const readObjectHitbox = (object: any): HitboxSize | null => {
+  return normalizeHitbox(readSignalValue(object?.hitbox));
+};
+
+const readCoordinate = (object: any, key: "x" | "y"): number | null => {
+  const value = readSignalValue(object?.[key]);
+  const numberValue = typeof value === "string" ? Number(value) : value;
+  return typeof numberValue === "number" && Number.isFinite(numberValue)
+    ? numberValue
+    : null;
+};
+
+const getObjectById = (sceneMap: any, id: string): any => {
+  return sceneMap?.getObjectById?.(id)
+    ?? sceneMap?.players?.()?.[id]
+    ?? sceneMap?.events?.()?.[id];
+};
+
+const applyHitboxToObject = (
+  sceneMap: any,
+  id: string,
+  object: any,
+  hitbox: HitboxSize,
+): void => {
+  if (!object) {
+    return;
+  }
+
+  const current = readObjectHitbox(object);
+  if (current?.width !== hitbox.width || current?.height !== hitbox.height) {
+    if (typeof object.hitbox?.set === "function") {
+      object.hitbox.set({ w: hitbox.width, h: hitbox.height });
+    }
+    else if (typeof object.setHitbox === "function") {
+      object.setHitbox(hitbox.width, hitbox.height);
+      return;
+    }
+  }
+
+  const objectId = typeof object.id === "string" && object.id ? object.id : id;
+  const x = readCoordinate(object, "x");
+  const y = readCoordinate(object, "y");
+  if (objectId && x !== null && y !== null) {
+    sceneMap?.updateHitbox?.(objectId, x, y, hitbox.width, hitbox.height);
+  }
+};
+
+const applyHitboxCollection = (sceneMap: any, collection: unknown): void => {
+  if (!collection || typeof collection !== "object") {
+    return;
+  }
+
+  for (const [id, patch] of Object.entries(collection)) {
+    if (!patch || typeof patch !== "object") {
+      continue;
+    }
+    const hitbox = normalizeHitbox((patch as any).hitbox);
+    if (!hitbox) {
+      continue;
+    }
+    applyHitboxToObject(sceneMap, id, getObjectById(sceneMap, id), hitbox);
+  }
+};
+
+export const applySyncedHitboxPayload = (sceneMap: any, payload: any): void => {
+  applyHitboxCollection(sceneMap, payload?.players);
+  applyHitboxCollection(sceneMap, payload?.events);
+};