@downdraft/cli 0.3.0 → 0.4.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@downdraft/cli",
-  "version": "0.3.0",
+  "version": "0.4.0-alpha.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/knackstedt/downdraft.git",
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.700.0",
-    "@downdraft/engine": "^0.3.0",
+    "@downdraft/engine": "^0.4.0-alpha.0",
     "eta": "^3.5.0",
     "jimp": "^1.6.1",
     "resedit": "3.1.0"

package/scripts/package-desktop.mjs

@@ -6,8 +6,9 @@
 //
 //     --runtime=bun|node|deno   JS host embedded in the package (default:
 //                               package.json build.runtime, else bun)
-//     --format=<csv>            dir | deb | appimage | flatpak (default:
-//                               package.json build.linux.target, else dir)
+//     --format=<csv>            dir | deb | appimage | flatpak | rpm
+//                               (default: package.json build.linux.target,
+//                               else dir)
 //     --mode=dev|debug|prod     bundle mode (default: prod)
 //     --product-name=<name>     display name (default: pkg.productName)
 //     --product-version=<v>     version (default: pkg.version)
@@ -49,7 +50,8 @@
 //     linux:  { target: ["deb","AppImage","flatpak"], category, maintainer,
 //               synopsis, description, icon },
 //     deb:    { section, priority, depends: [] },
-//     flatpak:{ runtime, runtimeVersion, sdk, finishArgs: [] }
+//     flatpak:{ runtime, runtimeVersion, sdk, finishArgs: [] },
+//     rpm:    { license, release, depends: [] }
 //   }
 //
 // Formats:
@@ -58,6 +60,8 @@
 //              assembled with dpkg-deb
 //   appimage — AppDir + AppRun + appimagetool (downloaded+cached on demand)
 //   flatpak  — generated manifest + flatpak-builder + build-bundle
+//   rpm      — same payload layout as deb, assembled with rpmbuild from a
+//              generated .spec + tarball Source0
 // ============================================================================
 
 import { spawnSync } from "node:child_process";
@@ -82,7 +86,7 @@ const [entry, outdirArg] = positional;
 
 if (!entry || !outdirArg) {
   console.error(
-    "usage: bun package-desktop.mjs [--runtime=bun|node|deno] [--format=dir|deb|appimage|flatpak,...] " +
+    "usage: bun package-desktop.mjs [--runtime=bun|node|deno] [--format=dir|deb|appimage|flatpak|rpm,...] " +
     "[--mode=...] [--product-name=] [--product-version=] [--app-id=] [--executable-name=] [--icon=] " +
     "[--node-bin=] [--deno-bin=] [--mcp] <entry.ts> <outdir>");
   process.exit(1);
@@ -101,10 +105,10 @@ if (!["bun", "node", "deno"].includes(runtime)) {
 }
 const formats = (flagValue("format") ?? (Array.isArray(linuxCfg.target) ? linuxCfg.target.join(",") : linuxCfg.target) ?? "dir")
   .split(",").map((s) => s.trim().toLowerCase()).filter(Boolean);
-const KNOWN_FORMATS = new Set(["dir", "deb", "appimage", "flatpak"]);
+const KNOWN_FORMATS = new Set(["dir", "deb", "appimage", "flatpak", "rpm"]);
 for (const f of formats.values()) {
   if (!KNOWN_FORMATS.has(f)) {
-    console.error(`unknown --format "${f}" — expected dir, deb, appimage, or flatpak`);
+    console.error(`unknown --format "${f}" — expected dir, deb, appimage, flatpak, or rpm`);
     process.exit(1);
   }
 }
@@ -655,8 +659,13 @@ if (runtime === "bun") {
     `# ${productName} — ${runtime} runtime launcher (package-desktop.mjs)\n` +
     `SELF="$(readlink -f "$0" 2>/dev/null || realpath "$0" 2>/dev/null || echo "$0")"\n` +
     `DIR="$(dirname "$SELF")"\n` +
+    `export DD_APP_ID="${appId}"\n` +
+    (iconPath ? `export DD_APP_ICON="$DIR/icon.png"\n` : "") +
     `exec "$DIR/${runtime}" ${rtArgs} "$DIR/bundle/index.js" "$@"\n`);
   chmodSync(join(appdir, exeName), 0o755);
+  // Staged at appdir root so the launcher's DD_APP_ICON resolves for all
+  // formats (deb installs appdir to /usr/lib, AppImage cpSync's it wholesale).
+  if (iconPath) copyFileSync(iconPath, join(appdir, "icon.png"));
 
   // Engine cdylibs (bun's path stages these inside package-native).
   await stageEngineLibs(nativeDir);
@@ -721,6 +730,7 @@ function desktopFile(iconName = exeName) {
     `Comment=${synopsis}\n` +
     `Exec=${exeName}\n` +
     `Icon=${iconName}\n` +
+    `StartupWMClass=${appId}\n` +
     `Terminal=false\n` +
     `Categories=${category}\n`);
 }
@@ -918,6 +928,75 @@ if (formats.includes("flatpak")) {
   artifacts.push(`flatpak  ${out}`);
 }
 
+// ── Format: rpm ──
+
+if (formats.includes("rpm")) {
+  const rpmCfg = build.rpm ?? {};
+  if (!runOut("sh", ["-c", "command -v rpmbuild"])) {
+    throw new Error("rpmbuild not installed — required for the rpm format (apt install rpm)");
+  }
+  const stage = mkdtempSync(join(tmpdir(), "dd-rpm-"));
+  const topdir = join(stage, "rpmbuild");
+  for (const d of ["BUILD", "RPMS", "SOURCES", "SPECS"]) {
+    mkdirSync(join(topdir, d), { recursive: true });
+  }
+
+  // rpm versions can't contain "-" — "~" is rpm's "sorts before" marker,
+  // so 1.2.3-beta.1 → 1.2.3~beta.1 still orders below the final release.
+  const rpmVersion = version.replace(/-/g, "~");
+
+  // Source0 tarball — %setup unpacks it into BUILD/payload and %install
+  // copies the staged appdir + packaging metadata into %{buildroot}.
+  const payload = join(stage, "payload");
+  mkdirSync(payload, { recursive: true });
+  cpSync(appdir, join(payload, "appdir"), { recursive: true, verbatimSymlinks: true });
+  writeFileSync(join(payload, `${appId}.desktop`), desktopFile());
+  writeFileSync(join(payload, `${appId}.metainfo.xml`), metainfoXml());
+  if (iconPath) await iconSet(join(payload, "hicolor"));
+  run("tar", ["-czf", join(topdir, "SOURCES", `${exeName}-${rpmVersion}.tar.gz`), "-C", stage, "payload"]);
+
+  const depends = (rpmCfg.depends ?? ["glibc", "libstdc++", "vulkan-loader"]).join(", ");
+  writeFileSync(join(topdir, "SPECS", `${exeName}.spec`),
+    `# ${productName} — generated by package-desktop.mjs\n` +
+    // A `bun build --compile` binary appends its embedded bundle past the
+    // ELF sections — brp-strip/__os_install_post would rewrite the file
+    // and silently drop it. AutoReqProv is off: the binary is self-
+    // contained, so only explicit Requires apply.
+    `%define debug_package %{nil}\n` +
+    `%global __os_install_post %{nil}\n` +
+    `AutoReqProv: no\n` +
+    `Name: ${exeName}\n` +
+    `Version: ${rpmVersion}\n` +
+    `Release: ${rpmCfg.release ?? "1%{?dist}"}\n` +
+    `Summary: ${synopsis}\n` +
+    `License: ${rpmCfg.license ?? "Proprietary"}\n` +
+    `Requires: ${depends}\n` +
+    `Source0: %{name}-%{version}.tar.gz\n` +
+    `\n%description\n${description}\n` +
+    `\n%prep\n%setup -q -n payload\n` +
+    `\n%build\n# prebuilt binary — nothing to compile\n` +
+    `\n%install\n` +
+    `mkdir -p %{buildroot}/usr/lib/%{name} %{buildroot}/usr/bin %{buildroot}%{_datadir}/applications %{buildroot}%{_datadir}/metainfo` +
+    (iconPath ? ` %{buildroot}%{_datadir}/icons\n` : "\n") +
+    `cp -a appdir/. %{buildroot}/usr/lib/%{name}/\n` +
+    `ln -s ../lib/%{name}/%{name} %{buildroot}/usr/bin/%{name}\n` +
+    `install -Dm644 ${appId}.desktop %{buildroot}%{_datadir}/applications/${appId}.desktop\n` +
+    `install -Dm644 ${appId}.metainfo.xml %{buildroot}%{_datadir}/metainfo/${appId}.metainfo.xml\n` +
+    (iconPath ? `cp -a hicolor %{buildroot}%{_datadir}/icons/\n` : "") +
+    `\n%files\n` +
+    `/usr/lib/%{name}\n` +
+    `/usr/bin/%{name}\n` +
+    `%{_datadir}/applications/${appId}.desktop\n` +
+    `%{_datadir}/metainfo/${appId}.metainfo.xml\n` +
+    (iconPath ? `%{_datadir}/icons/hicolor/*/apps/%{name}.png\n` : ""));
+
+  run("rpmbuild", ["-bb", "--define", `_topdir ${topdir}`, join(topdir, "SPECS", `${exeName}.spec`)]);
+  const built = readdirSync(join(topdir, "RPMS", "x86_64")).find((f) => f.endsWith(".rpm"));
+  const out = join(outdir, `${exeName}-${version}-linux-${runtime}.x86_64.rpm`);
+  copyFileSync(join(topdir, "RPMS", "x86_64", built), out);
+  artifacts.push(`rpm  ${out}`);
+}
+
 // ── koffi prebuild fetch (same mechanism as package-mobile) ──
 
 async function fetchKoffiPrebuild(pkgName, ver) {

package/scripts/package-mobile.mjs

@@ -51,6 +51,14 @@ const modeArg = flagValue("mode") ?? "prod";
 const doInstall = argv.includes("--install") || argv.includes("--launch");
 const doLaunch = argv.includes("--launch");
 const retainMcp = argv.includes("--mcp");
+// Games bundled for the shell run under libnode, where `import.meta.env` is
+// undefined — replace the Vite-ism statically so game code can use it.
+const modeDefines = {
+  "import.meta.env.DEV": modeArg === "dev" ? "true" : "false",
+  "import.meta.env.PROD": modeArg === "dev" ? "false" : "true",
+  "import.meta.env.MODE": JSON.stringify(modeArg),
+  ...(retainMcp ? {} : { __DD_MCP_STRIP__: "true" }),
+};
 const minSdk = flagValue("min-sdk") ?? "30";
 // --node-flavor=lite selects build/dist/android-lite/<abi>/libnode.so
 // (NODEJS_MOBILE_FLAVOR=lite from build-android.mjs: no intl/inspector/
@@ -450,7 +458,7 @@ while (workerEntries.size !== prevCount) {
     splitting: false,
     sourcemap: "none",
     minify: false,
-    define: retainMcp ? {} : { __DD_MCP_STRIP__: "true" },
+    define: modeDefines,
     outdir: scanOutdir,
   });
   if (!scan.success) {
@@ -475,7 +483,7 @@ const build = await Bun.build({
   splitting: false,
   sourcemap: "none",
   minify: modeArg === "prod",
-  define: retainMcp ? {} : { __DD_MCP_STRIP__: "true" },
+  define: modeDefines,
   external: ["koffi", "bun:ffi", "bun:test", "bun"],
   outdir: bundleDir,
 });

package/src/usage.ts

@@ -46,7 +46,7 @@ export const COMMANDS: CommandEntry[] = [
         { name: "game", alias: "g", type: "string", description: "Game to release (games/<game>). For multiple games, use --games. If omitted, infers from the current directory, or defaults to the only game in games/." },
         { name: "games", type: "string", description: "Comma-separated game names (e.g. sandjongg,to-the-ocean)" },
         { name: "target", alias: "t", type: "string", default: "all", enum: [...RELEASE_TARGETS], description: "Target platform(s): win, linux, mac, android, or all (android can't mix with desktop targets)" },
-        { name: "format", type: "string", description: "Package format(s), comma-separated: dir, deb, appimage, flatpak (linux only; default: build.linux.target in package.json, else dir)" },
+        { name: "format", type: "string", description: "Package format(s), comma-separated: dir, deb, appimage, flatpak, rpm (linux only; default: build.linux.target in package.json, else dir)" },
         { name: "runtime", type: "string", enum: ["bun", "node", "deno", "all"], description: "JS runtime embedded in the package: bun (compiled binary), node, deno, or all (default: build.runtime in package.json, \"runtime\" in downdraft.config.json, else bun). node/deno are linux-only today" },
         { name: "stage", type: "string", default: "release", enum: [...RELEASE_STAGES], description: "Stage: build, package, or release (all compile the native binary)" },
         { name: "mode", type: "string", default: "prod", enum: [...BUILD_MODES], description: "Build mode" },