diff --git a/.github/workflows/artcraft-linux-publish.yml b/.github/workflows/artcraft-linux-publish.yml index f448cf569f..f72a6b7448 100644 --- a/.github/workflows/artcraft-linux-publish.yml +++ b/.github/workflows/artcraft-linux-publish.yml @@ -13,7 +13,11 @@ jobs: runs-on: ubuntu-22.04 timeout-minutes: 10 steps: - - uses: actions/checkout@v4 + - name: Harden runner + uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4 + with: + egress-policy: audit + - uses: actions/checkout@v7 - uses: storytold/craft-common-actions/actions/install-apt-packages@main with: packages: rpm jq binutils zsync @@ -34,7 +38,11 @@ jobs: TAURI_FRONTEND_PATH: ${{ github.workspace }}/frontend TAURI_APP_PATH: ${{ github.workspace }}/crates/desktop/artcraft steps: - - uses: actions/checkout@v4 + - name: Harden runner + uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4 + with: + egress-policy: audit + - uses: actions/checkout@v7 - uses: storytold/craft-common-actions/actions/install-apt-packages@main with: packages: libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libssl-dev libclang-dev libasound2-dev libxdo-dev libdbus-1-dev build-essential clang file jq perl cmake nasm rpm zsync gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-libav @@ -63,16 +71,16 @@ jobs: PKG_CONFIG_LIBDIR_riscv64gc_unknown_linux_gnu=/usr/lib/riscv64-linux-gnu/pkgconfig:/usr/share/pkgconfig ENV echo "CMAKE_TOOLCHAIN_FILE_riscv64gc_unknown_linux_gnu=$GITHUB_WORKSPACE/packaging/linux/riscv64.cmake" >> "$GITHUB_ENV" - - uses: actions/setup-node@v4 + - uses: actions/setup-node@v7 with: node-version: '22' cache: npm cache-dependency-path: frontend/package-lock.json - - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # v1 + - uses: step-security/dtolnay-rust-toolchain@8dd607977d06adf4ed49b190381e74c17a9dd25f # v1.0.0 with: toolchain: stable targets: ${{ matrix.target }} - - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3 + - uses: step-security/rust-cache@8871c8ba063416da7c32246932ea6ae08700453e # v2.9.2 with: key: tauri-linux-${{ matrix.arch }} cache-on-failure: true @@ -80,7 +88,7 @@ jobs: working-directory: frontend - run: ./node_modules/.bin/nx run artcraft:build working-directory: frontend - - uses: tauri-apps/tauri-action@fce9c6108b31ea247710505d3aaaa893ee6768d4 # v0 + - uses: step-security/tauri-action@dc662d498edbd35ec8ed564b45d44e955444d1bc # v1.0.0 with: projectPath: crates/desktop/artcraft args: --target ${{ matrix.target }} --bundles ${{ matrix.bundles }} --config ${{ github.workspace }}/packaging/linux/tauri.conf.json @@ -89,7 +97,7 @@ jobs: ARCH: ${{ matrix.arch }} TARGET: ${{ matrix.target }} run: packaging/linux/package.sh "$ARCH" "$TARGET" - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: release-linux-${{ matrix.arch }} path: dist/release/* @@ -102,8 +110,12 @@ jobs: matrix: arch: [x86_64, aarch64] steps: - - uses: actions/checkout@v4 - - uses: actions/download-artifact@v4 + - name: Harden runner + uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4 + with: + egress-policy: audit + - uses: actions/checkout@v7 + - uses: actions/download-artifact@v8 with: name: release-linux-${{ matrix.arch }} path: dist/linux @@ -126,7 +138,7 @@ jobs: for package in dist/release/*.pkg.tar.zst; do tar --zstd -xOf "$package" .PKGINFO | grep -Fx 'depend = webkit2gtk-4.1' done - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: release-arch-${{ matrix.arch }} path: dist/release/*.pkg.tar.zst @@ -145,8 +157,12 @@ jobs: - {arch: x86_64, runner: ubuntu-24.04} - {arch: aarch64, runner: ubuntu-24.04-arm} steps: - - uses: actions/checkout@v4 - - uses: actions/download-artifact@v4 + - name: Harden runner + uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4 + with: + egress-policy: audit + - uses: actions/checkout@v7 + - uses: actions/download-artifact@v8 with: name: release-linux-${{ matrix.arch }} path: dist/linux @@ -161,8 +177,10 @@ jobs: - name: Build Flatpak and publish OCI env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} run: packaging/linux/flatpak.sh - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v7 with: name: release-flatpak-${{ matrix.arch }} path: | @@ -175,7 +193,11 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@v4 + - name: Harden runner + uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4 + with: + egress-policy: audit + - uses: actions/checkout@v7 - name: Read version id: version run: echo "value=$(jq -r .version crates/desktop/artcraft/tauri.conf.json)" >> "$GITHUB_OUTPUT" diff --git a/.github/workflows/artcraft-macos-publish.yml b/.github/workflows/artcraft-macos-publish.yml index d40cda5e61..07d2d8af04 100644 --- a/.github/workflows/artcraft-macos-publish.yml +++ b/.github/workflows/artcraft-macos-publish.yml @@ -10,6 +10,13 @@ on: # This workflow creates Universal macOS builds with signing certificate support. # On each push to the release branches it will create or update a GitHub release, build your app, and upload the artifacts to the release. +# One release build per branch at a time. A run in progress is never cancelled, because it may +# already have created or uploaded to the draft release. If more pushes arrive while one runs, +# GitHub keeps only the newest as pending, so the next build is of the latest commit. +concurrency: + group: macos-release-${{ github.ref }} + cancel-in-progress: false + jobs: publish-artcraft: permissions: @@ -28,17 +35,24 @@ jobs: # args: '' runs-on: ${{ matrix.platform }} + # Successful builds took 10-22 min (2026-04 to 2026-11). + timeout-minutes: 60 steps: - - uses: actions/checkout@v4 + - name: Harden runner + uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4 + with: + egress-policy: audit + - uses: actions/checkout@v7 - name: setup node - uses: actions/setup-node@v4 + uses: actions/setup-node@v7 with: node-version: lts/* - name: install Rust stable - uses: dtolnay/rust-toolchain@stable + uses: step-security/dtolnay-rust-toolchain@8dd607977d06adf4ed49b190381e74c17a9dd25f # v1.0.0 with: + toolchain: stable targets: ${{ matrix.platform == 'macos-latest-xlarge' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }} - name: install dependencies (ubuntu only) @@ -63,7 +77,7 @@ jobs: npm cache clean --force echo "Installing all workspace dependencies..." - npm ci + npm ci --ignore-scripts echo "=== Version Information ===" echo "Node version:" @@ -196,9 +210,8 @@ jobs: # Increase Node.js memory limit for the build export NODE_OPTIONS="--max-old-space-size=8192" - # Use npx to ensure we use the local nx version - echo "Building with npx nx..." - npx nx run artcraft:build + echo "Building with nx..." + ./node_modules/.bin/nx run artcraft:build echo "Checking build output..." # shellcheck disable=SC2012 @@ -217,7 +230,7 @@ jobs: - name: build and publish - uses: tauri-apps/tauri-action@v0 + uses: step-security/tauri-action@dc662d498edbd35ec8ed564b45d44e955444d1bc # v1.0.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} APPLE_ID: ${{ secrets.APPLE_ID }} diff --git a/.github/workflows/artcraft-windows-publish.yml b/.github/workflows/artcraft-windows-publish.yml index fa5847e49c..56384ccdc9 100644 --- a/.github/workflows/artcraft-windows-publish.yml +++ b/.github/workflows/artcraft-windows-publish.yml @@ -10,6 +10,13 @@ on: # This workflow creates Windows builds. # On each push to the release branches it will create or update a GitHub release, build your app, and upload the artifacts to the release. +# One release build per branch at a time. A run in progress is never cancelled, because it may +# already have created or uploaded to the draft release. If more pushes arrive while one runs, +# GitHub keeps only the newest as pending, so the next build is of the latest commit. +concurrency: + group: windows-release-${{ github.ref }} + cancel-in-progress: false + jobs: publish-artcraft-windows: permissions: @@ -23,11 +30,19 @@ jobs: args: '' runs-on: ${{ matrix.platform }} + # Successful builds took 17-36 min (2026-04 to 2026-11); one hung run used the full 6-hour default. + timeout-minutes: 90 steps: - - uses: actions/checkout@v4 + - name: Harden runner + uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4 + with: + egress-policy: audit + - uses: actions/checkout@v7 - name: install Rust stable - uses: dtolnay/rust-toolchain@stable + uses: step-security/dtolnay-rust-toolchain@8dd607977d06adf4ed49b190381e74c17a9dd25f # v1.0.0 + with: + toolchain: stable - name: install wreq dependencies run: | @@ -39,7 +54,7 @@ jobs: shell: cmd - name: setup node - uses: actions/setup-node@v4 + uses: actions/setup-node@v7 with: node-version: lts/* @@ -52,7 +67,7 @@ jobs: npm cache clean --force echo "Installing all workspace dependencies..." - npm ci + npm ci --ignore-scripts echo "=== Version Information ===" echo "Node version:" @@ -92,7 +107,7 @@ jobs: $config | ConvertTo-Json -Depth 10 | Set-Content tauri.conf.json - name: build and publish - uses: tauri-apps/tauri-action@v0 + uses: step-security/tauri-action@dc662d498edbd35ec8ed564b45d44e955444d1bc # v1.0.0 env: # NB(bt): This is needed by wreq. Hopefully it doesn't kill Tauri RUSTFLAGS: "-C target-feature=+crt-static" diff --git a/Cargo.lock b/Cargo.lock index 7ccf01b298..69dc9a660c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -304,7 +304,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -383,6 +383,7 @@ dependencies = [ "chrono", "cookie_store 0.0.1", "cookie_store_wrapper", + "craft-update", "directories", "dirs", "discord-rich-presence", @@ -838,6 +839,12 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +[[package]] +name = "base64" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" + [[package]] name = "base64ct" version = "1.6.0" @@ -1424,9 +1431,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.44" +version = "0.4.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" +checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327" dependencies = [ "iana-time-zone", "js-sys", @@ -1768,6 +1775,31 @@ dependencies = [ "libc", ] +[[package]] +name = "craft-update" +version = "0.1.0" +source = "git+https://github.com/storytold/craft-libs?rev=2a24c10817173d26d0ea4689acbbade36f91b5dc#2a24c10817173d26d0ea4689acbbade36f91b5dc" +dependencies = [ + "chrono", + "dunce", + "flate2", + "getrandom 0.3.1", + "log", + "plist", + "rustix 1.1.5", + "semver", + "serde", + "serde_json", + "sha2 0.10.8", + "tar", + "tempfile", + "ureq", + "verifysign", + "winreg 0.55.0", + "winsafe", + "zip", +] + [[package]] name = "crc" version = "3.0.1" @@ -1785,9 +1817,9 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32fast" -version = "1.4.2" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "2b929dd2a135771f40afabd1073f85eed59c800b7c61901e5c254270497dad64" dependencies = [ "cfg-if", ] @@ -2092,7 +2124,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -2464,7 +2496,7 @@ dependencies = [ "rustc_version", "toml 0.8.23", "vswhom", - "winreg", + "winreg 0.52.0", ] [[package]] @@ -2654,7 +2686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -2818,6 +2850,16 @@ dependencies = [ "walkdir", ] +[[package]] +name = "filetime" +version = "0.2.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c287a33c7f0a620c38e641e7f60827713987b3c0f26e8ddc9462cc69cf75759" +dependencies = [ + "cfg-if", + "libc", +] + [[package]] name = "find-msvc-tools" version = "0.1.9" @@ -4724,7 +4766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -5073,7 +5115,7 @@ dependencies = [ "png 0.18.1", "serde", "thiserror 2.0.18", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -7119,7 +7161,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys 0.12.1", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -7139,6 +7181,7 @@ version = "0.23.36" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b" dependencies = [ + "log", "once_cell", "ring", "rustls-pki-types", @@ -7189,6 +7232,33 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls-platform-verifier" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1167586491e2b18b8bfbb293e8180ec17c201c4f076d7cb3070ca964e7598f98" +dependencies = [ + "core-foundation 0.10.1", + "core-foundation-sys", + "jni 0.22.4", + "log", + "once_cell", + "rustls 0.23.36", + "rustls-native-certs", + "rustls-platform-verifier-android", + "rustls-webpki 0.103.9", + "security-framework 3.7.0", + "security-framework-sys", + "webpki-root-certs", + "windows-sys 0.60.2", +] + +[[package]] +name = "rustls-platform-verifier-android" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f" + [[package]] name = "rustls-webpki" version = "0.101.7" @@ -8022,6 +8092,7 @@ dependencies = [ "sqlx", "tempfile", "tokens", + "tokio", ] [[package]] @@ -8649,6 +8720,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "tar" +version = "0.4.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840" +dependencies = [ + "filetime", + "libc", +] + [[package]] name = "target-lexicon" version = "0.12.14" @@ -9033,7 +9114,7 @@ dependencies = [ "getrandom 0.4.1", "once_cell", "rustix 1.1.5", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -9543,7 +9624,7 @@ dependencies = [ "png 0.18.1", "serde", "thiserror 2.0.18", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -9607,6 +9688,12 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "typed-path" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54ec2755506471f54baf5e4bb5499d8e510cc1caf271270e778a736bd2d7336c" + [[package]] name = "typeid" version = "1.0.2" @@ -9636,7 +9723,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e" dependencies = [ "memoffset", "tempfile", - "windows-sys 0.61.2", + "windows-sys 0.60.2", ] [[package]] @@ -9788,6 +9875,35 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" +[[package]] +name = "ureq" +version = "3.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a7ac20be9b7726e0bbdbf974c059676d9acb1cd414961f570a4e8231cacd7fc" +dependencies = [ + "base64 0.23.1", + "flate2", + "log", + "percent-encoding", + "rustls 0.23.36", + "rustls-pki-types", + "rustls-platform-verifier", + "ureq-proto", + "utf8-zero", +] + +[[package]] +name = "ureq-proto" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841583fc36089d7d59419568ae157f43a5a03a2e5a81ba87c77d1596ef46e922" +dependencies = [ + "base64 0.23.1", + "http", + "httparse", + "log", +] + [[package]] name = "url" version = "2.5.8" @@ -9877,6 +9993,12 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" +[[package]] +name = "utf8-zero" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8c0a043c9540bae7c578c88f91dda8bd82e59ae27c21baca69c8b191aaf5a6e" + [[package]] name = "utf8_iter" version = "1.0.4" @@ -9992,6 +10114,16 @@ dependencies = [ "vello_common", ] +[[package]] +name = "verifysign" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6efd25aadc22c756a9012267fae0b130278d335d6ceb512ec02ce82029b5ca9" +dependencies = [ + "core-foundation 0.10.1", + "windows-sys 0.61.2", +] + [[package]] name = "version-compare" version = "0.2.0" @@ -11327,6 +11459,22 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.55.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97" +dependencies = [ + "cfg-if", + "windows-sys 0.59.0", +] + +[[package]] +name = "winsafe" +version = "0.0.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef0ffc427f045c0cc9ebffd6f4f91153dcd2a1547b5c3c29ee3f541e16e95c6" + [[package]] name = "wit-bindgen" version = "0.51.0" @@ -11889,6 +12037,19 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "zip" +version = "9.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711e8c9646791c49b7eb799a19c4ae70a9b8372ddc6a1fa4778defd1e2aa5d5e" +dependencies = [ + "crc32fast", + "flate2", + "indexmap 2.13.0", + "memchr", + "typed-path", +] + [[package]] name = "zmij" version = "1.0.21" diff --git a/README.md b/README.md index e7095a5377..da446e4916 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@

Scanned by SonarCloud + Reviewed by CodeRabbit

The IDE for artists.

diff --git a/crates/api_clients/artcraft/artcraft_client/Cargo.toml b/crates/api_clients/artcraft/artcraft_client/Cargo.toml index 6987761299..4fa416b0aa 100644 --- a/crates/api_clients/artcraft/artcraft_client/Cargo.toml +++ b/crates/api_clients/artcraft/artcraft_client/Cargo.toml @@ -33,6 +33,7 @@ chrono.workspace = true cookie.workspace = true log.workspace = true reqwest = { workspace = true, features = ["multipart", "gzip"] } +tokio = { workspace = true, features = ["fs"] } url.workspace = true # Serialization diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs index 9d0b0e1d59..964ec52c4a 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs @@ -60,7 +60,7 @@ pub async fn legacy_upload_media_file_from_file>( .build() .map_err(|err| StorytellerError::Client(ClientError::from(err)))?; - let file_bytes = std::fs::read(args.path.as_ref()) + let file_bytes = tokio::fs::read(args.path.as_ref()).await .map_err(|err| StorytellerError::Client(ClientError::from(err)))?; let file_name = args.path.as_ref().file_name() .and_then(|n| n.to_str()).unwrap_or("file").to_string(); diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs index 70105963e9..39c9a6358f 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs @@ -69,7 +69,7 @@ pub async fn upload_image_media_file_from_file_with_idempotency_token>( let client = storyteller_client_builder(api_host) .build()?; - let file_bytes = std::fs::read(path.as_ref())?; + let file_bytes = tokio::fs::read(path.as_ref()).await?; let file_name = path.as_ref().file_name() .and_then(|n| n.to_str()).unwrap_or("file").to_string(); let mut form = Form::new() diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs index 332a5464aa..d0864b126a 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs @@ -61,7 +61,7 @@ pub async fn upload_video_media_file_from_file>( let client = storyteller_client_builder(args.api_host) .build()?; - let file_bytes = std::fs::read(args.path.as_ref())?; + let file_bytes = tokio::fs::read(args.path.as_ref()).await?; let file_name = args.path.as_ref().file_name() .and_then(|n| n.to_str()).unwrap_or("file").to_string(); let mut form = Form::new() diff --git a/crates/api_clients/artcraft/artcraft_client/src/recipes/download_media_file.rs b/crates/api_clients/artcraft/artcraft_client/src/recipes/download_media_file.rs index a4eb3903b6..8c42250b13 100644 --- a/crates/api_clients/artcraft/artcraft_client/src/recipes/download_media_file.rs +++ b/crates/api_clients/artcraft/artcraft_client/src/recipes/download_media_file.rs @@ -1,5 +1,3 @@ -use std::fs; -use std::io::Write; use std::path::{Path, PathBuf}; use log::{info, warn}; @@ -68,13 +66,7 @@ pub async fn download_media_file>( let bytes = download_bytes(cdn_url).await?; // 4. Write to disk. - let mut file = fs::File::create(&output_path) - .map_err(|err| StorytellerError::Client(ClientError::IoError(err)))?; - - file.write_all(&bytes) - .map_err(|err| StorytellerError::Client(ClientError::IoError(err)))?; - - file.flush() + tokio::fs::write(&output_path, &bytes).await .map_err(|err| StorytellerError::Client(ClientError::IoError(err)))?; info!("Downloaded {} bytes to {:?}", bytes.len(), output_path); diff --git a/crates/api_clients/artcraft/artcraft_router/Cargo.toml b/crates/api_clients/artcraft/artcraft_router/Cargo.toml index 3fd929faee..8edabf415c 100644 --- a/crates/api_clients/artcraft/artcraft_router/Cargo.toml +++ b/crates/api_clients/artcraft/artcraft_router/Cargo.toml @@ -31,7 +31,7 @@ reqwest.workspace = true serde.workspace = true wreq.workspace = true serde_derive.workspace = true -tokio.workspace = true +tokio = { workspace = true, features = ["fs"] } uuid.workspace = true [dev-dependencies] diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/upload.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/upload.rs index ae878a16a3..1900d0465b 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/upload.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/upload.rs @@ -24,7 +24,7 @@ pub(crate) async fn upload_to_kinovi_web( .unwrap_or_else(|| "jpg".to_string()); let file_bytes = match maybe_local_path { - Some(local_path) => match std::fs::read(local_path) { + Some(local_path) => match tokio::fs::read(local_path).await { Ok(bytes) => { info!("Reusing predownloaded file for kinovi upload: {}", source_url); bytes diff --git a/crates/api_clients/midjourney_client/src/credentials/credential_manager.rs b/crates/api_clients/midjourney_client/src/credentials/credential_manager.rs index 2909961236..fb9472a468 100644 --- a/crates/api_clients/midjourney_client/src/credentials/credential_manager.rs +++ b/crates/api_clients/midjourney_client/src/credentials/credential_manager.rs @@ -93,7 +93,7 @@ impl MidjourneyCredentialManager { let _guard = self.mutation.lock().await; // Remove every format, so a later startup cannot migrate a logged-out account. for path in self.legacy_paths.iter().chain([&self.credential_path]) { - match std::fs::remove_file(path) { + match tokio::fs::remove_file(path).await { Ok(()) => {}, Err(err) if err.kind() == std::io::ErrorKind::NotFound => {}, Err(err) => return Err(err.into()), diff --git a/crates/api_clients/openai_sora_client/src/requests/common/task_id.rs b/crates/api_clients/openai_sora_client/src/requests/common/task_id.rs index 131d933fe9..b1894ef8b2 100644 --- a/crates/api_clients/openai_sora_client/src/requests/common/task_id.rs +++ b/crates/api_clients/openai_sora_client/src/requests/common/task_id.rs @@ -21,10 +21,6 @@ impl TaskId { pub fn as_str(&self) -> &str { &self.0 } - - pub fn to_string(&self) -> String { - self.0.to_string() - } } impl Display for TaskId { diff --git a/crates/api_clients/openai_sora_client/src/requests/deprecated/job_status/sora_job_status.rs b/crates/api_clients/openai_sora_client/src/requests/deprecated/job_status/sora_job_status.rs index fce3287c0c..5338d98de0 100644 --- a/crates/api_clients/openai_sora_client/src/requests/deprecated/job_status/sora_job_status.rs +++ b/crates/api_clients/openai_sora_client/src/requests/deprecated/job_status/sora_job_status.rs @@ -11,7 +11,7 @@ use errors::AnyhowResult; use log::{debug, error, warn}; use serde_derive::{Deserialize, Serialize}; use std::fmt::{Debug, Display}; -use std::{fs::File, io::Write, path::Path}; +use std::path::Path; use url::Url; use wreq::Client; @@ -271,9 +271,7 @@ pub async fn get_image_gen_status(status_request: &StatusRequest, credentials: & pub async fn save_generations_to_dir(generations: &[Generation], dir: &str) -> AnyhowResult<()> { let dir = Path::new(dir); - if !dir.exists() { - std::fs::create_dir_all(dir)?; - } + tokio::fs::create_dir_all(dir).await?; for generation in generations { let response = wreq::get(generation.url.clone()).send().await?; let image_bytes = response.bytes().await?; @@ -282,15 +280,13 @@ pub async fn save_generations_to_dir(generations: &[Generation], dir: &str) -> A let ext = url.path().split(".").last().unwrap_or("png"); let path = Path::new(dir).join(format!("{}.{}", generation.id, ext)); - let mut file = File::create(path)?; - file.write_all(&image_bytes)?; + tokio::fs::write(path, &image_bytes).await?; let thumbnail_url = generation.encodings.thumbnail.path.clone(); let thumbnail_response = wreq::get(thumbnail_url).send().await?; let thumbnail_bytes = thumbnail_response.bytes().await?; let thumbnail_path = Path::new(dir).join(format!("{}_thumbnail.{}", generation.id, ext)); - let mut thumbnail_file = File::create(thumbnail_path)?; - thumbnail_file.write_all(&thumbnail_bytes)?; + tokio::fs::write(thumbnail_path, &thumbnail_bytes).await?; } Ok(()) diff --git a/crates/api_clients/worldlabs_consumer_client/src/api/requests/google_refresh_token/google_refresh_token.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/google_refresh_token/google_refresh_token.rs index 7db5e6b9b1..259a45d38c 100644 --- a/crates/api_clients/worldlabs_consumer_client/src/api/requests/google_refresh_token/google_refresh_token.rs +++ b/crates/api_clients/worldlabs_consumer_client/src/api/requests/google_refresh_token/google_refresh_token.rs @@ -141,8 +141,8 @@ mod tests { async fn test_requests() -> AnyhowResult<()> { setup_test_logging(LevelFilter::Debug); - let refresh_token = "AMf-vByUgA0J9S93vULECe-sD50cbR85AFVYF60gKAmLFF1MBYwXlKRJCsv7z3oSpLtP0ApyOU5fAl52qHWM2U0yKgEu5gQ5UCUDt5SEG4UBRHWvHEmLLcu-Zl04Fq4ljocSEO3qJzuX1wyshmptZxlDPRkjdLYgyn-Kp03woI2yRPKLuQF5hQtABHabsNUh9Zhs129sgxuUlOuw4zsFI4L8UdE3bEuF3k6Mic7KlE3440YwyQ8Qtmk9zHtXIx2ob56N-1WTGSqwMUuQ1mX4OOvLve9bw2zDW3UzchomTWkh732886RPrP-DNRkPbO3FejUEMxuYQFWYX3EEeIEdfNGXFNGPL1dNniSXlSaKadpX699Ishjviv-x9o-pPQa3zoAj3NzWLyd8mn5rDBh9qAO_iDETaeo01Sjhb4mGYfAWZ-g4S6nW778"; - let refresh_token = WorldLabsRefreshToken::new(refresh_token.to_string()); + let refresh_token = std::env::var("WORLDLABS_REFRESH_TOKEN")?; + let refresh_token = WorldLabsRefreshToken::new(refresh_token); let result = google_refresh_token(GoogleRefreshTokenArgs { refresh_token: &refresh_token, diff --git a/crates/desktop/artcraft/Cargo.toml b/crates/desktop/artcraft/Cargo.toml index 51ff6bcd94..74eefe4928 100644 --- a/crates/desktop/artcraft/Cargo.toml +++ b/crates/desktop/artcraft/Cargo.toml @@ -22,6 +22,7 @@ crate-type = ["staticlib", "cdylib", "rlib"] tauri-build = { version = "2.6.2", features = [] } [dependencies] +craft-update = { git = "https://github.com/storytold/craft-libs", rev = "2a24c10817173d26d0ea4689acbbade36f91b5dc" } toml.workspace = true browser_emulation.workspace = true cookie_store_wrapper = { workspace = true, features = ["wreq"] } diff --git a/crates/desktop/artcraft/src/core/commands/mod.rs b/crates/desktop/artcraft/src/core/commands/mod.rs index 4baa4c0584..460227085a 100644 --- a/crates/desktop/artcraft/src/core/commands/mod.rs +++ b/crates/desktop/artcraft/src/core/commands/mod.rs @@ -12,4 +12,5 @@ pub mod platform_info_command; pub mod providers; pub mod response; pub mod task_queue; -pub mod deprecated; \ No newline at end of file +pub mod deprecated; +pub mod updates; diff --git a/crates/desktop/artcraft/src/core/commands/updates/check_for_updates_command.rs b/crates/desktop/artcraft/src/core/commands/updates/check_for_updates_command.rs new file mode 100644 index 0000000000..54791e3e57 --- /dev/null +++ b/crates/desktop/artcraft/src/core/commands/updates/check_for_updates_command.rs @@ -0,0 +1,8 @@ +use crate::updates::{UpdateInfo, Updates}; +use std::sync::Arc; +use tauri::{AppHandle, State}; + +#[tauri::command] +pub async fn check_for_updates_command(app: AppHandle, updates: State<'_, Arc>) -> Result { + updates.inner().run("The update check stopped unexpectedly", move |state| state.check(&app)).await +} diff --git a/crates/desktop/artcraft/src/core/commands/updates/install_update_command.rs b/crates/desktop/artcraft/src/core/commands/updates/install_update_command.rs new file mode 100644 index 0000000000..4346ad6769 --- /dev/null +++ b/crates/desktop/artcraft/src/core/commands/updates/install_update_command.rs @@ -0,0 +1,9 @@ +use crate::updates::{require_confirmation, Updates}; +use std::sync::Arc; +use tauri::{AppHandle, State}; + +#[tauri::command] +pub async fn install_update_command(app: AppHandle, updates: State<'_, Arc>, confirmed: bool) -> Result<(), String> { + require_confirmation(confirmed)?; + updates.inner().run("The update installer stopped unexpectedly", move |state| state.install(&app)).await +} diff --git a/crates/desktop/artcraft/src/core/commands/updates/mod.rs b/crates/desktop/artcraft/src/core/commands/updates/mod.rs new file mode 100644 index 0000000000..d11e8510a5 --- /dev/null +++ b/crates/desktop/artcraft/src/core/commands/updates/mod.rs @@ -0,0 +1,2 @@ +pub mod check_for_updates_command; +pub mod install_update_command; diff --git a/crates/desktop/artcraft/src/core/threads/third_party_task_polling_thread/handlers/fal/handle_fal_complete.rs b/crates/desktop/artcraft/src/core/threads/third_party_task_polling_thread/handlers/fal/handle_fal_complete.rs index 620d19aec0..7a04cb89dd 100644 --- a/crates/desktop/artcraft/src/core/threads/third_party_task_polling_thread/handlers/fal/handle_fal_complete.rs +++ b/crates/desktop/artcraft/src/core/threads/third_party_task_polling_thread/handlers/fal/handle_fal_complete.rs @@ -31,8 +31,6 @@ use sqlite_tasks::queries::task::Task; use sqlite_tasks::queries::update_successful_task_status_with_metadata::{ update_successful_task_status_with_metadata, UpdateSuccessfulTaskArgs, }; -use std::fs::File; -use std::io::Write; use std::path::PathBuf; use std::time::Duration; use tauri::AppHandle; @@ -255,8 +253,7 @@ async fn download_file( let filename = format!("fal_{}_{}.{}", generate_random_uuid(), index, extension); let download_path = tempdir.join(filename); - let mut file = File::create(&download_path)?; - file.write_all(&bytes)?; + tokio::fs::write(&download_path, bytes).await?; Ok(download_path) } diff --git a/crates/desktop/artcraft/src/core/utils/auto_download.rs b/crates/desktop/artcraft/src/core/utils/auto_download.rs index 3b4e2f3e31..a2e52d525a 100644 --- a/crates/desktop/artcraft/src/core/utils/auto_download.rs +++ b/crates/desktop/artcraft/src/core/utils/auto_download.rs @@ -94,7 +94,7 @@ async fn download_generated_results( } ensure!(!urls.is_empty(), "Completed task has no downloadable results"); let path = checkpoint_path(root, task); - let mut checkpoint: AutoDownloadCheckpoint = match std::fs::read(&path) { + let mut checkpoint: AutoDownloadCheckpoint = match tokio::fs::read(&path).await { Ok(bytes) => serde_json::from_slice(&bytes)?, Err(err) if err.kind() == std::io::ErrorKind::NotFound => { AutoDownloadCheckpoint { download_time: Local::now(), saved: BTreeMap::new() } diff --git a/crates/desktop/artcraft/src/core/utils/simple_http_download.rs b/crates/desktop/artcraft/src/core/utils/simple_http_download.rs index 966b71950c..769c9f0535 100644 --- a/crates/desktop/artcraft/src/core/utils/simple_http_download.rs +++ b/crates/desktop/artcraft/src/core/utils/simple_http_download.rs @@ -1,8 +1,6 @@ use errors::AnyhowResult; use reqwest::Client; use reqwest::Url; -use std::fs::OpenOptions; -use std::io::Write; use std::path::Path; const USER_AGENT: &str = "storyteller-client/1.0"; @@ -22,13 +20,7 @@ pub async fn simple_http_download>(url: &Url, download_path: P) - //let response : Response = reqwest::get(url).await?; let bytes = response.bytes().await?; - let mut file = OpenOptions::new() - .create(true) // To create a new file - .write(true) - .truncate(true) - .open(download_path)?; - - file.write_all(&bytes)?; + tokio::fs::write(download_path, bytes).await?; Ok(()) } diff --git a/crates/desktop/artcraft/src/lib.rs b/crates/desktop/artcraft/src/lib.rs index 643c671371..64a3f98f22 100644 --- a/crates/desktop/artcraft/src/lib.rs +++ b/crates/desktop/artcraft/src/lib.rs @@ -6,6 +6,11 @@ use crate::core::commands::generate::generate_mesh_command::generate_mesh_comman pub mod core; pub mod services; pub mod version; +pub mod updates; + +use std::sync::Arc; +use crate::core::commands::updates::check_for_updates_command::check_for_updates_command; +use crate::core::commands::updates::install_update_command::install_update_command; use tauri::Manager; @@ -155,11 +160,20 @@ pub fn run() { println!("Initializing backend runtime..."); let builder = tauri::Builder::default() + .manage(Arc::new(updates::Updates::default())) + .on_window_event(|window, event| { + if window.try_state::>().is_some_and(|updates| updates.prevents_exit()) { + if let tauri::WindowEvent::CloseRequested { api, .. } = event { + api.prevent_close(); + } + } + }) .plugin(tauri_plugin_dialog::init()) .plugin(tauri_plugin_http::init()) .plugin(tauri_plugin_opener::init()) .plugin(tauri_plugin_upload::init()) .setup(move |app| { + updates::show_previous_outcome(app.handle()); // TODO(bt): This is broken on windows // log_environment_details(); @@ -225,6 +239,8 @@ pub fn run() { // TODO: Break this out into another module, because RustRover/IntelliJ lags with these macros. // My first attempt at naively doing this didn't work because the macros can't find their codegen'd targets. let builder = builder.invoke_handler(tauri::generate_handler![ + check_for_updates_command, + install_update_command, check_sora_session_command, download_directory_reveal_command, download_media_file_command, @@ -290,6 +306,14 @@ pub fn run() { worldlabs_receive_bearer_command, ]); - builder.run(tauri::generate_context!("tauri.conf.json")) - .expect("error while running tauri application"); + let app = builder.build(tauri::generate_context!("tauri.conf.json")) + .expect("error while building tauri application"); + app.run(|handle, event| { + let updates = handle.state::>(); + match event { + tauri::RunEvent::ExitRequested { api, .. } if updates.prevents_exit() => api.prevent_exit(), + tauri::RunEvent::Exit => updates.finish(), + _ => {} + } + }); } diff --git a/crates/desktop/artcraft/src/main.rs b/crates/desktop/artcraft/src/main.rs index 50008bc51b..6b27bc958e 100644 --- a/crates/desktop/artcraft/src/main.rs +++ b/crates/desktop/artcraft/src/main.rs @@ -2,5 +2,10 @@ #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] fn main() { + if let Some(result) = artcraft_app_lib::updates::finish_helper() { + let failed = result.is_err(); + if let Err(error) = result { log::error!("Update failed: {error}"); } + std::process::exit(i32::from(failed)); + } artcraft_app_lib::run(); } diff --git a/crates/desktop/artcraft/src/services/midjourney/threads/upload_midjourney_batch.rs b/crates/desktop/artcraft/src/services/midjourney/threads/upload_midjourney_batch.rs index 8b0448e12a..9010ae09f3 100644 --- a/crates/desktop/artcraft/src/services/midjourney/threads/upload_midjourney_batch.rs +++ b/crates/desktop/artcraft/src/services/midjourney/threads/upload_midjourney_batch.rs @@ -119,7 +119,7 @@ pub(super) async fn upload_midjourney_batch(maybe_app_handle: Option<&AppHandle> } } - if let Err(err) = std::fs::remove_file(MidjourneyUploadCheckpoint::path(app_data_root, local_task)) { + if let Err(err) = tokio::fs::remove_file(MidjourneyUploadCheckpoint::path(app_data_root, local_task)).await { log::warn!("Could not remove completed Midjourney upload checkpoint: {}", err); } Ok(()) diff --git a/crates/desktop/artcraft/src/services/midjourney/utils/download_midjourney_image.rs b/crates/desktop/artcraft/src/services/midjourney/utils/download_midjourney_image.rs index fb63021c15..c07ecd6963 100644 --- a/crates/desktop/artcraft/src/services/midjourney/utils/download_midjourney_image.rs +++ b/crates/desktop/artcraft/src/services/midjourney/utils/download_midjourney_image.rs @@ -2,8 +2,6 @@ use crate::core::state::data_dir::app_data_root::AppDataRoot; use crate::core::state::data_dir::trait_data_subdir::DataSubdir; use errors::AnyhowResult; use midjourney_client::utils::get_image_url::get_image_url; -use std::fs::File; -use std::io::Write; use std::path::PathBuf; use url::Url; use midjourney_client::utils::image_downloader_client::ImageDownloaderClient; @@ -28,8 +26,7 @@ pub async fn download_midjourney_image( let download_filename = format!("{}_{}.{}", job_id, index, ext); let download_path = tempdir.join(download_filename); - let mut file = File::create(&download_path)?; - file.write_all(&image_bytes)?; + tokio::fs::write(&download_path, &image_bytes).await?; Ok(download_path) } diff --git a/crates/desktop/artcraft/src/services/sora/state/initialize_sora_jwt_bearer_token.rs b/crates/desktop/artcraft/src/services/sora/state/initialize_sora_jwt_bearer_token.rs index 5705cb165f..62b4c3983e 100644 --- a/crates/desktop/artcraft/src/services/sora/state/initialize_sora_jwt_bearer_token.rs +++ b/crates/desktop/artcraft/src/services/sora/state/initialize_sora_jwt_bearer_token.rs @@ -14,7 +14,7 @@ pub async fn initialize_sora_jwt_bearer_token(app_data_root: &AppDataRoot) -> An return Ok(()); // Bearer token already exists. } - let cookie = std::fs::read_to_string(app_data_root.get_sora_cookie_file_path())? + let cookie = tokio::fs::read_to_string(app_data_root.get_sora_cookie_file_path()).await? .trim() .to_string(); @@ -22,7 +22,7 @@ pub async fn initialize_sora_jwt_bearer_token(app_data_root: &AppDataRoot) -> An let bearer = generate_bearer_jwt_with_cookie(&cookie).await?; - std::fs::write(app_data_root.get_sora_bearer_token_file_path(), bearer)?; + tokio::fs::write(app_data_root.get_sora_bearer_token_file_path(), bearer).await?; Ok(()) } diff --git a/crates/desktop/artcraft/src/services/sora/state/read_sora_credentials_from_disk_with_upgrade.rs b/crates/desktop/artcraft/src/services/sora/state/read_sora_credentials_from_disk_with_upgrade.rs index 7538a1a067..eae939280f 100644 --- a/crates/desktop/artcraft/src/services/sora/state/read_sora_credentials_from_disk_with_upgrade.rs +++ b/crates/desktop/artcraft/src/services/sora/state/read_sora_credentials_from_disk_with_upgrade.rs @@ -8,8 +8,7 @@ use openai_sora_client::creds::sora_jwt_bearer_token::SoraJwtBearerToken; use openai_sora_client::creds::sora_sentinel::SoraSentinel; use openai_sora_client::creds::sora_sentinel_token::SoraSentinelToken; use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session; -use std::fs::{read_to_string, OpenOptions}; -use std::io::Write; +use tokio::fs::{read_to_string, write}; pub async fn read_sora_credentials_from_disk_with_upgrade(app_data_root: &AppDataRoot) -> AnyhowResult { let cookie_file = app_data_root.get_sora_cookie_file_path(); @@ -21,7 +20,7 @@ pub async fn read_sora_credentials_from_disk_with_upgrade(app_data_root: &AppDat return Err(anyhow!("Cookie file does not exist: {:?}", cookie_file)); } - let value = read_to_string(cookie_file)? + let value = read_to_string(cookie_file).await? .trim() .to_string(); @@ -32,14 +31,14 @@ pub async fn read_sora_credentials_from_disk_with_upgrade(app_data_root: &AppDat let mut sentinel_token = None; if bearer_file.exists() { - let value = read_to_string(&bearer_file)? + let value = read_to_string(&bearer_file).await? .trim() .to_string(); bearer = Some(SoraJwtBearerToken::new(value)?); } if legacy_sentinel_file.exists() { - let value = read_to_string(&legacy_sentinel_file)? + let value = read_to_string(&legacy_sentinel_file).await? .trim() .to_string(); @@ -47,7 +46,7 @@ pub async fn read_sora_credentials_from_disk_with_upgrade(app_data_root: &AppDat } if sentinel_token_file.exists() { - let value = read_to_string(&sentinel_token_file)? + let value = read_to_string(&sentinel_token_file).await? .trim() .to_string(); @@ -73,14 +72,7 @@ pub async fn read_sora_credentials_from_disk_with_upgrade(app_data_root: &AppDat info!("Persisting bearer token value..."); let value = bearer.token_str(); - let mut file = OpenOptions::new() - .create(true) - .write(true) - .truncate(true) - .open(&bearer_file)?; - - file.write_all(value.as_bytes())?; - file.flush()?; + write(&bearer_file, value.as_bytes()).await?; } } @@ -89,14 +81,7 @@ pub async fn read_sora_credentials_from_disk_with_upgrade(app_data_root: &AppDat info!("Persisting sentinel value..."); let value = sentinel.get_sentinel(); - let mut file = OpenOptions::new() - .create(true) - .write(true) - .truncate(true) - .open(&legacy_sentinel_file)?; - - file.write_all(value.as_bytes())?; - file.flush()?; + write(&legacy_sentinel_file, value.as_bytes()).await?; } } @@ -105,14 +90,7 @@ pub async fn read_sora_credentials_from_disk_with_upgrade(app_data_root: &AppDat info!("Persisting sentinel token..."); let value = sentinel_token.to_persistent_storage_json()?; - let mut file = OpenOptions::new() - .create(true) - .write(true) - .truncate(true) - .open(&sentinel_token_file)?; - - file.write_all(value.as_bytes())?; - file.flush()?; + write(&sentinel_token_file, value.as_bytes()).await?; } } diff --git a/crates/desktop/artcraft/src/services/sora/state/sora_credential_manager.rs b/crates/desktop/artcraft/src/services/sora/state/sora_credential_manager.rs index e10ddcf3f6..451e2ba1dd 100644 --- a/crates/desktop/artcraft/src/services/sora/state/sora_credential_manager.rs +++ b/crates/desktop/artcraft/src/services/sora/state/sora_credential_manager.rs @@ -162,14 +162,7 @@ impl SoraCredentialManager { self.holder.set_credentials(&creds)?; - let mut file = OpenOptions::new() - .create(true) - .write(true) - .truncate(true) - .open(self.app_data_root.get_sora_legacy_sentinel_file_path())?; - - file.write_all(sentinel.as_bytes())?; - file.flush()?; + tokio::fs::write(self.app_data_root.get_sora_legacy_sentinel_file_path(), sentinel.as_bytes()).await?; Ok(creds) } diff --git a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_successful_generations.rs b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_successful_generations.rs index b3bf451457..932c07afe5 100644 --- a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_successful_generations.rs +++ b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_successful_generations.rs @@ -33,8 +33,6 @@ use sqlite_tasks::queries::task::Task; use sqlite_tasks::queries::update_successful_task_status_with_metadata::{update_successful_task_status_with_metadata, UpdateSuccessfulTaskArgs}; use sqlite_tasks::queries::update_task_status::{update_task_status, UpdateTaskArgs}; use std::collections::{HashMap, HashSet}; -use std::fs::File; -use std::io::Write; use std::path::PathBuf; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; use artcraft_client::endpoints::media_files::get_media_file::get_media_file; @@ -213,8 +211,7 @@ async fn download_generation_item( info!("Writing to path: {:?}", download_path); - let mut file = File::create(&download_path)?; - file.write_all(&image_bytes)?; + tokio::fs::write(&download_path, image_bytes).await?; Ok(download_path) } diff --git a/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs b/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs index 1b52c9f615..9ddacd8b03 100644 --- a/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs +++ b/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs @@ -39,8 +39,6 @@ use sqlite_tasks::queries::task::Task; use sqlite_tasks::queries::update_successful_task_status_with_metadata::{update_successful_task_status_with_metadata, UpdateSuccessfulTaskArgs}; use sqlite_tasks::queries::update_task_status::{update_task_status, UpdateTaskArgs}; use std::collections::{HashMap, HashSet}; -use std::fs::File; -use std::io::Write; use std::path::PathBuf; use std::time::Duration; use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet; @@ -378,8 +376,7 @@ async fn download_spz( info!("Writing to path: {:?}", download_path); - let mut file = File::create(&download_path)?; - file.write_all(&image_bytes)?; + tokio::fs::write(&download_path, image_bytes).await?; Ok(download_path) } diff --git a/crates/desktop/artcraft/src/updates.rs b/crates/desktop/artcraft/src/updates.rs new file mode 100644 index 0000000000..515c66728a --- /dev/null +++ b/crates/desktop/artcraft/src/updates.rs @@ -0,0 +1,567 @@ +//! Manual update checks and verified installation shared with the native Craft apps. +use craft_update::pins::{Choice, Pins}; +use craft_update::self_update::Install; +use craft_update::{self_update, pick_asset, App, Http, Os, PackageKind, Paths, Platform, Release, Stop}; +use enums::tauri::tasks::task_status::TaskStatus; +use serde_derive::Serialize; +use sqlite_tasks::queries::list_tasks_for_frontend::list_tasks_for_frontend; +use std::sync::atomic::{AtomicBool, Ordering}; +use std::sync::{Arc, Mutex}; +use tauri::{AppHandle, Manager}; +use tauri_plugin_dialog::DialogExt; +use crate::core::state::task_database::TaskDatabase; +use crate::version::ARTCRAFT_VERSION; + +const APP: App = App { bundle_id_override: Some("ai.artcraft.app"), ..App::new("artcraft", "ArtCraft", "Create images and video", "storytold/artcraft") }; + +#[derive(Default)] +pub struct Updates { + busy: AtomicBool, + installing: AtomicBool, + maybe_release: Mutex>, + maybe_restart: Mutex>, +} + +#[derive(Debug, Serialize)] +pub struct UpdateInfo { + pub current_version: String, + pub maybe_available_version: Option, + pub can_install: bool, + pub tasks_running: bool, + pub releases_url: String, +} + +type Restart = Box Result<(), String> + Send>; + +/// Only effects cross this boundary. Tests exercise the same state transitions without +/// networking, changing an installed copy, reading personal preferences, or exiting a process. +trait Backend { + fn stable_choice(&self) -> Result<(), String>; + fn check(&self) -> Result, String>; + fn idle(&self) -> Result<(), String>; + fn installation(&self) -> Option<(Install, Platform)>; + fn can_replace(&self) -> bool; + fn prepare(&self, install: &Install, release: &Release, platform: Platform, before_replace: &dyn Fn() -> Result<(), String>) -> Result; + fn request_exit(&self); +} + +struct NativeBackend<'a>(&'a AppHandle); +struct Installing<'a>(&'a AtomicBool); + +pub(crate) struct Operation { + updates: Arc, +} + +impl Updates { + pub(crate) fn begin(self: &Arc) -> Result { + self.busy.compare_exchange(false, true, Ordering::AcqRel, Ordering::Acquire).map_err(|_| "An update operation is already running. Please wait.".to_owned())?; + Ok(Operation { updates: Arc::clone(self) }) + } + + /// Runs `work` off the async runtime while it holds the one-operation guard. + pub(crate) async fn run(self: &Arc, stopped: &str, work: impl FnOnce(&Updates) -> Result + Send + 'static) -> Result { + let operation = self.begin()?; + let state = Arc::clone(self); + tauri::async_runtime::spawn_blocking(move || { + let _operation = operation; + work(&state) + }) + .await + .map_err(|error| format!("{stopped}: {error}"))? + } + + pub(crate) fn check(&self, app: &AppHandle) -> Result { + self.check_with(&NativeBackend(app)) + } + + fn check_with(&self, backend: &impl Backend) -> Result { + backend.stable_choice()?; + let maybe_release = backend.check()?; + let tasks_running = backend.idle().is_err(); + let self_updating = maybe_release.as_ref().is_some_and(|release| backend.can_replace() && backend.installation().is_some_and(|(install, platform)| release_fits_copy(release, &install, platform))); + let info = update_info(maybe_release.as_ref(), self_updating, tasks_running); + *self.maybe_release.lock().map_err(|_| "The update state is unavailable. Restart ArtCraft and try again.")? = maybe_release; + Ok(info) + } + + pub(crate) fn install(&self, app: &AppHandle) -> Result<(), String> { + self.install_with(&NativeBackend(app)) + } + + fn install_with(&self, backend: &impl Backend) -> Result<(), String> { + self.installing.store(true, Ordering::Release); + let _installing = Installing(&self.installing); + backend.idle()?; + backend.stable_choice()?; + let release = self.maybe_release.lock().map_err(|_| "The update state is unavailable. Restart ArtCraft and try again.")?.clone().ok_or("Check for updates before installing one.")?; + let (install, platform) = backend.installation().ok_or("This installation cannot update itself. Open Releases or use its package manager.")?; + if !backend.can_replace() || !release_fits_copy(&release, &install, platform) { + return Err("Use Releases or your package manager to update this installation.".into()); + } + // Recheck tasks and launcher choices immediately before replacing any application files. + let before_replace = || backend.idle().and_then(|()| backend.stable_choice()); + let restart = backend.prepare(&install, &release, platform, &before_replace)?; + *self.maybe_restart.lock().map_err(|_| "The restart state is unavailable. Restart ArtCraft manually.")? = Some(restart); + // The helper starts in RunEvent::Exit, after Tauri accepts the normal exit request. + backend.request_exit(); + Ok(()) + } + + /// Keep the native process and window alive until replacement finishes. A prepared helper + /// may request the normal exit itself, so its restart must not be cancelled here. + pub fn prevents_exit(&self) -> bool { + self.installing.load(Ordering::Acquire) && self.maybe_restart.lock().map_or(true, |pending| pending.is_none()) + } + + pub fn finish(&self) { + match self.maybe_restart.lock() { + Ok(mut pending) => { + if let Some(restart) = pending.take() { + if let Err(error) = restart() { + log::error!("Could not start the update helper: {error}"); + } + } + }, + Err(_) => log::error!("Could not read the prepared update helper"), + } + } +} + +impl Drop for Installing<'_> { + fn drop(&mut self) { + self.0.store(false, Ordering::Release); + } +} + +impl Drop for Operation { + fn drop(&mut self) { + self.updates.busy.store(false, Ordering::Release); + } +} + +pub fn finish_helper() -> Option> { + self_update::finish(&APP, &std::env::args_os().skip(1).collect::>()) +} + +pub fn show_previous_outcome(app: &AppHandle) { + let Ok(paths) = Paths::for_app(&APP) else { + return; + }; + if let Some(message) = outcome_message(self_update::take_outcome(&paths, ARTCRAFT_VERSION)) { + app.dialog().message(message).title("ArtCraft update").show(|_| {}); + } +} + +fn outcome_message(outcome: Option) -> Option { + match outcome? { + self_update::Outcome::Installed(version) => Some(format!("ArtCraft was updated to {version}.")), + self_update::Outcome::Failed(error) => Some(format!("The ArtCraft update failed: {error}")), + } +} + +pub(crate) fn require_confirmation(confirmed: bool) -> Result<(), String> { + if confirmed { + Ok(()) + } else { + Err("Confirm that you saved your work before installing the update.".into()) + } +} + +fn stable_choice(pins: &Pins) -> Result<(), String> { + match pins.choice(APP.id) { + Choice::Stable => Ok(()), + _ => Err("ArtCraft Launcher manages this app's version. Change its version there.".into()), + } +} + +fn ensure_idle(app: &AppHandle) -> Result<(), String> { + let db = app.try_state::().ok_or("ArtCraft is still starting. Try checking again in a moment.")?; + let tasks = tauri::async_runtime::block_on(list_tasks_for_frontend(db.get_connection())).map_err(|error| format!("Could not check running tasks: {error}"))?; + no_active_tasks(tasks.tasks.iter().map(|task| task.status)) +} + +fn no_active_tasks(statuses: impl IntoIterator) -> Result<(), String> { + if statuses.into_iter().any(active_task) { + Err("Finish or cancel running tasks before installing an update.".into()) + } else { + Ok(()) + } +} + +fn active_task(status: TaskStatus) -> bool { + matches!(status, TaskStatus::Pending | TaskStatus::Started | TaskStatus::AttemptFailed) +} + +impl Backend for NativeBackend<'_> { + fn stable_choice(&self) -> Result<(), String> { + stable_choice(&Pins::load_default()) + } + + fn check(&self) -> Result, String> { + let http = Http::new(&format!("ArtCraft/{ARTCRAFT_VERSION}"))?; + craft_update::check_for_update(&APP, &http, ARTCRAFT_VERSION) + } + + fn idle(&self) -> Result<(), String> { + ensure_idle(self.0) + } + + fn installation(&self) -> Option<(Install, Platform)> { + self_update::current(&APP).zip(Platform::current()) + } + + fn can_replace(&self) -> bool { + self_update::is_self_updating(&APP) + } + + fn prepare(&self, install: &Install, release: &Release, platform: Platform, before_replace: &dyn Fn() -> Result<(), String>) -> Result { + let http = Http::new(&format!("ArtCraft/{ARTCRAFT_VERSION}"))?; + let paths = Paths::for_app(&APP)?; + let restart = self_update::prepare_update(&APP, install, release, platform, &http, &paths, &Stop::default(), &mut |_| {}, before_replace, Some(ARTCRAFT_VERSION))?; + Ok(Box::new(move || restart.start())) + } + + fn request_exit(&self) { + self.0.exit(0); + } +} + +fn release_fits_copy(release: &Release, install: &Install, platform: Platform) -> bool { + let kind = match install { + Install::MacApp(_) => PackageKind::Dmg, + Install::Msi(_) => PackageKind::Msi, + Install::Portable(_) => PackageKind::PortableZip, + Install::AppImage(_) => PackageKind::AppImage, + Install::Package(kind, _) => *kind, + Install::Flatpak => PackageKind::Flatpak, + // ArtCraft also ships NSIS. It must not be unpacked over as a loose portable copy; + // its registered installer remains its update path until the shared helper supports it. + Install::Standalone(_) if platform.os == Os::Windows => return false, + Install::Standalone(_) => PackageKind::TarGz, + }; + pick_asset(release, &[APP.id], platform, &[kind]).is_some() +} + +fn update_info(maybe_release: Option<&Release>, self_updating: bool, tasks_running: bool) -> UpdateInfo { + UpdateInfo { current_version: ARTCRAFT_VERSION.into(), maybe_available_version: maybe_release.map(Release::version_label), can_install: !tasks_running && self_updating && maybe_release.is_some(), tasks_running, releases_url: APP.releases_url() } +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn package_identity_and_display_version_match_the_release_configuration() { + let config: serde_json::Value = serde_json::from_str(include_str!("../tauri.conf.json")).expect("release configuration"); + assert_eq!(config["version"].as_str(), Some(ARTCRAFT_VERSION)); + assert_eq!(config["identifier"].as_str(), Some(APP.bundle_id().as_str())); + let mac: serde_json::Value = serde_json::from_str(include_str!("../tauri-mac.conf.json")).expect("macOS release configuration"); + assert_eq!(mac["version"].as_str(), Some(ARTCRAFT_VERSION), "the macOS build must report the same version"); + } + + #[test] + fn tauri_installers_and_flatpaks_are_offered_only_for_the_matching_copy() { + use craft_update::{Arch, Asset}; + let release = Release { assets: ["ArtCraft_0.42.1_x64_en-US.msi", "ArtCraft_0.42.1_universal.dmg", "artcraft-0.42.1-linux-x86_64.flatpak"].into_iter().map(|name| Asset { name: name.into(), ..Asset::default() }).collect(), ..Release::default() }; + assert!(release_fits_copy(&release, &Install::Msi("unused.exe".into()), Platform { os: Os::Windows, arch: Arch::X64 })); + assert!(release_fits_copy(&release, &Install::MacApp("unused.app".into()), Platform { os: Os::MacOs, arch: Arch::Arm64 })); + assert!(release_fits_copy(&release, &Install::Flatpak, Platform { os: Os::Linux, arch: Arch::X64 })); + assert!(!release_fits_copy(&release, &Install::Flatpak, Platform { os: Os::Linux, arch: Arch::Arm64 })); + assert!(!release_fits_copy(&release, &Install::Standalone("unused.exe".into()), Platform { os: Os::Windows, arch: Arch::X64 })); + } + + #[test] + fn checks_allow_closing_but_an_unfinished_install_keeps_the_window_alive() { + let state = Arc::new(Updates::default()); + let _check = state.begin().expect("checking"); + assert!(!state.prevents_exit()); + state.installing.store(true, Ordering::Release); + let installing = Installing(&state.installing); + assert!(state.prevents_exit()); + drop(installing); + assert!(!state.prevents_exit()); + } + + #[test] + fn running_and_retrying_tasks_block_an_update_but_completed_tasks_do_not() { + for status in [TaskStatus::Pending, TaskStatus::Started, TaskStatus::AttemptFailed] { + assert!(active_task(status)); + } + for status in [TaskStatus::CompleteSuccess, TaskStatus::CompleteFailure, TaskStatus::Dead, TaskStatus::CancelledByUser, TaskStatus::CancelledByProvider, TaskStatus::CancelledByUs] { + assert!(!active_task(status)); + } + assert!(no_active_tasks([TaskStatus::CompleteSuccess, TaskStatus::Dead]).is_ok()); + assert!(no_active_tasks([]).is_ok()); + assert_eq!(no_active_tasks([TaskStatus::CompleteSuccess, TaskStatus::Started]), Err("Finish or cancel running tasks before installing an update.".into())); + } + + #[test] + fn only_the_stable_track_lets_artcraft_update_itself() { + use craft_update::pins::VersionTrack; + let mut pins = Pins::default(); + assert!(stable_choice(&pins).is_ok()); + pins.set(APP.id, &VersionTrack::Pinned("0.41.0".into())); + assert!(stable_choice(&pins).unwrap_err().contains("ArtCraft Launcher manages this app's version")); + pins.set(APP.id, &VersionTrack::Nightly); + assert!(stable_choice(&pins).is_err()); + pins.set(APP.id, &VersionTrack::Stable); + assert!(stable_choice(&pins).is_ok()); + } + + #[test] + fn a_previous_update_outcome_is_reported_once_with_its_version_or_error() { + let installed = craft_update::parse_version("0.42.1").expect("version"); + assert_eq!(outcome_message(Some(self_update::Outcome::Installed(installed))).as_deref(), Some("ArtCraft was updated to 0.42.1.")); + assert_eq!(outcome_message(Some(self_update::Outcome::Failed("disk full".into()))).as_deref(), Some("The ArtCraft update failed: disk full")); + assert_eq!(outcome_message(None), None); + } + + #[test] + fn installing_requires_confirmation_and_an_ordinary_start_is_not_the_helper() { + assert!(require_confirmation(false).unwrap_err().contains("saved your work")); + assert!(require_confirmation(true).is_ok()); + // The test harness's own arguments never carry the helper flag. + assert!(finish_helper().is_none()); + } + + #[test] + fn commands_run_one_operation_at_a_time_and_release_it_after_failures() { + let state = Arc::new(Updates::default()); + let value = tauri::async_runtime::block_on(state.run("stopped", |_| Ok(7))); + assert_eq!(value, Ok(7)); + let failed: Result<(), String> = tauri::async_runtime::block_on(state.run("stopped", |_| Err("offline".into()))); + assert_eq!(failed, Err("offline".into())); + let held = state.begin().expect("guard released after a failure"); + let busy = tauri::async_runtime::block_on(state.run("stopped", |_| Ok(()))); + assert!(busy.unwrap_err().contains("already running")); + drop(held); + let panicked: Result<(), String> = tauri::async_runtime::block_on(state.run("The update check stopped unexpectedly", |_| panic!("worker crashed"))); + assert!(panicked.unwrap_err().starts_with("The update check stopped unexpectedly:")); + assert!(state.begin().is_ok(), "a crashed worker still releases the guard"); + } + + #[test] + fn only_a_replaceable_idle_copy_can_offer_installation() { + let release = Release { tag: "artcraft-v99.0.0".into(), ..Release::default() }; + assert!(!update_info(Some(&release), false, false).can_install); + assert!(!update_info(Some(&release), true, true).can_install); + assert!(!update_info(None, true, false).can_install); + assert_eq!(update_info(Some(&release), false, false).maybe_available_version.as_deref(), Some("artcraft-v99.0.0")); + assert_eq!(APP.bundle_id(), "ai.artcraft.app"); + } + + #[test] + fn operations_are_serialized_and_errors_release_the_guard() { + let state = Arc::new(Updates::default()); + let first = state.begin().expect("first check"); + assert!(state.begin().is_err()); + drop(first); + assert!(state.begin().is_ok()); + assert!(state.maybe_release.lock().expect("state").is_none()); + } + + #[test] + fn a_manual_check_offers_a_matching_idle_install_and_defers_its_helper_until_exit() { + let state = Updates::default(); + let backend = FakeBackend::default(); + let info = state.check_with(&backend).expect("checked"); + assert!(info.can_install); + state.install_with(&backend).expect("prepared"); + assert!(backend.exit_requested.load(Ordering::Acquire)); + assert!(!backend.helper_started.load(Ordering::Acquire)); + assert!(!state.prevents_exit(), "the prepared update may exit normally"); + state.finish(); + assert!(backend.helper_started.load(Ordering::Acquire)); + state.finish(); + assert_eq!(backend.helper_runs.load(Ordering::Acquire), 1, "exit events cannot run a helper twice"); + } + + #[test] + fn a_pin_stops_network_checks_and_replacement() { + let state = Updates::default(); + let backend = FakeBackend::default(); + backend.pinned.store(true, Ordering::Release); + assert!(state.check_with(&backend).unwrap_err().contains("pinned")); + assert!(!backend.checked.load(Ordering::Acquire)); + assert!(state.install_with(&backend).unwrap_err().contains("pinned")); + assert!(!state.prevents_exit()); + assert!(!backend.exit_requested.load(Ordering::Acquire)); + } + + #[test] + fn running_tasks_allow_a_check_but_block_the_install() { + let state = Updates::default(); + let backend = FakeBackend::default(); + backend.busy.store(true, Ordering::Release); + let info = state.check_with(&backend).expect("checking while busy"); + assert!(info.tasks_running); + assert!(!info.can_install); + assert!(state.install_with(&backend).unwrap_err().contains("busy")); + assert!(!state.prevents_exit()); + assert!(!backend.exit_requested.load(Ordering::Acquire)); + } + + #[test] + fn a_pin_or_task_started_during_download_stops_replacement_and_exit() { + for pin in [false, true] { + let state = Updates::default(); + let backend = FakeBackend::default(); + state.check_with(&backend).expect("checked"); + backend.pin_during_download.store(pin, Ordering::Release); + backend.task_during_download.store(!pin, Ordering::Release); + assert!(state.install_with(&backend).is_err()); + assert!(!state.prevents_exit(), "failed installation releases the close guard"); + assert!(!backend.exit_requested.load(Ordering::Acquire)); + assert!(state.maybe_restart.lock().expect("restart state").is_none()); + } + } + + #[test] + fn an_install_requires_a_previous_check_and_a_replaceable_matching_copy() { + let state = Updates::default(); + let backend = FakeBackend::default(); + assert!(state.install_with(&backend).unwrap_err().contains("Check for updates")); + state.check_with(&backend).expect("checked"); + backend.managed.store(true, Ordering::Release); + assert!(!state.check_with(&backend).expect("managed check").can_install); + assert!(state.install_with(&backend).unwrap_err().contains("package manager")); + backend.managed.store(false, Ordering::Release); + backend.missing_install.store(true, Ordering::Release); + assert!(!state.check_with(&backend).expect("unknown install").can_install); + assert!(state.install_with(&backend).unwrap_err().contains("cannot update")); + backend.missing_install.store(false, Ordering::Release); + backend.wrong_arch.store(true, Ordering::Release); + assert!(!state.check_with(&backend).expect("no matching asset").can_install); + assert!(state.install_with(&backend).unwrap_err().contains("package manager")); + assert!(!backend.exit_requested.load(Ordering::Acquire)); + } + + #[test] + fn no_new_release_clears_a_previous_offer_and_a_failed_check_is_reported() { + let state = Updates::default(); + let backend = FakeBackend::default(); + state.check_with(&backend).expect("first check"); + backend.no_release.store(true, Ordering::Release); + assert!(!state.check_with(&backend).expect("current version").can_install); + assert!(state.maybe_release.lock().expect("release").is_none()); + backend.network_error.store(true, Ordering::Release); + assert!(state.check_with(&backend).unwrap_err().contains("offline")); + } + + #[test] + fn a_failed_download_never_requests_exit_or_keeps_the_close_guard() { + let state = Updates::default(); + let backend = FakeBackend::default(); + state.check_with(&backend).expect("check"); + backend.download_error.store(true, Ordering::Release); + assert!(state.install_with(&backend).unwrap_err().contains("download")); + assert!(!state.prevents_exit()); + assert!(!backend.exit_requested.load(Ordering::Acquire)); + } + + #[test] + fn poisoned_state_returns_an_error_and_refuses_an_unsafe_exit() { + let state = Arc::new(Updates::default()); + let other = Arc::clone(&state); + let _ = std::thread::spawn(move || { + let _guard = other.maybe_release.lock().unwrap(); + panic!("simulate a previous worker failure"); + }) + .join(); + let backend = FakeBackend::default(); + assert!(state.check_with(&backend).is_err()); + assert!(state.install_with(&backend).is_err()); + let other = Arc::clone(&state); + let _ = std::thread::spawn(move || { + let _guard = other.maybe_restart.lock().unwrap(); + panic!("simulate a previous helper-state failure"); + }) + .join(); + state.installing.store(true, Ordering::Release); + assert!(state.prevents_exit()); + state.finish(); + } + + #[test] + fn every_supported_install_kind_requires_its_own_asset() { + use craft_update::{Arch, Asset}; + let linux = Platform { os: Os::Linux, arch: Arch::X64 }; + let windows = Platform { os: Os::Windows, arch: Arch::X64 }; + let release = Release { assets: ["artcraft-99.0.0-linux-x86_64.AppImage", "artcraft-99.0.0-linux-x86_64.tar.gz", "artcraft-99.0.0-linux-x86_64.deb", "artcraft-99.0.0-windows-x64-portable.zip"].into_iter().map(|name| Asset { name: name.into(), ..Asset::default() }).collect(), ..Release::default() }; + for install in [Install::AppImage("unused".into()), Install::Standalone("unused".into()), Install::Package(PackageKind::Deb, "unused".into())] { + assert!(release_fits_copy(&release, &install, linux)); + } + assert!(release_fits_copy(&release, &Install::Portable("unused".into()), windows)); + assert!(!release_fits_copy(&release, &Install::Package(PackageKind::Rpm, "unused".into()), linux)); + } + + #[derive(Default)] + struct FakeBackend { + pinned: AtomicBool, + busy: AtomicBool, + managed: AtomicBool, + missing_install: AtomicBool, + wrong_arch: AtomicBool, + no_release: AtomicBool, + network_error: AtomicBool, + download_error: AtomicBool, + pin_during_download: AtomicBool, + task_during_download: AtomicBool, + checked: AtomicBool, + exit_requested: AtomicBool, + helper_started: Arc, + helper_runs: Arc, + } + + impl Backend for FakeBackend { + fn stable_choice(&self) -> Result<(), String> { + if self.pinned.load(Ordering::Acquire) { + Err("pinned".into()) + } else { + Ok(()) + } + } + fn check(&self) -> Result, String> { + self.checked.store(true, Ordering::Release); + if self.network_error.load(Ordering::Acquire) { + return Err("offline".into()); + } + Ok((!self.no_release.load(Ordering::Acquire)).then(|| Release { tag: "artcraft-v99.0.0".into(), assets: vec![craft_update::Asset { name: "artcraft-99.0.0-linux-x86_64.flatpak".into(), ..Default::default() }], ..Default::default() })) + } + fn idle(&self) -> Result<(), String> { + if self.busy.load(Ordering::Acquire) { + Err("busy".into()) + } else { + Ok(()) + } + } + fn installation(&self) -> Option<(Install, Platform)> { + (!self.missing_install.load(Ordering::Acquire)).then(|| (Install::Flatpak, Platform { os: Os::Linux, arch: if self.wrong_arch.load(Ordering::Acquire) { craft_update::Arch::Arm64 } else { craft_update::Arch::X64 } })) + } + fn can_replace(&self) -> bool { + !self.managed.load(Ordering::Acquire) + } + fn prepare(&self, _: &Install, _: &Release, _: Platform, before_replace: &dyn Fn() -> Result<(), String>) -> Result { + if self.download_error.load(Ordering::Acquire) { + return Err("download failed".into()); + } + if self.pin_during_download.load(Ordering::Acquire) { + self.pinned.store(true, Ordering::Release); + } + if self.task_during_download.load(Ordering::Acquire) { + self.busy.store(true, Ordering::Release); + } + before_replace()?; + let started = Arc::clone(&self.helper_started); + let runs = Arc::clone(&self.helper_runs); + Ok(Box::new(move || { + started.store(true, Ordering::Release); + runs.fetch_add(1, Ordering::AcqRel); + Ok(()) + })) + } + fn request_exit(&self) { + self.exit_requested.store(true, Ordering::Release); + } + } +} diff --git a/crates/desktop/artcraft/src/version.rs b/crates/desktop/artcraft/src/version.rs index 450039ddef..b959a2445c 100644 --- a/crates/desktop/artcraft/src/version.rs +++ b/crates/desktop/artcraft/src/version.rs @@ -1,4 +1,4 @@ /// The version of the ArtCraft desktop app reported in the UI and via Analytics. /// This should match the CI builds. -pub const ARTCRAFT_VERSION: &str = "0.41.1"; +pub const ARTCRAFT_VERSION: &str = "0.42.1"; diff --git a/crates/desktop/artcraft/tauri-mac.conf.json b/crates/desktop/artcraft/tauri-mac.conf.json index 24f5e70708..511b175abc 100644 --- a/crates/desktop/artcraft/tauri-mac.conf.json +++ b/crates/desktop/artcraft/tauri-mac.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2.0.0-rc", "productName": "ArtCraft", - "version": "0.41.1", + "version": "0.42.1", "identifier": "ai.artcraft.app", "build": { "frontendDist": "../../../frontend/apps/artcraft/dist", diff --git a/crates/desktop/artcraft/tauri.conf.json b/crates/desktop/artcraft/tauri.conf.json index 43c6172c6b..8c45b83f0e 100644 --- a/crates/desktop/artcraft/tauri.conf.json +++ b/crates/desktop/artcraft/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2.0.0-rc", "productName": "ArtCraft", - "version": "0.41.1", + "version": "0.42.1", "identifier": "ai.artcraft.app", "build": { "frontendDist": "../../../frontend/apps/artcraft/dist", diff --git a/crates/lib/url_utils/src/download_extension/download_extension.rs b/crates/lib/url_utils/src/download_extension/download_extension.rs index 4193b07467..93ad91347e 100644 --- a/crates/lib/url_utils/src/download_extension/download_extension.rs +++ b/crates/lib/url_utils/src/download_extension/download_extension.rs @@ -1,4 +1,3 @@ - /// When downloading a remote file, it makes sense to try to match the same file extension (with reasonable safeguards). #[deprecated(note = "Use `Extension` in `url_utils::extension::extension` instead")] #[derive(Debug, Copy, Clone, Eq, PartialEq)] diff --git a/crates/lib/url_utils/src/download_extension/extract_download_extension_from_url.rs b/crates/lib/url_utils/src/download_extension/extract_download_extension_from_url.rs index 1d0c1b6465..5fd0984539 100644 --- a/crates/lib/url_utils/src/download_extension/extract_download_extension_from_url.rs +++ b/crates/lib/url_utils/src/download_extension/extract_download_extension_from_url.rs @@ -12,9 +12,7 @@ pub fn extract_download_extension_from_url_str(url: &str) -> Option Option { let path = url.path(); - let extension = std::path::Path::new(path) - .extension() - .and_then(|ext| ext.to_str())?; + let extension = std::path::Path::new(path).extension().and_then(|ext| ext.to_str())?; DownloadExtension::try_from_str(extension) } @@ -26,14 +24,14 @@ mod tests { #[test] fn success_case() { let url = "https://storyteller.ai/example.jpg"; - let maybe_extension= extract_download_extension_from_url_str(url); + let maybe_extension = extract_download_extension_from_url_str(url); assert_eq!(maybe_extension, Some(DownloadExtension::Jpg)); } #[test] fn difficult_url() { let url = "https://videos.youtube.com/foo/bar/files/00000000-f19a-1275-a092-caa60b38f8d2%2Fraw?se=2025-11-21T22%3A26%3A53Z&sp=r&sv=2024-08-09&sr=b&skoid=8cfff87a-01fc-27c1-9091-32999dcd1389&sktid=aa8ccaf6-e6da-484e-ab11-9c7496c21c53&skt=2025-11-17T21%3A09%3A08Z&ske=2025-10-23T21%3A14%3A08Z&sks=b&skv=2024-08-04&sig=T2U6%2Brw9WJdJagBkCL4/GlFr72KhZGP3QPlobIO7JlU%3D&ac=oaisdsorprnorthcentralus"; - let maybe_extension= extract_download_extension_from_url_str(url); + let maybe_extension = extract_download_extension_from_url_str(url); assert!(maybe_extension.is_none()); } } diff --git a/crates/lib/url_utils/src/download_extension/mod.rs b/crates/lib/url_utils/src/download_extension/mod.rs index 3706f2dddb..576d032ace 100644 --- a/crates/lib/url_utils/src/download_extension/mod.rs +++ b/crates/lib/url_utils/src/download_extension/mod.rs @@ -1,3 +1,4 @@ +#[expect(clippy::module_inception, reason = "Preserve the existing public module path")] mod download_extension; pub mod extract_download_extension_from_url; diff --git a/crates/lib/url_utils/src/extension/extension.rs b/crates/lib/url_utils/src/extension/extension.rs index a92df6d43c..cee9a92ec6 100644 --- a/crates/lib/url_utils/src/extension/extension.rs +++ b/crates/lib/url_utils/src/extension/extension.rs @@ -1,5 +1,6 @@ use std::borrow::Cow; use std::fmt; +use std::hash::{Hash, Hasher}; /// A file extension that can be either a compile-time constant or a runtime-parsed value. /// @@ -16,7 +17,7 @@ use std::fmt; /// assert_eq!(ext.without_period(), "mp4"); /// assert_eq!(ext.with_period(), ".mp4"); /// ``` -#[derive(Clone, Eq, Hash)] +#[derive(Clone, Eq)] pub struct Extension { /// The extension without the leading period, e.g. "png", "mp4". value: Cow<'static, str>, @@ -34,20 +35,14 @@ impl Extension { /// const MP4: Extension = Extension::from_static("mp4", ".mp4"); /// ``` pub const fn from_static(ext: &'static str, dotted: &'static str) -> Self { - Self { - value: Cow::Borrowed(ext), - dotted: Cow::Borrowed(dotted), - } + Self { value: Cow::Borrowed(ext), dotted: Cow::Borrowed(dotted) } } /// Creates an `Extension` from a `&str` at runtime. /// The input must NOT include a leading period. pub fn new(ext: &str) -> Self { - let dotted = format!(".{}", ext); - Self { - value: Cow::Owned(ext.to_string()), - dotted: Cow::Owned(dotted), - } + let dotted = format!(".{ext}"); + Self { value: Cow::Owned(ext.to_string()), dotted: Cow::Owned(dotted) } } /// Returns the extension without the leading period, e.g. `"png"`. @@ -67,6 +62,12 @@ impl PartialEq for Extension { } } +impl Hash for Extension { + fn hash(&self, state: &mut H) { + self.value.hash(state); + } +} + impl fmt::Debug for Extension { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "Extension(\"{}\")", self.value) @@ -135,12 +136,28 @@ mod tests { #[test] fn display() { - assert_eq!(format!("{}", PNG), "png"); + assert_eq!(format!("{PNG}"), "png"); assert_eq!(format!("{}", Extension::new("xyz")), "xyz"); } #[test] fn debug() { - assert_eq!(format!("{:?}", PNG), "Extension(\"png\")"); + assert_eq!(format!("{PNG:?}"), "Extension(\"png\")"); + } + + #[test] + fn hash_matches_equality() { + let plain = Extension::from_static("png", ".png"); + let inconsistent = Extension::from_static("png", ".not-a-suffix"); + assert_eq!(plain, inconsistent); + assert_eq!(hash(&plain), hash(&inconsistent)); + } + + fn hash(extension: &Extension) -> u64 { + use std::collections::hash_map::DefaultHasher; + + let mut hasher = DefaultHasher::new(); + extension.hash(&mut hasher); + hasher.finish() } } diff --git a/crates/lib/url_utils/src/extension/extract_extension_from_url.rs b/crates/lib/url_utils/src/extension/extract_extension_from_url.rs index 928aa583fe..2fb3310ead 100644 --- a/crates/lib/url_utils/src/extension/extract_extension_from_url.rs +++ b/crates/lib/url_utils/src/extension/extract_extension_from_url.rs @@ -6,24 +6,13 @@ use url::Url; // TODO: Lookups against these as lists will be slow /// Known image extensions. -const KNOWN_IMAGE_EXTENSIONS: &[Extension] = &[ - Extension::from_static("png", ".png"), - Extension::from_static("jpg", ".jpg"), - Extension::from_static("jpeg", ".jpeg"), - Extension::from_static("webp", ".webp"), -]; +const KNOWN_IMAGE_EXTENSIONS: &[Extension] = &[Extension::from_static("png", ".png"), Extension::from_static("jpg", ".jpg"), Extension::from_static("jpeg", ".jpeg"), Extension::from_static("webp", ".webp")]; /// Known audio extensions. -const KNOWN_AUDIO_EXTENSIONS: &[Extension] = &[ - Extension::from_static("wav", ".wav"), - Extension::from_static("mp3", ".mp3"), -]; +const KNOWN_AUDIO_EXTENSIONS: &[Extension] = &[Extension::from_static("wav", ".wav"), Extension::from_static("mp3", ".mp3")]; /// Known video extensions. -const KNOWN_VIDEO_EXTENSIONS: &[Extension] = &[ - Extension::from_static("mp4", ".mp4"), - Extension::from_static("webm", ".webm"), -]; +const KNOWN_VIDEO_EXTENSIONS: &[Extension] = &[Extension::from_static("mp4", ".mp4"), Extension::from_static("webm", ".webm")]; /// Controls which extensions are accepted when extracting from a URL. pub enum ExtractExtensions { @@ -62,9 +51,7 @@ pub fn extract_extension_from_url_str(url: &str, accept: &ExtractExtensions) -> /// Extracts a file extension from a parsed `Url`, filtered by `accept`. pub fn extract_extension_from_url(url: &Url, accept: &ExtractExtensions) -> Option { let path = url.path(); - let raw_ext = std::path::Path::new(path) - .extension() - .and_then(|ext| ext.to_str())?; + let raw_ext = std::path::Path::new(path).extension().and_then(|ext| ext.to_str())?; let lower = raw_ext.to_lowercase(); let candidate = Extension::new(&lower); @@ -72,27 +59,40 @@ pub fn extract_extension_from_url(url: &Url, accept: &ExtractExtensions) -> Opti match accept { ExtractExtensions::All => Some(candidate), ExtractExtensions::Set(set) => { - if set.contains(&candidate) { Some(candidate) } else { None } - } - ExtractExtensions::KnownImage => { - if slice_contains(KNOWN_IMAGE_EXTENSIONS, &candidate) { Some(candidate) } else { None } - } - ExtractExtensions::KnownAudio => { - if slice_contains(KNOWN_AUDIO_EXTENSIONS, &candidate) { Some(candidate) } else { None } - } - ExtractExtensions::KnownVideo => { - if slice_contains(KNOWN_VIDEO_EXTENSIONS, &candidate) { Some(candidate) } else { None } - } - ExtractExtensions::KnownMedia => { - if slice_contains(KNOWN_IMAGE_EXTENSIONS, &candidate) - || slice_contains(KNOWN_AUDIO_EXTENSIONS, &candidate) - || slice_contains(KNOWN_VIDEO_EXTENSIONS, &candidate) - { + if set.contains(&candidate) { Some(candidate) } else { None } - } + }, + ExtractExtensions::KnownImage => { + if slice_contains(KNOWN_IMAGE_EXTENSIONS, &candidate) { + Some(candidate) + } else { + None + } + }, + ExtractExtensions::KnownAudio => { + if slice_contains(KNOWN_AUDIO_EXTENSIONS, &candidate) { + Some(candidate) + } else { + None + } + }, + ExtractExtensions::KnownVideo => { + if slice_contains(KNOWN_VIDEO_EXTENSIONS, &candidate) { + Some(candidate) + } else { + None + } + }, + ExtractExtensions::KnownMedia => { + if slice_contains(KNOWN_IMAGE_EXTENSIONS, &candidate) || slice_contains(KNOWN_AUDIO_EXTENSIONS, &candidate) || slice_contains(KNOWN_VIDEO_EXTENSIONS, &candidate) { + Some(candidate) + } else { + None + } + }, } } @@ -190,19 +190,14 @@ mod tests { #[test] fn set_matches_custom_list() { - let accept = ExtractExtensions::from_vec(vec![ - Extension::from_static("csv", ".csv"), - Extension::from_static("tsv", ".tsv"), - ]); + let accept = ExtractExtensions::from_vec(vec![Extension::from_static("csv", ".csv"), Extension::from_static("tsv", ".tsv")]); let ext = extract_extension_from_url_str("https://example.com/data.csv", &accept); assert_eq!(ext.unwrap().without_period(), "csv"); } #[test] fn set_rejects_non_member() { - let accept = ExtractExtensions::from_vec(vec![ - Extension::from_static("csv", ".csv"), - ]); + let accept = ExtractExtensions::from_vec(vec![Extension::from_static("csv", ".csv")]); let ext = extract_extension_from_url_str("https://example.com/data.png", &accept); assert!(ext.is_none()); } @@ -215,10 +210,7 @@ mod tests { #[test] fn query_params_ignored() { - let ext = extract_extension_from_url_str( - "https://example.com/file.mp4?token=abc&format=hd", - &ExtractExtensions::KnownVideo, - ); + let ext = extract_extension_from_url_str("https://example.com/file.mp4?token=abc&format=hd", &ExtractExtensions::KnownVideo); assert_eq!(ext.unwrap().without_period(), "mp4"); } @@ -230,8 +222,7 @@ mod tests { } fn extract_extension_all(url: &str) -> Option { - extract_extension_from_url_str(url, &ExtractExtensions::All) - .map(|ext| ext.without_period().to_string()) + extract_extension_from_url_str(url, &ExtractExtensions::All).map(|ext| ext.without_period().to_string()) } #[test] diff --git a/crates/lib/url_utils/src/extension/mod.rs b/crates/lib/url_utils/src/extension/mod.rs index 824c6d227e..e0cc69f24a 100644 --- a/crates/lib/url_utils/src/extension/mod.rs +++ b/crates/lib/url_utils/src/extension/mod.rs @@ -1,2 +1,3 @@ +#[expect(clippy::module_inception, reason = "Preserve the existing public module path")] pub mod extension; -pub mod extract_extension_from_url; \ No newline at end of file +pub mod extract_extension_from_url; diff --git a/crates/lib/url_utils/src/lib.rs b/crates/lib/url_utils/src/lib.rs index 2f3ba5d097..abb775f0c5 100644 --- a/crates/lib/url_utils/src/lib.rs +++ b/crates/lib/url_utils/src/lib.rs @@ -1,2 +1,3 @@ pub mod extension; -pub mod download_extension; \ No newline at end of file +#[expect(deprecated, reason = "Keep the public compatibility module while downstream users migrate to Extension")] +pub mod download_extension; diff --git a/crates/schema/database/sqlite_tasks/Cargo.toml b/crates/schema/database/sqlite_tasks/Cargo.toml index aa9c83b3ed..5a2f4c3742 100644 --- a/crates/schema/database/sqlite_tasks/Cargo.toml +++ b/crates/schema/database/sqlite_tasks/Cargo.toml @@ -19,6 +19,7 @@ tokens.workspace = true anyhow.workspace = true chrono.workspace = true log.workspace = true +tokio = { workspace = true, features = ["fs"] } # TODO(bt,2025-07-09): Update sqlx ASAP. We're stuck on 0.7 because of the complex use of internal types and macros in the database crate. # We're going to embed in-memory SQLite diff --git a/crates/schema/database/sqlite_tasks/src/connection.rs b/crates/schema/database/sqlite_tasks/src/connection.rs index bd9af2bbb7..124589732e 100644 --- a/crates/schema/database/sqlite_tasks/src/connection.rs +++ b/crates/schema/database/sqlite_tasks/src/connection.rs @@ -22,7 +22,7 @@ impl TaskDbConnection { info!("Deleting and recreating SQLite database at {:?}", database_file.as_ref()); - if let Err(err) = std::fs::remove_file(&database_file) { + if let Err(err) = tokio::fs::remove_file(&database_file).await { error!("Error deleting SQLite database file: {:?}", err); } diff --git a/frontend/api_docs.html b/frontend/api_docs.html index a5c0ebb87b..6631f88bd9 100644 --- a/frontend/api_docs.html +++ b/frontend/api_docs.html @@ -5,14 +5,14 @@ Storyteller API - +
- - + +