@uzuhq/code-cli 0.6.1 → 0.6.3

package/dist/cli.js

@@ -3,8 +3,8 @@
 // src/cli.ts
 import { Command, Option } from "commander";
 import { execSync } from "child_process";
-import { readFileSync as readFileSync7, existsSync as existsSync4, unlinkSync, createWriteStream } from "fs";
-import { dirname as dirname5, resolve as resolve5 } from "path";
+import { readFileSync as readFileSync6, existsSync as existsSync4, unlinkSync, createWriteStream } from "fs";
+import { dirname as dirname5, resolve as resolve6 } from "path";
 import { ZipArchive } from "archiver";
 import { fileURLToPath as fileURLToPath4, pathToFileURL as pathToFileURL2 } from "url";
 
@@ -418,8 +418,30 @@ var registerRevision = async (params) => {
 
 // src/build-server-logic.ts
 import { build } from "esbuild";
-import { readFileSync as readFileSync2 } from "fs";
-var SDK_PACKAGES = ["@uzuhq/code-sdk", "@uzupj/uzu-sdk"];
+
+// src/sdk-server-stub.ts
+import { existsSync } from "fs";
+import { dirname, resolve } from "path";
+import { fileURLToPath } from "url";
+var SDK_SPECIFIER = /^(@uzuhq\/code-sdk|@uzupj\/uzu-sdk)$/;
+function resolveSdkShimPath() {
+  const here = fileURLToPath(import.meta.url);
+  const ext = here.endsWith(".ts") ? "ts" : "js";
+  const shim = resolve(dirname(here), "dev-server", `sdk-server-shim.${ext}`);
+  if (!existsSync(shim)) {
+    throw new Error(`sdk-server-shim \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${shim}`);
+  }
+  return shim;
+}
+var uzuSdkServerStub = {
+  name: "uzu-sdk-server-stub",
+  setup(build3) {
+    const shimPath = resolveSdkShimPath();
+    build3.onResolve({ filter: SDK_SPECIFIER }, () => ({ path: shimPath }));
+  }
+};
+
+// src/build-server-logic.ts
 var buildServerLogic = async (logicPath, outPath) => {
   await build({
     entryPoints: [logicPath],
@@ -428,29 +450,23 @@ var buildServerLogic = async (logicPath, outPath) => {
     format: "esm",
     target: "es2022",
     platform: "neutral",
-    // SDK の type-only import は tsc で消えるが安全のため external 指定。
-    // @uzupj/uzu-sdk は旧パッケージ名 (未移行 scenario 向けの両対応)
-    external: SDK_PACKAGES
+    // SDK は engine-core への素通し shim へ差し替えて bundle する。`uzu dev` と
+    // 同じ plugin を通すので、harness で動いたものが publish でも同じ形になる。
+    //
+    // external は 1 つも置かない。Worker Loader が facet へ渡すのは index.js /
+    // game-facet.js / logic.js の 3 つだけで npm の解決先が無いため、成果物に bare
+    // import が残ると部屋の起動時に落ちる。external を置かなければ、解決できない
+    // import は esbuild がここでエラーにするので、壊れた成果物は publish されない。
+    plugins: [uzuSdkServerStub]
   });
-  assertNoSdkRuntimeImport(outPath);
   console.log(`Built server logic: ${logicPath} \u2192 ${outPath}`);
 };
-var assertNoSdkRuntimeImport = (outPath) => {
-  const built = readFileSync2(outPath, "utf-8");
-  const found = SDK_PACKAGES.find((pkg) => built.includes(pkg));
-  if (!found) return;
-  throw new Error(
-    `logic \u304C ${found} \u304B\u3089\u5024\u3092 import \u3057\u3066\u3044\u307E\u3059\u3002
-  logic \u304B\u3089 SDK \u3078\u5411\u3051\u3066\u3088\u3044\u306E\u306F\u578B\u3060\u3051\u3067\u3059 (import type)\u3002
-  \u5B9F\u884C\u6642\u306B\u5FC5\u8981\u306A\u3082\u306E (serverOnly / SERVER_TIME \u7B49) \u306F @uzuhq/code-engine-core \u304B\u3089 import \u3057\u3066\u304F\u3060\u3055\u3044\u3002`
-  );
-};
 
 // src/create-2d-game.ts
-import { mkdirSync, readFileSync as readFileSync3, writeFileSync, readdirSync, statSync } from "fs";
-import { resolve, dirname, join as join3 } from "path";
-import { fileURLToPath } from "url";
-var __dirname = dirname(fileURLToPath(import.meta.url));
+import { mkdirSync, readFileSync as readFileSync2, writeFileSync, readdirSync, statSync } from "fs";
+import { resolve as resolve2, dirname as dirname2, join as join3 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+var __dirname = dirname2(fileURLToPath2(import.meta.url));
 var copyDir = (src, dest, replacements) => {
   mkdirSync(dest, { recursive: true });
   for (const entry of readdirSync(src)) {
@@ -461,13 +477,13 @@ var copyDir = (src, dest, replacements) => {
       continue;
     }
     if (entry.endsWith(".tpl")) {
-      let content = readFileSync3(srcPath, "utf-8");
+      let content = readFileSync2(srcPath, "utf-8");
       for (const [key, value] of Object.entries(replacements)) {
         content = content.replaceAll(`{{${key}}}`, value);
       }
       writeFileSync(join3(dest, entry.replace(/\.tpl$/, "")), content);
     } else {
-      const content = readFileSync3(srcPath, "utf-8");
+      const content = readFileSync2(srcPath, "utf-8");
       let output = content;
       for (const [key, value] of Object.entries(replacements)) {
         output = output.replaceAll(`{{${key}}}`, value);
@@ -478,8 +494,8 @@ var copyDir = (src, dest, replacements) => {
 };
 var toTitle = (name) => name.split("-").map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
 var create2dGame = (name) => {
-  const dest = resolve(process.cwd(), name);
-  const templateDir = resolve(__dirname, "..", "game-2d-template");
+  const dest = resolve2(process.cwd(), name);
+  const templateDir = resolve2(__dirname, "..", "game-2d-template");
   const title = toTitle(name);
   const replacements = { name, title };
   console.log(`Creating 2D game project: ${name}`);
@@ -494,7 +510,7 @@ Next steps:`);
 };
 
 // src/cf-images-upload.ts
-import { readFileSync as readFileSync4 } from "fs";
+import { readFileSync as readFileSync3 } from "fs";
 import { basename as basename2 } from "path";
 var parseUploadedImageId = (v) => {
   if (typeof v === "object" && v !== null && "success" in v && v.success === true && "result" in v && typeof v.result === "object" && v.result !== null && "id" in v.result && typeof v.result.id === "string" && v.result.id !== "") {
@@ -513,7 +529,7 @@ var uploadIconsToCfImages = async (env, token, filePaths) => {
     filePaths.map(async (filePath, i) => {
       const image = session.images[i];
       const formData = new FormData();
-      formData.append("file", new Blob([readFileSync4(filePath)]), basename2(filePath));
+      formData.append("file", new Blob([readFileSync3(filePath)]), basename2(filePath));
       const res = await fetch(image.uploadURL, { method: "POST", body: formData });
       if (!res.ok) {
         const detail = (await res.text()).trim();
@@ -530,8 +546,8 @@ var uploadIconsToCfImages = async (env, token, filePaths) => {
 
 // src/dev.ts
 import { spawn } from "child_process";
-import { readFileSync as readFileSync5, existsSync as existsSync2 } from "fs";
-import { dirname as dirname3, resolve as resolve3 } from "path";
+import { readFileSync as readFileSync4, existsSync as existsSync2 } from "fs";
+import { dirname as dirname3, resolve as resolve4 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { createInterface } from "readline";
 
@@ -552,6 +568,7 @@ import { randomUUID } from "crypto";
 var toMs = (t) => t;
 var plus = (t, d) => toMs(t) + d;
 var asGameTime = (ms) => ms;
+var GAME_START = asGameTime(0);
 
 // ../engine-core/src/game-clock.ts
 var NO_PLAYERS_GRACE_MS = 5 * 6e4;
@@ -778,7 +795,7 @@ function parseRoster(rosterParam) {
 }
 
 // ../engine-core/src/versions.ts
-var BRIDGE_VERSION = 2;
+var BRIDGE_VERSION = 1;
 var WIRE_VERSION = 2;
 
 // src/dev-server/admin-state-patch.ts
@@ -1862,7 +1879,7 @@ function startHarnessServer(opts) {
   });
   httpServer.listen(opts.port, opts.host ?? "127.0.0.1");
   return {
-    stop: () => new Promise((resolve6) => {
+    stop: () => new Promise((resolve7) => {
       for (const ws of wss.clients) {
         try {
           ws.close();
@@ -1870,7 +1887,7 @@ function startHarnessServer(opts) {
         }
       }
       wss.close(() => {
-        httpServer.close(() => resolve6());
+        httpServer.close(() => resolve7());
       });
     })
   };
@@ -2086,29 +2103,12 @@ function proxyUpgradeToScenario(req, socket, head, scenarioUrl) {
 
 // src/dev-server/load-logic.ts
 import { build as build2 } from "esbuild";
-import { existsSync, mkdtempSync, rmSync } from "fs";
+import { mkdtempSync, rmSync } from "fs";
 import { tmpdir } from "os";
-import { dirname as dirname2, join as join4, resolve as resolve2 } from "path";
-import { fileURLToPath as fileURLToPath2, pathToFileURL } from "url";
-function resolveSdkShimPath() {
-  const here = fileURLToPath2(import.meta.url);
-  const shim = here.endsWith(".ts") ? resolve2(dirname2(here), "sdk-server-shim.ts") : resolve2(dirname2(here), "dev-server", "sdk-server-shim.js");
-  if (!existsSync(shim)) {
-    throw new Error(`sdk-server-shim \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${shim}`);
-  }
-  return shim;
-}
-var uzuSdkServerStub = {
-  name: "uzu-sdk-server-stub",
-  setup(build3) {
-    const shimPath = resolveSdkShimPath();
-    build3.onResolve({ filter: /^(@uzuhq\/code-sdk|@uzupj\/uzu-sdk)$/ }, () => ({
-      path: shimPath
-    }));
-  }
-};
+import { join as join4, resolve as resolve3 } from "path";
+import { pathToFileURL } from "url";
 async function loadLogicFromPath(logicPath) {
-  const absPath = resolve2(logicPath);
+  const absPath = resolve3(logicPath);
   const tempDir = mkdtempSync(join4(tmpdir(), "uzu-dev-logic-"));
   const outPath = join4(tempDir, "logic.mjs");
   await build2({
@@ -2185,12 +2185,12 @@ var DEFAULT_READY_PATTERN = "Local:\\s+(https?://[^\\s]+)";
 var DEFAULT_MIN_IFRAME_SHORT_EDGE = 360;
 async function runDevCommand() {
   const cwd = process.cwd();
-  const manifestPath = resolve3(cwd, "manifest.json");
+  const manifestPath = resolve4(cwd, "manifest.json");
   if (!existsSync2(manifestPath)) {
     console.error("manifest.json \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002 scenario \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002");
     process.exit(1);
   }
-  const manifest = JSON.parse(readFileSync5(manifestPath, "utf-8"));
+  const manifest = JSON.parse(readFileSync4(manifestPath, "utf-8"));
   const playerCount = manifest.characters?.length ?? manifest.playerCount ?? 2;
   const orientation = manifest.orientation ?? "portrait";
   const devCommand = manifest.dev?.command ?? DEFAULT_DEV_COMMAND;
@@ -2198,13 +2198,13 @@ async function runDevCommand() {
   let loaded = null;
   if (manifest.serverActionLogicPath) {
     console.log(`[uzu dev] Building server logic from ${manifest.serverActionLogicPath}...`);
-    const logicPath = resolve3(cwd, manifest.serverActionLogicPath);
+    const logicPath = resolve4(cwd, manifest.serverActionLogicPath);
     loaded = await loadLogicFromPath(logicPath);
     console.log("[uzu dev] Server logic ready");
   }
   const thisDir = dirname3(fileURLToPath3(import.meta.url));
-  const clientEntryJs = resolve3(thisDir, "harness", "client-entry.js");
-  const clientEntryTs = resolve3(thisDir, "harness", "client-entry.ts");
+  const clientEntryJs = resolve4(thisDir, "harness", "client-entry.js");
+  const clientEntryTs = resolve4(thisDir, "harness", "client-entry.ts");
   const clientEntry = existsSync2(clientEntryJs) ? clientEntryJs : existsSync2(clientEntryTs) ? clientEntryTs : null;
   if (!clientEntry) {
     console.error(`harness client entry \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${clientEntryJs}`);
@@ -2301,7 +2301,7 @@ function stripAnsi(s) {
   return s.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "");
 }
 function watchForReady(child, pattern) {
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve7, reject) => {
     const timeout = setTimeout(() => {
       reject(new Error("Timed out waiting for scenario dev server to become ready (30s)"));
     }, 3e4);
@@ -2317,7 +2317,7 @@ function watchForReady(child, pattern) {
       const url = /^https?:\/\//i.test(captured) ? captured : `http://localhost:${captured}`;
       resolved = true;
       clearTimeout(timeout);
-      resolve6(url.replace(/\/$/, ""));
+      resolve7(url.replace(/\/$/, ""));
     };
     if (child.stdout) {
       const rl = createInterface({ input: child.stdout });
@@ -2344,14 +2344,14 @@ var MAX_HARNESS_PORT_ATTEMPTS = 100;
 var HARNESS_HOST = "0.0.0.0";
 async function findFreePort() {
   const net = await import("net");
-  const tryPort = (port) => new Promise((resolve6) => {
+  const tryPort = (port) => new Promise((resolve7) => {
     const server = net.createServer();
     server.unref();
-    server.once("error", () => resolve6(null));
+    server.once("error", () => resolve7(null));
     server.listen(port, HARNESS_HOST, () => {
       const address = server.address();
       const assigned = typeof address === "object" && address !== null ? address.port : port;
-      server.close(() => resolve6(assigned));
+      server.close(() => resolve7(assigned));
     });
   });
   for (let i = 0; i < MAX_HARNESS_PORT_ATTEMPTS; i++) {
@@ -2365,8 +2365,8 @@ async function findFreePort() {
 }
 
 // src/sdk-version.ts
-import { existsSync as existsSync3, readFileSync as readFileSync6 } from "fs";
-import { dirname as dirname4, resolve as resolve4 } from "path";
+import { existsSync as existsSync3, readFileSync as readFileSync5 } from "fs";
+import { dirname as dirname4, resolve as resolve5 } from "path";
 var SDK_PACKAGE_PATHS = [
   ["@uzuhq", "code-sdk"],
   ["@uzupj", "uzu-sdk"]
@@ -2378,17 +2378,17 @@ var readInstalledSdkVersion = (cwd) => {
       "@uzuhq/code-sdk \u304C node_modules \u306B\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u4F9D\u5B58\u3092 install \u3057\u3066\u304B\u3089 publish \u3057\u3066\u304F\u3060\u3055\u3044\u3002"
     );
   }
-  const version = JSON.parse(readFileSync6(pkgPath, "utf-8")).version;
+  const version = JSON.parse(readFileSync5(pkgPath, "utf-8")).version;
   if (!version) {
     throw new Error(`${pkgPath} \u306B version \u304C\u3042\u308A\u307E\u305B\u3093\u3002`);
   }
   return version;
 };
 var findSdkPackageJson = (cwd) => {
-  let dir = resolve4(cwd);
+  let dir = resolve5(cwd);
   for (; ; ) {
     const found = SDK_PACKAGE_PATHS.map(
-      (segments) => resolve4(dir, "node_modules", ...segments, "package.json")
+      (segments) => resolve5(dir, "node_modules", ...segments, "package.json")
     ).find(existsSync3);
     if (found) {
       return found;
@@ -2450,7 +2450,7 @@ var failureHtml = (msg) => {
 </body>`;
 };
 var startLoopbackServer = async () => {
-  let resolve6 = null;
+  let resolve7 = null;
   let reject = null;
   let delivered = false;
   let pending = null;
@@ -2487,7 +2487,7 @@ var startLoopbackServer = async () => {
     }
     res.writeHead(200, { "Content-Type": "text/html; charset=utf-8" });
     res.end(SUCCESS_HTML);
-    if (resolve6) resolve6(code);
+    if (resolve7) resolve7(code);
     else pending = { code };
   });
   await new Promise((res, rej) => {
@@ -2509,7 +2509,7 @@ var startLoopbackServer = async () => {
         () => rej(new Error(`login timed out after ${timeoutMs}ms`)),
         timeoutMs
       );
-      resolve6 = (code) => {
+      resolve7 = (code) => {
         clearTimeout(t);
         res(code);
       };
@@ -2557,8 +2557,8 @@ var runLoginFlow = async (env, onURL) => {
 // src/cli.ts
 var envOption = () => new Option("--env <env>", "\u63A5\u7D9A\u5148\u74B0\u5883 (dev | stg | prd)").default(DEFAULT_ENV).hideHelp();
 var readOwnCliVersion = () => {
-  const pkgPath = resolve5(dirname5(fileURLToPath4(import.meta.url)), "..", "package.json");
-  const version = JSON.parse(readFileSync7(pkgPath, "utf-8")).version;
+  const pkgPath = resolve6(dirname5(fileURLToPath4(import.meta.url)), "..", "package.json");
+  const version = JSON.parse(readFileSync6(pkgPath, "utf-8")).version;
   if (!version) {
     throw new Error("uzu-cli \u306E package.json \u306B version \u304C\u3042\u308A\u307E\u305B\u3093\u3002");
   }
@@ -2583,12 +2583,12 @@ program.command("dev").description(
 program.command("publish").description("\u30B2\u30FC\u30E0\u3092\u30D3\u30EB\u30C9\u3057\u3066 R2 \u306B\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9 \u2192 \u767B\u9332").option("--change-notes <msg>", "\u30EA\u30D3\u30B8\u30E7\u30F3\u306E\u5909\u66F4\u30E1\u30E2", "").addOption(envOption()).action(async (options) => {
   const env = resolveEnv(options.env);
   const cwd = process.cwd();
-  const manifestPath = resolve5(cwd, "manifest.json");
+  const manifestPath = resolve6(cwd, "manifest.json");
   if (!existsSync4(manifestPath)) {
     console.error("manifest.json \u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002\u30B2\u30FC\u30E0\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u3067\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002");
     process.exit(1);
   }
-  const manifest = JSON.parse(readFileSync7(manifestPath, "utf-8"));
+  const manifest = JSON.parse(readFileSync6(manifestPath, "utf-8"));
   if (typeof manifest !== "object" || manifest === null) {
     console.error("manifest.json \u304C\u4E0D\u6B63\u306A\u5F62\u5F0F\u3067\u3059\u3002");
     process.exit(1);
@@ -2642,8 +2642,8 @@ program.command("publish").description("\u30B2\u30FC\u30E0\u3092\u30D3\u30EB\u30
     execSync(buildCommand, { stdio: "inherit", cwd });
   }
   console.log("Creating ZIP...");
-  const absoluteOutputDir = resolve5(cwd, outputDir);
-  const zipPath = resolve5(cwd, "__zip__.zip");
+  const absoluteOutputDir = resolve6(cwd, outputDir);
+  const zipPath = resolve6(cwd, "__zip__.zip");
   await new Promise((res, reject) => {
     const output = createWriteStream(zipPath);
     const archive = new ZipArchive({ zlib: { level: 9 } });
@@ -2658,8 +2658,8 @@ program.command("publish").description("\u30B2\u30FC\u30E0\u3092\u30D3\u30EB\u30
   const { resourceId, revisionId, token } = await uploadGameToR2(env, zipPath, absoluteOutputDir);
   console.log(`Uploaded to R2. revisionId: ${revisionId}, resourceId: ${resourceId}`);
   if (manifest.serverActionLogicPath) {
-    const logicEntryPoint = resolve5(cwd, manifest.serverActionLogicPath);
-    const logicOutPath = resolve5(cwd, "__logic__.js");
+    const logicEntryPoint = resolve6(cwd, manifest.serverActionLogicPath);
+    const logicOutPath = resolve6(cwd, "__logic__.js");
     try {
       console.log("Building server logic...");
       await buildServerLogic(logicEntryPoint, logicOutPath);
@@ -2674,7 +2674,7 @@ program.command("publish").description("\u30B2\u30FC\u30E0\u3092\u30D3\u30EB\u30
         process.exit(1);
       }
       console.log("Uploading logic.js to R2...");
-      const logicJsContent = readFileSync7(logicOutPath, "utf-8");
+      const logicJsContent = readFileSync6(logicOutPath, "utf-8");
       await uploadLogicToR2(env, token, logicJsContent, { wireVersion: WIRE_VERSION });
     } finally {
       if (existsSync4(logicOutPath)) unlinkSync(logicOutPath);
@@ -2685,7 +2685,7 @@ program.command("publish").description("\u30B2\u30FC\u30E0\u3092\u30D3\u30EB\u30
     console.log("Resolving character icons...");
     const isLocalIcon = (char) => !!char.icon && !char.icon.startsWith("http://") && !char.icon.startsWith("https://");
     const localIconPaths = manifestCharacters.filter(isLocalIcon).map((char) => {
-      const iconAbsPath = resolve5(cwd, char.icon);
+      const iconAbsPath = resolve6(cwd, char.icon);
       if (!existsSync4(iconAbsPath)) {
         console.error(`\u30A2\u30A4\u30B3\u30F3\u30D5\u30A1\u30A4\u30EB\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${char.icon}`);
         process.exit(1);
@@ -2695,7 +2695,7 @@ program.command("publish").description("\u30B2\u30FC\u30E0\u3092\u30D3\u30EB\u30
     const iconURLs = await uploadIconsToCfImages(env, token, localIconPaths);
     resolvedCharacters = manifestCharacters.map((char) => {
       if (!isLocalIcon(char)) return char;
-      const cfImagesUrl = iconURLs.get(resolve5(cwd, char.icon));
+      const cfImagesUrl = iconURLs.get(resolve6(cwd, char.icon));
       if (!cfImagesUrl) {
         console.error(`\u30A2\u30A4\u30B3\u30F3\u306E\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9\u7D50\u679C\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093: ${char.icon}`);
         process.exit(1);

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

@@ -12,6 +12,7 @@ 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;
+var GAME_START = asGameTime(0);
 
 // ../engine-core/src/game-clock.ts
 var NO_PLAYERS_GRACE_MS = 5 * 6e4;
@@ -241,11 +242,12 @@ function parseRoster(rosterParam) {
 }
 
 // ../engine-core/src/versions.ts
-var BRIDGE_VERSION = 2;
+var BRIDGE_VERSION = 1;
 var WIRE_VERSION = 2;
 export {
   BRIDGE_VERSION,
   DEFAULT_ICON_URLS,
+  GAME_START,
   GameClock,
   NO_PLAYERS_GRACE_MS,
   SERVER_TIME,

package/package.json

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