@rpgjs/client 5.0.0-alpha.8 → 5.0.0-beta.1

package/src/Gui/Gui.ts

@@ -1,46 +1,263 @@
 import { Context, inject } from "@signe/di";
-import { signal } from "canvasengine";
+import { signal, Signal, WritableSignal } from "canvasengine";
 import { AbstractWebsocket, WebSocketToken } from "../services/AbstractSocket";
-import { PrebuiltGui } from "../components/gui";
+import { DialogboxComponent, ShopComponent, SaveLoadComponent, MainMenuComponent, NotificationComponent, TitleScreenComponent, GameoverComponent } from "../components/gui";
+import { combineLatest, Subscription } from "rxjs";
+import { delay, PrebuiltGui } from "@rpgjs/common";
 
 interface GuiOptions {
-  name: string;
+  name?: string;
+  id?: string;
   component: any;
   display?: boolean;
   data?: any;
+  /**
+   * Auto display the GUI when added to the system
+   * @default false
+   */
+  autoDisplay?: boolean;
+  /**
+   * Function that returns an array of Signal dependencies
+   * The GUI will only display when all dependencies are resolved (!= undefined)
+   * @returns Array of Signal dependencies
+   */
+  dependencies?: () => Signal[];
+  /**
+   * Attach the GUI to sprites instead of displaying globally
+   * When true, the GUI will be rendered in character.ce for each sprite
+   * @default false
+   */
+  attachToSprite?: boolean;
+}
+
+interface GuiInstance {
+  name: string;
+  component: any;
+  display: WritableSignal<boolean>;
+  data: WritableSignal<any>;
+  autoDisplay: boolean;
+  dependencies?: () => Signal[];
+  subscription?: Subscription;
+  attachToSprite?: boolean;
+}
+
+interface GuiAction {
+  guiId: string;
+  name: string;
+  data: any;
+  clientActionId: string;
 }
 
+type OptimisticReducer = (data: any, action: GuiAction) => any;
+
 const throwError = (id: string) => {
   throw `The GUI named ${id} is non-existent. Please add the component in the gui property of the decorator @RpgClient`;
 };
 
+const updateItemQuantity = (items: any[], id: string) => {
+  const index = items.findIndex((item) => item?.id === id);
+  if (index === -1) return items;
+  const item = items[index];
+  if (item?.usable === false) return items;
+  if (item?.consumable === false) return items;
+  const quantity = typeof item?.quantity === "number" ? item.quantity : 1;
+  const nextQuantity = Math.max(0, quantity - 1);
+  if (nextQuantity === quantity) return items;
+  if (nextQuantity <= 0) {
+    return items.filter((_, idx) => idx !== index);
+  }
+  const nextItems = items.slice();
+  nextItems[index] = { ...item, quantity: nextQuantity };
+  return nextItems;
+};
+
+const updateEquippedFlag = (items: any[], id: string, equip: boolean) => {
+  const index = items.findIndex((item) => item?.id === id);
+  if (index === -1) return items;
+  const item = items[index];
+  if (item?.equipped === equip) return items;
+  const nextItems = items.slice();
+  nextItems[index] = { ...item, equipped: equip };
+  return nextItems;
+};
+
+const mainMenuOptimisticReducer: OptimisticReducer = (data, action) => {
+  if (!data || typeof data !== "object") return data;
+  if (action.name === "useItem") {
+    if (!Array.isArray(data.items)) return data;
+    const id = action.data?.id;
+    if (!id) return data;
+    const nextItems = updateItemQuantity(data.items, id);
+    if (nextItems === data.items) return data;
+    return { ...data, items: nextItems };
+  }
+  if (action.name === "equipItem") {
+    const id = action.data?.id;
+    if (!id || typeof action.data?.equip !== "boolean") return data;
+    const equip = action.data.equip;
+    let nextItems = data.items;
+    let nextEquips = data.equips;
+    if (Array.isArray(data.items)) {
+      nextItems = updateEquippedFlag(data.items, id, equip);
+    }
+    if (Array.isArray(data.equips)) {
+      nextEquips = updateEquippedFlag(data.equips, id, equip);
+    }
+    if (nextItems === data.items && nextEquips === data.equips) return data;
+    return {
+      ...data,
+      ...(nextItems !== data.items ? { items: nextItems } : {}),
+      ...(nextEquips !== data.equips ? { equips: nextEquips } : {})
+    };
+  }
+  return data;
+};
+
 export class RpgGui {
   private webSocket: AbstractWebsocket;
-  gui = signal<any>({});
+  gui = signal<Record<string, GuiInstance>>({});
+  extraGuis: GuiInstance[] = [];
+  private vueGuiInstance: any = null; // Reference to VueGui instance
+  private optimisticReducers = new Map<string, OptimisticReducer[]>();
+  private pendingActions = new Map<string, GuiAction[]>();
+  /**
+   * Signal tracking which player IDs should display attached GUIs
+   * Key: player ID, Value: boolean (true = show, false = hide)
+   */
+  attachedGuiDisplayState = signal<Record<string, boolean>>({});
 
   constructor(private context: Context) {
     this.webSocket = inject(context, WebSocketToken);
     this.add({
       name: "rpg-dialog",
-      component: PrebuiltGui.Dialogbox,
+      component: DialogboxComponent,
     });
+    this.add({
+      name: PrebuiltGui.MainMenu,
+      component: MainMenuComponent,
+    });
+    this.add({
+      name: PrebuiltGui.Shop,
+      component: ShopComponent,
+    });
+    this.add({
+      name: PrebuiltGui.Notification,
+      component: NotificationComponent,
+      autoDisplay: true,
+    });
+    this.add({
+      name: PrebuiltGui.Save,
+      component: SaveLoadComponent,
+    });
+    this.add({
+      name: PrebuiltGui.TitleScreen,
+      component: TitleScreenComponent,
+    });
+    this.add({
+      name: PrebuiltGui.Gameover,
+      component: GameoverComponent,
+    });
+
+    this.registerOptimisticReducer(PrebuiltGui.MainMenu, mainMenuOptimisticReducer);
   }
 
   async _initialize() {
     this.webSocket.on("gui.open", (data: { guiId: string; data: any }) => {
+      this.clearPendingActions(data.guiId);
       this.display(data.guiId, data.data);
     });
 
     this.webSocket.on("gui.exit", (guiId: string) => {
       this.hide(guiId);
     });
+
+    this.webSocket.on("gui.update", (payload: { guiId: string; data: any; clientActionId?: string }) => {
+      this.applyServerUpdate(payload.guiId, payload.data, payload.clientActionId);
+    });
+
+    /**
+     * Listen for tooltip display state changes from server
+     * This is triggered by showAttachedGui/hideAttachedGui on the server
+     */
+    this.webSocket.on("gui.tooltip", (data: { players: string[]; display: boolean }) => {
+      const currentState = { ...this.attachedGuiDisplayState() };
+      data.players.forEach((playerId) => {
+        currentState[playerId] = data.display;
+      });
+      this.attachedGuiDisplayState.set(currentState);
+    });
+  }
+
+  /**
+   * Set the VueGui instance reference for Vue component management
+   * This is called by VueGui when it's initialized
+   * 
+   * @param vueGuiInstance - The VueGui instance
+   */
+  _setVueGuiInstance(vueGuiInstance: any) {
+    this.vueGuiInstance = vueGuiInstance;
+  }
+
+  /**
+   * Notify VueGui about GUI state changes
+   * This synchronizes the Vue component display state
+   * 
+   * @param guiId - The GUI component ID
+   * @param display - Display state
+   * @param data - Component data
+   */
+  private _notifyVueGui(guiId: string, display: boolean, data: any = {}) {
+    if (this.vueGuiInstance && this.vueGuiInstance.vm) {
+      // Find the GUI in extraGuis
+      const extraGui = this.extraGuis.find(gui => gui.name === guiId);
+      if (extraGui) {
+        // Update the Vue component's display state and data
+        this.vueGuiInstance.vm.gui[guiId] = {
+          name: guiId,
+          display,
+          data,
+          attachToSprite: extraGui.attachToSprite || false
+        };
+        // Trigger Vue reactivity
+        this.vueGuiInstance.vm.gui = Object.assign({}, this.vueGuiInstance.vm.gui);
+      }
+    }
+  }
+
+  /**
+   * Initialize Vue components in the VueGui instance
+   * This should be called after VueGui is mounted
+   */
+  _initializeVueComponents() {
+    if (this.vueGuiInstance && this.vueGuiInstance.vm) {
+      // Initialize all extraGuis in the Vue instance
+      this.extraGuis.forEach(gui => {
+        this.vueGuiInstance.vm.gui[gui.name] = {
+          name: gui.name,
+          display: gui.display(),
+          data: gui.data(),
+          attachToSprite: gui.attachToSprite || false
+        };
+      });
+      
+      // Trigger Vue reactivity
+      this.vueGuiInstance.vm.gui = Object.assign({}, this.vueGuiInstance.vm.gui);
+    }
   }
 
   guiInteraction(guiId: string, name: string, data: any) {
+    const clientActionId = globalThis.crypto?.randomUUID?.() || `${Date.now()}-${Math.random()}`;
+    const actionData = { ...(data || {}), clientActionId };
+    this.applyOptimisticAction({
+      guiId,
+      name,
+      data: actionData,
+      clientActionId
+    });
     this.webSocket.emit("gui.interaction", {
       guiId,
       name,
-      data,
+      data: actionData,
     });
   }
 
@@ -51,42 +268,313 @@ export class RpgGui {
     });
   }
 
+  /**
+   * Add a GUI component to the system
+   * 
+   * By default, only CanvasEngine components (.ce files) are accepted.
+   * Vue components should be handled by the @rpgjs/vue package.
+   * 
+   * @param gui - GUI configuration options
+   * @param gui.name - Name or ID of the GUI component
+   * @param gui.id - Alternative ID if name is not provided
+   * @param gui.component - The component to render (must be a CanvasEngine component)
+   * @param gui.display - Initial display state (default: false)
+   * @param gui.data - Initial data for the component
+   * @param gui.autoDisplay - Auto display when added (default: false)
+   * @param gui.dependencies - Function returning Signal dependencies
+   * @param gui.attachToSprite - Attach GUI to sprites instead of global display (default: false)
+   * 
+   * @example
+   * ```ts
+   * gui.add({
+   *   name: 'inventory',
+   *   component: InventoryComponent, // Must be a .ce component
+   *   autoDisplay: true,
+   *   dependencies: () => [playerSignal, inventorySignal]
+   * });
+   * 
+   * // Attach to sprites
+   * gui.add({
+   *   name: 'tooltip',
+   *   component: TooltipComponent,
+   *   attachToSprite: true
+   * });
+   * ```
+   */
   add(gui: GuiOptions) {
-    this.gui()[gui.name] = {
-      name: gui.name,
+    const guiId = gui.name || gui.id;
+    if (!guiId) {
+      throw new Error("GUI must have a name or id");
+    }
+    const guiInstance: GuiInstance = {
+      name: guiId,
       component: gui.component,
       display: signal(gui.display || false),
       data: signal(gui.data || {}),
+      autoDisplay: gui.autoDisplay || false,
+      dependencies: gui.dependencies ? gui.dependencies() : [],
+      attachToSprite: gui.attachToSprite || false,
     };
+
+    // Accept both CanvasEngine components (.ce) and Vue components
+    // Vue components will be handled by VueGui if available
+    if (typeof gui.component !== 'function') {
+      guiInstance.component = gui;
+      this.extraGuis.push(guiInstance);
+      
+      // Auto display Vue components if enabled
+      if (guiInstance.autoDisplay) {
+        this._notifyVueGui(guiId, true, gui.data || {});
+      }
+      return;
+    }
+
+    this.gui()[guiId] = guiInstance;
+
+    // Auto display if enabled and it's a CanvasEngine component
+    if (guiInstance.autoDisplay && typeof gui.component === 'function') {
+      this.display(guiId, gui.data);
+    }
   }
 
-  get(id: string | GuiOptions) {
-    if (typeof id != "string") {
-      id = id.name;
+  registerOptimisticReducer(guiId: string, reducer: OptimisticReducer) {
+    const existing = this.optimisticReducers.get(guiId) || [];
+    this.optimisticReducers.set(guiId, existing.concat(reducer));
+  }
+
+  /**
+   * Get all attached GUI components (attachToSprite: true)
+   * 
+   * Returns all GUI instances that are configured to be attached to sprites.
+   * These GUIs should be rendered in character.ce instead of canvas.ce.
+   * 
+   * @returns Array of GUI instances with attachToSprite: true
+   * 
+   * @example
+   * ```ts
+   * const attachedGuis = gui.getAttachedGuis();
+   * // Use in character.ce to render tooltips
+   * ```
+   */
+  getAttachedGuis(): GuiInstance[] {
+    const allGuis = this.getAll();
+    return Object.values(allGuis).filter(gui => gui.attachToSprite === true);
+  }
+
+  /**
+   * Check if a player should display attached GUIs
+   * 
+   * @param playerId - The player ID to check
+   * @returns true if attached GUIs should be displayed for this player
+   */
+  shouldDisplayAttachedGui(playerId: string): boolean {
+    return this.attachedGuiDisplayState()[playerId] === true;
+  }
+
+  get(id: string): GuiInstance | undefined {
+    // Check CanvasEngine GUIs first
+    const canvasGui = this.gui()[id];
+    if (canvasGui) {
+      return canvasGui;
     }
-    return this.gui()[id];
+    
+    // Check Vue GUIs in extraGuis
+    return this.extraGuis.find(gui => gui.name === id);
   }
 
   exists(id: string): boolean {
     return !!this.get(id);
   }
 
-  getAll() {
-    return this.gui();
+  getAll(): Record<string, GuiInstance> {
+    const allGuis = { ...this.gui() };
+    
+    // Add extraGuis to the result
+    this.extraGuis.forEach(gui => {
+      allGuis[gui.name] = gui;
+    });
+    
+    return allGuis;
   }
 
-  display(id: string, data = {}) {
+  /**
+   * Display a GUI component
+   * 
+   * Displays the GUI immediately if no dependencies are configured,
+   * or waits for all dependencies to be resolved if dependencies are present.
+   * Automatically manages subscriptions to prevent memory leaks.
+   * Works with both CanvasEngine components and Vue components.
+   * 
+   * @param id - The GUI component ID
+   * @param data - Data to pass to the component
+   * @param dependencies - Optional runtime dependencies (overrides config dependencies)
+   * 
+   * @example
+   * ```ts
+   * // Display immediately
+   * gui.display('inventory', { items: [] });
+   * 
+   * // Display with runtime dependencies
+   * gui.display('shop', { shopId: 1 }, [playerSignal, shopSignal]);
+   * ```
+   */
+  display(id: string, data = {}, dependencies: Signal[] = []) {
     if (!this.exists(id)) {
       throw throwError(id);
     }
-    this.get(id).data.set(data);
-    this.get(id).display.set(true);
+
+    const guiInstance = this.get(id)!;
+    
+    // Check if it's a Vue component (in extraGuis)
+    const isVueComponent = this.extraGuis.some(gui => gui.name === id);
+    
+    if (isVueComponent) {
+      // Handle Vue component display
+      this._handleVueComponentDisplay(id, data, dependencies, guiInstance);
+    } else {
+      guiInstance.data.set(data);
+      guiInstance.display.set(true);
+    }
+  }
+
+  isDisplaying(id: string): boolean {
+    const guiInstance = this.get(id);
+    if (!guiInstance) return false;
+    return guiInstance.display();
+  }
+
+  /**
+   * Handle Vue component display logic
+   * 
+   * @param id - GUI component ID
+   * @param data - Component data
+   * @param dependencies - Runtime dependencies
+   * @param guiInstance - GUI instance
+   */
+  private _handleVueComponentDisplay(id: string, data: any, dependencies: Signal[], guiInstance: GuiInstance) {
+    // Unsubscribe from previous subscription if exists
+    if (guiInstance.subscription) {
+      guiInstance.subscription.unsubscribe();
+      guiInstance.subscription = undefined;
+    }
+
+    // Use runtime dependencies or config dependencies
+    const deps = dependencies.length > 0 
+      ? dependencies 
+      : (guiInstance.dependencies ? guiInstance.dependencies() : []);
+
+    if (deps.length > 0) {
+      // Subscribe to dependencies
+      guiInstance.subscription = combineLatest(
+        deps.map(dependency => dependency.observable)
+      ).subscribe((values) => {
+        if (values.every(value => value !== undefined)) {
+          guiInstance.data.set(data);
+          guiInstance.display.set(true);
+          this._notifyVueGui(id, true, data);
+        }
+      });
+      return;
+    }
+
+    // No dependencies, display immediately
+    guiInstance.data.set(data);
+    guiInstance.display.set(true);
+    this._notifyVueGui(id, true, data);
   }
 
+  /**
+   * Hide a GUI component
+   * 
+   * Hides the GUI and cleans up any active subscriptions.
+   * Works with both CanvasEngine components and Vue components.
+   * 
+   * @param id - The GUI component ID
+   * 
+   * @example
+   * ```ts
+   * gui.hide('inventory');
+   * ```
+   */
   hide(id: string) {
     if (!this.exists(id)) {
       throw throwError(id);
     }
-    this.get(id).display.set(false);
+
+    const guiInstance = this.get(id)!;
+    
+    // Unsubscribe if there's an active subscription
+    if (guiInstance.subscription) {
+      guiInstance.subscription.unsubscribe();
+      guiInstance.subscription = undefined;
+    }
+
+    guiInstance.display.set(false)
+    
+    // Check if it's a Vue component and notify VueGui
+    const isVueComponent = this.extraGuis.some(gui => gui.name === id);
+    if (isVueComponent) {
+      this._notifyVueGui(id, false);
+    }
+  }
+
+  private isVueComponent(id: string) {
+    return this.extraGuis.some(gui => gui.name === id);
+  }
+
+  private clearPendingActions(guiId: string) {
+    this.pendingActions.delete(guiId);
+  }
+
+  private applyReducers(guiId: string, data: any, actions: GuiAction[]) {
+    const reducers = this.optimisticReducers.get(guiId);
+    if (!reducers || reducers.length === 0) return data;
+    let next = data;
+    for (const action of actions) {
+      for (const reducer of reducers) {
+        const updated = reducer(next, action);
+        if (updated !== undefined && updated !== null && updated !== next) {
+          next = updated;
+        }
+      }
+    }
+    return next;
+  }
+
+  private applyOptimisticAction(action: GuiAction) {
+    const guiInstance = this.get(action.guiId);
+    if (!guiInstance) return;
+    const reducers = this.optimisticReducers.get(action.guiId);
+    if (!reducers || reducers.length === 0) return;
+    const currentData = guiInstance.data();
+    const nextData = this.applyReducers(action.guiId, currentData, [action]);
+    if (nextData === currentData) return;
+    guiInstance.data.set(nextData);
+    const pending = this.pendingActions.get(action.guiId) || [];
+    pending.push(action);
+    this.pendingActions.set(action.guiId, pending);
+    if (this.isVueComponent(action.guiId)) {
+      this._notifyVueGui(action.guiId, guiInstance.display(), nextData);
+    }
+  }
+
+  private applyServerUpdate(guiId: string, data: any, clientActionId?: string) {
+    const guiInstance = this.get(guiId);
+    if (!guiInstance) return;
+    let pending = this.pendingActions.get(guiId) || [];
+    if (clientActionId) {
+      pending = pending.filter(action => action.clientActionId !== clientActionId);
+    } else {
+      pending = [];
+    }
+    let nextData = data;
+    if (pending.length) {
+      nextData = this.applyReducers(guiId, nextData, pending);
+    }
+    guiInstance.data.set(nextData);
+    this.pendingActions.set(guiId, pending);
+    if (this.isVueComponent(guiId)) {
+      this._notifyVueGui(guiId, guiInstance.display(), nextData);
+    }
   }
 }

package/src/Gui/NotificationManager.ts

@@ -0,0 +1,69 @@
+import { signal, animatedSignal } from "canvasengine";
+
+export type NotificationType = "info" | "warn" | "error";
+
+export interface NotificationPayload {
+  message: string;
+  type?: NotificationType;
+  icon?: string;
+  time?: number;
+  sound?: string;
+}
+
+export interface NotificationItem extends NotificationPayload {
+  id: number;
+  opacity: any;
+  offset: any;
+  layoutY: any;
+  removing: boolean;
+}
+
+const DEFAULT_DURATION = 220;
+
+export class NotificationManager {
+  stack = signal<NotificationItem[]>([]);
+  private _counter = 0;
+
+  add(payload: NotificationPayload, engine?: { playSound?: (id: string) => void }) {
+    const id = ++this._counter;
+    const opacity = animatedSignal(0, { duration: DEFAULT_DURATION });
+    const offset = animatedSignal(12, { duration: DEFAULT_DURATION });
+    const layoutY = animatedSignal(0, { duration: DEFAULT_DURATION });
+    const item: NotificationItem = {
+      id,
+      message: payload.message,
+      type: payload.type || "info",
+      icon: payload.icon,
+      time: payload.time,
+      sound: payload.sound,
+      opacity,
+      offset,
+      layoutY,
+      removing: false,
+    };
+    this.stack.update((list) => [...list, item]);
+    opacity.set(1);
+    offset.set(0);
+
+    if (payload.sound && engine?.playSound) {
+      engine.playSound(payload.sound);
+    }
+
+    const delay = typeof payload.time === "number" ? payload.time : 2000;
+    setTimeout(() => {
+      this.remove(id);
+    }, delay);
+  }
+
+  remove(id: number) {
+    const list = this.stack();
+    const item = list.find((it) => it.id === id);
+    if (!item || item.removing) return;
+    item.removing = true;
+    item.opacity.set(0);
+    item.offset.set(-8);
+    setTimeout(() => {
+      this.stack.update((items) => items.filter((it) => it.id !== id));
+    }, DEFAULT_DURATION);
+  }
+}