Update generate_html.cjs

generate_html.cjs

@@ -1,37 +1,25 @@
 const Packager = require("@turbowarp/packager");
 const fetch = require("cross-fetch").default;
+const fs = require("fs");
 
 async function fetchProjectData(projectId) {
-  // Node.js では trampoline ではなく Scratch API を直接使う
   const metaRes = await fetch(`https://api.scratch.mit.edu/projects/${encodeURIComponent(projectId)}`);
-  if (!metaRes.ok) {
-    throw new Error(`project metadata fetch failed: ${metaRes.status}`);
-  }
-
+  if (!metaRes.ok) throw new Error(`project metadata fetch failed: ${metaRes.status}`);
   const meta = await metaRes.json();
   const token = meta.project_token;
-  if (!token) {
-    throw new Error("project_token が取得できませんでした");
-  }
+  if (!token) throw new Error("project_token が取得できませんでした");
 
   const projectRes = await fetch(
     `https://projects.scratch.mit.edu/${encodeURIComponent(projectId)}?token=${encodeURIComponent(token)}`
   );
-  if (!projectRes.ok) {
-    throw new Error(`project data fetch failed: ${projectRes.status}`);
-  }
-
+  if (!projectRes.ok) throw new Error(`project data fetch failed: ${projectRes.status}`);
   return Buffer.from(await projectRes.arrayBuffer());
 }
 
 async function imageFromUrl(url) {
   if (!url) return undefined;
-
   const res = await fetch(url);
-  if (!res.ok) {
-    throw new Error(`image fetch failed: ${res.status}`);
-  }
-
+  if (!res.ok) throw new Error(`image fetch failed: ${res.status}`);
   const contentType = (res.headers.get("content-type") || "image/png").split(";")[0].trim();
   const buffer = Buffer.from(await res.arrayBuffer());
   return new Packager.Image(contentType, buffer);
@@ -46,44 +34,76 @@ function bool(v, fallback = false) {
 async function main() {
   const projectId = process.argv[2];
   const optionsJson = process.argv[3];
-
   if (!projectId) throw new Error("project id required");
 
-  const options = optionsJson ? JSON.parse(require("fs").readFileSync(optionsJson, "utf8")) : {};
+  const options = optionsJson ? JSON.parse(fs.readFileSync(optionsJson, "utf8")) : {};
   const projectData = await fetchProjectData(projectId);
-
   const loadedProject = await Packager.loadProject(projectData);
 
   const packager = new Packager.Packager();
   packager.project = loadedProject;
 
-  // ここでは「存在する値だけ」上書きする
+  // 基本オプション
   if ("turbo" in options) packager.options.turbo = bool(options.turbo);
-  if ("compiler" in options) packager.options.compiler = bool(options.compiler);
-  if ("warpTimer" in options) packager.options.warpTimer = bool(options.warpTimer);
+  if ("interpolation" in options) packager.options.interpolation = bool(options.interpolation);
+  if ("highQualityPen" in options) packager.options.highQualityPen = bool(options.highQualityPen);
+  if ("maxClones" in options) packager.options.maxClones = Number(options.maxClones);
+  if ("stageWidth" in options) packager.options.stageWidth = Number(options.stageWidth);
+  if ("stageHeight" in options) packager.options.stageHeight = Number(options.stageHeight);
+  if ("resizeMode" in options) packager.options.resizeMode = options.resizeMode;
+  if ("autoplay" in options) packager.options.autoplay = bool(options.autoplay);
+  if ("username" in options) packager.options.username = options.username;
+  if ("closeWhenStopped" in options) packager.options.closeWhenStopped = bool(options.closeWhenStopped);
+
+  // カスタム CSS/JS
+  if (options.custom?.js) packager.options.custom.js = options.custom.js;
+  if (options.custom?.css) packager.options.custom.css = options.custom.css;
+
+  // appearance
+  if (options.appearance) {
+    packager.options.appearance.background = options.appearance.background || packager.options.appearance.background;
+    packager.options.appearance.foreground = options.appearance.foreground || packager.options.appearance.foreground;
+    if (options.appearance.accent) packager.options.appearance.accent = options.appearance.accent;
+  }
 
-  if (typeof options.customJs === "string") {
-    packager.options.custom.js = options.customJs;
+  // loading screen
+  if (options.loadingScreen) {
+    packager.options.loading.progressBar = bool(options.loadingScreen.progressBar, true);
+    if (options.loadingScreen.text) packager.options.loading.text = options.loadingScreen.text;
+    const loadingImage = await imageFromUrl(options.loadingScreen.image);
+    if (loadingImage) packager.options.loading.image = loadingImage;
   }
-  if (typeof options.customCss === "string") {
-    packager.options.custom.css = options.customCss;
+
+  // app
+  if (options.app) {
+    if (options.app.windowTitle) packager.options.app.windowTitle = options.app.windowTitle;
+    const icon = await imageFromUrl(options.app.icon);
+    if (icon) packager.options.app.icon = icon;
   }
 
-  if (typeof options.title === "string" && options.title.trim() !== "") {
-    packager.options.app.title = options.title;
+  // compiler
+  if (options.compiler) {
+    packager.options.compiler.enabled = bool(options.compiler.enabled);
+    packager.options.compiler.warpTimer = bool(options.compiler.warpTimer);
   }
 
-  // 画像系は null を入れず、指定された時だけ設定する
-  const icon = await imageFromUrl(options.iconUrl);
-  if (icon) {
-    packager.options.app.icon = icon;
+  // chunks
+  if (options.chunks) {
+    packager.options.chunks.gamepad = bool(options.chunks.gamepad);
+    packager.options.chunks.pointerlock = bool(options.chunks.pointerlock);
   }
 
-  const loadingImage = await imageFromUrl(options.loadingImageUrl);
-  if (loadingImage) {
-    packager.options.loading.image = loadingImage;
+  // cloud variables
+  if (options.cloudVariables) {
+    packager.options.cloudVariables.mode = options.cloudVariables.mode || packager.options.cloudVariables.mode;
+    packager.options.cloudVariables.cloudHost = options.cloudVariables.cloudHost || packager.options.cloudVariables.cloudHost;
+    packager.options.cloudVariables.specialCloudBehaviors = bool(options.cloudVariables.specialCloudBehaviors);
+    packager.options.cloudVariables.unsafeCloudBehaviors = bool(options.cloudVariables.unsafeCloudBehaviors);
   }
 
+  // bake extensions
+  if ("bakeExtensions" in options) packager.options.bakeExtensions = bool(options.bakeExtensions);
+
   const result = await packager.package();
   process.stdout.write(Buffer.from(result.data).toString("utf8"));
 }