feat: implement command failed handler

.eslintrc.json

@@ -22,6 +22,7 @@
     "@typescript-eslint/default-param-last": "off",
     "arrow-body-style": "off",
     "no-param-reassign": "off",
+    "noUncheckedIndexedAccess": "off",
     "no-else-return": "off",
     "class-methods-use-this": "off"
   }

src/adapters/apis/world-journey-api/index.ts

@@ -32,6 +32,7 @@ export class WorldJourneyApi {
     events: {
       onWorldEntered: (worldJourneyService: WorldJourneyService) => void;
       onCommandSucceeded: (command: Command) => void;
+      onCommandFailed: (commandId: string, errorMessage: string) => void;
       onErrored: (message: string) => void;
       onDisconnect: () => void;
       onOpen: () => void;
@@ -59,7 +60,7 @@ export class WorldJourneyApi {
         if (!command) return;
         events.onCommandSucceeded(command);
       } else if (event.name === ServerEventNameEnum.CommandFailed) {
-        events.onErrored(event.errorMessage);
+        events.onCommandFailed(event.commandId, event.errorMessage);
       } else if (event.name === ServerEventNameEnum.Errored) {
         events.onErrored(event.message);
       }
@@ -92,6 +93,7 @@ export class WorldJourneyApi {
     events: {
       onWorldEntered: (worldJourneyService: WorldJourneyService) => void;
       onCommandSucceeded: (command: Command) => void;
+      onCommandFailed: (commandId: string, errorMessage: string) => void;
       onErrored: (message: string) => void;
       onDisconnect: () => void;
       onOpen: () => void;

src/contexts/world-journey-service-context/index.tsx

@@ -81,6 +81,11 @@ export function Provider({ children }: Props) {
   const itemApi = useMemo<ItemApi>(() => ItemApi.new(), []);
   const [items, setItems] = useState<ItemModel[] | null>([]);
   const [worldJourneyService, setWorldJourneyService] = useState<WorldJourneyService | null>(null);
+  useEffect(() => {
+    // @ts-expect-error
+    window.worldJourneyService = worldJourneyService;
+  }, [worldJourneyService]);
+
   const notificationEventDispatcher = useMemo(() => NotificationEventDispatcher.new(), []);
 
   const [embedCode, setEmbedCode] = useState<string | null>(null);
@@ -152,6 +157,11 @@ export function Provider({ children }: Props) {
         if (!newWorldJourneyService) return;
         newWorldJourneyService.executeCommand(command);
       },
+      onCommandFailed: (commandId, errorMessage) => {
+        if (!newWorldJourneyService) return;
+        newWorldJourneyService.handleFailedCommand(commandId);
+        notificationEventDispatcher.publishErrorTriggeredEvent(errorMessage);
+      },
       onErrored: (message) => {
         notificationEventDispatcher.publishErrorTriggeredEvent(message);
       },
@@ -175,16 +185,20 @@ export function Provider({ children }: Props) {
       if (!worldJourneyApi.current) return;
 
       const oldPlayerPos = oldPlayer.getPosition();
-      const playerPos = player.getPosition();
-      if (oldPlayerPos.isEqual(playerPos)) {
+      const newPlayerPos = player.getPosition();
+      if (oldPlayerPos.isEqual(newPlayerPos)) {
         return;
       }
 
-      const unitAtPlayerPos = worldJourneyService.getUnit(playerPos);
-      if (!unitAtPlayerPos) return;
+      const unitAtNewPlayerPos = worldJourneyService.getUnit(newPlayerPos);
+      if (!unitAtNewPlayerPos) return;
+
+      if (unitAtNewPlayerPos instanceof PortalUnitModel) {
+        // To prevent infinite teleporting loop, we need to check if we just came from another portal
+        const unitAtOldPlayerPos = worldJourneyService.getUnit(oldPlayerPos);
+        if (unitAtOldPlayerPos instanceof PortalUnitModel) return;
 
-      if (unitAtPlayerPos instanceof PortalUnitModel) {
-        const command = SendPlayerIntoPortalCommand.new(player.getId(), unitAtPlayerPos.getId());
+        const command = SendPlayerIntoPortalCommand.new(player.getId(), unitAtNewPlayerPos.getId());
         worldJourneyService.executeCommand(command);
         worldJourneyApi.current.sendCommand(command);
       }

src/services/world-journey-service/index.ts

@@ -60,6 +60,16 @@ export class WorldJourneyService {
     return new WorldJourneyService(world, players, myPlayerId, units);
   }
 
+  public handleFailedCommand(commandId: string) {
+    this.commandManager.handleFailedCommand(commandId, {
+      world: this.world,
+      playerManager: this.playerManager,
+      unitManager: this.unitManager,
+      itemManager: this.itemManager,
+      perspectiveManager: this.perspectiveManager,
+    });
+  }
+
   public executeCommand(command: Command) {
     this.commandManager.executeCommand(command, {
       world: this.world,

src/services/world-journey-service/managers/command-manager/commands/add-item-command.ts

@@ -21,7 +21,13 @@ export class AddItemCommand extends BaseCommand {
   }
 
   public execute({ itemManager }: CommandParams): void {
-    itemManager.addItem(this.item);
+    const isItemAdded = itemManager.addItem(this.item);
+
+    this.setUndoAction(() => {
+      if (isItemAdded) {
+        itemManager.removeItem(this.item.getId());
+      }
+    });
   }
 
   public getItem() {

src/services/world-journey-service/managers/command-manager/commands/add-perspective-depth-command.ts

@@ -13,6 +13,12 @@ export class AddPerspectiveDepthCommand extends BaseCommand {
   }
 
   public execute({ perspectiveManager }: CommandParams): void {
-    perspectiveManager.addPerspectiveDepth();
+    const isDepthChanged = perspectiveManager.addPerspectiveDepth();
+
+    this.setUndoAction(() => {
+      if (isDepthChanged) {
+        perspectiveManager.subtractPerspectiveDepth();
+      }
+    });
   }
 }

src/services/world-journey-service/managers/command-manager/commands/add-player-command.ts

@@ -21,12 +21,22 @@ export class AddPlayerCommand extends BaseCommand {
   }
 
   public execute({ playerManager, itemManager }: CommandParams): void {
-    playerManager.addPlayer(this.player);
+    const isPlayerAdded = playerManager.addPlayer(this.player);
 
     const playerHeldItemId = this.player.getHeldItemId();
+    let isPlaceholderItemIdAdded = false;
     if (playerHeldItemId) {
-      itemManager.addPlaceholderItemId(playerHeldItemId);
+      isPlaceholderItemIdAdded = itemManager.addPlaceholderItemId(playerHeldItemId);
     }
+
+    this.setUndoAction(() => {
+      if (isPlayerAdded) {
+        playerManager.removePlayer(this.player.getId());
+      }
+      if (playerHeldItemId && isPlaceholderItemIdAdded) {
+        itemManager.removePlaceholderItemId(playerHeldItemId);
+      }
+    });
   }
 
   public getPlayer() {

src/services/world-journey-service/managers/command-manager/commands/change-player-action-command.ts

@@ -30,7 +30,13 @@ export class ChangePlayerActionCommand extends BaseCommand {
     const clonedPlayer = player.clone();
     clonedPlayer.updateAction(this.action);
     clonedPlayer.updatePrecisePosition(this.action.getPrecisePosition());
-    playerManager.updatePlayer(clonedPlayer);
+    const isPlayerUpdated = playerManager.updatePlayer(clonedPlayer);
+
+    this.setUndoAction(() => {
+      if (isPlayerUpdated) {
+        playerManager.updatePlayer(player);
+      }
+    });
   }
 
   public getPlayerId() {

src/services/world-journey-service/managers/command-manager/commands/change-player-held-item-command.ts

@@ -33,7 +33,13 @@ export class ChangePlayerHeldItemCommand extends BaseCommand {
       itemManager.addPlaceholderItemId(this.itemId);
     }
 
-    playerManager.updatePlayer(clonedPlayer);
+    const isPlayerUpdated = playerManager.updatePlayer(clonedPlayer);
+
+    this.setUndoAction(() => {
+      if (isPlayerUpdated) {
+        playerManager.updatePlayer(player);
+      }
+    });
   }
 
   public getPlayerId() {

src/services/world-journey-service/managers/command-manager/commands/create-embed-unit-command.ts

@@ -72,7 +72,13 @@ export class CreateEmbedUnitCommand extends BaseCommand {
       if (playersAtPos) return;
     }
 
-    unitManager.addUnit(newUnit);
+    const newUnitAdded = unitManager.addUnit(newUnit);
+
+    this.setUndoAction(() => {
+      if (newUnitAdded) {
+        unitManager.removeUnit(newUnit.getId());
+      }
+    });
   }
 
   public getUnitId() {

src/services/world-journey-service/managers/command-manager/commands/create-fence-unit-command.ts

@@ -59,7 +59,13 @@ export class CreateFenceUnitCommand extends BaseCommand {
       if (playersAtPos) return;
     }
 
-    unitManager.addUnit(newUnit);
+    const newUnitAdded = unitManager.addUnit(newUnit);
+
+    this.setUndoAction(() => {
+      if (newUnitAdded) {
+        unitManager.removeUnit(newUnit.getId());
+      }
+    });
   }
 
   public getUnitId() {

src/services/world-journey-service/managers/command-manager/commands/create-link-unit-command.ts

@@ -72,7 +72,13 @@ export class CreateLinkUnitCommand extends BaseCommand {
       if (playersAtPos) return;
     }
 
-    unitManager.addUnit(newUnit);
+    const newUnitAdded = unitManager.addUnit(newUnit);
+
+    this.setUndoAction(() => {
+      if (newUnitAdded) {
+        unitManager.removeUnit(newUnit.getId());
+      }
+    });
   }
 
   public getUnitId() {

src/services/world-journey-service/managers/command-manager/commands/create-portal-unit-command.ts

@@ -67,10 +67,8 @@ export class CreatePortalUnitCommand extends BaseCommand {
     }
 
     const portalsWithoutTarget = unitManager.getPortalUnits().filter((unit) => !unit.getTargetUnitId());
-    if (portalsWithoutTarget.length === 0) {
-      unitManager.addUnit(newUnit);
-    } else {
-      const topLeftMostPortalWithoutTarget = portalsWithoutTarget.sort((unitA, unitB) => {
+    const topLeftMostPortalWithoutTarget = portalsWithoutTarget
+      .sort((unitA, unitB) => {
         const unitPosA = unitA.getPosition();
         const unitPosB = unitB.getPosition();
 
@@ -79,14 +77,31 @@ export class CreatePortalUnitCommand extends BaseCommand {
         } else {
           return unitPosA.getZ() - unitPosB.getZ();
         }
-      })[0];
-
-      topLeftMostPortalWithoutTarget.updateTargetUnitId(newUnit.getId());
-      unitManager.updateUnit(topLeftMostPortalWithoutTarget);
+      })
+      .at(0);
 
+    let isUnitAdded = false;
+    let isTopLeftMostPortalWithoutTargetUpdated = false;
+    if (topLeftMostPortalWithoutTarget) {
       newUnit.updateTargetUnitId(topLeftMostPortalWithoutTarget.getId());
-      unitManager.addUnit(newUnit);
+      isUnitAdded = unitManager.addUnit(newUnit);
+
+      const clonedTopLeftMostPortalWithoutTarget = topLeftMostPortalWithoutTarget.clone();
+      clonedTopLeftMostPortalWithoutTarget.updateTargetUnitId(newUnit.getId());
+      isTopLeftMostPortalWithoutTargetUpdated = unitManager.updateUnit(clonedTopLeftMostPortalWithoutTarget);
+    } else {
+      isUnitAdded = unitManager.addUnit(newUnit);
     }
+
+    this.setUndoAction(() => {
+      if (isUnitAdded) {
+        unitManager.removeUnit(newUnit.getId());
+      }
+
+      if (topLeftMostPortalWithoutTarget && isTopLeftMostPortalWithoutTargetUpdated) {
+        unitManager.updateUnit(topLeftMostPortalWithoutTarget);
+      }
+    });
   }
 
   public getUnitId() {

src/services/world-journey-service/managers/command-manager/commands/create-static-unit-command.ts

@@ -59,7 +59,13 @@ export class CreateStaticUnitCommand extends BaseCommand {
       if (playersAtPos) return;
     }
 
-    unitManager.addUnit(newUnit);
+    const newUnitAdded = unitManager.addUnit(newUnit);
+
+    this.setUndoAction(() => {
+      if (newUnitAdded) {
+        unitManager.removeUnit(newUnit.getId());
+      }
+    });
   }
 
   public getUnitId() {

src/services/world-journey-service/managers/command-manager/commands/remove-embed-unit-command.ts

@@ -20,7 +20,16 @@ export class RemoveEmbedUnitCommand extends BaseCommand {
   }
 
   public execute({ unitManager }: CommandParams): void {
-    unitManager.removeUnit(this.unitId);
+    const currentUnit = unitManager.getUnit(this.unitId);
+    if (!currentUnit) return;
+
+    const hasRemovedUnit = unitManager.removeUnit(this.unitId);
+
+    this.setUndoAction(() => {
+      if (hasRemovedUnit) {
+        unitManager.addUnit(currentUnit);
+      }
+    });
   }
 
   public getUnitId() {

src/services/world-journey-service/managers/command-manager/commands/remove-fence-unit-command.ts

@@ -20,7 +20,16 @@ export class RemoveFenceUnitCommand extends BaseCommand {
   }
 
   public execute({ unitManager }: CommandParams): void {
-    unitManager.removeUnit(this.unitId);
+    const currentUnit = unitManager.getUnit(this.unitId);
+    if (!currentUnit) return;
+
+    const hasRemovedUnit = unitManager.removeUnit(this.unitId);
+
+    this.setUndoAction(() => {
+      if (hasRemovedUnit) {
+        unitManager.addUnit(currentUnit);
+      }
+    });
   }
 
   public getUnitId() {

src/services/world-journey-service/managers/command-manager/commands/remove-link-unit-command.ts

@@ -20,7 +20,16 @@ export class RemoveLinkUnitCommand extends BaseCommand {
   }
 
   public execute({ unitManager }: CommandParams): void {
-    unitManager.removeUnit(this.unitId);
+    const currentUnit = unitManager.getUnit(this.unitId);
+    if (!currentUnit) return;
+
+    const hasRemovedUnit = unitManager.removeUnit(this.unitId);
+
+    this.setUndoAction(() => {
+      if (hasRemovedUnit) {
+        unitManager.addUnit(currentUnit);
+      }
+    });
   }
 
   public getUnitId() {

src/services/world-journey-service/managers/command-manager/commands/remove-player-command.ts

@@ -20,7 +20,16 @@ export class RemovePlayerCommand extends BaseCommand {
   }
 
   public execute({ playerManager }: CommandParams): void {
-    playerManager.removePlayer(this.playerId);
+    const currentPlayer = playerManager.getPlayer(this.playerId);
+    if (!currentPlayer) return;
+
+    const isPlayerRemoved = playerManager.removePlayer(this.playerId);
+
+    this.setUndoAction(() => {
+      if (isPlayerRemoved) {
+        playerManager.addPlayer(currentPlayer);
+      }
+    });
   }
 
   public getPlayerId() {