create-pixi-vn 2.1.3 → 2.1.5

package/template-nqtr-react-vite-muijoy-ink-tauri/src-tauri/Cargo.toml

@@ -39,6 +39,7 @@ tauri-plugin-process = "2"
 tauri-plugin-window-state = "2"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
+os_info = "3"
 steamworks = { version = "0.13", optional = true }
 
 [profile.release]

package/template-nqtr-react-vite-muijoy-ink-tauri/src-tauri/src/lib.rs

@@ -5,6 +5,7 @@ use tauri_plugin_window_state::{AppHandleExt, StateFlags};
 // Steam is only compiled on desktop targets when the "steam" feature is on.
 #[cfg(all(feature = "steam", not(target_os = "ios"), not(target_os = "android")))]
 mod steam;
+mod system_info;
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
@@ -24,36 +25,47 @@ pub fn run() {
     // is set in Cargo.toml). Steam is not supported on iOS / Android.
     #[cfg(all(feature = "steam", not(target_os = "ios"), not(target_os = "android")))]
     {
-        builder = builder
-            .manage(steam::SteamClient {
-                client: std::sync::Mutex::new(steam::try_init()),
-            })
-            .invoke_handler(tauri::generate_handler![
-                steam::steam_is_available,
-                steam::steam_get_player_name,
-                steam::steam_get_app_id,
-                steam::steam_unlock_achievement,
-                steam::steam_is_achievement_unlocked,
-                steam::steam_clear_achievement,
-                steam::steam_set_stat_int,
-                steam::steam_get_stat_int,
-                steam::steam_set_stat_float,
-                steam::steam_get_stat_float,
-                steam::steam_store_stats,
-                steam::steam_is_dlc_installed,
-                steam::steam_open_overlay,
-                steam::steam_open_store,
-            ]);
+        builder = builder.manage(steam::SteamClient {
+            client: std::sync::Mutex::new(steam::try_init()),
+        });
     }
 
+    // `generate_handler!` needs a static list, so the Steam commands can't be
+    // appended conditionally — the two variants below are kept in sync by hand.
+    #[cfg(all(feature = "steam", not(target_os = "ios"), not(target_os = "android")))]
+    let builder = builder.invoke_handler(tauri::generate_handler![
+        system_info::get_system_info,
+        system_info::get_webview_version,
+        steam::steam_is_available,
+        steam::steam_get_player_name,
+        steam::steam_get_app_id,
+        steam::steam_unlock_achievement,
+        steam::steam_is_achievement_unlocked,
+        steam::steam_clear_achievement,
+        steam::steam_set_stat_int,
+        steam::steam_get_stat_int,
+        steam::steam_set_stat_float,
+        steam::steam_get_stat_float,
+        steam::steam_store_stats,
+        steam::steam_is_dlc_installed,
+        steam::steam_open_overlay,
+        steam::steam_open_store,
+    ]);
+
+    #[cfg(not(all(feature = "steam", not(target_os = "ios"), not(target_os = "android"))))]
+    let builder = builder.invoke_handler(tauri::generate_handler![
+        system_info::get_system_info,
+        system_info::get_webview_version,
+    ]);
+
     builder
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
 }
 
-fn on_page_load(window: &tauri::Webview, _: &tauri::webview::PageLoadPayload<'_>) {
+fn on_page_load(_window: &tauri::Webview, _: &tauri::webview::PageLoadPayload<'_>) {
     #[cfg(not(debug_assertions))]
-    let _ = window.eval("document.addEventListener('contextmenu', e => e.preventDefault())");
+    let _ = _window.eval("document.addEventListener('contextmenu', e => e.preventDefault())");
 }
 
 #[cfg(not(mobile))]

package/template-nqtr-react-vite-muijoy-ink-tauri/src-tauri/src/system_info.rs

@@ -0,0 +1,33 @@
+use serde::Serialize;
+
+#[derive(Serialize)]
+pub struct SystemInfo {
+    /// Specific OS/distro name (e.g. "Ubuntu", "Windows", "Mac OS"), not just the generic platform.
+    os_type: String,
+    os_version: String,
+    bitness: String,
+    architecture: String,
+}
+
+/// Native OS/distro details, unavailable to plain web JS (browsers deliberately
+/// don't expose this to limit fingerprinting).
+#[tauri::command]
+pub fn get_system_info() -> SystemInfo {
+    let info = os_info::get();
+    SystemInfo {
+        os_type: info.os_type().to_string(),
+        os_version: info.version().to_string(),
+        bitness: info.bitness().to_string(),
+        architecture: info
+            .architecture()
+            .map(str::to_string)
+            .unwrap_or_else(|| std::env::consts::ARCH.to_string()),
+    }
+}
+
+/// Underlying WebView engine version (WebView2 on Windows, WebKitGTK on Linux,
+/// WKWebView on macOS/iOS, Android System WebView on Android).
+#[tauri::command]
+pub fn get_webview_version() -> Result<String, String> {
+    tauri::webview_version().map_err(|e| e.to_string())
+}

package/template-nqtr-react-vite-muijoy-tauri/.assetpack.ts

@@ -1,9 +1,87 @@
-import type { AssetPackConfig } from "@assetpack/core";
+import type { AssetPackConfig, AssetPipe } from "@assetpack/core";
+import { path } from "@assetpack/core";
 import { pixiPipes } from "@assetpack/core/pixi";
+import fs from "node:fs/promises";
 
 // TAURI_ENV_TARGET_TRIPLE is set by `tauri build` before running beforeBuildCommand
 const isTauri = !!process.env.TAURI_ENV_TARGET_TRIPLE;
 
+const manifestOutput = "src/assets/manifest.gen.json";
+
+/**
+ * AssetPack only creates a manifest bundle for folders explicitly tagged
+ * with "{m}" (see pixiManifest's `manifest` tag); everything else lands in
+ * the single "default" bundle. This splits the "default" bundle into one
+ * bundle per top-level folder under the assets entry, named after that
+ * folder, so bundles mirror the folder structure without needing to tag
+ * every folder manually. Files directly at the entry root (no folder) stay
+ * in "default". Runs after the manifest has been written to disk, so it
+ * re-reads and rewrites the file.
+ */
+function groupBundlesByFolder(options: { output: string }): AssetPipe<{ output: string }> {
+    return {
+        name: "group-bundles-by-folder",
+        defaultOptions: options,
+        async finish(_asset, opts) {
+            const manifest = JSON.parse(await fs.readFile(opts.output, "utf-8"));
+
+            const bundles = new Map<string, { name: string; assets: unknown[] }>();
+            for (const bundle of manifest.bundles) {
+                if (bundle.name !== "default") {
+                    bundles.set(bundle.name, bundle);
+                    continue;
+                }
+                for (const asset of bundle.assets) {
+                    const folder = path.dirname(asset.src[0]).split("/")[0];
+                    const bundleName = folder === "." ? "default" : folder;
+                    const target = bundles.get(bundleName) ?? { name: bundleName, assets: [] };
+                    target.assets.push(asset);
+                    bundles.set(bundleName, target);
+                }
+            }
+            manifest.bundles = [...bundles.values()];
+
+            await fs.writeFile(opts.output, JSON.stringify(manifest, null, 2));
+        },
+    };
+}
+
+/**
+ * Removes file extensions from the aliases generated by the pixi manifest
+ * pipe and replaces path separators with underscores (e.g.
+ * "yard/yard1.png" -> "yard_yard1"). Runs after the manifest has been
+ * written to disk, so it re-reads and rewrites the file.
+ *
+ * If two assets end up with the same normalized alias, the later one is
+ * prefixed with its bundle name (e.g. "yard_yard_yard1") to keep aliases
+ * unique across the whole manifest.
+ */
+function normalizeAliases(options: { output: string }): AssetPipe<{ output: string }> {
+    return {
+        name: "normalize-aliases",
+        defaultOptions: options,
+        async finish(_asset, opts) {
+            const manifest = JSON.parse(await fs.readFile(opts.output, "utf-8"));
+
+            const seen = new Set<string>();
+            for (const bundle of manifest.bundles) {
+                for (const asset of bundle.assets) {
+                    asset.alias = asset.alias.map((alias: string) => {
+                        const normalized = path.trimExt(alias).replaceAll("/", "_");
+                        const unique = seen.has(normalized)
+                            ? `${bundle.name}_${normalized}`
+                            : normalized;
+                        seen.add(normalized);
+                        return unique;
+                    });
+                }
+            }
+
+            await fs.writeFile(opts.output, JSON.stringify(manifest, null, 2));
+        },
+    };
+}
+
 const config: AssetPackConfig = {
     entry: "./src/assets",
     output: "./public/assets",
@@ -11,7 +89,7 @@ const config: AssetPackConfig = {
     pipes: [
         ...pixiPipes({
             manifest: {
-                output: "src/assets/manifest.gen.json",
+                output: manifestOutput,
                 createShortcuts: true,
             },
             // For Tauri: skip @0.5x mipmaps (unused on desktop, WebView handles DPR)
@@ -21,6 +99,8 @@ const config: AssetPackConfig = {
                 ? { png: true, jpg: true, webp: { quality: 88, alphaQuality: 88 } }
                 : undefined,
         }),
+        groupBundlesByFolder({ output: manifestOutput }),
+        normalizeAliases({ output: manifestOutput }),
     ],
 };
 

package/template-nqtr-react-vite-muijoy-tauri/.vscode/launch.json

@@ -26,7 +26,7 @@
       "cwd": "${workspaceFolder}",
       "terminal": "console",
       "preLaunchTask": "Cargo Build (Desktop Dev)",
-      "postDebugTask": "Stop Vite Desktop Server"
+      "postDebugTask": "Stop Vite Dev Server"
     },
     {
       "name": "Debug Game Preview",

package/template-nqtr-react-vite-muijoy-tauri/.vscode/tasks.json

@@ -106,7 +106,7 @@
       "label": "Cargo Build (Desktop Dev)",
       "type": "shell",
       "command": "cargo build --manifest-path=./src-tauri/Cargo.toml --no-default-features",
-      "dependsOn": ["Start Vite Desktop Server"],
+      "dependsOn": ["Restart Vite Dev Server"],
       "presentation": {
         "reveal": "always",
         "panel": "dedicated",
@@ -114,40 +114,6 @@
         "close": true
       },
       "problemMatcher": ["$rustc"]
-    },
-    {
-      "label": "Start Vite Desktop Server",
-      "type": "shell",
-      "command": "npm run dev",
-      "isBackground": true,
-      "dependsOn": ["Install Dependencies"],
-      "problemMatcher": {
-        "owner": "vite",
-        "pattern": {
-          "regexp": "^(?!x)x"
-        },
-        "background": {
-          "activeOnStart": true,
-          "beginsPattern": ".",
-          "endsPattern": "localhost:5173"
-        }
-      },
-      "presentation": {
-        "reveal": "always",
-        "panel": "dedicated",
-        "clear": false,
-        "close": true
-      }
-    },
-    {
-      "label": "Stop Vite Desktop Server",
-      "type": "shell",
-      "command": "pkill -f 'vite' 2>/dev/null; pkill -f 'npm run dev' 2>/dev/null; exit 0",
-      "presentation": {
-        "reveal": "never",
-        "panel": "dedicated",
-        "close": true
-      }
     }
   ]
 }

package/template-nqtr-react-vite-muijoy-tauri/package.json

@@ -24,8 +24,8 @@
   },
   "dependencies": {
     "@base-ui/react": "^1.6.0",
-    "@drincs/nqtr": "^1.0.2",
-    "@drincs/pixi-vn": "^1.8.21",
+    "@drincs/nqtr": "^1.0.3",
+    "@drincs/pixi-vn": "^1.8.25",
     "@tailwindcss/vite": "^4.3.0",
     "@tanstack/hotkeys": "^0.8.0",
     "@tanstack/react-hotkeys": "^0.10.0",

package/template-nqtr-react-vite-muijoy-tauri/src/assets/index.ts

@@ -14,16 +14,7 @@ export const manifest: AssetsManifest = {
         ...generatedManifestJson.bundles,
         {
             name: AUDIO_BUNDLE_NAME,
-            assets: [
-                {
-                    alias: "bgm_cheerful",
-                    src: "https://raw.githubusercontent.com/DRincs-Productions/pixi-vn-bucket/refs/heads/main/audio/bgm_cheerful.wav",
-                },
-                {
-                    alias: "sfx_whoosh",
-                    src: "https://raw.githubusercontent.com/DRincs-Productions/pixi-vn-bucket/refs/heads/main/audio/sfx_whoosh.wav",
-                },
-            ],
+            assets: [],
         },
         // screens
         {
@@ -31,7 +22,7 @@ export const manifest: AssetsManifest = {
             assets: [
                 {
                     alias: "background_main_menu",
-                    src: "https://raw.githubusercontent.com/DRincs-Productions/pixi-vn-bucket/refs/heads/main/main-menu.png",
+                    src: "https://pub-72ff059a2c6642fb9eab15df80fb3b45.r2.dev/main-menu.png",
                 },
             ],
         },

package/template-nqtr-react-vite-muijoy-tauri/src/assets/manifest.gen.json

@@ -1,8 +1,3 @@
 {
-  "bundles": [
-    {
-      "name": "default",
-      "assets": []
-    }
-  ]
-}
+  "bundles": []
+}

package/template-nqtr-react-vite-muijoy-tauri/src/components/menus/settings/index.tsx

@@ -1,6 +1,7 @@
 import { About } from "@/components/menus/settings/about";
 import { DialoguesControls } from "@/components/menus/settings/dialogues-controls";
 import { ControlsListSettingsPage } from "@/components/menus/settings/menus/controls";
+import { DiagnosticsSettingsPage } from "@/components/menus/settings/menus/diagnostics";
 import { HistoryListSettingsPage } from "@/components/menus/settings/menus/history";
 import { SaveLoadSettingsPage } from "@/components/menus/settings/menus/save-load";
 import { QuickMenus } from "@/components/menus/settings/quick-menus";
@@ -23,7 +24,7 @@ import { ArrowLeftIcon } from "lucide-react";
 import { Fragment } from "react";
 import { useTranslation } from "react-i18next";
 
-type SettingsTabPath = "menus/controls" | "menus/history" | "menus/save-load";
+type SettingsTabPath = "menus/controls" | "menus/history" | "menus/save-load" | "menus/diagnostics";
 
 type BreadcrumbEntry = {
     id: string;
@@ -38,7 +39,8 @@ export function Settings() {
     const normalizedTab: SettingsTabPath | undefined =
         currentTab === "menus/controls" ||
         currentTab === "menus/history" ||
-        currentTab === "menus/save-load"
+        currentTab === "menus/save-load" ||
+        currentTab === "menus/diagnostics"
             ? (currentTab as SettingsTabPath)
             : undefined;
 
@@ -55,7 +57,8 @@ export function Settings() {
         if (
             normalizedTab === "menus/controls" ||
             normalizedTab === "menus/history" ||
-            normalizedTab === "menus/save-load"
+            normalizedTab === "menus/save-load" ||
+            normalizedTab === "menus/diagnostics"
         ) {
             trail.push({ id: "menus", label: t("menus") });
             trail.push({
@@ -64,13 +67,17 @@ export function Settings() {
                         ? "menus-controls"
                         : normalizedTab === "menus/history"
                           ? "menus-history"
-                          : "menus-save-load",
+                          : normalizedTab === "menus/save-load"
+                            ? "menus-save-load"
+                            : "menus-diagnostics",
                 label:
                     normalizedTab === "menus/controls"
                         ? t("hotkeys_menu")
                         : normalizedTab === "menus/history"
                           ? t("history")
-                          : `${t("save")}/${t("load")}`,
+                          : normalizedTab === "menus/save-load"
+                            ? `${t("save")}/${t("load")}`
+                            : t("diagnostics"),
             });
         }
         return trail;
@@ -112,7 +119,8 @@ export function Settings() {
     if (
         normalizedTab === "menus/controls" ||
         normalizedTab === "menus/history" ||
-        normalizedTab === "menus/save-load"
+        normalizedTab === "menus/save-load" ||
+        normalizedTab === "menus/diagnostics"
     ) {
         return (
             <>
@@ -130,6 +138,7 @@ export function Settings() {
                 {normalizedTab === "menus/controls" ? <ControlsListSettingsPage /> : null}
                 {normalizedTab === "menus/history" ? <HistoryListSettingsPage /> : null}
                 {normalizedTab === "menus/save-load" ? <SaveLoadSettingsPage /> : null}
+                {normalizedTab === "menus/diagnostics" ? <DiagnosticsSettingsPage /> : null}
             </>
         );
     }