Update generate_html.cjs

generate_html.cjs

@@ -1,41 +1,94 @@
-// generate_html.js
 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}`);
+  }
+
+  const meta = await metaRes.json();
+  const token = meta.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}`);
+  }
+
+  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}`);
+  }
+
+  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);
+}
+
+function bool(v, fallback = false) {
+  if (v === undefined || v === null || v === "") return fallback;
+  if (typeof v === "boolean") return v;
+  return String(v).toLowerCase() === "true" || v === "1" || String(v).toLowerCase() === "yes";
+}
 
 async function main() {
-    const id = process.argv[2];
-    const optionsJsonPath = process.argv[3];
+  const projectId = process.argv[2];
+  const optionsJson = process.argv[3];
 
-    if (!id) throw new Error("project id required.");
-    const optionsInput = JSON.parse(fs.readFileSync(optionsJsonPath, "utf8"));
+  if (!projectId) throw new Error("project id required");
 
-    // Scratchプロジェクトの取得
-    const metaRes = await fetch(`https://trampoline.turbowarp.org/api/projects/${id}`);
-    const meta = await metaRes.json();
-    const token = meta.project_token;
-    const projectRes = await fetch(`https://projects.scratch.mit.edu/${id}?token=${token}`);
-    const projectData = await projectRes.arrayBuffer();
+  const options = optionsJson ? JSON.parse(require("fs").readFileSync(optionsJson, "utf8")) : {};
+  const projectData = await fetchProjectData(projectId);
 
-    // ロード
-    const loaded = await Packager.loadProject(projectData);
+  const loadedProject = await Packager.loadProject(projectData);
 
-    // Packagerの生成
-    const pack = new Packager.Packager();
-    pack.project = loaded;
+  const packager = new Packager.Packager();
+  packager.project = loadedProject;
 
-    // 既存のオプションを維持しつつ上書き
-    Object.assign(pack.options, optionsInput);
+  // ここでは「存在する値だけ」上書きする
+  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);
 
-    // パッケージ化
-    const { data, type } = await pack.package();
+  if (typeof options.customJs === "string") {
+    packager.options.custom.js = options.customJs;
+  }
+  if (typeof options.customCss === "string") {
+    packager.options.custom.css = options.customCss;
+  }
 
-    if (type !== "text/html") throw new Error("not html");
+  if (typeof options.title === "string" && options.title.trim() !== "") {
+    packager.options.app.title = options.title;
+  }
 
-    // HTMLとして出力
-    process.stdout.write(Buffer.from(data).toString("utf8"));
+  // 画像系は null を入れず、指定された時だけ設定する
+  const icon = await imageFromUrl(options.iconUrl);
+  if (icon) {
+    packager.options.app.icon = icon;
+  }
+
+  const loadingImage = await imageFromUrl(options.loadingImageUrl);
+  if (loadingImage) {
+    packager.options.loading.image = loadingImage;
+  }
+
+  const result = await packager.package();
+  process.stdout.write(Buffer.from(result.data).toString("utf8"));
 }
-main().catch(err => {
-    console.error(err);
-    process.exit(1);
+
+main().catch((err) => {
+  console.error(err);
+  process.exit(1);
 });