Merge pull request #177 from deavid:dev-deavid

Fixes for release

Author: deavid

.github/workflows/release-alpha.yml

@@ -30,11 +30,23 @@ jobs:
           toolchain: stable
           target: x86_64-pc-windows-gnu,wasm32-unknown-unknown
 
+      - name: Restore Cargo cache
+        uses: Swatinem/rust-cache@v2
+
       - name: Install just
         uses: extractions/setup-just@v3
 
-      - name: Build and Package Artifacts
-        run: just package-all
+      - name: Build and Package Linux
+        run: just package-linux
+
+      - name: Build and Package Windows
+        run: just package-windows
+
+      - name: Build and Package WASM
+        run: just package-wasm
+
+      - name: Build and Package Server
+        run: just package-server
 
       - name: Overwrite alpha-latest rolling release
         env:

.github/workflows/release-beta.yml

@@ -39,11 +39,23 @@ jobs:
           toolchain: stable
           target: x86_64-pc-windows-gnu,wasm32-unknown-unknown
 
+      - name: Restore Cargo cache
+        uses: Swatinem/rust-cache@v2
+
       - name: Install just
         uses: extractions/setup-just@v3
 
-      - name: Build and Package Artifacts (justfile)
-        run: just package-all
+      - name: Build and Package Linux
+        run: just package-linux
+
+      - name: Build and Package Windows
+        run: just package-windows
+
+      - name: Build and Package WASM
+        run: just package-wasm
+
+      - name: Build and Package Server
+        run: just package-server
 
 
       - name: Create GitHub Pre-Release and Upload Artifacts

.github/workflows/release-main.yml

@@ -62,8 +62,20 @@ jobs:
           echo "RELEASE_NOTES=$NOTES" >> $GITHUB_OUTPUT
         shell: bash
 
-      - name: Build and Package Artifacts (justfile)
-        run: just package-all
+      - name: Restore Cargo cache
+        uses: Swatinem/rust-cache@v2
+
+      - name: Build and Package Linux
+        run: just package-linux
+
+      - name: Build and Package Windows
+        run: just package-windows
+
+      - name: Build and Package WASM
+        run: just package-wasm
+
+      - name: Build and Package Server
+        run: just package-server
 
       - name: Create GitHub Release and Upload Artifacts
         env:

Cargo.lock

@@ -7,6 +7,7 @@ members = [
     "crates/tools/unhub",
     "crates/tools/unprocman",
     "crates/tools/text_to_speech/walkie_voice_generator",
+    "crates/tools/assetidx_updater",
 
     # ── Portable Libraries ─────────────────────────────────────────────────
     # Game-agnostic Bevy plugins. Zero Unhaunter-specific knowledge.
@@ -20,6 +21,7 @@ members = [
     # Zero internal game dependencies. Dependency arrow points here.
     # ════════════════════════════════════════════════════════════════════════
     "crates/uncommon-app-core",    # Base platform utilities and basic types
+    "crates/unassetidx-updater",   # Asset index file generator
     "crates/uncommon-states-core",
     "crates/unspatial-core",       # Coordinate math (isometric, Position, Direction)
     "crates/unnoise-core",         # Procedural noise math (Perlin)
@@ -286,6 +288,7 @@ unfps-plugin = { path = "crates/unfps-plugin" } # Frame-rate limiter via std::th
 # Zero internal game dependencies. Dependency arrow points here.
 # ════════════════════════════════════════════════════════════════════════════
 uncommon-app-core = { path = "crates/uncommon-app-core" }       # Binary-level base tools
+unassetidx-updater = { path = "crates/unassetidx-updater" }     # Asset index updater
 unspatial-core = { path = "crates/unspatial-core" }             # Coordinate math (isometric)
 unnoise-core = { path = "crates/unnoise-core" }                 # Procedural noise math (Perlin)
 unmetrics-core = { path = "crates/unmetrics-core" }             # Performance diagnostic data
@@ -467,6 +470,7 @@ getrandom_02 = { workspace = true }
 uncommon-states-core = { workspace = true }
 undifficulty-core = { workspace = true }
 uncommon-app-core = { workspace = true }
+unassetidx-updater = { workspace = true }
 unmission-core = { workspace = true }
 unvitals-plugin = { workspace = true }
 uninventory-plugin = { workspace = true }

Cargo.toml

@@ -30,85 +30,170 @@ upscale-assets:
 
 # Build Linux Release Binary
 build-linux:
+    #!/usr/bin/env bash
+    set -euo pipefail
+    recipe_start=$SECONDS
+    echo "::group::build-linux"
     echo "Building Linux release..."
+    step_start=$SECONDS
     cargo build --release --target x86_64-unknown-linux-gnu
+    echo "[timing] build-linux:cargo-build=$((SECONDS - step_start))s"
     echo "Linux build complete."
+    echo "[timing] build-linux:total=$((SECONDS - recipe_start))s"
+    echo "::endgroup::"
 
 # Build Windows Release Binary (GNU toolchain)
 # Assumes mingw-w64 is installed (either locally or in GH Actions runner)
 build-windows:
+    #!/usr/bin/env bash
+    set -euo pipefail
+    recipe_start=$SECONDS
+    echo "::group::build-windows"
     echo "Building Windows release..."
+    step_start=$SECONDS
     cargo build --release --target x86_64-pc-windows-gnu
+    echo "[timing] build-windows:cargo-build=$((SECONDS - step_start))s"
     echo "Windows build complete."
+    echo "[timing] build-windows:total=$((SECONDS - recipe_start))s"
+    echo "::endgroup::"
 
 # Build WASM Package
 build-wasm:
+    #!/usr/bin/env bash
+    set -euo pipefail
+    recipe_start=$SECONDS
+    echo "::group::build-wasm"
     echo "Building WASM package..."
+    step_start=$SECONDS
     cargo install wasm-pack # Ensure wasm-pack is available
+    echo "[timing] build-wasm:install-wasm-pack=$((SECONDS - step_start))s"
+    step_start=$SECONDS
     wasm-pack build --release --target web
+    echo "[timing] build-wasm:wasm-pack-build=$((SECONDS - step_start))s"
     echo "WASM build complete."
+    echo "[timing] build-wasm:total=$((SECONDS - recipe_start))s"
+    echo "::endgroup::"
 
 # Build Dedicated Server Binary (Linux only)
 build-server:
+    #!/usr/bin/env bash
+    set -euo pipefail
+    recipe_start=$SECONDS
+    echo "::group::build-server"
     echo "Building server release..."
+    step_start=$SECONDS
     cargo build --release --target x86_64-unknown-linux-gnu --bin unhaunter_dedicated
+    echo "[timing] build-server:cargo-build=$((SECONDS - step_start))s"
     echo "Server build complete."
+    echo "[timing] build-server:total=$((SECONDS - recipe_start))s"
+    echo "::endgroup::"
 
 # == Packaging Recipes ==
 
 package-common: ensure-dist-dir upscale-assets
+    #!/usr/bin/env bash
+    set -euo pipefail
+    recipe_start=$SECONDS
+    echo "::group::package-common"
     echo "Packaging Common artifacts for {{_version}}..."
+    step_start=$SECONDS
+    cargo run -p assetidx_updater --release
+    echo "[timing] package-common:update-assetidx=$((SECONDS - step_start))s"
+    step_start=$SECONDS
     rm -rf {{_dist_dir}}/common/*
     cp -r {{_assets_dir}} {{_dist_dir}}/common/assets
     cp {{_readme}} {{_dist_dir}}/common/README.md
     cp {{_license}} {{_dist_dir}}/common/LICENSE
     cp {{_changelog}} {{_dist_dir}}/common/CHANGELOG.md
     cp favicon*.png favicon*.ico {{_dist_dir}}/common/
     cp screenshots {{_dist_dir}}/common/screenshots -R
+    echo "[timing] package-common:copy-assets-and-docs=$((SECONDS - step_start))s"
+    echo "[timing] package-common:total=$((SECONDS - recipe_start))s"
+    echo "::endgroup::"
 
 # Package Linux Artifacts into .tar.gz
 package-linux: build-linux package-common
+    #!/usr/bin/env bash
+    set -euo pipefail
+    recipe_start=$SECONDS
+    echo "::group::package-linux"
     echo "Packaging Linux artifact for {{_version}}..."
+    step_start=$SECONDS
     rm -rf {{_dist_dir}}/linux/*
     cp {{_dist_dir}}/common/* {{_dist_dir}}/linux/ -R
     cp {{_target_dir}}/x86_64-unknown-linux-gnu/release/unhaunter_game {{_dist_dir}}/linux/unhaunter_game
+    echo "[timing] package-linux:prepare-files=$((SECONDS - step_start))s"
+    step_start=$SECONDS
     unlink {{_releases_dir}}/unhaunter-{{_version}}-linux-x86_64.tar.gz || true
-    tar -czvf {{_releases_dir}}/unhaunter-{{_version}}-linux-x86_64.tar.gz -C {{_dist_dir}}/linux .
+    tar -czf {{_releases_dir}}/unhaunter-{{_version}}-linux-x86_64.tar.gz -C {{_dist_dir}}/linux .
+    echo "[timing] package-linux:create-tarball=$((SECONDS - step_start))s"
     echo "Linux package created: {{_releases_dir}}/unhaunter-{{_version}}-linux-x86_64.tar.gz"
+    echo "[timing] package-linux:total=$((SECONDS - recipe_start))s"
+    echo "::endgroup::"
 
 # Package Windows Artifacts into .zip
 package-windows: build-windows package-common
+    #!/usr/bin/env bash
+    set -euo pipefail
+    recipe_start=$SECONDS
+    echo "::group::package-windows"
     echo "Packaging Windows artifact for {{_version}}..."
+    step_start=$SECONDS
     rm -rf {{_dist_dir}}/windows/*
     cp {{_dist_dir}}/common/* {{_dist_dir}}/windows/ -R
     cp {{_target_dir}}/x86_64-pc-windows-gnu/release/unhaunter_game.exe {{_dist_dir}}/windows/unhaunter_game.exe
+    echo "[timing] package-windows:prepare-files=$((SECONDS - step_start))s"
+    step_start=$SECONDS
     unlink {{_releases_dir}}/unhaunter-{{_version}}-windows-x86_64.zip || true
     cd {{_dist_dir}}/windows && zip -r ../../{{_releases_dir}}/unhaunter-{{_version}}-windows-x86_64.zip *
     cd ../../
+    echo "[timing] package-windows:create-zip=$((SECONDS - step_start))s"
     echo "Windows package created: {{_releases_dir}}/unhaunter-{{_version}}-windows-x86_64.zip"
+    echo "[timing] package-windows:total=$((SECONDS - recipe_start))s"
+    echo "::endgroup::"
 
 # Package WASM Artifacts into .zip
 package-wasm: build-wasm package-common
+    #!/usr/bin/env bash
+    set -euo pipefail
+    recipe_start=$SECONDS
+    echo "::group::package-wasm"
     echo "Packaging WASM artifact for {{_version}}..."
+    step_start=$SECONDS
     rm -rf {{_dist_dir}}/wasm/*
     cp {{_dist_dir}}/common/* {{_dist_dir}}/wasm/ -R
     cp -r pkg {{_dist_dir}}/wasm/pkg
     cp index.html {{_dist_dir}}/wasm/index.html
+    echo "[timing] package-wasm:prepare-files=$((SECONDS - step_start))s"
+    step_start=$SECONDS
     unlink {{_releases_dir}}/unhaunter-{{_version}}-wasm.zip || true
     cd {{_dist_dir}}/wasm && zip -r ../../{{_releases_dir}}/unhaunter-{{_version}}-wasm.zip *
     cd ../../
+    echo "[timing] package-wasm:create-zip=$((SECONDS - step_start))s"
     echo "WASM package created: {{_releases_dir}}/unhaunter-{{_version}}-wasm.zip"
+    echo "[timing] package-wasm:total=$((SECONDS - recipe_start))s"
+    echo "::endgroup::"
 
 # Package Dedicated Server Artifacts into .tar.gz
 package-server: ensure-dist-dir build-server
+    #!/usr/bin/env bash
+    set -euo pipefail
+    recipe_start=$SECONDS
+    echo "::group::package-server"
     echo "Packaging server artifact for {{_version}}..."
+    step_start=$SECONDS
     rm -rf {{_dist_dir}}/server
     mkdir -p {{_dist_dir}}/server
     cp {{_target_dir}}/x86_64-unknown-linux-gnu/release/unhaunter_dedicated {{_dist_dir}}/server/unhaunter_dedicated
     cp -r {{_assets_dir}} {{_dist_dir}}/server/assets
+    echo "[timing] package-server:prepare-files=$((SECONDS - step_start))s"
+    step_start=$SECONDS
     unlink {{_releases_dir}}/unhaunter-{{_version}}-server-linux-x86_64.tar.gz || true
-    tar -czvf {{_releases_dir}}/unhaunter-{{_version}}-server-linux-x86_64.tar.gz -C {{_dist_dir}}/server .
+    tar -czf {{_releases_dir}}/unhaunter-{{_version}}-server-linux-x86_64.tar.gz -C {{_dist_dir}}/server .
+    echo "[timing] package-server:create-tarball=$((SECONDS - step_start))s"
     echo "Server package created: {{_releases_dir}}/unhaunter-{{_version}}-server-linux-x86_64.tar.gz"
+    echo "[timing] package-server:total=$((SECONDS - recipe_start))s"
+    echo "::endgroup::"
 
 
 # == Combined Recipes ==

Justfile

@@ -0,0 +1,8 @@
+[package]
+name = "assetidx_updater"
+version = "0.1.0"
+edition = "2021"
+publish = false
+
+[dependencies]
+unassetidx-updater = { workspace = true }

crates/tools/assetidx_updater/Cargo.toml

@@ -0,0 +1,6 @@
+fn main() {
+    if let Err(e) = unassetidx_updater::update_assetidx_files() {
+        eprintln!("Failed to update assetidx files: {}", e);
+        std::process::exit(1);
+    }
+}

crates/tools/assetidx_updater/src/main.rs

@@ -106,6 +106,7 @@ pub(crate) fn generate_sample_ron() -> String {
 /// A `Result` containing the hex-encoded SHA256 hash string if successful,
 /// or an `anyhow::Error` if the file cannot be read or hashing fails.
 pub(crate) fn calculate_script_hash(script_path: &str) -> Result<String, anyhow::Error> {
+    use std::io::Read;
     let mut file = File::open(script_path).map_err(|e| {
         anyhow::anyhow!(
             "Failed to open script file {} for hashing: {}",
@@ -114,14 +115,20 @@ pub(crate) fn calculate_script_hash(script_path: &str) -> Result<String, anyhow:
         )
     })?;
     let mut hasher = Sha256::new();
-    std::io::copy(&mut file, &mut hasher).map_err(|e| {
+    let mut buffer = Vec::new();
+    file.read_to_end(&mut buffer).map_err(|e| {
         anyhow::anyhow!(
             "Failed to read script file {} for hashing: {}",
             script_path,
             e
         )
     })?;
-    Ok(format!("{:x}", hasher.finalize())) // Format hash as a hex string.
+    hasher.update(&buffer);
+    Ok(hasher
+        .finalize()
+        .iter()
+        .map(|b| format!("{:02x}", b))
+        .collect()) // Format hash as a hex string.
 }
 
 /// Calculates a combined SHA256 signature for a voice line.
@@ -138,7 +145,11 @@ pub(crate) fn calculate_combined_signature(tts_text: &str, script_hash: &str) ->
     let mut hasher = Sha256::new();
     hasher.update(tts_text.as_bytes());
     hasher.update(script_hash.as_bytes());
-    format!("{:x}", hasher.finalize())
+    hasher
+        .finalize()
+        .iter()
+        .map(|b| format!("{:02x}", b))
+        .collect()
 }
 
 /// Scans a directory for RON files (`.ron` extension).

crates/tools/text_to_speech/walkie_voice_generator/src/utils.rs

@@ -0,0 +1,7 @@
+[package]
+name = "unassetidx-updater"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+walkdir = { workspace = true }