@uzuhq/code-cli 0.6.0 → 0.6.1

package/dist/cli.js

@@ -549,7 +549,8 @@ import { WebSocketServer } from "ws";
 import { randomUUID } from "crypto";
 
 // ../engine-core/src/game-time.ts
-var plus = (t, d) => t + d;
+var toMs = (t) => t;
+var plus = (t, d) => toMs(t) + d;
 var asGameTime = (ms) => ms;
 
 // ../engine-core/src/game-clock.ts
@@ -584,7 +585,7 @@ var GameClock = class {
   }
   /** ゲーム内時刻を、alarm / setTimeout が使う実時刻へ直す。 */
   toWall(at) {
-    return at + this.startedAtWall + this.pausedTotalMs;
+    return toMs(at) + this.startedAtWall + this.pausedTotalMs;
   }
   /** 実際に理由を足したら true。呼び出し側が永続化や tick 停止の要否に使う。 */
   freeze(reason) {
@@ -628,9 +629,10 @@ var GameClock = class {
 function withGameClock(time, fn) {
   const realNow = Date.now;
   const RealDate = Date;
-  Date.now = () => time;
+  const ms = toMs(time);
+  Date.now = () => ms;
   globalThis.Date = new Proxy(RealDate, {
-    construct: (target, args) => Reflect.construct(target, args.length === 0 ? [time] : args)
+    construct: (target, args) => Reflect.construct(target, args.length === 0 ? [ms] : args)
   });
   try {
     return fn();

package/dist/dev-server/sdk-server-shim.js

@@ -6,8 +6,213 @@ var DEFAULT_ICON_URLS = [
   "https://imagedelivery.net/htp-D7B2hJT5XtdWYN9e7Q/43f45d11-da38-4d6e-637d-3df78e583500/original"
 ];
 
+// ../engine-core/src/game-time.ts
+var toMs = (t) => t;
+var plus = (t, d) => toMs(t) + d;
+var sub = (t, d) => toMs(t) - d;
+var minus = (a, b) => toMs(a) - toMs(b);
+var asGameTime = (ms) => ms;
+
 // ../engine-core/src/game-clock.ts
 var NO_PLAYERS_GRACE_MS = 5 * 6e4;
+var GameClock = class {
+  startedAtWall = 0;
+  pausedTotalMs = 0;
+  pausedAtWall = null;
+  frozenBy = /* @__PURE__ */ new Set();
+  /** 時計を 0 から始め直す。`setup()` を呼ぶ直前に通す。 */
+  restart() {
+    this.startedAtWall = Date.now();
+    this.pausedTotalMs = 0;
+    this.pausedAtWall = null;
+    this.frozenBy.clear();
+  }
+  get frozen() {
+    return this.frozenBy.size > 0;
+  }
+  isFrozenBy(reason) {
+    return this.frozenBy.has(reason);
+  }
+  /**
+   * 現在のゲーム内時刻。停止中は `pausedAtWall` で凍るので同じ値を返し続ける。
+   *
+   * IMPORTANT: [withGameClock] の中で呼んではいけない。実装が `Date.now()` を読むので、
+   * 差し替え済みの時刻を実時刻として引き算し、大きく負の値になる。
+   * ハンドラへ渡す時刻は必ず外で 1 回取ってから渡すこと。
+   */
+  now() {
+    return asGameTime((this.pausedAtWall ?? Date.now()) - this.startedAtWall - this.pausedTotalMs);
+  }
+  /** ゲーム内時刻を、alarm / setTimeout が使う実時刻へ直す。 */
+  toWall(at) {
+    return toMs(at) + this.startedAtWall + this.pausedTotalMs;
+  }
+  /** 実際に理由を足したら true。呼び出し側が永続化や tick 停止の要否に使う。 */
+  freeze(reason) {
+    if (this.frozenBy.has(reason)) return false;
+    const wasFrozen = this.frozen;
+    this.frozenBy.add(reason);
+    if (!wasFrozen) this.pausedAtWall = Date.now();
+    return true;
+  }
+  /** 実際に理由を外したら true。 */
+  unfreeze(reason) {
+    if (!this.frozenBy.delete(reason)) return false;
+    if (!this.frozen && this.pausedAtWall !== null) {
+      this.pausedTotalMs += Date.now() - this.pausedAtWall;
+      this.pausedAtWall = null;
+    }
+    return true;
+  }
+  snapshot() {
+    return {
+      startedAtWall: this.startedAtWall,
+      pausedTotalMs: this.pausedTotalMs,
+      pausedAtWall: this.pausedAtWall,
+      frozenBy: [...this.frozenBy]
+    };
+  }
+  /**
+   * 永続化した内容から復元する。欠損は「未停止」に倒す。
+   *
+   * 読めなかったせいで世界が止まったままになる方が、動き出すより悪い。
+   */
+  restore(saved) {
+    this.startedAtWall = saved.startedAtWall ?? 0;
+    this.pausedTotalMs = saved.pausedTotalMs ?? 0;
+    this.pausedAtWall = saved.pausedAtWall ?? null;
+    this.frozenBy.clear();
+    for (const reason of saved.frozenBy ?? []) this.frozenBy.add(reason);
+    if (this.frozen && this.pausedAtWall === null) this.frozenBy.clear();
+  }
+};
+function withGameClock(time, fn) {
+  const realNow = Date.now;
+  const RealDate = Date;
+  const ms = toMs(time);
+  Date.now = () => ms;
+  globalThis.Date = new Proxy(RealDate, {
+    construct: (target, args) => Reflect.construct(target, args.length === 0 ? [ms] : args)
+  });
+  try {
+    return fn();
+  } finally {
+    globalThis.Date = RealDate;
+    Date.now = realNow;
+  }
+}
+function resolveDeadline(at, key, warned, report) {
+  if (at === null || at === void 0) return null;
+  if (typeof at === "number" && Number.isFinite(at)) return asGameTime(at);
+  if (!warned.has(key)) {
+    warned.add(key);
+    report(
+      `deadline "${key}" \u306E at() \u304C\u7DE0\u5207\u306B\u4F7F\u3048\u306A\u3044\u5024\u3092\u8FD4\u3057\u305F: ${String(at)}\u3002\u3053\u306E\u7DE0\u5207\u306F\u4E8C\u5EA6\u3068\u767A\u706B\u3057\u306A\u3044\u3002\u5EC3\u6B62\u3055\u308C\u305F ctx.now \u3092\u8AAD\u3093\u3067\u3044\u306A\u3044\u304B\u78BA\u8A8D\u3059\u308B\u3053\u3068`
+    );
+  }
+  return null;
+}
+
+// ../engine-core/src/json-patch.ts
+function escapePointer(key) {
+  return key.replace(/~/g, "~0").replace(/\//g, "~1");
+}
+function unescapePointer(token) {
+  return token.replace(/~1/g, "/").replace(/~0/g, "~");
+}
+function compare(oldObj, newObj, basePath = "") {
+  if (oldObj === newObj) return [];
+  if (oldObj === null || newObj === null || typeof oldObj !== "object" || typeof newObj !== "object") {
+    return [{ op: "replace", path: basePath || "/", value: newObj }];
+  }
+  if (Array.isArray(oldObj) || Array.isArray(newObj)) {
+    if (JSON.stringify(oldObj) === JSON.stringify(newObj)) return [];
+    return [{ op: "replace", path: basePath || "/", value: newObj }];
+  }
+  const ops = [];
+  const oldKeys = Object.keys(oldObj);
+  const newKeys = Object.keys(newObj);
+  for (const key of oldKeys) {
+    if (!(key in newObj)) {
+      ops.push({ op: "remove", path: `${basePath}/${escapePointer(key)}` });
+    }
+  }
+  for (const key of newKeys) {
+    const childPath = `${basePath}/${escapePointer(key)}`;
+    if (!(key in oldObj)) {
+      ops.push({ op: "add", path: childPath, value: newObj[key] });
+    } else {
+      const childOps = compare(oldObj[key], newObj[key], childPath);
+      ops.push(...childOps);
+    }
+  }
+  return ops;
+}
+function applyPatch(doc, ops) {
+  for (const op of ops) {
+    const tokens = op.path.split("/").slice(1).map(unescapePointer);
+    if (tokens.length === 0) return false;
+    if (op.op === "replace" || op.op === "add") {
+      let target = doc;
+      for (let i = 0; i < tokens.length - 1; i++) {
+        target = target?.[tokens[i]];
+        if (target === void 0 || target === null) return false;
+      }
+      const lastKey = tokens[tokens.length - 1];
+      target[lastKey] = op.value;
+    } else if (op.op === "remove") {
+      let target = doc;
+      for (let i = 0; i < tokens.length - 1; i++) {
+        target = target?.[tokens[i]];
+        if (target === void 0 || target === null) return false;
+      }
+      const lastKey = tokens[tokens.length - 1];
+      if (Array.isArray(target)) {
+        target.splice(Number(lastKey), 1);
+      } else {
+        delete target[lastKey];
+      }
+    }
+  }
+  return true;
+}
+
+// ../engine-core/src/random.ts
+var SeededRandomImpl = class _SeededRandomImpl {
+  _state;
+  constructor(seed) {
+    this._state = seed | 0;
+  }
+  get state() {
+    return this._state;
+  }
+  static fromState(state) {
+    const r = new _SeededRandomImpl(0);
+    r._state = state;
+    return r;
+  }
+  float() {
+    this._state |= 0;
+    this._state = this._state + 1831565813 | 0;
+    let t = Math.imul(this._state ^ this._state >>> 15, 1 | this._state);
+    t = t + Math.imul(t ^ t >>> 7, 61 | t) ^ t;
+    return ((t ^ t >>> 14) >>> 0) / 4294967296;
+  }
+  int(max) {
+    return Math.floor(this.float() * max);
+  }
+  pick(array) {
+    return array[this.int(array.length)];
+  }
+  shuffle(array) {
+    const a = [...array];
+    for (let i = a.length - 1; i > 0; i--) {
+      const j = this.int(i + 1);
+      [a[i], a[j]] = [a[j], a[i]];
+    }
+    return a;
+  }
+};
 
 // ../engine-core/src/server-only.ts
 function serverOnly(handler) {
@@ -16,9 +221,45 @@ function serverOnly(handler) {
 function isServerOnlyAction(handler) {
   return typeof handler === "function" && "__serverOnly" in handler && handler.__serverOnly === true;
 }
+
+// ../engine-core/src/roster.ts
+function parseRoster(rosterParam) {
+  if (!rosterParam) return null;
+  let raw;
+  try {
+    raw = JSON.parse(rosterParam);
+  } catch {
+    return null;
+  }
+  if (!Array.isArray(raw)) return null;
+  return raw.filter((p) => (p.kind ?? "player") === "player").map((p) => ({
+    id: p.id,
+    nickname: p.name ?? "Guest",
+    iconUrl: p.iconUrl ?? "",
+    characterId: p.characterId
+  }));
+}
+
+// ../engine-core/src/versions.ts
+var BRIDGE_VERSION = 2;
+var WIRE_VERSION = 2;
 export {
+  BRIDGE_VERSION,
   DEFAULT_ICON_URLS,
+  GameClock,
+  NO_PLAYERS_GRACE_MS,
   SERVER_TIME,
+  SeededRandomImpl,
+  WIRE_VERSION,
+  applyPatch,
+  asGameTime,
+  compare,
   isServerOnlyAction,
-  serverOnly
+  minus,
+  parseRoster,
+  plus,
+  resolveDeadline,
+  serverOnly,
+  sub,
+  withGameClock
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uzuhq/code-cli",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "UZU ゲーム開発 CLI - ビルド・パブリッシュ・プロジェクト作成ツール",
   "type": "module",
   "bin": {