@rpgjs/client 5.0.0-beta.2 → 5.0.0-beta.4

package/dist/services/keyboardControls.js.map

@@ -1 +1 @@
-{"version":3,"file":"keyboardControls.js","names":[],"sources":["../../src/services/keyboardControls.ts"],"sourcesContent":["import { KeyboardControls  } from \"canvasengine\";\n\nexport enum Control {\n  Action = 'action',\n  Attack = 'attack',\n  Defense = 'defense',\n  Skill = 'skill',\n  Back = 'back',\n  Up = 1,\n  Down = 3,\n  Right = 2,\n  Left = 4\n}\n\nexport function provideKeyboardControls() {\n  return {\n    provide: 'KeyboardControls',\n    useValue: null,\n  };\n}"],"mappings":";AAEA,IAAY,UAAL,yBAAA,SAAA;AACL,SAAA,YAAA;AACA,SAAA,YAAA;AACA,SAAA,aAAA;AACA,SAAA,WAAA;AACA,SAAA,UAAA;AACA,SAAA,QAAA,QAAA,KAAA;AACA,SAAA,QAAA,UAAA,KAAA;AACA,SAAA,QAAA,WAAA,KAAA;AACA,SAAA,QAAA,UAAA,KAAA;;KACD;AAED,SAAgB,0BAA0B;AACxC,QAAO;EACL,SAAS;EACT,UAAU;EACX"}
+{"version":3,"file":"keyboardControls.js","names":[],"sources":["../../src/services/keyboardControls.ts"],"sourcesContent":["import { KeyboardControls  } from \"canvasengine\";\n\nexport enum Control {\n  Action = 'action',\n  Attack = 'attack',\n  Defense = 'defense',\n  Skill = 'skill',\n  Back = 'back',\n  Up = 1,\n  Down = 3,\n  Right = 2,\n  Left = 4\n}\n\nexport function provideKeyboardControls() {\n  return {\n    provide: 'KeyboardControls',\n    useValue: null,\n  };\n}"],"mappings":";AAEA,IAAY,UAAL,yBAAA,SAAA;AACL,SAAA,YAAS;AACT,SAAA,YAAS;AACT,SAAA,aAAU;AACV,SAAA,WAAQ;AACR,SAAA,UAAO;AACP,SAAA,QAAA,QAAK,KAAA;AACL,SAAA,QAAA,UAAO,KAAA;AACP,SAAA,QAAA,WAAQ,KAAA;AACR,SAAA,QAAA,UAAO,KAAA;;KACR;AAED,SAAgB,0BAA0B;AACxC,QAAO;EACL,SAAS;EACT,UAAU;EACX"}

package/dist/services/mmorpg.js

@@ -30,8 +30,9 @@ var BridgeWebsocket = class extends AbstractWebsocket {
 	async connection(listeners) {
 		class Room {}
 		const instance = new Room();
+		const host = this.options.host || window.location.host;
 		this.socket = await connectionRoom({
-			host: this.options.host || window.location.host,
+			host,
 			room: this.targetRoom,
 			id: this.privateId
 		}, instance);

package/dist/services/mmorpg.js.map

@@ -1 +1 @@
-{"version":3,"file":"mmorpg.js","names":[],"sources":["../../src/services/mmorpg.ts"],"sourcesContent":["import { Context } from \"@signe/di\";\nimport { connectionRoom } from \"@signe/sync/client\";\nimport { RpgGui } from \"../Gui/Gui\";\nimport { RpgClientEngine } from \"../RpgClientEngine\";\nimport { AbstractWebsocket, SocketUpdateProperties, WebSocketToken } from \"./AbstractSocket\";\nimport { UpdateMapService, UpdateMapToken } from \"@rpgjs/common\";\nimport { provideKeyboardControls } from \"./keyboardControls\";\nimport { provideSaveClient } from \"./save\";\n\ninterface MmorpgOptions {\n    host?: string;\n    connectionId?: string;\n    connectionIdScope?: \"local\" | \"session\" | \"ephemeral\";\n}\n\nclass BridgeWebsocket extends AbstractWebsocket {\n  private socket: any;\n  private privateId: string;\n  private pendingOn: Array<{ event: string; callback: (data: any) => void }> = [];\n  private targetRoom = \"lobby-1\";\n\n  constructor(protected context: Context, private options: MmorpgOptions = {}) {\n    super(context);\n    this.privateId = this.resolveConnectionId();\n  }\n\n  private resolveConnectionId(): string {\n    if (this.options.connectionId) {\n      return this.options.connectionId;\n    }\n\n    const scope = this.options.connectionIdScope ?? \"local\";\n    const key = \"rpgjs-user-id\";\n\n    if (scope === \"ephemeral\") {\n      return crypto.randomUUID();\n    }\n\n    const storage =\n      scope === \"session\"\n        ? window.sessionStorage\n        : window.localStorage;\n\n    const existing = storage.getItem(key);\n    if (existing) {\n      return existing;\n    }\n\n    const id = crypto.randomUUID();\n    storage.setItem(key, id);\n    return id;\n  }\n\n  async connection(listeners?: (data: any) => void) {\n    // tmp\n    class Room {\n        \n    }\n    const instance = new Room()\n    const host = this.options.host || window.location.host;\n    this.socket = await connectionRoom({\n        host,\n        room: this.targetRoom,\n        id: this.privateId\n    }, instance)\n\n    listeners?.(this.socket)\n    this.pendingOn.forEach(({ event, callback }) => this.socket.on(event, callback));\n    this.pendingOn = [];\n  }\n\n  on(key: string, callback: (data: any) => void) {\n    if (!this.socket) {\n      this.pendingOn.push({ event: key, callback });\n      return;\n    }\n    this.socket.on(key, callback);\n  }\n\n  off(event: string, callback: (data: any) => void) {\n    if (!this.socket) return;\n    this.socket.off(event, callback);\n  }\n\n  emit(event: string, data: any) {\n    this.socket.emit(event, data);\n  }\n\n  updateProperties({ room, host, query }: SocketUpdateProperties) {\n    if (!this.socket?.conn) return;\n    this.targetRoom = room;\n    this.socket.conn.updateProperties({\n      room,\n      id: this.privateId,\n      host: host || this.options.host || window.location.host,\n      query,\n    })\n  }\n\n  private waitForNextOpen(conn: any, timeoutMs = 10000): Promise<void> {\n    return new Promise((resolve, reject) => {\n      let timeoutId: number | undefined;\n      const onOpen = () => {\n        cleanup();\n        resolve();\n      };\n      const onError = () => {\n        cleanup();\n        reject(new Error(\"WebSocket reconnect failed\"));\n      };\n      const cleanup = () => {\n        conn.removeEventListener(\"open\", onOpen);\n        conn.removeEventListener(\"error\", onError);\n        if (timeoutId !== undefined) {\n          window.clearTimeout(timeoutId);\n        }\n      };\n\n      conn.addEventListener(\"open\", onOpen);\n      conn.addEventListener(\"error\", onError);\n      timeoutId = window.setTimeout(() => {\n        cleanup();\n        reject(new Error(\"WebSocket reconnect timeout\"));\n      }, timeoutMs);\n    });\n  }\n\n  async reconnect(_listeners?: (data: any) => void): Promise<void> {\n    if (!this.socket?.conn) return;\n    const conn = this.socket.conn;\n    const opened = this.waitForNextOpen(conn);\n    conn.reconnect();\n    await opened;\n  }\n\n  getCurrentRoom(): string {\n    return this.targetRoom || this.socket?.conn?.room || \"lobby-1\";\n  }\n}\n\nclass UpdateMapStandaloneService extends UpdateMapService {\n  constructor(protected context: Context, private _options: MmorpgOptions) {\n    super(context);\n  }\n\n  async update(_map: any) {\n    // In MMORPG mode, clients are untrusted and must not push map definitions.\n    // Map bootstrap/update is handled server-side by @rpgjs/vite.\n    return;\n  }\n}\n\nexport function provideMmorpg(options: MmorpgOptions) {\n  return [\n    {\n      provide: WebSocketToken,\n      useFactory: (context: Context) => new BridgeWebsocket(context, options),\n    },\n    {\n      provide: UpdateMapToken,\n      useFactory: (context: Context) => new UpdateMapStandaloneService(context, options),\n    },\n    provideKeyboardControls(),\n    provideSaveClient(),\n    RpgGui,\n    RpgClientEngine,\n  ];\n}\n"],"mappings":"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"}
+{"version":3,"file":"mmorpg.js","names":[],"sources":["../../src/services/mmorpg.ts"],"sourcesContent":["import { Context } from \"@signe/di\";\nimport { connectionRoom } from \"@signe/sync/client\";\nimport { RpgGui } from \"../Gui/Gui\";\nimport { RpgClientEngine } from \"../RpgClientEngine\";\nimport { AbstractWebsocket, SocketUpdateProperties, WebSocketToken } from \"./AbstractSocket\";\nimport { UpdateMapService, UpdateMapToken } from \"@rpgjs/common\";\nimport { provideKeyboardControls } from \"./keyboardControls\";\nimport { provideSaveClient } from \"./save\";\n\ninterface MmorpgOptions {\n    host?: string;\n    connectionId?: string;\n    connectionIdScope?: \"local\" | \"session\" | \"ephemeral\";\n}\n\nclass BridgeWebsocket extends AbstractWebsocket {\n  private socket: any;\n  private privateId: string;\n  private pendingOn: Array<{ event: string; callback: (data: any) => void }> = [];\n  private targetRoom = \"lobby-1\";\n\n  constructor(protected context: Context, private options: MmorpgOptions = {}) {\n    super(context);\n    this.privateId = this.resolveConnectionId();\n  }\n\n  private resolveConnectionId(): string {\n    if (this.options.connectionId) {\n      return this.options.connectionId;\n    }\n\n    const scope = this.options.connectionIdScope ?? \"local\";\n    const key = \"rpgjs-user-id\";\n\n    if (scope === \"ephemeral\") {\n      return crypto.randomUUID();\n    }\n\n    const storage =\n      scope === \"session\"\n        ? window.sessionStorage\n        : window.localStorage;\n\n    const existing = storage.getItem(key);\n    if (existing) {\n      return existing;\n    }\n\n    const id = crypto.randomUUID();\n    storage.setItem(key, id);\n    return id;\n  }\n\n  async connection(listeners?: (data: any) => void) {\n    // tmp\n    class Room {\n        \n    }\n    const instance = new Room()\n    const host = this.options.host || window.location.host;\n    this.socket = await connectionRoom({\n        host,\n        room: this.targetRoom,\n        id: this.privateId\n    }, instance)\n\n    listeners?.(this.socket)\n    this.pendingOn.forEach(({ event, callback }) => this.socket.on(event, callback));\n    this.pendingOn = [];\n  }\n\n  on(key: string, callback: (data: any) => void) {\n    if (!this.socket) {\n      this.pendingOn.push({ event: key, callback });\n      return;\n    }\n    this.socket.on(key, callback);\n  }\n\n  off(event: string, callback: (data: any) => void) {\n    if (!this.socket) return;\n    this.socket.off(event, callback);\n  }\n\n  emit(event: string, data: any) {\n    this.socket.emit(event, data);\n  }\n\n  updateProperties({ room, host, query }: SocketUpdateProperties) {\n    if (!this.socket?.conn) return;\n    this.targetRoom = room;\n    this.socket.conn.updateProperties({\n      room,\n      id: this.privateId,\n      host: host || this.options.host || window.location.host,\n      query,\n    })\n  }\n\n  private waitForNextOpen(conn: any, timeoutMs = 10000): Promise<void> {\n    return new Promise((resolve, reject) => {\n      let timeoutId: number | undefined;\n      const onOpen = () => {\n        cleanup();\n        resolve();\n      };\n      const onError = () => {\n        cleanup();\n        reject(new Error(\"WebSocket reconnect failed\"));\n      };\n      const cleanup = () => {\n        conn.removeEventListener(\"open\", onOpen);\n        conn.removeEventListener(\"error\", onError);\n        if (timeoutId !== undefined) {\n          window.clearTimeout(timeoutId);\n        }\n      };\n\n      conn.addEventListener(\"open\", onOpen);\n      conn.addEventListener(\"error\", onError);\n      timeoutId = window.setTimeout(() => {\n        cleanup();\n        reject(new Error(\"WebSocket reconnect timeout\"));\n      }, timeoutMs);\n    });\n  }\n\n  async reconnect(_listeners?: (data: any) => void): Promise<void> {\n    if (!this.socket?.conn) return;\n    const conn = this.socket.conn;\n    const opened = this.waitForNextOpen(conn);\n    conn.reconnect();\n    await opened;\n  }\n\n  getCurrentRoom(): string {\n    return this.targetRoom || this.socket?.conn?.room || \"lobby-1\";\n  }\n}\n\nclass UpdateMapStandaloneService extends UpdateMapService {\n  constructor(protected context: Context, private _options: MmorpgOptions) {\n    super(context);\n  }\n\n  async update(_map: any) {\n    // In MMORPG mode, clients are untrusted and must not push map definitions.\n    // Map bootstrap/update is handled server-side by @rpgjs/vite.\n    return;\n  }\n}\n\nexport function provideMmorpg(options: MmorpgOptions) {\n  return [\n    {\n      provide: WebSocketToken,\n      useFactory: (context: Context) => new BridgeWebsocket(context, options),\n    },\n    {\n      provide: UpdateMapToken,\n      useFactory: (context: Context) => new UpdateMapStandaloneService(context, options),\n    },\n    provideKeyboardControls(),\n    provideSaveClient(),\n    RpgGui,\n    RpgClientEngine,\n  ];\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpgjs/client",
-  "version": "5.0.0-beta.2",
+  "version": "5.0.0-beta.4",
   "description": "RPGJS is a framework for creating RPG/MMORPG games",
   "main": "dist/index.js",
   "types": "./dist/index.d.ts",
@@ -22,9 +22,9 @@
     "pixi.js": "^8.9.2"
   },
   "dependencies": {
-    "@rpgjs/common": "5.0.0-beta.2",
-    "@rpgjs/server": "5.0.0-beta.2",
-    "@rpgjs/ui-css": "5.0.0-beta.2",
+    "@rpgjs/common": "5.0.0-beta.4",
+    "@rpgjs/server": "5.0.0-beta.4",
+    "@rpgjs/ui-css": "5.0.0-beta.4",
     "@signe/di": "^2.9.0",
     "@signe/room": "^2.9.0",
     "@signe/sync": "^2.9.0",
@@ -32,10 +32,10 @@
     "rxjs": "^7.8.2"
   },
   "devDependencies": {
-    "@canvasengine/compiler": "2.0.0-beta.56",
-    "vite": "^8.0.3",
+    "@canvasengine/compiler": "2.0.0-beta.58",
+    "vite": "^8.0.10",
     "vite-plugin-dts": "^4.5.4",
-    "vitest": "^4.1.2"
+    "vitest": "^4.1.5"
   },
   "type": "module",
   "scripts": {

package/src/Game/Object.ts

@@ -1,6 +1,6 @@
 import { Hooks, ModulesToken, RpgCommonPlayer } from "@rpgjs/common";
 import { trigger, signal, effect } from "canvasengine";
-import { filter, from, map, Subscription, switchMap } from "rxjs";
+import { filter, from, map, of, Subscription, switchMap } from "rxjs";
 import { inject } from "../core/inject";
 import { RpgClientEngine } from "../RpgClientEngine";
 import TextComponent from "../components/dynamics/text.ce";
@@ -11,6 +11,11 @@ const DYNAMIC_COMPONENTS = {
 
 type Frame = { x: number; y: number; ts: number };
 
+type AnimationRestoreOptions = {
+  restoreAnimationName?: string;
+  restoreGraphics?: any[];
+};
+
 export abstract class RpgClientObject extends RpgCommonPlayer {
   abstract _type: string;
   emitParticleTrigger = trigger();
@@ -22,6 +27,10 @@ export abstract class RpgClientObject extends RpgCommonPlayer {
   graphicsSignals = signal<any[]>([]);
   _component = {} // temporary component memory
   flashTrigger = trigger();
+  private animationRestoreState?: {
+    animationName: string;
+    graphics: any[];
+  };
 
   constructor() {
     super();
@@ -39,8 +48,10 @@ export abstract class RpgClientObject extends RpgCommonPlayer {
     this.graphics.observable
     .pipe(
       map(({ items }) => items),
-      filter(graphics => graphics.length > 0),
-      switchMap(graphics => from(Promise.all(graphics.map(graphic => this.engine.getSpriteSheet(graphic)))))
+      switchMap(graphics => {
+        if (graphics.length === 0) return of([]);
+        return from(Promise.all(graphics.map(graphic => this.engine.getSpriteSheet(graphic))));
+      })
     )
     .subscribe((sheets) => {  
       this.graphicsSignals.set(sheets);
@@ -101,6 +112,30 @@ export abstract class RpgClientObject extends RpgCommonPlayer {
   }
 
   private animationSubscription?: Subscription;
+  private animationResetTimeout?: ReturnType<typeof setTimeout>;
+
+  private clearAnimationControls() {
+    if (this.animationSubscription) {
+      this.animationSubscription.unsubscribe();
+      this.animationSubscription = undefined;
+    }
+    if (this.animationResetTimeout) {
+      clearTimeout(this.animationResetTimeout);
+      this.animationResetTimeout = undefined;
+    }
+  }
+
+  private finishTemporaryAnimation() {
+    const restoreState = this.animationRestoreState;
+    this.clearAnimationControls();
+    this.animationCurrentIndex.set(0);
+    if (restoreState) {
+      this.animationName.set(restoreState.animationName);
+      this.graphics.set([...restoreState.graphics]);
+    }
+    this.animationRestoreState = undefined;
+    this.animationIsPlaying.set(false);
+  }
 
   /**
    * Trigger a flash animation on this sprite
@@ -199,12 +234,13 @@ export abstract class RpgClientObject extends RpgCommonPlayer {
    * ```
    */
   resetAnimationState() {
+    if (this.animationRestoreState) {
+      this.finishTemporaryAnimation();
+      return;
+    }
     this.animationIsPlaying.set(false);
     this.animationCurrentIndex.set(0);
-    if (this.animationSubscription) {
-      this.animationSubscription.unsubscribe();
-      this.animationSubscription = undefined;
-    }
+    this.clearAnimationControls();
   }
 
   /**
@@ -226,7 +262,7 @@ export abstract class RpgClientObject extends RpgCommonPlayer {
    * player.setAnimation('spell');
    * ```
    */
-  setAnimation(animationName: string, nbTimes?: number): void;
+  setAnimation(animationName: string, nbTimes?: number, options?: AnimationRestoreOptions): void;
   /**
    * Set a custom animation with temporary graphic change
    *
@@ -244,30 +280,52 @@ export abstract class RpgClientObject extends RpgCommonPlayer {
    * player.setAnimation('attack', 'hero_attack', 3);
    * ```
    */
-  setAnimation(animationName: string, graphic?: string | string[], nbTimes?: number): void;
-  setAnimation(animationName: string, graphicOrNbTimes?: string | string[] | number, nbTimes?: number): void {
-    if (this.animationIsPlaying()) return;
-    this.animationIsPlaying.set(true);
-    const previousAnimationName = this.animationName();
-    const previousGraphics = this.graphics();
-    this.animationCurrentIndex.set(0);
-
+  setAnimation(animationName: string, graphic?: string | string[], nbTimes?: number, options?: AnimationRestoreOptions): void;
+  setAnimation(
+    animationName: string,
+    graphicOrNbTimes?: string | string[] | number,
+    nbTimesOrOptions?: number | AnimationRestoreOptions,
+    options?: AnimationRestoreOptions
+  ): void {
     let graphic: string | string[] | undefined;
     let finalNbTimes: number = Infinity;
+    let restoreOptions: AnimationRestoreOptions | undefined = options;
 
     // Handle overloads
     if (typeof graphicOrNbTimes === 'number') {
       // setAnimation(animationName, nbTimes)
       finalNbTimes = graphicOrNbTimes;
+      restoreOptions = typeof nbTimesOrOptions === 'object' ? nbTimesOrOptions : options;
     } else if (graphicOrNbTimes !== undefined) {
       // setAnimation(animationName, graphic, nbTimes)
       graphic = graphicOrNbTimes;
-      finalNbTimes = nbTimes ?? Infinity;
+      if (typeof nbTimesOrOptions === 'number') {
+        finalNbTimes = nbTimesOrOptions;
+      } else {
+        finalNbTimes = Infinity;
+        restoreOptions = nbTimesOrOptions ?? options;
+      }
     } else {
       // setAnimation(animationName) - nbTimes remains Infinity
       finalNbTimes = Infinity;
     }
 
+    if (this.animationIsPlaying()) {
+      this.finishTemporaryAnimation();
+    }
+
+    this.animationIsPlaying.set(true);
+    const previousAnimationName =
+      restoreOptions?.restoreAnimationName ?? this.animationName();
+    const previousGraphics = restoreOptions?.restoreGraphics
+      ? [...restoreOptions.restoreGraphics]
+      : [...this.graphics()];
+    this.animationRestoreState = {
+      animationName: previousAnimationName,
+      graphics: previousGraphics,
+    };
+    this.animationCurrentIndex.set(0);
+
     // Temporarily change graphic if provided
     if (graphic !== undefined) {
       if (Array.isArray(graphic)) {
@@ -277,27 +335,23 @@ export abstract class RpgClientObject extends RpgCommonPlayer {
       }
     }
 
-    // Clean up any existing subscription
-    if (this.animationSubscription) {
-      this.animationSubscription.unsubscribe();
-    }
+    this.clearAnimationControls();
 
     this.animationSubscription =
       this.animationCurrentIndex.observable.subscribe((index) => {
         if (index >= finalNbTimes) {
-          this.animationCurrentIndex.set(0);
-          this.animationName.set(previousAnimationName);
-          // Reset graphic to previous value if it was changed
-          if (graphic !== undefined) {
-            this.graphics.set(previousGraphics);
-          }
-          this.animationIsPlaying.set(false);
-          if (this.animationSubscription) {
-            this.animationSubscription.unsubscribe();
-            this.animationSubscription = undefined;
-          }
+          this.finishTemporaryAnimation();
         }
       });
+
+    if (finalNbTimes !== Infinity) {
+      this.animationResetTimeout = setTimeout(() => {
+        if (this.animationIsPlaying()) {
+          this.finishTemporaryAnimation();
+        }
+      }, Math.max(1000, finalNbTimes * 1000));
+    }
+
     this.animationName.set(animationName);
   }
 

package/src/RpgClientEngine.ts

@@ -374,15 +374,27 @@ export class RpgClientEngine<T = any> {
       this.notificationManager.add(data);
     });
 
-     this.webSocket.on("setAnimation", (data) => {    
-      const { animationName, nbTimes, object, graphic } = data;
-       const player = this.sceneMap.getObjectById(object);
-       if (graphic !== undefined) {
-         player.setAnimation(animationName, graphic, nbTimes);
-       } else {
-         player.setAnimation(animationName, nbTimes);
-       }
-     })
+    this.webSocket.on("setAnimation", (data) => {
+      const {
+        animationName,
+        nbTimes,
+        object,
+        graphic,
+        restoreAnimationName,
+        restoreGraphics,
+      } = data;
+      const player = object ? this.sceneMap.getObjectById(object) : undefined;
+      if (!player) return;
+      const restoreOptions = {
+        restoreAnimationName,
+        restoreGraphics,
+      };
+      if (graphic !== undefined) {
+        player.setAnimation(animationName, graphic, nbTimes, restoreOptions);
+      } else {
+        player.setAnimation(animationName, nbTimes, restoreOptions);
+      }
+    })
 
     this.webSocket.on("playSound", (data) => {
       const { soundId, volume, loop } = data;
@@ -1174,6 +1186,18 @@ export class RpgClientEngine<T = any> {
   }
 
   async processInput({ input }: { input: Direction }) {
+    if (this.stopProcessingInput) return;
+
+    const currentPlayer = this.sceneMap.getCurrentPlayer() as any;
+    const canMove =
+      !currentPlayer ||
+      typeof currentPlayer.canMove !== "function" ||
+      currentPlayer.canMove();
+    if (!canMove) {
+      this.interruptCurrentPlayerMovement(currentPlayer);
+      return;
+    }
+
     const timestamp = Date.now();
     let frame: number;
     let tick: number;
@@ -1188,7 +1212,6 @@ export class RpgClientEngine<T = any> {
     this.inputFrameCounter = frame;
     this.hooks.callHooks("client-engine-onInput", this, { input, playerId: this.playerId }).subscribe();
 
-    const currentPlayer = this.sceneMap.getCurrentPlayer();
     const bodyReady = this.ensureCurrentPlayerBody();
     if (currentPlayer && bodyReady) {
       currentPlayer.changeDirection(input);
@@ -1207,6 +1230,13 @@ export class RpgClientEngine<T = any> {
 
   processAction({ action }: { action: number }) {
     if (this.stopProcessingInput) return;
+    const currentPlayer = this.sceneMap.getCurrentPlayer() as any;
+    const canMove =
+      !currentPlayer ||
+      typeof currentPlayer.canMove !== "function" ||
+      currentPlayer.canMove();
+    if (!canMove) return;
+
     this.hooks.callHooks("client-engine-onInput", this, { input: 'action', playerId: this.playerId }).subscribe();
     this.webSocket.emit('action', { action })
   }
@@ -1337,6 +1367,15 @@ export class RpgClientEngine<T = any> {
     if (!this.predictionEnabled || !this.prediction) {
       return;
     }
+    const player = this.sceneMap?.getCurrentPlayer?.() as any;
+    if (
+      player &&
+      typeof player.canMove === "function" &&
+      !player.canMove()
+    ) {
+      this.interruptCurrentPlayerMovement(player);
+      return;
+    }
     const pendingInputs = this.prediction.getPendingInputs();
     if (pendingInputs.length === 0) {
       return;
@@ -1475,6 +1514,34 @@ export class RpgClientEngine<T = any> {
     this.lastMovePathSentFrame = 0;
   }
 
+  /**
+   * Stop local movement immediately and discard pending predicted movement.
+   *
+   * Use this before a blocking action such as an A-RPG attack, dialog, dash
+   * startup, or any client-side state where already buffered movement inputs
+   * must not be replayed after server reconciliation.
+   *
+   * @param player - Player object to stop. Defaults to the current player.
+   * @returns `true` when a player was found and interrupted.
+   *
+   * @example
+   * ```ts
+   * engine.interruptCurrentPlayerMovement();
+   * ```
+   */
+  interruptCurrentPlayerMovement(player: any = this.sceneMap?.getCurrentPlayer?.()): boolean {
+    if (!player) {
+      return false;
+    }
+    (this.sceneMap as any)?.stopMovement?.(player);
+    this.prediction?.clearPendingInputs();
+    this.pendingPredictionFrames = [];
+    this.lastInputTime = 0;
+    this.lastMovePathSentAt = Date.now();
+    this.lastMovePathSentFrame = this.inputFrameCounter;
+    return true;
+  }
+
   /**
    * Trigger a flash animation on a sprite
    * 
@@ -1560,7 +1627,7 @@ export class RpgClientEngine<T = any> {
     if (typeof ack.x !== "number" || typeof ack.y !== "number") {
       return;
     }
-    const player = this.getCurrentPlayer();
+    const player = this.getCurrentPlayer() as any;
     const myId = this.playerIdSignal();
     if (!player || !myId) {
       return;
@@ -1583,10 +1650,14 @@ export class RpgClientEngine<T = any> {
     authoritativeState: PredictionState<Direction>,
     pendingInputs: PredictionHistoryEntry<Direction>[],
   ): void {
-    const player = this.getCurrentPlayer();
+    const player = this.getCurrentPlayer() as any;
     if (!player) {
       return;
     }
+    if (typeof player.canMove === "function" && !player.canMove()) {
+      this.interruptCurrentPlayerMovement(player);
+      return;
+    }
 
     (this.sceneMap as any).stopMovement(player);
     this.applyAuthoritativeState(authoritativeState);