@rpgjs/server 5.0.0-alpha.32 → 5.0.0-alpha.35

package/dist/index.js

@@ -5284,171 +5284,6 @@ var BehaviorSubject = (function (_super) {
     return BehaviorSubject;
 }(Subject));
 
-var dateTimestampProvider = {
-    now: function () {
-        return (Date).now();
-    }};
-
-var Action$1 = (function (_super) {
-    __extends(Action, _super);
-    function Action(scheduler, work) {
-        return _super.call(this) || this;
-    }
-    Action.prototype.schedule = function (state, delay) {
-        return this;
-    };
-    return Action;
-}(Subscription));
-
-var intervalProvider = {
-    setInterval: function (handler, timeout) {
-        var args = [];
-        for (var _i = 2; _i < arguments.length; _i++) {
-            args[_i - 2] = arguments[_i];
-        }
-        return setInterval.apply(void 0, __spreadArray([handler, timeout], __read(args)));
-    },
-    clearInterval: function (handle) {
-        return (clearInterval)(handle);
-    },
-    delegate: undefined,
-};
-
-var AsyncAction = (function (_super) {
-    __extends(AsyncAction, _super);
-    function AsyncAction(scheduler, work) {
-        var _this = _super.call(this, scheduler, work) || this;
-        _this.scheduler = scheduler;
-        _this.work = work;
-        _this.pending = false;
-        return _this;
-    }
-    AsyncAction.prototype.schedule = function (state, delay) {
-        var _a;
-        if (delay === void 0) { delay = 0; }
-        if (this.closed) {
-            return this;
-        }
-        this.state = state;
-        var id = this.id;
-        var scheduler = this.scheduler;
-        if (id != null) {
-            this.id = this.recycleAsyncId(scheduler, id, delay);
-        }
-        this.pending = true;
-        this.delay = delay;
-        this.id = (_a = this.id) !== null && _a !== void 0 ? _a : this.requestAsyncId(scheduler, this.id, delay);
-        return this;
-    };
-    AsyncAction.prototype.requestAsyncId = function (scheduler, _id, delay) {
-        if (delay === void 0) { delay = 0; }
-        return intervalProvider.setInterval(scheduler.flush.bind(scheduler, this), delay);
-    };
-    AsyncAction.prototype.recycleAsyncId = function (_scheduler, id, delay) {
-        if (delay === void 0) { delay = 0; }
-        if (delay != null && this.delay === delay && this.pending === false) {
-            return id;
-        }
-        if (id != null) {
-            intervalProvider.clearInterval(id);
-        }
-        return undefined;
-    };
-    AsyncAction.prototype.execute = function (state, delay) {
-        if (this.closed) {
-            return new Error('executing a cancelled action');
-        }
-        this.pending = false;
-        var error = this._execute(state, delay);
-        if (error) {
-            return error;
-        }
-        else if (this.pending === false && this.id != null) {
-            this.id = this.recycleAsyncId(this.scheduler, this.id, null);
-        }
-    };
-    AsyncAction.prototype._execute = function (state, _delay) {
-        var errored = false;
-        var errorValue;
-        try {
-            this.work(state);
-        }
-        catch (e) {
-            errored = true;
-            errorValue = e ? e : new Error('Scheduled action threw falsy error');
-        }
-        if (errored) {
-            this.unsubscribe();
-            return errorValue;
-        }
-    };
-    AsyncAction.prototype.unsubscribe = function () {
-        if (!this.closed) {
-            var _a = this, id = _a.id, scheduler = _a.scheduler;
-            var actions = scheduler.actions;
-            this.work = this.state = this.scheduler = null;
-            this.pending = false;
-            arrRemove(actions, this);
-            if (id != null) {
-                this.id = this.recycleAsyncId(scheduler, id, null);
-            }
-            this.delay = null;
-            _super.prototype.unsubscribe.call(this);
-        }
-    };
-    return AsyncAction;
-}(Action$1));
-
-var Scheduler = (function () {
-    function Scheduler(schedulerActionCtor, now) {
-        if (now === void 0) { now = Scheduler.now; }
-        this.schedulerActionCtor = schedulerActionCtor;
-        this.now = now;
-    }
-    Scheduler.prototype.schedule = function (work, delay, state) {
-        if (delay === void 0) { delay = 0; }
-        return new this.schedulerActionCtor(this, work).schedule(state, delay);
-    };
-    Scheduler.now = dateTimestampProvider.now;
-    return Scheduler;
-}());
-
-var AsyncScheduler = (function (_super) {
-    __extends(AsyncScheduler, _super);
-    function AsyncScheduler(SchedulerAction, now) {
-        if (now === void 0) { now = Scheduler.now; }
-        var _this = _super.call(this, SchedulerAction, now) || this;
-        _this.actions = [];
-        _this._active = false;
-        return _this;
-    }
-    AsyncScheduler.prototype.flush = function (action) {
-        var actions = this.actions;
-        if (this._active) {
-            actions.push(action);
-            return;
-        }
-        var error;
-        this._active = true;
-        do {
-            if ((error = action.execute(action.state, action.delay))) {
-                break;
-            }
-        } while ((action = actions.shift()));
-        this._active = false;
-        if (error) {
-            while ((action = actions.shift())) {
-                action.unsubscribe();
-            }
-            throw error;
-        }
-    };
-    return AsyncScheduler;
-}(Scheduler));
-
-var asyncScheduler = new AsyncScheduler(AsyncAction);
-var async = asyncScheduler;
-
 function isScheduler(value) {
     return value && isFunction$2(value.schedule);
 }
@@ -5828,10 +5663,6 @@ function lastValueFrom(source, config) {
     });
 }
 
-function isValidDate(value) {
-    return value instanceof Date && !isNaN(value);
-}
-
 function map(project, thisArg) {
     return operate(function (source, subscriber) {
         var index = 0;
@@ -5997,37 +5828,6 @@ function mergeMap(project, resultSelector, concurrent) {
     return operate(function (source, subscriber) { return mergeInternals(source, subscriber, project, concurrent); });
 }
 
-function timer(dueTime, intervalOrScheduler, scheduler) {
-    if (scheduler === void 0) { scheduler = async; }
-    var intervalDuration = -1;
-    if (intervalOrScheduler != null) {
-        if (isScheduler(intervalOrScheduler)) {
-            scheduler = intervalOrScheduler;
-        }
-        else {
-            intervalDuration = intervalOrScheduler;
-        }
-    }
-    return new Observable(function (subscriber) {
-        var due = isValidDate(dueTime) ? +dueTime - scheduler.now() : dueTime;
-        if (due < 0) {
-            due = 0;
-        }
-        var n = 0;
-        return scheduler.schedule(function () {
-            if (!subscriber.closed) {
-                subscriber.next(n++);
-                if (0 <= intervalDuration) {
-                    this.schedule(undefined, intervalDuration);
-                }
-                else {
-                    subscriber.complete();
-                }
-            }
-        }, due);
-    });
-}
-
 function filter(predicate, thisArg) {
     return operate(function (source, subscriber) {
         var index = 0;
@@ -6156,54 +5956,6 @@ function handleReset(reset, on) {
     return innerFrom(on.apply(void 0, __spreadArray([], __read(args)))).subscribe(onSubscriber);
 }
 
-function throttle$1(durationSelector, config) {
-    return operate(function (source, subscriber) {
-        var _a = config !== null && config !== void 0 ? config : {}, _b = _a.leading, leading = _b === void 0 ? true : _b, _c = _a.trailing, trailing = _c === void 0 ? false : _c;
-        var hasValue = false;
-        var sendValue = null;
-        var throttled = null;
-        var isComplete = false;
-        var endThrottling = function () {
-            throttled === null || throttled === void 0 ? void 0 : throttled.unsubscribe();
-            throttled = null;
-            if (trailing) {
-                send();
-                isComplete && subscriber.complete();
-            }
-        };
-        var cleanupThrottling = function () {
-            throttled = null;
-            isComplete && subscriber.complete();
-        };
-        var startThrottle = function (value) {
-            return (throttled = innerFrom(durationSelector(value)).subscribe(createOperatorSubscriber(subscriber, endThrottling, cleanupThrottling)));
-        };
-        var send = function () {
-            if (hasValue) {
-                hasValue = false;
-                var value = sendValue;
-                sendValue = null;
-                subscriber.next(value);
-                !isComplete && startThrottle(value);
-            }
-        };
-        source.subscribe(createOperatorSubscriber(subscriber, function (value) {
-            hasValue = true;
-            sendValue = value;
-            !(throttled && !throttled.closed) && (leading ? send() : startThrottle(value));
-        }, function () {
-            isComplete = true;
-            !(trailing && hasValue && throttled && !throttled.closed) && subscriber.complete();
-        }));
-    });
-}
-
-function throttleTime(duration, scheduler, config) {
-    if (scheduler === void 0) { scheduler = asyncScheduler; }
-    var duration$ = timer(duration, scheduler);
-    return throttle$1(function () { return duration$; }, config);
-}
-
 var __defProp$9 = Object.defineProperty;
 var __name$2 = (target, value) => __defProp$9(target, "name", { value, configurable: true });
 var ArraySubject = class extends BehaviorSubject {
@@ -6749,7 +6501,7 @@ function isClass$1(obj) {
   return typeof obj === "function" && obj.prototype && obj.prototype.constructor === obj;
 }
 __name$3(isClass$1, "isClass");
-var isObject$1 = /* @__PURE__ */ __name$3((item) => item && typeof item === "object" && !Array.isArray(item) && item !== null, "isObject");
+var isObject$2 = /* @__PURE__ */ __name$3((item) => item && typeof item === "object" && !Array.isArray(item) && item !== null, "isObject");
 function isInstanceOfClass(value) {
   if (value === null || typeof value !== "object" || value === void 0 || Array.isArray(value)) {
     return false;
@@ -6799,7 +6551,7 @@ function createStatesSnapshot(instance) {
       const signal = instance.$snapshot.get(key);
       const persist2 = signal.options.persist ?? true;
       let value = signal();
-      if (isObject$1(value) || Array.isArray(value)) {
+      if (isObject$2(value) || Array.isArray(value)) {
         continue;
       }
       if (persist2) {
@@ -6904,7 +6656,7 @@ var createSyncClass = /* @__PURE__ */ __name$3((currentClass, parentKey = null,
       if (transform) {
         signalValue = transform(signalValue);
       }
-      if (isObject$1(signalValue) || Array.isArray(signalValue)) {
+      if (isObject$2(signalValue) || Array.isArray(signalValue)) {
         signalValue = {
           ...signalValue
         };
@@ -6940,7 +6692,7 @@ var type = /* @__PURE__ */ __name$3((_signal, path, options = {}, currentInstanc
     ].includes(value.type)) {
       if (isInstanceOfClass(value.value)) {
         createSyncClass(value.value, value.key, currentInstance, newPath);
-      } else if (value.type === "update" && (isObject$1(value.value) || Array.isArray(value.value))) {
+      } else if (value.type === "update" && (isObject$2(value.value) || Array.isArray(value.value))) {
         createSyncClass(value.value, value.key, currentInstance, newPath);
       } else {
         savePath(newPath, value.value);
@@ -6969,7 +6721,7 @@ var type = /* @__PURE__ */ __name$3((_signal, path, options = {}, currentInstanc
     ].includes(value.type) && firstItem !== void 0) {
       if (isInstanceOfClass(firstItem)) {
         createSyncClass(firstItem, value.key, currentInstance, newPath);
-      } else if (value.type === "update" && (isObject$1(firstItem) || Array.isArray(firstItem))) {
+      } else if (value.type === "update" && (isObject$2(firstItem) || Array.isArray(firstItem))) {
         createSyncClass(firstItem, value.key, currentInstance, newPath);
       } else {
         savePath(newPath, firstItem);
@@ -8543,9 +8295,9 @@ var Server = class {
             sessionState,
             room: this.room
           })) ?? userSnapshot;
-          load(user, hydratedSnapshot, true);
           signal2()[publicId] = user;
-          await this.room.storage.put(`${usersPropName}.${publicId}`, hydratedSnapshot);
+          load(user, hydratedSnapshot, true);
+          await this.room.storage.put(`${usersPropName}.${publicId}`, userSnapshot);
         }
       }
       const transferToken = generateShortUUID$1();
@@ -9898,6 +9650,7 @@ class Item {
     this.atk = signal(0);
     this.pdef = signal(0);
     this.sdef = signal(0);
+    this.icon = signal("");
     this.quantity = signal(1);
     this.onAdd = () => {
     };
@@ -9907,6 +9660,7 @@ class Item {
     this.atk.set(data?.atk ?? 0);
     this.pdef.set(data?.pdef ?? 0);
     this.sdef.set(data?.sdef ?? 0);
+    this.icon.set(data?.icon ?? "");
     this.onAdd = data?.onAdd?.bind(this) ?? (() => {
     });
   }
@@ -9914,6 +9668,12 @@ class Item {
 __decorateClass$6([
   id()
 ], Item.prototype, "id");
+__decorateClass$6([
+  sync()
+], Item.prototype, "name");
+__decorateClass$6([
+  sync()
+], Item.prototype, "icon");
 __decorateClass$6([
   sync()
 ], Item.prototype, "quantity");
@@ -9933,6 +9693,7 @@ class Skill {
     this.name = signal("");
     this.description = signal("");
     this.spCost = signal(0);
+    this.icon = signal("");
     this.hitRate = signal(0);
     this.power = signal(0);
     this.coefficient = signal({});
@@ -9943,11 +9704,21 @@ class Skill {
     this.hitRate.set(data?.hitRate ?? 0);
     this.power.set(data?.power ?? 0);
     this.coefficient.set(data?.coefficient ?? {});
+    this.icon.set(data?.icon ?? "");
   }
 }
 __decorateClass$5([
   id()
 ], Skill.prototype, "id");
+__decorateClass$5([
+  sync()
+], Skill.prototype, "name");
+__decorateClass$5([
+  sync()
+], Skill.prototype, "spCost");
+__decorateClass$5([
+  sync()
+], Skill.prototype, "icon");
 
 var __defProp$5 = Object.defineProperty;
 var __decorateClass$4 = (decorators, target, key, kind) => {
@@ -16372,12 +16143,17 @@ class RpgCommonMap {
   }
   loadPhysic() {
     this.clearPhysic();
-    const hitboxes = this.data()?.hitboxes ?? [];
-    const gap = 100;
-    this.addStaticHitbox("map-width-left", -gap, 0, gap, this.data().height);
-    this.addStaticHitbox("map-width-right", this.data().width, 0, gap, this.data().height);
-    this.addStaticHitbox("map-height-top", 0, -gap, this.data().width, gap);
-    this.addStaticHitbox("map-height-bottom", 0, this.data().height, this.data().width, gap);
+    const mapData = this.data?.();
+    const mapWidth = typeof mapData?.width === "number" ? mapData.width : 0;
+    const mapHeight = typeof mapData?.height === "number" ? mapData.height : 0;
+    const hitboxes = Array.isArray(mapData?.hitboxes) ? mapData.hitboxes : [];
+    if (mapWidth > 0 && mapHeight > 0) {
+      const gap = 100;
+      this.addStaticHitbox("map-width-left", -gap, 0, gap, mapHeight);
+      this.addStaticHitbox("map-width-right", mapWidth, 0, gap, mapHeight);
+      this.addStaticHitbox("map-height-top", 0, -gap, mapWidth, gap);
+      this.addStaticHitbox("map-height-bottom", 0, mapHeight, mapWidth, gap);
+    }
     for (let staticHitbox of hitboxes) {
       if ("x" in staticHitbox) {
         this.addStaticHitbox(staticHitbox.id ?? generateShortUUID$1(), staticHitbox.x, staticHitbox.y, staticHitbox.width, staticHitbox.height);
@@ -16387,13 +16163,29 @@ class RpgCommonMap {
     }
     this.playersSubscription = this.players.observable.subscribe(
       ({ value: player, type, key }) => {
+        if (type === "remove") {
+          this.removeHitbox(key);
+          return;
+        }
+        if (type == "reset") {
+          if (!player) return;
+          for (let id in player) {
+            const _player = player[id];
+            _player.id = _player.id ?? id;
+            this.createCharacterHitbox(_player, "hero");
+          }
+          return;
+        }
         if (!player) return;
         if (type === "add") {
           player.id = key;
           this.createCharacterHitbox(player, "hero");
-        } else if (type === "remove") {
-          this.removeHitbox(key);
         } else if (type === "update") {
+          player.id = player.id ?? key;
+          if (!this.getBody(key)) {
+            this.createCharacterHitbox(player, "hero");
+            return;
+          }
           if (this.isPhysicsSyncingSignals) {
             return;
           }
@@ -16414,9 +16206,41 @@ class RpgCommonMap {
         }
         this.removeHitbox(key);
       } else if (type === "update") {
+        event.id = event.id ?? key;
+        if (!this.getBody(key)) {
+          this.createCharacterHitbox(event, "npc", {
+            mass: 100
+          });
+          return;
+        }
         this.updateCharacterHitbox(event);
+      } else if (type === "reset") {
+        for (const id in event) {
+          const _event = event[id];
+          if (!_event) continue;
+          _event.id = _event.id ?? id;
+          this.createCharacterHitbox(_event, "npc", {
+            mass: 100
+          });
+        }
       }
     });
+    const players = this.players();
+    for (const id in players) {
+      const player = players[id];
+      if (!player) continue;
+      player.id = player.id ?? id;
+      this.createCharacterHitbox(player, "hero");
+    }
+    const events = this.events();
+    for (const id in events) {
+      const event = events[id];
+      if (!event) continue;
+      event.id = event.id ?? id;
+      this.createCharacterHitbox(event, "npc", {
+        mass: 100
+      });
+    }
     if (this.autoTickEnabled) {
       this.tickSubscription = this.tick$.subscribe(({ delta }) => {
         this.runFixedTicks(delta);
@@ -16614,6 +16438,12 @@ class RpgCommonMap {
     if (!owner?.id) {
       return;
     }
+    const existingEntity = this.physic.getEntityByUUID(owner.id);
+    if (existingEntity) {
+      existingEntity.owner = owner;
+      this.updateCharacterHitbox(owner);
+      return;
+    }
     const hitbox = typeof owner.hitbox === "function" ? owner.hitbox() : owner.hitbox;
     const width = hitbox?.w ?? 32;
     const height = hitbox?.h ?? 32;
@@ -16630,6 +16460,9 @@ class RpgCommonMap {
   }
   updateCharacterHitbox(owner) {
     if (!owner?.id) return;
+    const entity = this.physic.getEntityByUUID(owner.id);
+    if (!entity) return;
+    entity.owner = owner;
     const hitbox = typeof owner.hitbox === "function" ? owner.hitbox() : owner.hitbox;
     const width = hitbox?.w ?? 32;
     const height = hitbox?.h ?? 32;
@@ -17017,22 +16850,26 @@ class RpgCommonMap {
         }
       }
     });
-    const entityWidth = width;
-    const entityHeight = height;
     entity.onPositionChange(({ x, y }) => {
+      const currentOwner = entity.owner;
+      if (!currentOwner) {
+        return;
+      }
+      const entityWidth = entity.width || width;
+      const entityHeight = entity.height || height;
       const topLeftX2 = x - entityWidth / 2;
       const topLeftY2 = y - entityHeight / 2;
       let changed = false;
-      if (typeof owner.x === "function" && typeof owner.x.set === "function") {
-        owner.x.set(Math.round(topLeftX2));
+      if (typeof currentOwner.x === "function" && typeof currentOwner.x.set === "function") {
+        currentOwner.x.set(Math.round(topLeftX2));
         changed = true;
       }
-      if (typeof owner.y === "function" && typeof owner.y.set === "function") {
-        owner.y.set(Math.round(topLeftY2));
+      if (typeof currentOwner.y === "function" && typeof currentOwner.y.set === "function") {
+        currentOwner.y.set(Math.round(topLeftY2));
         changed = true;
       }
       if (changed) {
-        owner.applyFrames?.();
+        currentOwner.applyFrames?.();
       }
     });
     entity.addResolutionFilter((self, other) => {
@@ -20669,6 +20506,27 @@ function WithVariableManager(Base) {
   };
 }
 
+const DEFAULT_EXP_CURVE = {
+  basis: 30,
+  extra: 20,
+  accelerationA: 30,
+  accelerationB: 30
+};
+function isObject$1(value) {
+  return typeof value === "object" && value !== null;
+}
+function toValidNumber(value, fallback) {
+  return typeof value === "number" && Number.isFinite(value) ? value : fallback;
+}
+function normalizeExpCurve(value) {
+  if (!isObject$1(value)) return DEFAULT_EXP_CURVE;
+  return {
+    basis: toValidNumber(value.basis, DEFAULT_EXP_CURVE.basis),
+    extra: toValidNumber(value.extra, DEFAULT_EXP_CURVE.extra),
+    accelerationA: toValidNumber(value.accelerationA, DEFAULT_EXP_CURVE.accelerationA),
+    accelerationB: toValidNumber(value.accelerationB, DEFAULT_EXP_CURVE.accelerationB)
+  };
+}
 function WithParameterManager(Base) {
   return class extends Base {
     constructor() {
@@ -20771,7 +20629,7 @@ function WithParameterManager(Base) {
        * ```
        * @memberof ParameterManager
        * */
-      this._expCurveSignal = type(signal(""), "_expCurveSignal", { persist: true }, this);
+      this._expCurveSignal = type(signal(JSON.stringify(DEFAULT_EXP_CURVE)), "_expCurveSignal", { persist: true }, this);
     }
     /**
      * Aggregates parameter modifiers from all sources (direct modifiers, states, equipment)
@@ -20820,7 +20678,13 @@ function WithParameterManager(Base) {
       return params;
     }
     get expCurve() {
-      return JSON.parse(this._expCurveSignal());
+      const raw = this._expCurveSignal();
+      if (!raw) return DEFAULT_EXP_CURVE;
+      try {
+        return normalizeExpCurve(JSON.parse(raw));
+      } catch {
+        return DEFAULT_EXP_CURVE;
+      }
     }
     set expCurve(val) {
       this._expCurveSignal.set(JSON.stringify(val));
@@ -21169,10 +21033,12 @@ function WithItemFixture(Base) {
   };
 }
 
-class Log {
+class Log extends Error {
   constructor(id, msg) {
+    super(`[${id}] ${msg}`);
+    this.name = "RpgLog";
     this.id = id;
-    this.msg = msg;
+    Object.setPrototypeOf(this, new.target.prototype);
   }
 }
 
@@ -21549,13 +21415,17 @@ function WithItemManager(Base) {
       this.removeItem(itemClass);
       return inventory;
     }
-    equip(itemClass, equip = true) {
-      const itemId = isString(itemClass) ? itemClass : itemClass.name;
-      const inventory = this.getItem(itemClass);
+    equip(itemId, equip = true) {
+      const autoAdd = equip === "auto";
+      const equipState = equip === "auto" ? true : equip;
+      const data = this.databaseById(itemId);
+      let inventory = this.getItem(itemId);
+      if (!inventory && autoAdd) {
+        inventory = this.addItem(itemId, 1);
+      }
       if (!inventory) {
         throw ItemLog.notInInventory(itemId);
       }
-      const data = this.databaseById(itemId);
       if (data._type == "item") {
         throw ItemLog.invalidToEquiped(itemId);
       }
@@ -21570,18 +21440,18 @@ function WithItemManager(Base) {
         }
       }
       const item = inventory;
-      if (item.equipped && equip) {
+      if (item.equipped && equipState) {
         throw ItemLog.isAlreadyEquiped(itemId);
       }
-      item.equipped = equip;
-      if (!equip) {
+      item.equipped = equipState;
+      if (!equipState) {
         const index = this.equipments().findIndex((it) => it.id() == item.id());
         this.equipments().splice(index, 1);
       } else {
         this.equipments().push(item);
       }
       const hookTarget = item._itemInstance || item;
-      this["execMethod"]("onEquip", [this, equip], hookTarget);
+      this["execMethod"]("onEquip", [this, equipState], hookTarget);
     }
   };
 }
@@ -22180,8 +22050,11 @@ function WithClassManager(Base) {
         this.addParameter(param, actor.parameters[param]);
       }
       for (let item of actor.startingEquipment) {
-        this.addItem(item);
-        this.equip(item, true);
+        const inventory = this.addItem(item);
+        const itemId = inventory?.id?.();
+        if (itemId) {
+          this.equip(itemId, true);
+        }
       }
       if (actor.class) this.setClass(actor.class);
       this["execMethod"]("onSet", [this], actor);
@@ -22365,7 +22238,9 @@ const _RpgPlayer = class _RpgPlayer extends BasicPlayerMixins(RpgCommonPlayer) {
     this._lastFramePositions = null;
     this.frames = [];
     this.events = signal([]);
-    let lastEmitted = null;
+    const initialX = typeof this.x === "function" ? Number(this.x()) || 0 : 0;
+    const initialY = typeof this.y === "function" ? Number(this.y()) || 0 : 0;
+    let lastEmitted = { x: initialX, y: initialY };
     let pendingUpdate = null;
     let updateScheduled = false;
     combineLatest([this.x.observable, this.y.observable]).subscribe(([x, y]) => {
@@ -22467,6 +22342,7 @@ const _RpgPlayer = class _RpgPlayer extends BasicPlayerMixins(RpgCommonPlayer) {
   }
   setMap(map2) {
     this.map = map2;
+    this.touchSide = true;
   }
   applyFrames() {
     this._frames.set(this.frames);
@@ -22508,12 +22384,13 @@ const _RpgPlayer = class _RpgPlayer extends BasicPlayerMixins(RpgCommonPlayer) {
     }));
     if (canChange.some((v) => v === false)) return false;
     if (positions && typeof positions === "object") {
-      this.teleport(positions);
+      await this.teleport(positions);
     }
-    await room?.$sessionTransfer(this.conn, realMapId);
+    const transferToken = await room?.$sessionTransfer(this.conn, realMapId);
     this.emit("changeMap", {
       mapId: realMapId,
-      positions
+      positions,
+      transferToken: typeof transferToken === "string" ? transferToken : void 0
     });
     return true;
   }
@@ -22525,16 +22402,28 @@ const _RpgPlayer = class _RpgPlayer extends BasicPlayerMixins(RpgCommonPlayer) {
       const direction = this.getDirection();
       const marginLeftRight = map2.tileWidth / 2;
       const marginTopDown = map2.tileHeight / 2;
-      const changeMap = async (adjacent, to) => {
-        if (this.touchSide) {
+      const hitbox = this.hitbox();
+      const currentX = this.x();
+      const currentY = this.y();
+      const nearBorder = currentX < marginLeftRight || currentX > map2.widthPx - hitbox.w - marginLeftRight || currentY < marginTopDown || currentY > map2.heightPx - hitbox.h - marginTopDown;
+      if (this.touchSide) {
+        if (nearBorder) {
           return false;
         }
-        this.touchSide = true;
+        this.touchSide = false;
+      }
+      const changeMap = async (adjacent, to) => {
         const [nextMap] = worldMaps.getAdjacentMaps(map2, adjacent);
-        if (!nextMap) return false;
+        if (!nextMap) {
+          return false;
+        }
         const id = nextMap.id;
         const nextMapInfo = worldMaps.getMapInfo(id);
-        return !!await this.changeMap(id, to(nextMapInfo));
+        const changed = !!await this.changeMap(id, to(nextMapInfo));
+        if (changed) {
+          this.touchSide = true;
+        }
+        return changed;
       };
       if (nextPosition.x < marginLeftRight && direction == Direction.Left) {
         ret = await changeMap({
@@ -24517,7 +24406,7 @@ class Doc {
 const version = {
     major: 4,
     minor: 3,
-    patch: 5,
+    patch: 6,
 };
 
 const $ZodType = /*@__PURE__*/ $constructor("$ZodType", (inst, def) => {
@@ -26574,7 +26463,7 @@ function finalize(ctx, schema) {
                 }
             }
             // When ref was extracted to $defs, remove properties that match the definition
-            if (refSchema.$ref) {
+            if (refSchema.$ref && refSeen.def) {
                 for (const key in schema) {
                     if (key === "$ref" || key === "allOf")
                         continue;
@@ -27935,6 +27824,9 @@ var __decorateClass$1 = (decorators, target, key, kind) => {
   if (kind && result) __defProp$1(target, key, result);
   return result;
 };
+function isRpgLog(error) {
+  return error instanceof Log || typeof error === "object" && error !== null && "id" in error && error.name === "RpgLog";
+}
 const MapUpdateSchema = object({
   /** Configuration object for the map (optional) */
   config: any().optional(),
@@ -27947,6 +27839,8 @@ const MapUpdateSchema = object({
   /** Height of the map in pixels (required) */
   height: number()
 });
+const SAFE_MAP_WIDTH = 1e3;
+const SAFE_MAP_HEIGHT = 1e3;
 let RpgMap = class extends RpgCommonMap {
   constructor(room) {
     super();
@@ -28019,6 +27913,7 @@ let RpgMap = class extends RpgCommonMap {
      * with custom formulas when the map is loaded.
      */
     this.damageFormulas = {};
+    this._weatherState = null;
     /** Internal: Map of shapes by name */
     this._shapes = /* @__PURE__ */ new Map();
     /** Internal: Map of shape entity UUIDs to RpgShape instances */
@@ -28047,6 +27942,19 @@ let RpgMap = class extends RpgCommonMap {
   onStart() {
     return BaseRoom.prototype.onStart.call(this);
   }
+  isPositiveNumber(value) {
+    return typeof value === "number" && Number.isFinite(value) && value > 0;
+  }
+  resolveTrustedMapDimensions(map) {
+    const normalizedId = typeof map?.id === "string" ? map.id.replace(/^map-/, "") : "";
+    const worldMapInfo = normalizedId ? this.worldMapsManager?.getMapInfo(normalizedId) : null;
+    if (!this.isPositiveNumber(map?.width)) {
+      map.width = this.isPositiveNumber(worldMapInfo?.width) ? worldMapInfo.width : SAFE_MAP_WIDTH;
+    }
+    if (!this.isPositiveNumber(map?.height)) {
+      map.height = this.isPositiveNumber(worldMapInfo?.height) ? worldMapInfo.height : SAFE_MAP_HEIGHT;
+    }
+  }
   /**
    * Setup collision detection between players, events, and shapes
    * 
@@ -28090,8 +27998,8 @@ let RpgMap = class extends RpgCommonMap {
     const activeCollisions = /* @__PURE__ */ new Set();
     const activeShapeCollisions = /* @__PURE__ */ new Set();
     const hasDifferentZ = (entityA, entityB) => {
-      const zA = entityA.owner.z();
-      const zB = entityB.owner.z();
+      const zA = entityA.owner?.z();
+      const zB = entityB.owner?.z();
       return zA !== zB;
     };
     this.physic.getEvents().onCollisionEnter((collision) => {
@@ -28200,12 +28108,19 @@ let RpgMap = class extends RpgCommonMap {
     if (packet && typeof packet === "object") {
       obj.timestamp = Date.now();
       if (player) {
+        const value = packet.value && typeof packet.value === "object" ? packet.value : void 0;
+        const packetPlayers = value?.players && typeof value.players === "object" ? value.players : void 0;
+        const playerSnapshot = packetPlayers?.[player.id];
+        const bodyPos = this.getBodyPosition(player.id, "top-left");
+        const ackX = typeof playerSnapshot?.x === "number" ? playerSnapshot.x : bodyPos?.x ?? player.x();
+        const ackY = typeof playerSnapshot?.y === "number" ? playerSnapshot.y : bodyPos?.y ?? player.y();
         const lastFramePositions = player._lastFramePositions;
         obj.ack = {
-          frame: lastFramePositions?.frame ?? player.pendingInputs.length,
-          x: lastFramePositions?.position?.x ?? player.x(),
-          y: lastFramePositions?.position?.y ?? player.y(),
-          direction: lastFramePositions?.position?.direction ?? player.direction()
+          frame: lastFramePositions?.frame ?? 0,
+          serverTick: this.getTick(),
+          x: Math.round(ackX),
+          y: Math.round(ackY),
+          direction: playerSnapshot?.direction ?? player.direction()
         };
       }
     }
@@ -28255,18 +28170,40 @@ let RpgMap = class extends RpgCommonMap {
     }
     player.context = context;
     player.conn = conn;
+    player.pendingInputs = [];
+    player.lastProcessedInputTs = 0;
+    player._lastFramePositions = null;
     player._onInit();
     this.dataIsReady$.pipe(
-      finalize$1(async () => {
-        if (this.stopAllSoundsBeforeJoin) {
-          player.stopAllSounds();
-        }
-        this.sounds.forEach((sound) => player.playSound(sound, { loop: true }));
-        await lastValueFrom(this.hooks.callHooks("server-map-onJoin", player, this));
-        if (typeof this._onJoin === "function") {
-          await this._onJoin(player);
-        }
-        await lastValueFrom(this.hooks.callHooks("server-player-onJoinMap", player, this));
+      finalize$1(() => {
+        void (async () => {
+          try {
+            const hitbox = typeof player.hitbox === "function" ? player.hitbox() : player.hitbox;
+            const width = hitbox?.w ?? 32;
+            const height = hitbox?.h ?? 32;
+            const body = this.getBody(player.id);
+            if (body) {
+              body.owner = player;
+            }
+            this.updateHitbox(player.id, player.x(), player.y(), width, height);
+            if (this.stopAllSoundsBeforeJoin) {
+              player.stopAllSounds();
+            }
+            this.sounds.forEach((sound) => player.playSound(sound, { loop: true }));
+            player.emit("weatherState", this.getWeather());
+            await lastValueFrom(this.hooks.callHooks("server-map-onJoin", player, this));
+            if (typeof this._onJoin === "function") {
+              await this._onJoin(player);
+            }
+            await lastValueFrom(this.hooks.callHooks("server-player-onJoinMap", player, this));
+          } catch (error) {
+            if (isRpgLog(error)) {
+              console.warn(`[RpgLog:${error.id}] ${error.message}`);
+              return;
+            }
+            console.error("[RPGJS] Error during map onJoin hooks:", error);
+          }
+        })();
       })
     ).subscribe();
   }
@@ -28300,6 +28237,8 @@ let RpgMap = class extends RpgCommonMap {
     }
     await lastValueFrom(this.hooks.callHooks("server-player-onLeaveMap", player, this));
     player.pendingInputs = [];
+    player.lastProcessedInputTs = 0;
+    player._lastFramePositions = null;
   }
   /**
    * Get the hooks system for this map
@@ -28342,18 +28281,60 @@ let RpgMap = class extends RpgCommonMap {
     player.execMethod("onInput", [action]);
   }
   async onInput(player, input) {
-    if (typeof input?.frame === "number") {
-      const existingInput = player.pendingInputs.find((pending) => pending.frame === input.frame);
-      if (existingInput) {
+    const lastAckedFrame = player._lastFramePositions?.frame ?? 0;
+    const now = Date.now();
+    const candidates = [];
+    const enqueueCandidate = (entry) => {
+      if (typeof entry?.frame !== "number") {
         return;
       }
-      player.pendingInputs.push({
-        input: input.input,
-        frame: input.frame,
-        timestamp: input.timestamp || Date.now()
-      });
+      if (!entry?.input) {
+        return;
+      }
+      const candidate = {
+        input: entry.input,
+        frame: entry.frame,
+        tick: typeof entry.tick === "number" ? entry.tick : void 0,
+        timestamp: typeof entry.timestamp === "number" ? entry.timestamp : now
+      };
+      if (typeof entry.x === "number" && typeof entry.y === "number") {
+        candidate.clientState = {
+          x: entry.x,
+          y: entry.y,
+          direction: entry.direction
+        };
+      }
+      candidates.push(candidate);
+    };
+    for (const trajectoryEntry of Array.isArray(input?.trajectory) ? input.trajectory : []) {
+      enqueueCandidate(trajectoryEntry);
+    }
+    enqueueCandidate(input);
+    if (candidates.length === 0) {
+      return;
+    }
+    candidates.sort((a, b) => a.frame - b.frame);
+    const existingFrames = new Set(
+      player.pendingInputs.map((pending) => pending?.frame).filter((frame) => typeof frame === "number")
+    );
+    for (const candidate of candidates) {
+      if (candidate.frame <= lastAckedFrame) {
+        continue;
+      }
+      if (existingFrames.has(candidate.frame)) {
+        continue;
+      }
+      player.pendingInputs.push(candidate);
+      existingFrames.add(candidate.frame);
     }
   }
+  onPing(player, payload) {
+    player.emit("pong", {
+      serverTick: this.getTick(),
+      clientTime: typeof payload?.clientTime === "number" ? payload.clientTime : Date.now(),
+      clientFrame: typeof payload?.clientFrame === "number" ? payload.clientFrame : 0
+    });
+  }
   async saveSlot(player, value) {
     BaseRoom.prototype.saveSlot(player, value);
   }
@@ -28378,9 +28359,15 @@ let RpgMap = class extends RpgCommonMap {
     await lastValueFrom(this.hooks.callHooks("server-maps-load", this));
     await lastValueFrom(this.hooks.callHooks("server-worldMaps-load", this));
     await lastValueFrom(this.hooks.callHooks("server-databaseHooks-load", this));
+    this.resolveTrustedMapDimensions(map);
+    this.data.set(map);
     map.events = map.events ?? [];
+    let initialWeather = this.globalConfig?.weather;
     if (map.id) {
       const mapFound = this.maps.find((m) => m.id === map.id);
+      if (typeof mapFound?.weather !== "undefined") {
+        initialWeather = mapFound.weather;
+      }
       if (mapFound?.events) {
         map.events = [
           ...mapFound.events,
@@ -28408,6 +28395,11 @@ let RpgMap = class extends RpgCommonMap {
         this.stopAllSoundsBeforeJoin = mapFound.stopAllSoundsBeforeJoin;
       }
     }
+    if (typeof initialWeather !== "undefined") {
+      this.setWeather(initialWeather);
+    } else {
+      this.clearWeather();
+    }
     await lastValueFrom(this.hooks.callHooks("server-map-onBeforeUpdate", map, this));
     this.loadPhysic();
     for (let event of map.events ?? []) {
@@ -28447,10 +28439,11 @@ let RpgMap = class extends RpgCommonMap {
   /**
    * Process pending inputs for a player with anti-cheat validation
    * 
-   * This method processes all pending inputs for a player while performing
+   * This method processes pending inputs for a player while performing
    * anti-cheat validation to prevent time manipulation and frame skipping.
    * It validates the time deltas between inputs and ensures they are within
-   * acceptable ranges.
+   * acceptable ranges. To preserve movement itinerary under network bursts,
+   * the number of inputs processed per call is capped.
    * 
    * ## Architecture
    * 
@@ -28500,14 +28493,16 @@ let RpgMap = class extends RpgCommonMap {
       // Max 10 frames skipped
       minTimeBetweenInputs: 16,
       // ~60fps minimum
-      enableAntiCheat: false
+      enableAntiCheat: false,
+      maxInputsPerTick: 1
     };
     const config = { ...defaultControls, ...controls };
     let lastProcessedTime = player.lastProcessedInputTs || 0;
-    let lastProcessedFrame = 0;
+    let lastProcessedFrame = player._lastFramePositions?.frame ?? 0;
     player.pendingInputs.sort((a, b) => (a.frame || 0) - (b.frame || 0));
     let hasProcessedInputs = false;
-    while (player.pendingInputs.length > 0) {
+    let processedThisTick = 0;
+    while (player.pendingInputs.length > 0 && processedThisTick < config.maxInputsPerTick) {
       const input = player.pendingInputs.shift();
       if (!input || typeof input.frame !== "number") {
         continue;
@@ -28537,6 +28532,19 @@ let RpgMap = class extends RpgCommonMap {
         processedInputs.push(input.input);
         hasProcessedInputs = true;
         lastProcessedTime = input.timestamp || Date.now();
+        processedThisTick += 1;
+        const bodyPos = this.getBodyPosition(player.id, "top-left");
+        const ackX = typeof input.clientState?.x === "number" ? input.clientState.x : bodyPos?.x ?? player.x();
+        const ackY = typeof input.clientState?.y === "number" ? input.clientState.y : bodyPos?.y ?? player.y();
+        player._lastFramePositions = {
+          frame: input.frame,
+          position: {
+            x: Math.round(ackX),
+            y: Math.round(ackY),
+            direction: input.clientState?.direction ?? player.direction()
+          },
+          serverTick: this.getTick()
+        };
       }
       lastProcessedFrame = input.frame;
     }
@@ -28579,20 +28587,17 @@ let RpgMap = class extends RpgCommonMap {
     if (this._inputLoopSubscription) {
       this._inputLoopSubscription.unsubscribe();
     }
-    this._inputLoopSubscription = this.tick$.pipe(
-      throttleTime(50)
-      // Throttle to 50ms for input processing
-    ).subscribe(async ({ timestamp }) => {
+    this._inputLoopSubscription = this.tick$.subscribe(() => {
       for (const player of this.getPlayers()) {
-        if (player.pendingInputs.length > 0) {
-          const anyPlayer = player;
-          if (!anyPlayer._isProcessingInputs) {
-            anyPlayer._isProcessingInputs = true;
-            await this.processInput(player.id).finally(() => {
-              anyPlayer._isProcessingInputs = false;
-            });
-          }
+        const anyPlayer = player;
+        const shouldProcess = player.pendingInputs.length > 0 || (player.lastProcessedInputTs || 0) > 0;
+        if (!shouldProcess || anyPlayer._isProcessingInputs) {
+          continue;
         }
+        anyPlayer._isProcessingInputs = true;
+        void this.processInput(player.id).finally(() => {
+          anyPlayer._isProcessingInputs = false;
+        });
       }
     });
   }
@@ -29090,6 +29095,66 @@ let RpgMap = class extends RpgCommonMap {
       animationName
     });
   }
+  cloneWeatherState(weather) {
+    if (!weather) {
+      return null;
+    }
+    return {
+      ...weather,
+      params: weather.params ? { ...weather.params } : void 0
+    };
+  }
+  /**
+   * Get the current map weather state.
+   */
+  getWeather() {
+    return this.cloneWeatherState(this._weatherState);
+  }
+  /**
+   * Set the full weather state for this map.
+   *
+   * When `sync` is true (default), all connected clients receive the new weather.
+   */
+  setWeather(next, options = {}) {
+    const sync2 = options.sync !== false;
+    if (next && !next.effect) {
+      throw new Error("setWeather: 'effect' is required when weather is not null.");
+    }
+    this._weatherState = this.cloneWeatherState(next);
+    if (sync2) {
+      this.$broadcast({
+        type: "weatherState",
+        value: this._weatherState
+      });
+    }
+    return this.getWeather();
+  }
+  /**
+   * Patch the current weather state.
+   *
+   * Nested `params` values are merged.
+   */
+  patchWeather(patch, options = {}) {
+    const current = this._weatherState ?? null;
+    if (!current && !patch.effect) {
+      throw new Error("patchWeather: 'effect' is required when no weather is currently set.");
+    }
+    const next = {
+      ...current ?? {},
+      ...patch,
+      params: {
+        ...current?.params ?? {},
+        ...patch.params ?? {}
+      }
+    };
+    return this.setWeather(next, options);
+  }
+  /**
+   * Clear weather for this map.
+   */
+  clearWeather(options = {}) {
+    this.setWeather(null, options);
+  }
   /**
    * Configure runtime synchronized properties on the map
    * 
@@ -29530,6 +29595,9 @@ __decorateClass$1([
 __decorateClass$1([
   Action("move")
 ], RpgMap.prototype, "onInput", 1);
+__decorateClass$1([
+  Action("ping")
+], RpgMap.prototype, "onPing", 1);
 __decorateClass$1([
   Action("save.save")
 ], RpgMap.prototype, "saveSlot", 1);
@@ -29894,6 +29962,7 @@ function provideServerModules(modules) {
                     type: MapClass.type,
                     name: MapClass.prototype?.name,
                     sounds: MapClass.prototype?.sounds,
+                    weather: MapClass.prototype?.weather,
                     lowMemory: MapClass.prototype?.lowMemory,
                     stopAllSoundsBeforeJoin: MapClass.prototype?.stopAllSoundsBeforeJoin,
                     events: MapClass.prototype?._events,
@@ -30027,6 +30096,7 @@ function MapData(options) {
     target.prototype.file = options.file;
     target.prototype.id = options.id;
     target.prototype.sounds = options.sounds;
+    target.prototype.weather = options.weather;
     target.prototype.lowMemory = options.lowMemory;
     target.prototype.stopAllSoundsBeforeJoin = options.stopAllSoundsBeforeJoin;
     target.prototype.$schema = {};