@rpgjs/client 5.0.0-beta.10 → 5.0.0-beta.11

package/src/services/pointerContext.ts

@@ -0,0 +1,84 @@
+export interface ClientPointerPosition {
+  x: number;
+  y: number;
+}
+
+export interface ClientPointerContext {
+  screen(): ClientPointerPosition | null;
+  world(): ClientPointerPosition | null;
+  update(screen: ClientPointerPosition | null, world?: ClientPointerPosition | null): ClientPointerPosition | null;
+  updateFromEvent(event: any): ClientPointerPosition | null;
+}
+
+function toPosition(point: any): ClientPointerPosition | null {
+  const x = Number(point?.x);
+  const y = Number(point?.y);
+
+  if (!Number.isFinite(x) || !Number.isFinite(y)) {
+    return null;
+  }
+
+  return { x, y };
+}
+
+function extractGlobalPoint(event: any): ClientPointerPosition | null {
+  return toPosition(event?.global)
+    ?? toPosition(event?.data?.global)
+    ?? toPosition(event);
+}
+
+function extractWorldPoint(event: any, global: ClientPointerPosition | null): ClientPointerPosition | null {
+  const target = event?.currentTarget ?? event?.target;
+
+  if (target && global && typeof target.toLocal === "function") {
+    return toPosition(target.toLocal(global));
+  }
+
+  if (typeof event?.getLocalPosition === "function") {
+    return toPosition(event.getLocalPosition(target));
+  }
+
+  if (typeof event?.data?.getLocalPosition === "function") {
+    return toPosition(event.data.getLocalPosition(target));
+  }
+
+  return global;
+}
+
+export function createClientPointerContext(): ClientPointerContext {
+  let lastScreen: ClientPointerPosition | null = null;
+  let lastWorld: ClientPointerPosition | null = null;
+
+  const update = (screen: ClientPointerPosition | null, world?: ClientPointerPosition | null) => {
+    const nextScreen = toPosition(screen);
+    const nextWorld = toPosition(world) ?? nextScreen;
+
+    if (nextScreen) {
+      lastScreen = nextScreen;
+    }
+
+    if (nextWorld) {
+      lastWorld = nextWorld;
+    }
+
+    return lastWorld ? { ...lastWorld } : null;
+  };
+
+  return {
+    screen() {
+      return lastScreen ? { ...lastScreen } : null;
+    },
+
+    world() {
+      return lastWorld ? { ...lastWorld } : null;
+    },
+
+    update,
+
+    updateFromEvent(event: any) {
+      const global = extractGlobalPoint(event);
+      const world = extractWorldPoint(event, global);
+      return update(global, world);
+    },
+  };
+}

package/src/services/standalone-message.ts

@@ -0,0 +1,7 @@
+export function normalizeStandaloneMessage(event: unknown): any {
+  const raw = event && typeof event === "object" && "data" in event
+    ? (event as MessageEvent).data
+    : event;
+
+  return typeof raw === "string" ? JSON.parse(raw) : raw;
+}

package/src/services/standalone.spec.ts

@@ -0,0 +1,34 @@
+import { describe, expect, test, vi } from "vitest";
+import { normalizeStandaloneMessage } from "./standalone-message";
+
+describe("standalone websocket bridge", () => {
+  test("dispatches mock room object broadcasts to named listeners", () => {
+    const onSpawn = vi.fn();
+    const object = normalizeStandaloneMessage({
+      type: "projectile:spawnBatch",
+      value: {
+        projectiles: [{ id: "p1", type: "bolt" }],
+      },
+    });
+
+    if (object.type === "projectile:spawnBatch") {
+      onSpawn(object.value);
+    }
+
+    expect(onSpawn).toHaveBeenCalledWith({
+      projectiles: [{ id: "p1", type: "bolt" }],
+    });
+  });
+
+  test("still accepts browser-style string messages", () => {
+    expect(normalizeStandaloneMessage({
+      data: JSON.stringify({
+        type: "projectile:spawnBatch",
+        value: { projectiles: [] },
+      }),
+    })).toEqual({
+      type: "projectile:spawnBatch",
+      value: { projectiles: [] },
+    });
+  });
+});

package/src/services/standalone.ts

@@ -7,6 +7,7 @@ import { LoadMapToken } from "./loadMap";
 import { RpgGui } from "../Gui/Gui";
 import { provideKeyboardControls } from "./keyboardControls";
 import { provideSaveClient } from "./save";
+import { normalizeStandaloneMessage } from "./standalone-message";
 
 type ServerIo = any;
 type ClientIo = any;
@@ -58,16 +59,16 @@ class BridgeWebsocket extends AbstractWebsocket {
       }
     })
     listeners?.(this.socket)
-    await this.serverInstance.onConnect(this.socket.conn as any, { request } as any);
     this.room.clients.set(this.socket.id, this.socket);
     this.pendingOn.forEach(({ event, callback }) => this.socket.addEventListener(event, callback));
     this.pendingOn = [];
+    await this.serverInstance.onConnect(this.socket.conn as any, { request } as any);
     return this.socket
   }
 
   on(key: string, callback: (data: any) => void) {
     const handler = (event) => {
-      const object = JSON.parse(event);
+      const object = normalizeStandaloneMessage(event);
       if (object.type === key) {
         callback(object.value);
       }