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

package/dist/services/save.js.map

@@ -1 +1 @@
-{"version":3,"file":"save.js","names":[],"sources":["../../src/services/save.ts"],"sourcesContent":["import type { SaveSlotList, SaveSlotMeta } from \"@rpgjs/common\";\nimport { inject } from \"../core/inject\";\nimport { AbstractWebsocket, WebSocketToken } from \"./AbstractSocket\";\n\nexport const SaveClientToken = \"SaveClientToken\";\n\ntype SaveListResult = {\n  requestId: string;\n  slots: SaveSlotList;\n};\n\ntype SaveSaveResult = {\n  requestId: string;\n  index: number;\n  slots: SaveSlotList;\n};\n\ntype SaveLoadResult = {\n  requestId: string;\n  index: number;\n  ok: boolean;\n  slot?: SaveSlotMeta;\n};\n\ntype SaveErrorResult = {\n  requestId: string;\n  message: string;\n};\n\ntype PendingRequest = {\n  resolve: (value: any) => void;\n  reject: (error: Error) => void;\n};\n\nexport class SaveClientService {\n  private webSocket: AbstractWebsocket = inject(WebSocketToken);\n  private pending: Map<string, PendingRequest> = new Map();\n  private requestCounter = 0;\n\n  initialize() {\n    const saveListResult = (data: SaveListResult) => this.resolveRequest(data.requestId, data);\n    const saveSaveResult = (data: SaveSaveResult) => this.resolveRequest(data.requestId, data);\n    const saveLoadResult = (data: SaveLoadResult) => this.resolveRequest(data.requestId, data);\n    const saveErrorResult = (data: SaveErrorResult) => this.rejectRequest(data.requestId, data.message);\n    this.webSocket.off(\"save.list.result\", saveListResult);\n    this.webSocket.off(\"save.save.result\", saveSaveResult);\n    this.webSocket.off(\"save.load.result\", saveLoadResult);\n    this.webSocket.off(\"save.error\", saveErrorResult);\n    this.webSocket.on(\"save.list.result\", saveListResult);\n    this.webSocket.on(\"save.save.result\", saveSaveResult);\n    this.webSocket.on(\"save.load.result\", saveLoadResult);\n    this.webSocket.on(\"save.error\", saveErrorResult);\n  }\n\n  listSlots(): Promise<SaveSlotList> {\n    return this.request<SaveListResult>(\"save.list\", {}).then((result) => result.slots);\n  }\n\n  saveSlot(index: number, meta: SaveSlotMeta = {}): Promise<SaveSlotList> {\n    return this.request<SaveSaveResult>(\"save.save\", { index, meta }).then((result) => result.slots);\n  }\n\n  loadSlot(index: number): Promise<boolean> {\n    return this.request<SaveLoadResult>(\"save.load\", { index }).then((result) => result.ok);\n  }\n\n  private request<T>(event: string, payload: Record<string, any>): Promise<T> {\n    return new Promise((resolve, reject) => {\n      if (!this.webSocket) {\n        this.initialize();\n      }\n      const requestId = this.nextRequestId();\n      this.pending.set(requestId, { resolve, reject });\n      this.webSocket?.emit(event, { requestId, ...payload });\n    });\n  }\n\n  private resolveRequest(requestId: string, result: any) {\n    const pending = this.pending.get(requestId);\n    if (!pending) return;\n    this.pending.delete(requestId);\n    pending.resolve(result);\n  }\n\n  private rejectRequest(requestId: string, message: string) {\n    const pending = this.pending.get(requestId);\n    if (!pending) return;\n    this.pending.delete(requestId);\n    pending.reject(new Error(message));\n  }\n\n  private nextRequestId(): string {\n    this.requestCounter += 1;\n    return `${Date.now()}-${this.requestCounter}`;\n  }\n}\n\nexport function provideSaveClient() {\n  return {\n    provide: SaveClientService,\n    useClass: SaveClientService,\n  };\n}\n"],"mappings":";;;AAIA,IAAa,kBAAkB;AA8B/B,IAAa,oBAAb,MAA+B;;mBACU,OAAO,eAAe;iCACd,IAAI,KAAK;wBAC/B;;CAEzB,aAAa;EACX,MAAM,kBAAkB,SAAyB,KAAK,eAAe,KAAK,WAAW,KAAK;EAC1F,MAAM,kBAAkB,SAAyB,KAAK,eAAe,KAAK,WAAW,KAAK;EAC1F,MAAM,kBAAkB,SAAyB,KAAK,eAAe,KAAK,WAAW,KAAK;EAC1F,MAAM,mBAAmB,SAA0B,KAAK,cAAc,KAAK,WAAW,KAAK,QAAQ;AACnG,OAAK,UAAU,IAAI,oBAAoB,eAAe;AACtD,OAAK,UAAU,IAAI,oBAAoB,eAAe;AACtD,OAAK,UAAU,IAAI,oBAAoB,eAAe;AACtD,OAAK,UAAU,IAAI,cAAc,gBAAgB;AACjD,OAAK,UAAU,GAAG,oBAAoB,eAAe;AACrD,OAAK,UAAU,GAAG,oBAAoB,eAAe;AACrD,OAAK,UAAU,GAAG,oBAAoB,eAAe;AACrD,OAAK,UAAU,GAAG,cAAc,gBAAgB;;CAGlD,YAAmC;AACjC,SAAO,KAAK,QAAwB,aAAa,EAAE,CAAC,CAAC,MAAM,WAAW,OAAO,MAAM;;CAGrF,SAAS,OAAe,OAAqB,EAAE,EAAyB;AACtE,SAAO,KAAK,QAAwB,aAAa;GAAE;GAAO;GAAM,CAAC,CAAC,MAAM,WAAW,OAAO,MAAM;;CAGlG,SAAS,OAAiC;AACxC,SAAO,KAAK,QAAwB,aAAa,EAAE,OAAO,CAAC,CAAC,MAAM,WAAW,OAAO,GAAG;;CAGzF,QAAmB,OAAe,SAA0C;AAC1E,SAAO,IAAI,SAAS,SAAS,WAAW;AACtC,OAAI,CAAC,KAAK,UACR,MAAK,YAAY;GAEnB,MAAM,YAAY,KAAK,eAAe;AACtC,QAAK,QAAQ,IAAI,WAAW;IAAE;IAAS;IAAQ,CAAC;AAChD,QAAK,WAAW,KAAK,OAAO;IAAE;IAAW,GAAG;IAAS,CAAC;IACtD;;CAGJ,eAAuB,WAAmB,QAAa;EACrD,MAAM,UAAU,KAAK,QAAQ,IAAI,UAAU;AAC3C,MAAI,CAAC,QAAS;AACd,OAAK,QAAQ,OAAO,UAAU;AAC9B,UAAQ,QAAQ,OAAO;;CAGzB,cAAsB,WAAmB,SAAiB;EACxD,MAAM,UAAU,KAAK,QAAQ,IAAI,UAAU;AAC3C,MAAI,CAAC,QAAS;AACd,OAAK,QAAQ,OAAO,UAAU;AAC9B,UAAQ,OAAO,IAAI,MAAM,QAAQ,CAAC;;CAGpC,gBAAgC;AAC9B,OAAK,kBAAkB;AACvB,SAAO,GAAG,KAAK,KAAK,CAAC,GAAG,KAAK;;;AAIjC,SAAgB,oBAAoB;AAClC,QAAO;EACL,SAAS;EACT,UAAU;EACX"}
+{"version":3,"file":"save.js","names":[],"sources":["../../src/services/save.ts"],"sourcesContent":["import type { SaveSlotList, SaveSlotMeta } from \"@rpgjs/common\";\nimport { inject } from \"../core/inject\";\nimport { AbstractWebsocket, WebSocketToken } from \"./AbstractSocket\";\n\nexport const SaveClientToken = \"SaveClientToken\";\n\ntype SaveListResult = {\n  requestId: string;\n  slots: SaveSlotList;\n};\n\ntype SaveSaveResult = {\n  requestId: string;\n  index: number;\n  slots: SaveSlotList;\n};\n\ntype SaveLoadResult = {\n  requestId: string;\n  index: number;\n  ok: boolean;\n  slot?: SaveSlotMeta;\n};\n\ntype SaveErrorResult = {\n  requestId: string;\n  message: string;\n};\n\ntype PendingRequest = {\n  resolve: (value: any) => void;\n  reject: (error: Error) => void;\n};\n\nexport class SaveClientService {\n  private webSocket: AbstractWebsocket = inject(WebSocketToken);\n  private pending: Map<string, PendingRequest> = new Map();\n  private requestCounter = 0;\n\n  initialize() {\n    const saveListResult = (data: SaveListResult) => this.resolveRequest(data.requestId, data);\n    const saveSaveResult = (data: SaveSaveResult) => this.resolveRequest(data.requestId, data);\n    const saveLoadResult = (data: SaveLoadResult) => this.resolveRequest(data.requestId, data);\n    const saveErrorResult = (data: SaveErrorResult) => this.rejectRequest(data.requestId, data.message);\n    this.webSocket.off(\"save.list.result\", saveListResult);\n    this.webSocket.off(\"save.save.result\", saveSaveResult);\n    this.webSocket.off(\"save.load.result\", saveLoadResult);\n    this.webSocket.off(\"save.error\", saveErrorResult);\n    this.webSocket.on(\"save.list.result\", saveListResult);\n    this.webSocket.on(\"save.save.result\", saveSaveResult);\n    this.webSocket.on(\"save.load.result\", saveLoadResult);\n    this.webSocket.on(\"save.error\", saveErrorResult);\n  }\n\n  listSlots(): Promise<SaveSlotList> {\n    return this.request<SaveListResult>(\"save.list\", {}).then((result) => result.slots);\n  }\n\n  saveSlot(index: number, meta: SaveSlotMeta = {}): Promise<SaveSlotList> {\n    return this.request<SaveSaveResult>(\"save.save\", { index, meta }).then((result) => result.slots);\n  }\n\n  loadSlot(index: number): Promise<boolean> {\n    return this.request<SaveLoadResult>(\"save.load\", { index }).then((result) => result.ok);\n  }\n\n  private request<T>(event: string, payload: Record<string, any>): Promise<T> {\n    return new Promise((resolve, reject) => {\n      if (!this.webSocket) {\n        this.initialize();\n      }\n      const requestId = this.nextRequestId();\n      this.pending.set(requestId, { resolve, reject });\n      this.webSocket?.emit(event, { requestId, ...payload });\n    });\n  }\n\n  private resolveRequest(requestId: string, result: any) {\n    const pending = this.pending.get(requestId);\n    if (!pending) return;\n    this.pending.delete(requestId);\n    pending.resolve(result);\n  }\n\n  private rejectRequest(requestId: string, message: string) {\n    const pending = this.pending.get(requestId);\n    if (!pending) return;\n    this.pending.delete(requestId);\n    pending.reject(new Error(message));\n  }\n\n  private nextRequestId(): string {\n    this.requestCounter += 1;\n    return `${Date.now()}-${this.requestCounter}`;\n  }\n}\n\nexport function provideSaveClient() {\n  return {\n    provide: SaveClientService,\n    useClass: SaveClientService,\n  };\n}\n"],"mappings":";;;AAIA,IAAa,kBAAkB;AA8B/B,IAAa,oBAAb,MAA+B;;mBACU,OAAO,cAAc;iCACb,IAAI,IAAI;wBAC9B;;CAEzB,aAAa;EACX,MAAM,kBAAkB,SAAyB,KAAK,eAAe,KAAK,WAAW,IAAI;EACzF,MAAM,kBAAkB,SAAyB,KAAK,eAAe,KAAK,WAAW,IAAI;EACzF,MAAM,kBAAkB,SAAyB,KAAK,eAAe,KAAK,WAAW,IAAI;EACzF,MAAM,mBAAmB,SAA0B,KAAK,cAAc,KAAK,WAAW,KAAK,OAAO;EAClG,KAAK,UAAU,IAAI,oBAAoB,cAAc;EACrD,KAAK,UAAU,IAAI,oBAAoB,cAAc;EACrD,KAAK,UAAU,IAAI,oBAAoB,cAAc;EACrD,KAAK,UAAU,IAAI,cAAc,eAAe;EAChD,KAAK,UAAU,GAAG,oBAAoB,cAAc;EACpD,KAAK,UAAU,GAAG,oBAAoB,cAAc;EACpD,KAAK,UAAU,GAAG,oBAAoB,cAAc;EACpD,KAAK,UAAU,GAAG,cAAc,eAAe;CACjD;CAEA,YAAmC;EACjC,OAAO,KAAK,QAAwB,aAAa,CAAC,CAAC,EAAE,MAAM,WAAW,OAAO,KAAK;CACpF;CAEA,SAAS,OAAe,OAAqB,CAAC,GAA0B;EACtE,OAAO,KAAK,QAAwB,aAAa;GAAE;GAAO;EAAK,CAAC,EAAE,MAAM,WAAW,OAAO,KAAK;CACjG;CAEA,SAAS,OAAiC;EACxC,OAAO,KAAK,QAAwB,aAAa,EAAE,MAAM,CAAC,EAAE,MAAM,WAAW,OAAO,EAAE;CACxF;CAEA,QAAmB,OAAe,SAA0C;EAC1E,OAAO,IAAI,SAAS,SAAS,WAAW;GACtC,IAAI,CAAC,KAAK,WACR,KAAK,WAAW;GAElB,MAAM,YAAY,KAAK,cAAc;GACrC,KAAK,QAAQ,IAAI,WAAW;IAAE;IAAS;GAAO,CAAC;GAC/C,KAAK,WAAW,KAAK,OAAO;IAAE;IAAW,GAAG;GAAQ,CAAC;EACvD,CAAC;CACH;CAEA,eAAuB,WAAmB,QAAa;EACrD,MAAM,UAAU,KAAK,QAAQ,IAAI,SAAS;EAC1C,IAAI,CAAC,SAAS;EACd,KAAK,QAAQ,OAAO,SAAS;EAC7B,QAAQ,QAAQ,MAAM;CACxB;CAEA,cAAsB,WAAmB,SAAiB;EACxD,MAAM,UAAU,KAAK,QAAQ,IAAI,SAAS;EAC1C,IAAI,CAAC,SAAS;EACd,KAAK,QAAQ,OAAO,SAAS;EAC7B,QAAQ,OAAO,IAAI,MAAM,OAAO,CAAC;CACnC;CAEA,gBAAgC;EAC9B,KAAK,kBAAkB;EACvB,OAAO,GAAG,KAAK,IAAI,EAAE,GAAG,KAAK;CAC/B;AACF;AAEA,SAAgB,oBAAoB;CAClC,OAAO;EACL,SAAS;EACT,UAAU;CACZ;AACF"}

package/dist/services/save.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/services/standalone-message.d.ts

@@ -0,0 +1 @@
+export declare function normalizeStandaloneMessage(event: unknown): any;

package/dist/services/standalone-message.js

@@ -0,0 +1,9 @@
+//#region src/services/standalone-message.ts
+function normalizeStandaloneMessage(event) {
+	const raw = event && typeof event === "object" && "data" in event ? event.data : event;
+	return typeof raw === "string" ? JSON.parse(raw) : raw;
+}
+//#endregion
+export { normalizeStandaloneMessage };
+
+//# sourceMappingURL=standalone-message.js.map

package/dist/services/standalone-message.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"standalone-message.js","names":[],"sources":["../../src/services/standalone-message.ts"],"sourcesContent":["export function normalizeStandaloneMessage(event: unknown): any {\n  const raw = event && typeof event === \"object\" && \"data\" in event\n    ? (event as MessageEvent).data\n    : event;\n\n  return typeof raw === \"string\" ? JSON.parse(raw) : raw;\n}\n"],"mappings":";AAAA,SAAgB,2BAA2B,OAAqB;CAC9D,MAAM,MAAM,SAAS,OAAO,UAAU,YAAY,UAAU,QACvD,MAAuB,OACxB;CAEJ,OAAO,OAAO,QAAQ,WAAW,KAAK,MAAM,GAAG,IAAI;AACrD"}

package/dist/services/standalone.js

@@ -2,8 +2,9 @@ import { AbstractWebsocket, WebSocketToken } from "./AbstractSocket.js";
 import { provideSaveClient } from "./save.js";
 import { RpgGui } from "../Gui/Gui.js";
 import { RpgClientEngine } from "../RpgClientEngine.js";
-import { ClientIo, ServerIo } from "../node_modules/.pnpm/@signe_room@2.9.0/node_modules/@signe/room/dist/index.js";
+import { ClientIo, ServerIo } from "../node_modules/.pnpm/@signe_room@3.0.1/node_modules/@signe/room/dist/index.js";
 import { provideKeyboardControls } from "./keyboardControls.js";
+import { normalizeStandaloneMessage } from "./standalone-message.js";
 import { UpdateMapService, UpdateMapToken } from "@rpgjs/common";
 //#region src/services/standalone.ts
 var BridgeWebsocket = class extends AbstractWebsocket {
@@ -42,15 +43,15 @@ var BridgeWebsocket = class extends AbstractWebsocket {
 			headers: { "Content-Type": "application/json" }
 		});
 		listeners?.(this.socket);
-		await this.serverInstance.onConnect(this.socket.conn, { request });
 		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, { request });
 		return this.socket;
 	}
 	on(key, callback) {
 		const handler = (event) => {
-			const object = JSON.parse(event);
+			const object = normalizeStandaloneMessage(event);
 			if (object.type === key) callback(object.value);
 		};
 		if (!this.socket) {

package/dist/services/standalone.js.map

@@ -1 +1 @@
-{"version":3,"file":"standalone.js","names":[],"sources":["../../src/services/standalone.ts"],"sourcesContent":["import { AbstractWebsocket, SocketUpdateProperties, WebSocketToken } from \"./AbstractSocket\";\nimport { ClientIo, ServerIo } from \"@signe/room\";\nimport { Context } from \"@signe/di\";\nimport { RpgClientEngine } from \"../RpgClientEngine\";\nimport { UpdateMapService, UpdateMapToken } from \"@rpgjs/common\";\nimport { LoadMapToken } from \"./loadMap\";\nimport { RpgGui } from \"../Gui/Gui\";\nimport { provideKeyboardControls } from \"./keyboardControls\";\nimport { provideSaveClient } from \"./save\";\n\ntype ServerIo = any;\ntype ClientIo = any;\n\ninterface StandaloneOptions {\n  env?: Record<string, any>;\n}\n\nclass BridgeWebsocket extends AbstractWebsocket {\n  private room: ServerIo;\n  private socket: ClientIo;\n  private pendingOn: Array<{ event: string; callback: (data: any) => void }> = [];\n  private rooms = {\n    partyFn: async (roomId: string) => {\n      this.room = new ServerIo(roomId, this.rooms);\n      const server = new this.server(this.room)\n      await server.onStart();\n      await server.subRoom.onStart()\n      this.context.set('server', server)\n      return server\n    },\n    env: {}\n  }\n  private serverInstance: any;\n\n  constructor(protected context: Context, private server: any, options: StandaloneOptions = {}) {\n    super(context);\n    // fake room\n    this.rooms.env = options.env || {};\n    this.room = new ServerIo(\"lobby-1\", this.rooms);\n  }\n\n  async connection(listeners?: (data: any) => void) {\n    this.serverInstance = new this.server(this.room);\n    await this.serverInstance.onStart();\n    await this.serverInstance.subRoom.onStart()\n    this.context.set('server', this.serverInstance)\n    return this._connection(listeners)\n  }\n\n  private async _connection(listeners?: (data: any) => void) {\n    this.serverInstance = this.context.get('server')\n    this.socket = new ClientIo(this.serverInstance, 'player-client-id');\n    const url = new URL('http://localhost')\n    const request = new Request(url.toString(), {\n      method: 'GET',\n      headers: {\n        'Content-Type': 'application/json'\n      }\n    })\n    listeners?.(this.socket)\n    await this.serverInstance.onConnect(this.socket.conn as any, { request } as any);\n    this.room.clients.set(this.socket.id, this.socket);\n    this.pendingOn.forEach(({ event, callback }) => this.socket.addEventListener(event, callback));\n    this.pendingOn = [];\n    return this.socket\n  }\n\n  on(key: string, callback: (data: any) => void) {\n    const handler = (event) => {\n      const object = JSON.parse(event);\n      if (object.type === key) {\n        callback(object.value);\n      }\n    };\n    if (!this.socket) {\n      this.pendingOn.push({ event: \"message\", callback: handler });\n      return;\n    }\n    this.socket.addEventListener(\"message\", handler);\n  }\n\n  off(event: string, callback: (data: any) => void) {\n    if (!this.socket) return;\n    this.socket.removeEventListener(event, callback);\n  }\n\n  emit(event: string, data: any) {\n    this.socket.send({\n      action: event,\n      value: data,\n    });\n  }\n\n  /**\n   * Update underlying connection properties before a reconnect\n   *\n   * Design\n   * - Dynamically register a factory for the requested room to ensure a fresh server instance\n   * - Swap the internal ServerIo to target the new room\n   *\n   * @param params - Properties to update\n   * @param params.room - The target room id (e.g. `map-simplemap2`)\n   *\n   * @example\n   * ```ts\n   * websocket.updateProperties({ room: 'map-simplemap2' })\n   * await websocket.reconnect()\n   * ```\n   */\n  updateProperties(_params: SocketUpdateProperties) {\n    // empty\n  }\n\n  /**\n   * Reconnect the client to the current Party room\n   *\n   * Design\n   * - Must be called after `updateProperties()` when switching rooms\n   * - Rebuilds the client <-> server bridge and re-triggers connection listeners\n   *\n   * @param listeners - Optional callback to re-bind event handlers on the new socket\n   *\n   * @example\n   * ```ts\n   * websocket.updateProperties({ room: 'map-dungeon' })\n   * await websocket.reconnect((socket) => {\n   *   // re-bind events here\n   * })\n   * ```\n   */\n  async reconnect(listeners?: (data: any) => void): Promise<void> {\n    await this._connection((socket) => {\n      listeners?.(socket)\n    })\n  }\n\n  getServer() {\n    return this.serverInstance\n  }\n\n  getSocket() {\n    return this.socket\n  }\n}\n\nclass UpdateMapStandaloneService extends UpdateMapService {\n  private server: any;\n\n  /**\n   * Update the current room map data on the server side\n   *\n   * Design\n   * - Uses the in-memory server instance stored in context (standalone mode)\n   * - Builds a local HTTP-like request to the current Party room endpoint\n   *\n   * @param map - The map payload to apply on the server\n   *\n   * @example\n   * ```ts\n   * await updateMapService.update({ width: 1024, height: 768, events: [] })\n   * ```\n   */\n  async update(map: any) {\n    this.server = this.context.get('server')\n    const roomId = this.server?.room?.id ?? 'lobby-1'\n    const req = {\n      url: `http://localhost/parties/main/${roomId}/map/update`,\n      method: 'POST',\n      headers: new Headers({}),\n      json: async () => {\n        return map;\n      }\n    };\n    await this.server.onRequest(req)\n  }\n}\n\nexport function provideRpg(server: any, options: StandaloneOptions = {}) {\n  return [\n    {\n      provide: WebSocketToken,\n      useFactory: (context: Context) => new BridgeWebsocket(context, server, options),\n    },\n    {\n      provide: UpdateMapToken,\n      useClass: UpdateMapStandaloneService,\n    },\n    provideKeyboardControls(),\n    provideSaveClient(),\n    RpgGui,\n    RpgClientEngine,\n  ];\n}\n"],"mappings":"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"}
+{"version":3,"file":"standalone.js","names":[],"sources":["../../src/services/standalone.ts"],"sourcesContent":["import { AbstractWebsocket, SocketUpdateProperties, WebSocketToken } from \"./AbstractSocket\";\nimport { ClientIo, ServerIo } from \"@signe/room\";\nimport { Context } from \"@signe/di\";\nimport { RpgClientEngine } from \"../RpgClientEngine\";\nimport { UpdateMapService, UpdateMapToken } from \"@rpgjs/common\";\nimport { LoadMapToken } from \"./loadMap\";\nimport { RpgGui } from \"../Gui/Gui\";\nimport { provideKeyboardControls } from \"./keyboardControls\";\nimport { provideSaveClient } from \"./save\";\nimport { normalizeStandaloneMessage } from \"./standalone-message\";\n\ntype ServerIo = any;\ntype ClientIo = any;\n\ninterface StandaloneOptions {\n  env?: Record<string, any>;\n}\n\nclass BridgeWebsocket extends AbstractWebsocket {\n  private room: ServerIo;\n  private socket: ClientIo;\n  private pendingOn: Array<{ event: string; callback: (data: any) => void }> = [];\n  private rooms = {\n    partyFn: async (roomId: string) => {\n      this.room = new ServerIo(roomId, this.rooms);\n      const server = new this.server(this.room)\n      await server.onStart();\n      await server.subRoom.onStart()\n      this.context.set('server', server)\n      return server\n    },\n    env: {}\n  }\n  private serverInstance: any;\n\n  constructor(protected context: Context, private server: any, options: StandaloneOptions = {}) {\n    super(context);\n    // fake room\n    this.rooms.env = options.env || {};\n    this.room = new ServerIo(\"lobby-1\", this.rooms);\n  }\n\n  async connection(listeners?: (data: any) => void) {\n    this.serverInstance = new this.server(this.room);\n    await this.serverInstance.onStart();\n    await this.serverInstance.subRoom.onStart()\n    this.context.set('server', this.serverInstance)\n    return this._connection(listeners)\n  }\n\n  private async _connection(listeners?: (data: any) => void) {\n    this.serverInstance = this.context.get('server')\n    this.socket = new ClientIo(this.serverInstance, 'player-client-id');\n    const url = new URL('http://localhost')\n    const request = new Request(url.toString(), {\n      method: 'GET',\n      headers: {\n        'Content-Type': 'application/json'\n      }\n    })\n    listeners?.(this.socket)\n    this.room.clients.set(this.socket.id, this.socket);\n    this.pendingOn.forEach(({ event, callback }) => this.socket.addEventListener(event, callback));\n    this.pendingOn = [];\n    await this.serverInstance.onConnect(this.socket.conn as any, { request } as any);\n    return this.socket\n  }\n\n  on(key: string, callback: (data: any) => void) {\n    const handler = (event) => {\n      const object = normalizeStandaloneMessage(event);\n      if (object.type === key) {\n        callback(object.value);\n      }\n    };\n    if (!this.socket) {\n      this.pendingOn.push({ event: \"message\", callback: handler });\n      return;\n    }\n    this.socket.addEventListener(\"message\", handler);\n  }\n\n  off(event: string, callback: (data: any) => void) {\n    if (!this.socket) return;\n    this.socket.removeEventListener(event, callback);\n  }\n\n  emit(event: string, data: any) {\n    this.socket.send({\n      action: event,\n      value: data,\n    });\n  }\n\n  /**\n   * Update underlying connection properties before a reconnect\n   *\n   * Design\n   * - Dynamically register a factory for the requested room to ensure a fresh server instance\n   * - Swap the internal ServerIo to target the new room\n   *\n   * @param params - Properties to update\n   * @param params.room - The target room id (e.g. `map-simplemap2`)\n   *\n   * @example\n   * ```ts\n   * websocket.updateProperties({ room: 'map-simplemap2' })\n   * await websocket.reconnect()\n   * ```\n   */\n  updateProperties(_params: SocketUpdateProperties) {\n    // empty\n  }\n\n  /**\n   * Reconnect the client to the current Party room\n   *\n   * Design\n   * - Must be called after `updateProperties()` when switching rooms\n   * - Rebuilds the client <-> server bridge and re-triggers connection listeners\n   *\n   * @param listeners - Optional callback to re-bind event handlers on the new socket\n   *\n   * @example\n   * ```ts\n   * websocket.updateProperties({ room: 'map-dungeon' })\n   * await websocket.reconnect((socket) => {\n   *   // re-bind events here\n   * })\n   * ```\n   */\n  async reconnect(listeners?: (data: any) => void): Promise<void> {\n    await this._connection((socket) => {\n      listeners?.(socket)\n    })\n  }\n\n  getServer() {\n    return this.serverInstance\n  }\n\n  getSocket() {\n    return this.socket\n  }\n}\n\nclass UpdateMapStandaloneService extends UpdateMapService {\n  private server: any;\n\n  /**\n   * Update the current room map data on the server side\n   *\n   * Design\n   * - Uses the in-memory server instance stored in context (standalone mode)\n   * - Builds a local HTTP-like request to the current Party room endpoint\n   *\n   * @param map - The map payload to apply on the server\n   *\n   * @example\n   * ```ts\n   * await updateMapService.update({ width: 1024, height: 768, events: [] })\n   * ```\n   */\n  async update(map: any) {\n    this.server = this.context.get('server')\n    const roomId = this.server?.room?.id ?? 'lobby-1'\n    const req = {\n      url: `http://localhost/parties/main/${roomId}/map/update`,\n      method: 'POST',\n      headers: new Headers({}),\n      json: async () => {\n        return map;\n      }\n    };\n    await this.server.onRequest(req)\n  }\n}\n\nexport function provideRpg(server: any, options: StandaloneOptions = {}) {\n  return [\n    {\n      provide: WebSocketToken,\n      useFactory: (context: Context) => new BridgeWebsocket(context, server, options),\n    },\n    {\n      provide: UpdateMapToken,\n      useClass: UpdateMapStandaloneService,\n    },\n    provideKeyboardControls(),\n    provideSaveClient(),\n    RpgGui,\n    RpgClientEngine,\n  ];\n}\n"],"mappings":"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"}

package/dist/services/standalone.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utils/getEntityProp.js

@@ -1,3 +1,4 @@
+import { readPropValue } from "./readPropValue.js";
 import { computed } from "canvasengine";
 //#region src/utils/getEntityProp.ts
 var entityPropMap = {
@@ -6,17 +7,17 @@ var entityPropMap = {
 	gold: (entity) => entity._gold(),
 	hp: (entity) => entity.hpSignal(),
 	sp: (entity) => entity.spSignal(),
-	name: (entity) => entity.name(),
+	name: (entity) => entity.name,
 	type: (entity) => entity.type(),
 	x: (entity) => entity.x(),
 	y: (entity) => entity.y(),
 	z: (entity) => entity.z(),
 	tint: (entity) => entity.tint(),
 	direction: (entity) => entity.direction(),
-	speed: (entity) => entity.speed(),
+	speed: (entity) => entity.speed,
 	hitbox: (entity) => entity.hitbox(),
 	animation: (entity) => entity.animationName(),
-	canMove: (entity) => entity.canMove(),
+	canMove: (entity) => readPropValue(entity._canMove ?? entity.canMove),
 	graphics: (entity) => entity.graphics(),
 	items: (entity) => entity.items(),
 	equipments: (entity) => entity.equipments(),

package/dist/utils/getEntityProp.js.map

@@ -1 +1 @@
-{"version":3,"file":"getEntityProp.js","names":[],"sources":["../../src/utils/getEntityProp.ts"],"sourcesContent":["import { computed, Signal } from \"canvasengine\";\nimport { RpgClientObject } from \"../Game/Object\";\n\nconst BUILTIN_PARAM_KEYS = [\n  \"maxHp\",\n  \"maxSp\",\n  \"atk\",\n  \"pdef\",\n  \"sdef\",\n  \"str\",\n  \"agi\",\n  \"int\",\n  \"dex\",\n] as const;\n\ntype BuiltInParamKey = typeof BUILTIN_PARAM_KEYS[number];\ntype ParamPropKey = `params.${BuiltInParamKey}` | `params.${string}`;\n\nconst entityPropMap = {\n  level: (entity: RpgClientObject) => entity._level(),\n  exp: (entity: RpgClientObject) => entity._exp(),\n  gold: (entity: RpgClientObject) => entity._gold(),\n  hp: (entity: RpgClientObject) => entity.hpSignal(),\n  sp: (entity: RpgClientObject) => entity.spSignal(),\n  name: (entity: RpgClientObject) => entity.name(),\n  type: (entity: RpgClientObject) => entity.type(),\n  x: (entity: RpgClientObject) => entity.x(),\n  y: (entity: RpgClientObject) => entity.y(),\n  z: (entity: RpgClientObject) => entity.z(),\n  tint: (entity: RpgClientObject) => entity.tint(),\n  direction: (entity: RpgClientObject) => entity.direction(),\n  speed: (entity: RpgClientObject) => entity.speed(),\n  hitbox: (entity: RpgClientObject) => entity.hitbox(),\n  animation: (entity: RpgClientObject) => entity.animationName(),\n  canMove: (entity: RpgClientObject) => entity.canMove(),\n  graphics: (entity: RpgClientObject) => entity.graphics(),\n  items: (entity: RpgClientObject) => entity.items(),\n  equipments: (entity: RpgClientObject) => entity.equipments(),\n  states: (entity: RpgClientObject) => entity.states(),\n  skills: (entity: RpgClientObject) => entity.skills(),\n  effects: (entity: RpgClientObject) => entity._effects(),\n  componentsTop: (entity: RpgClientObject) => entity.componentsTop(),\n  componentsBottom: (entity: RpgClientObject) => entity.componentsBottom(),\n  componentsCenter: (entity: RpgClientObject) => entity.componentsCenter(),\n  componentsLeft: (entity: RpgClientObject) => entity.componentsLeft(),\n  componentsRight: (entity: RpgClientObject) => entity.componentsRight(),\n} as const;\n\ntype EntityPropMap = typeof entityPropMap;\ntype EntityPropKey = keyof EntityPropMap | ParamPropKey;\ntype EntityPropValue<K extends EntityPropKey> = K extends keyof EntityPropMap\n  ? ReturnType<EntityPropMap[K]>\n  : K extends `params.${string}`\n  ? number | undefined\n  : never;\n\nconst isSignal = <T>(value: unknown): value is Signal<T> =>\n  typeof value === \"function\";\n\nconst toSignal = <T>(value: Signal<T> | T): Signal<T> =>\n  isSignal<T>(value) ? value : computed(() => value);\n\nexport const getEntityProp = <K extends EntityPropKey>(\n  entity: Signal<RpgClientObject | undefined> | RpgClientObject | undefined,\n  key: K\n): Signal<EntityPropValue<K>> => {\n  const entitySignal = toSignal(entity);\n\n  return computed(() => {\n    const current = entitySignal();\n    if (!current) {\n      return undefined as EntityPropValue<K>;\n    }\n\n    if (Object.prototype.hasOwnProperty.call(entityPropMap, key)) {\n      const getter = entityPropMap[key as keyof EntityPropMap];\n      return getter(current) as EntityPropValue<K>;\n    }\n\n    if (key.startsWith(\"params.\")) {\n      const paramKey = key.slice(\"params.\".length);\n      return current._param?.()?.[paramKey] as EntityPropValue<K>;\n    }\n\n    return undefined as EntityPropValue<K>;\n  });\n};\n"],"mappings":";;AAkBA,IAAM,gBAAgB;CACpB,QAAQ,WAA4B,OAAO,QAAQ;CACnD,MAAM,WAA4B,OAAO,MAAM;CAC/C,OAAO,WAA4B,OAAO,OAAO;CACjD,KAAK,WAA4B,OAAO,UAAU;CAClD,KAAK,WAA4B,OAAO,UAAU;CAClD,OAAO,WAA4B,OAAO,MAAM;CAChD,OAAO,WAA4B,OAAO,MAAM;CAChD,IAAI,WAA4B,OAAO,GAAG;CAC1C,IAAI,WAA4B,OAAO,GAAG;CAC1C,IAAI,WAA4B,OAAO,GAAG;CAC1C,OAAO,WAA4B,OAAO,MAAM;CAChD,YAAY,WAA4B,OAAO,WAAW;CAC1D,QAAQ,WAA4B,OAAO,OAAO;CAClD,SAAS,WAA4B,OAAO,QAAQ;CACpD,YAAY,WAA4B,OAAO,eAAe;CAC9D,UAAU,WAA4B,OAAO,SAAS;CACtD,WAAW,WAA4B,OAAO,UAAU;CACxD,QAAQ,WAA4B,OAAO,OAAO;CAClD,aAAa,WAA4B,OAAO,YAAY;CAC5D,SAAS,WAA4B,OAAO,QAAQ;CACpD,SAAS,WAA4B,OAAO,QAAQ;CACpD,UAAU,WAA4B,OAAO,UAAU;CACvD,gBAAgB,WAA4B,OAAO,eAAe;CAClE,mBAAmB,WAA4B,OAAO,kBAAkB;CACxE,mBAAmB,WAA4B,OAAO,kBAAkB;CACxE,iBAAiB,WAA4B,OAAO,gBAAgB;CACpE,kBAAkB,WAA4B,OAAO,iBAAiB;CACvE;AAUD,IAAM,YAAe,UACnB,OAAO,UAAU;AAEnB,IAAM,YAAe,UACnB,SAAY,MAAM,GAAG,QAAQ,eAAe,MAAM;AAEpD,IAAa,iBACX,QACA,QAC+B;CAC/B,MAAM,eAAe,SAAS,OAAO;AAErC,QAAO,eAAe;EACpB,MAAM,UAAU,cAAc;AAC9B,MAAI,CAAC,QACH;AAGF,MAAI,OAAO,UAAU,eAAe,KAAK,eAAe,IAAI,EAAE;GAC5D,MAAM,SAAS,cAAc;AAC7B,UAAO,OAAO,QAAQ;;AAGxB,MAAI,IAAI,WAAW,UAAU,EAAE;GAC7B,MAAM,WAAW,IAAI,MAAM,EAAiB;AAC5C,UAAO,QAAQ,UAAU,GAAG;;GAI9B"}
+{"version":3,"file":"getEntityProp.js","names":[],"sources":["../../src/utils/getEntityProp.ts"],"sourcesContent":["import { computed, Signal } from \"canvasengine\";\nimport { RpgClientObject } from \"../Game/Object\";\nimport { readPropValue } from \"./readPropValue\";\n\nconst BUILTIN_PARAM_KEYS = [\n  \"maxHp\",\n  \"maxSp\",\n  \"atk\",\n  \"pdef\",\n  \"sdef\",\n  \"str\",\n  \"agi\",\n  \"int\",\n  \"dex\",\n] as const;\n\ntype BuiltInParamKey = typeof BUILTIN_PARAM_KEYS[number];\ntype ParamPropKey = `params.${BuiltInParamKey}` | `params.${string}`;\n\nconst entityPropMap = {\n  level: (entity: RpgClientObject) => entity._level(),\n  exp: (entity: RpgClientObject) => entity._exp(),\n  gold: (entity: RpgClientObject) => entity._gold(),\n  hp: (entity: RpgClientObject) => entity.hpSignal(),\n  sp: (entity: RpgClientObject) => entity.spSignal(),\n  name: (entity: RpgClientObject) => entity.name,\n  type: (entity: RpgClientObject) => entity.type(),\n  x: (entity: RpgClientObject) => entity.x(),\n  y: (entity: RpgClientObject) => entity.y(),\n  z: (entity: RpgClientObject) => entity.z(),\n  tint: (entity: RpgClientObject) => entity.tint(),\n  direction: (entity: RpgClientObject) => entity.direction(),\n  speed: (entity: RpgClientObject) => entity.speed,\n  hitbox: (entity: RpgClientObject) => entity.hitbox(),\n  animation: (entity: RpgClientObject) => entity.animationName(),\n  canMove: (entity: RpgClientObject) => readPropValue<boolean>((entity as any)._canMove ?? entity.canMove),\n  graphics: (entity: RpgClientObject) => entity.graphics(),\n  items: (entity: RpgClientObject) => entity.items(),\n  equipments: (entity: RpgClientObject) => entity.equipments(),\n  states: (entity: RpgClientObject) => entity.states(),\n  skills: (entity: RpgClientObject) => entity.skills(),\n  effects: (entity: RpgClientObject) => entity._effects(),\n  componentsTop: (entity: RpgClientObject) => entity.componentsTop(),\n  componentsBottom: (entity: RpgClientObject) => entity.componentsBottom(),\n  componentsCenter: (entity: RpgClientObject) => entity.componentsCenter(),\n  componentsLeft: (entity: RpgClientObject) => entity.componentsLeft(),\n  componentsRight: (entity: RpgClientObject) => entity.componentsRight(),\n} as const;\n\ntype EntityPropMap = typeof entityPropMap;\ntype EntityPropKey = keyof EntityPropMap | ParamPropKey;\ntype EntityPropValue<K extends EntityPropKey> = K extends keyof EntityPropMap\n  ? ReturnType<EntityPropMap[K]>\n  : K extends `params.${string}`\n  ? number | undefined\n  : never;\n\nconst isSignal = <T>(value: unknown): value is Signal<T> =>\n  typeof value === \"function\";\n\nconst toSignal = <T>(value: Signal<T> | T): Signal<T> =>\n  isSignal<T>(value) ? value : computed(() => value);\n\nexport const getEntityProp = <K extends EntityPropKey>(\n  entity: Signal<RpgClientObject | undefined> | RpgClientObject | undefined,\n  key: K\n): Signal<EntityPropValue<K>> => {\n  const entitySignal = toSignal(entity);\n\n  return computed(() => {\n    const current = entitySignal();\n    if (!current) {\n      return undefined as EntityPropValue<K>;\n    }\n\n    if (Object.prototype.hasOwnProperty.call(entityPropMap, key)) {\n      const getter = entityPropMap[key as keyof EntityPropMap];\n      return getter(current) as EntityPropValue<K>;\n    }\n\n    if (key.startsWith(\"params.\")) {\n      const paramKey = key.slice(\"params.\".length);\n      return current._param?.()?.[paramKey] as EntityPropValue<K>;\n    }\n\n    return undefined as EntityPropValue<K>;\n  });\n};\n"],"mappings":";;;AAmBA,IAAM,gBAAgB;CACpB,QAAQ,WAA4B,OAAO,OAAO;CAClD,MAAM,WAA4B,OAAO,KAAK;CAC9C,OAAO,WAA4B,OAAO,MAAM;CAChD,KAAK,WAA4B,OAAO,SAAS;CACjD,KAAK,WAA4B,OAAO,SAAS;CACjD,OAAO,WAA4B,OAAO;CAC1C,OAAO,WAA4B,OAAO,KAAK;CAC/C,IAAI,WAA4B,OAAO,EAAE;CACzC,IAAI,WAA4B,OAAO,EAAE;CACzC,IAAI,WAA4B,OAAO,EAAE;CACzC,OAAO,WAA4B,OAAO,KAAK;CAC/C,YAAY,WAA4B,OAAO,UAAU;CACzD,QAAQ,WAA4B,OAAO;CAC3C,SAAS,WAA4B,OAAO,OAAO;CACnD,YAAY,WAA4B,OAAO,cAAc;CAC7D,UAAU,WAA4B,cAAwB,OAAe,YAAY,OAAO,OAAO;CACvG,WAAW,WAA4B,OAAO,SAAS;CACvD,QAAQ,WAA4B,OAAO,MAAM;CACjD,aAAa,WAA4B,OAAO,WAAW;CAC3D,SAAS,WAA4B,OAAO,OAAO;CACnD,SAAS,WAA4B,OAAO,OAAO;CACnD,UAAU,WAA4B,OAAO,SAAS;CACtD,gBAAgB,WAA4B,OAAO,cAAc;CACjE,mBAAmB,WAA4B,OAAO,iBAAiB;CACvE,mBAAmB,WAA4B,OAAO,iBAAiB;CACvE,iBAAiB,WAA4B,OAAO,eAAe;CACnE,kBAAkB,WAA4B,OAAO,gBAAgB;AACvE;AAUA,IAAM,YAAe,UACnB,OAAO,UAAU;AAEnB,IAAM,YAAe,UACnB,SAAY,KAAK,IAAI,QAAQ,eAAe,KAAK;AAEnD,IAAa,iBACX,QACA,QAC+B;CAC/B,MAAM,eAAe,SAAS,MAAM;CAEpC,OAAO,eAAe;EACpB,MAAM,UAAU,aAAa;EAC7B,IAAI,CAAC,SACH;EAGF,IAAI,OAAO,UAAU,eAAe,KAAK,eAAe,GAAG,GAAG;GAC5D,MAAM,SAAS,cAAc;GAC7B,OAAO,OAAO,OAAO;EACvB;EAEA,IAAI,IAAI,WAAW,SAAS,GAAG;GAC7B,MAAM,WAAW,IAAI,MAAM,CAAgB;GAC3C,OAAO,QAAQ,SAAS,IAAI;EAC9B;CAGF,CAAC;AACH"}

package/dist/utils/getEntityProp.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utils/readPropValue.d.ts

@@ -0,0 +1,2 @@
+export declare const readPropValue: <T = unknown>(value: unknown) => T;
+export declare const getCanMoveValue: (entity: any) => boolean;

package/dist/utils/readPropValue.js

@@ -0,0 +1,13 @@
+//#region src/utils/readPropValue.ts
+var readPropValue = (value) => {
+	if (typeof value === "function") return readPropValue(value());
+	if (value && typeof value === "object" && "value" in value) return readPropValue(value.value);
+	return value;
+};
+var getCanMoveValue = (entity) => {
+	return readPropValue(entity?._canMove ?? entity?.canMove) !== false;
+};
+//#endregion
+export { getCanMoveValue, readPropValue };
+
+//# sourceMappingURL=readPropValue.js.map

package/dist/utils/readPropValue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"readPropValue.js","names":[],"sources":["../../src/utils/readPropValue.ts"],"sourcesContent":["export const readPropValue = <T = unknown>(value: unknown): T => {\n  if (typeof value === \"function\") {\n    return readPropValue((value as () => unknown)());\n  }\n\n  if (value && typeof value === \"object\" && \"value\" in value) {\n    return readPropValue((value as { value: unknown }).value);\n  }\n\n  return value as T;\n};\n\nexport const getCanMoveValue = (entity: any): boolean => {\n  const value = readPropValue(entity?._canMove ?? entity?.canMove);\n  return value !== false;\n};\n"],"mappings":";AAAA,IAAa,iBAA8B,UAAsB;CAC/D,IAAI,OAAO,UAAU,YACnB,OAAO,cAAe,MAAwB,CAAC;CAGjD,IAAI,SAAS,OAAO,UAAU,YAAY,WAAW,OACnD,OAAO,cAAe,MAA6B,KAAK;CAG1D,OAAO;AACT;AAEA,IAAa,mBAAmB,WAAyB;CAEvD,OADc,cAAc,QAAQ,YAAY,QAAQ,OACjD,MAAU;AACnB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpgjs/client",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.11",
   "description": "RPGJS is a framework for creating RPG/MMORPG games",
   "main": "dist/index.js",
   "types": "./dist/index.d.ts",
@@ -17,26 +17,25 @@
   "author": "Samuel Ronce",
   "license": "MIT",
   "peerDependencies": {
-    "@canvasengine/presets": "*",
-    "canvasengine": "*",
+    "@canvasengine/presets": "^2.0.0-rc.4",
+    "canvasengine": "^2.0.0-rc.4",
     "pixi.js": "^8.9.2"
   },
   "dependencies": {
-    "@rpgjs/client": "5.0.0-beta.1",
-    "@rpgjs/common": "5.0.0-beta.1",
-    "@rpgjs/server": "5.0.0-beta.1",
-    "@rpgjs/ui-css": "5.0.0-beta.1",
-    "@signe/di": "^2.9.0",
-    "@signe/room": "^2.9.0",
-    "@signe/sync": "^2.9.0",
+    "@rpgjs/common": "5.0.0-beta.11",
+    "@rpgjs/server": "5.0.0-beta.11",
+    "@rpgjs/ui-css": "5.0.0-beta.11",
+    "@signe/di": "3.0.1",
+    "@signe/room": "3.0.1",
+    "@signe/sync": "3.0.1",
     "pixi-filters": "^6.1.5",
     "rxjs": "^7.8.2"
   },
   "devDependencies": {
-    "@canvasengine/compiler": "2.0.0-beta.56",
-    "vite": "^8.0.3",
-    "vite-plugin-dts": "^4.5.4",
-    "vitest": "^4.1.2"
+    "@canvasengine/compiler": "2.0.0-rc.4",
+    "vite": "^8.0.13",
+    "vite-plugin-dts": "^5.0.0",
+    "vitest": "^4.1.6"
   },
   "type": "module",
   "scripts": {

package/src/Game/AnimationManager.spec.ts

@@ -0,0 +1,30 @@
+import { describe, expect, test, vi } from "vitest";
+import { AnimationManager } from "./AnimationManager";
+
+describe("AnimationManager", () => {
+  test("resolves displayEffect when the component calls onFinish", async () => {
+    const manager = new AnimationManager();
+    const done = manager.displayEffect({}, { x: 10, y: 20 });
+
+    expect(manager.current()).toHaveLength(1);
+    manager.current()[0].onFinish();
+
+    await expect(done).resolves.toBeUndefined();
+    expect(manager.current()).toHaveLength(0);
+  });
+
+  test("keeps onFinish idempotent and forwards user callback data", async () => {
+    const manager = new AnimationManager();
+    const onFinish = vi.fn();
+    const done = manager.displayEffect({ onFinish }, { x: 10, y: 20 });
+    const finish = manager.current()[0].onFinish;
+
+    finish({ ok: true });
+    finish({ ok: false });
+
+    await done;
+    expect(onFinish).toHaveBeenCalledTimes(1);
+    expect(onFinish).toHaveBeenCalledWith({ ok: true });
+    expect(manager.current()).toHaveLength(0);
+  });
+});

package/src/Game/AnimationManager.ts

@@ -4,18 +4,30 @@ import { signal } from "canvasengine";
 export class AnimationManager {
   current = signal<any[]>([]);
 
-  displayEffect(params: any, player: RpgCommonPlayer | { x: number, y: number }) {
+  displayEffect(params: any, player: RpgCommonPlayer | { x: number, y: number }): Promise<void> {
     const id = generateUID();
-    this.current().push({
-      ...params,
-      id,
-      x: player.x,
-      y: player.y,
-      object: player,
-      onFinish: () => {
+    const effectParams = params ?? {};
+    return new Promise<void>((resolve) => {
+      let finished = false;
+      const finish = (data?: any) => {
+        if (finished) return;
+        finished = true;
         const index = this.current().findIndex((value) => value.id === id);
-        this.current().splice(index, 1);
-      },
+        if (index !== -1) {
+          this.current().splice(index, 1);
+        }
+        effectParams.onFinish?.(data);
+        resolve();
+      };
+
+      this.current().push({
+        ...effectParams,
+        id,
+        x: player.x,
+        y: player.y,
+        object: player,
+        onFinish: finish,
+      });
     });
   }
 }

package/src/Game/Map.ts

@@ -1,5 +1,9 @@
 import {
   RpgCommonMap,
+  cloneLightingState,
+  normalizeLightingState,
+  type LightSpot,
+  type LightingState,
   type WeatherState,
   type MapPhysicsInitContext,
   type MapPhysicsEntityContext,
@@ -11,6 +15,15 @@ import { RpgClientEvent } from "./Event";
 import { RpgClientEngine } from "../RpgClientEngine";
 import { inject } from "../core/inject";
 
+type TestGlobalScope = typeof globalThis & {
+  process?: {
+    env?: {
+      TEST?: string;
+    };
+  };
+  __RPGJS_TEST__?: boolean;
+};
+
 export class RpgClientMap extends RpgCommonMap<any> {
   engine: RpgClientEngine = inject(RpgClientEngine)
   @users(RpgClientPlayer) players = signal<Record<string, RpgClientPlayer>>({});
@@ -18,19 +31,43 @@ export class RpgClientMap extends RpgCommonMap<any> {
   currentPlayer = computed(() => this.players()[this.engine.playerIdSignal()!])
   weatherState = signal<WeatherState | null>(null);
   localWeatherOverride = signal<WeatherState | null>(null);
+  lightingState = signal<LightingState | null>(null);
+  localLightSpots = signal<Record<string, LightSpot>>({});
   weather = computed<WeatherState | null>(() => {
     const local = this.localWeatherOverride() 
     const state = this.weatherState()
     return local ?? state
   });
+  lighting = computed<LightingState | null>(() => {
+    const state = cloneLightingState(this.lightingState());
+    const localSpots = Object.entries(this.localLightSpots()).map(([id, spot]) => ({
+      ...spot,
+      id: spot.id ?? id,
+    }));
+
+    if (!state && localSpots.length === 0) {
+      return null;
+    }
+
+    const next: LightingState = { ...(state ?? {}) };
+    if (!state?.ambient) {
+      delete next.ambient;
+    }
+    next.spots = [
+      ...(state?.spots ?? []),
+      ...localSpots,
+    ];
+    return next;
+  });
   private manualClientPhysicsTick = false;
   private readonly isTestEnvironment: boolean;
 
   constructor() {
     super();
     // Détecter l'environnement de test
-    const isTest = (typeof process !== 'undefined' && process.env?.TEST === 'true')
-      || (typeof window !== 'undefined' && (window as any).__RPGJS_TEST__ === true);
+    const testGlobal = globalThis as TestGlobalScope;
+    const isTest = testGlobal.process?.env?.TEST === 'true'
+      || testGlobal.__RPGJS_TEST__ === true;
     this.isTestEnvironment = isTest;
     if (isTest) {
       this.autoTickEnabled = false;
@@ -58,6 +95,8 @@ export class RpgClientMap extends RpgCommonMap<any> {
     this.events.set({})
     this.weatherState.set(null);
     this.localWeatherOverride.set(null);
+    this.lightingState.set(null);
+    this.localLightSpots.set({});
     this.clearPhysic()
   }
 
@@ -73,6 +112,56 @@ export class RpgClientMap extends RpgCommonMap<any> {
     this.localWeatherOverride.set(null);
   }
 
+  getLighting(): LightingState | null {
+    return this.lighting();
+  }
+
+  addLightSpot(id: string, spot: LightSpot): void {
+    const normalized = normalizeLightingState({ spots: [{ ...spot, id }] });
+    const nextSpot = normalized?.spots?.[0];
+    if (!nextSpot) {
+      return;
+    }
+    this.localLightSpots.update((spots) => ({
+      ...spots,
+      [id]: nextSpot,
+    }));
+  }
+
+  patchLightSpot(id: string, patch: Partial<LightSpot>): void {
+    this.localLightSpots.update((spots) => {
+      const current = spots[id];
+      if (!current) {
+        return spots;
+      }
+      return {
+        ...spots,
+        [id]: {
+          ...current,
+          ...patch,
+          id,
+          x: patch.x ?? current.x,
+          y: patch.y ?? current.y,
+        },
+      };
+    });
+  }
+
+  removeLightSpot(id: string): void {
+    this.localLightSpots.update((spots) => {
+      if (!(id in spots)) {
+        return spots;
+      }
+      const next = { ...spots };
+      delete next[id];
+      return next;
+    });
+  }
+
+  clearLightSpots(): void {
+    this.localLightSpots.set({});
+  }
+
   stepClientPhysics(deltaMs: number): number {
     if (!this.manualClientPhysicsTick) {
       return 0;