@uzuhq/code-cli 0.5.8 → 0.5.10

package/dist/cli.js

@@ -3,7 +3,7 @@
 // src/cli.ts
 import { Command, Option } from "commander";
 import { execSync } from "child_process";
-import { readFileSync as readFileSync6, existsSync as existsSync4, unlinkSync, createWriteStream } from "fs";
+import { readFileSync as readFileSync7, existsSync as existsSync4, unlinkSync, createWriteStream } from "fs";
 import { dirname as dirname5, resolve as resolve5 } from "path";
 import { ZipArchive } from "archiver";
 import { fileURLToPath as fileURLToPath4, pathToFileURL as pathToFileURL2 } from "url";
@@ -348,17 +348,26 @@ var uploadGameToR2 = async (env, zipPath, outputDir) => {
   });
   return { resourceId: session.resourceId, revisionId: session.revisionId, token: session.token };
 };
-var uploadLogicToR2 = async (env, token, logicJs) => {
+var uploadLogicToR2 = async (env, token, logicJs, meta) => {
   const session = await createUploadSession({
     env,
     token,
-    files: [{ path: "logic.js", contentType: "application/javascript" }]
+    files: [
+      { path: "logic.js", contentType: "application/javascript" },
+      { path: "meta.json", contentType: "application/json" }
+    ]
   });
-  if (session.uploads.length !== 1) {
-    throw new Error("logic.js \u306E\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9 URL \u304C\u767A\u884C\u3055\u308C\u3066\u3044\u307E\u305B\u3093");
-  }
-  await putToPresignedURL(session.uploads[0], logicJs);
-  console.log(`Uploaded logic.js to R2: ${session.revisionId}/logic.js`);
+  const uploadByPath = new Map(session.uploads.map((u) => [u.path, u]));
+  const logicUpload = uploadByPath.get("logic.js");
+  const metaUpload = uploadByPath.get("meta.json");
+  if (!logicUpload || !metaUpload) {
+    throw new Error("logic.js / meta.json \u306E\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9 URL \u304C\u767A\u884C\u3055\u308C\u3066\u3044\u307E\u305B\u3093");
+  }
+  await Promise.all([
+    putToPresignedURL(logicUpload, logicJs),
+    putToPresignedURL(metaUpload, JSON.stringify(meta))
+  ]);
+  console.log(`Uploaded logic.js / meta.json to R2: ${session.revisionId}/`);
 };
 
 // src/rest-register.ts
@@ -409,6 +418,8 @@ 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"];
 var buildServerLogic = async (logicPath, outPath) => {
   await build({
     entryPoints: [logicPath],
@@ -419,13 +430,24 @@ var buildServerLogic = async (logicPath, outPath) => {
     platform: "neutral",
     // SDK の type-only import は tsc で消えるが安全のため external 指定。
     // @uzupj/uzu-sdk は旧パッケージ名 (未移行 scenario 向けの両対応)
-    external: ["@uzuhq/code-sdk", "@uzupj/uzu-sdk"]
+    external: SDK_PACKAGES
   });
+  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 readFileSync2, writeFileSync, readdirSync, statSync } from "fs";
+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));
@@ -439,13 +461,13 @@ var copyDir = (src, dest, replacements) => {
       continue;
     }
     if (entry.endsWith(".tpl")) {
-      let content = readFileSync2(srcPath, "utf-8");
+      let content = readFileSync3(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 = readFileSync2(srcPath, "utf-8");
+      const content = readFileSync3(srcPath, "utf-8");
       let output = content;
       for (const [key, value] of Object.entries(replacements)) {
         output = output.replaceAll(`{{${key}}}`, value);
@@ -472,7 +494,7 @@ Next steps:`);
 };
 
 // src/cf-images-upload.ts
-import { readFileSync as readFileSync3 } from "fs";
+import { readFileSync as readFileSync4 } 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 !== "") {
@@ -491,7 +513,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([readFileSync3(filePath)]), basename2(filePath));
+      formData.append("file", new Blob([readFileSync4(filePath)]), basename2(filePath));
       const res = await fetch(image.uploadURL, { method: "POST", body: formData });
       if (!res.ok) {
         const detail = (await res.text()).trim();
@@ -508,7 +530,7 @@ var uploadIconsToCfImages = async (env, token, filePaths) => {
 
 // src/dev.ts
 import { spawn } from "child_process";
-import { readFileSync as readFileSync4, existsSync as existsSync2 } from "fs";
+import { readFileSync as readFileSync5, existsSync as existsSync2 } from "fs";
 import { dirname as dirname3, resolve as resolve3 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { createInterface } from "readline";
@@ -650,6 +672,10 @@ function parseRoster(rosterParam) {
   }));
 }
 
+// ../engine-core/src/versions.ts
+var BRIDGE_VERSION = 1;
+var WIRE_VERSION = 1;
+
 // src/dev-server/admin-state-patch.ts
 var MERGE_PATCH_ARRAY_REJECT = "[applyJsonMergePatch] cannot merge a non-array patch into an array target";
 function applyJsonMergePatch(target, patch) {
@@ -821,7 +847,7 @@ var GameRoom = class _GameRoom {
   maybeStartGame() {
     if (this.gameState !== null) return;
     if (this.players.length === 0) return;
-    this.seed = Date.now() & 4294967295;
+    this.seed = Math.floor(Math.random() * 4294967295);
     this.random = new SeededRandomImpl(this.seed);
     this.gameState = this.logic.setup(this.setupArgs(this.random));
     this.stateInitialized = true;
@@ -1910,7 +1936,7 @@ async function runDevCommand() {
     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(readFileSync4(manifestPath, "utf-8"));
+  const manifest = JSON.parse(readFileSync5(manifestPath, "utf-8"));
   const playerCount = manifest.characters?.length ?? manifest.playerCount ?? 2;
   const orientation = manifest.orientation ?? "portrait";
   const devCommand = manifest.dev?.command ?? DEFAULT_DEV_COMMAND;
@@ -2085,7 +2111,7 @@ async function findFreePort() {
 }
 
 // src/sdk-version.ts
-import { existsSync as existsSync3, readFileSync as readFileSync5 } from "fs";
+import { existsSync as existsSync3, readFileSync as readFileSync6 } from "fs";
 import { dirname as dirname4, resolve as resolve4 } from "path";
 var SDK_PACKAGE_PATHS = [
   ["@uzuhq", "code-sdk"],
@@ -2098,7 +2124,7 @@ 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(readFileSync5(pkgPath, "utf-8")).version;
+  const version = JSON.parse(readFileSync6(pkgPath, "utf-8")).version;
   if (!version) {
     throw new Error(`${pkgPath} \u306B version \u304C\u3042\u308A\u307E\u305B\u3093\u3002`);
   }
@@ -2278,7 +2304,7 @@ var runLoginFlow = async (env, onURL) => {
 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(readFileSync6(pkgPath, "utf-8")).version;
+  const version = JSON.parse(readFileSync7(pkgPath, "utf-8")).version;
   if (!version) {
     throw new Error("uzu-cli \u306E package.json \u306B version \u304C\u3042\u308A\u307E\u305B\u3093\u3002");
   }
@@ -2308,7 +2334,7 @@ program.command("publish").description("\u30B2\u30FC\u30E0\u3092\u30D3\u30EB\u30
     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(readFileSync6(manifestPath, "utf-8"));
+  const manifest = JSON.parse(readFileSync7(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);
@@ -2345,12 +2371,13 @@ program.command("publish").description("\u30B2\u30FC\u30E0\u3092\u30D3\u30EB\u30
   console.log(
     `Publishing game: ${gameId} (players: ${playerCount}, orientation: ${orientation})`
   );
-  let sdkVersion;
+  let sdkVersion = "";
   try {
     sdkVersion = readInstalledSdkVersion(cwd);
   } catch (e) {
-    console.error(e instanceof Error ? e.message : String(e));
-    process.exit(1);
+    console.warn(
+      `SDK \u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u7279\u5B9A\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F (\u8A18\u9332\u306F\u7A7A\u306B\u306A\u308A\u307E\u3059): ${e instanceof Error ? e.message : String(e)}`
+    );
   }
   await getValidIdToken(env).catch((e) => {
     console.error(e instanceof Error ? e.message : String(e));
@@ -2393,8 +2420,8 @@ program.command("publish").description("\u30B2\u30FC\u30E0\u3092\u30D3\u30EB\u30
         process.exit(1);
       }
       console.log("Uploading logic.js to R2...");
-      const logicJsContent = readFileSync6(logicOutPath, "utf-8");
-      await uploadLogicToR2(env, token, logicJsContent);
+      const logicJsContent = readFileSync7(logicOutPath, "utf-8");
+      await uploadLogicToR2(env, token, logicJsContent, { wireVersion: WIRE_VERSION });
     } finally {
       if (existsSync4(logicOutPath)) unlinkSync(logicOutPath);
     }
@@ -2434,7 +2461,12 @@ program.command("publish").description("\u30B2\u30FC\u30E0\u3092\u30D3\u30EB\u30
     orientation,
     characters: resolvedCharacters,
     manifest,
-    publishMeta: { sdkVersion, cliVersion: OWN_CLI_VERSION }
+    publishMeta: {
+      sdkVersion,
+      cliVersion: OWN_CLI_VERSION,
+      bridgeVersion: BRIDGE_VERSION,
+      wireVersion: WIRE_VERSION
+    }
   });
   console.log(`Registered revision: ${revId}`);
   unlinkSync(zipPath);

package/package.json

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