diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c571233..805b6ff 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,6 +2,11 @@ name: Build on: workflow_dispatch: inputs: + build_only: + description: 'Build and test artifacts without publishing releases, images, or update feeds' + required: true + default: false + type: boolean gp_branch: description: 'GlobalProtect-openconnect branch to use for the snapshot release' required: true @@ -10,6 +15,11 @@ on: description: 'gpgui branch to use for the snapshot release' required: true default: dev + build_macos: + description: 'Build Apple Silicon artifacts for the snapshot release' + required: true + default: false + type: boolean build_bsd: description: 'Build FreeBSD/OpenBSD packages for the snapshot release' required: true @@ -35,10 +45,32 @@ on: - v*.*.* concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + group: ${{ github.workflow }}-${{ github.event_name == 'workflow_dispatch' && (inputs.build_only && github.run_id || 'release') || github.ref }} + cancel-in-progress: ${{ github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/') }} jobs: + test-gp: + runs-on: ubuntu-latest + steps: + - name: Checkout GlobalProtect-openconnect + uses: actions/checkout@v6 + with: + token: ${{ secrets.GH_PAT }} + repository: yuezk/GlobalProtect-openconnect + ref: ${{ github.event_name == 'workflow_dispatch' && inputs.gp_branch || github.ref }} + submodules: recursive + - name: Run Rust tests in Docker + run: | + docker run --rm \ + --user root \ + -e COREPACK_INTEGRITY_KEYS=0 \ + -e LIBXML2_STATIC=1 \ + -e PKEXEC_UID=1000 \ + -v "$(pwd):/workspace" \ + -w /workspace \ + yuezk/gpdev:binary-builder-tauri2 \ + cargo test --workspace + tarball: runs-on: ubuntu-latest steps: @@ -206,11 +238,13 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v4 - name: Login to Docker Hub + if: ${{ github.event_name != 'workflow_dispatch' || !inputs.build_only }} uses: docker/login-action@v4 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_TOKEN }} - name: Build and push by digest + if: ${{ github.event_name != 'workflow_dispatch' || !inputs.build_only }} id: build uses: docker/build-push-action@v7 with: @@ -218,20 +252,37 @@ jobs: file: packaging/docker/alpine/Dockerfile platforms: ${{ matrix.platform }} outputs: type=image,name=yuezk/globalprotect-openconnect,push-by-digest=true,name-canonical=true,push=true + - name: Build local image for verification + if: ${{ github.event_name == 'workflow_dispatch' && inputs.build_only }} + uses: docker/build-push-action@v7 + with: + context: . + file: packaging/docker/alpine/Dockerfile + platforms: ${{ matrix.platform }} + tags: yuezk/globalprotect-openconnect:build-test + load: true + push: false - name: Verify CLI tools env: IMAGE: yuezk/globalprotect-openconnect DIGEST: ${{ steps.build.outputs.digest }} + BUILD_ONLY: ${{ github.event_name == 'workflow_dispatch' && inputs.build_only }} run: | - docker run --rm "$IMAGE@$DIGEST" --help - docker run --rm --entrypoint gpauth "$IMAGE@$DIGEST" --help - docker run --rm --entrypoint sh "$IMAGE@$DIGEST" -lc 'test "$(id -u gp)" = "1000" && test "$SUDO_UID" = "1000"' + image_ref="$IMAGE@$DIGEST" + if [[ "$BUILD_ONLY" == "true" ]]; then + image_ref="$IMAGE:build-test" + fi + docker run --rm "$image_ref" --help + docker run --rm --entrypoint gpauth "$image_ref" --help + docker run --rm --entrypoint sh "$image_ref" -lc 'test "$(id -u gp)" = "1000" && test "$SUDO_UID" = "1000"' - name: Export digest + if: ${{ github.event_name != 'workflow_dispatch' || !inputs.build_only }} run: | mkdir -p /tmp/digests digest="${{ steps.build.outputs.digest }}" touch "/tmp/digests/${digest#sha256:}" - name: Upload digest + if: ${{ github.event_name != 'workflow_dispatch' || !inputs.build_only }} uses: actions/upload-artifact@v7 with: name: digests-${{ env.PLATFORM_PAIR }} @@ -278,14 +329,22 @@ jobs: repository: yuezk/gpgui ref: ${{ github.event_name == 'workflow_dispatch' && inputs.gpgui_branch || github.ref_name }} path: gpgui-source/gpgui + - name: Verify Linux desktop assets + if: matrix.os.arch == 'amd64' && matrix.libc.name == 'glibc' + run: gpgui-source/gp/scripts/verify-linux-desktop-assets.sh gpgui-source/gpgui - name: Tarball run: | cd gpgui-source tar -czf gpgui.tar.gz gpgui gp - name: Build gpgui in Docker + env: + GPGUI_LICENSE_SIGNING_KEYS: ${{ vars.GPGUI_LICENSE_SIGNING_KEYS }} run: | docker run --rm \ -e COREPACK_INTEGRITY_KEYS=0 \ + -e GPGUI_BUILD_VERSION=${{ github.run_number }}.${{ github.run_attempt }} \ + -e GPGUI_UPDATE_CHANNEL=${{ github.event_name == 'workflow_dispatch' && 'snapshot' || 'stable' }} \ + -e GPGUI_LICENSE_SIGNING_KEYS \ -v $(pwd)/gpgui-source:/workspace yuezk/gpdev:${{ matrix.libc.builder }} - name: Install gpgui in Docker run: | @@ -304,6 +363,209 @@ jobs: gpgui-source/*.bin.tar.xz gpgui-source/*.bin.tar.xz.sha256 + nix-source: + needs: [build-gpgui] + strategy: + fail-fast: false + matrix: + platform: + - runner: ubuntu-latest + system: x86_64-linux + artifact_arch: amd64 + - runner: ubuntu-24.04-arm + system: aarch64-linux + artifact_arch: ubuntu-24.04-arm + runs-on: ${{ matrix.platform.runner }} + name: nix-source (${{ matrix.platform.system }}) + env: + NIX_SYSTEM: ${{ matrix.platform.system }} + NIXPKGS: locked + steps: + - name: Checkout source and dependencies + uses: actions/checkout@v6 + with: + token: ${{ secrets.GH_PAT }} + ref: ${{ github.event_name == 'workflow_dispatch' && inputs.gp_branch || github.ref }} + submodules: recursive + path: gp + - name: Download current GUI artifact + uses: actions/download-artifact@v8 + with: + name: artifact-gpgui-${{ matrix.platform.artifact_arch }} + path: nix-artifacts/gui + - name: Install Nix + uses: cachix/install-nix-action@v31 + - name: Configure current source and GUI inputs + run: | + echo "GP_SOURCE=$PWD/gp" >> "$GITHUB_ENV" + gui_archive=$(find "$PWD/nix-artifacts/gui" -name '*.bin.tar.xz' -type f) + test -f "$gui_archive" + echo "GP_GUI_ARCHIVE=$gui_archive" >> "$GITHUB_ENV" + - name: Build source package + run: | + nix build --impure --file gp/nix/ci.nix source \ + --extra-experimental-features "nix-command flakes" --print-build-logs + bash gp/scripts/tests/nix-desktop-authorization.sh result + - name: Test source runtime in NixOS + if: matrix.platform.system == 'x86_64-linux' + run: | + nix build --impure --file gp/nix/ci.nix runtime-source \ + --extra-experimental-features "nix-command flakes" --print-build-logs + + nix-prebuilt: + needs: [build-gp, build-gpgui] + strategy: + fail-fast: false + matrix: + platform: + - runner: ubuntu-latest + system: x86_64-linux + artifact_arch: amd64 + - runner: ubuntu-24.04-arm + system: aarch64-linux + artifact_arch: ubuntu-24.04-arm + nixpkgs: [locked, nixos-25.11, nixos-26.05, nixpkgs-unstable] + runs-on: ${{ matrix.platform.runner }} + name: nix-prebuilt (${{ matrix.platform.system }}, ${{ matrix.nixpkgs }}) + env: + NIX_SYSTEM: ${{ matrix.platform.system }} + NIXPKGS: ${{ matrix.nixpkgs }} + steps: + - name: Checkout packaging and tests + uses: actions/checkout@v6 + with: + token: ${{ secrets.GH_PAT }} + ref: ${{ github.event_name == 'workflow_dispatch' && inputs.gp_branch || github.ref }} + submodules: recursive + path: gp + - name: Download current Linux binary artifact + uses: actions/download-artifact@v8 + with: + name: artifact-gp-binary-${{ matrix.platform.artifact_arch }} + path: nix-artifacts/binaries + - name: Download current GUI artifact + uses: actions/download-artifact@v8 + with: + name: artifact-gpgui-${{ matrix.platform.artifact_arch }} + path: nix-artifacts/gui + - name: Install Nix + uses: cachix/install-nix-action@v31 + - name: Configure current artifact inputs + run: | + echo "GP_SOURCE=$PWD/gp" >> "$GITHUB_ENV" + binary_archive=$(find "$PWD/nix-artifacts/binaries" -name '*.bin.tar.xz' -type f) + gui_archive=$(find "$PWD/nix-artifacts/gui" -name '*.bin.tar.xz' -type f) + test -f "$binary_archive" + test -f "$gui_archive" + echo "GP_BINARY_ARCHIVE=$binary_archive" >> "$GITHUB_ENV" + echo "GP_GUI_ARCHIVE=$gui_archive" >> "$GITHUB_ENV" + - name: Build package through host NixOS module + run: | + nix build --impure --file gp/nix/ci.nix module \ + --extra-experimental-features "nix-command flakes" --print-build-logs + bash gp/scripts/tests/nix-desktop-authorization.sh result + - name: Build standalone prebuilt package + if: matrix.nixpkgs == 'locked' + run: | + nix build --impure --file gp/nix/ci.nix prebuilt \ + --extra-experimental-features "nix-command flakes" --print-build-logs + - name: Test prebuilt runtime in NixOS + if: matrix.nixpkgs == 'locked' && matrix.platform.system == 'x86_64-linux' + run: | + nix build --impure --file gp/nix/ci.nix runtime-prebuilt \ + --extra-experimental-features "nix-command flakes" --print-build-logs + + trigger-gpgui-macos: + needs: test-gp + if: ${{ startsWith(github.ref, 'refs/tags/') || (github.event_name == 'workflow_dispatch' && inputs.build_macos) }} + permissions: + contents: read + runs-on: ubuntu-latest + name: trigger private macOS release + outputs: + run_id: ${{ steps.dispatch.outputs.run_id }} + run_url: ${{ steps.dispatch.outputs.run_url }} + steps: + - name: Dispatch private macOS release + id: dispatch + env: + GH_TOKEN: ${{ secrets.GPGUI_ACTIONS_TOKEN }} + PUBLIC_GH_TOKEN: ${{ github.token }} + CHANNEL: ${{ github.event_name == 'workflow_dispatch' && 'snapshot' || 'stable' }} + RELEASE_TAG: ${{ github.event_name == 'workflow_dispatch' && 'snapshot' || github.ref_name }} + GP_REF: ${{ github.event_name == 'workflow_dispatch' && inputs.gp_branch || github.ref_name }} + GPGUI_REF: ${{ github.event_name == 'workflow_dispatch' && inputs.gpgui_branch || github.ref_name }} + BUILD_VERSION: ${{ github.run_number }}.${{ github.run_attempt }} + REQUEST_ID: ${{ github.run_id }}.${{ github.run_attempt }}.macos + BUILD_ONLY: ${{ github.event_name == 'workflow_dispatch' && inputs.build_only }} + run: | + set -euo pipefail + + if [[ -z "${GH_TOKEN:-}" ]]; then + echo "GPGUI_ACTIONS_TOKEN is not configured" >&2 + exit 1 + fi + + gp_ref_path="$(jq -rn --arg ref "$GP_REF" '$ref | @uri')" + gpgui_ref_path="$(jq -rn --arg ref "$GPGUI_REF" '$ref | @uri')" + gp_sha="$(GH_TOKEN="$PUBLIC_GH_TOKEN" gh api \ + "repos/yuezk/GlobalProtect-openconnect/commits/$gp_ref_path" --jq .sha)" + gpgui_sha="$(gh api "repos/yuezk/gpgui/commits/$gpgui_ref_path" --jq .sha)" + if [[ -z "$gp_sha" || -z "$gpgui_sha" ]]; then + echo "Could not resolve release source refs" >&2 + exit 1 + fi + + expected_title="macOS $CHANNEL $RELEASE_TAG ($REQUEST_ID)" + jq -n \ + --arg workflow_ref "$GPGUI_REF" \ + --arg request_id "$REQUEST_ID" \ + --arg build_version "$BUILD_VERSION" \ + --arg channel "$CHANNEL" \ + --arg release_tag "$RELEASE_TAG" \ + --arg gp_ref "$gp_sha" \ + --arg gpgui_ref "$gpgui_sha" \ + --argjson build_only "$BUILD_ONLY" \ + '{ + ref: $workflow_ref, + inputs: { + request_id: $request_id, + build_version: $build_version, + channel: $channel, + release_tag: $release_tag, + gp_ref: $gp_ref, + gpgui_ref: $gpgui_ref, + build_only: $build_only + } + }' | gh api --method POST \ + repos/yuezk/gpgui/actions/workflows/release-macos.yaml/dispatches \ + --input - + + run_id="" + run_url="" + for _ in {1..40}; do + runs="$(gh api \ + 'repos/yuezk/gpgui/actions/workflows/release-macos.yaml/runs?event=workflow_dispatch&per_page=50')" + run_id="$(jq -r --arg title "$expected_title" \ + '[.workflow_runs[] | select(.display_title == $title)] | first | .id // empty' \ + <<<"$runs")" + run_url="$(jq -r --arg title "$expected_title" \ + '[.workflow_runs[] | select(.display_title == $title)] | first | .html_url // empty' \ + <<<"$runs")" + if [[ -n "$run_id" ]]; then + { + echo "run_id=$run_id" + echo "run_url=$run_url" + } >> "$GITHUB_OUTPUT" + echo "Triggered private workflow: $run_url" + exit 0 + fi + sleep 3 + done + + echo "Could not locate the dispatched private workflow run" >&2 + exit 1 + setup-bsd-matrix: runs-on: ubuntu-latest outputs: @@ -374,7 +636,7 @@ jobs: path: gpgui-frontend/gpgui - name: Build gpgui frontend run: | - cd gpgui-frontend/gpgui/app + cd gpgui-frontend/gpgui/apps/desktop pnpm install --frozen-lockfile pnpm build - name: Upload gpgui frontend @@ -382,7 +644,7 @@ jobs: with: name: bsd-gpgui-frontend if-no-files-found: error - path: gpgui-frontend/gpgui/app/dist/** + path: gpgui-frontend/gpgui/apps/desktop/dist/** build-bsd: needs: @@ -416,7 +678,7 @@ jobs: uses: actions/download-artifact@v8 with: name: bsd-gpgui-frontend - path: ${{ matrix.workspace }}/gpgui/app/dist + path: ${{ matrix.workspace }}/gpgui/apps/desktop/dist - name: Build on FreeBSD if: ${{ matrix.os == 'freebsd' }} uses: vmactions/freebsd-vm@v1 @@ -447,14 +709,17 @@ jobs: webkit2-gtk_41 run: | set -eu + export GPGUI_BUILD_VERSION=${{ github.run_number }}.${{ github.run_attempt }} + export GPGUI_UPDATE_CHANNEL=${{ github.event_name == 'workflow_dispatch' && 'snapshot' || 'stable' }} + export GPGUI_LICENSE_SIGNING_KEYS='${{ vars.GPGUI_LICENSE_SIGNING_KEYS }}' cd "${{ matrix.workspace }}/gp" cargo build --release --workspace - cd ../gpgui/app/src-tauri + cd ../gpgui/apps/desktop/src-tauri cargo build --release --workspace - cd ../../../gp + cd ../../../../gp gmake "${{ matrix.package_target }}" GPGUI_BINARY=../gpgui/target/release/gpgui pkg install -y ".build/${{ matrix.artifact_dir }}"/artifacts/*.pkg gpclient --version @@ -470,25 +735,27 @@ jobs: arch: ${{ matrix.arch }} usesh: true prepare: | - pkg_add -z \ + set -eu + pkg_add -u -I + pkg_add -I \ git \ rust \ libiconv \ gettext-tools \ - autoconf-2.72 \ - automake-1.17 \ + autoconf%2.72 \ + automake%1.17 \ libtool \ - patch \ gmake \ - pkgconf \ libxml \ gnutls \ p11-kit \ - nettle \ gmp \ + lz4 \ + dbus \ gnome-keyring \ polkit \ - webkitgtk41 + webkitgtk41 \ + xdg-utils ln -sf /usr/local/bin/autoreconf-2.72 /usr/local/bin/autoreconf ln -sf /usr/local/bin/autoconf-2.72 /usr/local/bin/autoconf ln -sf /usr/local/bin/autoheader-2.72 /usr/local/bin/autoheader @@ -499,14 +766,17 @@ jobs: set -eu export AUTOCONF_VERSION=2.72 export AUTOMAKE_VERSION=1.17 + export GPGUI_BUILD_VERSION=${{ github.run_number }}.${{ github.run_attempt }} + export GPGUI_UPDATE_CHANNEL=${{ github.event_name == 'workflow_dispatch' && 'snapshot' || 'stable' }} + export GPGUI_LICENSE_SIGNING_KEYS='${{ vars.GPGUI_LICENSE_SIGNING_KEYS }}' cd "${{ matrix.workspace }}/gp" cargo build --release --workspace - cd ../gpgui/app/src-tauri + cd ../gpgui/apps/desktop/src-tauri cargo build --release --workspace - cd ../../../gp + cd ../../../../gp gmake "${{ matrix.package_target }}" GPGUI_BINARY=../gpgui/target/release/gpgui pkg_add -D unsigned ".build/${{ matrix.artifact_dir }}"/artifacts/*.tgz gpclient --version @@ -523,7 +793,7 @@ jobs: ${{ matrix.workspace }}/gp/.build/${{ matrix.artifact_dir }}/artifacts/* gh-release: - if: ${{ always() && (github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags/')) }} + if: ${{ always() && ((github.event_name == 'workflow_dispatch' && !inputs.build_only) || startsWith(github.ref, 'refs/tags/')) }} runs-on: ubuntu-latest permissions: actions: read @@ -532,6 +802,9 @@ jobs: attestations: write artifact-metadata: write needs: + - test-gp + - nix-source + - nix-prebuilt - tarball - tarball-offline - build-gp @@ -562,7 +835,7 @@ jobs: result = data["result"] if result in {"failure", "cancelled"}: failed.append(f"{name}: {result}") - elif name in {"build-gp", "build-docker-image"} and result == "skipped" and is_tag: + elif name in {"build-gp", "build-docker-image", "nix-prebuilt"} and result == "skipped" and is_tag: continue elif name in {"build-gpgui-frontend", "build-bsd"} and result == "skipped" and not bsd_matrix_enabled: continue @@ -632,10 +905,60 @@ jobs: run: | cd gh-release/gp/scripts && ./gh-release.sh "$RELEASE_TAG" + wait-gpgui-macos: + if: ${{ always() && needs.trigger-gpgui-macos.result != 'skipped' }} + needs: + - gh-release + - trigger-gpgui-macos + runs-on: ubuntu-latest + timeout-minutes: 130 + steps: + - name: Wait for private macOS release + env: + GH_TOKEN: ${{ secrets.GPGUI_ACTIONS_TOKEN }} + PUBLIC_RELEASE_RESULT: ${{ needs.gh-release.result }} + BUILD_ONLY: ${{ github.event_name == 'workflow_dispatch' && inputs.build_only }} + PRIVATE_RUN_ID: ${{ needs.trigger-gpgui-macos.outputs.run_id }} + PRIVATE_RUN_URL: ${{ needs.trigger-gpgui-macos.outputs.run_url }} + run: | + set -euo pipefail + + if [[ -z "$PRIVATE_RUN_ID" ]]; then + echo "The private macOS workflow was not started" >&2 + exit 1 + fi + if [[ "$BUILD_ONLY" != "true" && "$PUBLIC_RELEASE_RESULT" != "success" ]]; then + gh api --method POST \ + "repos/yuezk/gpgui/actions/runs/$PRIVATE_RUN_ID/cancel" >/dev/null || true + echo "The public release failed; cancelled $PRIVATE_RUN_URL" >&2 + exit 1 + fi + + for _ in $(seq 1 480); do + run="$(gh api "repos/yuezk/gpgui/actions/runs/$PRIVATE_RUN_ID")" + status="$(jq -r '.status' <<<"$run")" + conclusion="$(jq -r '.conclusion // ""' <<<"$run")" + if [[ "$status" == "completed" ]]; then + echo "Private macOS workflow completed: $PRIVATE_RUN_URL" + if [[ "$conclusion" != "success" ]]; then + echo "Private macOS workflow concluded with: $conclusion" >&2 + exit 1 + fi + exit 0 + fi + sleep 15 + done + + gh api --method POST \ + "repos/yuezk/gpgui/actions/runs/$PRIVATE_RUN_ID/cancel" >/dev/null || true + echo "Private macOS workflow timed out: $PRIVATE_RUN_URL" >&2 + exit 1 + publish-docker-image: needs: + - test-gp - build-docker-image - if: ${{ github.event_name == 'workflow_dispatch' || startsWith(github.ref, 'refs/tags/') }} + if: ${{ (github.event_name == 'workflow_dispatch' && !inputs.build_only) || startsWith(github.ref, 'refs/tags/') }} runs-on: ubuntu-latest steps: - name: Download digests diff --git a/.github/workflows/publish-copr.yaml b/.github/workflows/publish-copr.yaml new file mode 100644 index 0000000..9736eee --- /dev/null +++ b/.github/workflows/publish-copr.yaml @@ -0,0 +1,80 @@ +name: Publish COPR + +on: + workflow_dispatch: + inputs: + tag: + description: 'Tag to publish' + required: true + revision: + description: 'Package revision' + type: string + required: true + default: "1" + +permissions: + contents: read + +jobs: + publish-copr: + runs-on: ubuntu-latest + container: fedora:latest + steps: + - name: Install tools + run: dnf install -y copr-cli gh + + - name: Check inputs + env: + GH_TOKEN: ${{ github.token }} + TAG: ${{ inputs.tag }} + REVISION: ${{ inputs.revision }} + run: | + if [[ ! "$REVISION" =~ ^[1-9][0-9]*$ ]]; then + echo "Revision must be a positive integer" >&2 + exit 1 + fi + + gh api "repos/${{ github.repository }}/git/ref/tags/$TAG" >/dev/null + + - name: Download published spec + env: + GH_TOKEN: ${{ github.token }} + TAG: ${{ inputs.tag }} + run: | + mkdir -p publish-copr + + gh release download "$TAG" \ + --repo "${{ github.repository }}" \ + --pattern globalprotect-openconnect.spec \ + --dir publish-copr + + - name: Set package revision + env: + REVISION: ${{ inputs.revision }} + run: | + spec=publish-copr/globalprotect-openconnect.spec + + if [[ "$(grep -c '^Release:' "$spec")" -ne 1 ]]; then + echo "Expected exactly one Release field in $spec" >&2 + exit 1 + fi + + sed -Ei \ + "s/^Release:[[:space:]]+.*/Release: ${REVISION}%{?dist}/" \ + "$spec" + + grep '^Release:' "$spec" + + - name: Configure COPR authentication + env: + COPR_CONFIG: ${{ secrets.COPR_CONFIG }} + run: | + install -d -m 700 "$HOME/.config" + printf '%s\n' "$COPR_CONFIG" > "$HOME/.config/copr" + chmod 600 "$HOME/.config/copr" + + - name: Build and publish COPR package + run: | + copr-cli build \ + yuezk/globalprotect-openconnect \ + publish-copr/globalprotect-openconnect.spec diff --git a/.github/workflows/publish-obs.yaml b/.github/workflows/publish-obs.yaml new file mode 100644 index 0000000..f538734 --- /dev/null +++ b/.github/workflows/publish-obs.yaml @@ -0,0 +1,72 @@ +name: Publish OBS + +on: + workflow_dispatch: + inputs: + tag: + description: 'Tag to publish' + required: true + revision: + description: 'Package revision' + type: string + required: true + default: "1" + +permissions: + contents: read + +jobs: + publish-obs: + runs-on: ubuntu-latest + steps: + - name: Check inputs + env: + GH_TOKEN: ${{ github.token }} + TAG: ${{ inputs.tag }} + REVISION: ${{ inputs.revision }} + run: | + if [[ ! "$REVISION" =~ ^[1-9][0-9]*$ ]]; then + echo "Revision must be a positive integer" >&2 + exit 1 + fi + + gh api "repos/${{ github.repository }}/git/ref/tags/$TAG" >/dev/null + + - name: Prepare OBS package + env: + GH_TOKEN: ${{ github.token }} + TAG: ${{ inputs.tag }} + REVISION: ${{ inputs.revision }} + run: | + version="${TAG#v}" + archive="globalprotect-openconnect-${version}.offline.tar.gz" + source_dir="publish-obs/source/globalprotect-openconnect-${version}" + + mkdir -p publish-obs/files publish-obs/source + + gh release download "$TAG" \ + --repo "${{ github.repository }}" \ + --pattern "$archive" \ + --dir publish-obs + + tar -xzf "publish-obs/$archive" -C publish-obs/source + + make -C "$source_dir" init-rpm \ + REVISION="$REVISION" \ + RPM_SOURCE='%{name}.tar.gz' + + mv "publish-obs/$archive" \ + publish-obs/files/globalprotect-openconnect.tar.gz + cp "$source_dir/.build/rpm/globalprotect-openconnect.spec" \ + "$source_dir/.build/rpm/globalprotect-openconnect.changes" \ + publish-obs/files/ + + - name: Publish OBS package + uses: yuezk/publish-obs-package@main + with: + project: home:yuezk + package: globalprotect-openconnect + username: yuezk + password: ${{ secrets.OBS_PASSWORD }} + files: ./publish-obs/files/* + commit_message: 'Release ${{ inputs.tag }}-${{ inputs.revision }}' diff --git a/.github/workflows/publish-ppa.yaml b/.github/workflows/publish-ppa.yaml index 85ffbc6..1f2abbd 100644 --- a/.github/workflows/publish-ppa.yaml +++ b/.github/workflows/publish-ppa.yaml @@ -19,7 +19,7 @@ on: description: 'Rust version to use' type: "string" required: true - default: "1.89" + default: "1.91" jobs: check: runs-on: ubuntu-latest diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 5649a40..4289968 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -272,13 +272,6 @@ jobs: uses: actions/download-artifact@v8 with: path: gh-release - - name: Generate release notes - id: release-notes - run: | - cd gh-release/gp - mkdir -p .build - scripts/release-notes.sh "${{ inputs.tag }}" > .build/release-notes.md - echo "path=$GITHUB_WORKSPACE/gh-release/gp/.build/release-notes.md" >> "$GITHUB_OUTPUT" - name: Rename APK artifacts run: | shopt -s nullglob @@ -290,7 +283,6 @@ jobs: mv "$file" "${file%.apk}-aarch64.apk" done - name: Generate release asset checksums - id: release-assets run: | cd gh-release/gp mkdir -p .build @@ -303,21 +295,20 @@ jobs: digest=$(sha256sum "$file" | cut -d ' ' -f 1) printf '%s %s\n' "$digest" "$(basename "$file")" done < .build/release-assets.txt > .build/release-assets.sha256 - { - echo 'files<> "$GITHUB_OUTPUT" - name: Attest release assets uses: actions/attest-build-provenance@v4 with: subject-checksums: gh-release/gp/.build/release-assets.sha256 - - name: Update release - uses: softprops/action-gh-release@v1 - with: - token: ${{ secrets.GH_PAT }} - prerelease: ${{ contains(github.ref, 'snapshot') }} - fail_on_unmatched_files: true - tag_name: ${{ inputs.tag }} - body_path: ${{ steps.release-notes.outputs.path }} - files: ${{ steps.release-assets.outputs.files }} + - name: Upload release assets + env: + GH_TOKEN: ${{ secrets.GH_PAT }} + run: | + mapfile -t files < gh-release/gp/.build/release-assets.txt + if [[ "${{ inputs.tag }}" == "snapshot" ]]; then + for file in "${files[@]}"; do + gh release upload snapshot "$file" --clobber \ + --repo yuezk/GlobalProtect-openconnect + done + else + gh-release/gp/scripts/upload-release-assets.sh "${{ inputs.tag }}" "${files[@]}" + fi diff --git a/.github/workflows/update-flake-hashes.yaml b/.github/workflows/update-flake-hashes.yaml index ad6c1d0..93845b3 100644 --- a/.github/workflows/update-flake-hashes.yaml +++ b/.github/workflows/update-flake-hashes.yaml @@ -104,14 +104,19 @@ jobs: test -x result/bin/gpgui-helper test -x result/bin/gpgui test ! -L result/bin/gpservice - head -n1 result/bin/gpclient | grep '^#!' - head -n1 result/bin/gpservice | grep '^#!' - grep -q '/run/wrappers/bin/pkexec' result/bin/gpclient - grep -q 'gpservice_public=.*/bin/gpservice' result/bin/gpclient - grep -q 'exec .*/bin/gpservice' result/bin/gpservice - ! grep -q '@gpservice_public@\|@gpservice_fhs@\|\$out/bin/gpservice' result/bin/gpclient result/bin/gpservice + test -x result/libexec/gpclient/gp-vpnc-script-installer + test -x result/libexec/gpclient/gp-hip-script-installer + result/bin/gpclient --version + result/bin/gpservice --version + result/bin/gpauth --version - ! grep -R '/usr/bin/gp' result/share + if grep -R '/usr/bin/gp' result/share; then + echo "Desktop assets contain paths outside the Nix package" >&2 + exit 1 + fi + + - name: Verify desktop authorization runs on the host + run: bash scripts/tests/nix-desktop-authorization.sh result open-pull-request: needs: diff --git a/.gitmodules b/.gitmodules index 9f23140..7822bd4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "crates/openconnect/deps/openconnect"] path = crates/openconnect/deps/openconnect - url = https://gitlab.com/openconnect/openconnect.git + url = https://github.com/yuezk/openconnect.git + branch = globalprotect [submodule "crates/openconnect/deps/libxml2"] path = crates/openconnect/deps/libxml2 - url = https://gitlab.gnome.org/GNOME/libxml2.git + url = https://github.com/GNOME/libxml2.git \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index c356a94..205fe22 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -20,39 +20,39 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "generic-array", ] [[package]] name = "aho-corasick" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" +checksum = "c982642fa9e8606056828ee9a8505737230110bb1099153c79efe865c59d12ba" dependencies = [ "memchr", ] [[package]] name = "alloc-no-stdlib" -version = "2.0.4" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" +checksum = "c2fb6cfd47bf496ff64095c20eaba0c201404ee38714d4142fcfa1dc334fcc7a" [[package]] name = "alloc-stdlib" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e76a019e91224d279006ff972f1e984179a6e9feb050adba6ce8274aef23195" +checksum = "0b5c1865780388bfa186411ab5f247819487fc4864c6e9c3106611fa347586e1" dependencies = [ "alloc-no-stdlib", ] [[package]] name = "android_system_properties" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +checksum = "ae221649c9976a6f6c56ae1facf410f3ddb33cc661c4b7b61020a912d4237fbc" dependencies = [ "libc", ] @@ -109,9 +109,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.102" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470" [[package]] name = "ascii" @@ -121,9 +121,9 @@ checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" [[package]] name = "askama" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf825125edd887a019d0a3a837dcc5499a68b0d034cc3eb594070c3e18addc" +checksum = "6024d73179f43f15ccd2b881bfea6fee7f3a46ec53f33b52210dea749ebebaa4" dependencies = [ "askama_macros", "itoa", @@ -134,9 +134,9 @@ dependencies = [ [[package]] name = "askama_derive" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1c7065972a130eafa84215f21352ae15b4a7393da48c1f5e103904490736738" +checksum = "071ee5ebf2138e3ad180e0aacf6940c2cab5e6d8333741d9925c7bee2b153f39" dependencies = [ "askama_parser", "basic-toml", @@ -147,40 +147,40 @@ dependencies = [ "rustc-hash", "serde", "serde_derive", - "syn 2.0.118", + "syn 3.0.6", ] [[package]] name = "askama_macros" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e23b1d2c4bd39a41971f6124cef4cc6fd0540913ecb90919b69ab3bbe44ae1a" +checksum = "643e1c7cbb6aec1d920332fe51a7c0d8219e273dcb8602db03f5263e4d16487b" dependencies = [ "askama_derive", ] [[package]] name = "askama_parser" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7db09fde9143e7ac4513358fb32ee32847125b63b18ea715afd487956da715da" +checksum = "2c5ae75772275d268b03ab8bdccdd12117b6169ee23256942b34e46c9f476583" dependencies = [ "rustc-hash", "serde", "serde_derive", "unicode-ident", - "winnow 1.0.3", + "winnow 1.0.4", ] [[package]] name = "async-trait" -version = "0.1.89" +version = "0.1.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" +checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 3.0.6", ] [[package]] @@ -214,27 +214,27 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "auth" -version = "2.6.5" +version = "3.0.0" dependencies = [ "anyhow", "block2", - "common", + "browser-launcher", "gpapi", "html-escape", "log", "objc2", + "objc2-app-kit", "objc2-foundation", "objc2-web-kit", - "open", "regex", "tauri", + "tempfile", "tiny_http", "tokio", "tokio-util", "uuid", - "webbrowser", + "uzers", "webkit2gtk", - "which", ] [[package]] @@ -252,28 +252,6 @@ dependencies = [ "cc", ] -[[package]] -name = "aws-lc-rs" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00" -dependencies = [ - "aws-lc-sys", - "zeroize", -] - -[[package]] -name = "aws-lc-sys" -version = "0.41.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4" -dependencies = [ - "cc", - "cmake", - "dunce", - "fs_extra", -] - [[package]] name = "axum" version = "0.8.9" @@ -300,10 +278,10 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sha1", + "sha1 0.10.7", "sync_wrapper", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.29.0", "tower", "tower-layer", "tower-service", @@ -341,6 +319,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 = "basic-toml" version = "0.1.10" @@ -373,13 +357,22 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.13.0" +version = "2.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" +checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06" dependencies = [ "serde_core", ] +[[package]] +name = "blake2" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" +dependencies = [ + "digest 0.10.7", +] + [[package]] name = "block-buffer" version = "0.10.4" @@ -389,6 +382,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-buffer" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa" +dependencies = [ + "hybrid-array", +] + [[package]] name = "block2" version = "0.6.2" @@ -400,9 +402,9 @@ dependencies = [ [[package]] name = "brotli" -version = "8.0.4" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc91aac060a7a1e25823bdccbfb6af1875b88f17c6daac97894eed8207166b3" +checksum = "f8b851b75c23ca7873623d612fe49bd1989aeb03d08fb9432187eb253d3d4c6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -411,14 +413,25 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "5.0.3" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a32acac15fe1967bc3986b2a6347dffc965602354ea6f450ad07e8bfd253583" +checksum = "941cd9bd4ddab83cb46fa5a2d428f1c857b24ac78cb876cf7beb710840934bd7" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", ] +[[package]] +name = "browser-launcher" +version = "3.0.0" +dependencies = [ + "anyhow", + "log", + "open", + "webbrowser", + "which", +] + [[package]] name = "bs58" version = "0.5.1" @@ -436,9 +449,9 @@ checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" [[package]] name = "bytemuck" -version = "1.25.0" +version = "1.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec" +checksum = "95832e849adfb21180ccb6826a99da14e5d266ae5c2e668e1602cf234f153797" [[package]] name = "byteorder" @@ -448,9 +461,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593" +checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" dependencies = [ "serde", ] @@ -461,7 +474,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "cairo-sys-rs", "glib", "libc", @@ -482,9 +495,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.2.3" +version = "1.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ce8d3bd5823c7504d3f579f13e7b2f3da252fcb938c594d5680ee508bf846f" +checksum = "bbbad30e4b4c14a39e3cc8aed085a12a327257c316619c93581e017bc52be591" dependencies = [ "serde_core", ] @@ -509,28 +522,27 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror 2.0.18", + "thiserror 2.0.21", ] [[package]] name = "cargo_toml" -version = "0.22.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77" +checksum = "82f4b26e751e711a5302649417f2da046dce6391b2ea30a4820f37462314f0b9" dependencies = [ + "semver", "serde", - "toml 0.9.12+spec-1.1.0", + "toml 1.1.6+spec-1.1.0", ] [[package]] name = "cc" -version = "1.2.64" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dad887fd958be91b5098c0248def011f4523ab786cd411be668777e55063501f" +checksum = "f74872d07caf508b30a21f6836e7d7016a2eaf7d9ff4f48deaa58cd8a0407630" dependencies = [ "find-msvc-tools", - "jobserver", - "libc", "shlex", ] @@ -542,13 +554,13 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] name = "cfb" -version = "0.7.3" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f" +checksum = "a347dcabdae9c31b0825fd6a8bed285ec9c2acb89c47827126d52fa4f59cece3" dependencies = [ - "byteorder", "fnv", "uuid", + "web-time", ] [[package]] @@ -563,15 +575,15 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" +checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600" [[package]] name = "cfg_aliases" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527" [[package]] name = "chacha20" @@ -581,7 +593,18 @@ checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", "cipher", - "cpufeatures", + "cpufeatures 0.2.17", +] + +[[package]] +name = "chacha20" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65c35e4b699c7e15ccbe7ee35c005e4fc0a278d22238a2857e6ce2dadeda1b06" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.1", + "rand_core 0.10.1", ] [[package]] @@ -591,7 +614,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ "aead", - "chacha20", + "chacha20 0.9.1", "cipher", "poly1305", "zeroize", @@ -623,16 +646,16 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "inout", "zeroize", ] [[package]] name = "clap" -version = "4.6.1" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51" +checksum = "aa8876b300ab35ba921adea3dfd70157a46249b33f95c9084ae5709785478946" dependencies = [ "clap_builder", "clap_derive", @@ -650,9 +673,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.6.0" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" +checksum = "ec0797fb7aeb1406c84efac526901f7ec3ead2124f946b494e72879d4b54704d" dependencies = [ "anstream", "anstyle", @@ -662,30 +685,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.6.1" +version = "4.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9" +checksum = "f9c751b79415d4e559e3d1fcf128e09e720eb673a06d26cf6f392d37d75b66e0" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.118", + "syn 3.0.6", ] [[package]] name = "clap_lex" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" - -[[package]] -name = "cmake" -version = "0.1.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0f78a02292a74a88ac736019ab962ece0bc380e3f977bf72e376c5d78ff0678" -dependencies = [ - "cc", -] +checksum = "1c133bc6a41be0d194c306b5506d15e6feeea7b1d6604bd3f8310dfb2ca96486" [[package]] name = "colorchoice" @@ -695,9 +709,9 @@ checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" [[package]] name = "combine" -version = "4.6.7" +version = "4.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +checksum = "cfc320937d09e6de266b31b9afb480f197d7a861be86be7cb2ea7e5d1bfffc5e" dependencies = [ "bytes", "memchr", @@ -705,7 +719,7 @@ dependencies = [ [[package]] name = "common" -version = "2.6.5" +version = "3.0.0" [[package]] name = "compile-time" @@ -721,6 +735,12 @@ dependencies = [ "time", ] +[[package]] +name = "const-oid" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" + [[package]] name = "convert_case" version = "0.10.0" @@ -732,9 +752,9 @@ dependencies = [ [[package]] name = "cookie" -version = "0.18.1" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" +checksum = "1a373e3602691c3cdea496d2f0ee5935151e6168fe87739483c463db1b2f2f87" dependencies = [ "time", "version_check", @@ -772,7 +792,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "064badf302c3194842cf2c5d61f56cc88e54a759313879cdf03abdd27d0c3b97" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "core-foundation 0.10.1", "core-graphics-types", "foreign-types 0.5.0", @@ -785,11 +805,17 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "core-foundation 0.10.1", "libc", ] +[[package]] +name = "core_detect" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f8f80099a98041a3d1622845c271458a2d73e688351bf3cb999266764b81d48" + [[package]] name = "cpufeatures" version = "0.2.17" @@ -800,28 +826,37 @@ dependencies = [ ] [[package]] -name = "crc32fast" -version = "1.5.0" +name = "cpufeatures" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +checksum = "5ca28b0ae3115b884660db4118d803791fd6756b6e88f39c0f3f7859060d7566" +dependencies = [ + "libc", +] + +[[package]] +name = "crc32fast" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01a7799fd6b852db0e61728dde9a204c423b44d689dbd432522543614b490e78" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.15" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" +checksum = "98b0cc327b5bc766e7fda9c9260cc0fa81b43a8e240440422dff70788e3f9ef1" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" +checksum = "622f3fc73690be383c7214310406f28a90e6edeadc3cea882f9d71e495b9711a" dependencies = [ "crossbeam-epoch", "crossbeam-utils", @@ -829,18 +864,18 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.18" +version = "0.9.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +checksum = "dc74980687109a3b14c72fd458107bf0baa1da1a1a805e178d15501ba9b86d9d" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.21" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6" [[package]] name = "crossterm" @@ -848,7 +883,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "crossterm_winapi", "derive_more", "document-features", @@ -881,10 +916,19 @@ dependencies = [ ] [[package]] -name = "cssparser" -version = "0.36.0" +name = "crypto-common" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dae61cf9c0abb83bd659dab65b7e4e38d8236824c85f0f804f173567bda257d2" +checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" +dependencies = [ + "hybrid-array", +] + +[[package]] +name = "cssparser" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9cdaae01d5ed7882b04d795e7f752f46ff52d2fa3b50a20d28c464510bba98" dependencies = [ "cssparser-macros", "dtoa-short", @@ -895,35 +939,50 @@ dependencies = [ [[package]] name = "cssparser-macros" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" +checksum = "d045de693cb712d0b22c6a64be5b953f67b3ce00ab5ad3dd5d8b441886ab8e1a" dependencies = [ "quote", - "syn 2.0.118", + "syn 3.0.6", ] [[package]] name = "ctor" -version = "0.8.0" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "352d39c2f7bef1d6ad73db6f5160efcaed66d94ef8c6c573a8410c00bf909a98" +checksum = "914a755b7c2d4af2bdcff7ce1739e2db9a1b81a9b07123d8015786ae03c0980d" + +[[package]] +name = "curve25519-dalek" +version = "4.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ - "ctor-proc-macro", - "dtor", + "cfg-if", + "cpufeatures 0.2.17", + "curve25519-dalek-derive", + "fiat-crypto", + "rustc_version", + "subtle", ] [[package]] -name = "ctor-proc-macro" -version = "0.0.7" +name = "curve25519-dalek-derive" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52560adf09603e58c9a7ee1fe1dcb95a16927b17c127f0ac02d6e768a0e25bc1" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", +] [[package]] name = "darling" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d" +checksum = "ed17f5901b6630b993ca003def43f2f8ef4014fc13b047b57aad617ff32bc2ec" dependencies = [ "darling_core", "darling_macro", @@ -931,45 +990,76 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0" +checksum = "6837e2cf7485aaae18f86181d2f0e9a7ed297a025e220aeabf63fdebd3a2ddff" dependencies = [ "ident_case", "proc-macro2", "quote", "strsim", - "syn 2.0.118", + "syn 3.0.6", ] [[package]] name = "darling_macro" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d" +checksum = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785" dependencies = [ "darling_core", "quote", - "syn 2.0.118", + "syn 3.0.6", ] [[package]] name = "data-encoding" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8" +checksum = "4583a4551df46e2792f82ceeac45e850d2e2d5debba0b91f102385cda5b11f06" [[package]] name = "dbus" -version = "0.9.11" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b942602992bb7acfd1f51c49811c58a610ef9181b6e66f3e519d79b540a3bf73" +checksum = "3ab69f03cc8c4340c9c8e315114e1658e6775a9b16a04357973aa21cec22b32e" dependencies = [ "libc", "libdbus-sys", "windows-sys 0.61.2", ] +[[package]] +name = "defmt" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2953bfe4f93bbd20cc71198842756f77d161884c99ebbabc41d80231ded88d1" +dependencies = [ + "bitflags 1.3.2", + "defmt-macros", +] + +[[package]] +name = "defmt-macros" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bad9c72e7ca2137e0dc3813245a0d282fd6daad32fd800af018306a9169b5fe8" +dependencies = [ + "defmt-parser", + "proc-macro2", + "quote", + "syn 2.0.119", +] + +[[package]] +name = "defmt-parser" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10d60334b3b2e7c9d91ef8150abfb6fa4c1c39ebbcf4a81c2e346aad939fee3e" +dependencies = [ + "thiserror 2.0.21", +] + [[package]] name = "deranged" version = "0.5.8" @@ -998,7 +1088,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.118", + "syn 2.0.119", ] [[package]] @@ -1007,8 +1097,20 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer", - "crypto-common", + "block-buffer 0.10.4", + "crypto-common 0.1.7", + "subtle", +] + +[[package]] +name = "digest" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" +dependencies = [ + "block-buffer 0.12.1", + "const-oid", + "crypto-common 0.2.2", ] [[package]] @@ -1022,9 +1124,9 @@ dependencies = [ [[package]] name = "dirs" -version = "6.0.0" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" +checksum = "8d57d423b3c82e89b9a24ca3091fee61f456a26edbd28d26c65906f4bc1dcd8f" dependencies = [ "dirs-sys", ] @@ -1047,7 +1149,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2", "libc", "objc2", @@ -1055,13 +1157,13 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" +checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 3.0.6", ] [[package]] @@ -1095,7 +1197,7 @@ checksum = "0fbbb781877580993a8707ec48672673ec7b81eeba04cfd2310bd28c08e47c8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 2.0.119", ] [[package]] @@ -1121,9 +1223,9 @@ dependencies = [ [[package]] name = "dom_query" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521e380c0c8afb8d9a1e83a1822ee03556fc3e3e7dbc1fd30be14e37f9cb3f89" +checksum = "fac5fca71e65e94cc718a6e2af65d6e0f9c6027751c2aa562fbb5087fda639bc" dependencies = [ "bit-set", "cssparser", @@ -1158,21 +1260,6 @@ dependencies = [ "dtoa", ] -[[package]] -name = "dtor" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1057d6c64987086ff8ed0fd3fbf377a6b7d205cc7715868cd401705f715cbe4" -dependencies = [ - "dtor-proc-macro", -] - -[[package]] -name = "dtor-proc-macro" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f678cf4a922c215c63e0de95eb1ff08a958a81d47e485cf9da1e27bf6305cfa5" - [[package]] name = "dunce" version = "1.0.5" @@ -1187,20 +1274,20 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" [[package]] name = "either" -version = "1.16.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" +checksum = "0e9c71c2167ca323c882b99918929403426e2373ea17242ff5653e0d5e1058be" [[package]] name = "embed-resource" -version = "3.0.9" +version = "3.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31a88c8d26de40ed18fe748c547845aa39de1db3afd958f8cb91579f3644bcb" +checksum = "6168487b5e7eb2673e6efe1200b1848016e436a6ca0b8031bf04bd9d493a249f" dependencies = [ "cc", "memchr", "rustc_version", - "toml 1.1.2+spec-1.1.0", + "toml 1.1.6+spec-1.1.0", "vswhom", "winreg", ] @@ -1213,18 +1300,23 @@ checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" [[package]] name = "encoding_rs" -version = "0.8.35" +version = "0.8.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" +checksum = "8e985e0451871ad22fb8d2b6b076e2028a502a0d3950998c2c5c0a4f9b5d9679" dependencies = [ "cfg-if", + "core_detect", + "multiversion_no_op", + "rustversion", + "scopeguard", + "simdutf8", ] [[package]] name = "env_filter" -version = "1.0.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e90c2accc4b07a8456ea0debdc2e7587bdd890680d71173a15d4ae604f6eef" +checksum = "900d271a03799a1ee8d1ca9b19893b48ca674a9284fefcfb85f05e74ed314217" dependencies = [ "log", "regex", @@ -1232,9 +1324,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.10" +version = "0.11.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0621c04f2196ac3f488dd583365b9c09be011a4ab8b9f37248ffcc8f6198b56a" +checksum = "de671bd27a75a797dc9ae289ba1e77276e75e2026408aab65185384e2d5cd3f6" dependencies = [ "anstream", "anstyle", @@ -1272,9 +1364,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" +checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223" [[package]] name = "fdeflate" @@ -1285,6 +1377,12 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + [[package]] name = "field-offset" version = "0.3.6" @@ -1307,18 +1405,19 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.9" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" +checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484" [[package]] name = "flate2" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" +checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.9.1", + "zlib-rs", ] [[package]] @@ -1354,13 +1453,13 @@ dependencies = [ [[package]] name = "foreign-types-macros" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +checksum = "ea5190182e6915eb873ddbc16e23b711b6eb1f9c00a0d0a3a91b5f6228475225" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 3.0.6", ] [[package]] @@ -1392,9 +1491,9 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "futures" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b147ee9d1f6d097cef9ce628cd2ee62288d963e16fb287bd9286455b241382d" +checksum = "9a31d2a3fbaaeb2af2368bbdd904aa8e812d3c04a1ee10d3171f52d556e5d0a3" dependencies = [ "futures-channel", "futures-core", @@ -1407,9 +1506,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" +checksum = "b1f9e3d69d39e4862ffed03ed071a76f9a13ba1d9109d355b0f0aa6b15e393c4" dependencies = [ "futures-core", "futures-sink", @@ -1417,15 +1516,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" +checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" [[package]] name = "futures-executor" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf29c38818342a3b26b5b923639e7b1f4a61fc5e76102d4b1981c6dc7a7579d" +checksum = "031b47cf1a3c6cc8bc2fc76cd437f521619387907d469316e7c0bc278f1f5432" dependencies = [ "futures-core", "futures-task", @@ -1434,38 +1533,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" +checksum = "53c0fa8157de1303bfffdaa1cc2a673bfffb60102f76b0ef4441659124373fed" [[package]] name = "futures-macro" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" +checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 3.0.6", ] [[package]] name = "futures-sink" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" +checksum = "1944426bf7d03f1d14f708785e4b33efd750b36d48a157b836b3efc15ede8e1d" [[package]] name = "futures-task" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711b3d59c33004d3856fbdc83b99d4ff37a24768fa1be9ce3538a1cde4393" +checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd" [[package]] name = "futures-util" -version = "0.3.32" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" +checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc" dependencies = [ "futures-channel", "futures-core", @@ -1603,10 +1702,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi 0.11.1+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] @@ -1616,11 +1713,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", - "js-sys", "libc", "r-efi 5.3.0", "wasip2", - "wasm-bindgen", ] [[package]] @@ -1632,6 +1727,7 @@ dependencies = [ "cfg-if", "libc", "r-efi 6.0.0", + "rand_core 0.10.1", ] [[package]] @@ -1672,7 +1768,7 @@ version = "0.18.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "futures-channel", "futures-core", "futures-executor", @@ -1700,7 +1796,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.118", + "syn 2.0.119", ] [[package]] @@ -1715,9 +1811,9 @@ dependencies = [ [[package]] name = "glob" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" +checksum = "e4eba85ea1d0a966a983acd07deee566e67395d2d96b6fb39e62b5a833f1eb0b" [[package]] name = "gobject-sys" @@ -1732,7 +1828,7 @@ dependencies = [ [[package]] name = "gpapi" -version = "2.6.5" +version = "3.0.0" dependencies = [ "anyhow", "base64 0.22.1", @@ -1743,14 +1839,17 @@ dependencies = [ "common", "dns-lookup", "env_logger", + "getrandom 0.4.3", "gtk", "humantime", "log", "log-reload", "md5", "netdev", + "nix 0.31.3", "openssl", "os_info", + "oslog", "pem", "proptest", "redact-engine", @@ -1760,11 +1859,14 @@ dependencies = [ "serde_json", "serde_urlencoded", "sha256", + "snow", + "socket2", "specta", "tauri", "tempfile", - "thiserror 2.0.18", + "thiserror 2.0.21", "tokio", + "tokio-util", "url", "urlencoding", "uuid", @@ -1772,18 +1874,18 @@ dependencies = [ "version-compare", "whoami", "xmltree", + "zeroize", ] [[package]] name = "gpauth" -version = "2.6.5" +version = "3.0.0" dependencies = [ "anyhow", "auth", "clap", "common", "compile-time", - "env_logger", "gpapi", "home", "log", @@ -1796,37 +1898,33 @@ dependencies = [ [[package]] name = "gpclient" -version = "2.6.5" +version = "3.0.0" dependencies = [ "anyhow", - "askama", - "chrono", "clap", "common", "compile-time", "directories", "env_logger", "gpapi", + "gphip", "inquire", "log", - "netdev", "openconnect", "reqwest", "serde", "serde_json", - "serde_urlencoded", "sysinfo", "tempfile", "tokio", - "uuid", + "tokio-util", "uzers", "whoami", - "xmltree", ] [[package]] name = "gpgui-helper" -version = "2.6.5" +version = "3.0.0" dependencies = [ "anyhow", "clap", @@ -1840,28 +1938,60 @@ dependencies = [ "tauri-build", "tempfile", "tokio", + "tokio-tungstenite 0.30.0", + "uuid", + "zeroize", +] + +[[package]] +name = "gphip" +version = "3.0.0" +dependencies = [ + "anyhow", + "askama", + "chrono", + "gpapi", + "netdev", + "serde", + "serde_json", + "serde_urlencoded", + "uuid", + "uzers", + "xmltree", ] [[package]] name = "gpservice" -version = "2.6.5" +version = "3.0.0" dependencies = [ "anyhow", "axum", + "base64 0.22.1", "clap", "common", "compile-time", "env_logger", "futures", + "getrandom 0.4.3", "gpapi", + "gphip", "log", + "mac_address", + "nix 0.31.3", "openconnect", + "openssl", "serde", "serde_json", + "sha256", "tar", + "tempfile", + "thiserror 2.0.21", "tokio", + "tokio-tungstenite 0.29.0", "tokio-util", + "uuid", "xz2", + "zeroize", ] [[package]] @@ -1913,14 +2043,14 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.118", + "syn 2.0.119", ] [[package]] name = "h2" -version = "0.4.15" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cb093c84e8bd9b188d4c4a8cb6579fc016968d14c99882163cd3ff402a4f155" +checksum = "7d29020232d6aa3fb1daca64c1127cf662cf97f254ae16c18c05b8ab635fc118" dependencies = [ "atomic-waker", "bytes", @@ -1928,7 +2058,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.14.0", + "indexmap 2.14.2", "slab", "tokio", "tokio-util", @@ -1976,18 +2106,15 @@ dependencies = [ [[package]] name = "html-escape" -version = "0.2.13" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1ad449764d627e22bfd7cd5e8868264fc9236e07c752972b4080cd351cb476" -dependencies = [ - "utf8-width", -] +checksum = "c9356095b4b41197bba32173600e1582792cda618f65d12f68e2e77d273413c5" [[package]] name = "html5ever" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1054432bae2f14e0061e33d23402fbaa67a921d319d56adc6bcf887ddad1cbc2" +checksum = "46a1761807faccc9a19e86944bbf40610014066306f96edcdedc2fb714bcb7b8" dependencies = [ "log", "markup5ever", @@ -1995,9 +2122,9 @@ dependencies = [ [[package]] name = "http" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425" +checksum = "918d3568bebf352712bc2ef3d46a8bcf1a75b373be6539de198e9105cbbf9ce0" dependencies = [ "bytes", "itoa", @@ -2005,9 +2132,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c" dependencies = [ "bytes", "http", @@ -2015,9 +2142,9 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +checksum = "23169fe34a5fbcdd3f3862e78fb9b6fccd5f02a6dc6f732547005d45631ce71c" dependencies = [ "bytes", "futures-core", @@ -2040,15 +2167,24 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" +checksum = "15cdd26707701c53297e2fa6afb323d55fbc1d0810c3aec078ae3ef0424c3c15" + +[[package]] +name = "hybrid-array" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27f864f10dfb56725ce5ce5472bc52252c8f93a4ab86327122cebf62c5f59a17" +dependencies = [ + "typenum", +] [[package]] name = "hyper" -version = "1.10.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498" +checksum = "2c3e324da4c95177d6291d4c8730197c0d1822f8a9766814a4a44fa5ab797c9c" dependencies = [ "atomic-waker", "bytes", @@ -2068,9 +2204,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.9" +version = "0.27.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" +checksum = "dfa8e654703247911e29c23fbeaa261834bd9bb74efba2f9acddc37bfb127f53" dependencies = [ "http", "hyper", @@ -2099,16 +2235,17 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" +checksum = "ddc03d96684f9226b8a787cdb71488417b53ab5ea8fdb1dac946cb9431cc8bff" dependencies = [ - "base64 0.22.1", + "base64 0.23.1", "bytes", "futures-channel", "futures-util", "http", "http-body", + "httparse", "hyper", "ipnet", "libc", @@ -2158,9 +2295,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" +checksum = "fa68d21081c4a05d5a901a1c62add574c77048b6a1c67be3b50ce0b60d4ca513" dependencies = [ "displaydoc", "potential_utf", @@ -2172,9 +2309,9 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" +checksum = "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb" dependencies = [ "displaydoc", "litemap", @@ -2185,9 +2322,9 @@ dependencies = [ [[package]] name = "icu_normalizer" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" +checksum = "12f9cf5f235641ed274641dd81c3f28d870e276763d0797aeeab72317b1c646f" dependencies = [ "icu_collections", "icu_normalizer_data", @@ -2199,16 +2336,17 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" +checksum = "1563da1ed3e0b3bf3d74c9b85917ac9c56464d2f57242270c09c9e752f8021a0" [[package]] name = "icu_properties" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" +checksum = "7e7ca276ad3145661a65914e6daf131ca5120cd3dcee8f8f3214b8875184a148" dependencies = [ + "displaydoc", "icu_collections", "icu_locale_core", "icu_properties_data", @@ -2219,15 +2357,15 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" +checksum = "e590f038c1464a96894fd6d10127e90a8be4509f56ff7ecef851b15cee0b7caa" [[package]] name = "icu_provider" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" +checksum = "d27bbb9d3abbefac45d55f647c9de1d44aafcd1186eb91879afef17c396c3e73" dependencies = [ "displaydoc", "icu_locale_core", @@ -2278,9 +2416,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.14.0" +version = "2.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" +checksum = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855" dependencies = [ "equivalent", "hashbrown 0.17.1", @@ -2290,9 +2428,9 @@ dependencies = [ [[package]] name = "infer" -version = "0.19.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a588916bfdfd92e71cacef98a63d9b1f0d74d6599980d11894290e7ddefffcf7" +checksum = "f4200d433cbd5178df7797c9c2e75b348b728e39631cf14520d1e2fc424201f4" dependencies = [ "cfb", ] @@ -2312,7 +2450,7 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6654738b8024300cf062d04a1c13c10c8e2cea598ec1c47dc9b6641159429756" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "crossterm", "dyn-clone", "fuzzy-matcher", @@ -2322,9 +2460,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.12.0" +version = "2.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" +checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0" [[package]] name = "is-docker" @@ -2391,26 +2529,56 @@ dependencies = [ [[package]] name = "jiff" -version = "0.2.28" +version = "0.2.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4603d3033e49e2b0e31229fcab20a5d40089c607d975cd9c80551dc69eed9102" +checksum = "b2b005715dcbeb0089a3c0dab99f2ff1cc3b2525323552703d648585d342a383" dependencies = [ + "defmt", + "jiff-core", "jiff-static", + "jiff-tzdb-platform", "log", "portable-atomic", "portable-atomic-util", "serde_core", + "windows-link 0.2.1", +] + +[[package]] +name = "jiff-core" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e52fe76043ccecc9005d2305ebaadf7d7fc0cc89ca6baa10a94d6bc68c7128c" +dependencies = [ + "defmt", + "log", ] [[package]] name = "jiff-static" -version = "0.2.28" +version = "0.2.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "782d32378dddf207193ac91cefb848ad41abb58195c95168e1291227a0832b47" +checksum = "2cc9817253cf7c7ee4684451bd327e88d6f3658014e54a29198625590650695c" dependencies = [ + "jiff-core", "proc-macro2", "quote", - "syn 2.0.118", + "syn 2.0.119", +] + +[[package]] +name = "jiff-tzdb" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa8377070c6bae868759445e5a77f66d84f0b72f3a054bfb00e6d038b8282da7" + +[[package]] +name = "jiff-tzdb-platform" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "875a5a69ac2bab1a891711cf5eccbec1ce0341ea805560dcd90b7a2e925132e8" +dependencies = [ + "jiff-tzdb", ] [[package]] @@ -2441,7 +2609,7 @@ dependencies = [ "jni-sys 0.4.1", "log", "simd_cesu8", - "thiserror 2.0.18", + "thiserror 2.0.21", "walkdir", "windows-link 0.2.1", ] @@ -2456,7 +2624,7 @@ dependencies = [ "quote", "rustc_version", "simd_cesu8", - "syn 2.0.118", + "syn 2.0.119", ] [[package]] @@ -2484,24 +2652,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" dependencies = [ "quote", - "syn 2.0.118", -] - -[[package]] -name = "jobserver" -version = "0.1.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" -dependencies = [ - "getrandom 0.3.4", - "libc", + "syn 2.0.119", ] [[package]] name = "js-sys" -version = "0.3.102" +version = "0.3.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31" +checksum = "7883d941dae510fb2d978fc3fe018c71c9e2892fd38854de3e8b92c2e5ad9cc5" dependencies = [ "cfg-if", "futures-util", @@ -2510,21 +2668,21 @@ dependencies = [ [[package]] name = "json-patch" -version = "3.0.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08" +checksum = "7421438de105a0827e44fadd05377727847d717c80ce29a229f85fd04c427b72" dependencies = [ "jsonptr", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.21", ] [[package]] name = "jsonptr" -version = "0.6.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70" +checksum = "a5a3cc660ba5d72bce0b3bb295bf20847ccbb40fd423f3f05b61273672e561fe" dependencies = [ "serde", "serde_json", @@ -2532,13 +2690,12 @@ dependencies = [ [[package]] name = "keyboard-types" -version = "0.7.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" +checksum = "0fbe853b403ae61a04233030ae8a79d94975281ed9770a1f9e246732b534b28d" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "serde", - "unicode-segmentation", ] [[package]] @@ -2567,9 +2724,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.186" +version = "0.2.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" +checksum = "ce5d3ddc6d3fa000eb1536d85e147bfe31aacaba692ed6a876f95cb7c855be78" [[package]] name = "libdbus-sys" @@ -2592,9 +2749,9 @@ dependencies = [ [[package]] name = "libredox" -version = "0.1.17" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3" +checksum = "61ff90caf6077a803a240f62fdbe88645a890bbca49ef8174c3cb0404362171d" dependencies = [ "libc", ] @@ -2607,9 +2764,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "litemap" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" +checksum = "47d9d19d1d6efa0109d2f65ff4c85cddd50bd572e5a00127ab10987290bcefae" [[package]] name = "litrs" @@ -2628,9 +2785,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.32" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a" +checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" [[package]] name = "log-reload" @@ -2641,12 +2798,6 @@ dependencies = [ "log", ] -[[package]] -name = "lru-slab" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" - [[package]] name = "lzma-sys" version = "0.1.20" @@ -2665,10 +2816,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3d25b0e0b648a86960ac23b7ad4abb9717601dec6f66c165f5b037f3f03065f" [[package]] -name = "markup5ever" -version = "0.38.0" +name = "mac_address" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8983d30f2915feeaaab2d6babdd6bc7e9ed1a00b66b5e6d74df19aa9c0e91862" +checksum = "b367b50a9be9a5d3b5718c1da74e5d6b9c17647f89752ee2562a470cc3c4eb1a" +dependencies = [ + "nix 0.30.1", + "windows-sys 0.61.2", +] + +[[package]] +name = "markup5ever" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7122d987ec5f704ee56f6e5b41a7d93722e9aae27ae07cafa4036c4d3f9757de" dependencies = [ "log", "tendril", @@ -2683,15 +2844,15 @@ checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" [[package]] name = "md5" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae960838283323069879657ca3de837e9f7bbb4c7bf6ea7f1b290d5e9476d2e0" +checksum = "7ebb8d8732c6a6df3d8f032a82911cfc747e00efb95cc46e8d0acd5b5b88570c" [[package]] name = "memchr" -version = "2.8.2" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "memoffset" @@ -2719,10 +2880,20 @@ dependencies = [ ] [[package]] -name = "mio" -version = "1.2.1" +name = "miniz_oxide" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda" +checksum = "b63fbc4a50860e98e7b2aa7804ded1db5cbc3aff9193adaff57a6931bf7c4b4c" +dependencies = [ + "adler2", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "1.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1788edb87fdc09c7e26304471e2f5be8cdefb1b6930d6e3985fc02ff53bf86ee" dependencies = [ "libc", "log", @@ -2732,9 +2903,9 @@ dependencies = [ [[package]] name = "muda" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd04e60bc0b07438a6771710ee1698f98f6ebbc7f89b61264af1563b8aeb878" +checksum = "cca139e57da4383727f189e43e66e84fa372347027fc996f9f1a007ec0a37996" dependencies = [ "crossbeam-channel", "dpi", @@ -2747,10 +2918,16 @@ dependencies = [ "once_cell", "png 0.18.1", "serde", - "thiserror 2.0.18", + "thiserror 2.0.21", "windows-sys 0.61.2", ] +[[package]] +name = "multiversion_no_op" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d" + [[package]] name = "native-tls" version = "0.2.18" @@ -2774,7 +2951,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "jni-sys 0.3.1", "log", "ndk-sys", @@ -2822,9 +2999,9 @@ dependencies = [ [[package]] name = "netlink-packet-core" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3463cbb78394cb0141e2c926b93fc2197e473394b761986eca3b9da2c63ae0f4" +checksum = "b897d7bd4f0af82e68d40d0344cf37e97f9c97ddf74a098de3e4da05e96ca395" dependencies = [ "paste", ] @@ -2835,7 +3012,7 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df9854ea6ad14e3f4698a7f03b65bce0833dd2d81d594a0e4a984170537146b6" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "libc", "log", "netlink-packet-core", @@ -2858,16 +3035,30 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" +[[package]] +name = "nix" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" +dependencies = [ + "bitflags 2.13.2", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset", +] + [[package]] name = "nix" version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "cfg-if", "cfg_aliases", "libc", + "memoffset", ] [[package]] @@ -2913,14 +3104,14 @@ dependencies = [ "proc-macro-crate 3.5.0", "proc-macro2", "quote", - "syn 2.0.118", + "syn 2.0.119", ] [[package]] name = "objc2" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f" +checksum = "08849bbd4767dfae9457696856ae1c84fe4e0281bbe4a7abff2d0e06fb7981f8" dependencies = [ "objc2-encode", "objc2-exception-helper", @@ -2932,11 +3123,12 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2", "objc2", "objc2-core-foundation", "objc2-foundation", + "objc2-quartz-core", ] [[package]] @@ -2945,7 +3137,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "objc2", "objc2-foundation", ] @@ -2966,7 +3158,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2", "dispatch2", "libc", @@ -2979,7 +3171,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "dispatch2", "objc2", "objc2-core-foundation", @@ -3012,7 +3204,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "objc2", "objc2-core-foundation", "objc2-core-graphics", @@ -3039,7 +3231,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2", "libc", "objc2", @@ -3062,7 +3254,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "objc2", "objc2-core-foundation", ] @@ -3083,7 +3275,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "objc2", "objc2-core-foundation", "objc2-foundation", @@ -3095,7 +3287,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "709fe137109bd1e8b5a99390f77a7d8b2961dafc1a1c5db8f2e60329ad6d895a" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "objc2", "objc2-core-foundation", ] @@ -3106,7 +3298,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7216bd11cbda54ccabcab84d523dc93b858ec75ecfb3a7d89513fa22464da396" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "dispatch2", "libc", "objc2", @@ -3120,7 +3312,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2", "objc2", "objc2-cloud-kit", @@ -3151,7 +3343,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2", "objc2", "objc2-app-kit", @@ -3181,23 +3373,23 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "open" -version = "5.3.5" +version = "5.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fbaa89d2ddc8473c78a3adf69eea8cffa28c483b8e02a971ef31527cd0fc92c" +checksum = "aa576c76302b7b808eecc68061e67336c47833ef9d22caa74dda10fa9675eebc" dependencies = [ "is-wsl", "libc", - "pathdiff", ] [[package]] name = "openconnect" -version = "2.6.5" +version = "3.0.0" dependencies = [ "autotools", "cc", "fs_extra", "is_executable", + "libc", "log", "pkg-config", ] @@ -3208,7 +3400,7 @@ version = "0.10.81" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "cfg-if", "foreign-types 0.3.2", "libc", @@ -3224,7 +3416,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 2.0.119", ] [[package]] @@ -3259,13 +3451,22 @@ checksum = "9cf20a545b305cf1da722b236b5155c9bb35f1d5ceb28c048bd96ca842f41b5b" dependencies = [ "android_system_properties", "log", - "nix", + "nix 0.31.3", "objc2", "objc2-foundation", "objc2-ui-kit", "windows-sys 0.61.2", ] +[[package]] +name = "oslog" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d2043d1f61d77cb2f4b1f7b7b2295f40507f5f8e9d1c8bf10a1ca5f97a3969" +dependencies = [ + "cc", +] + [[package]] name = "pango" version = "0.18.3" @@ -3320,12 +3521,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" -[[package]] -name = "pathdiff" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" - [[package]] name = "pem" version = "3.0.6" @@ -3383,7 +3578,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.118", + "syn 2.0.119", ] [[package]] @@ -3403,18 +3598,18 @@ checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pkg-config" -version = "0.3.33" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" +checksum = "f6b464fbc74e149a392436b17d523f769e057cb6877f6a5c4618bc6f11800548" [[package]] name = "plist" -version = "1.9.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "092791278e026273c1b65bbdcfbba3a300f2994c896bd01ab01da613c29c46f1" +checksum = "2896bade328c13f7042a297ea5ac5b0951f6cf989dea5f32c2fd98da398195cb" dependencies = [ - "base64 0.22.1", - "indexmap 2.14.0", + "base64 0.23.1", + "indexmap 2.14.2", "quick-xml", "serde", "time", @@ -3430,7 +3625,7 @@ dependencies = [ "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.8.9", ] [[package]] @@ -3439,11 +3634,11 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide", + "miniz_oxide 0.8.9", ] [[package]] @@ -3452,40 +3647,40 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ - "cpufeatures", + "cpufeatures 0.2.17", "opaque-debug", "universal-hash", ] [[package]] name = "portable-atomic" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" +checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85" [[package]] name = "portable-atomic-util" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618" +checksum = "10ab3eb7f3becc3a1cbc4f2c6f20267996cfc1a6467a873763411b136a122715" dependencies = [ "portable-atomic", ] [[package]] name = "potential_utf" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" +checksum = "d83eb9bc6d8e5cf568e7a1101d60ee05e81ed50ea106026f3d18deeb046d7661" dependencies = [ "zerovec", ] [[package]] name = "powerfmt" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" +checksum = "4a6394b9e965e73d0a289ee54f589087e2c676aedf60885baf52c76b771e4958" [[package]] name = "ppv-lite86" @@ -3528,7 +3723,7 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ - "toml_edit 0.25.12+spec-1.1.0", + "toml_edit 0.25.15+spec-1.1.0", ] [[package]] @@ -3557,9 +3752,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.106" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" +checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9" dependencies = [ "unicode-ident", ] @@ -3572,9 +3767,9 @@ checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.13.0", + "bitflags 2.13.2", "num-traits", - "rand", + "rand 0.9.5", "rand_chacha", "rand_xorshift", "regex-syntax", @@ -3591,74 +3786,18 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-xml" -version = "0.39.4" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e" +checksum = "41b1177fdf999d2321d3fb46ff47159d9c1fb9ad66a4879f8c50a0b504615e9b" dependencies = [ "memchr", ] -[[package]] -name = "quinn" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" -dependencies = [ - "bytes", - "cfg_aliases", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "socket2", - "thiserror 2.0.18", - "tokio", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-proto" -version = "0.11.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098" -dependencies = [ - "aws-lc-rs", - "bytes", - "getrandom 0.3.4", - "lru-slab", - "rand", - "ring", - "rustc-hash", - "rustls", - "rustls-pki-types", - "slab", - "thiserror 2.0.18", - "tinyvec", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-udp" -version = "0.5.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" -dependencies = [ - "cfg_aliases", - "libc", - "once_cell", - "socket2", - "tracing", - "windows-sys 0.52.0", -] - [[package]] name = "quote" -version = "1.0.45" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" +checksum = "1fbf4db142a473a8d80c26bbf18454ed458bf8d26c8219c331daecfdbd079001" dependencies = [ "proc-macro2", ] @@ -3677,14 +3816,25 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "rand" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" +checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41" dependencies = [ "rand_chacha", "rand_core 0.9.5", ] +[[package]] +name = "rand" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65c9fb96cbc91e3478eaae79a69fcd3f1ae4ad052e471fe6732fff548984b4af" +dependencies = [ + "chacha20 0.10.2", + "getrandom 0.4.3", + "rand_core 0.10.1", +] + [[package]] name = "rand_chacha" version = "0.9.0" @@ -3713,6 +3863,12 @@ dependencies = [ "getrandom 0.3.4", ] +[[package]] +name = "rand_core" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" + [[package]] name = "rand_xorshift" version = "0.4.0" @@ -3768,45 +3924,44 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", ] [[package]] name = "redox_users" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" +checksum = "60dc65c0ff1a7ae1294b0c67b9f14baf70b644404010370171787bfac1038fc0" dependencies = [ - "getrandom 0.2.17", "libredox", - "thiserror 2.0.18", + "thiserror 2.0.21", ] [[package]] name = "ref-cast" -version = "1.0.25" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" +checksum = "7e440fb4e4b4147295338efb76001ab9e4efc0e5839df2c47fc5ac2381d365c3" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.25" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" +checksum = "92ecd8964f8453721699a1ed72037b0db49ce2f5a5138486ee89bed6f67cdf3a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 3.0.6", ] [[package]] name = "regex" -version = "1.12.4" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba" +checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d" dependencies = [ "aho-corasick", "memchr", @@ -3816,9 +3971,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.14" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" +checksum = "ad8553b9b26413251cbf30e620595c7a41b3887f03da04579c0e6b0d6a06b4b2" dependencies = [ "aho-corasick", "memchr", @@ -3833,11 +3988,11 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "reqwest" -version = "0.13.4" +version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3" +checksum = "16a1cfa75cc186dd73d5818e510e042e40927bccc9c236b061cea97e1eb08029" dependencies = [ - "base64 0.22.1", + "base64 0.23.1", "bytes", "encoding_rs", "futures-core", @@ -3856,17 +4011,13 @@ dependencies = [ "native-tls", "percent-encoding", "pin-project-lite", - "quinn", - "rustls", "rustls-pki-types", - "rustls-platform-verifier", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", "tokio", "tokio-native-tls", - "tokio-rustls", "tokio-util", "tower", "tower-http", @@ -3894,9 +4045,9 @@ dependencies = [ [[package]] name = "rustc-hash" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" +checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d" [[package]] name = "rustc_version" @@ -3909,11 +4060,11 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" +checksum = "891efababe418670775f199f0d233d84843c227a0949a883ce15b37c78d6629d" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "errno", "libc", "linux-raw-sys", @@ -3922,11 +4073,10 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.40" +version = "0.23.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" +checksum = "0d41d731c7d2f962d1ccc364cec258de3c0e93b38c2fb3ba97ac74513048d634" dependencies = [ - "aws-lc-rs", "once_cell", "rustls-pki-types", "rustls-webpki", @@ -3934,62 +4084,21 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rustls-native-certs" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d" -dependencies = [ - "openssl-probe", - "rustls-pki-types", - "schannel", - "security-framework", -] - [[package]] name = "rustls-pki-types" -version = "1.14.1" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" +checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96" dependencies = [ - "web-time", "zeroize", ] -[[package]] -name = "rustls-platform-verifier" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0" -dependencies = [ - "core-foundation 0.10.1", - "core-foundation-sys", - "jni 0.22.4", - "log", - "once_cell", - "rustls", - "rustls-native-certs", - "rustls-platform-verifier-android", - "rustls-webpki", - "security-framework", - "security-framework-sys", - "webpki-root-certs", - "windows-sys 0.52.0", -] - -[[package]] -name = "rustls-platform-verifier-android" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" - [[package]] name = "rustls-webpki" -version = "0.103.13" +version = "0.103.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e" +checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2" dependencies = [ - "aws-lc-rs", "ring", "rustls-pki-types", "untrusted", @@ -3997,9 +4106,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" [[package]] name = "rusty-fork" @@ -4066,9 +4175,9 @@ dependencies = [ [[package]] name = "schemars" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc" +checksum = "687274d293b6cdc6e73e0fee520bf2049650090d7164f87672d212a3c530cf4a" dependencies = [ "dyn-clone", "ref-cast", @@ -4085,7 +4194,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.118", + "syn 2.0.119", ] [[package]] @@ -4100,7 +4209,7 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "core-foundation 0.10.1", "core-foundation-sys", "libc", @@ -4119,11 +4228,11 @@ dependencies = [ [[package]] name = "selectors" -version = "0.36.1" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c" +checksum = "8adfa1c298912827b8a28b223b3b874357397ae706e6190acd9bf28cee99114d" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "cssparser", "derive_more", "log", @@ -4148,9 +4257,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.228" +version = "1.0.229" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +checksum = "4148590afebada386688f18773da617792bf2ef03ffc1e4cbd2b1d45b023e0ba" dependencies = [ "serde_core", "serde_derive", @@ -4170,22 +4279,22 @@ dependencies = [ [[package]] name = "serde_core" -version = "1.0.228" +version = "1.0.229" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" +checksum = "67dca2c9c51e58a4791a4b1ed58308b39c64224d349a935ab5039aa360942a48" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.228" +version = "1.0.229" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" +checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 3.0.6", ] [[package]] @@ -4196,14 +4305,14 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 2.0.119", ] [[package]] name = "serde_json" -version = "1.0.150" +version = "1.0.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" +checksum = "c841b55ecdae098c80dcae9cf767f6f8a0c2cdb3416bbef72181df4d0fe73f14" dependencies = [ "itoa", "memchr", @@ -4235,13 +4344,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" +checksum = "8d3b1629de253c70a0508c3899572da79ca359fdab27c7920ff00406df418906" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 3.0.6", ] [[package]] @@ -4276,18 +4385,19 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.21.0" +version = "3.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a5c54c7310e7b8b9577c286d7e399ddd876c3e12b3ed917a8aabc4b96e9e8c" +checksum = "df9adc193c780ef8f159aee8b61e2d5801aaa555e6eb0947fe45530ec506296f" dependencies = [ - "base64 0.22.1", + "base64 0.23.1", "bs58", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.14.0", + "indexmap 2.14.2", + "jiff", "schemars 0.9.0", - "schemars 1.2.1", + "schemars 1.2.2", "serde_core", "serde_json", "serde_with_macros", @@ -4296,14 +4406,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.21.0" +version = "3.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84d57bc0c8b9a17920c178daa6bb924850d54a9c97ab45194bb8c17ad66bb660" +checksum = "3e17bbc68e28663bbbb90df47e058aa7eda4fb445b89fe70457bb94fbccf6e49" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.118", + "syn 3.0.6", ] [[package]] @@ -4325,7 +4435,7 @@ checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 2.0.119", ] [[package]] @@ -4339,13 +4449,24 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +checksum = "a978451301f4db1d02937a4ab3ccce137717b81826e79b7d49ffe3244a13c3b8" dependencies = [ "cfg-if", - "cpufeatures", - "digest", + "cpufeatures 0.2.17", + "digest 0.10.7", +] + +[[package]] +name = "sha1" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.1", + "digest 0.11.3", ] [[package]] @@ -4361,8 +4482,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", - "cpufeatures", - "digest", + "cpufeatures 0.2.17", + "digest 0.10.7", ] [[package]] @@ -4417,15 +4538,15 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" +checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea" [[package]] name = "simd_cesu8" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33" +checksum = "11031e251abf8611c80f460e19dbdeb54a66db918e49c65a7065b46ac7aec520" dependencies = [ "rustc_version", "simdutf8", @@ -4439,9 +4560,9 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "siphasher" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" +checksum = "33f4fe9184a62d842c9ef383018f3306d8ba224fd9d836f56d7288308847c256" [[package]] name = "slab" @@ -4451,15 +4572,31 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" -version = "1.15.2" +version = "1.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" +checksum = "f9395f0f0eee849a9b707b2f06bb92a6a422090e2123bb2ef8e87a0e61892a8e" + +[[package]] +name = "snow" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "599b506ccc4aff8cf7844bc42cf783009a434c1e26c964432560fb6d6ad02d82" +dependencies = [ + "blake2", + "chacha20poly1305", + "curve25519-dalek", + "getrandom 0.3.4", + "ring", + "rustc_version", + "sha2", + "subtle", +] [[package]] name = "socket2" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" +checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", "windows-sys 0.61.2", @@ -4521,6 +4658,7 @@ checksum = "4ccbb212565d2dc177bc15ecb7b039d66c4490da892436a4eee5b394d620c9bc" dependencies = [ "specta-macros", "thiserror 1.0.69", + "uuid", ] [[package]] @@ -4532,7 +4670,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.118", + "syn 2.0.119", ] [[package]] @@ -4579,9 +4717,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "swift-rs" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4057c98e2e852d51fdcfca832aac7b571f6b351ad159f9eda5db1655f8d0c4d7" +checksum = "e45c444e496845d3f2a351146bff59aae4975b2280238df1dfaa0c7d1846f38e" dependencies = [ "base64 0.21.7", "serde", @@ -4600,9 +4738,20 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.118" +version = "2.0.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422" +checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee" dependencies = [ "proc-macro2", "quote", @@ -4620,13 +4769,13 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.13.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 3.0.6", ] [[package]] @@ -4640,7 +4789,7 @@ dependencies = [ "ntapi", "objc2-core-foundation", "objc2-io-kit", - "windows", + "windows 0.61.3", ] [[package]] @@ -4649,7 +4798,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "core-foundation 0.9.4", "system-configuration-sys", ] @@ -4679,11 +4828,10 @@ dependencies = [ [[package]] name = "tao" -version = "0.35.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c93047acf68669466a34690ac58cca7010bd1b201e1ec86f1fd0a75d3dd4a9" +version = "0.37.1" +source = "git+https://github.com/yuezk/tao?rev=1452ae7a42c9f134296ba199f91f514fc9077f61#1452ae7a42c9f134296ba199f91f514fc9077f61" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "block2", "core-foundation 0.10.1", "core-graphics", @@ -4699,33 +4847,32 @@ dependencies = [ "libc", "log", "ndk", + "ndk-context", "ndk-sys", "objc2", "objc2-app-kit", "objc2-foundation", "objc2-ui-kit", - "once_cell", "parking_lot", "percent-encoding", "raw-window-handle", "tao-macros", "unicode-segmentation", "url", - "windows", - "windows-core 0.61.2", + "windows 0.62.2", + "windows-core 0.62.2", "windows-version", "x11-dl", ] [[package]] name = "tao-macros" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd" +version = "0.1.4" +source = "git+https://github.com/yuezk/tao?rev=1452ae7a42c9f134296ba199f91f514fc9077f61#1452ae7a42c9f134296ba199f91f514fc9077f61" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 2.0.119", ] [[package]] @@ -4747,9 +4894,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.11.3" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2616f96cb644bf2c5c456d9de4d5d5100e592d7424c74d8b55c5cb96e359e93" +checksum = "ed99ee9694a2deb776d91cae48ac7411ddfc89ecae2f9b5041111d8c88f2ace9" dependencies = [ "anyhow", "bytes", @@ -4786,21 +4933,21 @@ dependencies = [ "tauri-runtime", "tauri-runtime-wry", "tauri-utils", - "thiserror 2.0.18", + "thiserror 2.0.21", "tokio", "tray-icon", "url", "webkit2gtk", "webview2-com", "window-vibrancy", - "windows", + "windows 0.62.2", ] [[package]] name = "tauri-build" -version = "2.6.3" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9ce40b16101cb6ea63d3e221567affd1c3a9205f95d7bc574941a10636b632" +checksum = "59563ca5b331fd97f27ee9672ec8d36d33bb3c9e2c9f6710a1a5687256052e45" dependencies = [ "anyhow", "cargo_toml", @@ -4819,25 +4966,25 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.6.3" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08279169ff42f8fc45a1dbc9dcae888893ba95288142e5880c59b93a26d2cfc5" +checksum = "e50213e463086ecc283d7e9f51c30cc0fd304ad457425158018be26dbf0d0a80" dependencies = [ "base64 0.22.1", "brotli", "ico", "json-patch", "plist", - "png 0.17.16", + "png 0.18.1", "proc-macro2", "quote", "semver", "serde", "serde_json", "sha2", - "syn 2.0.118", + "syn 2.0.119", "tauri-utils", - "thiserror 2.0.18", + "thiserror 2.0.21", "time", "url", "uuid", @@ -4846,23 +4993,23 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.6.3" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8b394794f399a421811d06966343e7933fcae92d59f5180b9388d1174497a45" +checksum = "8129fb43bb6e0d6b73ad3315cd172beaab17cd28899c594b1b32c80edbbfd99c" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.118", + "syn 2.0.119", "tauri-codegen", "tauri-utils", ] [[package]] name = "tauri-runtime" -version = "2.11.3" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0b4bc95aed361b0019067d189a1174a603d460d0f6c72606512d59fc9c12ec8" +checksum = "c2a57a2a9b8c8b7fc00d35b510fe808ded7f9f1b44fc1cdda6aee38632ea5413" dependencies = [ "cookie", "dpi", @@ -4876,18 +5023,18 @@ dependencies = [ "serde", "serde_json", "tauri-utils", - "thiserror 2.0.18", + "thiserror 2.0.21", "url", "webkit2gtk", "webview2-com", - "windows", + "windows 0.62.2", ] [[package]] name = "tauri-runtime-wry" -version = "2.11.3" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe41e015bf8fc4d6477ff4926a0ef769dc64ff34c7b0038b6f7cacae892acb5c" +checksum = "7f9e7e0c9f80a5130773cfabb6df4dc924518fb1b2c923726966804634b57d22" dependencies = [ "gtk", "http", @@ -4905,15 +5052,15 @@ dependencies = [ "url", "webkit2gtk", "webview2-com", - "windows", + "windows 0.62.2", "wry", ] [[package]] name = "tauri-utils" -version = "2.9.3" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e176a18e67764923c4f1ce66f25ae4abe5f688384d5eb1a0fa6c77f3d90f887" +checksum = "2ff55a614843b9a3f010f211df637c94df2607175b8d0f6e0f4a7c19e18621ee" dependencies = [ "anyhow", "brotli", @@ -4939,8 +5086,8 @@ dependencies = [ "serde_json", "serde_with", "swift-rs", - "thiserror 2.0.18", - "toml 1.1.2+spec-1.1.0", + "thiserror 2.0.21", + "toml 1.1.6+spec-1.1.0", "url", "urlpattern", "uuid", @@ -4955,7 +5102,7 @@ checksum = "cc65d45c68858bfe420dd29e834b5d15dbecf8a07a8a16cf4d532c7b1f69d4b6" dependencies = [ "dunce", "embed-resource", - "toml 1.1.2+spec-1.1.0", + "toml 1.1.6+spec-1.1.0", ] [[package]] @@ -4973,12 +5120,11 @@ dependencies = [ [[package]] name = "tendril" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4790fc369d5a530f4b544b094e31388b9b3a37c0f4652ade4505945f5660d24" +checksum = "5fed54709c5b3a53d09bb1c113ea4f5ceafd1e772ddcb0030a82e1d56c087b08" dependencies = [ "new_debug_unreachable", - "utf-8", ] [[package]] @@ -4992,11 +5138,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.18" +version = "2.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" +checksum = "09e52cb86a36cede5cb101bf8908837b3e4c6e5e59fe7fd85c23fb56200d189e" dependencies = [ - "thiserror-impl 2.0.18", + "thiserror-impl 2.0.21", ] [[package]] @@ -5007,34 +5153,34 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 2.0.119", ] [[package]] name = "thiserror-impl" -version = "2.0.18" +version = "2.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" +checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 3.0.6", ] [[package]] name = "thread_local" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" +checksum = "1ad99c4c6d32803332c548b1af0540b357b3f5fc0be8f6c6bfe8b2e6ae784070" dependencies = [ "cfg-if", ] [[package]] name = "time" -version = "0.3.49" +version = "0.3.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711a53c2d47bbd818258c498c8dbfe186a2526c631495cfe7e078567f86b8469" +checksum = "cdb87b95ec50ddfa440816d227a17b2ccbdda963a316a727fda0fc4334f7d134" dependencies = [ "deranged", "num-conv", @@ -5052,9 +5198,9 @@ checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" [[package]] name = "time-macros" -version = "0.2.29" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71c652a3727a9cbb9a02f707f530b618ce00d0ccd762009c8c23bd191df3c17d" +checksum = "7e689342a48d2ea927c87ea50cabf8594854bf940e9310208848d680d668ed85" dependencies = [ "num-conv", "time-core", @@ -5074,9 +5220,9 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" +checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643" dependencies = [ "displaydoc", "zerovec", @@ -5084,24 +5230,15 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.11.0" +version = "1.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" +checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee" [[package]] name = "tokio" -version = "1.52.3" +version = "1.53.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" +checksum = "e95f91fcc7a621e8b030f6aa23c71fe9838ae2fb4d8118b75602a328f5144044" dependencies = [ "bytes", "libc", @@ -5115,13 +5252,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.7.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" +checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 3.0.6", ] [[package]] @@ -5136,9 +5273,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.4" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" +checksum = "c9cc2678c2cdd569ef8215e2afd7954ada2ae20b4fdd2c5fe6139a3b02d105db" dependencies = [ "rustls", "tokio", @@ -5153,18 +5290,31 @@ dependencies = [ "futures-util", "log", "tokio", - "tungstenite", + "tungstenite 0.29.0", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17a073bfed563fa236697a068031408a93cd9522e08abf9933ead3e73411bd71" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.30.0", ] [[package]] name = "tokio-util" -version = "0.7.18" +version = "0.7.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" +checksum = "494815d09bf52b5548659851081238f0ca39ff638363907596da739561c62c52" dependencies = [ "bytes", "futures-core", "futures-sink", + "libc", "pin-project-lite", "tokio", ] @@ -5183,32 +5333,17 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.12+spec-1.1.0" +version = "1.1.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863" +checksum = "920602543f0911ab71da12c50d59701da54c196d1a2bf5cb4b75667f137a406a" dependencies = [ - "indexmap 2.14.0", - "serde_core", - "serde_spanned 1.1.1", - "toml_datetime 0.7.5+spec-1.1.0", - "toml_parser", - "toml_writer", - "winnow 0.7.15", -] - -[[package]] -name = "toml" -version = "1.1.2+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee" -dependencies = [ - "indexmap 2.14.0", + "indexmap 2.14.2", "serde_core", "serde_spanned 1.1.1", "toml_datetime 1.1.1+spec-1.1.0", "toml_parser", "toml_writer", - "winnow 1.0.3", + "winnow 1.0.4", ] [[package]] @@ -5220,15 +5355,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_datetime" -version = "0.7.5+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" -dependencies = [ - "serde_core", -] - [[package]] name = "toml_datetime" version = "1.1.1+spec-1.1.0" @@ -5244,7 +5370,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.14.2", "toml_datetime 0.6.3", "winnow 0.5.40", ] @@ -5255,7 +5381,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.14.2", "serde", "serde_spanned 0.6.9", "toml_datetime 0.6.3", @@ -5264,30 +5390,30 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.25.12+spec-1.1.0" +version = "0.25.15+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7" +checksum = "1340ea94a5856333492c9064b02c778b191dd2c853778d9609debdcdfea3a614" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.14.2", "toml_datetime 1.1.1+spec-1.1.0", "toml_parser", - "winnow 1.0.3", + "winnow 1.0.4", ] [[package]] name = "toml_parser" -version = "1.1.2+spec-1.1.0" +version = "1.1.3+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" +checksum = "1d38ac1cf9b95face32296c0a3ede1fdc270627c9d9c02a7274dd6d960dc4d56" dependencies = [ - "winnow 1.0.3", + "winnow 1.0.4", ] [[package]] name = "toml_writer" -version = "1.1.1+spec-1.1.0" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db" +checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2" [[package]] name = "tower" @@ -5311,7 +5437,7 @@ version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.2", "bytes", "futures-util", "http", @@ -5357,9 +5483,9 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.24.1" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65ba1e5f6b9ef9fd87e21b9c6f351554dbd717960089168fcfdef854686961dc" +checksum = "b2b9c52859a94554803ccd4a24b98f74148ebc73b90676d783f3490b1bff9d72" dependencies = [ "crossbeam-channel", "dirs", @@ -5373,7 +5499,7 @@ dependencies = [ "once_cell", "png 0.18.1", "serde", - "thiserror 2.0.18", + "thiserror 2.0.21", "windows-sys 0.61.2", ] @@ -5394,9 +5520,25 @@ dependencies = [ "http", "httparse", "log", - "rand", - "sha1", - "thiserror 2.0.18", + "rand 0.9.5", + "sha1 0.10.7", + "thiserror 2.0.21", +] + +[[package]] +name = "tungstenite" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48ac77174b19c110a50ab2128b24215ac9cb40e0e12e093fb602d175c569d22" +dependencies = [ + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand 0.10.3", + "sha1 0.11.0", + "thiserror 2.0.21", ] [[package]] @@ -5417,52 +5559,11 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" -[[package]] -name = "unic-char-property" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" -dependencies = [ - "unic-char-range", -] - -[[package]] -name = "unic-char-range" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" - -[[package]] -name = "unic-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" - -[[package]] -name = "unic-ucd-ident" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e230a37c0381caa9219d67cf063aa3a375ffed5bf541a452db16e744bdab6987" -dependencies = [ - "unic-char-property", - "unic-char-range", - "unic-ucd-version", -] - -[[package]] -name = "unic-ucd-version" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" -dependencies = [ - "unic-common", -] - [[package]] name = "unicode-ident" -version = "1.0.24" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" +checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954" [[package]] name = "unicode-segmentation" @@ -5482,7 +5583,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ - "crypto-common", + "crypto-common 0.1.7", "subtle", ] @@ -5513,28 +5614,16 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "urlpattern" -version = "0.3.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70acd30e3aa1450bc2eece896ce2ad0d178e9c079493819301573dae3c37ba6d" +checksum = "df16f50ef4cc145211879a3867ba757076b25dfee812040dcb0658bd9ae7904b" dependencies = [ + "icu_properties", "regex", "serde", - "unic-ucd-ident", "url", ] -[[package]] -name = "utf-8" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" - -[[package]] -name = "utf8-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1292c0d970b54115d14f2492fe0170adf21d68a1de108eebc51c1df4f346a091" - [[package]] name = "utf8_iter" version = "1.0.4" @@ -5549,9 +5638,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.23.3" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7" +checksum = "97277d36b9c3ace13e58fa6e753f8b0bbbf302a18dd193240d70f9e29681059a" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -5629,9 +5718,9 @@ dependencies = [ [[package]] name = "want" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +checksum = "ec4cdd0dd910afe868b7ef477227d8d538b46b3075031afee8a9f2acb0a2ed0b" dependencies = [ "try-lock", ] @@ -5671,9 +5760,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.125" +version = "0.2.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a" +checksum = "9bb54f33acc68fd454578d9820b0bde1a1a3d17aa17bb7b6595806d02886d409" dependencies = [ "cfg-if", "once_cell", @@ -5684,19 +5773,20 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.75" +version = "0.4.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280" +checksum = "3cbab34de2d982e9b48e18d216d04c4a6f641066ff19ffb699980f591ee3610e" dependencies = [ "js-sys", + "tokio", "wasm-bindgen", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.125" +version = "0.2.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d" +checksum = "2e29d0c35b16e224a7eeb5cd2d25e3e1968fbd65604117b44d3b789d00ee8535" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5704,22 +5794,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.125" +version = "0.2.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd" +checksum = "6f501a8bc3719dba86ef8ae4728879c08001bea749eb1333ac5b91e040e2a6b7" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.118", + "syn 3.0.6", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.125" +version = "0.2.129" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f" +checksum = "23f0c9c52aa7cd7d77769a4cfe2a9adb1b331f489a41d912ce14513d5ab995c6" dependencies = [ "unicode-ident", ] @@ -5739,9 +5829,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.102" +version = "0.3.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6430a72df5eb332242960fe84b3002a241163998241eb596d4f739b9757061d" +checksum = "88261b9deccee56594c11a3460c462c41f58d148598fe70ad77070126a68aba4" dependencies = [ "js-sys", "wasm-bindgen", @@ -5759,9 +5849,9 @@ dependencies = [ [[package]] name = "web_atoms" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "075474b12bcb3d2e3d4546580e9de478eeeead668a1761e2a8860c836b7ef297" +checksum = "ba8b815c1b593dc0baf78dd0f4fc8fdb2de53198fb1163738093e9a311c33fb3" dependencies = [ "phf", "phf_codegen", @@ -5771,15 +5861,15 @@ dependencies = [ [[package]] name = "webbrowser" -version = "1.2.1" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fc95580916af1e68ff6a7be07446fc5db73ebf71cf092de939bbf5f7e189f72" +checksum = "62c35be770821a214dbc362fc26908c853e776c0004294d0b10b8a6bad582f94" dependencies = [ - "core-foundation 0.10.1", "jni 0.22.4", "log", "ndk-context", "objc2", + "objc2-app-kit", "objc2-foundation", "url", "web-sys", @@ -5829,27 +5919,16 @@ dependencies = [ "system-deps", ] -[[package]] -name = "webpki-root-certs" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d46a5a140e6f7afeccd8eae97eff335163939eac8b929834875168b29b3d267" -dependencies = [ - "rustls-pki-types", -] - [[package]] name = "webview2-com" -version = "0.38.2" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7130243a7a5b33c54a444e54842e6a9e133de08b5ad7b5861cd8ed9a6a5bc96a" +checksum = "3f89fca7a704cee10dcb3654c1dbb8941d1783132f1917358af75bec37a7d7e6" dependencies = [ "webview2-com-macros", "webview2-com-sys", - "windows", - "windows-core 0.61.2", - "windows-implement", - "windows-interface", + "windows 0.62.2", + "windows-core 0.62.2", ] [[package]] @@ -5860,34 +5939,34 @@ checksum = "67a921c1b6914c367b2b823cd4cde6f96beec77d30a939c8199bb377cf9b9b54" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 2.0.119", ] [[package]] name = "webview2-com-sys" -version = "0.38.2" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c" +checksum = "b3a07132775117d6065853d9d1178157b8c90e228de47129d6bce2c7edebedfb" dependencies = [ - "thiserror 2.0.18", - "windows", - "windows-core 0.61.2", + "thiserror 2.0.21", + "windows 0.62.2", + "windows-core 0.62.2", ] [[package]] name = "which" -version = "8.0.4" +version = "8.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d7cd18d4acb58fb3cdfe9ea54e6cd96a4e7d4cc45c56338b236e82dad47248" +checksum = "bae2f2b2b816647a1cab1acc91f5bd20812d53cb344382635ec2181940c8034f" dependencies = [ "libc", ] [[package]] name = "whoami" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "998767ef88740d1f5b0682a9c53c24431453923962269c2db68ee43788c5a40d" +checksum = "626c4bac6755d76ffc12cb01b2eac751db1996b9e0041de9aa02c8c211ddc82c" dependencies = [ "libc", "libredox", @@ -5929,16 +6008,17 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window-vibrancy" -version = "0.6.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c" +checksum = "111e51caca442cafd9bab396628ac4d814880eaea4e63dfd76a12e9f342b5580" dependencies = [ "objc2", "objc2-app-kit", "objc2-core-foundation", "objc2-foundation", + "objc2-quartz-core", "raw-window-handle", - "windows-sys 0.59.0", + "windows-sys 0.61.2", "windows-version", ] @@ -5948,11 +6028,23 @@ version = "0.61.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" dependencies = [ - "windows-collections", + "windows-collections 0.2.0", "windows-core 0.61.2", - "windows-future", + "windows-future 0.2.1", "windows-link 0.1.3", - "windows-numerics", + "windows-numerics 0.2.0", +] + +[[package]] +name = "windows" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" +dependencies = [ + "windows-collections 0.3.2", + "windows-core 0.62.2", + "windows-future 0.3.2", + "windows-numerics 0.3.1", ] [[package]] @@ -5964,6 +6056,15 @@ dependencies = [ "windows-core 0.61.2", ] +[[package]] +name = "windows-collections" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" +dependencies = [ + "windows-core 0.62.2", +] + [[package]] name = "windows-core" version = "0.61.2" @@ -5998,7 +6099,18 @@ checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" dependencies = [ "windows-core 0.61.2", "windows-link 0.1.3", - "windows-threading", + "windows-threading 0.1.0", +] + +[[package]] +name = "windows-future" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" +dependencies = [ + "windows-core 0.62.2", + "windows-link 0.2.1", + "windows-threading 0.2.1", ] [[package]] @@ -6009,7 +6121,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 2.0.119", ] [[package]] @@ -6020,7 +6132,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 2.0.119", ] [[package]] @@ -6045,6 +6157,16 @@ dependencies = [ "windows-link 0.1.3", ] +[[package]] +name = "windows-numerics" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" +dependencies = [ + "windows-core 0.62.2", + "windows-link 0.2.1", +] + [[package]] name = "windows-registry" version = "0.6.1" @@ -6194,6 +6316,15 @@ dependencies = [ "windows-link 0.1.3", ] +[[package]] +name = "windows-threading" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" +dependencies = [ + "windows-link 0.2.1", +] + [[package]] name = "windows-version" version = "0.1.7" @@ -6352,27 +6483,21 @@ dependencies = [ [[package]] name = "winnow" -version = "0.7.15" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" - -[[package]] -name = "winnow" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1" +checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.55.0" +version = "0.56.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97" +checksum = "7d6f32a0ff4a9f6f01231eb2059cc85479330739333e0e58cadf03b6af2cca10" dependencies = [ "cfg-if", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -6383,15 +6508,15 @@ checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" [[package]] name = "writeable" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" +checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc" [[package]] name = "wry" -version = "0.55.1" +version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186f9871daa55fd9c016578b810d149de58367113db7fb72b462d2323ce19514" +checksum = "a819957a01b3119af85e638a38d242af76dbc87d130dca67bfd0441072e21ff0" dependencies = [ "base64 0.22.1", "block2", @@ -6420,13 +6545,13 @@ dependencies = [ "sha2", "soup3", "tao-macros", - "thiserror 2.0.18", + "thiserror 2.0.21", "url", "webkit2gtk", "webkit2gtk-sys", "webview2-com", - "windows", - "windows-core 0.61.2", + "windows 0.62.2", + "windows-core 0.62.2", "windows-version", "x11-dl", ] @@ -6464,9 +6589,9 @@ dependencies = [ [[package]] name = "xml" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "636f85e5ca6488e96401b61eb7de54f4e44755c988af0f52cf90230c312a1a89" +checksum = "2f45bb2c13fec6a6cb4c0f76a7e94839e110a14ec803ec2940777a94c347bc52" [[package]] name = "xmltree" @@ -6474,7 +6599,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbc04313cab124e498ab1724e739720807b6dc405b9ed0edc5860164d2e4ff70" dependencies = [ - "indexmap 2.14.0", + "indexmap 2.14.2", "xml", ] @@ -6500,34 +6625,34 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" +checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 3.0.6", "synstructure", ] [[package]] name = "zerocopy" -version = "0.8.52" +version = "0.8.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f" +checksum = "879fb705ce98c32e41ebdb970fbe1204f8492423b314c6ab0354c3e7b5542866" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.52" +version = "0.8.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930" +checksum = "708882a28301d604fa039cc7727607a98d04c4b86dc76ec9cc683f805d709759" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 2.0.119", ] [[package]] @@ -6541,27 +6666,30 @@ dependencies = [ [[package]] name = "zerofrom-derive" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" +checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 3.0.6", "synstructure", ] [[package]] name = "zeroize" -version = "1.9.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" +checksum = "e13084392c5e4bc371903e2935a5eaeed24905a7511356b883835e18a78f6879" +dependencies = [ + "serde", +] [[package]] name = "zerotrie" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" +checksum = "4ea269c3bd32f0a32c321907a2ae912ba6f4649bb0fc764a15627e99a7095a3f" dependencies = [ "displaydoc", "yoke", @@ -6570,9 +6698,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" +checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8" dependencies = [ "yoke", "zerofrom", @@ -6581,17 +6709,23 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" +checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.118", + "syn 3.0.6", ] [[package]] -name = "zmij" -version = "1.0.21" +name = "zlib-rs" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" +checksum = "b268e58e7c693d7c271f93ffc4ba3b380412554231c85bf61ca7af91042a4112" + +[[package]] +name = "zmij" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" diff --git a/Cargo.toml b/Cargo.toml index d5bb32d..6c206e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,8 +10,8 @@ members = [ ] [workspace.package] -rust-version = "1.89" -version = "2.6.5" +rust-version = "1.91" +version = "3.0.0" authors = ["Kevin Yue "] homepage = "https://github.com/yuezk/GlobalProtect-openconnect" edition = "2024" @@ -31,7 +31,7 @@ env_logger = "0.11" is_executable = "1.0" log = "0.4" regex = "1" -reqwest = { version = "0.13", features = ["native-tls", "json", "form", "query"] } +reqwest = { version = "0.13", default-features = false, features = ["native-tls", "charset", "http2", "system-proxy", "json", "form", "query"] } openssl = "0.10" pem = "3" xmltree = { version = "0.12", features = ["attribute-order"] } @@ -59,12 +59,20 @@ which = "8" uuid = "1" netdev = "0.40" humantime = "2" +snow = { version = "0.10", default-features = false, features = ["std", "use-getrandom", "use-curve25519", "use-chacha20poly1305", "use-sha2"] } +zeroize = "1" # Tauri dependencies tauri = { version = "2" } specta = "=2.0.0-rc.20" proptest = "1" +[patch.crates-io] +# Restore BSD GTK resize hit testing until https://github.com/tauri-apps/tao/pull/1356 is released. +tao = { git = "https://github.com/yuezk/tao", rev = "1452ae7a42c9f134296ba199f91f514fc9077f61" } +# Use one macro source for Tao and Wry so Cargo can vendor the workspace. +tao-macros = { git = "https://github.com/yuezk/tao", rev = "1452ae7a42c9f134296ba199f91f514fc9077f61" } + [profile.release] opt-level = 'z' # Optimize for size lto = true # Enable link-time optimization diff --git a/Makefile b/Makefile index a929f53..155dd50 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ SHELL := /bin/sh INCLUDE_GUI ?= 0 CARGO ?= cargo DISABLE_RUST_TOOLCHAIN ?= 0 -RUST_VERSION ?= 1.89 +RUST_VERSION ?= 1.91 IGNORE_RUST_VERSION ?= 0 VERSION = $(shell grep '^version' Cargo.toml | head -1 | sed 's/version *= *"\(.*\)"/\1/') @@ -64,6 +64,9 @@ endif default: build +dev-service: + ./scripts/dev-service.sh + version: @echo $(VERSION) @@ -142,6 +145,8 @@ install: install -Dm755 target/release/gpclient $(DESTDIR)/usr/bin/gpclient install -Dm755 target/release/gpauth $(DESTDIR)/usr/bin/gpauth install -Dm755 target/release/gpservice $(DESTDIR)/usr/bin/gpservice + install -Dm755 target/release/gp-hip-script-installer $(DESTDIR)/usr/libexec/gpclient/gp-hip-script-installer + install -Dm755 target/release/gp-vpnc-script-installer $(DESTDIR)/usr/libexec/gpclient/gp-vpnc-script-installer # Install the GUI components if BUILD_GUI_HELPER is set to 1 if [ $(BUILD_GUI_HELPER) -eq 1 ]; then \ @@ -153,7 +158,6 @@ install: fi install -Dm755 packaging/files/usr/libexec/gpclient/vpnc-script $(DESTDIR)/usr/libexec/gpclient/vpnc-script - install -Dm755 packaging/files/usr/libexec/gpclient/hipreport.sh $(DESTDIR)/usr/libexec/gpclient/hipreport.sh # Install the disconnect hooks install -Dm755 packaging/files/usr/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down @@ -163,7 +167,14 @@ install: install -Dm644 packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg install -Dm644 packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/gpgui.png install -Dm644 packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpgui.png + install -Dm644 packaging/files/usr/share/icons/hicolor/256x256/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/256x256/apps/gpgui.png install -Dm644 packaging/files/usr/share/icons/hicolor/256x256@2/apps/gpgui.png $(DESTDIR)/usr/share/icons/hicolor/256x256@2/apps/gpgui.png + install -Dm644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg + install -Dm644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg + install -Dm644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg + install -Dm644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg + install -Dm644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg + install -Dm644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg install -Dm644 packaging/files/usr/share/polkit-1/actions/com.yuezk.gpgui.policy $(DESTDIR)/usr/share/polkit-1/actions/com.yuezk.gpgui.policy install-bsd: @@ -183,19 +194,29 @@ install-bsd: fi install -d $(DESTDIR)$(PREFIX)/libexec/gpclient + install -m 755 target/release/gp-hip-script-installer $(DESTDIR)$(PREFIX)/libexec/gpclient/gp-hip-script-installer + install -m 755 target/release/gp-vpnc-script-installer $(DESTDIR)$(PREFIX)/libexec/gpclient/gp-vpnc-script-installer install -m 755 packaging/files/usr/libexec/gpclient/vpnc-script $(DESTDIR)$(PREFIX)/libexec/gpclient/vpnc-script - install -m 755 packaging/files/usr/libexec/gpclient/hipreport.sh $(DESTDIR)$(PREFIX)/libexec/gpclient/hipreport.sh install -d $(DESTDIR)$(PREFIX)/share/applications install -m 644 packaging/bsd/gpgui.desktop $(DESTDIR)$(PREFIX)/share/applications/gpgui.desktop install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps + install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256@2/apps + install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/status install -m 644 packaging/files/usr/share/icons/hicolor/scalable/apps/gpgui.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/gpgui.svg install -m 644 packaging/files/usr/share/icons/hicolor/32x32/apps/gpgui.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/gpgui.png install -m 644 packaging/files/usr/share/icons/hicolor/128x128/apps/gpgui.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/128x128/apps/gpgui.png + install -m 644 packaging/files/usr/share/icons/hicolor/256x256/apps/gpgui.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/gpgui.png install -m 644 packaging/files/usr/share/icons/hicolor/256x256@2/apps/gpgui.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256@2/apps/gpgui.png + install -m 644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg + install -m 644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg + install -m 644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg + install -m 644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg + install -m 644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg + install -m 644 packaging/files/usr/share/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg install -d $(DESTDIR)$(PREFIX)/share/polkit-1/actions install -m 644 packaging/bsd/com.yuezk.gpgui.policy $(DESTDIR)$(PREFIX)/share/polkit-1/actions/com.yuezk.gpgui.policy @@ -216,7 +237,7 @@ bsd-gpgui-tarball: package-freebsd: BSD_FLAVOR=freebsd package-freebsd: clean-bsd-package test -x "$(GPGUI_BINARY)" - mkdir -p .build/freebsd/pkgroot .build/freebsd/artifacts + mkdir -p .build/freebsd/pkgroot .build/freebsd/artifacts .build/freebsd/metadata $(MAKE) install-bsd DESTDIR=$(CURDIR)/.build/freebsd/pkgroot PREFIX=$(PREFIX) GPGUI_BINARY="$(GPGUI_BINARY)" find .build/freebsd/pkgroot$(PREFIX) -type f -print | sed 's|^.build/freebsd/pkgroot$(PREFIX)/||' | sort > .build/freebsd/PLIST freebsd_major=$$(freebsd-version -u | sed 's/\..*//'); \ @@ -227,8 +248,9 @@ package-freebsd: clean-bsd-package -e "s/@ABI@/FreeBSD:$$freebsd_major:$$freebsd_arch/g" \ -e "s/@ARCH@/freebsd:$$freebsd_major:$$freebsd_arch/g" \ -e 's|@PREFIX@|$(PREFIX)|g' \ - packaging/bsd/freebsd/MANIFEST.in > .build/freebsd/+MANIFEST - pkg create -r .build/freebsd/pkgroot -M .build/freebsd/+MANIFEST -p .build/freebsd/PLIST -o .build/freebsd/artifacts + packaging/bsd/freebsd/MANIFEST.in > .build/freebsd/metadata/+MANIFEST + cp packaging/bsd/freebsd/POST_DEINSTALL .build/freebsd/metadata/+POST_DEINSTALL + pkg create -r .build/freebsd/pkgroot -M .build/freebsd/metadata -p .build/freebsd/PLIST -o .build/freebsd/artifacts freebsd_arch=$$(uname -m | sed -e 's/x86_64/amd64/' -e 's/arm64/aarch64/'); \ mv .build/freebsd/artifacts/$(PKG_NAME)-$(VERSION).pkg .build/freebsd/artifacts/$(PKG_NAME)-$(VERSION)-freebsd-$$freebsd_arch.pkg $(MAKE) bsd-gpgui-tarball BSD_FLAVOR=freebsd GPGUI_BINARY="$(GPGUI_BINARY)" @@ -240,12 +262,20 @@ package-openbsd: clean-bsd-package $(MAKE) install-bsd DESTDIR=$(CURDIR)/.build/openbsd/pkgroot PREFIX=$(PREFIX) GPGUI_BINARY="$(GPGUI_BINARY)" cp packaging/bsd/openbsd/COMMENT .build/openbsd/+COMMENT cp packaging/bsd/openbsd/DESC .build/openbsd/+DESC - find .build/openbsd/pkgroot$(PREFIX) -type f -print | sed 's|^.build/openbsd/pkgroot$(PREFIX)/||' | sort > .build/openbsd/PLIST + { \ + echo '@unexec-delete /bin/rm -f /usr/local/libexec/gpclient/gpgui /var/db/gpclient/scripts/vpnc-script /var/db/gpclient/scripts/vpnc-script.metadata || echo "Warning: failed to remove gpclient runtime files" >&2'; \ + echo '@unexec-delete /bin/rmdir /usr/local/libexec/gpclient 2>/dev/null || true'; \ + echo '@unexec-delete /bin/rmdir /var/db/gpclient/scripts 2>/dev/null || true'; \ + echo '@unexec-delete /bin/rmdir /var/db/gpclient 2>/dev/null || true'; \ + find .build/openbsd/pkgroot$(PREFIX) -type f -print | sed 's|^.build/openbsd/pkgroot$(PREFIX)/||' | sort; \ + } > .build/openbsd/PLIST comment=$$(cat .build/openbsd/+COMMENT); \ openbsd_arch=$$(uname -m | sed 's/x86_64/amd64/'); \ gnome_keyring_pkg=$$(pkg_info -e 'gnome-keyring-*' | sed 's/^inst://' | head -n 1); \ + dbus_pkg=$$(pkg_info -e 'dbus-*' | sed 's/^inst://' | head -n 1); \ polkit_pkg=$$(pkg_info -e 'polkit-*' | sed 's/^inst://' | head -n 1); \ webkitgtk_pkg=$$(pkg_info -e 'webkitgtk41-*' | sed 's/^inst://' | head -n 1); \ + xdg_utils_pkg=$$(pkg_info -e 'xdg-utils-*' | sed 's/^inst://' | head -n 1); \ pkg_create \ -B .build/openbsd/pkgroot \ -D COMMENT="$$comment" \ @@ -253,8 +283,10 @@ package-openbsd: clean-bsd-package -f .build/openbsd/PLIST \ -p $(PREFIX) \ -P x11/gnome/keyring:gnome-keyring-*:$$gnome_keyring_pkg \ + -P x11/dbus:dbus-*:$$dbus_pkg \ -P sysutils/polkit:polkit-*:$$polkit_pkg \ -P www/webkitgtk4,webkitgtk41:webkitgtk41-*:$$webkitgtk_pkg \ + -P devel/xdg-utils:xdg-utils-*:$$xdg_utils_pkg \ .build/openbsd/artifacts/$(PKG_NAME)-$(VERSION)-openbsd-$$openbsd_arch.tgz $(MAKE) bsd-gpgui-tarball BSD_FLAVOR=openbsd GPGUI_BINARY="$(GPGUI_BINARY)" @@ -264,11 +296,12 @@ uninstall: rm -f $(DESTDIR)/usr/bin/gpclient rm -f $(DESTDIR)/usr/bin/gpauth rm -f $(DESTDIR)/usr/bin/gpservice + rm -f $(DESTDIR)/usr/libexec/gpclient/gp-hip-script-installer rm -f $(DESTDIR)/usr/bin/gpgui-helper rm -f $(DESTDIR)/usr/bin/gpgui rm -f $(DESTDIR)/usr/libexec/gpclient/vpnc-script - rm -f $(DESTDIR)/usr/libexec/gpclient/hipreport.sh + rm -f $(DESTDIR)/usr/libexec/gpclient/gp-vpnc-script-installer rm -f $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down rm -f $(DESTDIR)/usr/lib/NetworkManager/dispatcher.d/gpclient-nm-hook @@ -277,9 +310,23 @@ uninstall: rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/gpgui.svg rm -f $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/gpgui.png rm -f $(DESTDIR)/usr/share/icons/hicolor/128x128/apps/gpgui.png + rm -f $(DESTDIR)/usr/share/icons/hicolor/256x256/apps/gpgui.png rm -f $(DESTDIR)/usr/share/icons/hicolor/256x256@2/apps/gpgui.png + rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connected-symbolic.svg + rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-disconnected-symbolic.svg + rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-1-symbolic.svg + rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-2-symbolic.svg + rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-3-symbolic.svg + rm -f $(DESTDIR)/usr/share/icons/hicolor/scalable/status/gpgui-connecting-4-symbolic.svg rm -f $(DESTDIR)/usr/share/polkit-1/actions/com.yuezk.gpgui.policy + rm -f $(DESTDIR)/var/lib/gpclient/gpgui \ + $(DESTDIR)/var/lib/gpclient/scripts/vpnc-script \ + $(DESTDIR)/var/lib/gpclient/scripts/vpnc-script.metadata || \ + echo "Warning: failed to remove gpclient runtime files" >&2 + rmdir $(DESTDIR)/var/lib/gpclient/scripts 2>/dev/null || true + rmdir $(DESTDIR)/var/lib/gpclient 2>/dev/null || true + clean-debian: rm -rf .build/deb @@ -298,18 +345,19 @@ init-debian: clean-debian tarball sed -i "s/@RUST_VERSION@/$(RUST_VERSION)/g" .build/deb/$(PKG)/debian/control - # Remove the GUI dependencies if BUILD_GUI_HELPER is set to 0 - if [ $(BUILD_GUI_HELPER) -eq 0 ]; then \ + # Remove the GUI dependencies if neither GUI component is included + if [ $(INCLUDE_GUI) -eq 0 ] && [ $(BUILD_GUI_HELPER) -eq 0 ]; then \ sed -i "/libsecret-1-0/d" .build/deb/$(PKG)/debian/control; \ sed -i "/libayatana-appindicator3-1/d" .build/deb/$(PKG)/debian/control; \ sed -i "/gnome-keyring/d" .build/deb/$(PKG)/debian/control; \ fi - # Remove the WebKitGTK build dependency only if neither gpauth webview auth nor gpgui-helper needs it - if [ $(BUILD_GUI_HELPER) -eq 0 ] && [ $(BUILD_WEBVIEW_AUTH) -eq 0 ]; then \ + # Remove WebKitGTK only if no included component needs it + if [ $(INCLUDE_GUI) -eq 0 ] && [ $(BUILD_GUI_HELPER) -eq 0 ] && [ $(BUILD_WEBVIEW_AUTH) -eq 0 ]; then \ sed -i "/libwebkit2gtk-4.1-dev/d" .build/deb/$(PKG)/debian/control; \ fi + sed -i "s/@INCLUDE_GUI@/$(INCLUDE_GUI)/g" .build/deb/$(PKG)/debian/rules sed -i "s/@BUILD_GUI_HELPER@/$(BUILD_GUI_HELPER)/g" .build/deb/$(PKG)/debian/rules sed -i "s/@BUILD_WEBVIEW_AUTH@/$(BUILD_WEBVIEW_AUTH)/g" .build/deb/$(PKG)/debian/rules sed -i "s/@RUST_VERSION@/$(RUST_VERSION)/g" .build/deb/$(PKG)/debian/rules @@ -386,6 +434,7 @@ init-pkgbuild: clean-pkgbuild tarball cp .build/tarball/${PKG}.tar.gz .build/pkgbuild cp packaging/pkgbuild/PKGBUILD.in .build/pkgbuild/PKGBUILD + cp packaging/pkgbuild/gp.install .build/pkgbuild/gp.install sed -i "s/@PKG_NAME@/$(PKG_NAME)/g" .build/pkgbuild/PKGBUILD sed -i "s/@VERSION@/$(VERSION)/g" .build/pkgbuild/PKGBUILD @@ -402,6 +451,7 @@ init-apk: clean-apk tarball cp .build/tarball/${PKG}.tar.gz .build/apk cp packaging/apk/APKBUILD.in .build/apk/APKBUILD + cp packaging/apk/post-deinstall .build/apk/$(PKG_NAME).post-deinstall sed -i "s/@PKG_NAME@/$(PKG_NAME)/g" .build/apk/APKBUILD sed -i "s/@VERSION@/$(VERSION)/g" .build/apk/APKBUILD @@ -409,14 +459,14 @@ init-apk: clean-apk tarball checksum=$$(sha512sum .build/apk/${PKG}.tar.gz | cut -d' ' -f1); \ sed -i "s/@SHA512@/$$checksum/g" .build/apk/APKBUILD - # Remove the GUI dependencies if BUILD_GUI_HELPER is set to 0 - if [ $(BUILD_GUI_HELPER) -eq 0 ]; then \ + # Remove the GUI dependencies if neither GUI component is included + if [ $(INCLUDE_GUI) -eq 0 ] && [ $(BUILD_GUI_HELPER) -eq 0 ]; then \ sed -i "/^\tlibayatana-appindicator$$/d" .build/apk/APKBUILD; \ sed -i "/^\tlibsecret$$/d" .build/apk/APKBUILD; \ fi - # Remove the WebKitGTK dependency only if neither gpauth webview auth nor gpgui-helper needs it - if [ $(BUILD_GUI_HELPER) -eq 0 ] && [ $(BUILD_WEBVIEW_AUTH) -eq 0 ]; then \ + # Remove WebKitGTK only if no included component needs it + if [ $(INCLUDE_GUI) -eq 0 ] && [ $(BUILD_GUI_HELPER) -eq 0 ] && [ $(BUILD_WEBVIEW_AUTH) -eq 0 ]; then \ sed -i "/^\twebkit2gtk-4.1$$/d" .build/apk/APKBUILD; \ fi diff --git a/README.md b/README.md index 5166236..82931fe 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # GlobalProtect-openconnect -A modern GlobalProtect VPN client for Linux, built on OpenConnect with full support for SSO authentication. This project provides both command-line and graphical interfaces for seamless VPN connectivity. +A GlobalProtect VPN client built on OpenConnect with support for SSO authentication. It provides command-line tools for Linux, FreeBSD, and OpenBSD, and the GP Connect desktop application for macOS, Linux, FreeBSD, and OpenBSD.

@@ -15,23 +15,27 @@ A modern GlobalProtect VPN client for Linux, built on OpenConnect with full supp - [Command-Line Interface](#command-line-interface) - [Graphical User Interface](#graphical-user-interface) - [Installation](#installation) + - [macOS](#macos) - [Debian / Ubuntu](#debian--ubuntu) - [Arch Linux / Manjaro](#arch-linux--manjaro) - [Fedora 38+ / Rawhide](#fedora-38--rawhide) - [openSUSE Leap 15.6+ / Tumbleweed](#opensuse-leap-156--tumbleweed) - [Other RPM-based Distributions](#other-rpm-based-distributions) - [Alpine Linux](#alpine-linux) + - [FreeBSD](#freebsd) + - [OpenBSD](#openbsd) - [Gentoo](#gentoo) - [NixOS](#nixos) - [Official Docker Image](#official-docker-image) - [Other Distributions](#other-distributions) - [Building from Source](#building-from-source) - [Frequently Asked Questions](#frequently-asked-questions) -- [License](#license) +- [NetworkManager Integration](#networkmanager-integration) +- [Licensing](#licensing) ## Features -- **Cross-Platform Linux Support** – Optimized for various Linux distributions +- **Desktop Platform Support** – macOS, Linux, FreeBSD, and OpenBSD - **Dual Interface** – Available as both CLI and GUI applications - **Flexible Authentication** – Supports SSO, non-SSO, FIDO2 (e.g., YubiKey), and client certificate authentication - **Browser Integration** – Authenticate using your default browser or any specified browser @@ -44,7 +48,7 @@ A modern GlobalProtect VPN client for Linux, built on OpenConnect with full supp ### Command-Line Interface -The CLI version is fully open source and feature-rich, providing nearly identical functionality to the GUI version. +The CLI is free and open source. Use it to authenticate, connect to portals or gateways, and generate HIP reports from the terminal. #### Basic Commands @@ -61,6 +65,7 @@ Commands: Options: --fix-openssl Uses extended compatibility mode for OpenSSL operations to support a broader range of systems and formats. --ignore-tls-errors Ignore the TLS errors + --lock-file Path to the gpclient PID lock file --log-format Log output format. JSON is intended for non-interactive consumers; interactive prompts remain text. [default: text] [possible values: text, json] -v, --verbose... Enable verbose output, -v for debug, -vv for trace -q, --quiet... Decrease logging verbosity, -q for warnings, -qq for errors @@ -70,29 +75,48 @@ Options: > **Tip:** Use `gpclient help ` for detailed information on a specific command. -#### External Browser Authentication +#### HIP reports -For browser-based authentication with the CLI: +HIP is disabled in the CLI unless enabled explicitly. Use `--hip` to generate reports inside `gpclient`, including later reports requested by the gateway: -**Method 1:** Using sudo with environment preservation: ```bash -sudo gpclient connect --browser +sudo gpclient connect --hip ``` -**Method 2:** Using authentication piping: +Use `--hip=/absolute/path/to/script` for a custom executable. It runs as the `gpclient` process user unless `--hip-user` specifies another user. No installed HIP script is discovered automatically. `--hip-user` applies only to custom executables. + +`gpclient hip` generates a report on demand for inspection; see `gpclient hip --help` for report inputs. The GUI's HIP tab supports generated reports, edited XML, and HIP Off on all desktop platforms. Linux, FreeBSD, and OpenBSD also support desktop-user scripts and explicitly approved root scripts. + +#### External Browser Authentication + +Use `gpclient` directly for browser-based authentication. It opens the browser as your normal desktop user while keeping VPN tunnel setup privileged: + ```bash -gpauth --browser 2>/dev/null | sudo gpclient connect --cookie-on-stdin +sudo gpclient connect --browser +``` + +To reuse a saved portal cookie for later connections, add `--cookie-cache`: + +```bash +sudo gpclient connect --browser --cookie-cache +``` + +Add `--gateway ` to select a particular gateway. Cookie caching is handled by `gpclient`. Its default cache file is `$HOME/.config/gpclient/cookie.json`, which normally belongs to root when running with `sudo`. To choose a predictable location, specify the path explicitly: + +```bash +sudo gpclient connect --browser --cookie-cache=/absolute/path/to/cookie.json ``` **Browser Options:** -- Use `--browser` to auto-select Chrome, Firefox, then the system default browser + +- Use `--browser` to try your recognized default browser first, then another detected browser, and finally the system URL handler - Use `--browser default` to use the system default browser - Use `--browser ` to specify a browser (e.g., `firefox`, `chrome`) - Use `--browser remote` for headless servers – this provides a URL you can access from another machine to complete authentication ### Graphical User Interface -The GUI application provides an intuitive interface for managing VPN connections. Launch it from your application menu or via the terminal: +GP Connect provides a desktop interface for managing VPN connections. On macOS, open GP Connect from Applications. On Linux, FreeBSD, and OpenBSD, launch it from your application menu or via the terminal: ```bash gpclient launch-gui @@ -108,6 +132,10 @@ gpclient launch-gui > > For older Linux distributions, use [v2.3.13](https://github.com/yuezk/GlobalProtect-openconnect/releases/tag/v2.3.13) instead of the latest release. It provides release assets for common distro families, including Debian/Ubuntu (`.deb`), Arch Linux / Manjaro (`.pkg.tar.zst`), RPM-based distros such as Fedora / RHEL / Rocky / AlmaLinux / CentOS (`.rpm`), and generic Linux tarballs (`.bin.tar.xz`). +### macOS + +Download the GP Connect `.dmg` from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page, open it, and drag GP Connect into Applications. The macOS build requires Apple silicon and macOS 13 or later. + ### Debian / Ubuntu #### Option 1: Install from PPA (Recommended) @@ -130,7 +158,7 @@ sudo apt-get install globalprotect-openconnect Download the latest `.deb` package from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page, then install: ```bash -sudo apt install --fix-broken globalprotect-openconnect_*.deb +sudo apt install --fix-broken ./globalprotect-openconnect_*.deb ``` ### Arch Linux / Manjaro @@ -244,6 +272,7 @@ Add the flake input and NixOS module to your `flake.nix`: The module builds the package with your NixOS configuration's `pkgs`, so the GlobalProtect GUI and the system use the same Nixpkgs dependency versions. +It also enables Polkit and its setuid `pkexec` wrapper for privileged operations. ```nix { @@ -289,9 +318,22 @@ After logging back in to GNOME, enable AppIndicator support if needed: gnome-extensions enable appindicatorsupport@rgcjonas.gmail.com ``` +NixOS does not run an imperative package-uninstall hook when a package is +removed from the system configuration. Remove an installed replacement VPN +script from the app settings before removing the package. + +The `prebuilt` package and NixOS module use the published release pinned in `flake.nix`. Both `prebuilt` and `fromSource` run natively on the host with packaged dependencies and installer paths. The `fromSource` package builds the current flake checkout, including its Git submodules: + +```bash +git submodule update --init --recursive +nix build "git+file://$PWD?submodules=1#fromSource" +``` + +Local source builds require initialized Git submodules and a flake URL with `submodules=1`, as shown above. For a remote source flake, use a Git URL with submodules enabled, such as `git+https://github.com/yuezk/GlobalProtect-openconnect?submodules=1#fromSource`. The `prebuilt` package and NixOS module do not require Git submodules. Build output (`target`, `.build`, and `node_modules`) is excluded from the source input. Updating release asset hashes changes the prebuilt package, independently of source builds. + ### Official Docker Image -The official Docker image provides the CLI tools on Alpine Linux: +The [official Docker image](https://hub.docker.com/r/yuezk/globalprotect-openconnect) provides the CLI tools on Alpine Linux: ```bash docker pull yuezk/globalprotect-openconnect: @@ -304,7 +346,7 @@ Run it with access to the TUN device: ```bash docker run --rm -it --cap-add=NET_ADMIN --device=/dev/net/tun \ yuezk/globalprotect-openconnect: \ - connect --cookie-on-stdin + connect ``` For browser authentication in a headless environment, use remote browser authentication: @@ -315,6 +357,12 @@ docker run --rm -it --cap-add=NET_ADMIN --device=/dev/net/tun \ connect --browser remote ``` +On a host with multiple network interfaces, use `--browser-listen` to select the IP address reachable from the browser machine: + +```bash +gpclient connect --browser remote --browser-listen 192.168.107.15 +``` + On a Linux host, add host networking if the VPN routes should affect the host network namespace: ```bash @@ -325,16 +373,6 @@ docker run --rm -it --network host --cap-add=NET_ADMIN --device=/dev/net/tun \ Without `--network host`, the VPN connection stays inside the container's network namespace. Docker Desktop on macOS and Windows does not make the host use the VPN through `--network host`; run `gpclient` on the host or use a container gateway setup for host traffic. -Alternatively, pipe `gpauth` remote-browser output into `gpclient`: - -```bash -docker run --rm -it --entrypoint gpauth yuezk/globalprotect-openconnect: \ - --browser remote 2>/dev/null \ - | docker run --rm -i --cap-add=NET_ADMIN --device=/dev/net/tun \ - yuezk/globalprotect-openconnect: \ - connect --cookie-on-stdin -``` - The image includes `gpclient` and `gpauth` only. It does not include embedded webview authentication, `gpgui-helper`, or `gpgui`. ### Other Distributions @@ -342,14 +380,16 @@ The image includes `gpclient` and `gpauth` only. It does not include embedded we #### Manual Installation 1. **Install dependencies:** - - `webkit2gtk` + - WebKitGTK 4.1 (for example, `libwebkit2gtk-4.1-0` on Debian/Ubuntu) - `libsecret` - `libayatana-appindicator` or `libappindicator-gtk3` + - polkit (`pkexec`) for GUI-launched VPN connections 2. **Download and extract:** Download `globalprotect-openconnect_${version}_${arch}.bin.tar.xz` from the [releases](https://github.com/yuezk/GlobalProtect-openconnect/releases) page: ```bash tar -xJf globalprotect-openconnect_${version}_${arch}.bin.tar.xz + cd globalprotect-openconnect_${version} ``` 3. **Install:** @@ -359,11 +399,11 @@ The image includes `gpclient` and `gpauth` only. It does not include embedded we ## Building from Source -You can build the application from source using either a DevContainer (recommended) or a local development environment. +The instructions below build the open-source components on Linux. For FreeBSD and OpenBSD, see [Building from Source on FreeBSD and OpenBSD](./docs/bsd-source-build.md). -### Method 1: Using DevContainer (Recommended) +### Method 1: Using DevContainer -This project includes a DevContainer configuration that provides a consistent, reproducible build environment with all dependencies pre-installed. +This project includes a DevContainer configuration for Linux development. The repository's `rust-toolchain.toml` selects the Rust toolchain; rustup may need to download it on the first build. #### Prerequisites @@ -387,7 +427,7 @@ This project includes a DevContainer configuration that provides a consistent, r 3. **Build the project:** - To build everything including the GUI helper run this command: + To build the open-source components, including the GUI helper, run: ```bash docker run --privileged --cap-add=NET_ADMIN --device=/dev/net/tun \ --tty -v "$(pwd)":/workspace -w /workspace gpoc-devcontainer \ @@ -395,13 +435,17 @@ This project includes a DevContainer configuration that provides a consistent, r ``` To build without the GUI helper run the same command as above, but with `BUILD_GUI_HELPER=0` passed as an argument to `make`. -5. **Locate build artifacts:** +4. **Locate build artifacts:** The compiled binaries will be available in `target/release/`: - `gpclient` – CLI client - `gpservice` – Background service - `gpauth` – Authentication helper - `gpgui-helper` – GUI helper + - `gp-hip-script-installer` – Privileged HIP script installer + - `gp-vpnc-script-installer` – Privileged VPN script installer + + The proprietary GP Connect desktop application is distributed separately. Use `INCLUDE_GUI=1` with `make build` to download its matching published Linux build for installation. #### Alternative: Using VS Code @@ -416,11 +460,11 @@ This project includes a DevContainer configuration that provides a consistent, r #### Prerequisites -- [Rust 1.89 or later](https://www.rust-lang.org/tools/install) +- [Rust 1.91 or later](https://www.rust-lang.org/tools/install) - [Tauri dependencies](https://tauri.app/start/prerequisites/) - OpenConnect source-build dependencies: `autoconf`, `automake`, `autopoint`/`gettext`, `libtool`, `patch`, `pkg-config`, `libxml2`, `zlib`, `lz4`, `gnutls`, `p11-kit`, `nettle`, and `gmp` development packages - `pkexec` and `gnome-keyring` (or `pam_kwallet` on KDE) -- `nodejs` and `pnpm` (optional) +- Node.js and pnpm if rebuilding the GUI helper frontend #### Build Steps @@ -440,7 +484,7 @@ This project includes a DevContainer configuration that provides a consistent, r sudo make install ``` - > **Note:** `DESTDIR` is not currently supported. + To stage the files for packaging instead of installing them into the system, use `make install DESTDIR=/absolute/path/to/staging`. ### Testing Your Build @@ -452,35 +496,44 @@ Verify the CLI client is working correctly: ### Build Options -- `BUILD_GUI_HELPER=0` – Build CLI components only (excludes GUI) +- `BUILD_GUI_HELPER=0` – Skip building and installing the GUI helper +- `BUILD_WEBVIEW_AUTH=0` – Build `gpauth` without embedded browser authentication; use an external or remote browser +- `INCLUDE_GUI=1` – Download the matching published Linux desktop application for installation - `OFFLINE=1` – Build in offline mode using vendored dependencies ## Frequently Asked Questions ### Q: How do I resolve the "Secure Storage not ready" error? -**Solution 1:** Update to version 2.2.0 or later, which includes a file-based storage fallback. +Unlock your desktop keyring and ensure the application can access it. On Linux and BSD, check that a keyring service such as GNOME Keyring is installed and running in your desktop session. On macOS, check Keychain access. -**Solution 2:** Install the `gnome-keyring` package and restart your system. +Linux and BSD can use file storage when secure storage is unavailable during initial setup. An existing configuration that uses the keyring still needs access to that keyring. See related issues: [#321](https://github.com/yuezk/GlobalProtect-openconnect/issues/321), [#316](https://github.com/yuezk/GlobalProtect-openconnect/issues/316) ### Q: How do I fix the "cannot open display" error when using CLI? -If you encounter `(gpauth:18869): Gtk-WARNING **: 10:33:37.566: cannot open display:`, try running the command with `sudo -E`: +Run the client from a terminal in your normal desktop session and use an external browser: ```bash -sudo -E gpclient connect +sudo gpclient connect --browser ``` See related issue: [#316](https://github.com/yuezk/GlobalProtect-openconnect/issues/316) +On a headless server, use `--browser remote` and complete authentication from another machine. + +## NetworkManager Integration + +- [WMP/GlobalProtect-SAML-NetworkManager](https://github.com/WMP/GlobalProtect-SAML-NetworkManager) – NetworkManager VPN plugin with SAML/SSO support for GNOME and KDE Plasma +- [jdpipe/networkmanager-gpclient](https://github.com/jdpipe/networkmanager-gpclient) – NetworkManager VPN plugin that uses `gpclient` + ## Licensing ### Trial and Pricing The **CLI version** is completely free and open source. -The **GUI version** is a paid application with a **7-day trial period** after installation. +The **GUI version** is a paid application with a **7-day trial**. Start the trial in the app by verifying your email address with a one-time code. Installing the app alone does not start the trial. ### Open Source Licenses @@ -489,8 +542,10 @@ This project consists of multiple components, each with its own license: | Component | Type | License | |-----------|------|---------| | [gpapi](./crates/gpapi) | Crate | [MIT](./crates/gpapi/LICENSE) | -| [openconnect](./crates/openconnect) | Crate | [GPL-3.0](./crates/openconnect/LICENSE) | -| [common](./crates/common) | Crate | [GPL-3.0](./crates/common/LICENSE) | +| [openconnect](./crates/openconnect) | Rust wrapper crate | [MIT](./crates/openconnect/LICENSE) | +| [upstream OpenConnect](./crates/openconnect/deps/openconnect) | C library | [LGPL-2.1](./crates/openconnect/deps/openconnect/COPYING.LGPL) | +| [common](./crates/common) | Crate | [MIT](./crates/common/LICENSE) | +| [browser-launcher](./crates/browser-launcher) | Crate | [MIT](./crates/browser-launcher/LICENSE) | | [auth](./crates/auth) | Crate | [GPL-3.0](./crates/auth/LICENSE) | | [gpservice](./apps/gpservice) | Application | [GPL-3.0](./apps/gpservice/LICENSE) | | [gpclient](./apps/gpclient) | Application | [GPL-3.0](./apps/gpclient/LICENSE) | diff --git a/apps/gpauth/Cargo.toml b/apps/gpauth/Cargo.toml index fb08b73..ffb70cd 100644 --- a/apps/gpauth/Cargo.toml +++ b/apps/gpauth/Cargo.toml @@ -11,14 +11,13 @@ tauri-build = { version = "2", features = [], optional = true } [dependencies] common = { path = "../../crates/common" } -gpapi = { path = "../../crates/gpapi", features = ["clap"] } +gpapi = { path = "../../crates/gpapi", features = ["clap", "logger"] } auth = { path = "../../crates/auth", features = ["browser-auth"] } # Shared dependencies anyhow.workspace = true clap.workspace = true -env_logger.workspace = true log.workspace = true serde_json.workspace = true tokio = { workspace = true, features = ["rt-multi-thread"] } @@ -34,3 +33,4 @@ tauri = { workspace = true, optional = true } [features] default = ["webview-auth"] webview-auth = ["auth/webview-auth", "dep:tauri", "dep:tauri-build"] +release-devtools = ["auth/release-devtools"] diff --git a/apps/gpauth/Info.plist b/apps/gpauth/Info.plist new file mode 100644 index 0000000..d8b32ff --- /dev/null +++ b/apps/gpauth/Info.plist @@ -0,0 +1,19 @@ + + + + + LSUIElement + + CFBundleURLTypes + + + CFBundleURLName + GlobalProtect authentication callback + CFBundleURLSchemes + + globalprotectcallback + + + + + diff --git a/apps/gpauth/icons/128x128.png b/apps/gpauth/icons/128x128.png index d7e9730..b31f37a 100644 Binary files a/apps/gpauth/icons/128x128.png and b/apps/gpauth/icons/128x128.png differ diff --git a/apps/gpauth/icons/128x128@2x.png b/apps/gpauth/icons/128x128@2x.png index 301c18a..d10cdd6 100644 Binary files a/apps/gpauth/icons/128x128@2x.png and b/apps/gpauth/icons/128x128@2x.png differ diff --git a/apps/gpauth/icons/32x32.png b/apps/gpauth/icons/32x32.png index a29d98a..fcbd261 100644 Binary files a/apps/gpauth/icons/32x32.png and b/apps/gpauth/icons/32x32.png differ diff --git a/apps/gpauth/icons/icon.icns b/apps/gpauth/icons/icon.icns index 2657ed2..8fa387a 100644 Binary files a/apps/gpauth/icons/icon.icns and b/apps/gpauth/icons/icon.icns differ diff --git a/apps/gpauth/icons/icon.ico b/apps/gpauth/icons/icon.ico index 0d74c41..566bb12 100644 Binary files a/apps/gpauth/icons/icon.ico and b/apps/gpauth/icons/icon.ico differ diff --git a/apps/gpauth/icons/icon.png b/apps/gpauth/icons/icon.png index 52a3e63..4aff083 100644 Binary files a/apps/gpauth/icons/icon.png and b/apps/gpauth/icons/icon.png differ diff --git a/apps/gpauth/src/callback_app.rs b/apps/gpauth/src/callback_app.rs new file mode 100644 index 0000000..66eab62 --- /dev/null +++ b/apps/gpauth/src/callback_app.rs @@ -0,0 +1,58 @@ +use std::{ + sync::{ + Arc, + atomic::{AtomicBool, Ordering}, + }, + time::Duration, +}; + +use tauri::RunEvent; + +pub fn run() -> anyhow::Result<()> { + let handled = Arc::new(AtomicBool::new(false)); + let timeout_handled = Arc::clone(&handled); + let app = tauri::Builder::default() + .setup(move |app| { + #[cfg(target_os = "macos")] + app.set_activation_policy(tauri::ActivationPolicy::Accessory); + + let app_handle = app.handle().clone(); + tauri::async_runtime::spawn(async move { + tokio::time::sleep(Duration::from_secs(10)).await; + if !timeout_handled.swap(true, Ordering::AcqRel) { + app_handle.exit(1); + } + }); + Ok(()) + }) + .build(crate::tauri_context::get())?; + + app.run(move |app_handle, event| { + let RunEvent::Opened { urls } = event else { + return; + }; + let Some(callback) = urls + .into_iter() + .find(|url| url.scheme().eq_ignore_ascii_case("globalprotectcallback")) + else { + return; + }; + if handled.swap(true, Ordering::AcqRel) { + return; + } + + let app_handle = app_handle.clone(); + tauri::async_runtime::spawn(async move { + let exit_code = match auth::forward_auth_callback(callback.as_str()).await { + Ok(()) => 0, + Err(err) => { + eprintln!("Failed to forward authentication callback: {err}"); + 1 + } + }; + app_handle.exit(exit_code); + }); + }); + + Ok(()) +} diff --git a/apps/gpauth/src/cli.rs b/apps/gpauth/src/cli.rs index 8a39129..e578225 100644 --- a/apps/gpauth/src/cli.rs +++ b/apps/gpauth/src/cli.rs @@ -1,15 +1,22 @@ +#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] +use auth::forward_auth_callback; use auth::{BrowserAuthenticator, auth_prelogin}; use clap::Parser; +#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] +use clap::Subcommand; +#[cfg(feature = "webview-auth")] +use gpapi::auth::AuthWindowTheme; use gpapi::{ - auth::{SamlAuthData, SamlAuthResult}, + auth::{AuthenticationCancelled, SamlAuthData, SamlAuthResult}, clap::{Args, InfoLevelVerbosity, args::Os, handle_error}, gp_params::GpParams, - log_format::{LogFormat, write_json_record}, + log_format::LogFormat, os_profile::{ClientOs, OsProfile}, utils::{normalize_server, openssl}, }; use log::info; use serde_json::json; +use std::net::IpAddr; use tempfile::NamedTempFile; const VERSION: &str = concat!( @@ -26,6 +33,8 @@ const VERSION: &str = concat!( version = VERSION, author, about = "The authentication component for the GlobalProtect VPN client, supports the SSO authentication method.", + args_conflicts_with_subcommands = true, + subcommand_negates_reqs = true, help_template = "\ {before-help}{name} {version} {author} @@ -40,8 +49,12 @@ See 'gpauth -h' for more information. " )] struct Cli { - #[arg(help = "The portal server to authenticate")] - server: String, + #[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] + #[command(subcommand)] + command: Option, + + #[arg(required = true, help = "The portal server to authenticate")] + server: Option, #[arg(long, help = "Treating the server as a gateway")] gateway: bool, @@ -91,12 +104,15 @@ struct Cli { #[arg( long, - help = "Use external browser authentication. With no value, auto-select Chrome, Firefox, then system default. Use `default` for the system default browser.", + help = "Use external browser authentication. With no value, auto-select Chrome, Firefox, then system default. Use `default` for the system default browser or `remote` for headless servers.", default_missing_value = "auto", num_args=0..=1 )] browser: Option, + #[arg(long, help = "Listen on this IP address when using '--browser remote'")] + browser_listen: Option, + #[cfg(feature = "webview-auth")] #[arg(long, help = "The HiDPI mode, useful for high-resolution screens")] hidpi: bool, @@ -105,10 +121,28 @@ struct Cli { #[arg(long, help = "Clean the cache of the embedded browser")] pub clean: bool, + #[cfg(feature = "webview-auth")] + #[arg(long, help = "Set the embedded authentication window title")] + window_title: Option, + + #[cfg(feature = "webview-auth")] + #[arg(long, value_enum, default_value_t = AuthWindowTheme::default(), help = "Set the embedded authentication window appearance")] + window_theme: AuthWindowTheme, + #[command(flatten)] verbose: InfoLevelVerbosity, } +#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] +#[derive(Subcommand)] +enum CliCommand { + #[command(hide = true)] + AuthCallback { + #[arg(help = "The globalprotectcallback URL to forward")] + callback: String, + }, +} + impl Args for Cli { fn fix_openssl(&self) -> bool { self.fix_openssl @@ -139,13 +173,19 @@ impl Cli { } async fn run(&self) -> anyhow::Result<()> { + if self.browser_listen.is_some() + && !matches!(self.browser.as_deref(), Some(browser) if browser.eq_ignore_ascii_case("remote")) + { + anyhow::bail!("The '--browser-listen' option requires '--browser remote'"); + } + if self.ignore_tls_errors { info!("TLS errors will be ignored"); } let openssl_conf = self.prepare_env()?; - let server = normalize_server(&self.server)?; + let server = normalize_server(self.server.as_deref().expect("server is required for authentication"))?; let gp_params = self.build_gp_params(); info!( "gpauth auth host-id: {}", @@ -168,7 +208,7 @@ impl Cli { if let Some(browser) = browser { let auth_host_id = gp_params.os_profile().host_identity().host_id().to_string(); - let authenticator = BrowserAuthenticator::new(&auth_request, browser); + let authenticator = BrowserAuthenticator::new(&auth_request, browser, self.browser_listen); let auth_result = authenticator.authenticate().await; print_auth_result(auth_result, Some(&auth_host_id)); @@ -179,7 +219,16 @@ impl Cli { } #[cfg(feature = "webview-auth")] - crate::webview_auth::authenticate(server, gp_params, auth_request, self.clean, openssl_conf).await?; + crate::webview_auth::authenticate( + server, + gp_params, + auth_request, + self.clean, + self.window_title.clone(), + self.window_theme, + openssl_conf, + ) + .await?; Ok(()) } @@ -218,23 +267,28 @@ impl Cli { } } -fn build_logger(cli: &Cli) -> env_logger::Builder { - let mut builder = env_logger::builder(); - builder.filter_level(cli.verbose.log_level_filter()); +fn init_logger(cli: &Cli) { + let Some(level) = cli.verbose.log_level_filter().to_level() else { + log::set_max_level(log::LevelFilter::Off); + return; + }; - // Text is env_logger's own format, so leave it untouched rather than - // reimplementing it. - if cli.log_format == LogFormat::Json { - builder.format(write_json_record); - } - - builder + gpapi::logger::init(level, "com.yuezk.gpgui", "gpauth", cli.log_format); } pub async fn run() { let cli = Cli::parse(); - build_logger(&cli).init(); + #[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] + if let Some(CliCommand::AuthCallback { callback }) = &cli.command { + if let Err(err) = forward_auth_callback(callback).await { + eprintln!("Failed to forward authentication callback: {err}"); + std::process::exit(1); + } + return; + } + + init_logger(&cli); info!("gpauth started: {}", VERSION); if let Err(err) = cli.run().await { @@ -252,6 +306,7 @@ pub fn print_auth_result(auth_result: anyhow::Result, host_id: Opt }; SamlAuthResult::Success(auth_data) } + Err(err) if err.downcast_ref::().is_some() => SamlAuthResult::Cancelled, Err(err) => SamlAuthResult::Failure(format!("{}", err)), }; @@ -260,13 +315,6 @@ pub fn print_auth_result(auth_result: anyhow::Result, host_id: Opt #[cfg(test)] mod tests { - use std::{ - io::Write, - sync::{Arc, Mutex}, - }; - - use log::Log; - use super::*; /// gpauth's own result already goes to stdout as JSON; this makes its *logs* @@ -287,53 +335,6 @@ mod tests { assert_eq!(cli.log_format, LogFormat::Json); } - /// A `Write` that keeps what was written, so the logger can be driven for - /// real instead of asserting on how it was configured. - #[derive(Clone, Default)] - struct Captured(Arc>>); - - impl Write for Captured { - fn write(&mut self, buf: &[u8]) -> std::io::Result { - self.0.lock().unwrap().extend_from_slice(buf); - Ok(buf.len()) - } - - fn flush(&mut self) -> std::io::Result<()> { - Ok(()) - } - } - - #[test] - fn json_format_emits_one_json_object_per_record() { - let cli = - Cli::try_parse_from(["gpauth", "portal.example.com", "--log-format", "json"]).expect("gpauth args should parse"); - - let captured = Captured::default(); - let logger = build_logger(&cli) - .target(env_logger::Target::Pipe(Box::new(captured.clone()))) - .build(); - - // Drive the logger directly: `init()` installs a global that a second test - // could not replace. - logger.log( - &log::Record::builder() - .level(log::Level::Info) - .target("gpauth") - .args(format_args!("authenticating against {}", "portal.example.com")) - .build(), - ); - logger.flush(); - - let out = String::from_utf8(captured.0.lock().unwrap().clone()).expect("log output should be UTF-8"); - let lines: Vec<_> = out.lines().collect(); - assert_eq!(lines.len(), 1, "expected exactly one line, got: {out:?}"); - - let v: serde_json::Value = serde_json::from_str(lines[0]).unwrap_or_else(|e| panic!("not JSON: {out:?} ({e})")); - assert_eq!(v["level"], "INFO"); - assert_eq!(v["target"], "gpauth"); - assert_eq!(v["message"], "authenticating against portal.example.com"); - } - #[test] fn os_defaults_to_runtime_os() { let cli = Cli::try_parse_from(["gpauth", "portal.example.com"]).expect("gpauth args should parse"); @@ -341,6 +342,23 @@ mod tests { assert_eq!(cli.os, Os::default()); } + #[test] + #[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] + fn callback_arguments_parse_separately() { + let cli = Cli::try_parse_from([ + "gpauth", + "auth-callback", + "globalprotectcallback:cas-as=1&un=alice@example.com&token=token", + ]) + .unwrap(); + + assert!(matches!( + cli.command, + Some(CliCommand::AuthCallback { callback }) if callback.starts_with("globalprotectcallback:") + )); + assert!(cli.server.is_none()); + } + #[test] fn host_id_arg_sets_profile_host_id_seed() { let cli = Cli::try_parse_from(["gpauth", "portal.example.com", "--host-id", "host-seed"]) @@ -375,6 +393,21 @@ mod tests { assert!(cli.external_browser_requested()); } + #[test] + fn browser_listen_accepts_ip_address() { + let cli = Cli::try_parse_from([ + "gpauth", + "portal.example.com", + "--browser", + "remote", + "--browser-listen", + "192.168.107.15", + ]) + .expect("gpauth args should parse"); + + assert_eq!(cli.browser_listen, Some("192.168.107.15".parse().unwrap())); + } + #[test] fn client_version_arg_sets_profile_client_version() { let cli = Cli::try_parse_from(["gpauth", "portal.example.com", "--client-version", "legacy-client"]) @@ -403,4 +436,21 @@ mod tests { assert_eq!(cli.sslkey.as_deref(), Some("/tmp/client.key")); assert_eq!(cli.key_password.as_deref(), Some("secret")); } + + #[cfg(feature = "webview-auth")] + #[test] + fn auth_window_options_parse() { + let cli = Cli::try_parse_from([ + "gpauth", + "portal.example.com", + "--window-title", + "GP Connect Login", + "--window-theme", + "dark", + ]) + .expect("gpauth window options should parse"); + + assert_eq!(cli.window_title.as_deref(), Some("GP Connect Login")); + assert_eq!(cli.window_theme, AuthWindowTheme::Dark); + } } diff --git a/apps/gpauth/src/main.rs b/apps/gpauth/src/main.rs index 393941d..e41357a 100644 --- a/apps/gpauth/src/main.rs +++ b/apps/gpauth/src/main.rs @@ -2,10 +2,34 @@ mod cli; +#[cfg(all(target_os = "macos", feature = "webview-auth"))] +mod callback_app; + +#[cfg(feature = "webview-auth")] +mod tauri_context; + #[cfg(feature = "webview-auth")] mod webview_auth; #[tokio::main] async fn main() { + #[cfg(all(target_os = "macos", feature = "webview-auth"))] + if is_callback_app_launch() { + if let Err(err) = callback_app::run() { + eprintln!("Failed to handle authentication callback: {err}"); + } + return; + } + cli::run().await; } + +#[cfg(all(target_os = "macos", feature = "webview-auth"))] +fn is_callback_app_launch() -> bool { + std::env::args_os().len() == 1 + && std::env::current_exe().is_ok_and(|executable| { + executable + .ancestors() + .any(|path| path.extension().is_some_and(|extension| extension == "app")) + }) +} diff --git a/apps/gpauth/src/tauri_context.rs b/apps/gpauth/src/tauri_context.rs new file mode 100644 index 0000000..f0c7476 --- /dev/null +++ b/apps/gpauth/src/tauri_context.rs @@ -0,0 +1,3 @@ +pub fn get() -> tauri::Context { + tauri::generate_context!() +} diff --git a/apps/gpauth/src/webview_auth.rs b/apps/gpauth/src/webview_auth.rs index abdf48b..0b162ca 100644 --- a/apps/gpauth/src/webview_auth.rs +++ b/apps/gpauth/src/webview_auth.rs @@ -1,5 +1,5 @@ -use auth::WebviewAuthenticator; -use gpapi::gp_params::GpParams; +use auth::{WebviewAuthenticator, apply_auth_theme}; +use gpapi::{auth::AuthWindowTheme, gp_params::GpParams}; use log::info; use tauri::RunEvent; use tempfile::NamedTempFile; @@ -11,19 +11,27 @@ pub async fn authenticate( gp_params: GpParams, auth_request: String, clean: bool, + window_title: Option, + window_theme: AuthWindowTheme, mut openssl_conf: Option, ) -> anyhow::Result<()> { let auth_host_id = gp_params.os_profile().host_identity().host_id().to_string(); tauri::Builder::default() .setup(move |app| { + #[cfg(target_os = "macos")] + app.set_activation_policy(tauri::ActivationPolicy::Accessory); + + apply_auth_theme(app.handle(), window_theme); let app_handle = app.handle().clone(); tauri::async_runtime::spawn(async move { let authenticator = WebviewAuthenticator::new(&server, &gp_params) .with_auth_request(&auth_request) .with_webview_user_agent(gp_params.os_profile().webview_user_agent()) - .with_clean(clean); + .with_clean(clean) + .with_window_title(window_title.as_deref().unwrap_or("GlobalProtect Login")) + .with_window_theme(window_theme); let auth_result = authenticator.authenticate(&app_handle).await; print_auth_result(auth_result, Some(&auth_host_id)); @@ -34,7 +42,7 @@ pub async fn authenticate( Ok(()) }) - .build(tauri::generate_context!())? + .build(crate::tauri_context::get())? .run(move |_app_handle, event| { if let RunEvent::Exit = event { if let Some(file) = openssl_conf.take() { diff --git a/apps/gpauth/tauri.conf.json b/apps/gpauth/tauri.conf.json index f446cb7..596b819 100644 --- a/apps/gpauth/tauri.conf.json +++ b/apps/gpauth/tauri.conf.json @@ -6,11 +6,14 @@ "beforeBuildCommand": "" }, "identifier": "com.yuezk.gpauth", - "productName": "gpauth", + "productName": "GP Connect Login", "app": { "withGlobalTauri": false, "security": { "csp": null } + }, + "bundle": { + "icon": ["icons/icon.png"] } } diff --git a/apps/gpclient/Cargo.toml b/apps/gpclient/Cargo.toml index 2f30f52..dd5713b 100644 --- a/apps/gpclient/Cargo.toml +++ b/apps/gpclient/Cargo.toml @@ -9,28 +9,24 @@ license.workspace = true [dependencies] common = { path = "../../crates/common" } gpapi = { path = "../../crates/gpapi", features = ["clap"] } +gphip = { path = "../../crates/gphip" } openconnect = { path = "../../crates/openconnect" } anyhow.workspace = true -askama.workspace = true -chrono.workspace = true clap.workspace = true env_logger.workspace = true inquire = "0.9" log.workspace = true tokio = { workspace = true, features = ["rt-multi-thread"] } +tokio-util.workspace = true sysinfo.workspace = true serde.workspace = true serde_json.workspace = true -serde_urlencoded.workspace = true whoami.workspace = true tempfile.workspace = true reqwest.workspace = true directories.workspace = true compile-time.workspace = true -netdev.workspace = true -xmltree.workspace = true -uuid = { workspace = true, features = ["v5"] } uzers.workspace = true [features] diff --git a/apps/gpclient/src/cli.rs b/apps/gpclient/src/cli.rs index 5467439..45188bc 100644 --- a/apps/gpclient/src/cli.rs +++ b/apps/gpclient/src/cli.rs @@ -1,4 +1,7 @@ -use std::{env::temp_dir, fs::File, str::FromStr}; +use std::{ + path::{Path, PathBuf}, + str::FromStr, +}; use anyhow::bail; use clap::{Parser, Subcommand}; @@ -32,6 +35,7 @@ const VERSION: &str = concat!( pub(crate) struct SharedArgs<'a> { pub(crate) fix_openssl: bool, pub(crate) ignore_tls_errors: bool, + pub(crate) lock_file: &'a Path, pub(crate) verbose: &'a InfoLevelVerbosity, pub(crate) log_format: LogFormat, } @@ -46,6 +50,21 @@ enum CliCommand { LaunchGui(LaunchGuiArgs), #[command(about = "Generate HIP report")] Hip(HipArgs), + #[command(hide = true)] + DetectInternalHost { + #[arg(long)] + address: std::net::IpAddr, + #[arg(long)] + hostname: String, + }, + #[command(hide = true)] + ResolveGateway { + host: String, + #[arg(long, default_value_t = 443)] + port: u16, + #[arg(long)] + disable_ipv6: bool, + }, } #[derive(Parser)] @@ -77,6 +96,13 @@ struct Cli { fix_openssl: bool, #[arg(long, help = "Ignore the TLS errors")] ignore_tls_errors: bool, + #[arg( + long, + global = true, + default_value = GP_CLIENT_LOCK_FILE, + help = "Path to the gpclient PID lock file" + )] + lock_file: PathBuf, #[arg( long, @@ -105,8 +131,16 @@ impl Args for Cli { } impl Cli { + fn can_run_alongside_client(&self) -> bool { + match &self.command { + CliCommand::Connect(_) => false, + CliCommand::LaunchGui(args) => args.is_auth_callback(), + _ => true, + } + } + async fn is_running(&self) -> bool { - let Ok(c) = fs::read_to_string(GP_CLIENT_LOCK_FILE).await else { + let Ok(c) = fs::read_to_string(&self.lock_file).await else { return false; }; @@ -135,10 +169,7 @@ impl Cli { async fn run(&self) -> anyhow::Result<()> { // check if an instance is running - if !matches!( - self.command, - CliCommand::Disconnect(_) | CliCommand::Hip(_) - ) && self.is_running().await { + if !self.can_run_alongside_client() && self.is_running().await { bail!("Another instance of the client is already running"); } @@ -148,6 +179,7 @@ impl Cli { let shared_args = SharedArgs { fix_openssl: self.fix_openssl, ignore_tls_errors: self.ignore_tls_errors, + lock_file: &self.lock_file, verbose: &self.verbose, log_format: self.log_format, }; @@ -158,9 +190,23 @@ impl Cli { match &self.command { CliCommand::Connect(args) => ConnectHandler::new(args, &shared_args).handle().await, - CliCommand::Disconnect(args) => DisconnectHandler::new(args).handle().await, + CliCommand::Disconnect(args) => DisconnectHandler::new(args, shared_args.lock_file).handle().await, CliCommand::LaunchGui(args) => LaunchGuiHandler::new(args).handle().await, CliCommand::Hip(args) => HipHandler::new(args).handle().await, + CliCommand::DetectInternalHost { address, hostname } => { + let internal = gpapi::session::network::native::detect_in_helper(*address, hostname)?; + println!("{}", serde_json::to_string(&internal)?); + Ok(()) + } + CliCommand::ResolveGateway { + host, + port, + disable_ipv6, + } => { + let addresses = gpapi::session::network::native::lookup_in_helper(host, *port, *disable_ipv6)?; + println!("{}", serde_json::to_string(&addresses)?); + Ok(()) + } } } } @@ -175,17 +221,6 @@ fn build_logger(cli: &Cli) -> env_logger::Builder { builder.format(write_json_record); } - // Output the log messages to a file if the command is the auth callback - if let CliCommand::LaunchGui(args) = &cli.command { - let auth_data = args.auth_data.as_deref().unwrap_or_default(); - if !auth_data.is_empty() - && let Ok(log_file) = File::create(temp_dir().join("gpcallback.log")) - { - let target = Box::new(log_file); - builder.target(env_logger::Target::Pipe(target)); - } - } - builder } @@ -213,6 +248,92 @@ mod tests { use super::*; + #[test] + fn resolver_helper_runs_alongside_client_and_is_hidden_from_help() { + let cli = Cli::try_parse_from([ + "gpclient", + "resolve-gateway", + "localhost", + "--port", + "444", + "--disable-ipv6", + ]) + .unwrap(); + assert!(cli.can_run_alongside_client()); + use clap::CommandFactory; + let help = Cli::command().render_help().to_string(); + assert!(!help.contains("resolve-gateway")); + } + + #[test] + fn lock_file_defaults_to_standard_path() { + let cli = Cli::try_parse_from(["gpclient", "connect", "portal.example.com"]).expect("cli should parse"); + + assert_eq!(cli.lock_file, PathBuf::from(GP_CLIENT_LOCK_FILE)); + } + + #[test] + fn lock_file_can_be_overridden_after_subcommand() { + let cli = Cli::try_parse_from([ + "gpclient", + "connect", + "portal.example.com", + "--lock-file", + "/tmp/gpclient-portal.lock", + ]) + .expect("global lock file option should parse after subcommand"); + + assert_eq!(cli.lock_file, PathBuf::from("/tmp/gpclient-portal.lock")); + } + + #[test] + fn hip_can_run_alongside_connected_client() { + let cli = Cli::try_parse_from([ + "gpclient", + "hip", + "--client-version", + "6.2.4-49", + "--client-os", + "Mac", + "--cookie", + "user=alice", + "--md5", + "test", + ]) + .expect("HIP arguments should parse"); + + assert!(cli.can_run_alongside_client()); + } + + #[test] + #[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] + fn launch_gui_accepts_auth_callback() { + let cli = Cli::try_parse_from([ + "gpclient", + "launch-gui", + "globalprotectcallback:cas-as=1&un=alice@example.com&token=token", + ]) + .expect("authentication callback should parse"); + + assert!(matches!( + &cli.command, + CliCommand::LaunchGui(args) if args.is_auth_callback() + )); + assert!(cli.can_run_alongside_client()); + } + + #[test] + #[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] + fn launch_gui_rejects_callback_with_minimized() { + assert!(Cli::try_parse_from(["gpclient", "launch-gui", "globalprotectcallback:token", "--minimized",]).is_err()); + } + + #[test] + #[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] + fn launch_gui_rejects_non_callback_positional() { + assert!(Cli::try_parse_from(["gpclient", "launch-gui", "https://example.com/callback"]).is_err()); + } + fn parse_cli(args: &[&str]) -> Cli { Cli::try_parse_from(args).expect("arguments should parse") } diff --git a/apps/gpclient/src/connect/args.rs b/apps/gpclient/src/connect/args.rs index 3f9bc48..ae2b785 100644 --- a/apps/gpclient/src/connect/args.rs +++ b/apps/gpclient/src/connect/args.rs @@ -6,7 +6,7 @@ use gpapi::{ os_profile::{ClientOs, OsProfile}, }; use log::warn; -use std::path::PathBuf; +use std::{net::IpAddr, path::PathBuf}; #[derive(Args)] pub(crate) struct ConnectArgs { @@ -54,13 +54,16 @@ pub(crate) struct ConnectArgs { #[arg( long, - help = "Use HIP (Host Integrity Protection) extension, optionally specify the HIP script path", + help = "Enable HIP (Host Information Profile), optionally specify a custom executable", default_missing_value = "", num_args=0..=1 )] pub(super) hip: Option, - #[arg(long, help = "The user used to run the HIP script")] + #[arg( + long, + help = "Run a custom HIP executable as this user; otherwise inherit the process user" + )] pub(super) hip_user: Option, #[arg( @@ -147,6 +150,9 @@ pub(crate) struct ConnectArgs { )] pub(super) browser: Option, + #[arg(long, help = "Listen on this IP address when using '--browser remote'")] + pub(super) browser_listen: Option, + #[arg( long, help = "Authenticate and print the gateway cookie to stdout, then exit without starting the \ @@ -271,6 +277,23 @@ mod tests { assert_eq!(cli.args.browser.as_deref(), Some("default")); } + #[test] + fn browser_listen_accepts_ip_address() { + use clap::Parser; + + let cli = ConnectArgsTestCli::try_parse_from([ + "test", + "portal.example.com", + "--browser", + "remote", + "--browser-listen", + "192.168.107.15", + ]) + .expect("connect args should parse"); + + assert_eq!(cli.args.browser_listen, Some("192.168.107.15".parse().unwrap())); + } + #[test] fn os_defaults_to_runtime_os() { use clap::Parser; @@ -421,8 +444,7 @@ mod tests { fn cookie_only_is_disabled_by_default() { use clap::Parser; - let cli = ConnectArgsTestCli::try_parse_from(["test", "portal.example.com"]) - .expect("connect args should parse"); + let cli = ConnectArgsTestCli::try_parse_from(["test", "portal.example.com"]).expect("connect args should parse"); assert!(!cli.args.cookie_only); } diff --git a/apps/gpclient/src/connect/credential.rs b/apps/gpclient/src/connect/credential.rs index 71444ef..147535e 100644 --- a/apps/gpclient/src/connect/credential.rs +++ b/apps/gpclient/src/connect/credential.rs @@ -85,6 +85,7 @@ impl ConnectHandler<'_> { .sslkey(self.args.sslkey.as_deref()) .key_password(key_password.as_deref()) .browser(browser) + .browser_listen(self.args.browser_listen) .log_format(self.shared_args.log_format) .verbose(verbose); @@ -115,7 +116,8 @@ impl ConnectHandler<'_> { .clean(clean_auth) .default_browser(use_default_browser); - let cred = auth_launcher.launch().await?; + let cred = auth_launcher.cancellation(&self.cancellation).launch().await?; + self.check_cancelled()?; Ok(cred) } diff --git a/apps/gpclient/src/connect/flow_tests.rs b/apps/gpclient/src/connect/flow_tests.rs new file mode 100644 index 0000000..9eff2ca --- /dev/null +++ b/apps/gpclient/src/connect/flow_tests.rs @@ -0,0 +1,173 @@ +use std::time::Duration; + +use clap::Parser; +use gpapi::{ + cookie_store::{self, StoredCookie}, + credential::AuthCookieCredential, + gateway::{Gateway, GatewayLoginContext, GatewaySelection}, + log_format::LogFormat, + session::SessionMode, +}; +use tokio::io::{AsyncReadExt, AsyncWriteExt}; + +use super::{ConnectArgs, ConnectHandler}; +use crate::cli::SharedArgs; + +#[derive(Parser)] +struct TestArgs { + #[command(flatten)] + connect: ConnectArgs, +} + +fn login_response() -> String { + let mut fields = [""; 20]; + fields[1] = "issued-cookie"; + fields[3] = "gateway"; + fields[4] = "alice"; + fields[5] = "fixture-auth"; + fields[6] = "vsys1"; + fields[12] = "tunnel"; + format!( + "{}", + fields + .iter() + .map(|field| format!("{field}")) + .collect::() + ) +} + +async fn gateway(responses: Vec<(&'static str, String)>) -> (String, tokio::task::JoinHandle>) { + let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap(); + let origin = format!("http://{}", listener.local_addr().unwrap()); + let worker = tokio::spawn(async move { + tokio::time::timeout(Duration::from_secs(5), async move { + let mut requests = Vec::new(); + for (status, body) in responses { + let (mut stream, _) = listener.accept().await.unwrap(); + let mut request = Vec::new(); + loop { + let mut buf = [0; 4096]; + let count = stream.read(&mut buf).await.unwrap(); + assert_ne!(count, 0, "Request ended before its body"); + request.extend_from_slice(&buf[..count]); + if let Some(end) = request.windows(4).position(|bytes| bytes == b"\r\n\r\n") { + let headers = String::from_utf8_lossy(&request[..end]).to_ascii_lowercase(); + let length = headers + .lines() + .find_map(|line| line.strip_prefix("content-length:")) + .map(|value| value.trim().parse::().unwrap()) + .unwrap_or(0); + if request.len() >= end + 4 + length { + break; + } + } + } + requests.push(String::from_utf8(request).unwrap()); + stream + .write_all( + format!( + "HTTP/1.1 {status}\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{body}", + body.len() + ) + .as_bytes(), + ) + .await + .unwrap(); + } + requests + }) + .await + .expect("Gateway fixture timed out") + }); + (origin, worker) +} + +#[tokio::test] +async fn cached_tunnel_authentication_does_not_require_portal_discovery() { + let (gateway, worker) = gateway(vec![("200 OK", login_response())]).await; + let directory = tempfile::tempdir().unwrap(); + let cache = directory.path().join("cookie.json"); + let args = TestArgs::parse_from([ + "test", + "http://unavailable-portal.invalid", + "--cookie-only", + "--cookie-cache", + cache.to_str().unwrap(), + ]) + .connect; + let lock = directory.path().join("client.pid"); + let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0); + let shared = SharedArgs { + fix_openssl: false, + ignore_tls_errors: true, + lock_file: &lock, + verbose: &verbose, + log_format: LogFormat::Text, + }; + let handler = ConnectHandler::new(&args, &shared); + cookie_store::save( + &cache, + &StoredCookie::new( + args.server.clone(), + "alice".into(), + handler.os_profile.borrow().host_identity().host_id().into(), + gateway, + AuthCookieCredential::new("alice", "portal-cookie", ""), + ), + ) + .unwrap(); + handler.handle_impl().await.unwrap(); + let requests = worker.await.unwrap(); + assert_eq!(requests.len(), 1); + assert!(requests[0].starts_with("POST /ssl-vpn/login.esp ")); + assert!(requests[0].contains("portal-cookie")); + assert_eq!( + handler.sessions.borrow().members()[0].transport.authentication().mode(), + SessionMode::Tunnel + ); +} + +#[tokio::test] +async fn internal_tunnel_keeps_gateway_authentication_after_portal_cookie_rejection() { + let (origin, worker) = gateway(vec![ + ( + "200 OK", + "Success".into(), + ), + ("403 Forbidden", "rejected".into()), + ("200 OK", login_response()), + ]) + .await; + let args = TestArgs::parse_from(["test", &origin, "--user", "alice", "--passwd-on-stdin"]).connect; + let directory = tempfile::tempdir().unwrap(); + let lock = directory.path().join("client.pid"); + let verbose = gpapi::clap::InfoLevelVerbosity::new(0, 0); + let shared = SharedArgs { + fix_openssl: false, + ignore_tls_errors: true, + lock_file: &lock, + verbose: &verbose, + log_format: LogFormat::Text, + }; + let handler = ConnectHandler::new(&args, &shared); + handler.password_from_stdin.replace(Some("gateway-password".into())); + let mut value = serde_json::to_value(Gateway::new("internal".into(), origin.clone())).unwrap(); + value["kind"] = serde_json::json!("internal"); + let gateway: Gateway = serde_json::from_value(value).unwrap(); + let session = handler + .authenticate_gateway( + &origin, + &origin, + &AuthCookieCredential::new("alice", "rejected-cookie", ""), + false, + GatewayLoginContext::new(&gateway, GatewaySelection::Auto), + ) + .await + .unwrap(); + assert_eq!(session.authentication.mode(), SessionMode::Tunnel); + assert!(session.extension_auth.binding().is_none()); + let requests = worker.await.unwrap(); + assert_eq!(requests.len(), 3); + assert!(requests[1].contains("rejected-cookie")); + assert!(requests[2].contains("gateway-password")); +} diff --git a/apps/gpclient/src/connect/gateway.rs b/apps/gpclient/src/connect/gateway.rs index fc4c327..1c06afe 100644 --- a/apps/gpclient/src/connect/gateway.rs +++ b/apps/gpclient/src/connect/gateway.rs @@ -1,5 +1,6 @@ use std::{ fs, + path::Path, sync::{ Arc, Mutex, atomic::{AtomicBool, Ordering}, @@ -10,36 +11,35 @@ use gpapi::{ clap::report, cookie_store, credential::{AuthCookieCredential, Credential}, - gateway::{GatewayLogin, GatewayLoginContext, SessionExtensionAuth, gateway_login, gateway_login_with_context}, + gateway::{Gateway, GatewayLogin, GatewayLoginClient, GatewayLoginContext, GatewaySelection, SessionExtensionAuth}, gp_params::GpParams, os_profile::OsProfile, - portal::prelogin, - process::users::{get_non_root_user, get_user_by_name}, - utils::shutdown_signal, + portal::{PortalConfig, prelogin}, + process::users::get_user_by_name, + session::{GatewayAuthentication, SessionMode}, }; use inquire::Text; use log::{Level, info, warn}; -use openconnect::{Vpn, VpnBuilder}; +use openconnect::{HipScript, HipSource, Vpn, VpnBuilder}; use tokio::{runtime::Handle, task::JoinHandle}; -use crate::{ - GP_CLIENT_LOCK_FILE, - session::{SessionContextInput, build_session_context, session_info_from_vpn, spawn_session_runtime_with_info}, +use crate::session::{ + SessionContextInput, build_session_context, session_info_from_vpn, spawn_session_runtime_with_info, }; use super::{ConnectHandler, args::cookie_cache_path}; const OPENCONNECT_INTERRUPTED_EXIT_CODE: i32 = -4; -struct GatewayLoginSession { - cookie: String, - extension_auth: SessionExtensionAuth, +pub(super) struct GatewayLoginSession { + pub(super) authentication: GatewayAuthentication, + pub(super) extension_auth: SessionExtensionAuth, } #[derive(Debug, Clone, Copy, PartialEq, Eq)] enum GatewayConnectFailureStage { - BeforeTunnel, - AfterTunnel, + BeforeEstablishment, + AfterEstablishment, } #[derive(Debug)] @@ -49,22 +49,22 @@ pub(super) struct GatewayConnectError { } impl GatewayConnectError { - fn before_tunnel(error: anyhow::Error) -> Self { + fn before_establishment(error: anyhow::Error) -> Self { Self { - stage: GatewayConnectFailureStage::BeforeTunnel, + stage: GatewayConnectFailureStage::BeforeEstablishment, error, } } - fn after_tunnel(error: anyhow::Error) -> Self { + fn after_establishment(error: anyhow::Error) -> Self { Self { - stage: GatewayConnectFailureStage::AfterTunnel, + stage: GatewayConnectFailureStage::AfterEstablishment, error, } } - pub(super) fn is_before_tunnel(&self) -> bool { - self.stage == GatewayConnectFailureStage::BeforeTunnel + pub(super) fn is_before_establishment(&self) -> bool { + self.stage == GatewayConnectFailureStage::BeforeEstablishment } pub(super) fn as_error(&self) -> &anyhow::Error { @@ -77,59 +77,81 @@ impl GatewayConnectError { } impl ConnectHandler<'_> { - pub(super) async fn try_cached_cookie(&self, server: &str) -> Option<()> { + pub(super) async fn try_cached_cookie(&self, server: &str) -> Option> { let path = cookie_cache_path(self.args)?; let host_id = self.os_profile.borrow().host_identity().host_id().to_string(); let stored = cookie_store::load(&path, server, &host_id)?; - if !stored.auth_cookie.can_authenticate_gateway() { - warn!( - "Cached portal cookie for {} is not usable for gateway authentication. Clearing cache.", - stored.server - ); cookie_store::clear(&path); return None; } - - info!( - "Using cached portal cookie for {} (saved_at={}, gateway={})", - stored.server, stored.saved_at, stored.last_gateway - ); - - let cred: Credential = (&stored.auth_cookie).into(); - let mut gp_params = self.build_gp_params(); - gp_params.set_is_gateway(true); - - let login_session = match self.login_gateway(&stored.last_gateway, &cred, &gp_params, None).await { + let credential = (&stored.auth_cookie).into(); + let mut params = self.build_gp_params(); + params.set_is_gateway(true); + let session = match self + .login_gateway(&stored.last_gateway, &credential, ¶ms, None) + .await + { Ok(session) => session, - Err(err) => { - warn!( - "Cached portal cookie rejected by gateway {}: {}. Clearing cache and falling back to portal auth.", - stored.last_gateway, err - ); + Err(error) => { + if self.cancellation.is_cancelled() + || error + .downcast_ref::() + .is_some() + { + return Some(Err(error)); + } cookie_store::clear(&path); + warn!("Cached gateway authentication failed: {error}"); return None; } }; - - match self + if session.authentication.mode() == SessionMode::NonTunnel && !self.args.cookie_only { + self.logout_gateway(&stored.last_gateway).await; + info!("Cached non-tunnel login requires fresh portal discovery"); + return None; + } + let result = self .connect_gateway( server, &stored.last_gateway, - &login_session.cookie, + &session.authentication, false, - login_session.extension_auth, + session.extension_auth, ) - .await - { - Ok(()) => Some(()), - Err(err) => { - warn!("Gateway connect failed after cached-cookie login: {}", err.as_error()); + .await; + match result { + Ok(()) => Some(Ok(())), + Err(error) if self.cancellation.is_cancelled() => Some(Err(error.into_error())), + Err(error) => { + self.logout_gateway(&stored.last_gateway).await; + warn!("Cached gateway connection failed: {}", error.as_error()); None } } } + pub(super) fn cached_portal_credential(&self, server: &str) -> Option { + if self.args.cookie_on_stdin { + return None; + } + let path = cookie_cache_path(self.args)?; + let host_id = self.os_profile.borrow().host_identity().host_id().to_string(); + let stored = cookie_store::load(&path, server, &host_id)?; + if !stored.auth_cookie.can_authenticate_gateway() { + cookie_store::clear(&path); + return None; + } + info!("Using cached credential for fresh portal discovery"); + Some((&stored.auth_cookie).into()) + } + + pub(super) fn clear_cookie_cache(&self) { + if let Some(path) = cookie_cache_path(self.args) { + cookie_store::clear(&path); + } + } + pub(super) async fn connect_gateway_with_prelogin( &self, portal: &str, @@ -143,7 +165,11 @@ impl ConnectHandler<'_> { gp_params.set_is_gateway(true); let gateway_browser_auth_allowed = true; - let prelogin = prelogin(gateway, &gp_params, self.direct_gateway_prelogin_options()).await?; + let prelogin = tokio::select! { + biased; + _ = self.cancellation.cancelled() => return Err(gpapi::auth::AuthenticationCancelled.into()), + result = prelogin(gateway, &gp_params, self.direct_gateway_prelogin_options()) => result?, + }; let cred = self .obtain_credential(&prelogin, gateway, gateway_browser_auth_allowed) .await?; @@ -156,7 +182,7 @@ impl ConnectHandler<'_> { .connect_gateway( portal, gateway, - &login_session.cookie, + &login_session.authentication, allow_extend_session, login_session.extension_auth, ) @@ -164,94 +190,101 @@ impl ConnectHandler<'_> { .map_err(GatewayConnectError::into_error) } - /// Connect to a gateway using the official client's auth flow: - /// - /// 1. Call gateway prelogin and retain the response (SAML data is held as a fallback). - /// 2. If the portal provided auth cookies, attempt gateway login using them. - /// 3. If that login succeeds, proceed directly to the VPN connection. - /// 4. If no portal auth cookies exist or portal-cookie login fails, use the retained gateway prelogin response to authenticate - /// against the gateway (SAML or username/password) and obtain a gateway-issued - /// credential. - /// 5. Retry gateway login with the gateway credential (now carrying the gateway's - /// `prelogin-cookie`) and connect on success. pub(super) async fn connect_gateway_with_fallback( + &self, + portal: &str, + gateway: &Gateway, + portal_cred: &AuthCookieCredential, + config: &PortalConfig, + selection: GatewaySelection, + remaining: &[&Gateway], + ) -> Result<(), GatewayConnectError> { + let session = self + .authenticate_gateway( + portal, + gateway.server(), + portal_cred, + config.default_browser().unwrap_or(false), + GatewayLoginContext::new(gateway, selection).with_connect_method(config.connect_method()), + ) + .await + .map_err(GatewayConnectError::before_establishment)?; + if !self.args.cookie_only && session.authentication.mode() == SessionMode::NonTunnel { + if gateway.kind() != gpapi::gateway::GatewayKind::Internal { + return Err(GatewayConnectError::after_establishment(anyhow::anyhow!( + "Non-tunnel authentication requires freshly discovered internal gateways" + ))); + } + return self + .connect_internal_gateways(portal, config, portal_cred, gateway, session, remaining) + .await + .map_err(GatewayConnectError::after_establishment); + } + self + .connect_gateway( + portal, + gateway.server(), + &session.authentication, + config.allow_extend_session().unwrap_or(false), + session.extension_auth, + ) + .await + } + + pub(super) async fn authenticate_gateway( &self, portal: &str, gateway: &str, portal_cred: &AuthCookieCredential, - allow_extend_session: bool, portal_config_default_browser: bool, gateway_context: GatewayLoginContext, - ) -> Result<(), GatewayConnectError> { - info!("Connecting to gateway with portal-cookie first, gateway prelogin fallback..."); - + ) -> anyhow::Result { + self.check_cancelled()?; let mut gp_params = self.build_gp_params(); gp_params.set_is_gateway(true); - let gateway_browser_auth_allowed = self.gateway_browser_auth_allowed(portal_config_default_browser); - - let gateway_prelogin = prelogin(gateway, &gp_params, self.prelogin_options(gateway_browser_auth_allowed)) - .await - .map_err(GatewayConnectError::before_tunnel)?; + let browser_allowed = self.gateway_browser_auth_allowed(portal_config_default_browser); + let gateway_prelogin = tokio::select! { + biased; + _ = self.cancellation.cancelled() => return Err(gpapi::auth::AuthenticationCancelled.into()), + result = prelogin(gateway, &gp_params, self.prelogin_options(browser_allowed)) => result?, + }; + self.check_cancelled()?; if portal_cred.can_authenticate_gateway() { - let portal_cred_for_login: Credential = portal_cred.into(); + let credential: Credential = portal_cred.into(); match self - .login_gateway(gateway, &portal_cred_for_login, &gp_params, Some(&gateway_context)) + .login_gateway(gateway, &credential, &gp_params, Some(&gateway_context)) .await { - Ok(login_session) => { - info!("Gateway login with portal auth cookies succeeded"); + Ok(session) => { self.save_cookie_cache(portal, gateway, portal_cred); - return self - .connect_gateway( - portal, - gateway, - &login_session.cookie, - allow_extend_session, - login_session.extension_auth, - ) - .await; + return Ok(session); } - Err(err) => { - info!("Gateway login with portal auth cookies failed: {}", err); - info!("Falling back to gateway prelogin authentication..."); + Err(error) => { + self.check_cancelled()?; + if error + .downcast_ref::() + .is_some() + { + return Err(error); + } + info!("Portal cookie login failed; using gateway prelogin authentication: {error}"); } } - } else { - info!("Portal config did not provide gateway auth cookies; using gateway prelogin flow"); } - let gateway_cred = match self - .obtain_credential(&gateway_prelogin, gateway, gateway_browser_auth_allowed) - .await - { - Ok(cred) => cred, - Err(err) => { - self.print_direct_gateway_recommendation(gateway); - return Err(GatewayConnectError::before_tunnel(err)); - } - }; - - let login_session = match self - .login_gateway(gateway, &gateway_cred, &gp_params, Some(&gateway_context)) - .await - { - Ok(login_session) => login_session, - Err(err) => { - self.print_direct_gateway_recommendation(gateway); - return Err(GatewayConnectError::before_tunnel(err)); - } - }; - - self - .connect_gateway( - portal, - gateway, - &login_session.cookie, - allow_extend_session, - login_session.extension_auth, - ) + let credential = self + .obtain_credential(&gateway_prelogin, gateway, browser_allowed) .await + .inspect_err(|_| self.print_direct_gateway_recommendation(gateway))?; + self.check_cancelled()?; + let result = self + .login_gateway(gateway, &credential, &gp_params, Some(&gateway_context)) + .await; + if result.is_err() { + self.print_direct_gateway_recommendation(gateway); + } + result } fn save_cookie_cache(&self, portal: &str, gateway: &str, auth_cookie: &AuthCookieCredential) { @@ -308,24 +341,39 @@ impl ConnectHandler<'_> { gateway_context: Option<&GatewayLoginContext>, ) -> anyhow::Result { let mut gp_params = gp_params.clone(); + gp_params.prepare_client_identity()?; + let cancellation = self.cancellation.clone(); + let internal = gateway_context.is_some_and(|context| context.kind() == gpapi::gateway::GatewayKind::Internal); + let mut client = GatewayLoginClient::new(gateway, gp_params)?; loop { - let login = match gateway_context { - Some(context) => gateway_login_with_context(gateway, cred, &gp_params, context).await?, - None => gateway_login(gateway, cred, &gp_params).await?, - }; + self.check_cancelled()?; + let login = client.login(cred, gateway_context, &cancellation).await?; match login { - GatewayLogin::Cookie(cookie) => { + GatewayLogin::Authenticated(authentication) => { + let descriptor = Gateway::new(gateway.to_string(), gateway.to_string()); + client.register_session( + descriptor.clone(), + authentication.clone(), + &mut self.sessions.borrow_mut(), + ); + self.check_cancelled()?; + if internal && authentication.mode() == SessionMode::NonTunnel && !self.args.cookie_only { + client + .bind_non_tunnel(self.args.disable_ipv6, None, &cancellation) + .await + .map_err(|error| error.context(gpapi::gateway::GatewayLoginProtocolError))?; + client.update_registered_session(&descriptor, &authentication, &mut self.sessions.borrow_mut()); + } return Ok(GatewayLoginSession { - cookie, - extension_auth: SessionExtensionAuth::new(cred.clone(), gp_params), + authentication, + extension_auth: SessionExtensionAuth::new(cred.clone(), client), }); } GatewayLogin::Mfa(message, input_str) => { let otp = Text::new(&message).prompt()?; - gp_params.set_input_str(&input_str); - gp_params.set_otp(&otp); + client.respond_mfa(&input_str, &otp); info!("Retrying gateway login with MFA..."); } @@ -333,14 +381,15 @@ impl ConnectHandler<'_> { } } - async fn connect_gateway( + pub(super) async fn connect_gateway( &self, portal: &str, gateway: &str, - cookie: &str, + authentication: &GatewayAuthentication, allow_extend_session: bool, extension_auth: SessionExtensionAuth, ) -> Result<(), GatewayConnectError> { + let cookie = authentication.cookie(); // --cookie-only: print the gateway cookie and exit without opening a tunnel. // No tun device is allocated, no root is required, and no logout is issued // against the gateway — the cookie remains valid for subsequent use. @@ -351,20 +400,39 @@ impl ConnectHandler<'_> { return Ok(()); } + if authentication.mode() != SessionMode::Tunnel { + return Err(GatewayConnectError::after_establishment(anyhow::anyhow!( + "Non-tunnel authentication requires fresh internal portal discovery" + ))); + } + self + .check_cancelled() + .map_err(GatewayConnectError::after_establishment)?; + let identity_files = extension_auth + .client_identity() + .map(|identity| identity.write_files(None)) + .transpose() + .map_err(GatewayConnectError::before_establishment)?; + let certificate = identity_files.as_ref().map(|files| files.certificate().to_owned()); + let sslkey = identity_files.as_ref().and_then(|files| files.key().map(str::to_owned)); + let key_password = extension_auth + .client_identity() + .and_then(|identity| identity.key_password()) + .map(str::to_owned); let mtu = self.args.mtu.unwrap_or(0); - let (hip, csd_wrapper) = self.determine_hip_script(); - let hip_user = self.determine_hip_user(); - let csd_uid = get_uid(&hip_user).map_err(GatewayConnectError::before_tunnel)?; let os_profile = self.os_profile.borrow().clone(); + let hip_source = self + .hip_source(os_profile.clone()) + .map_err(GatewayConnectError::before_establishment)?; let session_ctx = build_session_context(SessionContextInput { portal: portal.to_string(), gateway: gateway.to_string(), cookie: cookie.to_string(), os_profile: os_profile.clone(), - certificate: self.args.certificate.clone(), - sslkey: self.args.sslkey.clone(), - key_password: self.latest_key_password.borrow().clone(), + certificate: certificate.clone(), + sslkey: sslkey.clone(), + key_password: key_password.clone(), disable_ipv6: self.args.disable_ipv6, extension_auth: Some(extension_auth), }); @@ -372,12 +440,10 @@ impl ConnectHandler<'_> { .script(self.args.script.clone()) .interface(self.args.interface.clone()) .script_tun(self.args.script_tun) - .certificate(self.args.certificate.clone()) - .sslkey(self.args.sslkey.clone()) - .key_password(self.latest_key_password.borrow().clone()) - .hip(hip) - .csd_uid(csd_uid) - .csd_wrapper(csd_wrapper) + .certificate(certificate) + .sslkey(sslkey) + .key_password(key_password) + .hip_source(hip_source) .reconnect_timeout(self.args.reconnect_timeout) .mtu(mtu) .disable_ipv6(self.args.disable_ipv6) @@ -387,7 +453,7 @@ impl ConnectHandler<'_> { .no_xmlpost(self.args.no_xmlpost); let vpn = apply_os_profile(vpn_builder, &os_profile) .build() - .map_err(|err| GatewayConnectError::before_tunnel(err.into()))?; + .map_err(|err| GatewayConnectError::before_establishment(err.into()))?; let vpn = Arc::new(vpn); let vpn_clone = vpn.clone(); @@ -400,53 +466,97 @@ impl ConnectHandler<'_> { let tunnel_established_on_connect = Arc::clone(&tunnel_established); let disconnect_requested = Arc::new(AtomicBool::new(false)); let disconnect_requested_on_signal = Arc::clone(&disconnect_requested); + let cancellation = self.cancellation.clone(); - tokio::spawn(async move { - shutdown_signal().await; + let disconnect_task = tokio::spawn(async move { + cancellation.cancelled().await; info!("Received the interrupt signal, disconnecting..."); disconnect_requested_on_signal.store(true, Ordering::SeqCst); vpn_clone.disconnect(); }); + let lock_file_on_connect = self.shared_args.lock_file.to_path_buf(); + let pid_written = self.pid_written.clone(); let log_format = self.shared_args.log_format; - let connect_result = vpn.connect(move |vpn_session_info| { - tunnel_established_on_connect.store(true, Ordering::SeqCst); - write_pid_file(); + let session_cancellation = self.cancellation.clone(); + let (established_tx, established_rx) = tokio::sync::oneshot::channel(); + self.sessions.borrow_mut().relinquish_gateway(gateway); + let worker = tokio::task::spawn_blocking(move || { + vpn.connect(move |vpn_session_info| { + if session_cancellation.is_cancelled() { + return; + } + tunnel_established_on_connect.store(true, Ordering::SeqCst); + pid_written.store(write_pid_file(&lock_file_on_connect), Ordering::SeqCst); + let _ = established_tx.send(()); - let Some(session_ctx) = session_ctx_on_connect.lock().unwrap().take() else { - return; - }; - let session_info = session_info_from_vpn(vpn_session_info, allow_extend_session); - info!("VPN session info: {}", session_info.log_summary()); + let Some(session_ctx) = session_ctx_on_connect.lock().unwrap().take() else { + return; + }; + let session_info = session_info_from_vpn(vpn_session_info, allow_extend_session); + info!("VPN session info: {}", session_info.log_summary()); - let task = spawn_session_runtime_with_info(&runtime_handle, session_ctx, session_info, log_format); - session_task_on_connect.lock().unwrap().replace(task); + let task = spawn_session_runtime_with_info(&runtime_handle, session_ctx, session_info, log_format); + session_task_on_connect.lock().unwrap().replace(task); + }) }); + tokio::pin!(worker); + let connect_result = tokio::select! { + result = &mut worker => result, + established = established_rx => { + if established.is_ok() { + let unused = self.sessions.borrow().members().iter() + .filter(|session| session.gateway.server() != gateway) + .map(|session| session.gateway.server().to_owned()) + .collect::>(); + for server in unused { + self.logout_gateway(&server).await; + } + } + (&mut worker).await + } + }; let tunnel_established = tunnel_established.load(Ordering::SeqCst); + disconnect_task.abort(); + let _ = disconnect_task.await; - if let Some(task) = session_task.lock().unwrap().take() { + let session_task = { session_task.lock().unwrap().take() }; + if let Some(task) = session_task { task.abort(); - } - - if fs::metadata(GP_CLIENT_LOCK_FILE).is_ok() { - info!("Removing PID file"); - fs::remove_file(GP_CLIENT_LOCK_FILE).map_err(|err| GatewayConnectError::after_tunnel(err.into()))?; + let _ = task.await; } let disconnect_requested = disconnect_requested.load(Ordering::SeqCst); + let connect_result = connect_result.map_err(|error| GatewayConnectError::after_establishment(error.into()))?; classify_openconnect_result(connect_result, tunnel_established, disconnect_requested) } - fn determine_hip_script(&self) -> (bool, Option) { - if let Some(hip) = &self.args.hip { - return if hip.is_empty() { - (true, None) - } else { - (true, Some(hip.clone())) - }; + pub(super) fn hip_source(&self, profile: OsProfile) -> anyhow::Result { + let user = self.determine_hip_user(); + let script = self.args.hip.as_ref().or(self.args.csd_wrapper.as_ref()); + match script { + Some(path) if !path.is_empty() => Ok(HipSource::Script(HipScript::new(path.clone(), get_uid(&user)?)?)), + Some(_) => { + anyhow::ensure!(user.is_none(), "--hip-user requires an explicit HIP script"); + Ok(HipSource::Generator(Arc::new(move |request, control| { + let input = gphip::ReportInput { + profile: profile.clone(), + context: gphip::ReportContext::Connected { + cookie: request.cookie.clone(), + client_ip: request.client_ip.clone(), + client_ipv6: request.client_ipv6.clone(), + md5: request.md5.clone(), + }, + }; + gphip::generate_report_with_control(&input, &|| control.check()) + .map_err(|error| error.downcast::().unwrap_or_else(std::io::Error::other)) + }))) + } + None => { + anyhow::ensure!(user.is_none(), "--hip-user requires an explicit HIP script"); + Ok(HipSource::Disabled) + } } - - (self.args.csd_wrapper.is_some(), self.args.csd_wrapper.clone()) } fn determine_hip_user(&self) -> Option { @@ -473,9 +583,9 @@ fn classify_openconnect_result( let error = anyhow::anyhow!("OpenConnect exited with status {}", exit_code); if tunnel_established { - Err(GatewayConnectError::after_tunnel(error)) + Err(GatewayConnectError::after_establishment(error)) } else { - Err(GatewayConnectError::before_tunnel(error)) + Err(GatewayConnectError::before_establishment(error)) } } @@ -483,22 +593,23 @@ fn direct_gateway_command(gateway: &str) -> String { format!("gpauth --gateway {gateway} | sudo gpclient connect {gateway} --as-gateway --cookie-on-stdin") } -fn write_pid_file() { +pub(super) fn write_pid_file(lock_file: &Path) -> bool { let pid = std::process::id(); - if let Err(err) = fs::write(GP_CLIENT_LOCK_FILE, pid.to_string()) { + if let Err(err) = fs::write(lock_file, pid.to_string()) { warn!("Failed to write PID file: {}", err); + false } else { - info!("Wrote PID {} to {}", pid, GP_CLIENT_LOCK_FILE); + info!("Wrote PID {} to {}", pid, lock_file.display()); + true } } -fn get_uid(user: &Option) -> anyhow::Result { - if let Some(user) = user { - get_user_by_name(user).map(|user| user.uid()) - } else { - get_non_root_user().map_or_else(|_| Ok(0), |user| Ok(user.uid())) - } +fn get_uid(user: &Option) -> anyhow::Result> { + user + .as_ref() + .map(|user| get_user_by_name(user).map(|user| user.uid())) + .transpose() } fn apply_os_profile(builder: VpnBuilder, profile: &OsProfile) -> VpnBuilder { @@ -514,6 +625,23 @@ fn apply_os_profile(builder: VpnBuilder, profile: &OsProfile) -> VpnBuilder { mod tests { use super::*; + #[test] + fn hip_script_defaults_to_inherited_process_identity() { + assert_eq!(get_uid(&None).unwrap(), None); + } + + #[test] + fn explicit_hip_user_must_exist() { + assert!(get_uid(&Some("gpclient-nonexistent-hip-user".to_string())).is_err()); + } + + #[test] + fn explicit_hip_user_resolves_to_the_selected_account() { + let current = uzers::get_user_by_uid(uzers::get_effective_uid()).unwrap(); + let name = current.name().to_string_lossy().into_owned(); + assert_eq!(get_uid(&Some(name)).unwrap(), Some(current.uid())); + } + #[test] fn openconnect_success_is_not_a_gateway_failure() { assert!(classify_openconnect_result(0, false, false).is_ok()); @@ -524,14 +652,14 @@ mod tests { fn openconnect_failure_before_callback_is_retryable_gateway_failure() { let err = classify_openconnect_result(1, false, false).expect_err("nonzero exit should fail"); - assert!(err.is_before_tunnel()); + assert!(err.is_before_establishment()); } #[test] fn openconnect_failure_after_callback_is_terminal_gateway_failure() { let err = classify_openconnect_result(1, true, false).expect_err("nonzero exit should fail"); - assert!(!err.is_before_tunnel()); + assert!(!err.is_before_establishment()); } #[test] @@ -544,7 +672,7 @@ mod tests { let err = classify_openconnect_result(OPENCONNECT_INTERRUPTED_EXIT_CODE, true, false) .expect_err("unexpected interrupt should fail"); - assert!(!err.is_before_tunnel()); + assert!(!err.is_before_establishment()); } #[test] diff --git a/apps/gpclient/src/connect/internal.rs b/apps/gpclient/src/connect/internal.rs new file mode 100644 index 0000000..1f06017 --- /dev/null +++ b/apps/gpclient/src/connect/internal.rs @@ -0,0 +1,226 @@ +use std::sync::Arc; + +use anyhow::{Context, bail, ensure}; +use gpapi::{ + credential::AuthCookieCredential, + gateway::{Gateway, GatewayLoginContext, GatewaySelection}, + portal::PortalConfig, + process::collection::CollectionControl, + session::{ + MaintenanceState, SessionEndReason, SessionMode, + network::PhysicalNetwork, + non_tunnel::{SessionCallbacks, SessionExit, maintain_non_tunnel_sessions}, + }, +}; +use log::{info, warn}; + +use super::ConnectHandler; + +impl ConnectHandler<'_> { + pub(super) async fn connect_internal_gateways( + &self, + portal: &str, + config: &PortalConfig, + credential: &AuthCookieCredential, + first_gateway: &Gateway, + first_session: super::gateway::GatewayLoginSession, + remaining: &[&Gateway], + ) -> anyhow::Result<()> { + ensure!(remaining.len() < 64, "Too many internal non-tunnel candidates"); + let mut hosts = std::collections::HashSet::new(); + for gateway in std::iter::once(first_gateway).chain(remaining.iter().copied()) { + ensure!( + gateway.kind() == gpapi::gateway::GatewayKind::Internal, + "Non-tunnel candidates must be internal" + ); + ensure!( + hosts.insert(gpapi::utils::normalize_server(gateway.server())?), + "Duplicate internal gateway" + ); + } + let mut authenticated = vec![(first_gateway, first_session)]; + for gateway in remaining.iter().copied() { + self.check_cancelled()?; + let context = + GatewayLoginContext::new(gateway, GatewaySelection::Auto).with_connect_method(config.connect_method()); + match self + .authenticate_gateway( + portal, + gateway.server(), + credential, + config.default_browser().unwrap_or(false), + context, + ) + .await + { + Ok(session) => authenticated.push((gateway, session)), + Err(error) => { + self.logout_gateway(gateway.server()).await; + self.check_cancelled()?; + warn!("Internal gateway {gateway} authentication failed: {error}"); + } + } + } + self.check_cancelled()?; + let modes = authenticated.iter().map(|(_, session)| session.authentication.mode()); + ensure!( + internal_session_mode(modes)? == SessionMode::NonTunnel, + "Expected non-tunnel authentication" + ); + self.run_internal_session(config, &authenticated).await + } + + async fn run_internal_session( + &self, + config: &PortalConfig, + authenticated: &[(&gpapi::gateway::Gateway, super::gateway::GatewayLoginSession)], + ) -> anyhow::Result<()> { + let cancellation = self.cancellation.clone(); + let network = Arc::new(PhysicalNetwork::capture_controlled(&cancellation).await?); + let detection = config.internal_detection().cloned(); + let bindings = authenticated + .iter() + .map(|(_, session)| { + session + .extension_auth + .binding() + .cloned() + .context("Non-tunnel binding is missing") + }) + .collect::>>()?; + for binding in &bindings { + network + .validate_internal_binding(binding, detection.as_ref(), &cancellation) + .await?; + } + let policy = config + .internal_session_policy() + .context("Invalid internal session policy")?; + let profile = self.os_profile.borrow().clone(); + let source = if policy.collect_hip_data() { + self.hip_source(profile.clone())? + } else { + openconnect::HipSource::Disabled + }; + let source = Arc::new(source); + let validate_network = network.clone(); + let validate_detection = detection.clone(); + let callbacks = SessionCallbacks { + produce_report: Arc::new(move |request, control| { + control.check()?; + if matches!(source.as_ref(), openconnect::HipSource::Disabled) { + return gphip::generate_identity_report(&gphip::ReportInput { + profile: profile.clone(), + context: gphip::ReportContext::Connected { + cookie: request.cookie.clone(), + client_ip: request.client_ip.clone(), + client_ipv6: request.client_ipv6.clone(), + md5: request.md5.clone(), + }, + }) + .map_err(std::io::Error::other); + } + source.collect( + &openconnect::HipRequest { + cookie: request.cookie.clone(), + client_ip: request.client_ip.clone(), + client_ipv6: request.client_ipv6.clone(), + md5: request.md5.clone(), + client_version: profile.client_version().into(), + client_os: profile.client_os().as_str().into(), + os_version: profile.os_version().into(), + host_id: Some(profile.host_id().into()), + local_hostname: Some(profile.computer().into()), + }, + &|| control.check(), + ) + }), + report_submitted: Arc::new(|_, _| {}), + status_changed: Arc::new(|member| match member.maintenance { + MaintenanceState::Healthy => info!( + "Internal network — authenticated: {} (IPv4: {:?}, IPv6: {:?})", + member.gateway, member.client_ip, member.client_ipv6 + ), + state => info!("Internal gateway {}: {state:?}", member.gateway), + }), + validate_network: Arc::new(move |cancellation| { + let network = validate_network.clone(); + let detection = validate_detection.clone(); + let bindings = bindings.clone(); + Box::pin(async move { + for binding in &bindings { + network + .validate_internal_binding(binding, detection.as_ref(), &cancellation) + .await?; + } + Ok(()) + }) + }), + }; + let monitor_cancel = cancellation.child_token(); + let monitor_token = monitor_cancel.clone(); + let (network_changed, network_signal) = tokio::sync::oneshot::channel(); + let monitor = tokio::spawn(async move { + match network.wait_for_change(detection, monitor_token).await { + Ok(false) => {} + Ok(true) | Err(_) => { + let _ = network_changed.send(SessionEndReason::NetworkChanged); + } + } + }); + + // The PID spans maintenance and cleanup, including initialization before the + // first successful HIP exchange. The outer handler owns final session logout. + self.pid_written.store( + super::gateway::write_pid_file(self.shared_args.lock_file), + std::sync::atomic::Ordering::SeqCst, + ); + let mut sessions = self.sessions.take(); + let result = maintain_non_tunnel_sessions(&mut sessions, policy, callbacks, cancellation, async move { + network_signal.await.unwrap_or(SessionEndReason::NetworkChanged) + }) + .await; + self.sessions.replace(sessions); + monitor_cancel.cancel(); + monitor.await.context("Internal network monitor failed")?; + match result? { + SessionExit::Disconnected => Ok(()), + SessionExit::Failed(reason) => bail!("Internal session ended: {reason:?}. Connect again to authenticate."), + } + } + + pub(super) async fn logout_gateway(&self, gateway: &str) { + let mut sessions = self.sessions.take(); + sessions.logout_gateway(gateway).await; + self.sessions.replace(sessions); + } +} + +fn internal_session_mode(modes: impl Iterator) -> anyhow::Result { + let mut modes = modes; + let mode = modes.next().context("No internal gateway authenticated successfully")?; + ensure!( + modes.all(|candidate| candidate == mode), + "Mixed tunnel and non-tunnel internal gateways are unsupported; select a gateway explicitly" + ); + Ok(mode) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn internal_modes_reject_mixed_and_empty_sets() { + assert!(internal_session_mode([].into_iter()).is_err()); + assert!(internal_session_mode([SessionMode::Tunnel, SessionMode::NonTunnel].into_iter()).is_err()); + assert_eq!( + internal_session_mode([SessionMode::NonTunnel, SessionMode::NonTunnel].into_iter()).unwrap(), + SessionMode::NonTunnel + ); + assert_eq!( + internal_session_mode([SessionMode::Tunnel].into_iter()).unwrap(), + SessionMode::Tunnel + ); + } +} diff --git a/apps/gpclient/src/connect/mod.rs b/apps/gpclient/src/connect/mod.rs index cacef1e..f615df1 100644 --- a/apps/gpclient/src/connect/mod.rs +++ b/apps/gpclient/src/connect/mod.rs @@ -1,17 +1,25 @@ mod args; mod credential; +#[cfg(test)] +mod flow_tests; mod gateway; +mod internal; use std::cell::RefCell; +use std::sync::{ + Arc, + atomic::{AtomicBool, Ordering}, +}; use anyhow::bail; use gpapi::{ clap::report, error::PortalError, - gateway::{GatewayLoginContext, GatewaySelection}, + gateway::GatewaySelection, gp_params::GpParams, os_profile::OsProfile, portal::{PreloginOptions, prelogin, retrieve_config}, + session::GatewaySessions, utils::request::RequestIdentityError, }; use inquire::{Password, PasswordDisplayMode, Select}; @@ -25,6 +33,7 @@ use credential::CleanAuthState; use gateway::GatewayConnectError; pub(crate) struct ConnectHandler<'a> { + cancellation: tokio_util::sync::CancellationToken, args: &'a ConnectArgs, shared_args: &'a SharedArgs<'a>, os_profile: RefCell, @@ -32,6 +41,8 @@ pub(crate) struct ConnectHandler<'a> { password_from_stdin: RefCell>, cookie_from_stdin: RefCell>, clean_auth_state: RefCell, + sessions: RefCell, + pid_written: Arc, } impl<'a> ConnectHandler<'a> { @@ -44,6 +55,7 @@ impl<'a> ConnectHandler<'a> { let clean_auth = false; Self { + cancellation: tokio_util::sync::CancellationToken::new(), args, shared_args, os_profile: RefCell::new(build_os_profile(args)), @@ -51,6 +63,8 @@ impl<'a> ConnectHandler<'a> { password_from_stdin: Default::default(), cookie_from_stdin: Default::default(), clean_auth_state: RefCell::new(CleanAuthState::new(clean_auth)), + sessions: RefCell::default(), + pid_written: Arc::default(), } } @@ -93,6 +107,43 @@ impl<'a> ConnectHandler<'a> { } pub(crate) async fn handle(&self) -> anyhow::Result<()> { + let cancellation = self.cancellation.clone(); + let signal = tokio::spawn(async move { + gpapi::utils::shutdown_signal().await; + cancellation.cancel(); + }); + let result = self.handle_attempt().await; + let sessions = self.sessions.take(); + if self.args.cookie_only && result.is_ok() { + sessions.relinquish(); + } else { + sessions.logout().await; + } + if self.pid_written.load(Ordering::SeqCst) { + if let Err(error) = std::fs::remove_file(self.shared_args.lock_file) { + warn!("Failed to remove PID file: {error}"); + } + } + signal.abort(); + let _ = signal.await; + result + } + + fn check_cancelled(&self) -> anyhow::Result<()> { + if self.cancellation.is_cancelled() { + Err(gpapi::auth::AuthenticationCancelled.into()) + } else { + Ok(()) + } + } + + async fn handle_attempt(&self) -> anyhow::Result<()> { + if self.args.browser_listen.is_some() + && !matches!(self.args.browser.as_deref(), Some(browser) if browser.eq_ignore_ascii_case("remote")) + { + bail!("The '--browser-listen' option requires '--browser remote'"); + } + #[cfg(feature = "webview-auth")] if self.args.default_browser && self.args.browser.is_some() { bail!("Cannot use `--default-browser` and `--browser` options at the same time"); @@ -101,6 +152,7 @@ impl<'a> ConnectHandler<'a> { self.latest_key_password.replace(self.args.key_password.clone()); loop { + self.check_cancelled()?; let Err(err) = self.handle_impl().await else { return Ok(()); }; @@ -138,6 +190,7 @@ impl<'a> ConnectHandler<'a> { } pub(crate) async fn handle_impl(&self) -> anyhow::Result<()> { + self.check_cancelled()?; let server = self.args.server.as_str(); let as_gateway = self.args.as_gateway; @@ -149,10 +202,11 @@ impl<'a> ConnectHandler<'a> { } if !self.args.cookie_on_stdin { - if let Some(()) = self.try_cached_cookie(server).await { - return Ok(()); + if let Some(result) = self.try_cached_cookie(server).await { + return result; } } + self.check_cancelled()?; let Err(err) = self.connect_portal_with_prelogin(server).await else { return Ok(()); @@ -184,10 +238,35 @@ impl<'a> ConnectHandler<'a> { async fn connect_portal_with_prelogin(&self, portal: &str) -> anyhow::Result<()> { let gp_params = self.build_gp_params(); - let prelogin = prelogin(portal, &gp_params, self.prelogin_options(false)).await?; + let prelogin = tokio::select! { + biased; + _ = self.cancellation.cancelled() => return Err(gpapi::auth::AuthenticationCancelled.into()), + result = prelogin(portal, &gp_params, self.prelogin_options(false)) => result?, + }; - let cred = self.obtain_credential(&prelogin, portal, false).await?; - let mut portal_config = retrieve_config(portal, &cred, &gp_params).await?; + let cached = self.cached_portal_credential(portal); + let cached_config = match cached { + Some(cred) => match retrieve_config(portal, &cred, &gp_params, &self.cancellation).await { + Ok(config) => Some((cred, config)), + Err(error) => { + self.check_cancelled()?; + warn!("Cached portal authentication failed: {error}"); + self.clear_cookie_cache(); + None + } + }, + None => None, + }; + let (cred, mut portal_config) = match cached_config { + Some(result) => result, + None => { + let cred = self.obtain_credential(&prelogin, portal, false).await?; + self.check_cancelled()?; + let config = retrieve_config(portal, &cred, &gp_params, &self.cancellation).await?; + (cred, config) + } + }; + self.check_cancelled()?; portal_config.sort_gateways(prelogin.region()); @@ -195,7 +274,6 @@ impl<'a> ConnectHandler<'a> { Some(password) => portal_config.auth_cookie().clone().with_password(password), None => portal_config.auth_cookie().clone(), }; - let allow_extend_session = portal_config.allow_extend_session().unwrap_or(false); let portal_config_default_browser = portal_config.default_browser().unwrap_or(false); info!("Portal config default-browser: {}", portal_config_default_browser); @@ -211,29 +289,27 @@ impl<'a> ConnectHandler<'a> { ); let mut last_err: Option = None; - for gateway in &gateways { + for (index, gateway) in gateways.iter().enumerate() { info!("Auto-gateway: attempting gateway {}", gateway); - let gateway_context = - GatewayLoginContext::new(gateway, GatewaySelection::Auto).with_connect_method(portal_config.connect_method()); - match self .connect_gateway_with_fallback( portal, - gateway.server(), + gateway, &auth_cookie, - allow_extend_session, - portal_config_default_browser, - gateway_context, + &portal_config, + GatewaySelection::Auto, + &gateways[index + 1..], ) .await { Ok(()) => return Ok(()), Err(err) => { - if !err.is_before_tunnel() { + self.logout_gateway(gateway.server()).await; + if !err.is_before_establishment() { return Err(err.into_error()); } warn!( - "Auto-gateway: gateway {} failed before tunnel setup: {}", + "Auto-gateway: gateway {} failed before session establishment: {}", gateway, err.as_error() ); @@ -264,6 +340,9 @@ impl<'a> ConnectHandler<'a> { None => { let gateways = portal_config.gateways(); + if gateways.is_empty() { + bail!("No gateways available in portal configuration"); + } if gateways.len() > 1 { let gateway = Select::new("Which gateway do you want to connect to?", gateways) .with_vim_mode(true) @@ -277,18 +356,14 @@ impl<'a> ConnectHandler<'a> { } }; - let gateway = selected_gateway.server(); - let gateway_context = - GatewayLoginContext::new(selected_gateway, gateway_selection).with_connect_method(portal_config.connect_method()); - self .connect_gateway_with_fallback( portal, - gateway, + selected_gateway, &auth_cookie, - allow_extend_session, - portal_config_default_browser, - gateway_context, + &portal_config, + gateway_selection, + &[], ) .await .map_err(GatewayConnectError::into_error) diff --git a/apps/gpclient/src/disconnect.rs b/apps/gpclient/src/disconnect.rs index a0c6d66..060e288 100644 --- a/apps/gpclient/src/disconnect.rs +++ b/apps/gpclient/src/disconnect.rs @@ -1,8 +1,7 @@ -use crate::GP_CLIENT_LOCK_FILE; use clap::Args; use gpapi::utils::lock_file::gpservice_lock_info; use log::{info, warn}; -use std::{fs, str::FromStr, thread, time::Duration}; +use std::{fs, path::Path, str::FromStr, thread, time::Duration}; use sysinfo::{Pid, Signal, System}; #[derive(Args)] @@ -17,16 +16,17 @@ pub struct DisconnectArgs { pub struct DisconnectHandler<'a> { args: &'a DisconnectArgs, + lock_file: &'a Path, } impl<'a> DisconnectHandler<'a> { - pub fn new(args: &'a DisconnectArgs) -> Self { - Self { args } + pub fn new(args: &'a DisconnectArgs, lock_file: &'a Path) -> Self { + Self { args, lock_file } } pub async fn handle(&self) -> anyhow::Result<()> { // Try to disconnect the CLI client - if let Ok(c) = fs::read_to_string(GP_CLIENT_LOCK_FILE) { + if let Ok(c) = fs::read_to_string(self.lock_file) { send_signal(c.trim(), Signal::Interrupt).unwrap_or_else(|err| { warn!("Failed to send signal to client: {}", err); }); diff --git a/apps/gpclient/src/hip.rs b/apps/gpclient/src/hip.rs index 286d571..b733351 100644 --- a/apps/gpclient/src/hip.rs +++ b/apps/gpclient/src/hip.rs @@ -1,137 +1,12 @@ -use askama::Template; +use std::time::Duration; + use clap::Args; use gpapi::{ clap::args::Os, - os_profile::{ClientOs, OsProfile, OsProfileBuilder}, + os_profile::{ClientOs, OsProfileBuilder}, + process::collection::CollectionBudget, }; -use log::debug; -use serde::Deserialize; -use std::collections::HashMap; -use std::process::Command; -use xmltree::Element; - -#[derive(Template)] -#[template(path = "hip_report.xml")] -struct HipReportTemplate<'a> { - client_version: &'a str, - generate_time: String, - day: String, - month: String, - year: String, - user_name: &'a str, - host_info: HostInfo, - md5: &'a str, -} - -#[derive(Debug, Clone, Deserialize)] -struct DefenderInfo { - #[serde(rename = "appVersion")] - app_version: String, - #[serde(rename = "engineVersion")] - engine_version: String, - #[serde(rename = "definitionsVersion")] - definitions_version: String, - #[serde(rename = "realTimeProtectionEnabled")] - real_time_protection_enabled: RealTimeProtection, -} - -#[derive(Debug, Clone, Deserialize)] -struct RealTimeProtection { - value: bool, -} - -#[derive(Debug, Clone)] -struct UfwInfo { - version: String, - is_enabled: bool, -} - -#[derive(Debug, Clone)] -struct ClamAvInfo { - version: String, - definitions_version: Option, - real_time_protection: bool, -} - -/// Host information for HIP reporting -struct HostInfo { - /// Common for all OSes, e.g., "Apple", "Microsoft", "Linux" - os_vendor: String, - /// Common for all OSes, e.g., "Linux Ubuntu 20.04", "Apple Mac OS X 10.15.7", etc. - os_version: String, - /// Per-OS machine identifier (UUID for Linux/Windows, MAC for macOS) - host_id: String, - /// Common for all OSes - host_name: String, - /// Only for macOS and Windows, e.g., "10.15.7", "10.0.19044.2130" - software_version: String, - domain: String, - network_interfaces: Vec, - defender: Option, - clamav: Option, - ufw: Option, -} - -impl HostInfo { - /// Get the first available IPv4 address from network interfaces - pub fn default_ipv4(&self) -> &str { - self - .network_interfaces - .first() - .and_then(|iface| iface.ipv4.as_deref()) - .unwrap_or_default() - } - - /// Get the first available IPv6 address from network interfaces - pub fn default_ipv6(&self) -> &str { - self - .network_interfaces - .first() - .and_then(|iface| iface.ipv6.as_deref()) - .unwrap_or_default() - } -} - -/// Network interface information -#[derive(Clone)] -struct NetworkInterface { - name: String, - description: String, - mac_address: Option, - ipv4: Option, - ipv6: Option, -} - -impl NetworkInterface { - /// Create a new network interface with basic information - fn new(name: String, description: String) -> Self { - Self { - name, - description, - mac_address: None, - ipv4: None, - ipv6: None, - } - } - - /// Set MAC address - fn with_mac(mut self, mac: Option) -> Self { - self.mac_address = mac; - self - } - - /// Set IPv4 address - fn with_ipv4(mut self, ipv4: Option) -> Self { - self.ipv4 = ipv4; - self - } - - /// Set IPv6 address - fn with_ipv6(mut self, ipv6: Option) -> Self { - self.ipv6 = ipv6; - self - } -} +use gphip::{ReportContext, ReportInput, generate_report_with_control}; #[derive(Args)] pub(crate) struct HipArgs { @@ -162,603 +37,33 @@ pub(crate) struct HipArgs { pub(crate) struct HipHandler<'a> { args: &'a HipArgs, - profile: OsProfile, } impl<'a> HipHandler<'a> { pub(crate) fn new(args: &'a HipArgs) -> Self { - let profile = build_os_profile(args); - Self { args, profile } + Self { args } } pub(crate) async fn handle(&self) -> anyhow::Result<()> { - let cookie_params = self.parse_cookie(); - let report = self.generate_hip_report(&cookie_params)?; - - debug!("Generated HIP report:\n{}", report); - println!("{}", report); - + let budget = CollectionBudget::new(Duration::from_secs(60)); + let client_os = ClientOs::from(self.args.client_os); + let mut builder = OsProfileBuilder::new(client_os).client_version(self.args.client_version.clone()); + if let Some(os_version) = self.args.os_version.as_deref() { + builder = builder.os_version(os_version); + } + if let Some(host_id) = self.args.host_id.as_deref() { + builder = builder.host_id_override(host_id); + } + let input = ReportInput { + profile: builder.build_with_control(&budget)?, + context: ReportContext::Connected { + cookie: self.args.cookie.clone(), + client_ip: self.args.client_ip.clone(), + client_ipv6: self.args.client_ipv6.clone(), + md5: self.args.md5.clone(), + }, + }; + println!("{}", generate_report_with_control(&input, &budget)?); Ok(()) } - - fn parse_cookie(&self) -> HashMap { - // Parse URL-encoded cookie string using serde_urlencoded - serde_urlencoded::from_str(&self.args.cookie).unwrap_or_default() - } - - /// Generate the complete HIP report XML - fn generate_hip_report(&self, cookie_params: &HashMap) -> anyhow::Result { - let (generate_time, day, month, year) = get_current_time_components(); - let user_name = cookie_params.get("user").map(|s| s.as_str()).unwrap_or(""); - let host_info = self.collect_host_info(cookie_params); - - let template = HipReportTemplate { - client_version: &self.args.client_version, - generate_time, - day, - month, - year, - user_name, - host_info, - md5: &self.args.md5, - }; - - let report = template.render()?; - format_xml(&report) - } - - /// Collect host information using the configured OsProfile. - fn collect_host_info(&self, cookie_params: &'a HashMap) -> HostInfo { - HostInfoCollector::new(&self.profile, self.args, cookie_params).collect() - } -} - -/// Construct an `OsProfile` from CLI args, falling back to per-OS defaults -/// for any value not supplied on the command line. -fn build_os_profile(args: &HipArgs) -> OsProfile { - let client_os = ClientOs::from(args.client_os); - let mut builder = OsProfileBuilder::new(client_os).client_version(args.client_version.clone()); - if let Some(host_id) = args.host_id.as_deref() { - debug!("HIP host-id override supplied: {}", host_id); - builder = builder.host_id_override(host_id); - } - let profile = builder.build(); - debug!( - "HIP OS profile host-id: runtime={}, projected={}, client_os={}", - profile.host_identity().host_id(), - profile.host_id(), - client_os.as_str() - ); - profile -} - -// ============================================================================ -// Host Information Collector -// ============================================================================ - -/// Helper struct for collecting host information. -/// -/// Identity values (vendor, host_id, computer name, software version) come -/// from the configured `OsProfile`, while runtime state (network interfaces, -/// IP addresses) is enumerated here from the underlying machine. -struct HostInfoCollector<'p, 'a> { - profile: &'p OsProfile, - args: &'a HipArgs, - cookie_params: &'a HashMap, -} - -impl<'p, 'a> HostInfoCollector<'p, 'a> { - fn new(profile: &'p OsProfile, args: &'a HipArgs, cookie_params: &'a HashMap) -> Self { - Self { - profile, - args, - cookie_params, - } - } - - /// Domain belongs to the runtime user/session, not the simulated OS, so - /// it is sourced from the auth cookie when available. - fn get_domain(&self) -> String { - self - .cookie_params - .get("domain") - .map(|s| s.to_string()) - .unwrap_or_default() - } - - /// Collect network interface information with fallback - fn collect_network_interface(&self) -> NetworkInterface { - match netdev::get_default_interface() { - Ok(iface) => NetworkInterface::new( - iface.name.clone(), - iface.description.unwrap_or_else(|| iface.name.clone()), - ) - .with_mac(iface.mac_addr.map(|mac| mac.address())) - .with_ipv4(iface.ipv4.first().map(|ip| ip.addr().to_string())) - .with_ipv6(iface.ipv6.first().map(|ip| ip.addr().to_string())), - - Err(_) => NetworkInterface::new("unknown".to_string(), "unknown".to_string()) - .with_ipv4(self.args.client_ip.clone()) - .with_ipv6(self.args.client_ipv6.clone()), - } - } - - /// Single entry point for collecting host info — dispatches per-OS - /// behavior via `OsProfile` methods rather than `#[cfg(target_os)]`. - fn collect(&self) -> HostInfo { - let runtime_iface = self.collect_network_interface(); - let primary = self.adapt_primary_interface(&runtime_iface); - - let mut interfaces = vec![primary.clone()]; - interfaces.extend(self.extra_interfaces(&primary)); - - HostInfo { - os_vendor: self.profile.os_vendor().to_string(), - os_version: self.profile.os_version().to_string(), - host_id: self.profile.host_id().to_string(), - host_name: self.profile.computer().to_string(), - software_version: self.profile.software_version().to_string(), - domain: self.domain_for_profile(), - network_interfaces: interfaces, - defender: self.defender_for_profile(), - clamav: self.clamav_for_profile(), - ufw: self.ufw_for_profile(), - } - } - - /// Build the primary network interface with OS-appropriate naming and - /// MAC formatting. When emulating a different OS, the runtime interface - /// name/description are replaced with the canonical placeholder for the - /// target OS. - fn adapt_primary_interface(&self, runtime: &NetworkInterface) -> NetworkInterface { - let (name, description) = if self.profile.is_native() { - (runtime.name.clone(), runtime.description.clone()) - } else { - placeholder_interface_for(self.profile, runtime) - }; - - NetworkInterface { - name, - description, - mac_address: format_mac_for(self.profile, runtime.mac_address.clone()), - ipv4: runtime.ipv4.clone(), - ipv6: runtime.ipv6.clone(), - } - } - - /// Additional interfaces appended after the primary. Only Windows - /// emits the software loopback interface in HIP reports. - fn extra_interfaces(&self, primary: &NetworkInterface) -> Vec { - match self.profile.client_os() { - ClientOs::Windows => vec![NetworkInterface { - name: derive_windows_network_name(self.profile.host_id(), primary), - description: "Software Loopback Interface 1".to_string(), - mac_address: Some(String::new()), - ipv4: Some("127.0.0.1".to_string()), - ipv6: Some("::1".to_string()), - }], - ClientOs::Linux | ClientOs::Mac => vec![], - } - } - - /// Linux HIP reports omit the domain field; macOS/Windows include it - /// from the auth cookie. - fn domain_for_profile(&self) -> String { - match self.profile.client_os() { - ClientOs::Linux => String::new(), - ClientOs::Mac | ClientOs::Windows => self.get_domain(), - } - } - - fn defender_for_profile(&self) -> Option { - match self.profile.client_os() { - ClientOs::Linux => detect_microsoft_defender_blocking(), - ClientOs::Mac | ClientOs::Windows => None, - } - } - - fn clamav_for_profile(&self) -> Option { - match self.profile.client_os() { - ClientOs::Linux => detect_clamav(), - ClientOs::Mac | ClientOs::Windows => None, - } - } - - fn ufw_for_profile(&self) -> Option { - match self.profile.client_os() { - ClientOs::Linux => detect_ufw(), - ClientOs::Mac | ClientOs::Windows => None, - } - } -} - -fn detect_clamav() -> Option { - let version_out = Command::new("clamscan").arg("--version").output().ok()?; - if !version_out.status.success() { - debug!("clamscan not found or failed"); - return None; - } - - let version_str = String::from_utf8(version_out.stdout).ok()?; - let (version, definitions_version) = parse_clamav_version(&version_str)?; - - let rtp_out = Command::new("systemctl") - .args(["is-active", "clamav-onaccess.service"]) - .output() - .ok()?; - - let real_time_protection = rtp_out.status.success(); - - Some(ClamAvInfo { - version, - definitions_version, - real_time_protection, - }) -} - -fn detect_ufw() -> Option { - let version_out = Command::new("ufw").arg("version").output().ok()?; - if !version_out.status.success() { - debug!("ufw not found or failed"); - return None; - } - - let version_str = String::from_utf8(version_out.stdout).ok()?; - let version = parse_ufw_version(&version_str)?; - - let is_root = uzers::get_effective_uid() == 0; - let status_out = ufw_status_command(is_root).output().ok()?; - if !status_out.status.success() { - if is_root { - log::warn!("ufw status failed while running as root"); - } else { - log::warn!("sudo -n ufw status failed. You may need to configure sudoers to allow execution without a password."); - } - return None; - } - - let status_str = String::from_utf8(status_out.stdout).ok()?; - let is_enabled = parse_ufw_status(&status_str)?; - - Some(UfwInfo { version, is_enabled }) -} - -fn ufw_status_command(is_root: bool) -> Command { - let mut command = if is_root { - Command::new("ufw") - } else { - let mut command = Command::new("sudo"); - command.args(["-n", "ufw"]); - command - }; - - command.arg("status").env("LC_ALL", "C"); - command -} - -fn parse_clamav_version(output: &str) -> Option<(String, Option)> { - let mut output_parts = output.split_whitespace(); - if output_parts.next()? != "ClamAV" { - return None; - } - - let mut version_parts = output_parts.next()?.split('/'); - let version = version_parts.next()?; - if version.is_empty() { - return None; - } - - let definitions_version = version_parts - .next() - .filter(|definitions_version| !definitions_version.is_empty()) - .map(str::to_string); - - Some((version.to_string(), definitions_version)) -} - -fn parse_ufw_version(output: &str) -> Option { - let mut output_parts = output.split_whitespace(); - if output_parts.next()? != "ufw" { - return None; - } - - output_parts.next().map(str::to_string) -} - -fn parse_ufw_status(output: &str) -> Option { - let status = output - .lines() - .find_map(|line| line.trim().strip_prefix("Status:"))? - .trim(); - - match status { - "active" => Some(true), - "inactive" => Some(false), - _ => None, - } -} - -fn detect_microsoft_defender_blocking() -> Option { - let output = Command::new("mdatp") - .arg("health") - .arg("--output") - .arg("json") - .output() - .ok()?; - - if !output.status.success() { - debug!("mdatp health command failed"); - return None; - } - - let json = String::from_utf8(output.stdout).ok()?; - let defender = parse_defender_info(&json)?; - - debug!("Detected Microsoft Defender: {:?}", defender); - Some(defender) -} - -fn parse_defender_info(json: &str) -> Option { - serde_json::from_str(json).ok() -} - -// ============================================================================ -// Per-OS interface helpers (selected via OsProfile, not cfg) -// ============================================================================ - -/// Canonical interface name/description for the target OS when the runtime -/// is a different OS (i.e. emulation). -fn placeholder_interface_for(profile: &OsProfile, runtime: &NetworkInterface) -> (String, String) { - match profile.client_os() { - ClientOs::Linux => ("enp1s0f0".to_string(), "enp1s0f0".to_string()), - ClientOs::Mac => ("en0".to_string(), "en0".to_string()), - ClientOs::Windows => ( - derive_windows_network_name(profile.host_id(), runtime), - "PANGP Virtual Ethernet Adapter Secure".to_string(), - ), - } -} - -/// MAC address formatting per target OS. Windows uses hyphen separators; -/// Linux and macOS preserve the colon-separated form returned by the -/// platform. -fn format_mac_for(profile: &OsProfile, mac: Option) -> Option { - match profile.client_os() { - ClientOs::Windows => mac.map(|m| m.replace(':', "-")), - ClientOs::Linux | ClientOs::Mac => mac, - } -} - -// ============================================================================ -// Utility Functions -// ============================================================================ - -/// Get current time components for HIP report -fn get_current_time_components() -> (String, String, String, String) { - let now = chrono::Local::now(); - ( - now.format("%m/%d/%Y %H:%M:%S").to_string(), - now.format("%d").to_string(), - now.format("%m").to_string(), - now.format("%Y").to_string(), - ) -} - -/// Format XML string with proper indentation -fn format_xml(xml_str: &str) -> anyhow::Result { - let xml = Element::parse(xml_str.as_bytes())?; - - let config = xmltree::EmitterConfig::new().perform_indent(true); - let mut xml_buf = Vec::new(); - xml.write_with_config(&mut xml_buf, config)?; - - Ok(String::from_utf8(xml_buf)?) -} - -fn derive_windows_network_name(host_id: &str, iface: &NetworkInterface) -> String { - let seed = format!( - "{}-{}-{}", - host_id, - iface.mac_address.as_deref().unwrap_or("00:00:00:00:00:00"), - iface.name - ); - - format!( - "{{{}}}", - uuid::Uuid::new_v5(&uuid::Uuid::NAMESPACE_DNS, seed.as_bytes()) - .to_string() - .to_uppercase() - ) -} - -#[cfg(test)] -mod tests { - use super::*; - use gpapi::os_profile::runtime_client_os; - use std::ffi::OsStr; - - fn make_hip_args(client_os: Os) -> HipArgs { - HipArgs { - client_version: "6.2.4-49".to_string(), - client_os, - os_version: Some("test-os-version".to_string()), - host_id: None, - cookie: String::new(), - client_ip: None, - client_ipv6: None, - md5: "deadbeef".to_string(), - } - } - - fn make_profile(client_os: ClientOs) -> OsProfile { - OsProfileBuilder::new(client_os).build() - } - - #[test] - fn host_info_os_vendor_is_linux_for_linux_profile() { - let args = make_hip_args(Os::Linux); - let profile = make_profile(ClientOs::Linux); - let cookie_params: HashMap = HashMap::new(); - - let info = HostInfoCollector::new(&profile, &args, &cookie_params).collect(); - - assert_eq!(info.os_vendor, "Linux"); - } - - #[test] - fn host_info_os_vendor_is_apple_for_mac_profile() { - let args = make_hip_args(Os::Mac); - let profile = make_profile(ClientOs::Mac); - let cookie_params: HashMap = HashMap::new(); - - let info = HostInfoCollector::new(&profile, &args, &cookie_params).collect(); - - assert_eq!(info.os_vendor, "Apple"); - } - - #[test] - fn host_info_os_vendor_is_microsoft_for_windows_profile() { - let args = make_hip_args(Os::Windows); - let profile = make_profile(ClientOs::Windows); - let cookie_params: HashMap = HashMap::new(); - - let info = HostInfoCollector::new(&profile, &args, &cookie_params).collect(); - - assert_eq!(info.os_vendor, "Microsoft"); - } - - #[test] - fn host_info_host_id_comes_from_os_profile() { - let args = make_hip_args(Os::Linux); - let profile = make_profile(ClientOs::Linux); - let cookie_params: HashMap = HashMap::new(); - - let info = HostInfoCollector::new(&profile, &args, &cookie_params).collect(); - - assert_eq!(info.host_id, profile.host_id()); - } - - #[test] - fn host_info_host_id_independent_of_runtime_for_each_os() { - // host_id should reflect the OsProfile's machine identity for every - // simulated OS, regardless of the runtime platform. - for (client_os, os_arg) in [ - (ClientOs::Linux, Os::Linux), - (ClientOs::Mac, Os::Mac), - (ClientOs::Windows, Os::Windows), - ] { - let args = make_hip_args(os_arg); - let profile = make_profile(client_os); - let cookie_params: HashMap = HashMap::new(); - - let info = HostInfoCollector::new(&profile, &args, &cookie_params).collect(); - - assert_eq!(info.host_id, profile.host_id()); - } - } - - #[test] - fn hip_os_version_argument_is_ignored() { - let args = make_hip_args(Os::Linux); - let profile = build_os_profile(&args); - let cookie_params: HashMap = HashMap::new(); - - let info = HostInfoCollector::new(&profile, &args, &cookie_params).collect(); - - assert_eq!(info.os_version, profile.os_version()); - assert_ne!(info.os_version, "test-os-version"); - } - - #[test] - fn host_id_argument_sets_profile_runtime_identity() { - let mut args = make_hip_args(Os::default()); - args.host_id = Some("auth-host-id".to_string()); - - let profile = build_os_profile(&args); - - assert_eq!(profile.client_os(), runtime_client_os()); - assert_eq!(profile.host_identity().host_id(), "auth-host-id"); - } - - #[test] - fn host_info_uses_host_id_argument_for_native_profile() { - let mut args = make_hip_args(Os::default()); - args.host_id = Some("auth-host-id".to_string()); - let profile = build_os_profile(&args); - let cookie_params: HashMap = HashMap::new(); - - let info = HostInfoCollector::new(&profile, &args, &cookie_params).collect(); - - assert_eq!(profile.host_identity().host_id(), "auth-host-id"); - assert_eq!(info.host_id, profile.host_id()); - } - - #[test] - fn parses_microsoft_defender_health_json() { - let defender = parse_defender_info( - r#"{ - "appVersion": "101.25042.0000", - "engineVersion": "1.1.25040.2", - "definitionsVersion": "1.429.201.0", - "realTimeProtectionEnabled": { "value": true } - }"#, - ) - .expect("defender health json should parse"); - - assert_eq!(defender.app_version, "101.25042.0000"); - assert_eq!(defender.engine_version, "1.1.25040.2"); - assert_eq!(defender.definitions_version, "1.429.201.0"); - assert!(defender.real_time_protection_enabled.value); - } - - #[test] - fn rejects_invalid_microsoft_defender_health_json() { - assert!(parse_defender_info("{}").is_none()); - } - - #[test] - fn parses_clamav_version() { - let version = - parse_clamav_version("ClamAV 1.4.3/27562/Sun Aug 31 10:23:42 2026").expect("ClamAV version should parse"); - - assert_eq!(version, ("1.4.3".to_string(), Some("27562".to_string()))); - } - - #[test] - fn parses_clamav_version_without_definitions_version() { - assert_eq!(parse_clamav_version("ClamAV 1.4.3"), Some(("1.4.3".to_string(), None))); - } - - #[test] - fn parses_ufw_version() { - assert_eq!(parse_ufw_version("ufw 0.36.2\n"), Some("0.36.2".to_string())); - assert_eq!(parse_ufw_version("unexpected output\n"), None); - } - - #[test] - fn parses_ufw_status() { - assert_eq!(parse_ufw_status("Status: active\n"), Some(true)); - assert_eq!(parse_ufw_status("Status: inactive\n"), Some(false)); - assert_eq!(parse_ufw_status("Status: unknown\n"), None); - } - - #[test] - fn runs_ufw_status_directly_as_root() { - let command = ufw_status_command(true); - - assert_eq!(command.get_program(), OsStr::new("ufw")); - assert!(command.get_args().eq(["status"].into_iter().map(OsStr::new))); - } - - #[test] - fn runs_ufw_status_through_non_interactive_sudo_as_non_root() { - let command = ufw_status_command(false); - - assert_eq!(command.get_program(), OsStr::new("sudo")); - assert!( - command - .get_args() - .eq(["-n", "ufw", "status"].into_iter().map(OsStr::new)) - ); - } } diff --git a/apps/gpclient/src/launch_gui.rs b/apps/gpclient/src/launch_gui.rs index 958270f..bef2bea 100644 --- a/apps/gpclient/src/launch_gui.rs +++ b/apps/gpclient/src/launch_gui.rs @@ -1,26 +1,45 @@ -use std::{collections::HashMap, env::temp_dir, fs, path::PathBuf}; +use std::{fs, path::PathBuf}; +#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd", test))] +use std::process::{Command, ExitStatus}; + +#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] +use anyhow::Context; +#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd", test))] +use anyhow::bail; use clap::Args; -use common::constants::GP_CALLBACK_PORT_FILENAME; +#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd", test))] +use common::binary_paths; use directories::ProjectDirs; -use gpapi::{ - process::service_launcher::ServiceLauncher, - utils::{endpoint::http_endpoint, env_utils, shutdown_signal}, -}; +use gpapi::{process::desktop_launcher::DesktopLauncher, utils::endpoint::http_endpoint}; use log::info; -use tokio::io::AsyncWriteExt; #[derive(Args)] pub(crate) struct LaunchGuiArgs { + #[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] #[arg( required = false, - help = "The authentication data, used for the default browser authentication" + conflicts_with = "minimized", + value_parser = parse_auth_callback, + help = "The external-browser authentication callback URL" )] - pub auth_data: Option, + callback: Option, #[arg(long, help = "Launch the GUI minimized")] minimized: bool, } +impl LaunchGuiArgs { + pub(crate) fn is_auth_callback(&self) -> bool { + #[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] + { + return self.callback.is_some(); + } + + #[cfg(not(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd")))] + false + } +} + pub(crate) struct LaunchGuiHandler<'a> { args: &'a LaunchGuiArgs, } @@ -37,11 +56,9 @@ impl<'a> LaunchGuiHandler<'a> { anyhow::bail!("`launch-gui` cannot be run as root"); } - let auth_data = self.args.auth_data.as_deref().unwrap_or_default(); - if !auth_data.is_empty() { - info!("Received auth callback data"); - // Process the authentication data, its format is `globalprotectcallback:` - return feed_auth_data(auth_data).await; + #[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] + if let Some(callback) = &self.args.callback { + return forward_auth_callback(callback); } if try_active_gui().await.is_ok() { @@ -49,27 +66,13 @@ impl<'a> LaunchGuiHandler<'a> { return Ok(()); } - tokio::spawn(async move { - shutdown_signal().await; - info!("Shutting down..."); - }); - let log_file = get_log_file()?; let log_file_path = log_file.to_string_lossy().to_string(); info!("Log file: {}", log_file_path); - let mut extra_envs = HashMap::::new(); - extra_envs.insert("GP_LOG_FILE".into(), log_file_path.clone()); - - // Persist the environment variables to a file - let env_file = env_utils::persist_env_vars(Some(extra_envs))?; - let env_file = env_file.into_temp_path(); - let env_file_path = env_file.to_string_lossy().to_string(); - - let exit_status = ServiceLauncher::new() + let exit_status = DesktopLauncher::new(env!("CARGO_PKG_VERSION")) .minimized(self.args.minimized) - .env_file(&env_file_path) .log_file(&log_file_path) .launch() .await?; @@ -80,24 +83,36 @@ impl<'a> LaunchGuiHandler<'a> { } } -async fn feed_auth_data(auth_data: &str) -> anyhow::Result<()> { - if let Err(err) = feed_auth_data_cli(auth_data).await { - info!("Failed to feed auth data to the CLI: {}", err); +#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd"))] +fn forward_auth_callback(callback: &str) -> anyhow::Result<()> { + let status = auth_callback_command(callback) + .status() + .context("Failed to start the authentication callback handler")?; + ensure_auth_callback_succeeded(status) +} + +#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd", test))] +fn auth_callback_command(callback: &str) -> Command { + let mut command = Command::new(binary_paths::gpauth()); + command.args(["auth-callback", callback]); + command +} + +#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd", test))] +fn ensure_auth_callback_succeeded(status: ExitStatus) -> anyhow::Result<()> { + if !status.success() { + bail!("Authentication callback handler exited with {status}"); } Ok(()) } -async fn feed_auth_data_cli(auth_data: &str) -> anyhow::Result<()> { - info!("Feeding auth data to the CLI"); - - let port_file = temp_dir().join(GP_CALLBACK_PORT_FILENAME); - let port = tokio::fs::read_to_string(port_file).await?; - let mut stream = tokio::net::TcpStream::connect(format!("127.0.0.1:{}", port.trim())).await?; - - stream.write_all(auth_data.as_bytes()).await?; - - Ok(()) +#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "openbsd", test))] +fn parse_auth_callback(callback: &str) -> Result { + callback + .starts_with("globalprotectcallback:") + .then(|| callback.to_owned()) + .ok_or_else(|| "callback URL must use the globalprotectcallback scheme".to_owned()) } async fn try_active_gui() -> anyhow::Result<()> { @@ -120,3 +135,34 @@ fn get_log_file() -> anyhow::Result { Ok(dirs.data_dir().join("gpclient.log")) } + +#[cfg(all(test, unix))] +mod tests { + use std::os::unix::process::ExitStatusExt; + + use super::*; + + const CALLBACK: &str = "globalprotectcallback:cas-as=1&un=alice@example.com&token=token"; + + #[test] + fn callback_command_preserves_callback_argument() { + let command = auth_callback_command(CALLBACK); + let args = command + .get_args() + .map(|argument| argument.to_str().unwrap()) + .collect::>(); + + assert_eq!(args, ["auth-callback", CALLBACK]); + } + + #[test] + fn callback_command_status_is_propagated() { + assert!(ensure_auth_callback_succeeded(ExitStatus::from_raw(0)).is_ok()); + assert!(ensure_auth_callback_succeeded(ExitStatus::from_raw(1 << 8)).is_err()); + } + + #[test] + fn rejects_non_callback_url() { + assert!(parse_auth_callback("https://example.com/callback").is_err()); + } +} diff --git a/apps/gpclient/src/session.rs b/apps/gpclient/src/session.rs index ce7eee8..ada811a 100644 --- a/apps/gpclient/src/session.rs +++ b/apps/gpclient/src/session.rs @@ -220,6 +220,7 @@ mod tests { prior_secs: 1_800, message: "Session expires soon".to_string(), }), + ..Default::default() }, true, ); @@ -240,6 +241,7 @@ mod tests { prior_secs: 1_800, message: "Session expires soon".to_string(), }), + ..Default::default() }, false, ); diff --git a/apps/gpgui-helper/dist/assets/icon-BlfaAlWe.svg b/apps/gpgui-helper/dist/assets/icon-BlfaAlWe.svg deleted file mode 100644 index bccc611..0000000 --- a/apps/gpgui-helper/dist/assets/icon-BlfaAlWe.svg +++ /dev/null @@ -1,99 +0,0 @@ - - - -image/svg+xml - - - - - - - - \ No newline at end of file diff --git a/apps/gpgui-helper/dist/assets/icon-small-BO4dlTNl.svg b/apps/gpgui-helper/dist/assets/icon-small-BO4dlTNl.svg new file mode 100644 index 0000000..592bec9 --- /dev/null +++ b/apps/gpgui-helper/dist/assets/icon-small-BO4dlTNl.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/gpgui-helper/dist/assets/main-B7u6_mhO.js b/apps/gpgui-helper/dist/assets/main-B7u6_mhO.js new file mode 100644 index 0000000..18a3632 --- /dev/null +++ b/apps/gpgui-helper/dist/assets/main-B7u6_mhO.js @@ -0,0 +1,9 @@ +var e=(e,t)=>()=>(t||(e((t={exports:{}}).exports,t),e=null),t.exports);(function(){let e=document.createElement(`link`).relList;if(e&&e.supports&&e.supports(`modulepreload`))return;for(let e of document.querySelectorAll(`link[rel="modulepreload"]`))n(e);new MutationObserver(e=>{for(let t of e)if(t.type===`childList`)for(let e of t.addedNodes)e.tagName===`LINK`&&e.rel===`modulepreload`&&n(e)}).observe(document,{childList:!0,subtree:!0});function t(e){let t={};return e.integrity&&(t.integrity=e.integrity),e.referrerPolicy&&(t.referrerPolicy=e.referrerPolicy),t.credentials=e.crossOrigin===`use-credentials`?`include`:e.crossOrigin===`anonymous`?`omit`:`same-origin`,t}function n(e){if(e.ep)return;e.ep=!0;let n=t(e);fetch(e.href,n)}})();var t=e((e=>{function t(e,t){var n=e.length;e.push(t);a:for(;0>>1,a=e[r];if(0>>1;ri(c,n))li(u,c)?(e[r]=u,e[l]=n,r=l):(e[r]=c,e[s]=n,r=s);else if(li(u,n))e[r]=u,e[l]=n,r=l;else break a}}return t}function i(e,t){var n=e.sortIndex-t.sortIndex;return n===0?e.id-t.id:n}if(e.unstable_now=void 0,typeof performance==`object`&&typeof performance.now==`function`){var a=performance;e.unstable_now=function(){return a.now()}}else{var o=Date,s=o.now();e.unstable_now=function(){return o.now()-s}}var c=[],l=[],u=1,d=null,f=3,p=!1,m=!1,h=!1,g=!1,_=typeof setTimeout==`function`?setTimeout:null,v=typeof clearTimeout==`function`?clearTimeout:null,y=typeof setImmediate<`u`?setImmediate:null;function b(e){for(var i=n(l);i!==null;){if(i.callback===null)r(l);else if(i.startTime<=e)r(l),i.sortIndex=i.expirationTime,t(c,i);else break;i=n(l)}}function ee(e){if(h=!1,b(e),!m){if(n(c)!==null)m=!0,x||(x=!0,ie());else{var t=n(l);t!==null&&se(ee,t.startTime-e)}}}var x=!1,te=-1,ne=5,S=-1;function re(){return g?!0:!(e.unstable_now()-St&&re());){var o=d.callback;if(typeof o==`function`){d.callback=null,f=d.priorityLevel;var s=o(d.expirationTime<=t);if(t=e.unstable_now(),typeof s==`function`){d.callback=s,b(t),i=!0;break b}d===n(c)&&r(c),b(t)}else r(c);d=n(c)}if(d!==null)i=!0;else{var u=n(l);u!==null&&se(ee,u.startTime-t),i=!1}}break a}finally{d=null,f=a,p=!1}i=void 0}}finally{i?ie():x=!1}}}var ie;if(typeof y==`function`)ie=function(){y(C)};else if(typeof MessageChannel<`u`){var ae=new MessageChannel,oe=ae.port2;ae.port1.onmessage=C,ie=function(){oe.postMessage(null)}}else ie=function(){_(C,0)};function se(t,n){te=_(function(){t(e.unstable_now())},n)}e.unstable_IdlePriority=5,e.unstable_ImmediatePriority=1,e.unstable_LowPriority=4,e.unstable_NormalPriority=3,e.unstable_Profiling=null,e.unstable_UserBlockingPriority=2,e.unstable_cancelCallback=function(e){e.callback=null},e.unstable_forceFrameRate=function(e){0>e||125o?(r.sortIndex=a,t(l,r),n(c)===null&&r===n(l)&&(h?(v(te),te=-1):h=!0,se(ee,a-o))):(r.sortIndex=s,t(c,r),m||p||(m=!0,x||(x=!0,ie()))),r},e.unstable_shouldYield=re,e.unstable_wrapCallback=function(e){var t=f;return function(){var n=f;f=t;try{return e.apply(this,arguments)}finally{f=n}}}})),n=e(((e,n)=>{n.exports=t()})),r=e((e=>{var t=Symbol.for(`react.transitional.element`),n=Symbol.for(`react.portal`),r=Symbol.for(`react.fragment`),i=Symbol.for(`react.strict_mode`),a=Symbol.for(`react.profiler`),o=Symbol.for(`react.consumer`),s=Symbol.for(`react.context`),c=Symbol.for(`react.forward_ref`),l=Symbol.for(`react.suspense`),u=Symbol.for(`react.memo`),d=Symbol.for(`react.lazy`),f=Symbol.for(`react.activity`),p=Symbol.for(`react.view_transition`),m=Symbol.iterator;function h(e){return typeof e!=`object`||!e?null:(e=m&&e[m]||e[`@@iterator`],typeof e==`function`?e:null)}var g={isMounted:function(){return!1},enqueueForceUpdate:function(){},enqueueReplaceState:function(){},enqueueSetState:function(){}},_=Object.assign,v={};function y(e,t,n){this.props=e,this.context=t,this.refs=v,this.updater=n||g}y.prototype.isReactComponent={},y.prototype.setState=function(e,t){if(typeof e!=`object`&&typeof e!=`function`&&e!=null)throw Error(`takes an object of state variables to update or a function which returns an object of state variables.`);this.updater.enqueueSetState(this,e,t,`setState`)},y.prototype.forceUpdate=function(e){this.updater.enqueueForceUpdate(this,e,`forceUpdate`)};function b(){}b.prototype=y.prototype;function ee(e,t,n){this.props=e,this.context=t,this.refs=v,this.updater=n||g}var x=ee.prototype=new b;x.constructor=ee,_(x,y.prototype),x.isPureReactComponent=!0;var te=Array.isArray;function ne(){}var S={H:null,A:null,T:null,S:null},re=Object.prototype.hasOwnProperty;function C(e,n,r){var i=r.ref;return{$$typeof:t,type:e,key:n,ref:i===void 0?null:i,props:r}}function ie(e,t){return C(e.type,t,e.props)}function ae(e){return typeof e==`object`&&!!e&&e.$$typeof===t}function oe(e){var t={"=":`=0`,":":`=2`};return`$`+e.replace(/[=:]/g,function(e){return t[e]})}var se=/\/+/g;function ce(e,t){return typeof e==`object`&&e&&e.key!=null?oe(``+e.key):t.toString(36)}function le(e){switch(e.status){case`fulfilled`:return e.value;case`rejected`:throw e.reason;default:switch(typeof e.status==`string`?e.then(ne,ne):(e.status=`pending`,e.then(function(t){e.status===`pending`&&(e.status=`fulfilled`,e.value=t)},function(t){e.status===`pending`&&(e.status=`rejected`,e.reason=t)})),e.status){case`fulfilled`:return e.value;case`rejected`:throw e.reason}}throw e}function ue(e,r,i,a,o){var s=typeof e;(s===`undefined`||s===`boolean`)&&(e=null);var c=!1;if(e===null)c=!0;else switch(s){case`bigint`:case`string`:case`number`:c=!0;break;case`object`:switch(e.$$typeof){case t:case n:c=!0;break;case d:return c=e._init,ue(c(e._payload),r,i,a,o)}}if(c)return o=o(e),c=a===``?`.`+ce(e,0):a,te(o)?(i=``,c!=null&&(i=c.replace(se,`$&/`)+`/`),ue(o,r,i,``,function(e){return e})):o!=null&&(ae(o)&&(o=ie(o,i+(o.key==null||e&&e.key===o.key?``:(``+o.key).replace(se,`$&/`)+`/`)+c)),r.push(o)),1;c=0;var l=a===``?`.`:a+`:`;if(te(e))for(var u=0;u{t.exports=r()})),a=e((e=>{var t=i();function n(e){var t=`https://react.dev/errors/`+e;if(1{function n(){if(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__<`u`&&typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE==`function`)try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(n)}catch(e){console.error(e)}}n(),t.exports=a()})),s=e((e=>{var t=n(),r=i(),a=o();function s(e){var t=`https://react.dev/errors/`+e;if(1Oe||(e.current=De[Oe],De[Oe]=null,Oe--)}function D(e,t){Oe++,De[Oe]=e.current,e.current=t}var je=ke(null),Me=ke(null),Ne=ke(null),Pe=ke(null);function Fe(e,t){switch(D(Ne,t),D(Me,e),D(je,null),t.nodeType){case 9:case 11:e=(e=t.documentElement)&&(e=e.namespaceURI)?up(e):0;break;default:if(e=t.tagName,t=t.namespaceURI)t=up(t),e=dp(t,e);else switch(e){case`svg`:e=1;break;case`math`:e=2;break;default:e=0}}Ae(je),D(je,e)}function Ie(){Ae(je),Ae(Me),Ae(Ne)}function Le(e){var t=e.memoizedState;t!==null&&(sh._currentValue=t.memoizedState,D(Pe,e)),t=je.current;var n=dp(t,e.type);t!==n&&(D(Me,e),D(je,n))}function Re(e){Me.current===e&&(Ae(je),Ae(Me)),Pe.current===e&&(Ae(Pe),sh._currentValue=Ee)}var ze,Be;function Ve(e){if(ze===void 0)try{throw Error()}catch(e){var t=e.stack.trim().match(/\n( *(at )?)/);ze=t&&t[1]||``,Be=-1)`:-1i||c[r]!==l[i]){var u=` +`+c[r].replace(` at new `,` at `);return e.displayName&&u.includes(``)&&(u=u.replace(``,e.displayName)),u}while(1<=r&&0<=i);break}}}finally{He=!1,Error.prepareStackTrace=n}return(n=e?e.displayName||e.name:``)?Ve(n):``}function We(e,t){switch(e.tag){case 26:case 27:case 5:return Ve(e.type);case 16:return Ve(`Lazy`);case 13:return e.child!==t&&t!==null?Ve(`Suspense Fallback`):Ve(`Suspense`);case 19:return Ve(`SuspenseList`);case 0:case 15:return Ue(e.type,!1);case 11:return Ue(e.type.render,!1);case 1:return Ue(e.type,!0);case 31:return Ve(`Activity`);case 30:return Ve(`ViewTransition`);default:return``}}function Ge(e){try{var t=``,n=null;do t+=We(e,n),n=e,e=e.return;while(e);return t}catch(e){return` +Error generating stack: `+e.message+` +`+e.stack}}var Ke=Object.prototype.hasOwnProperty,qe=t.unstable_scheduleCallback,Je=t.unstable_cancelCallback,Ye=t.unstable_shouldYield,Xe=t.unstable_requestPaint,Ze=t.unstable_now,Qe=t.unstable_getCurrentPriorityLevel,$e=t.unstable_ImmediatePriority,et=t.unstable_UserBlockingPriority,tt=t.unstable_NormalPriority,nt=t.unstable_LowPriority,rt=t.unstable_IdlePriority,it=t.log,at=t.unstable_setDisableYieldValue,ot=null,st=null;function ct(e){if(typeof it==`function`&&at(e),st&&typeof st.setStrictMode==`function`)try{st.setStrictMode(ot,e)}catch{}}var lt=Math.clz32?Math.clz32:ft,ut=Math.log,dt=Math.LN2;function ft(e){return e>>>=0,e===0?32:31-(ut(e)/dt|0)|0}var pt=256,mt=262144,ht=4194304;function gt(e){var t=e&42;if(t!==0)return t;switch(e&-e){case 1:return 1;case 2:return 2;case 4:return 4;case 8:return 8;case 16:return 16;case 32:return 32;case 64:return 64;case 128:return 128;case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:return e&-e;case 262144:case 524288:case 1048576:case 2097152:return e&3932160;case 4194304:case 8388608:case 16777216:case 33554432:return e&62914560;case 67108864:return 67108864;case 134217728:return 134217728;case 268435456:return 268435456;case 536870912:return 536870912;case 1073741824:return 0;default:return e}}function _t(e,t,n){var r=e.pendingLanes;if(r===0)return 0;var i=0,a=e.suspendedLanes,o=e.pingedLanes;e=e.warmLanes;var s=r&134217727;return s===0?(s=r&~a,s===0?o===0?n||(n=r&~e,n!==0&&(i=gt(n))):i=gt(o):i=gt(s)):(r=s&~a,r===0?(o&=s,o===0?n||(n=s&~e,n!==0&&(i=gt(n))):i=gt(o)):i=gt(r)),i===0?0:t!==0&&t!==i&&(t&a)===0&&(a=i&-i,n=t&-t,a>=n||a===32&&n&4194048)?t:i}function vt(e,t){return(e.pendingLanes&~(e.suspendedLanes&~e.pingedLanes)&t)===0}function yt(e,t){t&8&&(t|=t&32);var n=e.entangledLanes;if(n!==0)for(e=e.entanglements,n&=t;0n;n++)t.push(e);return t}function Ct(e,t){e.pendingLanes|=t,t!==268435456&&(e.suspendedLanes=0,e.pingedLanes=0,e.warmLanes=0)}function wt(e,t,n,r,i,a){var o=e.pendingLanes;e.pendingLanes=n,e.suspendedLanes=0,e.pingedLanes=0,e.warmLanes=0,e.expiredLanes&=n,e.entangledLanes&=n,e.errorRecoveryDisabledLanes&=n,e.shellSuspendCounter=0;var s=e.entanglements,c=e.expirationTimes,l=e.hiddenUpdates;for(n=o&~n;0=Cr),Er=` `,Dr=!1;function Or(e,t){switch(e){case`keyup`:return xr.indexOf(t.keyCode)!==-1;case`keydown`:return t.keyCode!==229;case`keypress`:case`mousedown`:case`focusout`:return!0;default:return!1}}function kr(e){return e=e.detail,typeof e==`object`&&`data`in e?e.data:null}var Ar=!1;function jr(e,t){switch(e){case`compositionend`:return kr(t);case`keypress`:return t.which===32?(Dr=!0,Er):null;case`textInput`:return e=t.data,e===Er&&Dr?null:e;default:return null}}function Mr(e,t){if(Ar)return e===`compositionend`||!Sr&&Or(e,t)?(e=Wn(),Un=Hn=Vn=null,Ar=!1,e):null;switch(e){case`paste`:return null;case`keypress`:if(!(t.ctrlKey||t.altKey||t.metaKey)||t.ctrlKey&&t.altKey){if(t.char&&1=t)return{node:n,offset:t-e};e=r}a:{for(;n;){if(n.nextSibling){n=n.nextSibling;break a}n=n.parentNode}n=void 0}n=ti(n)}}function ri(e,t){return e&&t?e===t?!0:e&&e.nodeType===3?!1:t&&t.nodeType===3?ri(e,t.parentNode):`contains`in e?e.contains(t):e.compareDocumentPosition?!!(e.compareDocumentPosition(t)&16):!1:!1}function ii(e){e=e!=null&&e.ownerDocument!=null&&e.ownerDocument.defaultView!=null?e.ownerDocument.defaultView:window;for(var t=ei(e.document);t instanceof e.HTMLIFrameElement;){try{var n=typeof t.contentWindow.location.href==`string`}catch{n=!1}if(n)e=t.contentWindow;else break;t=ei(e.document)}return t}function ai(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return t&&(t===`input`&&(e.type===`text`||e.type===`search`||e.type===`tel`||e.type===`url`||e.type===`password`)||t===`textarea`||e.contentEditable===`true`)}var oi=Rn&&`documentMode`in document&&11>=document.documentMode,si=null,ci=null,li=null,ui=!1;function di(e,t,n){var r=n.window===n?n.document:n.nodeType===9?n:n.ownerDocument;ui||si==null||si!==ei(r)||(r=si,`selectionStart`in r&&ai(r)?r={start:r.selectionStart,end:r.selectionEnd}:(r=(r.ownerDocument&&r.ownerDocument.defaultView||window).getSelection(),r={anchorNode:r.anchorNode,anchorOffset:r.anchorOffset,focusNode:r.focusNode,focusOffset:r.focusOffset}),li&&$r(li,r)||(li=r,r=Jf(ci,`onSelect`),0>=o,i-=o,sa=1<<32-lt(t)+i|n<h?(g=d,d=null):g=d.sibling;var _=p(i,d,s[h],c);if(_===null){d===null&&(d=g);break}e&&d&&_.alternate===null&&t(i,d),o=a(_,o,h),u===null?l=_:u.sibling=_,u=_,d=g}if(h===s.length)return n(i,d),A&&la(i,h),l;if(d===null){for(;hg?(_=h,h=null):_=h.sibling;var y=p(i,h,v.value,l);if(y===null){h===null&&(h=_);break}e&&h&&y.alternate===null&&t(i,h),o=a(y,o,g),d===null?u=y:d.sibling=y,d=y,h=_}if(v.done)return n(i,h),A&&la(i,g),u;if(h===null){for(;!v.done;g++,v=c.next())v=f(i,v.value,l),v!==null&&(o=a(v,o,g),d===null?u=v:d.sibling=v,d=v);return A&&la(i,g),u}for(h=r(h);!v.done;g++,v=c.next())v=m(h,i,g,v.value,l),v!==null&&(e&&(_=v.alternate,_!==null&&h.delete(_.key===null?g:_.key)),o=a(v,o,g),d===null?u=v:d.sibling=v,d=v);return e&&h.forEach(function(e){return t(i,e)}),A&&la(i,g),u}function _(e,r,a,c){if(typeof a==`object`&&a&&a.type===se&&a.key===null&&a.props.ref===void 0&&(a=a.props.children),typeof a==`object`&&a){switch(a.$$typeof){case ae:a:{for(var l=a.key;r!==null;){if(r.key===l){if(l=a.type,l===se){if(r.tag===7){n(e,r.sibling),c=i(r,a.props.children),vo(c,a),c.return=e,e=c;break a}}else if(r.elementType===l||typeof l==`object`&&l&&l.$$typeof===ge&&uo(l)===r.type){n(e,r.sibling),c=i(r,a.props),vo(c,a),c.return=e,e=c;break a}n(e,r);break}t(e,r),r=r.sibling}a.type===se?(c=Ji(a.props.children,e.mode,c,a.key),vo(c,a),c.return=e,e=c):(c=qi(a.type,a.key,a.props,null,e.mode,c),vo(c,a),c.return=e,e=c)}return o(e);case oe:a:{for(l=a.key;r!==null;){if(r.key===l){if(r.tag===4&&r.stateNode.containerInfo===a.containerInfo&&r.stateNode.implementation===a.implementation){n(e,r.sibling),c=i(r,a.children||[]),c.return=e,e=c;break a}n(e,r);break}t(e,r),r=r.sibling}c=Zi(a,e.mode,c),c.return=e,e=c}return o(e);case ge:return a=uo(a),_(e,r,a,c)}if(Te(a))return h(e,r,a,c);if(Se(a)){if(l=Se(a),typeof l!=`function`)throw Error(s(150));return a=l.call(a),g(e,r,a,c)}if(typeof a.then==`function`)return _(e,r,_o(a),c);if(a.$$typeof===de)return _(e,r,Ia(e,a),c);yo(e,a)}return typeof a==`string`&&a!==``||typeof a==`number`||typeof a==`bigint`?(a=``+a,r!==null&&r.tag===6?(n(e,r.sibling),c=i(r,a),c.return=e,e=c):(n(e,r),c=Yi(a,e.mode,c),c.return=e,e=c),o(e)):n(e,r)}return function(e,t,n,r){try{go=0;var i=_(e,t,n,r);return ho=null,i}catch(t){if(t===io||t===oo)throw t;var a=Ui(29,t,null,e.mode);return a.lanes=r,a.return=e,a}}}var xo=bo(!0),So=bo(!1),Co=!1;function wo(e){e.updateQueue={baseState:e.memoizedState,firstBaseUpdate:null,lastBaseUpdate:null,shared:{pending:null,lanes:0,hiddenCallbacks:null},callbacks:null}}function To(e,t){e=e.updateQueue,t.updateQueue===e&&(t.updateQueue={baseState:e.baseState,firstBaseUpdate:e.firstBaseUpdate,lastBaseUpdate:e.lastBaseUpdate,shared:e.shared,callbacks:null})}function Eo(e){return{lane:e,tag:0,payload:null,callback:null,next:null}}function Do(e,t,n){var r=e.updateQueue;if(r===null)return null;if(r=r.shared,W&2){var i=r.pending;return i===null?t.next=t:(t.next=i.next,i.next=t),r.pending=t,t=Bi(e),zi(e,null,n),t}return Ii(e,r,t,n),Bi(e)}function Oo(e,t,n){if(t=t.updateQueue,t!==null&&(t=t.shared,n&4194048)){var r=t.lanes;r&=e.pendingLanes,n|=r,t.lanes=n,Et(e,n)}}function ko(e,t){var n=e.updateQueue,r=e.alternate;if(r!==null&&(r=r.updateQueue,n===r)){var i=null,a=null;if(n=n.firstBaseUpdate,n!==null){do{var o={lane:n.lane,tag:n.tag,payload:n.payload,callback:null,next:null};a===null?i=a=o:a=a.next=o,n=n.next}while(n!==null);a===null?i=a=t:a=a.next=t}else i=a=t;n={baseState:r.baseState,firstBaseUpdate:i,lastBaseUpdate:a,shared:r.shared,callbacks:r.callbacks},e.updateQueue=n;return}e=n.lastBaseUpdate,e===null?n.firstBaseUpdate=t:e.next=t,n.lastBaseUpdate=t}var Ao=!1;function jo(){if(Ao){var e=Ya;if(e!==null)throw e}}function Mo(e,t,n,r){Ao=!1;var i=e.updateQueue;Co=!1;var a=i.firstBaseUpdate,o=i.lastBaseUpdate,s=i.shared.pending;if(s!==null){i.shared.pending=null;var c=s,l=c.next;c.next=null,o===null?a=l:o.next=l,o=c;var u=e.alternate;u!==null&&(u=u.updateQueue,s=u.lastBaseUpdate,s!==o&&(s===null?u.firstBaseUpdate=l:s.next=l,u.lastBaseUpdate=c))}if(a!==null){var d=i.baseState;o=0,u=l=c=null,s=a;do{var f=s.lane&-536870913,p=f!==s.lane;if(p?(q&f)===f:(r&f)===f){f!==0&&f===Ja&&(Ao=!0),u!==null&&(u=u.next={lane:0,tag:s.tag,payload:s.payload,callback:null,next:null});a:{var m=e,h=s;f=t;var g=n;switch(h.tag){case 1:if(m=h.payload,typeof m==`function`){d=m.call(g,d,f);break a}d=m;break a;case 3:m.flags=m.flags&-65537|128;case 0:if(m=h.payload,f=typeof m==`function`?m.call(g,d,f):m,f==null)break a;d=C({},d,f);break a;case 2:Co=!0}}f=s.callback,f!==null&&(e.flags|=64,p&&(e.flags|=8192),p=i.callbacks,p===null?i.callbacks=[f]:p.push(f))}else p={lane:f,tag:s.tag,payload:s.payload,callback:s.callback,next:null},u===null?(l=u=p,c=d):u=u.next=p,o|=f;if(s=s.next,s===null){if(s=i.shared.pending,s===null)break;p=s,s=p.next,p.next=null,i.lastBaseUpdate=p,i.shared.pending=null}}while(1);u===null&&(c=d),i.baseState=c,i.firstBaseUpdate=l,i.lastBaseUpdate=u,a===null&&(i.shared.lanes=0),sd|=o,e.lanes=o,e.memoizedState=d}}function No(e,t){if(typeof e!=`function`)throw Error(s(191,e));e.call(t)}function Po(e,t){var n=e.callbacks;if(n!==null)for(e.callbacks=null,e=0;ea?a:8;var o=T.T,s={};s.types=o===null?null:o.types,T.T=s,_c(e,!1,t,n);try{var c=i(),l=T.S;l!==null&&l(s,c),typeof c==`object`&&c&&typeof c.then==`function`?gc(e,t,Qa(c,r),jd(e)):gc(e,t,r,jd(e))}catch(n){gc(e,t,{then:function(){},status:`rejected`,reason:n},jd())}finally{E.p=a,o!==null&&s.types!==null&&(o.types=s.types),T.T=o}}function oc(){}function sc(e,t,n,r){if(e.tag!==5)throw Error(s(476));var i=cc(e).queue;ac(e,i,t,Ee,n===null?oc:function(){return lc(e),n(r)})}function cc(e){var t=e.memoizedState;if(t!==null)return t;t={memoizedState:Ee,baseState:Ee,baseQueue:null,queue:{pending:null,lanes:0,dispatch:null,lastRenderedReducer:vs,lastRenderedState:Ee},next:null};var n={};return t.next={memoizedState:n,baseState:n,baseQueue:null,queue:{pending:null,lanes:0,dispatch:null,lastRenderedReducer:vs,lastRenderedState:n},next:null},e.memoizedState=t,e=e.alternate,e!==null&&(e.memoizedState=t),t}function lc(e){var t=cc(e);t.next===null&&(t=e.alternate.memoizedState),gc(e,t.next.queue,{},jd())}function uc(){return Fa(sh)}function dc(){return I().memoizedState}function fc(){return I().memoizedState}function pc(e){for(var t=e.return;t!==null;){switch(t.tag){case 24:case 3:var n=jd();e=Eo(n);var r=Do(t,e,n);r!==null&&(Pd(r,t,n),Oo(r,t,n)),t={cache:Va()},e.payload=t;return}t=t.return}}function mc(e,t,n){var r=jd();n={lane:r,revertLane:0,gesture:null,action:n,hasEagerState:!1,eagerState:null,next:null},vc(e)?yc(t,n):(n=Li(e,t,n,r),n!==null&&(Pd(n,e,r),bc(n,t,r)))}function hc(e,t,n){gc(e,t,n,jd())}function gc(e,t,n,r){var i={lane:r,revertLane:0,gesture:null,action:n,hasEagerState:!1,eagerState:null,next:null};if(vc(e))yc(t,i);else{var a=e.alternate;if(e.lanes===0&&(a===null||a.lanes===0)&&(a=t.lastRenderedReducer,a!==null))try{var o=t.lastRenderedState,s=a(o,n);if(i.hasEagerState=!0,i.eagerState=s,Qr(s,o))return Ii(e,t,i,0),G===null&&Fi(),!1}catch{}if(n=Li(e,t,i,r),n!==null)return Pd(n,e,r),bc(n,t,r),!0}return!1}function _c(e,t,n,r){if(r={lane:2,revertLane:Pf(),gesture:null,action:r,hasEagerState:!1,eagerState:null,next:null},vc(e)){if(t)throw Error(s(479))}else t=Li(e,n,r,2),t!==null&&Pd(t,e,2)}function vc(e){var t=e.alternate;return e===M||t!==null&&t===M}function yc(e,t){$o=Qo=!0;var n=e.pending;n===null?t.next=t:(t.next=n.next,n.next=t),e.pending=t}function bc(e,t,n){if(n&4194048){var r=t.lanes;r&=e.pendingLanes,n|=r,t.lanes=n,Et(e,n)}}var xc={readContext:Fa,use:gs,useCallback:F,useContext:F,useEffect:F,useImperativeHandle:F,useLayoutEffect:F,useInsertionEffect:F,useMemo:F,useReducer:F,useRef:F,useState:F,useDebugValue:F,useDeferredValue:F,useTransition:F,useSyncExternalStore:F,useId:F,useHostTransitionStatus:F,useFormState:F,useActionState:F,useOptimistic:F,useMemoCache:F,useCacheRefresh:F,useEffectEvent:F},Sc={readContext:Fa,use:gs,useCallback:function(e,t){return ps().memoizedState=[e,t===void 0?null:t],e},useContext:Fa,useEffect:Ks,useImperativeHandle:function(e,t,n){n=n==null?null:n.concat([e]),Ws(4194308,4,Qs.bind(null,t,e),n)},useLayoutEffect:function(e,t){return Ws(4194308,4,e,t)},useInsertionEffect:function(e,t){Ws(4,2,e,t)},useMemo:function(e,t){var n=ps();t=t===void 0?null:t;var r=e();if(es){ct(!0);try{e()}finally{ct(!1)}}return n.memoizedState=[r,t],r},useReducer:function(e,t,n){var r=ps();if(n!==void 0){var i=n(t);if(es){ct(!0);try{n(t)}finally{ct(!1)}}}else i=t;return r.memoizedState=r.baseState=i,e={pending:null,lanes:0,dispatch:null,lastRenderedReducer:e,lastRenderedState:i},r.queue=e,e=e.dispatch=mc.bind(null,M,e),[r.memoizedState,e]},useRef:function(e){var t=ps();return e={current:e},t.memoizedState=e},useState:function(e){e=Os(e);var t=e.queue,n=hc.bind(null,M,t);return t.dispatch=n,[e.memoizedState,n]},useDebugValue:ec,useDeferredValue:function(e,t){return rc(ps(),e,t)},useTransition:function(){var e=Os(!1);return e=ac.bind(null,M,e.queue,!0,!1),ps().memoizedState=e,[!1,e]},useSyncExternalStore:function(e,t,n){var r=M,i=ps();if(A){if(n===void 0)throw Error(s(407));n=n()}else{if(n=t(),G===null)throw Error(s(349));q&127||Cs(r,t,n)}i.memoizedState=n;var a={value:n,getSnapshot:t};return i.queue=a,Ks(Ts.bind(null,r,a,e),[e]),r.flags|=2048,Hs(9,{destroy:void 0},ws.bind(null,r,a,n,t),null),n},useId:function(){var e=ps(),t=G.identifierPrefix;if(A){var n=ca,r=sa;n=(r&~(1<<32-lt(r)-1)).toString(32)+n,t=`_`+t+`R_`+n,n=ts++,0<\/script>`,a=a.removeChild(a.firstChild);break;case`select`:a=typeof r.is==`string`?o.createElement(`select`,{is:r.is}):o.createElement(`select`),r.multiple?a.multiple=!0:r.size&&(a.size=r.size);break;default:a=typeof r.is==`string`?o.createElement(i,{is:r.is}):o.createElement(i)}}a[Nt]=t,a[Pt]=r;a:for(o=t.child;o!==null;){if(o.tag===5||o.tag===6)a.appendChild(o.stateNode);else if(o.tag!==4&&o.tag!==27&&o.child!==null){o.child.return=o,o=o.child;continue}if(o===t)break a;for(;o.sibling===null;){if(o.return===null||o.return===t)break a;o=o.return}o.sibling.return=o.return,o=o.sibling}t.stateNode=a;a:switch(np(a,i,r),i){case`button`:case`input`:case`select`:case`textarea`:r=!!r.autoFocus;break a;case`img`:r=!0;break a;default:r=!1}r&&vl(t)}}return z(t),t.subtreeFlags&=-33554433,yl(t,t.type,e===null?null:e.memoizedProps,t.pendingProps,n),null;case 6:if(e&&t.stateNode!=null)e.memoizedProps!==r&&vl(t);else{if(typeof r!=`string`&&t.stateNode===null)throw Error(s(166));if(e=Ne.current,xa(t)){if(e=t.stateNode,n=t.memoizedProps,r=null,i=ma,i!==null)switch(i.tag){case 27:case 5:r=i.memoizedProps}e[Nt]=t,e=!!(e.nodeValue===n||r!==null&&!0===r.suppressHydrationWarning||ep(e.nodeValue,n)),e||va(t,!0)}else e=lp(e).createTextNode(r),e[Nt]=t,t.stateNode=e}return z(t),null;case 31:if(n=t.memoizedState,e===null||e.memoizedState!==null){if(r=xa(t),n!==null){if(e===null){if(!r)throw Error(s(318));if(e=t.memoizedState,e=e===null?null:e.dehydrated,!e)throw Error(s(557));e[Nt]=t}else Sa(),!(t.flags&128)&&(t.memoizedState=null),t.flags|=4;z(t),e=!1}else n=Ca(),e!==null&&e.memoizedState!==null&&(e.memoizedState.hydrationErrors=n),e=!0;if(!e)return t.flags&256?(Ko(t),t):(Ko(t),null);if(t.flags&128)throw Error(s(558))}return z(t),null;case 13:if(r=t.memoizedState,e===null||e.memoizedState!==null&&e.memoizedState.dehydrated!==null){if(i=xa(t),r!==null&&r.dehydrated!==null){if(e===null){if(!i)throw Error(s(318));if(i=t.memoizedState,i=i===null?null:i.dehydrated,!i)throw Error(s(317));i[Nt]=t}else Sa(),!(t.flags&128)&&(t.memoizedState=null),t.flags|=4;z(t),i=!1}else i=Ca(),e!==null&&e.memoizedState!==null&&(e.memoizedState.hydrationErrors=i),i=!0;if(!i)return t.flags&256?(Ko(t),t):(Ko(t),null)}return Ko(t),t.flags&128?(t.lanes=n,t):(n=r!==null,e=e!==null&&e.memoizedState!==null,n&&(r=t.child,i=null,r.alternate!==null&&r.alternate.memoizedState!==null&&r.alternate.memoizedState.cachePool!==null&&(i=r.alternate.memoizedState.cachePool.pool),a=null,r.memoizedState!==null&&r.memoizedState.cachePool!==null&&(a=r.memoizedState.cachePool.pool),a!==i&&(r.flags|=2048)),n!==e&&n&&(t.child.flags|=8192),xl(t,t.updateQueue),z(t),null);case 4:return Ie(),e===null&&Wf(t.stateNode.containerInfo),t.flags|=67108864,z(t),null;case 10:return ka(t.type),z(t),null;case 19:if(Yo(t),r=t.memoizedState,r===null)return z(t),null;if(i=!!(t.flags&128),a=r.rendering,a===null){if(i)Sl(r,!1);else{if(Y!==0||e!==null&&e.flags&128)for(e=t.child;e!==null;){if(a=Xo(e),a!==null){for(t.flags|=128,Sl(r,!1),e=a.updateQueue,t.updateQueue=e,xl(t,e),t.subtreeFlags=0,e=n,n=t.child;n!==null;)Ki(n,e),n=n.sibling;return Jo(t,qo.current&1|2),A&&la(t,r.treeForkCount),t.child}e=e.sibling}r.tail!==null&&Ze()>_d&&(t.flags|=128,i=!0,Sl(r,!1),t.lanes=4194304)}}else{if(!i){if(e=Xo(a),e!==null){if(t.flags|=128,i=!0,e=e.updateQueue,t.updateQueue=e,xl(t,e),Sl(r,!0),r.tail===null&&r.tailMode!==`collapsed`&&r.tailMode!==`visible`&&!a.alternate&&!A)return z(t),null}else 2*Ze()-r.renderingStartTime>_d&&n!==536870912&&(t.flags|=128,i=!0,Sl(r,!1),t.lanes=4194304)}r.isBackwards?(a.sibling=t.child,t.child=a):(e=r.last,e===null?t.child=a:e.sibling=a,r.last=a)}if(r.tail!==null){e=r.tail;a:{for(n=e;n!==null;){if(n.alternate!==null){n=!1;break a}n=n.sibling}n=!0}return r.rendering=e,r.tail=e.sibling,r.renderingStartTime=Ze(),e.sibling=null,a=qo.current,a=i?a&1|2:a&1,r.tailMode===`visible`||r.tailMode===`collapsed`||!n||A?Jo(t,a):(n=a,D(Bo,t),D(qo,n),Vo===null&&(Vo=t)),A&&la(t,r.treeForkCount),e}return z(t),null;case 22:case 23:return Ko(t),zo(),r=t.memoizedState!==null,e===null?r&&(t.flags|=8192):e.memoizedState!==null!==r&&(t.flags|=8192),r?n&536870912&&!(t.flags&128)&&(z(t),t.subtreeFlags&6&&(t.flags|=8192)):z(t),n=t.updateQueue,n!==null&&xl(t,n.retryQueue),n=null,e!==null&&e.memoizedState!==null&&e.memoizedState.cachePool!==null&&(n=e.memoizedState.cachePool.pool),r=null,t.memoizedState!==null&&t.memoizedState.cachePool!==null&&(r=t.memoizedState.cachePool.pool),r!==n&&(t.flags|=2048),e!==null&&Ae(eo),null;case 24:return n=null,e!==null&&(n=e.memoizedState.cache),t.memoizedState.cache!==n&&(t.flags|=2048),ka(j),z(t),null;case 25:return null;case 30:return t.flags|=33554432,z(t),null}throw Error(s(156,t.tag))}function wl(e,t){switch(fa(t),t.tag){case 1:return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 3:return ka(j),Ie(),e=t.flags,e&65536&&!(e&128)?(t.flags=e&-65537|128,t):null;case 26:case 27:case 5:return Re(t),null;case 31:if(t.memoizedState!==null){if(Ko(t),t.alternate===null)throw Error(s(340));Sa()}return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 13:if(Ko(t),e=t.memoizedState,e!==null&&e.dehydrated!==null){if(t.alternate===null)throw Error(s(340));Sa()}return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 19:return Yo(t),e=t.flags,e&65536?(t.flags=e&-65537|128,e=t.memoizedState,e!==null&&(e.rendering=null,e.tail=null),t.flags|=4,t):null;case 4:return Ie(),null;case 10:return ka(t.type),null;case 22:case 23:return Ko(t),zo(),e!==null&&Ae(eo),e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 24:return ka(j),null;case 25:return null;default:return null}}function Tl(e,t){switch(fa(t),t.tag){case 3:ka(j),Ie();break;case 26:case 27:case 5:Re(t);break;case 4:Ie();break;case 31:t.memoizedState!==null&&Ko(t);break;case 13:Ko(t);break;case 19:Yo(t);break;case 10:ka(t.type);break;case 22:case 23:Ko(t),zo(),e!==null&&Ae(eo);break;case 24:ka(j)}}function El(e,t){try{var n=t.updateQueue,r=n===null?null:n.lastEffect;if(r!==null){var i=r.next;n=i;do{if((n.tag&e)===e){r=void 0;var a=n.create,o=n.inst;r=a(),o.destroy=r}n=n.next}while(n!==i)}}catch(e){Z(t,t.return,e)}}function Dl(e,t,n){try{var r=t.updateQueue,i=r===null?null:r.lastEffect;if(i!==null){var a=i.next;r=a;do{if((r.tag&e)===e){var o=r.inst,s=o.destroy;if(s!==void 0){o.destroy=void 0,i=t;var c=n,l=s;try{l()}catch(e){Z(i,c,e)}}}r=r.next}while(r!==a)}}catch(e){Z(t,t.return,e)}}function Ol(e){var t=e.updateQueue;if(t!==null){var n=e.stateNode;try{Po(t,n)}catch(t){Z(e,e.return,t)}}}function kl(e,t,n){n.props=kc(e.type,e.memoizedProps),n.state=e.memoizedState;try{n.componentWillUnmount()}catch(n){Z(e,t,n)}}function Al(e,t){try{var n=e.ref;if(n!==null){switch(e.tag){case 26:case 27:case 5:var r=e.stateNode;break;case 30:var i=e.stateNode,a=Oi(e.memoizedProps,i);(i.ref===null||i.ref.name!==a)&&(i.ref=Pp(a)),r=i.ref;break;case 7:if(e.stateNode===null){var o=new Fp(e);h(e.child,!1,Qp,o,void 0,void 0),e.stateNode=o}r=e.stateNode;break;default:r=e.stateNode}typeof n==`function`?e.refCleanup=n(r):n.current=r}}catch(n){Z(e,t,n)}}function jl(e,t){var n=e.ref,r=e.refCleanup;if(n!==null){if(typeof r==`function`)try{r()}catch(n){Z(e,t,n)}finally{e.refCleanup=null,e=e.alternate,e!=null&&(e.refCleanup=null)}else if(typeof n==`function`)try{n(null)}catch(n){Z(e,t,n)}else n.current=null}}function Ml(e,t){if((e.tag===5||e.tag===27||e.tag===6)&&e.alternate===null&&t!==null)for(var n=0;n title`))),np(r,t,n),r[Nt]=e,qt(r),t=r;break a;case`link`:if(a=Gm(`link`,`href`,i).get(t+(n.href||``))){for(o=0;og&&(o=g,g=h,h=o);var _=ni(s,h),v=ni(s,g);if(_&&v&&(p.rangeCount!==1||p.anchorNode!==_.node||p.anchorOffset!==_.offset||p.focusNode!==v.node||p.focusOffset!==v.offset)){var y=d.createRange();y.setStart(_.node,_.offset),p.removeAllRanges(),h>g?(p.addRange(y),p.extend(v.node,v.offset)):(y.setEnd(v.node,v.offset),p.addRange(y))}}}}for(d=[],p=s;p=p.parentNode;)p.nodeType===1&&d.push({element:p,left:p.scrollLeft,top:p.scrollTop});for(typeof s.focus==`function`&&s.focus(),s=0;sn?32:n,T.T=null,n=wd,wd=null;var a=bd,o=Sd;if(X=0,xd=bd=null,Sd=0,W&6)throw Error(s(331));var c=W;if(W|=4,Zu(a.current),Uu(a,a.current,o,n),W=c,Df(0,!1),st&&typeof st.onPostCommitFiberRoot==`function`)try{st.onPostCommitFiberRoot(ot,a)}catch{}return!0}finally{E.p=i,T.T=r,uf(e,t)}}function pf(e,t,n){t=$i(n,t),t=Fc(e.stateNode,t,2),e=Do(e,t,2),e!==null&&(Ct(e,2),Ef(e))}function Z(e,t,n){if(e.tag===3)pf(e,e,n);else for(;t!==null;){if(t.tag===3){pf(t,e,n);break}if(t.tag===1){var r=t.stateNode;if(typeof t.type.getDerivedStateFromError==`function`||typeof r.componentDidCatch==`function`&&(yd===null||!yd.has(r))){e=$i(n,e),n=Ic(2),r=Do(t,n,2),r!==null&&(Lc(n,r,t,e),Ct(r,2),Ef(r));break}}t=t.return}}function mf(e,t,n){var r=e.pingCache;if(r===null){r=e.pingCache=new td;var i=new Set;r.set(t,i)}else i=r.get(t),i===void 0&&(i=new Set,r.set(t,i));i.has(n)||(ad=!0,i.add(n),e=hf.bind(null,e,t,n),t.then(e,e))}function hf(e,t,n){var r=e.pingCache;r!==null&&r.delete(t),e.pingedLanes|=e.suspendedLanes&n,e.warmLanes&=~n,G===e&&(q&n)===n&&(Y===4||Y===3&&(q&62914560)===q&&300>Ze()-hd?W&2?ld|=n:Vd(e,0):ld|=n,dd===q&&(dd=0)),Ef(e)}function gf(e,t){t===0&&(t=xt()),e=Ri(e,t),e!==null&&(Ct(e,t),Ef(e))}function _f(e){var t=e.memoizedState,n=0;t!==null&&(n=t.retryLane),gf(e,n)}function vf(e,t){var n=0;switch(e.tag){case 31:case 13:var r=e.stateNode,i=e.memoizedState;i!==null&&(n=i.retryLane);break;case 19:r=e.stateNode;break;case 22:r=e.stateNode._retryCache;break;default:throw Error(s(314))}r!==null&&r.delete(t),gf(e,n)}function yf(e,t){return qe(e,t)}var bf=null,xf=null,Sf=!1,Cf=!1,wf=!1,Tf=0;function Ef(e){e!==xf&&e.next===null&&(xf===null?bf=xf=e:xf=xf.next=e),Cf=!0,Sf||(Sf=!0,Nf())}function Df(e,t){if(!wf&&Cf){wf=!0;do for(var n=!1,r=bf;r!==null;){if(!t){if(e!==0){var i=r.pendingLanes;if(i===0)var a=0;else{var o=r.suspendedLanes,s=r.pingedLanes;a=(1<<31-lt(42|e)+1)-1,a&=i&~(o&~s),a=a&201326741?a&201326741|1:a?a|2:0}a!==0&&(n=!0,Mf(r,a))}else a=q,a=_t(r,r===G?a:0,r.cancelPendingCommit!==null||r.timeoutHandle!==-1),!(a&3)||vt(r,a)||(n=!0,Mf(r,a))}r=r.next}while(n);wf=!1}}function Of(){kf()}function kf(){Cf=Sf=!1;var e=0;Tf!==0&&hp()&&(e=Tf);for(var t=Ze(),n=null,r=bf;r!==null;){var i=r.next,a=Af(r,t);a===0?(r.next=null,n===null?bf=i:n.next=i,i===null&&(xf=n)):(n=r,(e!==0||a&3)&&(Cf=!0)),r=i}X!==0&&X!==5||Df(e,!1),Tf!==0&&(Tf=0)}function Af(e,t){for(var n=e.suspendedLanes,r=e.pingedLanes,i=e.expirationTimes,a=e.pendingLanes&-62914561;0s)break;var u=c.transferSize,d=c.initiatorType;u&&ap(d)&&(c=c.responseEnd,o+=u*(c$m){s.length=o;break}f=new Promise(jp.bind(f)),s.push(f)}}}if(0`u`?null:document;function Tm(e,t,n){var r=wm;if(r&&typeof t==`string`&&t){var i=mn(t);i=`link[rel="`+e+`"][href="`+i+`"]`,typeof n==`string`&&(i+=`[crossorigin="`+n+`"]`),ym.has(i)||(ym.add(i),e={rel:e,crossOrigin:n,href:t},r.querySelector(i)===null&&(t=r.createElement(`link`),np(t,`link`,e),qt(t),r.head.appendChild(t)))}}function Em(e){xm.D(e),Tm(`dns-prefetch`,e,null)}function Dm(e,t){xm.C(e,t),Tm(`preconnect`,e,t)}function Om(e,t,n){xm.L(e,t,n);var r=wm;if(r&&e&&t){var i=`link[rel="preload"][as="`+mn(t)+`"]`;t===`image`&&n&&n.imageSrcSet?(i+=`[imagesrcset="`+mn(n.imageSrcSet)+`"]`,typeof n.imageSizes==`string`&&(i+=`[imagesizes="`+mn(n.imageSizes)+`"]`)):i+=`[href="`+mn(e)+`"]`;var a=i;switch(t){case`style`:a=Pm(e);break;case`script`:a=Rm(e)}if(!(vm.has(a)||(e=C({rel:`preload`,href:t===`image`&&n&&n.imageSrcSet?void 0:e,as:t},n),vm.set(a,e),r.querySelector(i)!==null||t===`style`&&r.querySelector(Fm(a))||t===`script`&&r.querySelector(zm(a))))){var o=r.createElement(`link`);np(o,`link`,e),t===`style`&&(o[Vt]=!0,o.onload=o.onerror=function(){Jt(o)}),qt(o),r.head.appendChild(o)}}}function km(e,t){xm.m(e,t);var n=wm;if(n&&e){var r=t&&typeof t.as==`string`?t.as:`script`,i=`link[rel="modulepreload"][as="`+mn(r)+`"][href="`+mn(e)+`"]`,a=i;switch(r){case`audioworklet`:case`paintworklet`:case`serviceworker`:case`sharedworker`:case`worker`:case`script`:a=Rm(e)}if(!vm.has(a)&&(e=C({rel:`modulepreload`,href:e},t),vm.set(a,e),n.querySelector(i)===null)){switch(r){case`audioworklet`:case`paintworklet`:case`serviceworker`:case`sharedworker`:case`worker`:case`script`:if(n.querySelector(zm(a)))return}r=n.createElement(`link`),np(r,`link`,e),qt(r),n.head.appendChild(r)}}}function Am(e,t,n){xm.S(e,t,n);var r=wm;if(r&&e){var i=Kt(r).hoistableStyles,a=Pm(e);t||=`default`;var o=i.get(a);if(!o){var s={loading:0,preload:null};if(o=r.querySelector(Fm(a)))s.loading=5;else{e=C({rel:`stylesheet`,href:e,"data-precedence":t},n),(n=vm.get(a))&&Hm(e,n);var c=o=r.createElement(`link`);qt(c),np(c,`link`,e),c._p=new Promise(function(e,t){c.onload=e,c.onerror=t}),c.addEventListener(`load`,function(){s.loading|=1}),c.addEventListener(`error`,function(){s.loading|=2}),s.loading|=4,Vm(o,t,r)}o={type:`stylesheet`,instance:o,count:1,state:s},i.set(a,o)}}}function jm(e,t){xm.X(e,t);var n=wm;if(n&&e){var r=Kt(n).hoistableScripts,i=Rm(e),a=r.get(i);a||(a=n.querySelector(zm(i)),a||(e=C({src:e,async:!0},t),(t=vm.get(i))&&Um(e,t),a=n.createElement(`script`),qt(a),np(a,`link`,e),n.head.appendChild(a)),a={type:`script`,instance:a,count:1,state:null},r.set(i,a))}}function Mm(e,t){xm.M(e,t);var n=wm;if(n&&e){var r=Kt(n).hoistableScripts,i=Rm(e),a=r.get(i);a||(a=n.querySelector(zm(i)),a||(e=C({src:e,async:!0,type:`module`},t),(t=vm.get(i))&&Um(e,t),a=n.createElement(`script`),qt(a),np(a,`link`,e),n.head.appendChild(a)),a={type:`script`,instance:a,count:1,state:null},r.set(i,a))}}function Nm(e,t,n,r){var i=(i=Ne.current)?bm(i):null;if(!i)throw Error(s(446));switch(e){case`meta`:case`title`:return null;case`style`:return typeof n.precedence==`string`&&typeof n.href==`string`?(n=Pm(n.href),t=Kt(i).hoistableStyles,r=t.get(n),r||(r={type:`style`,instance:null,count:0,state:null},t.set(n,r)),r):{type:`void`,instance:null,count:0,state:null};case`link`:if(n.rel===`stylesheet`&&typeof n.href==`string`&&typeof n.precedence==`string`){e=Pm(n.href);var a=Kt(i).hoistableStyles,o=a.get(e);if(o||(i=i.ownerDocument||i,o={type:`stylesheet`,instance:null,count:0,state:{loading:0,preload:null}},a.set(e,o),(a=i.querySelector(Fm(e)))?a._p||(o.instance=a,o.state.loading=5):(a=vm.get(e),a||(a={rel:`preload`,as:`style`,href:n.href,crossOrigin:n.crossOrigin,integrity:n.integrity,media:n.media,hrefLang:n.hrefLang,referrerPolicy:n.referrerPolicy},vm.set(e,a)),Lm(i,e,a,o.state))),t&&r===null)throw Error(s(528,``));return o}if(t&&r!==null)throw Error(s(529,``));return null;case`script`:return t=n.async,n=n.src,typeof n==`string`&&t&&typeof t!=`function`&&typeof t!=`symbol`?(n=Rm(n),t=Kt(i).hoistableScripts,r=t.get(n),r||(r={type:`script`,instance:null,count:0,state:null},t.set(n,r)),r):{type:`void`,instance:null,count:0,state:null};default:throw Error(s(444,e))}}function Pm(e){return`href="`+mn(e)+`"`}function Fm(e){return`link[rel="stylesheet"][`+e+`]`}function Im(e){return C({},e,{"data-precedence":e.precedence,precedence:null})}function Lm(e,t,n,r){if(t=e.querySelector(`link[rel="preload"][as="style"][`+t+`]`)){if(!0!==t[Vt]){r.loading=1;return}}else t=e.createElement(`link`),t[Vt]=!0,t.onload=t.onerror=Jt.bind(null,t),np(t,`link`,n),qt(t),e.head.appendChild(t);r.preload=t,t.addEventListener(`load`,function(){return r.loading|=1}),t.addEventListener(`error`,function(){return r.loading|=2})}function Rm(e){return`[src="`+mn(e)+`"]`}function zm(e){return`script[async]`+e}function Bm(e,t,n){if(t.count++,t.instance===null)switch(t.type){case`style`:var r=e.querySelector(`style[data-href~="`+mn(n.href)+`"]`);if(r)return t.instance=r,qt(r),r;var i=C({},n,{"data-href":n.href,"data-precedence":n.precedence,href:null,precedence:null});return r=(e.ownerDocument||e).createElement(`style`),qt(r),np(r,`style`,i),Vm(r,n.precedence,e),t.instance=r;case`stylesheet`:i=Pm(n.href);var a=e.querySelector(Fm(i));if(a)return t.state.loading|=4,t.instance=a,qt(a),a;r=Im(n),(i=vm.get(i))&&Hm(r,i),a=(e.ownerDocument||e).createElement(`link`),qt(a);var o=a;return o._p=new Promise(function(e,t){o.onload=e,o.onerror=t}),np(a,`link`,r),t.state.loading|=4,Vm(a,n.precedence,e),t.instance=a;case`script`:return a=Rm(n.src),(i=e.querySelector(zm(a)))?(t.instance=i,qt(i),i):(r=n,(i=vm.get(a))&&(r=C({},n),Um(r,i)),e=e.ownerDocument||e,i=e.createElement(`script`),qt(i),np(i,`link`,r),e.head.appendChild(i),t.instance=i);case`void`:return null;default:throw Error(s(443,t.type))}else t.type===`stylesheet`&&!(t.state.loading&4)&&(r=t.instance,t.state.loading|=4,Vm(r,n.precedence,e));return t.instance}function Vm(e,t,n){for(var r=n.querySelectorAll(`link[rel="stylesheet"][data-precedence],style[data-precedence]`),i=r.length?r[r.length-1]:null,a=i,o=0;o title`):null)}function qm(e,t,n){if(n===1||t.itemProp!=null)return!1;switch(e){case`meta`:case`title`:return!0;case`style`:if(typeof t.precedence!=`string`||typeof t.href!=`string`||t.href===``)break;return!0;case`link`:if(typeof t.rel!=`string`||typeof t.href!=`string`||t.href===``||t.onLoad||t.onError)break;switch(t.rel){case`stylesheet`:return e=t.disabled,typeof t.precedence==`string`&&e==null;default:return!0}case`script`:if(t.async&&typeof t.async!=`function`&&typeof t.async!=`symbol`&&!t.onLoad&&!t.onError&&t.src&&typeof t.src==`string`)return!0}return!1}function Jm(e,t){return e===`img`&&t.src!=null&&t.src!==``&&t.onLoad==null&&t.loading!==`lazy`}function Ym(e){return!(e.type===`stylesheet`&&!(e.state.loading&3))}function Xm(e){return(e.width||100)*(e.height||100)*(typeof devicePixelRatio==`number`?devicePixelRatio:1)*.25}function Zm(e,t){typeof t.decode==`function`&&(e.imgCount++,t.complete||(e.imgBytes+=Xm(t),e.suspenseyImages.push(t)),e=rh.bind(e),t.decode().then(e,e))}function Qm(e,t,n,r){if(n.type===`stylesheet`&&(typeof r.media!=`string`||!1!==matchMedia(r.media).matches)&&!(n.state.loading&4)){if(n.instance===null){var i=Pm(r.href),a=t.querySelector(Fm(i));if(a){t=a._p,typeof t==`object`&&t&&typeof t.then==`function`&&(e.count++,e=nh.bind(e),t.then(e,e)),n.state.loading|=4,n.instance=a,qt(a);return}a=t.ownerDocument||t,r=Im(r),(i=vm.get(i))&&Hm(r,i),a=a.createElement(`link`),qt(a);var o=a;o._p=new Promise(function(e,t){o.onload=e,o.onerror=t}),np(a,`link`,r),n.instance=a}e.stylesheets===null&&(e.stylesheets=new Map),e.stylesheets.set(n,t),(t=n.state.preload)&&!(n.state.loading&3)&&(e.count++,n=nh.bind(e),t.addEventListener(`load`,n),t.addEventListener(`error`,n))}}var $m=0;function eh(e,t){return e.stylesheets&&e.count===0&&ah(e,e.stylesheets),0$m?50:800)+t);return e.unsuspend=n,function(){e.unsuspend=null,clearTimeout(r),clearTimeout(i)}}:null}function th(e){if(e.count===0&&(e.imgCount===0||!e.waitingForImages)){if(e.stylesheets)ah(e,e.stylesheets);else if(e.unsuspend){var t=e.unsuspend;e.unsuspend=null,t()}}}function nh(){this.count--,th(this)}function rh(){this.imgCount--,th(this)}var ih=null;function ah(e,t){e.stylesheets=null,e.unsuspend!==null&&(e.count++,ih=new Map,t.forEach(oh,e),ih=null,nh.call(e))}function oh(e,t){if(!(t.state.loading&4)){var n=ih.get(e);if(n)var r=n.get(null);else{n=new Map,ih.set(e,n);for(var i=e.querySelectorAll(`link[data-precedence],style[data-precedence]`),a=0;a{function n(){if(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__<`u`&&typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE==`function`)try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(n)}catch(e){console.error(e)}}n(),t.exports=s()}))();function l(e,t,n,r){if(n===`a`&&!r)throw TypeError(`Private accessor was defined without a getter`);if(typeof t==`function`?e!==t||!r:!t.has(e))throw TypeError(`Cannot read private member from an object whose class did not declare it`);return n===`m`?r:n===`a`?r.call(e):r?r.value:t.get(e)}function u(e,t,n,r,i){if(r===`m`)throw TypeError(`Private method is not writable`);if(r===`a`&&!i)throw TypeError(`Private accessor was defined without a setter`);if(typeof t==`function`?e!==t||!i:!t.has(e))throw TypeError(`Cannot write private member to an object whose class did not declare it`);return r===`a`?i.call(e,n):i?i.value=n:t.set(e,n),n}var d,f=`__TAURI_TO_IPC_KEY__`;function p(e,t=!1){return window.__TAURI_INTERNALS__.transformCallback(e,t)}async function m(e,t={},n){return window.__TAURI_INTERNALS__.invoke(e,t,n)}var h=class{get rid(){return l(this,d,`f`)}constructor(e){d.set(this,void 0),u(this,d,e,`f`)}async close(){return m(`plugin:resources|close`,{rid:this.rid})}async[(d=new WeakMap,Symbol.asyncDispose)](){await this.close()}},g=class{constructor(...e){this.type=`Logical`,e.length===1?`Logical`in e[0]?(this.width=e[0].Logical.width,this.height=e[0].Logical.height):(this.width=e[0].width,this.height=e[0].height):(this.width=e[0],this.height=e[1])}toPhysical(e){return new _(this.width*e,this.height*e)}[f](){return{width:this.width,height:this.height}}toJSON(){return this[f]()}},_=class{constructor(...e){this.type=`Physical`,e.length===1?`Physical`in e[0]?(this.width=e[0].Physical.width,this.height=e[0].Physical.height):(this.width=e[0].width,this.height=e[0].height):(this.width=e[0],this.height=e[1])}toLogical(e){return new g(this.width/e,this.height/e)}[f](){return{width:this.width,height:this.height}}toJSON(){return this[f]()}},v=class{constructor(e){this.size=e}toLogical(e){return this.size instanceof g?this.size:this.size.toLogical(e)}toPhysical(e){return this.size instanceof _?this.size:this.size.toPhysical(e)}[f](){return{[`${this.size.type}`]:{width:this.size.width,height:this.size.height}}}toJSON(){return this[f]()}},y=class{constructor(...e){this.type=`Logical`,e.length===1?`Logical`in e[0]?(this.x=e[0].Logical.x,this.y=e[0].Logical.y):(this.x=e[0].x,this.y=e[0].y):(this.x=e[0],this.y=e[1])}toPhysical(e){return new b(this.x*e,this.y*e)}[f](){return{x:this.x,y:this.y}}toJSON(){return this[f]()}},b=class{constructor(...e){this.type=`Physical`,e.length===1?`Physical`in e[0]?(this.x=e[0].Physical.x,this.y=e[0].Physical.y):(this.x=e[0].x,this.y=e[0].y):(this.x=e[0],this.y=e[1])}toLogical(e){return new y(this.x/e,this.y/e)}[f](){return{x:this.x,y:this.y}}toJSON(){return this[f]()}},ee=class{constructor(e){this.position=e}toLogical(e){return this.position instanceof y?this.position:this.position.toLogical(e)}toPhysical(e){return this.position instanceof b?this.position:this.position.toPhysical(e)}[f](){return{[`${this.position.type}`]:{x:this.position.x,y:this.position.y}}}toJSON(){return this[f]()}},x;(function(e){e.WINDOW_RESIZED=`tauri://resize`,e.WINDOW_MOVED=`tauri://move`,e.WINDOW_CLOSE_REQUESTED=`tauri://close-requested`,e.WINDOW_DESTROYED=`tauri://destroyed`,e.WINDOW_FOCUS=`tauri://focus`,e.WINDOW_BLUR=`tauri://blur`,e.WINDOW_SCALE_FACTOR_CHANGED=`tauri://scale-change`,e.WINDOW_THEME_CHANGED=`tauri://theme-changed`,e.WINDOW_CREATED=`tauri://window-created`,e.WINDOW_SUSPENDED=`tauri://suspended`,e.WINDOW_RESUMED=`tauri://resumed`,e.WEBVIEW_CREATED=`tauri://webview-created`,e.DRAG_ENTER=`tauri://drag-enter`,e.DRAG_OVER=`tauri://drag-over`,e.DRAG_DROP=`tauri://drag-drop`,e.DRAG_LEAVE=`tauri://drag-leave`})(x||={});async function te(e,t){window.__TAURI_EVENT_PLUGIN_INTERNALS__.unregisterListener(e,t),await m(`plugin:event|unlisten`,{event:e,eventId:t})}async function ne(e,t,n){return m(`plugin:event|listen`,{event:e,target:typeof n?.target==`string`?{kind:`AnyLabel`,label:n.target}:n?.target??{kind:`Any`},handler:p(t)}).then(t=>async()=>te(e,t))}async function S(e,t,n){return ne(e,n=>{te(e,n.id),t(n)},n)}async function re(e,t){await m(`plugin:event|emit`,{event:e,payload:t})}async function C(e,t,n){await m(`plugin:event|emit_to`,{target:typeof e==`string`?{kind:`AnyLabel`,label:e}:e,event:t,payload:n})}var ie=class e extends h{constructor(e){super(e)}static async new(t,n,r){return m(`plugin:image|new`,{rgba:t,width:n,height:r}).then(t=>new e(t))}static async fromBytes(t){return m(`plugin:image|from_bytes`,{bytes:t}).then(t=>new e(t))}static async fromPath(t){return m(`plugin:image|from_path`,{path:t}).then(t=>new e(t))}async rgba(){return m(`plugin:image|rgba`,{rid:this.rid}).then(e=>new Uint8Array(e))}async size(){return m(`plugin:image|size`,{rid:this.rid})}};function ae(e){return e==null?null:typeof e==`string`?e:e instanceof ie?e.rid:e}var oe;(function(e){e[e.Critical=1]=`Critical`,e[e.Informational=2]=`Informational`})(oe||={});var se=class{constructor(e){this._preventDefault=!1,this.event=e.event,this.id=e.id}preventDefault(){this._preventDefault=!0}isPreventDefault(){return this._preventDefault}},ce;(function(e){e.None=`none`,e.Normal=`normal`,e.Indeterminate=`indeterminate`,e.Paused=`paused`,e.Error=`error`})(ce||={});function le(){return new fe(window.__TAURI_INTERNALS__.metadata.currentWindow.label,{skip:!0})}async function ue(){return m(`plugin:window|get_all_windows`).then(e=>e.map(e=>new fe(e,{skip:!0})))}var de=[`tauri://created`,`tauri://error`],fe=class{constructor(e,t={}){this.label=e,this.listeners=Object.create(null),t?.skip||m(`plugin:window|create`,{options:{...t,parent:typeof t.parent==`string`?t.parent:t.parent?.label,label:e}}).then(async()=>this.emit(`tauri://created`)).catch(async e=>this.emit(`tauri://error`,e))}static async getByLabel(e){return(await ue()).find(t=>t.label===e)??null}static getCurrent(){return le()}static async getAll(){return ue()}static async getFocusedWindow(){for(let e of await ue())if(await e.isFocused())return e;return null}async listen(e,t){return this._handleTauriEvent(e,t)?()=>{let n=this.listeners[e];n.splice(n.indexOf(t),1)}:ne(e,t,{target:{kind:`Window`,label:this.label}})}async once(e,t){return this._handleTauriEvent(e,t)?()=>{let n=this.listeners[e];n.splice(n.indexOf(t),1)}:S(e,t,{target:{kind:`Window`,label:this.label}})}async emit(e,t){if(de.includes(e)){for(let n of this.listeners[e]||[])n({event:e,id:-1,payload:t});return}return re(e,t)}async emitTo(e,t,n){if(de.includes(t)){for(let e of this.listeners[t]||[])e({event:t,id:-1,payload:n});return}return C(e,t,n)}_handleTauriEvent(e,t){return de.includes(e)?(e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t],!0):!1}async scaleFactor(){return m(`plugin:window|scale_factor`,{label:this.label})}async innerPosition(){return m(`plugin:window|inner_position`,{label:this.label}).then(e=>new b(e))}async outerPosition(){return m(`plugin:window|outer_position`,{label:this.label}).then(e=>new b(e))}async innerSize(){return m(`plugin:window|inner_size`,{label:this.label}).then(e=>new _(e))}async outerSize(){return m(`plugin:window|outer_size`,{label:this.label}).then(e=>new _(e))}async isFullscreen(){return m(`plugin:window|is_fullscreen`,{label:this.label})}async isMinimized(){return m(`plugin:window|is_minimized`,{label:this.label})}async isMaximized(){return m(`plugin:window|is_maximized`,{label:this.label})}async isFocused(){return m(`plugin:window|is_focused`,{label:this.label})}async isDecorated(){return m(`plugin:window|is_decorated`,{label:this.label})}async isResizable(){return m(`plugin:window|is_resizable`,{label:this.label})}async isMaximizable(){return m(`plugin:window|is_maximizable`,{label:this.label})}async isMinimizable(){return m(`plugin:window|is_minimizable`,{label:this.label})}async isClosable(){return m(`plugin:window|is_closable`,{label:this.label})}async isVisible(){return m(`plugin:window|is_visible`,{label:this.label})}async title(){return m(`plugin:window|title`,{label:this.label})}async theme(){return m(`plugin:window|theme`,{label:this.label})}async isAlwaysOnTop(){return m(`plugin:window|is_always_on_top`,{label:this.label})}async activityName(){return m(`plugin:window|activity_name`,{label:this.label})}async sceneIdentifier(){return m(`plugin:window|scene_identifier`,{label:this.label})}async center(){return m(`plugin:window|center`,{label:this.label})}async requestUserAttention(e){let t=null;return e&&(t=e===oe.Critical?{type:`Critical`}:{type:`Informational`}),m(`plugin:window|request_user_attention`,{label:this.label,value:t})}async setResizable(e){return m(`plugin:window|set_resizable`,{label:this.label,value:e})}async setEnabled(e){return m(`plugin:window|set_enabled`,{label:this.label,value:e})}async isEnabled(){return m(`plugin:window|is_enabled`,{label:this.label})}async setMaximizable(e){return m(`plugin:window|set_maximizable`,{label:this.label,value:e})}async setMinimizable(e){return m(`plugin:window|set_minimizable`,{label:this.label,value:e})}async setClosable(e){return m(`plugin:window|set_closable`,{label:this.label,value:e})}async setTitle(e){return m(`plugin:window|set_title`,{label:this.label,value:e})}async maximize(){return m(`plugin:window|maximize`,{label:this.label})}async unmaximize(){return m(`plugin:window|unmaximize`,{label:this.label})}async toggleMaximize(){return m(`plugin:window|toggle_maximize`,{label:this.label})}async minimize(){return m(`plugin:window|minimize`,{label:this.label})}async unminimize(){return m(`plugin:window|unminimize`,{label:this.label})}async show(){return m(`plugin:window|show`,{label:this.label})}async hide(){return m(`plugin:window|hide`,{label:this.label})}async close(){return m(`plugin:window|close`,{label:this.label})}async destroy(){return m(`plugin:window|destroy`,{label:this.label})}async setDecorations(e){return m(`plugin:window|set_decorations`,{label:this.label,value:e})}async setShadow(e){return m(`plugin:window|set_shadow`,{label:this.label,value:e})}async setEffects(e){return m(`plugin:window|set_effects`,{label:this.label,value:e})}async clearEffects(){return m(`plugin:window|set_effects`,{label:this.label,value:null})}async setAlwaysOnTop(e){return m(`plugin:window|set_always_on_top`,{label:this.label,value:e})}async setAlwaysOnBottom(e){return m(`plugin:window|set_always_on_bottom`,{label:this.label,value:e})}async setContentProtected(e){return m(`plugin:window|set_content_protected`,{label:this.label,value:e})}async setSize(e){return m(`plugin:window|set_size`,{label:this.label,value:e instanceof v?e:new v(e)})}async setMinSize(e){return m(`plugin:window|set_min_size`,{label:this.label,value:e instanceof v?e:e?new v(e):null})}async setMaxSize(e){return m(`plugin:window|set_max_size`,{label:this.label,value:e instanceof v?e:e?new v(e):null})}async setSizeConstraints(e){function t(e){return e?{Logical:e}:null}return m(`plugin:window|set_size_constraints`,{label:this.label,value:{minWidth:t(e?.minWidth),minHeight:t(e?.minHeight),maxWidth:t(e?.maxWidth),maxHeight:t(e?.maxHeight)}})}async setPosition(e){return m(`plugin:window|set_position`,{label:this.label,value:e instanceof ee?e:new ee(e)})}async setFullscreen(e){return m(`plugin:window|set_fullscreen`,{label:this.label,value:e})}async setFullscreenOnMonitor(e){return m(`plugin:window|set_fullscreen_on_monitor`,{label:this.label,value:e})}async setSimpleFullscreen(e){return m(`plugin:window|set_simple_fullscreen`,{label:this.label,value:e})}async setFocus(){return m(`plugin:window|set_focus`,{label:this.label})}async setFocusable(e){return m(`plugin:window|set_focusable`,{label:this.label,value:e})}async setIcon(e){return m(`plugin:window|set_icon`,{label:this.label,value:ae(e)})}async setSkipTaskbar(e){return m(`plugin:window|set_skip_taskbar`,{label:this.label,value:e})}async setCursorGrab(e){return m(`plugin:window|set_cursor_grab`,{label:this.label,value:e})}async setCursorVisible(e){return m(`plugin:window|set_cursor_visible`,{label:this.label,value:e})}async setCursorIcon(e){return m(`plugin:window|set_cursor_icon`,{label:this.label,value:e})}async setBackgroundColor(e){return m(`plugin:window|set_background_color`,{label:this.label,value:e})}async setCursorPosition(e){return m(`plugin:window|set_cursor_position`,{label:this.label,value:e instanceof ee?e:new ee(e)})}async setIgnoreCursorEvents(e){return m(`plugin:window|set_ignore_cursor_events`,{label:this.label,value:e})}async startDragging(){return m(`plugin:window|start_dragging`,{label:this.label})}async startResizeDragging(e){return m(`plugin:window|start_resize_dragging`,{label:this.label,value:e})}async setBadgeCount(e){return m(`plugin:window|set_badge_count`,{label:this.label,value:e})}async setBadgeLabel(e){return m(`plugin:window|set_badge_label`,{label:this.label,value:e})}async setOverlayIcon(e){return m(`plugin:window|set_overlay_icon`,{label:this.label,value:e?ae(e):void 0})}async setProgressBar(e){return m(`plugin:window|set_progress_bar`,{label:this.label,value:e})}async setVisibleOnAllWorkspaces(e){return m(`plugin:window|set_visible_on_all_workspaces`,{label:this.label,value:e})}async setTitleBarStyle(e){return m(`plugin:window|set_title_bar_style`,{label:this.label,value:e})}async setTheme(e){return m(`plugin:window|set_theme`,{label:this.label,value:e})}async onResized(e){return this.listen(x.WINDOW_RESIZED,t=>{t.payload=new _(t.payload),e(t)})}async onMoved(e){return this.listen(x.WINDOW_MOVED,t=>{t.payload=new b(t.payload),e(t)})}async onCloseRequested(e){return this.listen(x.WINDOW_CLOSE_REQUESTED,async t=>{let n=new se(t);await e(n),n.isPreventDefault()||await this.destroy()})}async onDragDropEvent(e){let t=await this.listen(x.DRAG_ENTER,t=>{e({...t,payload:{type:`enter`,paths:t.payload.paths,position:new b(t.payload.position)}})}),n=await this.listen(x.DRAG_OVER,t=>{e({...t,payload:{type:`over`,position:new b(t.payload.position)}})}),r=await this.listen(x.DRAG_DROP,t=>{e({...t,payload:{type:`drop`,paths:t.payload.paths,position:new b(t.payload.position)}})}),i=await this.listen(x.DRAG_LEAVE,t=>{e({...t,payload:{type:`leave`}})});return()=>{t(),r(),n(),i()}}async onFocusChanged(e){let t=await this.listen(x.WINDOW_FOCUS,t=>{e({...t,payload:!0})}),n=await this.listen(x.WINDOW_BLUR,t=>{e({...t,payload:!1})});return()=>{t(),n()}}async onScaleChanged(e){return this.listen(x.WINDOW_SCALE_FACTOR_CHANGED,e)}async onThemeChanged(e){return this.listen(x.WINDOW_THEME_CHANGED,e)}},pe;(function(e){e.Disabled=`disabled`,e.Throttle=`throttle`,e.Suspend=`suspend`})(pe||={});var me;(function(e){e.Default=`default`,e.FluentOverlay=`fluentOverlay`})(me||={});var he;(function(e){e.AppearanceBased=`appearanceBased`,e.Light=`light`,e.Dark=`dark`,e.MediumLight=`mediumLight`,e.UltraDark=`ultraDark`,e.Titlebar=`titlebar`,e.Selection=`selection`,e.Menu=`menu`,e.Popover=`popover`,e.Sidebar=`sidebar`,e.HeaderView=`headerView`,e.Sheet=`sheet`,e.WindowBackground=`windowBackground`,e.HudWindow=`hudWindow`,e.FullScreenUI=`fullScreenUI`,e.Tooltip=`tooltip`,e.ContentBackground=`contentBackground`,e.UnderWindowBackground=`underWindowBackground`,e.UnderPageBackground=`underPageBackground`,e.LiquidGlassRegular=`liquidGlassRegular`,e.LiquidGlassClear=`liquidGlassClear`,e.Mica=`mica`,e.Blur=`blur`,e.Acrylic=`acrylic`,e.Tabbed=`tabbed`,e.TabbedDark=`tabbedDark`,e.TabbedLight=`tabbedLight`})(he||={});var ge;(function(e){e.FollowsWindowActiveState=`followsWindowActiveState`,e.Active=`active`,e.Inactive=`inactive`})(ge||={});var _e=`/assets/icon-small-BO4dlTNl.svg`,ve=i(),ye=e((e=>{var t=Symbol.for(`react.transitional.element`),n=Symbol.for(`react.fragment`);function r(e,n,r){var i=null;if(r!==void 0&&(i=``+r),n.key!==void 0&&(i=``+n.key),`key`in n)for(var a in r={},n)a!==`key`&&(r[a]=n[a]);else r=n;return n=r.ref,{$$typeof:t,type:e,key:i,ref:n===void 0?null:n,props:r}}e.Fragment=n,e.jsx=r,e.jsxs=r})),w=e(((e,t)=>{t.exports=ye()}))(),be=le();function xe(){let[e,t]=(0,ve.useState)(!1),[n,r]=(0,ve.useState)(null);return(0,ve.useEffect)(()=>{let e=[],n=!1;return(async()=>{let i=await be.listen(`app://update-progress`,e=>{r(e.payload)}),a=await be.listen(`app://update-error`,()=>{t(!0)});if(n){i(),a();return}e.push(i,a),await be.emit(`app://update`)})(),()=>{n=!0,e.forEach(e=>e())}},[]),(0,w.jsxs)(`div`,{className:`update-window`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`img`,{src:_e,alt:``,className:`update-logo`,"data-tauri-drag-region":!0}),(0,w.jsx)(`div`,{className:`update-content`,"data-tauri-drag-region":!0,children:e?(0,w.jsx)(Ce,{onRetry:()=>{t(!1),r(null),be.emit(`app://update`)}}):(0,w.jsx)(Se,{progress:n})})]})}function Se({progress:e}){return(0,w.jsxs)(`div`,{className:`update-status`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`h1`,{className:`update-title`,"data-tauri-drag-region":!0,children:`Getting GP Connect ready`}),(0,w.jsx)(we,{value:e})]})}function Ce({onRetry:e}){return(0,w.jsxs)(`div`,{className:`update-status error-status`,"data-tauri-drag-region":!0,children:[(0,w.jsxs)(`div`,{className:`error-copy`,role:`alert`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`h1`,{className:`update-title`,"data-tauri-drag-region":!0,children:`Couldn’t get GP Connect ready`}),(0,w.jsx)(`p`,{className:`update-description`,"data-tauri-drag-region":!0,children:`Please try again.`})]}),(0,w.jsx)(`button`,{type:`button`,onClick:e,className:`retry-button`,children:`Retry`})]})}function we({value:e}){let t=e!==null;return(0,w.jsxs)(w.Fragment,{children:[(0,w.jsxs)(`div`,{className:`progress-summary`,"data-tauri-drag-region":!0,children:[(0,w.jsx)(`p`,{className:`update-description`,"data-tauri-drag-region":!0,children:`This should only take a moment.`}),(0,w.jsx)(`span`,{className:`progress-label`,"aria-hidden":`true`,children:t?`${Math.round(e)}%`:`In progress`})]}),(0,w.jsx)(`div`,{className:`progress-bar${t?``:` progress-bar-indeterminate`}`,role:`progressbar`,"aria-label":`Update progress`,"aria-valuemin":t?0:void 0,"aria-valuemax":t?100:void 0,"aria-valuenow":t?Math.round(e):void 0,children:(0,w.jsx)(`div`,{className:`progress-fill`,style:t?{width:`${e}%`}:void 0})})]})}(0,c.createRoot)(document.getElementById(`root`)).render((0,w.jsx)(xe,{})); \ No newline at end of file diff --git a/apps/gpgui-helper/dist/assets/main-C5muOSVO.css b/apps/gpgui-helper/dist/assets/main-C5muOSVO.css deleted file mode 100644 index 368a455..0000000 --- a/apps/gpgui-helper/dist/assets/main-C5muOSVO.css +++ /dev/null @@ -1 +0,0 @@ -html,body,#root{-webkit-user-select:none;user-select:none;cursor:default;height:100%;margin:0;padding:0} diff --git a/apps/gpgui-helper/dist/assets/main-CyyZK63u.js b/apps/gpgui-helper/dist/assets/main-CyyZK63u.js deleted file mode 100644 index 14676c2..0000000 --- a/apps/gpgui-helper/dist/assets/main-CyyZK63u.js +++ /dev/null @@ -1,168 +0,0 @@ -var e=Object.create,t=Object.defineProperty,n=Object.getOwnPropertyDescriptor,r=Object.getOwnPropertyNames,i=Object.getPrototypeOf,a=Object.prototype.hasOwnProperty,o=(e,t)=>()=>(t||e((t={exports:{}}).exports,t),t.exports),s=(e,i,o,s)=>{if(i&&typeof i==`object`||typeof i==`function`)for(var c=r(i),l=0,u=c.length,d;li[e]).bind(null,d),enumerable:!(s=n(i,d))||s.enumerable});return e},c=(n,r,a)=>(a=n==null?{}:e(i(n)),s(r||!n||!n.__esModule?t(a,`default`,{value:n,enumerable:!0}):a,n));(function(){let e=document.createElement(`link`).relList;if(e&&e.supports&&e.supports(`modulepreload`))return;for(let e of document.querySelectorAll(`link[rel="modulepreload"]`))n(e);new MutationObserver(e=>{for(let t of e)if(t.type===`childList`)for(let e of t.addedNodes)e.tagName===`LINK`&&e.rel===`modulepreload`&&n(e)}).observe(document,{childList:!0,subtree:!0});function t(e){let t={};return e.integrity&&(t.integrity=e.integrity),e.referrerPolicy&&(t.referrerPolicy=e.referrerPolicy),e.crossOrigin===`use-credentials`?t.credentials=`include`:e.crossOrigin===`anonymous`?t.credentials=`omit`:t.credentials=`same-origin`,t}function n(e){if(e.ep)return;e.ep=!0;let n=t(e);fetch(e.href,n)}})();var l=o((e=>{function t(e,t){var n=e.length;e.push(t);a:for(;0>>1,a=e[r];if(0>>1;ri(c,n))li(u,c)?(e[r]=u,e[l]=n,r=l):(e[r]=c,e[s]=n,r=s);else if(li(u,n))e[r]=u,e[l]=n,r=l;else break a}}return t}function i(e,t){var n=e.sortIndex-t.sortIndex;return n===0?e.id-t.id:n}if(e.unstable_now=void 0,typeof performance==`object`&&typeof performance.now==`function`){var a=performance;e.unstable_now=function(){return a.now()}}else{var o=Date,s=o.now();e.unstable_now=function(){return o.now()-s}}var c=[],l=[],u=1,d=null,f=3,p=!1,m=!1,h=!1,g=!1,_=typeof setTimeout==`function`?setTimeout:null,v=typeof clearTimeout==`function`?clearTimeout:null,y=typeof setImmediate<`u`?setImmediate:null;function b(e){for(var i=n(l);i!==null;){if(i.callback===null)r(l);else if(i.startTime<=e)r(l),i.sortIndex=i.expirationTime,t(c,i);else break;i=n(l)}}function x(e){if(h=!1,b(e),!m)if(n(c)!==null)m=!0,S||(S=!0,re());else{var t=n(l);t!==null&&oe(x,t.startTime-e)}}var S=!1,C=-1,w=5,ee=-1;function te(){return g?!0:!(e.unstable_now()-eet&&te());){var o=d.callback;if(typeof o==`function`){d.callback=null,f=d.priorityLevel;var s=o(d.expirationTime<=t);if(t=e.unstable_now(),typeof s==`function`){d.callback=s,b(t),i=!0;break b}d===n(c)&&r(c),b(t)}else r(c);d=n(c)}if(d!==null)i=!0;else{var u=n(l);u!==null&&oe(x,u.startTime-t),i=!1}}break a}finally{d=null,f=a,p=!1}i=void 0}}finally{i?re():S=!1}}}var re;if(typeof y==`function`)re=function(){y(ne)};else if(typeof MessageChannel<`u`){var ie=new MessageChannel,ae=ie.port2;ie.port1.onmessage=ne,re=function(){ae.postMessage(null)}}else re=function(){_(ne,0)};function oe(t,n){C=_(function(){t(e.unstable_now())},n)}e.unstable_IdlePriority=5,e.unstable_ImmediatePriority=1,e.unstable_LowPriority=4,e.unstable_NormalPriority=3,e.unstable_Profiling=null,e.unstable_UserBlockingPriority=2,e.unstable_cancelCallback=function(e){e.callback=null},e.unstable_forceFrameRate=function(e){0>e||125o?(r.sortIndex=a,t(l,r),n(c)===null&&r===n(l)&&(h?(v(C),C=-1):h=!0,oe(x,a-o))):(r.sortIndex=s,t(c,r),m||p||(m=!0,S||(S=!0,re()))),r},e.unstable_shouldYield=te,e.unstable_wrapCallback=function(e){var t=f;return function(){var n=f;f=t;try{return e.apply(this,arguments)}finally{f=n}}}})),u=o(((e,t)=>{t.exports=l()})),d=o((e=>{var t=Symbol.for(`react.transitional.element`),n=Symbol.for(`react.portal`),r=Symbol.for(`react.fragment`),i=Symbol.for(`react.strict_mode`),a=Symbol.for(`react.profiler`),o=Symbol.for(`react.consumer`),s=Symbol.for(`react.context`),c=Symbol.for(`react.forward_ref`),l=Symbol.for(`react.suspense`),u=Symbol.for(`react.memo`),d=Symbol.for(`react.lazy`),f=Symbol.for(`react.activity`),p=Symbol.iterator;function m(e){return typeof e!=`object`||!e?null:(e=p&&e[p]||e[`@@iterator`],typeof e==`function`?e:null)}var h={isMounted:function(){return!1},enqueueForceUpdate:function(){},enqueueReplaceState:function(){},enqueueSetState:function(){}},g=Object.assign,_={};function v(e,t,n){this.props=e,this.context=t,this.refs=_,this.updater=n||h}v.prototype.isReactComponent={},v.prototype.setState=function(e,t){if(typeof e!=`object`&&typeof e!=`function`&&e!=null)throw Error(`takes an object of state variables to update or a function which returns an object of state variables.`);this.updater.enqueueSetState(this,e,t,`setState`)},v.prototype.forceUpdate=function(e){this.updater.enqueueForceUpdate(this,e,`forceUpdate`)};function y(){}y.prototype=v.prototype;function b(e,t,n){this.props=e,this.context=t,this.refs=_,this.updater=n||h}var x=b.prototype=new y;x.constructor=b,g(x,v.prototype),x.isPureReactComponent=!0;var S=Array.isArray;function C(){}var w={H:null,A:null,T:null,S:null},ee=Object.prototype.hasOwnProperty;function te(e,n,r){var i=r.ref;return{$$typeof:t,type:e,key:n,ref:i===void 0?null:i,props:r}}function ne(e,t){return te(e.type,t,e.props)}function re(e){return typeof e==`object`&&!!e&&e.$$typeof===t}function ie(e){var t={"=":`=0`,":":`=2`};return`$`+e.replace(/[=:]/g,function(e){return t[e]})}var ae=/\/+/g;function oe(e,t){return typeof e==`object`&&e&&e.key!=null?ie(``+e.key):t.toString(36)}function T(e){switch(e.status){case`fulfilled`:return e.value;case`rejected`:throw e.reason;default:switch(typeof e.status==`string`?e.then(C,C):(e.status=`pending`,e.then(function(t){e.status===`pending`&&(e.status=`fulfilled`,e.value=t)},function(t){e.status===`pending`&&(e.status=`rejected`,e.reason=t)})),e.status){case`fulfilled`:return e.value;case`rejected`:throw e.reason}}throw e}function se(e,r,i,a,o){var s=typeof e;(s===`undefined`||s===`boolean`)&&(e=null);var c=!1;if(e===null)c=!0;else switch(s){case`bigint`:case`string`:case`number`:c=!0;break;case`object`:switch(e.$$typeof){case t:case n:c=!0;break;case d:return c=e._init,se(c(e._payload),r,i,a,o)}}if(c)return o=o(e),c=a===``?`.`+oe(e,0):a,S(o)?(i=``,c!=null&&(i=c.replace(ae,`$&/`)+`/`),se(o,r,i,``,function(e){return e})):o!=null&&(re(o)&&(o=ne(o,i+(o.key==null||e&&e.key===o.key?``:(``+o.key).replace(ae,`$&/`)+`/`)+c)),r.push(o)),1;c=0;var l=a===``?`.`:a+`:`;if(S(e))for(var u=0;u{t.exports=d()})),p=o((e=>{var t=f();function n(e){var t=`https://react.dev/errors/`+e;if(1{function n(){if(!(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__>`u`||typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE!=`function`))try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(n)}catch(e){console.error(e)}}n(),t.exports=p()})),h=o((e=>{var t=u(),n=f(),r=m();function i(e){var t=`https://react.dev/errors/`+e;if(1de||(e.current=ue[de],ue[de]=null,de--)}function k(e,t){de++,ue[de]=e.current,e.current=t}var me=fe(null),he=fe(null),ge=fe(null),A=fe(null);function _e(e,t){switch(k(ge,t),k(he,e),k(me,null),t.nodeType){case 9:case 11:e=(e=t.documentElement)&&(e=e.namespaceURI)?Vd(e):0;break;default:if(e=t.tagName,t=t.namespaceURI)t=Vd(t),e=Hd(t,e);else switch(e){case`svg`:e=1;break;case`math`:e=2;break;default:e=0}}pe(me),k(me,e)}function j(){pe(me),pe(he),pe(ge)}function ve(e){e.memoizedState!==null&&k(A,e);var t=me.current,n=Hd(t,e.type);t!==n&&(k(he,e),k(me,n))}function ye(e){he.current===e&&(pe(me),pe(he)),A.current===e&&(pe(A),Qf._currentValue=le)}var be,xe;function Se(e){if(be===void 0)try{throw Error()}catch(e){var t=e.stack.trim().match(/\n( *(at )?)/);be=t&&t[1]||``,xe=-1)`:-1i||c[r]!==l[i]){var u=` -`+c[r].replace(` at new `,` at `);return e.displayName&&u.includes(``)&&(u=u.replace(``,e.displayName)),u}while(1<=r&&0<=i);break}}}finally{Ce=!1,Error.prepareStackTrace=n}return(n=e?e.displayName||e.name:``)?Se(n):``}function Te(e,t){switch(e.tag){case 26:case 27:case 5:return Se(e.type);case 16:return Se(`Lazy`);case 13:return e.child!==t&&t!==null?Se(`Suspense Fallback`):Se(`Suspense`);case 19:return Se(`SuspenseList`);case 0:case 15:return we(e.type,!1);case 11:return we(e.type.render,!1);case 1:return we(e.type,!0);case 31:return Se(`Activity`);default:return``}}function Ee(e){try{var t=``,n=null;do t+=Te(e,n),n=e,e=e.return;while(e);return t}catch(e){return` -Error generating stack: `+e.message+` -`+e.stack}}var De=Object.prototype.hasOwnProperty,Oe=t.unstable_scheduleCallback,ke=t.unstable_cancelCallback,Ae=t.unstable_shouldYield,je=t.unstable_requestPaint,Me=t.unstable_now,Ne=t.unstable_getCurrentPriorityLevel,Pe=t.unstable_ImmediatePriority,Fe=t.unstable_UserBlockingPriority,Ie=t.unstable_NormalPriority,Le=t.unstable_LowPriority,Re=t.unstable_IdlePriority,ze=t.log,Be=t.unstable_setDisableYieldValue,Ve=null,He=null;function Ue(e){if(typeof ze==`function`&&Be(e),He&&typeof He.setStrictMode==`function`)try{He.setStrictMode(Ve,e)}catch{}}var We=Math.clz32?Math.clz32:qe,Ge=Math.log,Ke=Math.LN2;function qe(e){return e>>>=0,e===0?32:31-(Ge(e)/Ke|0)|0}var Je=256,Ye=262144,Xe=4194304;function Ze(e){var t=e&42;if(t!==0)return t;switch(e&-e){case 1:return 1;case 2:return 2;case 4:return 4;case 8:return 8;case 16:return 16;case 32:return 32;case 64:return 64;case 128:return 128;case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:return e&261888;case 262144:case 524288:case 1048576:case 2097152:return e&3932160;case 4194304:case 8388608:case 16777216:case 33554432:return e&62914560;case 67108864:return 67108864;case 134217728:return 134217728;case 268435456:return 268435456;case 536870912:return 536870912;case 1073741824:return 0;default:return e}}function Qe(e,t,n){var r=e.pendingLanes;if(r===0)return 0;var i=0,a=e.suspendedLanes,o=e.pingedLanes;e=e.warmLanes;var s=r&134217727;return s===0?(s=r&~a,s===0?o===0?n||(n=r&~e,n!==0&&(i=Ze(n))):i=Ze(o):i=Ze(s)):(r=s&~a,r===0?(o&=s,o===0?n||(n=s&~e,n!==0&&(i=Ze(n))):i=Ze(o)):i=Ze(r)),i===0?0:t!==0&&t!==i&&(t&a)===0&&(a=i&-i,n=t&-t,a>=n||a===32&&n&4194048)?t:i}function $e(e,t){return(e.pendingLanes&~(e.suspendedLanes&~e.pingedLanes)&t)===0}function et(e,t){switch(e){case 1:case 2:case 4:case 8:case 64:return t+250;case 16:case 32:case 128:case 256:case 512:case 1024:case 2048:case 4096:case 8192:case 16384:case 32768:case 65536:case 131072:case 262144:case 524288:case 1048576:case 2097152:return t+5e3;case 4194304:case 8388608:case 16777216:case 33554432:return-1;case 67108864:case 134217728:case 268435456:case 536870912:case 1073741824:return-1;default:return-1}}function tt(){var e=Xe;return Xe<<=1,!(Xe&62914560)&&(Xe=4194304),e}function nt(e){for(var t=[],n=0;31>n;n++)t.push(e);return t}function rt(e,t){e.pendingLanes|=t,t!==268435456&&(e.suspendedLanes=0,e.pingedLanes=0,e.warmLanes=0)}function it(e,t,n,r,i,a){var o=e.pendingLanes;e.pendingLanes=n,e.suspendedLanes=0,e.pingedLanes=0,e.warmLanes=0,e.expiredLanes&=n,e.entangledLanes&=n,e.errorRecoveryDisabledLanes&=n,e.shellSuspendCounter=0;var s=e.entanglements,c=e.expirationTimes,l=e.hiddenUpdates;for(n=o&~n;0`u`||window.document===void 0||window.document.createElement===void 0),hn=!1;if(mn)try{var gn={};Object.defineProperty(gn,`passive`,{get:function(){hn=!0}}),window.addEventListener(`test`,gn,gn),window.removeEventListener(`test`,gn,gn)}catch{hn=!1}var _n=null,vn=null,yn=null;function bn(){if(yn)return yn;var e,t=vn,n=t.length,r,i=`value`in _n?_n.value:_n.textContent,a=i.length;for(e=0;e=P),er=` `,tr=!1;function nr(e,t){switch(e){case`keyup`:return Xn.indexOf(t.keyCode)!==-1;case`keydown`:return t.keyCode!==229;case`keypress`:case`mousedown`:case`focusout`:return!0;default:return!1}}function rr(e){return e=e.detail,typeof e==`object`&&`data`in e?e.data:null}var ir=!1;function ar(e,t){switch(e){case`compositionend`:return rr(t);case`keypress`:return t.which===32?(tr=!0,er):null;case`textInput`:return e=t.data,e===er&&tr?null:e;default:return null}}function or(e,t){if(ir)return e===`compositionend`||!Zn&&nr(e,t)?(e=bn(),yn=vn=_n=null,ir=!1,e):null;switch(e){case`paste`:return null;case`keypress`:if(!(t.ctrlKey||t.altKey||t.metaKey)||t.ctrlKey&&t.altKey){if(t.char&&1=t)return{node:n,offset:t-e};e=r}a:{for(;n;){if(n.nextSibling){n=n.nextSibling;break a}n=n.parentNode}n=void 0}n=Or(n)}}function Ar(e,t){return e&&t?e===t?!0:e&&e.nodeType===3?!1:t&&t.nodeType===3?Ar(e,t.parentNode):`contains`in e?e.contains(t):e.compareDocumentPosition?!!(e.compareDocumentPosition(t)&16):!1:!1}function jr(e){e=e!=null&&e.ownerDocument!=null&&e.ownerDocument.defaultView!=null?e.ownerDocument.defaultView:window;for(var t=Ht(e.document);t instanceof e.HTMLIFrameElement;){try{var n=typeof t.contentWindow.location.href==`string`}catch{n=!1}if(n)e=t.contentWindow;else break;t=Ht(e.document)}return t}function Mr(e){var t=e&&e.nodeName&&e.nodeName.toLowerCase();return t&&(t===`input`&&(e.type===`text`||e.type===`search`||e.type===`tel`||e.type===`url`||e.type===`password`)||t===`textarea`||e.contentEditable===`true`)}var Nr=mn&&`documentMode`in document&&11>=document.documentMode,Pr=null,Fr=null,Ir=null,Lr=!1;function Rr(e,t,n){var r=n.window===n?n.document:n.nodeType===9?n:n.ownerDocument;Lr||Pr==null||Pr!==Ht(r)||(r=Pr,`selectionStart`in r&&Mr(r)?r={start:r.selectionStart,end:r.selectionEnd}:(r=(r.ownerDocument&&r.ownerDocument.defaultView||window).getSelection(),r={anchorNode:r.anchorNode,anchorOffset:r.anchorOffset,focusNode:r.focusNode,focusOffset:r.focusOffset}),Ir&&Dr(Ir,r)||(Ir=r,r=Ed(Fr,`onSelect`),0>=o,i-=o,Oi=1<<32-We(t)+i|n<h?(g=d,d=null):g=d.sibling;var _=p(i,d,s[h],c);if(_===null){d===null&&(d=g);break}e&&d&&_.alternate===null&&t(i,d),a=o(_,a,h),u===null?l=_:u.sibling=_,u=_,d=g}if(h===s.length)return n(i,d),R&&Ai(i,h),l;if(d===null){for(;hg?(_=h,h=null):_=h.sibling;var y=p(a,h,v.value,l);if(y===null){h===null&&(h=_);break}e&&h&&y.alternate===null&&t(a,h),s=o(y,s,g),d===null?u=y:d.sibling=y,d=y,h=_}if(v.done)return n(a,h),R&&Ai(a,g),u;if(h===null){for(;!v.done;g++,v=c.next())v=f(a,v.value,l),v!==null&&(s=o(v,s,g),d===null?u=v:d.sibling=v,d=v);return R&&Ai(a,g),u}for(h=r(h);!v.done;g++,v=c.next())v=m(h,a,g,v.value,l),v!==null&&(e&&v.alternate!==null&&h.delete(v.key===null?g:v.key),s=o(v,s,g),d===null?u=v:d.sibling=v,d=v);return e&&h.forEach(function(e){return t(a,e)}),R&&Ai(a,g),u}function b(e,r,o,c){if(typeof o==`object`&&o&&o.type===y&&o.key===null&&(o=o.props.children),typeof o==`object`&&o){switch(o.$$typeof){case _:a:{for(var l=o.key;r!==null;){if(r.key===l){if(l=o.type,l===y){if(r.tag===7){n(e,r.sibling),c=a(r,o.props.children),c.return=e,e=c;break a}}else if(r.elementType===l||typeof l==`object`&&l&&l.$$typeof===re&&Oa(l)===r.type){n(e,r.sibling),c=a(r,o.props),Pa(c,o),c.return=e,e=c;break a}n(e,r);break}else t(e,r);r=r.sibling}o.type===y?(c=_i(o.props.children,e.mode,c,o.key),c.return=e,e=c):(c=gi(o.type,o.key,o.props,null,e.mode,c),Pa(c,o),c.return=e,e=c)}return s(e);case v:a:{for(l=o.key;r!==null;){if(r.key===l)if(r.tag===4&&r.stateNode.containerInfo===o.containerInfo&&r.stateNode.implementation===o.implementation){n(e,r.sibling),c=a(r,o.children||[]),c.return=e,e=c;break a}else{n(e,r);break}else t(e,r);r=r.sibling}c=bi(o,e.mode,c),c.return=e,e=c}return s(e);case re:return o=Oa(o),b(e,r,o,c)}if(ce(o))return h(e,r,o,c);if(T(o)){if(l=T(o),typeof l!=`function`)throw Error(i(150));return o=l.call(o),g(e,r,o,c)}if(typeof o.then==`function`)return b(e,r,B(o),c);if(o.$$typeof===C)return b(e,r,ra(e,o),c);Fa(e,o)}return typeof o==`string`&&o!==``||typeof o==`number`||typeof o==`bigint`?(o=``+o,r!==null&&r.tag===6?(n(e,r.sibling),c=a(r,o),c.return=e,e=c):(n(e,r),c=vi(o,e.mode,c),c.return=e,e=c),s(e)):n(e,r)}return function(e,t,n,r){try{Na=0;var i=b(e,t,n,r);return Ma=null,i}catch(t){if(t===Sa||t===wa)throw t;var a=fi(29,t,null,e.mode);return a.lanes=r,a.return=e,a}}}var La=Ia(!0),Ra=Ia(!1),za=!1;function Ba(e){e.updateQueue={baseState:e.memoizedState,firstBaseUpdate:null,lastBaseUpdate:null,shared:{pending:null,lanes:0,hiddenCallbacks:null},callbacks:null}}function Va(e,t){e=e.updateQueue,t.updateQueue===e&&(t.updateQueue={baseState:e.baseState,firstBaseUpdate:e.firstBaseUpdate,lastBaseUpdate:e.lastBaseUpdate,shared:e.shared,callbacks:null})}function Ha(e){return{lane:e,tag:0,payload:null,callback:null,next:null}}function Ua(e,t,n){var r=e.updateQueue;if(r===null)return null;if(r=r.shared,K&2){var i=r.pending;return i===null?t.next=t:(t.next=i.next,i.next=t),r.pending=t,t=li(e),ci(e,null,n),t}return ai(e,r,t,n),li(e)}function Wa(e,t,n){if(t=t.updateQueue,t!==null&&(t=t.shared,n&4194048)){var r=t.lanes;r&=e.pendingLanes,n|=r,t.lanes=n,ot(e,n)}}function Ga(e,t){var n=e.updateQueue,r=e.alternate;if(r!==null&&(r=r.updateQueue,n===r)){var i=null,a=null;if(n=n.firstBaseUpdate,n!==null){do{var o={lane:n.lane,tag:n.tag,payload:n.payload,callback:null,next:null};a===null?i=a=o:a=a.next=o,n=n.next}while(n!==null);a===null?i=a=t:a=a.next=t}else i=a=t;n={baseState:r.baseState,firstBaseUpdate:i,lastBaseUpdate:a,shared:r.shared,callbacks:r.callbacks},e.updateQueue=n;return}e=n.lastBaseUpdate,e===null?n.firstBaseUpdate=t:e.next=t,n.lastBaseUpdate=t}var Ka=!1;function V(){if(Ka){var e=pa;if(e!==null)throw e}}function qa(e,t,n,r){Ka=!1;var i=e.updateQueue;za=!1;var a=i.firstBaseUpdate,o=i.lastBaseUpdate,s=i.shared.pending;if(s!==null){i.shared.pending=null;var c=s,l=c.next;c.next=null,o===null?a=l:o.next=l,o=c;var u=e.alternate;u!==null&&(u=u.updateQueue,s=u.lastBaseUpdate,s!==o&&(s===null?u.firstBaseUpdate=l:s.next=l,u.lastBaseUpdate=c))}if(a!==null){var d=i.baseState;o=0,u=l=c=null,s=a;do{var f=s.lane&-536870913,p=f!==s.lane;if(p?(Y&f)===f:(r&f)===f){f!==0&&f===fa&&(Ka=!0),u!==null&&(u=u.next={lane:0,tag:s.tag,payload:s.payload,callback:null,next:null});a:{var m=e,g=s;f=t;var _=n;switch(g.tag){case 1:if(m=g.payload,typeof m==`function`){d=m.call(_,d,f);break a}d=m;break a;case 3:m.flags=m.flags&-65537|128;case 0:if(m=g.payload,f=typeof m==`function`?m.call(_,d,f):m,f==null)break a;d=h({},d,f);break a;case 2:za=!0}}f=s.callback,f!==null&&(e.flags|=64,p&&(e.flags|=8192),p=i.callbacks,p===null?i.callbacks=[f]:p.push(f))}else p={lane:f,tag:s.tag,payload:s.payload,callback:s.callback,next:null},u===null?(l=u=p,c=d):u=u.next=p,o|=f;if(s=s.next,s===null){if(s=i.shared.pending,s===null)break;p=s,s=p.next,p.next=null,i.lastBaseUpdate=p,i.shared.pending=null}}while(1);u===null&&(c=d),i.baseState=c,i.firstBaseUpdate=l,i.lastBaseUpdate=u,a===null&&(i.shared.lanes=0),Gl|=o,e.lanes=o,e.memoizedState=d}}function Ja(e,t){if(typeof e!=`function`)throw Error(i(191,e));e.call(t)}function Ya(e,t){var n=e.callbacks;if(n!==null)for(e.callbacks=null,e=0;ea?a:8;var o=D.T,s={};D.T=s,Ps(e,!1,t,n);try{var c=i(),l=D.S;l!==null&&l(s,c),typeof c==`object`&&c&&typeof c.then==`function`?Ns(e,t,ga(c,r),pu(e)):Ns(e,t,r,pu(e))}catch(n){Ns(e,t,{then:function(){},status:`rejected`,reason:n},pu())}finally{O.p=a,o!==null&&s.types!==null&&(o.types=s.types),D.T=o}}function Cs(){}function ws(e,t,n,r){if(e.tag!==5)throw Error(i(476));var a=Ts(e).queue;Ss(e,a,t,le,n===null?Cs:function(){return Es(e),n(r)})}function Ts(e){var t=e.memoizedState;if(t!==null)return t;t={memoizedState:le,baseState:le,baseQueue:null,queue:{pending:null,lanes:0,dispatch:null,lastRenderedReducer:Fo,lastRenderedState:le},next:null};var n={};return t.next={memoizedState:n,baseState:n,baseQueue:null,queue:{pending:null,lanes:0,dispatch:null,lastRenderedReducer:Fo,lastRenderedState:n},next:null},e.memoizedState=t,e=e.alternate,e!==null&&(e.memoizedState=t),t}function Es(e){var t=Ts(e);t.next===null&&(t=e.alternate.memoizedState),Ns(e,t.next.queue,{},pu())}function Ds(){return na(Qf)}function Os(){return Ao().memoizedState}function ks(){return Ao().memoizedState}function As(e){for(var t=e.return;t!==null;){switch(t.tag){case 24:case 3:var n=pu();e=Ha(n);var r=Ua(t,e,n);r!==null&&(hu(r,t,n),Wa(r,t,n)),t={cache:la()},e.payload=t;return}t=t.return}}function js(e,t,n){var r=pu();n={lane:r,revertLane:0,gesture:null,action:n,hasEagerState:!1,eagerState:null,next:null},Fs(e)?Is(t,n):(n=oi(e,t,n,r),n!==null&&(hu(n,e,r),Ls(n,t,r)))}function Ms(e,t,n){Ns(e,t,n,pu())}function Ns(e,t,n,r){var i={lane:r,revertLane:0,gesture:null,action:n,hasEagerState:!1,eagerState:null,next:null};if(Fs(e))Is(t,i);else{var a=e.alternate;if(e.lanes===0&&(a===null||a.lanes===0)&&(a=t.lastRenderedReducer,a!==null))try{var o=t.lastRenderedState,s=a(o,n);if(i.hasEagerState=!0,i.eagerState=s,Er(s,o))return ai(e,t,i,0),q===null&&ii(),!1}catch{}if(n=oi(e,t,i,r),n!==null)return hu(n,e,r),Ls(n,t,r),!0}return!1}function Ps(e,t,n,r){if(r={lane:2,revertLane:dd(),gesture:null,action:r,hasEagerState:!1,eagerState:null,next:null},Fs(e)){if(t)throw Error(i(479))}else t=oi(e,n,r,2),t!==null&&hu(t,e,2)}function Fs(e){var t=e.alternate;return e===H||t!==null&&t===H}function Is(e,t){mo=po=!0;var n=e.pending;n===null?t.next=t:(t.next=n.next,n.next=t),e.pending=t}function Ls(e,t,n){if(n&4194048){var r=t.lanes;r&=e.pendingLanes,n|=r,t.lanes=n,ot(e,n)}}var Rs={readContext:na,use:No,useCallback:bo,useContext:bo,useEffect:bo,useImperativeHandle:bo,useLayoutEffect:bo,useInsertionEffect:bo,useMemo:bo,useReducer:bo,useRef:bo,useState:bo,useDebugValue:bo,useDeferredValue:bo,useTransition:bo,useSyncExternalStore:bo,useId:bo,useHostTransitionStatus:bo,useFormState:bo,useActionState:bo,useOptimistic:bo,useMemoCache:bo,useCacheRefresh:bo};Rs.useEffectEvent=bo;var zs={readContext:na,use:No,useCallback:function(e,t){return ko().memoizedState=[e,t===void 0?null:t],e},useContext:na,useEffect:ls,useImperativeHandle:function(e,t,n){n=n==null?null:n.concat([e]),ss(4194308,4,hs.bind(null,t,e),n)},useLayoutEffect:function(e,t){return ss(4194308,4,e,t)},useInsertionEffect:function(e,t){ss(4,2,e,t)},useMemo:function(e,t){var n=ko();t=t===void 0?null:t;var r=e();if(ho){Ue(!0);try{e()}finally{Ue(!1)}}return n.memoizedState=[r,t],r},useReducer:function(e,t,n){var r=ko();if(n!==void 0){var i=n(t);if(ho){Ue(!0);try{n(t)}finally{Ue(!1)}}}else i=t;return r.memoizedState=r.baseState=i,e={pending:null,lanes:0,dispatch:null,lastRenderedReducer:e,lastRenderedState:i},r.queue=e,e=e.dispatch=js.bind(null,H,e),[r.memoizedState,e]},useRef:function(e){var t=ko();return e={current:e},t.memoizedState=e},useState:function(e){e=Go(e);var t=e.queue,n=Ms.bind(null,H,t);return t.dispatch=n,[e.memoizedState,n]},useDebugValue:_s,useDeferredValue:function(e,t){return bs(ko(),e,t)},useTransition:function(){var e=Go(!1);return e=Ss.bind(null,H,e.queue,!0,!1),ko().memoizedState=e,[!1,e]},useSyncExternalStore:function(e,t,n){var r=H,a=ko();if(R){if(n===void 0)throw Error(i(407));n=n()}else{if(n=t(),q===null)throw Error(i(349));Y&127||Bo(r,t,n)}a.memoizedState=n;var o={value:n,getSnapshot:t};return a.queue=o,ls(Ho.bind(null,r,o,e),[e]),r.flags|=2048,as(9,{destroy:void 0},Vo.bind(null,r,o,n,t),null),n},useId:function(){var e=ko(),t=q.identifierPrefix;if(R){var n=ki,r=Oi;n=(r&~(1<<32-We(r)-1)).toString(32)+n,t=`_`+t+`R_`+n,n=go++,0<\/script>`,o=o.removeChild(o.firstChild);break;case`select`:o=typeof r.is==`string`?s.createElement(`select`,{is:r.is}):s.createElement(`select`),r.multiple?o.multiple=!0:r.size&&(o.size=r.size);break;default:o=typeof r.is==`string`?s.createElement(a,{is:r.is}):s.createElement(a)}}o[pt]=t,o[mt]=r;a:for(s=t.child;s!==null;){if(s.tag===5||s.tag===6)o.appendChild(s.stateNode);else if(s.tag!==4&&s.tag!==27&&s.child!==null){s.child.return=s,s=s.child;continue}if(s===t)break a;for(;s.sibling===null;){if(s.return===null||s.return===t)break a;s=s.return}s.sibling.return=s.return,s=s.sibling}t.stateNode=o;a:switch(Pd(o,a,r),a){case`button`:case`input`:case`select`:case`textarea`:r=!!r.autoFocus;break a;case`img`:r=!0;break a;default:r=!1}r&&jc(t)}}return Ic(t),Mc(t,t.type,e===null?null:e.memoizedProps,t.pendingProps,n),null;case 6:if(e&&t.stateNode!=null)e.memoizedProps!==r&&jc(t);else{if(typeof r!=`string`&&t.stateNode===null)throw Error(i(166));if(e=ge.current,Hi(t)){if(e=t.stateNode,n=t.memoizedProps,r=null,a=Fi,a!==null)switch(a.tag){case 27:case 5:r=a.memoizedProps}e[pt]=t,e=!!(e.nodeValue===n||r!==null&&!0===r.suppressHydrationWarning||Md(e.nodeValue,n)),e||zi(t,!0)}else e=Bd(e).createTextNode(r),e[pt]=t,t.stateNode=e}return Ic(t),null;case 31:if(n=t.memoizedState,e===null||e.memoizedState!==null){if(r=Hi(t),n!==null){if(e===null){if(!r)throw Error(i(318));if(e=t.memoizedState,e=e===null?null:e.dehydrated,!e)throw Error(i(557));e[pt]=t}else Ui(),!(t.flags&128)&&(t.memoizedState=null),t.flags|=4;Ic(t),e=!1}else n=Wi(),e!==null&&e.memoizedState!==null&&(e.memoizedState.hydrationErrors=n),e=!0;if(!e)return t.flags&256?(so(t),t):(so(t),null);if(t.flags&128)throw Error(i(558))}return Ic(t),null;case 13:if(r=t.memoizedState,e===null||e.memoizedState!==null&&e.memoizedState.dehydrated!==null){if(a=Hi(t),r!==null&&r.dehydrated!==null){if(e===null){if(!a)throw Error(i(318));if(a=t.memoizedState,a=a===null?null:a.dehydrated,!a)throw Error(i(317));a[pt]=t}else Ui(),!(t.flags&128)&&(t.memoizedState=null),t.flags|=4;Ic(t),a=!1}else a=Wi(),e!==null&&e.memoizedState!==null&&(e.memoizedState.hydrationErrors=a),a=!0;if(!a)return t.flags&256?(so(t),t):(so(t),null)}return so(t),t.flags&128?(t.lanes=n,t):(n=r!==null,e=e!==null&&e.memoizedState!==null,n&&(r=t.child,a=null,r.alternate!==null&&r.alternate.memoizedState!==null&&r.alternate.memoizedState.cachePool!==null&&(a=r.alternate.memoizedState.cachePool.pool),o=null,r.memoizedState!==null&&r.memoizedState.cachePool!==null&&(o=r.memoizedState.cachePool.pool),o!==a&&(r.flags|=2048)),n!==e&&n&&(t.child.flags|=8192),Pc(t,t.updateQueue),Ic(t),null);case 4:return j(),e===null&&Sd(t.stateNode.containerInfo),Ic(t),null;case 10:return Xi(t.type),Ic(t),null;case 19:if(pe(co),r=t.memoizedState,r===null)return Ic(t),null;if(a=(t.flags&128)!=0,o=r.rendering,o===null)if(a)Fc(r,!1);else{if(Wl!==0||e!==null&&e.flags&128)for(e=t.child;e!==null;){if(o=lo(e),o!==null){for(t.flags|=128,Fc(r,!1),e=o.updateQueue,t.updateQueue=e,Pc(t,e),t.subtreeFlags=0,e=n,n=t.child;n!==null;)hi(n,e),n=n.sibling;return k(co,co.current&1|2),R&&Ai(t,r.treeForkCount),t.child}e=e.sibling}r.tail!==null&&Me()>tu&&(t.flags|=128,a=!0,Fc(r,!1),t.lanes=4194304)}else{if(!a)if(e=lo(o),e!==null){if(t.flags|=128,a=!0,e=e.updateQueue,t.updateQueue=e,Pc(t,e),Fc(r,!0),r.tail===null&&r.tailMode===`hidden`&&!o.alternate&&!R)return Ic(t),null}else 2*Me()-r.renderingStartTime>tu&&n!==536870912&&(t.flags|=128,a=!0,Fc(r,!1),t.lanes=4194304);r.isBackwards?(o.sibling=t.child,t.child=o):(e=r.last,e===null?t.child=o:e.sibling=o,r.last=o)}return r.tail===null?(Ic(t),null):(e=r.tail,r.rendering=e,r.tail=e.sibling,r.renderingStartTime=Me(),e.sibling=null,n=co.current,k(co,a?n&1|2:n&1),R&&Ai(t,r.treeForkCount),e);case 22:case 23:return so(t),eo(),r=t.memoizedState!==null,e===null?r&&(t.flags|=8192):e.memoizedState!==null!==r&&(t.flags|=8192),r?n&536870912&&!(t.flags&128)&&(Ic(t),t.subtreeFlags&6&&(t.flags|=8192)):Ic(t),n=t.updateQueue,n!==null&&Pc(t,n.retryQueue),n=null,e!==null&&e.memoizedState!==null&&e.memoizedState.cachePool!==null&&(n=e.memoizedState.cachePool.pool),r=null,t.memoizedState!==null&&t.memoizedState.cachePool!==null&&(r=t.memoizedState.cachePool.pool),r!==n&&(t.flags|=2048),e!==null&&pe(va),null;case 24:return n=null,e!==null&&(n=e.memoizedState.cache),t.memoizedState.cache!==n&&(t.flags|=2048),Xi(ca),Ic(t),null;case 25:return null;case 30:return null}throw Error(i(156,t.tag))}function Rc(e,t){switch(Ni(t),t.tag){case 1:return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 3:return Xi(ca),j(),e=t.flags,e&65536&&!(e&128)?(t.flags=e&-65537|128,t):null;case 26:case 27:case 5:return ye(t),null;case 31:if(t.memoizedState!==null){if(so(t),t.alternate===null)throw Error(i(340));Ui()}return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 13:if(so(t),e=t.memoizedState,e!==null&&e.dehydrated!==null){if(t.alternate===null)throw Error(i(340));Ui()}return e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 19:return pe(co),null;case 4:return j(),null;case 10:return Xi(t.type),null;case 22:case 23:return so(t),eo(),e!==null&&pe(va),e=t.flags,e&65536?(t.flags=e&-65537|128,t):null;case 24:return Xi(ca),null;case 25:return null;default:return null}}function zc(e,t){switch(Ni(t),t.tag){case 3:Xi(ca),j();break;case 26:case 27:case 5:ye(t);break;case 4:j();break;case 31:t.memoizedState!==null&&so(t);break;case 13:so(t);break;case 19:pe(co);break;case 10:Xi(t.type);break;case 22:case 23:so(t),eo(),e!==null&&pe(va);break;case 24:Xi(ca)}}function Bc(e,t){try{var n=t.updateQueue,r=n===null?null:n.lastEffect;if(r!==null){var i=r.next;n=i;do{if((n.tag&e)===e){r=void 0;var a=n.create,o=n.inst;r=a(),o.destroy=r}n=n.next}while(n!==i)}}catch(e){Z(t,t.return,e)}}function Vc(e,t,n){try{var r=t.updateQueue,i=r===null?null:r.lastEffect;if(i!==null){var a=i.next;r=a;do{if((r.tag&e)===e){var o=r.inst,s=o.destroy;if(s!==void 0){o.destroy=void 0,i=t;var c=n,l=s;try{l()}catch(e){Z(i,c,e)}}}r=r.next}while(r!==a)}}catch(e){Z(t,t.return,e)}}function Hc(e){var t=e.updateQueue;if(t!==null){var n=e.stateNode;try{Ya(t,n)}catch(t){Z(e,e.return,t)}}}function Uc(e,t,n){n.props=Ks(e.type,e.memoizedProps),n.state=e.memoizedState;try{n.componentWillUnmount()}catch(n){Z(e,t,n)}}function Wc(e,t){try{var n=e.ref;if(n!==null){switch(e.tag){case 26:case 27:case 5:var r=e.stateNode;break;case 30:r=e.stateNode;break;default:r=e.stateNode}typeof n==`function`?e.refCleanup=n(r):n.current=r}}catch(n){Z(e,t,n)}}function Gc(e,t){var n=e.ref,r=e.refCleanup;if(n!==null)if(typeof r==`function`)try{r()}catch(n){Z(e,t,n)}finally{e.refCleanup=null,e=e.alternate,e!=null&&(e.refCleanup=null)}else if(typeof n==`function`)try{n(null)}catch(n){Z(e,t,n)}else n.current=null}function Kc(e){var t=e.type,n=e.memoizedProps,r=e.stateNode;try{a:switch(t){case`button`:case`input`:case`select`:case`textarea`:n.autoFocus&&r.focus();break a;case`img`:n.src?r.src=n.src:n.srcSet&&(r.srcset=n.srcSet)}}catch(t){Z(e,e.return,t)}}function qc(e,t,n){try{var r=e.stateNode;Fd(r,e.type,n,t),r[mt]=t}catch(t){Z(e,e.return,t)}}function Jc(e){return e.tag===5||e.tag===3||e.tag===26||e.tag===27&&Zd(e.type)||e.tag===4}function Yc(e){a:for(;;){for(;e.sibling===null;){if(e.return===null||Jc(e.return))return null;e=e.return}for(e.sibling.return=e.return,e=e.sibling;e.tag!==5&&e.tag!==6&&e.tag!==18;){if(e.tag===27&&Zd(e.type)||e.flags&2||e.child===null||e.tag===4)continue a;e.child.return=e,e=e.child}if(!(e.flags&2))return e.stateNode}}function Xc(e,t,n){var r=e.tag;if(r===5||r===6)e=e.stateNode,t?(n.nodeType===9?n.body:n.nodeName===`HTML`?n.ownerDocument.body:n).insertBefore(e,t):(t=n.nodeType===9?n.body:n.nodeName===`HTML`?n.ownerDocument.body:n,t.appendChild(e),n=n._reactRootContainer,n!=null||t.onclick!==null||(t.onclick=on));else if(r!==4&&(r===27&&Zd(e.type)&&(n=e.stateNode,t=null),e=e.child,e!==null))for(Xc(e,t,n),e=e.sibling;e!==null;)Xc(e,t,n),e=e.sibling}function Zc(e,t,n){var r=e.tag;if(r===5||r===6)e=e.stateNode,t?n.insertBefore(e,t):n.appendChild(e);else if(r!==4&&(r===27&&Zd(e.type)&&(n=e.stateNode),e=e.child,e!==null))for(Zc(e,t,n),e=e.sibling;e!==null;)Zc(e,t,n),e=e.sibling}function Qc(e){var t=e.stateNode,n=e.memoizedProps;try{for(var r=e.type,i=t.attributes;i.length;)t.removeAttributeNode(i[0]);Pd(t,r,n),t[pt]=e,t[mt]=n}catch(t){Z(e,e.return,t)}}var $c=!1,el=!1,tl=!1,nl=typeof WeakSet==`function`?WeakSet:Set,rl=null;function il(e,t){if(e=e.containerInfo,Rd=sp,e=jr(e),Mr(e)){if(`selectionStart`in e)var n={start:e.selectionStart,end:e.selectionEnd};else a:{n=(n=e.ownerDocument)&&n.defaultView||window;var r=n.getSelection&&n.getSelection();if(r&&r.rangeCount!==0){n=r.anchorNode;var a=r.anchorOffset,o=r.focusNode;r=r.focusOffset;try{n.nodeType,o.nodeType}catch{n=null;break a}var s=0,c=-1,l=-1,u=0,d=0,f=e,p=null;b:for(;;){for(var m;f!==n||a!==0&&f.nodeType!==3||(c=s+a),f!==o||r!==0&&f.nodeType!==3||(l=s+r),f.nodeType===3&&(s+=f.nodeValue.length),(m=f.firstChild)!==null;)p=f,f=m;for(;;){if(f===e)break b;if(p===n&&++u===a&&(c=s),p===o&&++d===r&&(l=s),(m=f.nextSibling)!==null)break;f=p,p=f.parentNode}f=m}n=c===-1||l===-1?null:{start:c,end:l}}else n=null}n||={start:0,end:0}}else n=null;for(zd={focusedElem:e,selectionRange:n},sp=!1,rl=t;rl!==null;)if(t=rl,e=t.child,t.subtreeFlags&1028&&e!==null)e.return=t,rl=e;else for(;rl!==null;){switch(t=rl,o=t.alternate,e=t.flags,t.tag){case 0:if(e&4&&(e=t.updateQueue,e=e===null?null:e.events,e!==null))for(n=0;n title`))),Pd(o,r,n),o[pt]=e,Et(o),r=o;break a;case`link`:var s=Vf(`link`,`href`,a).get(r+(n.href||``));if(s){for(var c=0;cg&&(o=g,g=h,h=o);var _=kr(s,h),v=kr(s,g);if(_&&v&&(p.rangeCount!==1||p.anchorNode!==_.node||p.anchorOffset!==_.offset||p.focusNode!==v.node||p.focusOffset!==v.offset)){var y=d.createRange();y.setStart(_.node,_.offset),p.removeAllRanges(),h>g?(p.addRange(y),p.extend(v.node,v.offset)):(y.setEnd(v.node,v.offset),p.addRange(y))}}}}for(d=[],p=s;p=p.parentNode;)p.nodeType===1&&d.push({element:p,left:p.scrollLeft,top:p.scrollTop});for(typeof s.focus==`function`&&s.focus(),s=0;sn?32:n,D.T=null,n=lu,lu=null;var o=au,s=su;if(iu=0,ou=au=null,su=0,K&6)throw Error(i(331));var c=K;if(K|=4,Pl(o.current),El(o,o.current,s,n),K=c,id(0,!1),He&&typeof He.onPostCommitFiberRoot==`function`)try{He.onPostCommitFiberRoot(Ve,o)}catch{}return!0}finally{O.p=a,D.T=r,Vu(e,t)}}function Wu(e,t,n){t=Si(n,t),t=Zs(e.stateNode,t,2),e=Ua(e,t,2),e!==null&&(rt(e,2),rd(e))}function Z(e,t,n){if(e.tag===3)Wu(e,e,n);else for(;t!==null;){if(t.tag===3){Wu(t,e,n);break}else if(t.tag===1){var r=t.stateNode;if(typeof t.type.getDerivedStateFromError==`function`||typeof r.componentDidCatch==`function`&&(ru===null||!ru.has(r))){e=Si(n,e),n=Qs(2),r=Ua(t,n,2),r!==null&&($s(n,r,t,e),rt(r,2),rd(r));break}}t=t.return}}function Gu(e,t,n){var r=e.pingCache;if(r===null){r=e.pingCache=new Rl;var i=new Set;r.set(t,i)}else i=r.get(t),i===void 0&&(i=new Set,r.set(t,i));i.has(n)||(Hl=!0,i.add(n),e=Ku.bind(null,e,t,n),t.then(e,e))}function Ku(e,t,n){var r=e.pingCache;r!==null&&r.delete(t),e.pingedLanes|=e.suspendedLanes&n,e.warmLanes&=~n,q===e&&(Y&n)===n&&(Wl===4||Wl===3&&(Y&62914560)===Y&&300>Me()-$l?!(K&2)&&Su(e,0):ql|=n,Yl===Y&&(Yl=0)),rd(e)}function qu(e,t){t===0&&(t=tt()),e=si(e,t),e!==null&&(rt(e,t),rd(e))}function Ju(e){var t=e.memoizedState,n=0;t!==null&&(n=t.retryLane),qu(e,n)}function Yu(e,t){var n=0;switch(e.tag){case 31:case 13:var r=e.stateNode,a=e.memoizedState;a!==null&&(n=a.retryLane);break;case 19:r=e.stateNode;break;case 22:r=e.stateNode._retryCache;break;default:throw Error(i(314))}r!==null&&r.delete(t),qu(e,n)}function Xu(e,t){return Oe(e,t)}var Zu=null,Qu=null,$u=!1,ed=!1,td=!1,nd=0;function rd(e){e!==Qu&&e.next===null&&(Qu===null?Zu=Qu=e:Qu=Qu.next=e),ed=!0,$u||($u=!0,ud())}function id(e,t){if(!td&&ed){td=!0;do for(var n=!1,r=Zu;r!==null;){if(!t)if(e!==0){var i=r.pendingLanes;if(i===0)var a=0;else{var o=r.suspendedLanes,s=r.pingedLanes;a=(1<<31-We(42|e)+1)-1,a&=i&~(o&~s),a=a&201326741?a&201326741|1:a?a|2:0}a!==0&&(n=!0,ld(r,a))}else a=Y,a=Qe(r,r===q?a:0,r.cancelPendingCommit!==null||r.timeoutHandle!==-1),!(a&3)||$e(r,a)||(n=!0,ld(r,a));r=r.next}while(n);td=!1}}function ad(){od()}function od(){ed=$u=!1;var e=0;nd!==0&&Gd()&&(e=nd);for(var t=Me(),n=null,r=Zu;r!==null;){var i=r.next,a=sd(r,t);a===0?(r.next=null,n===null?Zu=i:n.next=i,i===null&&(Qu=n)):(n=r,(e!==0||a&3)&&(ed=!0)),r=i}iu!==0&&iu!==5||id(e,!1),nd!==0&&(nd=0)}function sd(e,t){for(var n=e.suspendedLanes,r=e.pingedLanes,i=e.expirationTimes,a=e.pendingLanes&-62914561;0s)break;var u=c.transferSize,d=c.initiatorType;u&&Id(d)&&(c=c.responseEnd,o+=u*(c`u`?null:document;function xf(e,t,n){var r=bf;if(r&&typeof t==`string`&&t){var i=Wt(t);i=`link[rel="`+e+`"][href="`+i+`"]`,typeof n==`string`&&(i+=`[crossorigin="`+n+`"]`),hf.has(i)||(hf.add(i),e={rel:e,crossOrigin:n,href:t},r.querySelector(i)===null&&(t=r.createElement(`link`),Pd(t,`link`,e),Et(t),r.head.appendChild(t)))}}function Sf(e){_f.D(e),xf(`dns-prefetch`,e,null)}function Cf(e,t){_f.C(e,t),xf(`preconnect`,e,t)}function wf(e,t,n){_f.L(e,t,n);var r=bf;if(r&&e&&t){var i=`link[rel="preload"][as="`+Wt(t)+`"]`;t===`image`&&n&&n.imageSrcSet?(i+=`[imagesrcset="`+Wt(n.imageSrcSet)+`"]`,typeof n.imageSizes==`string`&&(i+=`[imagesizes="`+Wt(n.imageSizes)+`"]`)):i+=`[href="`+Wt(e)+`"]`;var a=i;switch(t){case`style`:a=Af(e);break;case`script`:a=Pf(e)}mf.has(a)||(e=h({rel:`preload`,href:t===`image`&&n&&n.imageSrcSet?void 0:e,as:t},n),mf.set(a,e),r.querySelector(i)!==null||t===`style`&&r.querySelector(jf(a))||t===`script`&&r.querySelector(Ff(a))||(t=r.createElement(`link`),Pd(t,`link`,e),Et(t),r.head.appendChild(t)))}}function Tf(e,t){_f.m(e,t);var n=bf;if(n&&e){var r=t&&typeof t.as==`string`?t.as:`script`,i=`link[rel="modulepreload"][as="`+Wt(r)+`"][href="`+Wt(e)+`"]`,a=i;switch(r){case`audioworklet`:case`paintworklet`:case`serviceworker`:case`sharedworker`:case`worker`:case`script`:a=Pf(e)}if(!mf.has(a)&&(e=h({rel:`modulepreload`,href:e},t),mf.set(a,e),n.querySelector(i)===null)){switch(r){case`audioworklet`:case`paintworklet`:case`serviceworker`:case`sharedworker`:case`worker`:case`script`:if(n.querySelector(Ff(a)))return}r=n.createElement(`link`),Pd(r,`link`,e),Et(r),n.head.appendChild(r)}}}function Ef(e,t,n){_f.S(e,t,n);var r=bf;if(r&&e){var i=Tt(r).hoistableStyles,a=Af(e);t||=`default`;var o=i.get(a);if(!o){var s={loading:0,preload:null};if(o=r.querySelector(jf(a)))s.loading=5;else{e=h({rel:`stylesheet`,href:e,"data-precedence":t},n),(n=mf.get(a))&&Rf(e,n);var c=o=r.createElement(`link`);Et(c),Pd(c,`link`,e),c._p=new Promise(function(e,t){c.onload=e,c.onerror=t}),c.addEventListener(`load`,function(){s.loading|=1}),c.addEventListener(`error`,function(){s.loading|=2}),s.loading|=4,Lf(o,t,r)}o={type:`stylesheet`,instance:o,count:1,state:s},i.set(a,o)}}}function Df(e,t){_f.X(e,t);var n=bf;if(n&&e){var r=Tt(n).hoistableScripts,i=Pf(e),a=r.get(i);a||(a=n.querySelector(Ff(i)),a||(e=h({src:e,async:!0},t),(t=mf.get(i))&&zf(e,t),a=n.createElement(`script`),Et(a),Pd(a,`link`,e),n.head.appendChild(a)),a={type:`script`,instance:a,count:1,state:null},r.set(i,a))}}function Of(e,t){_f.M(e,t);var n=bf;if(n&&e){var r=Tt(n).hoistableScripts,i=Pf(e),a=r.get(i);a||(a=n.querySelector(Ff(i)),a||(e=h({src:e,async:!0,type:`module`},t),(t=mf.get(i))&&zf(e,t),a=n.createElement(`script`),Et(a),Pd(a,`link`,e),n.head.appendChild(a)),a={type:`script`,instance:a,count:1,state:null},r.set(i,a))}}function kf(e,t,n,r){var a=(a=ge.current)?gf(a):null;if(!a)throw Error(i(446));switch(e){case`meta`:case`title`:return null;case`style`:return typeof n.precedence==`string`&&typeof n.href==`string`?(t=Af(n.href),n=Tt(a).hoistableStyles,r=n.get(t),r||(r={type:`style`,instance:null,count:0,state:null},n.set(t,r)),r):{type:`void`,instance:null,count:0,state:null};case`link`:if(n.rel===`stylesheet`&&typeof n.href==`string`&&typeof n.precedence==`string`){e=Af(n.href);var o=Tt(a).hoistableStyles,s=o.get(e);if(s||(a=a.ownerDocument||a,s={type:`stylesheet`,instance:null,count:0,state:{loading:0,preload:null}},o.set(e,s),(o=a.querySelector(jf(e)))&&!o._p&&(s.instance=o,s.state.loading=5),mf.has(e)||(n={rel:`preload`,as:`style`,href:n.href,crossOrigin:n.crossOrigin,integrity:n.integrity,media:n.media,hrefLang:n.hrefLang,referrerPolicy:n.referrerPolicy},mf.set(e,n),o||Nf(a,e,n,s.state))),t&&r===null)throw Error(i(528,``));return s}if(t&&r!==null)throw Error(i(529,``));return null;case`script`:return t=n.async,n=n.src,typeof n==`string`&&t&&typeof t!=`function`&&typeof t!=`symbol`?(t=Pf(n),n=Tt(a).hoistableScripts,r=n.get(t),r||(r={type:`script`,instance:null,count:0,state:null},n.set(t,r)),r):{type:`void`,instance:null,count:0,state:null};default:throw Error(i(444,e))}}function Af(e){return`href="`+Wt(e)+`"`}function jf(e){return`link[rel="stylesheet"][`+e+`]`}function Mf(e){return h({},e,{"data-precedence":e.precedence,precedence:null})}function Nf(e,t,n,r){e.querySelector(`link[rel="preload"][as="style"][`+t+`]`)?r.loading=1:(t=e.createElement(`link`),r.preload=t,t.addEventListener(`load`,function(){return r.loading|=1}),t.addEventListener(`error`,function(){return r.loading|=2}),Pd(t,`link`,n),Et(t),e.head.appendChild(t))}function Pf(e){return`[src="`+Wt(e)+`"]`}function Ff(e){return`script[async]`+e}function If(e,t,n){if(t.count++,t.instance===null)switch(t.type){case`style`:var r=e.querySelector(`style[data-href~="`+Wt(n.href)+`"]`);if(r)return t.instance=r,Et(r),r;var a=h({},n,{"data-href":n.href,"data-precedence":n.precedence,href:null,precedence:null});return r=(e.ownerDocument||e).createElement(`style`),Et(r),Pd(r,`style`,a),Lf(r,n.precedence,e),t.instance=r;case`stylesheet`:a=Af(n.href);var o=e.querySelector(jf(a));if(o)return t.state.loading|=4,t.instance=o,Et(o),o;r=Mf(n),(a=mf.get(a))&&Rf(r,a),o=(e.ownerDocument||e).createElement(`link`),Et(o);var s=o;return s._p=new Promise(function(e,t){s.onload=e,s.onerror=t}),Pd(o,`link`,r),t.state.loading|=4,Lf(o,n.precedence,e),t.instance=o;case`script`:return o=Pf(n.src),(a=e.querySelector(Ff(o)))?(t.instance=a,Et(a),a):(r=n,(a=mf.get(o))&&(r=h({},n),zf(r,a)),e=e.ownerDocument||e,a=e.createElement(`script`),Et(a),Pd(a,`link`,r),e.head.appendChild(a),t.instance=a);case`void`:return null;default:throw Error(i(443,t.type))}else t.type===`stylesheet`&&!(t.state.loading&4)&&(r=t.instance,t.state.loading|=4,Lf(r,n.precedence,e));return t.instance}function Lf(e,t,n){for(var r=n.querySelectorAll(`link[rel="stylesheet"][data-precedence],style[data-precedence]`),i=r.length?r[r.length-1]:null,a=i,o=0;o title`):null)}function Uf(e,t,n){if(n===1||t.itemProp!=null)return!1;switch(e){case`meta`:case`title`:return!0;case`style`:if(typeof t.precedence!=`string`||typeof t.href!=`string`||t.href===``)break;return!0;case`link`:if(typeof t.rel!=`string`||typeof t.href!=`string`||t.href===``||t.onLoad||t.onError)break;switch(t.rel){case`stylesheet`:return e=t.disabled,typeof t.precedence==`string`&&e==null;default:return!0}case`script`:if(t.async&&typeof t.async!=`function`&&typeof t.async!=`symbol`&&!t.onLoad&&!t.onError&&t.src&&typeof t.src==`string`)return!0}return!1}function Wf(e){return!(e.type===`stylesheet`&&!(e.state.loading&3))}function Gf(e,t,n,r){if(n.type===`stylesheet`&&(typeof r.media!=`string`||!1!==matchMedia(r.media).matches)&&!(n.state.loading&4)){if(n.instance===null){var i=Af(r.href),a=t.querySelector(jf(i));if(a){t=a._p,typeof t==`object`&&t&&typeof t.then==`function`&&(e.count++,e=Jf.bind(e),t.then(e,e)),n.state.loading|=4,n.instance=a,Et(a);return}a=t.ownerDocument||t,r=Mf(r),(i=mf.get(i))&&Rf(r,i),a=a.createElement(`link`),Et(a);var o=a;o._p=new Promise(function(e,t){o.onload=e,o.onerror=t}),Pd(a,`link`,r),n.instance=a}e.stylesheets===null&&(e.stylesheets=new Map),e.stylesheets.set(n,t),(t=n.state.preload)&&!(n.state.loading&3)&&(e.count++,n=Jf.bind(e),t.addEventListener(`load`,n),t.addEventListener(`error`,n))}}var Kf=0;function qf(e,t){return e.stylesheets&&e.count===0&&Xf(e,e.stylesheets),0Kf?50:800)+t);return e.unsuspend=n,function(){e.unsuspend=null,clearTimeout(r),clearTimeout(i)}}:null}function Jf(){if(this.count--,this.count===0&&(this.imgCount===0||!this.waitingForImages)){if(this.stylesheets)Xf(this,this.stylesheets);else if(this.unsuspend){var e=this.unsuspend;this.unsuspend=null,e()}}}var Yf=null;function Xf(e,t){e.stylesheets=null,e.unsuspend!==null&&(e.count++,Yf=new Map,t.forEach(Zf,e),Yf=null,Jf.call(e))}function Zf(e,t){if(!(t.state.loading&4)){var n=Yf.get(e);if(n)var r=n.get(null);else{n=new Map,Yf.set(e,n);for(var i=e.querySelectorAll(`link[data-precedence],style[data-precedence]`),a=0;a{function n(){if(!(typeof __REACT_DEVTOOLS_GLOBAL_HOOK__>`u`||typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE!=`function`))try{__REACT_DEVTOOLS_GLOBAL_HOOK__.checkDCE(n)}catch(e){console.error(e)}}n(),t.exports=h()})),_={black:`#000`,white:`#fff`},v={50:`#ffebee`,100:`#ffcdd2`,200:`#ef9a9a`,300:`#e57373`,400:`#ef5350`,500:`#f44336`,600:`#e53935`,700:`#d32f2f`,800:`#c62828`,900:`#b71c1c`,A100:`#ff8a80`,A200:`#ff5252`,A400:`#ff1744`,A700:`#d50000`},y={50:`#f3e5f5`,100:`#e1bee7`,200:`#ce93d8`,300:`#ba68c8`,400:`#ab47bc`,500:`#9c27b0`,600:`#8e24aa`,700:`#7b1fa2`,800:`#6a1b9a`,900:`#4a148c`,A100:`#ea80fc`,A200:`#e040fb`,A400:`#d500f9`,A700:`#aa00ff`},b={50:`#e3f2fd`,100:`#bbdefb`,200:`#90caf9`,300:`#64b5f6`,400:`#42a5f5`,500:`#2196f3`,600:`#1e88e5`,700:`#1976d2`,800:`#1565c0`,900:`#0d47a1`,A100:`#82b1ff`,A200:`#448aff`,A400:`#2979ff`,A700:`#2962ff`},x={50:`#e1f5fe`,100:`#b3e5fc`,200:`#81d4fa`,300:`#4fc3f7`,400:`#29b6f6`,500:`#03a9f4`,600:`#039be5`,700:`#0288d1`,800:`#0277bd`,900:`#01579b`,A100:`#80d8ff`,A200:`#40c4ff`,A400:`#00b0ff`,A700:`#0091ea`},S={50:`#e8f5e9`,100:`#c8e6c9`,200:`#a5d6a7`,300:`#81c784`,400:`#66bb6a`,500:`#4caf50`,600:`#43a047`,700:`#388e3c`,800:`#2e7d32`,900:`#1b5e20`,A100:`#b9f6ca`,A200:`#69f0ae`,A400:`#00e676`,A700:`#00c853`},C={50:`#fff3e0`,100:`#ffe0b2`,200:`#ffcc80`,300:`#ffb74d`,400:`#ffa726`,500:`#ff9800`,600:`#fb8c00`,700:`#f57c00`,800:`#ef6c00`,900:`#e65100`,A100:`#ffd180`,A200:`#ffab40`,A400:`#ff9100`,A700:`#ff6d00`},w={50:`#fafafa`,100:`#f5f5f5`,200:`#eeeeee`,300:`#e0e0e0`,400:`#bdbdbd`,500:`#9e9e9e`,600:`#757575`,700:`#616161`,800:`#424242`,900:`#212121`,A100:`#f5f5f5`,A200:`#eeeeee`,A400:`#bdbdbd`,A700:`#616161`};function ee(e,...t){let n=new URL(`https://mui.com/production-error/?code=${e}`);return t.forEach(e=>n.searchParams.append(`args[]`,e)),`Minified MUI error #${e}; visit ${n} for the full message.`}var te=`$$material`;function ne(){return ne=Object.assign?Object.assign.bind():function(e){for(var t=1;t0?j(Oe,--Ee):0,we--,De===10&&(we=1,Ce--),De}function Ne(){return De=Ee2||Le(De)>3?``:` `}function He(e,t){for(;--t&&Ne()&&!(De<48||De>102||De>57&&De<65||De>70&&De<97););return Ie(e,Fe()+(t<6&&Pe()==32&&Ne()==32))}function Ue(e){for(;Ne();)switch(De){case e:return Ee;case 34:case 39:e!==34&&e!==39&&Ue(De);break;case 40:e===41&&Ue(e);break;case 92:Ne();break}return Ee}function We(e,t){for(;Ne()&&e+De!==57&&!(e+De===84&&Pe()===47););return`/*`+Ie(t,Ee-1)+`*`+pe(e===47?e:Ne())}function Ge(e){for(;!Le(Pe());)Ne();return Ie(e,Ee)}function Ke(e){return ze(qe(``,null,null,null,[``],e=Re(e),0,[0],e))}function qe(e,t,n,r,i,a,o,s,c){for(var l=0,u=0,d=o,f=0,p=0,m=0,h=1,g=1,_=1,v=0,y=``,b=i,x=a,S=r,C=y;g;)switch(m=v,v=Ne()){case 40:if(m!=108&&j(C,d-1)==58){_e(C+=A(Be(v),`&`,`&\f`),`&\f`)!=-1&&(_=-1);break}case 34:case 39:case 91:C+=Be(v);break;case 9:case 10:case 13:case 32:C+=Ve(m);break;case 92:C+=He(Fe()-1,7);continue;case 47:switch(Pe()){case 42:case 47:xe(Ye(We(Ne(),Fe()),t,n),c);break;default:C+=`/`}break;case 123*h:s[l++]=ye(C)*_;case 125*h:case 59:case 0:switch(v){case 0:case 125:g=0;case 59+u:_==-1&&(C=A(C,/\f/g,``)),p>0&&ye(C)-d&&xe(p>32?Xe(C+`;`,r,n,d-1):Xe(A(C,` `,``)+`;`,r,n,d-2),c);break;case 59:C+=`;`;default:if(xe(S=Je(C,t,n,l,u,i,s,y,b=[],x=[],d),a),v===123)if(u===0)qe(C,t,S,S,b,a,d,s,x);else switch(f===99&&j(C,3)===110?100:f){case 100:case 108:case 109:case 115:qe(e,S,S,r&&xe(Je(e,S,S,0,0,i,s,y,i,b=[],d),x),i,x,d,s,r?b:x);break;default:qe(C,S,S,S,[``],x,0,s,x)}}l=u=p=0,h=_=1,y=C=``,d=o;break;case 58:d=1+ye(C),p=m;default:if(h<1){if(v==123)--h;else if(v==125&&h++==0&&Me()==125)continue}switch(C+=pe(v),v*h){case 38:_=u>0?1:(C+=`\f`,-1);break;case 44:s[l++]=(ye(C)-1)*_,_=1;break;case 64:Pe()===45&&(C+=Be(Ne())),f=Pe(),u=d=ye(y=C+=Ge(Fe())),v++;break;case 45:m===45&&ye(C)==2&&(h=0)}}return a}function Je(e,t,n,r,i,a,o,s,c,l,u){for(var d=i-1,f=i===0?a:[``],p=be(f),m=0,h=0,g=0;m0?f[_]+` `+v:A(v,/&\f/g,f[_])))&&(c[g++]=y);return ke(e,t,n,i===0?D:s,c,l,u)}function Ye(e,t,n){return ke(e,t,n,ce,pe(je()),ve(e,2,-2),0)}function Xe(e,t,n,r){return ke(e,t,n,O,ve(e,0,r),ve(e,r+1,-1),r)}function Ze(e,t){for(var n=``,r=be(e),i=0;i6)switch(j(e,t+1)){case 109:if(j(e,t+4)!==45)break;case 102:return A(e,/(.+:)(.+)-([^]+)/,`$1`+E+`$2-$3$1`+se+(j(e,t+3)==108?`$3`:`$2-$3`))+e;case 115:return~_e(e,`stretch`)?ct(A(e,`stretch`,`fill-available`),t)+e:e}break;case 4949:if(j(e,t+1)!==115)break;case 6444:switch(j(e,ye(e)-3-(~_e(e,`!important`)&&10))){case 107:return A(e,`:`,`:`+E)+e;case 101:return A(e,/(.+:)([^;!]+)(;|!.+)?/,`$1`+E+(j(e,14)===45?`inline-`:``)+`box$3$1`+E+`$2$3$1`+T+`$2box$3`)+e}break;case 5936:switch(j(e,t+11)){case 114:return E+e+T+A(e,/[svh]\w+-[tblr]{2}/,`tb`)+e;case 108:return E+e+T+A(e,/[svh]\w+-[tblr]{2}/,`tb-rl`)+e;case 45:return E+e+T+A(e,/[svh]\w+-[tblr]{2}/,`lr`)+e}return E+e+T+e+e}return e}var lt=[function(e,t,n,r){if(e.length>-1&&!e.return)switch(e.type){case O:e.return=ct(e.value,e.length);break;case ue:return Ze([Ae(e,{value:A(e.value,`@`,`@`+E)})],r);case D:if(e.length)return Se(e.props,function(t){switch(ge(t,/(::plac\w+|:read-\w+)/)){case`:read-only`:case`:read-write`:return Ze([Ae(e,{props:[A(t,/:(read-\w+)/,`:`+se+`$1`)]})],r);case`::placeholder`:return Ze([Ae(e,{props:[A(t,/:(plac\w+)/,`:`+E+`input-$1`)]}),Ae(e,{props:[A(t,/:(plac\w+)/,`:`+se+`$1`)]}),Ae(e,{props:[A(t,/:(plac\w+)/,T+`input-$1`)]})],r)}return``})}}],ut=function(e){var t=e.key;if(t===`css`){var n=document.querySelectorAll(`style[data-emotion]:not([data-s])`);Array.prototype.forEach.call(n,function(e){e.getAttribute(`data-emotion`).indexOf(` `)!==-1&&(document.head.appendChild(e),e.setAttribute(`data-s`,``))})}var r=e.stylisPlugins||lt,i={},a,o=[];a=e.container||document.head,Array.prototype.forEach.call(document.querySelectorAll(`style[data-emotion^="`+t+` "]`),function(e){for(var t=e.getAttribute(`data-emotion`).split(` `),n=1;n{var t=typeof Symbol==`function`&&Symbol.for,n=t?Symbol.for(`react.element`):60103,r=t?Symbol.for(`react.portal`):60106,i=t?Symbol.for(`react.fragment`):60107,a=t?Symbol.for(`react.strict_mode`):60108,o=t?Symbol.for(`react.profiler`):60114,s=t?Symbol.for(`react.provider`):60109,c=t?Symbol.for(`react.context`):60110,l=t?Symbol.for(`react.async_mode`):60111,u=t?Symbol.for(`react.concurrent_mode`):60111,d=t?Symbol.for(`react.forward_ref`):60112,f=t?Symbol.for(`react.suspense`):60113,p=t?Symbol.for(`react.suspense_list`):60120,m=t?Symbol.for(`react.memo`):60115,h=t?Symbol.for(`react.lazy`):60116,g=t?Symbol.for(`react.block`):60121,_=t?Symbol.for(`react.fundamental`):60117,v=t?Symbol.for(`react.responder`):60118,y=t?Symbol.for(`react.scope`):60119;function b(e){if(typeof e==`object`&&e){var t=e.$$typeof;switch(t){case n:switch(e=e.type,e){case l:case u:case i:case o:case a:case f:return e;default:switch(e&&=e.$$typeof,e){case c:case d:case h:case m:case s:return e;default:return t}}case r:return t}}}function x(e){return b(e)===u}e.AsyncMode=l,e.ConcurrentMode=u,e.ContextConsumer=c,e.ContextProvider=s,e.Element=n,e.ForwardRef=d,e.Fragment=i,e.Lazy=h,e.Memo=m,e.Portal=r,e.Profiler=o,e.StrictMode=a,e.Suspense=f,e.isAsyncMode=function(e){return x(e)||b(e)===l},e.isConcurrentMode=x,e.isContextConsumer=function(e){return b(e)===c},e.isContextProvider=function(e){return b(e)===s},e.isElement=function(e){return typeof e==`object`&&!!e&&e.$$typeof===n},e.isForwardRef=function(e){return b(e)===d},e.isFragment=function(e){return b(e)===i},e.isLazy=function(e){return b(e)===h},e.isMemo=function(e){return b(e)===m},e.isPortal=function(e){return b(e)===r},e.isProfiler=function(e){return b(e)===o},e.isStrictMode=function(e){return b(e)===a},e.isSuspense=function(e){return b(e)===f},e.isValidElementType=function(e){return typeof e==`string`||typeof e==`function`||e===i||e===u||e===o||e===a||e===f||e===p||typeof e==`object`&&!!e&&(e.$$typeof===h||e.$$typeof===m||e.$$typeof===s||e.$$typeof===c||e.$$typeof===d||e.$$typeof===_||e.$$typeof===v||e.$$typeof===y||e.$$typeof===g)},e.typeOf=b})),ft=o(((e,t)=>{t.exports=dt()})),pt=o(((e,t)=>{var n=ft(),r={childContextTypes:!0,contextType:!0,contextTypes:!0,defaultProps:!0,displayName:!0,getDefaultProps:!0,getDerivedStateFromError:!0,getDerivedStateFromProps:!0,mixins:!0,propTypes:!0,type:!0},i={name:!0,length:!0,prototype:!0,caller:!0,callee:!0,arguments:!0,arity:!0},a={$$typeof:!0,render:!0,defaultProps:!0,displayName:!0,propTypes:!0},o={$$typeof:!0,compare:!0,defaultProps:!0,displayName:!0,propTypes:!0,type:!0},s={};s[n.ForwardRef]=a,s[n.Memo]=o;function c(e){return n.isMemo(e)?o:s[e.$$typeof]||r}var l=Object.defineProperty,u=Object.getOwnPropertyNames,d=Object.getOwnPropertySymbols,f=Object.getOwnPropertyDescriptor,p=Object.getPrototypeOf,m=Object.prototype;function h(e,t,n){if(typeof t!=`string`){if(m){var r=p(t);r&&r!==m&&h(e,r,n)}var a=u(t);d&&(a=a.concat(d(t)));for(var o=c(e),s=c(t),g=0;g=4;++r,i-=4)n=e.charCodeAt(r)&255|(e.charCodeAt(++r)&255)<<8|(e.charCodeAt(++r)&255)<<16|(e.charCodeAt(++r)&255)<<24,n=(n&65535)*1540483477+((n>>>16)*59797<<16),n^=n>>>24,t=(n&65535)*1540483477+((n>>>16)*59797<<16)^(t&65535)*1540483477+((t>>>16)*59797<<16);switch(i){case 3:t^=(e.charCodeAt(r+2)&255)<<16;case 2:t^=(e.charCodeAt(r+1)&255)<<8;case 1:t^=e.charCodeAt(r)&255,t=(t&65535)*1540483477+((t>>>16)*59797<<16)}return t^=t>>>13,t=(t&65535)*1540483477+((t>>>16)*59797<<16),((t^t>>>15)>>>0).toString(36)}var yt={animationIterationCount:1,aspectRatio:1,borderImageOutset:1,borderImageSlice:1,borderImageWidth:1,boxFlex:1,boxFlexGroup:1,boxOrdinalGroup:1,columnCount:1,columns:1,flex:1,flexGrow:1,flexPositive:1,flexShrink:1,flexNegative:1,flexOrder:1,gridRow:1,gridRowEnd:1,gridRowSpan:1,gridRowStart:1,gridColumn:1,gridColumnEnd:1,gridColumnSpan:1,gridColumnStart:1,msGridRow:1,msGridRowSpan:1,msGridColumn:1,msGridColumnSpan:1,fontWeight:1,lineHeight:1,opacity:1,order:1,orphans:1,scale:1,tabSize:1,widows:1,zIndex:1,zoom:1,WebkitLineClamp:1,fillOpacity:1,floodOpacity:1,stopOpacity:1,strokeDasharray:1,strokeDashoffset:1,strokeMiterlimit:1,strokeOpacity:1,strokeWidth:1},bt=!1,xt=/[A-Z]|^ms/g,St=/_EMO_([^_]+?)_([^]*?)_EMO_/g,Ct=function(e){return e.charCodeAt(1)===45},wt=function(e){return e!=null&&typeof e!=`boolean`},Tt=tt(function(e){return Ct(e)?e:e.replace(xt,`-$&`).toLowerCase()}),Et=function(e,t){switch(e){case`animation`:case`animationName`:if(typeof t==`string`)return t.replace(St,function(e,t,n){return jt={name:t,styles:n,next:jt},t})}return yt[e]!==1&&!Ct(e)&&typeof t==`number`&&t!==0?t+`px`:t},Dt=`Component selectors can only be used in conjunction with @emotion/babel-plugin, the swc Emotion plugin, or another Emotion-aware compiler transform.`;function Ot(e,t,n){if(n==null)return``;var r=n;if(r.__emotion_styles!==void 0)return r;switch(typeof n){case`boolean`:return``;case`object`:var i=n;if(i.anim===1)return jt={name:i.name,styles:i.styles,next:jt},i.name;var a=n;if(a.styles!==void 0){var o=a.next;if(o!==void 0)for(;o!==void 0;)jt={name:o.name,styles:o.styles,next:jt},o=o.next;return a.styles+`;`}return kt(e,t,n);case`function`:if(e!==void 0){var s=jt,c=n(e);return jt=s,Ot(e,t,c)}break}var l=n;if(t==null)return l;var u=t[l];return u===void 0?l:u}function kt(e,t,n){var r=``;if(Array.isArray(n))for(var i=0;i96?Qt:$t},tn=function(e,t,n){var r;if(t){var i=t.shouldForwardProp;r=e.__emotion_forwardProp&&i?function(t){return e.__emotion_forwardProp(t)&&i(t)}:i}return typeof r!=`function`&&n&&(r=e.__emotion_forwardProp),r},nn=function(e){var t=e.cache,n=e.serialized,r=e.isStringTag;return gt(t,n,r),Ft(function(){return _t(t,n,r)}),null},rn=function e(t,n){var r=t.__emotion_real===t,i=r&&t.__emotion_base||t,a,o;n!==void 0&&(a=n.label,o=n.target);var s=tn(t,n,r),c=s||en(i),l=!c(`as`);return function(){var u=arguments,d=r&&t.__emotion_styles!==void 0?t.__emotion_styles.slice(0):[];if(a!==void 0&&d.push(`label:`+a+`;`),u[0]==null||u[0].raw===void 0)d.push.apply(d,u);else{var f=u[0];d.push(f[0]);for(var p=u.length,m=1;m{var t=Symbol.for(`react.transitional.element`),n=Symbol.for(`react.fragment`);function r(e,n,r){var i=null;if(r!==void 0&&(i=``+r),n.key!==void 0&&(i=``+n.key),`key`in n)for(var a in r={},n)a!==`key`&&(r[a]=n[a]);else r=n;return n=r.ref,{$$typeof:t,type:e,key:i,ref:n===void 0?null:n,props:r}}e.Fragment=n,e.jsx=r,e.jsxs=r})),N=o(((e,t)=>{t.exports=sn()}))();function cn(e){return e==null||Object.keys(e).length===0}function ln(e){let{styles:t,defaultTheme:n={}}=e;return(0,N.jsx)(Kt,{styles:typeof t==`function`?e=>t(cn(e)?n:e):t})}function un(e,t){return on(e,t)}function dn(e,t){Array.isArray(e.__emotion_styles)&&(e.__emotion_styles=t(e.__emotion_styles))}var fn=[];function pn(e){return fn[0]=e,Mt(fn)}var mn=o((e=>{var t=Symbol.for(`react.fragment`),n=Symbol.for(`react.strict_mode`),r=Symbol.for(`react.profiler`),i=Symbol.for(`react.consumer`),a=Symbol.for(`react.context`),o=Symbol.for(`react.forward_ref`),s=Symbol.for(`react.suspense`),c=Symbol.for(`react.suspense_list`),l=Symbol.for(`react.memo`),u=Symbol.for(`react.lazy`),d=Symbol.for(`react.client.reference`);e.isValidElementType=function(e){return!!(typeof e==`string`||typeof e==`function`||e===t||e===r||e===n||e===s||e===c||typeof e==`object`&&e&&(e.$$typeof===u||e.$$typeof===l||e.$$typeof===a||e.$$typeof===i||e.$$typeof===o||e.$$typeof===d||e.getModuleId!==void 0))}})),hn=o(((e,t)=>{t.exports=mn()}))();function gn(e){if(typeof e!=`object`||!e)return!1;let t=Object.getPrototypeOf(e);return(t===null||t===Object.prototype||Object.getPrototypeOf(t)===null)&&!(Symbol.toStringTag in e)&&!(Symbol.iterator in e)}function _n(e){if(M.isValidElement(e)||(0,hn.isValidElementType)(e)||!gn(e))return e;let t={};return Object.keys(e).forEach(n=>{t[n]=_n(e[n])}),t}function vn(e,t,n={clone:!0}){let r=n.clone?{...e}:e;return gn(e)&&gn(t)&&Object.keys(t).forEach(i=>{M.isValidElement(t[i])||(0,hn.isValidElementType)(t[i])?r[i]=t[i]:gn(t[i])&&Object.prototype.hasOwnProperty.call(e,i)&&gn(e[i])?r[i]=vn(e[i],t[i],n):n.clone?r[i]=gn(t[i])?_n(t[i]):t[i]:r[i]=t[i]}),r}var yn=e=>{let t=Object.keys(e).map(t=>({key:t,val:e[t]}))||[];return t.sort((e,t)=>e.val-t.val),t.reduce((e,t)=>({...e,[t.key]:t.val}),{})};function bn(e){let{values:t={xs:0,sm:600,md:900,lg:1200,xl:1536},unit:n=`px`,step:r=5,...i}=e,a=yn(t),o=Object.keys(a);function s(e){return`@media (min-width:${typeof t[e]==`number`?t[e]:e}${n})`}function c(e){return`@media (max-width:${(typeof t[e]==`number`?t[e]:e)-r/100}${n})`}function l(e,i){let a=o.indexOf(i);return`@media (min-width:${typeof t[e]==`number`?t[e]:e}${n}) and (max-width:${(a!==-1&&typeof t[o[a]]==`number`?t[o[a]]:i)-r/100}${n})`}function u(e){return o.indexOf(e)+1e.startsWith(`@container`)).sort((e,t)=>{let n=/min-width:\s*([0-9.]+)/;return(e.match(n)?.[1]||0)-+(t.match(n)?.[1]||0)});return n.length?n.reduce((e,n)=>{let r=t[n];return delete e[n],e[n]=r,e},{...t}):t}function Sn(e,t){return t===`@`||t.startsWith(`@`)&&(e.some(e=>t.startsWith(`@${e}`))||!!t.match(/^@\d/))}function Cn(e,t){let n=t.match(/^@([^/]+)?\/?(.+)?$/);if(!n)return null;let[,r,i]=n,a=Number.isNaN(+r)?r||0:+r;return e.containerQueries(i).up(a)}function wn(e){let t=(e,t)=>e.replace(`@media`,t?`@container ${t}`:`@container`);function n(n,r){n.up=(...n)=>t(e.breakpoints.up(...n),r),n.down=(...n)=>t(e.breakpoints.down(...n),r),n.between=(...n)=>t(e.breakpoints.between(...n),r),n.only=(...n)=>t(e.breakpoints.only(...n),r),n.not=(...n)=>{let i=t(e.breakpoints.not(...n),r);return i.includes(`not all and`)?i.replace(`not all and `,``).replace(`min-width:`,`width<`).replace(`max-width:`,`width>`).replace(`and`,`or`):i}}let r={},i=e=>(n(r,e),r);return n(i),{...e,containerQueries:i}}var Tn={borderRadius:4};function En(e,t){return t?vn(e,t,{clone:!1}):e}var Dn={xs:0,sm:600,md:900,lg:1200,xl:1536},On={keys:[`xs`,`sm`,`md`,`lg`,`xl`],up:e=>`@media (min-width:${Dn[e]}px)`},kn={containerQueries:e=>({up:t=>{let n=typeof t==`number`?t:Dn[t]||t;return typeof n==`number`&&(n=`${n}px`),e?`@container ${e} (min-width:${n})`:`@container (min-width:${n})`}})};function An(e,t,n){let r=e.theme||{};if(Array.isArray(t)){let e=r.breakpoints||On;return t.reduce((r,i,a)=>(r[e.up(e.keys[a])]=n(t[a]),r),{})}if(typeof t==`object`){let e=r.breakpoints||On;return Object.keys(t).reduce((i,a)=>{if(Sn(e.keys,a)){let e=Cn(r.containerQueries?r:kn,a);e&&(i[e]=n(t[a],a))}else if(Object.keys(e.values||Dn).includes(a)){let r=e.up(a);i[r]=n(t[a],a)}else{let e=a;i[e]=t[e]}return i},{})}return n(t)}function jn(e={}){return e.keys?.reduce((t,n)=>{let r=e.up(n);return t[r]={},t},{})||{}}function Mn(e,t){return e.reduce((e,t)=>{let n=e[t];return(!n||Object.keys(n).length===0)&&delete e[t],e},t)}function Nn(e){if(typeof e!=`string`)throw Error(ee(7));return e.charAt(0).toUpperCase()+e.slice(1)}function Pn(e,t,n=!0){if(!t||typeof t!=`string`)return null;if(e&&e.vars&&n){let n=`vars.${t}`.split(`.`).reduce((e,t)=>e&&e[t]?e[t]:null,e);if(n!=null)return n}return t.split(`.`).reduce((e,t)=>e&&e[t]!=null?e[t]:null,e)}function Fn(e,t,n,r=n){let i;return i=typeof e==`function`?e(n):Array.isArray(e)?e[n]||r:Pn(e,n)||r,t&&(i=t(i,r,e)),i}function In(e){let{prop:t,cssProperty:n=e.prop,themeKey:r,transform:i}=e,a=e=>{if(e[t]==null)return null;let a=e[t],o=e.theme,s=Pn(o,r)||{};return An(e,a,e=>{let r=Fn(s,i,e);return e===r&&typeof e==`string`&&(r=Fn(s,i,`${t}${e===`default`?``:Nn(e)}`,e)),n===!1?r:{[n]:r}})};return a.propTypes={},a.filterProps=[t],a}function Ln(e){let t={};return n=>(t[n]===void 0&&(t[n]=e(n)),t[n])}var Rn={m:`margin`,p:`padding`},zn={t:`Top`,r:`Right`,b:`Bottom`,l:`Left`,x:[`Left`,`Right`],y:[`Top`,`Bottom`]},Bn={marginX:`mx`,marginY:`my`,paddingX:`px`,paddingY:`py`},Vn=Ln(e=>{if(e.length>2)if(Bn[e])e=Bn[e];else return[e];let[t,n]=e.split(``),r=Rn[t],i=zn[n]||``;return Array.isArray(i)?i.map(e=>r+e):[r+i]}),Hn=[`m`,`mt`,`mr`,`mb`,`ml`,`mx`,`my`,`margin`,`marginTop`,`marginRight`,`marginBottom`,`marginLeft`,`marginX`,`marginY`,`marginInline`,`marginInlineStart`,`marginInlineEnd`,`marginBlock`,`marginBlockStart`,`marginBlockEnd`],Un=[`p`,`pt`,`pr`,`pb`,`pl`,`px`,`py`,`padding`,`paddingTop`,`paddingRight`,`paddingBottom`,`paddingLeft`,`paddingX`,`paddingY`,`paddingInline`,`paddingInlineStart`,`paddingInlineEnd`,`paddingBlock`,`paddingBlockStart`,`paddingBlockEnd`],Wn=[...Hn,...Un];function Gn(e,t,n,r){let i=Pn(e,t,!0)??n;return typeof i==`number`||typeof i==`string`?e=>typeof e==`string`?e:typeof i==`string`?i.startsWith(`var(`)&&e===0?0:i.startsWith(`var(`)&&e===1?i:`calc(${e} * ${i})`:i*e:Array.isArray(i)?e=>{if(typeof e==`string`)return e;let t=i[Math.abs(e)];return e>=0?t:typeof t==`number`?-t:typeof t==`string`&&t.startsWith(`var(`)?`calc(-1 * ${t})`:`-${t}`}:typeof i==`function`?i:()=>void 0}function Kn(e){return Gn(e,`spacing`,8,`spacing`)}function qn(e,t){return typeof t==`string`||t==null?t:e(t)}function Jn(e,t){return n=>e.reduce((e,r)=>(e[r]=qn(t,n),e),{})}function Yn(e,t,n,r){if(!t.includes(n))return null;let i=Jn(Vn(n),r),a=e[n];return An(e,a,i)}function Xn(e,t){let n=Kn(e.theme);return Object.keys(e).map(r=>Yn(e,t,r,n)).reduce(En,{})}function Zn(e){return Xn(e,Hn)}Zn.propTypes={},Zn.filterProps=Hn;function P(e){return Xn(e,Un)}P.propTypes={},P.filterProps=Un;function Qn(e){return Xn(e,Wn)}Qn.propTypes={},Qn.filterProps=Wn;function $n(e=8,t=Kn({spacing:e})){if(e.mui)return e;let n=(...e)=>(e.length===0?[1]:e).map(e=>{let n=t(e);return typeof n==`number`?`${n}px`:n}).join(` `);return n.mui=!0,n}function er(...e){let t=e.reduce((e,t)=>(t.filterProps.forEach(n=>{e[n]=t}),e),{}),n=e=>Object.keys(e).reduce((n,r)=>t[r]?En(n,t[r](e)):n,{});return n.propTypes={},n.filterProps=e.reduce((e,t)=>e.concat(t.filterProps),[]),n}function tr(e){return typeof e==`number`?`${e}px solid`:e}function nr(e,t){return In({prop:e,themeKey:`borders`,transform:t})}var rr=nr(`border`,tr),ir=nr(`borderTop`,tr),ar=nr(`borderRight`,tr),or=nr(`borderBottom`,tr),sr=nr(`borderLeft`,tr),cr=nr(`borderColor`),lr=nr(`borderTopColor`),ur=nr(`borderRightColor`),dr=nr(`borderBottomColor`),fr=nr(`borderLeftColor`),pr=nr(`outline`,tr),mr=nr(`outlineColor`),hr=e=>{if(e.borderRadius!==void 0&&e.borderRadius!==null){let t=Gn(e.theme,`shape.borderRadius`,4,`borderRadius`);return An(e,e.borderRadius,e=>({borderRadius:qn(t,e)}))}return null};hr.propTypes={},hr.filterProps=[`borderRadius`],er(rr,ir,ar,or,sr,cr,lr,ur,dr,fr,hr,pr,mr);var gr=e=>{if(e.gap!==void 0&&e.gap!==null){let t=Gn(e.theme,`spacing`,8,`gap`);return An(e,e.gap,e=>({gap:qn(t,e)}))}return null};gr.propTypes={},gr.filterProps=[`gap`];var _r=e=>{if(e.columnGap!==void 0&&e.columnGap!==null){let t=Gn(e.theme,`spacing`,8,`columnGap`);return An(e,e.columnGap,e=>({columnGap:qn(t,e)}))}return null};_r.propTypes={},_r.filterProps=[`columnGap`];var vr=e=>{if(e.rowGap!==void 0&&e.rowGap!==null){let t=Gn(e.theme,`spacing`,8,`rowGap`);return An(e,e.rowGap,e=>({rowGap:qn(t,e)}))}return null};vr.propTypes={},vr.filterProps=[`rowGap`],er(gr,_r,vr,In({prop:`gridColumn`}),In({prop:`gridRow`}),In({prop:`gridAutoFlow`}),In({prop:`gridAutoColumns`}),In({prop:`gridAutoRows`}),In({prop:`gridTemplateColumns`}),In({prop:`gridTemplateRows`}),In({prop:`gridTemplateAreas`}),In({prop:`gridArea`}));function yr(e,t){return t===`grey`?t:e}er(In({prop:`color`,themeKey:`palette`,transform:yr}),In({prop:`bgcolor`,cssProperty:`backgroundColor`,themeKey:`palette`,transform:yr}),In({prop:`backgroundColor`,themeKey:`palette`,transform:yr}));function br(e){return e<=1&&e!==0?`${e*100}%`:e}var xr=In({prop:`width`,transform:br}),Sr=e=>e.maxWidth!==void 0&&e.maxWidth!==null?An(e,e.maxWidth,t=>{let n=e.theme?.breakpoints?.values?.[t]||Dn[t];return n?e.theme?.breakpoints?.unit===`px`?{maxWidth:n}:{maxWidth:`${n}${e.theme.breakpoints.unit}`}:{maxWidth:br(t)}}):null;Sr.filterProps=[`maxWidth`];var Cr=In({prop:`minWidth`,transform:br}),wr=In({prop:`height`,transform:br}),Tr=In({prop:`maxHeight`,transform:br}),Er=In({prop:`minHeight`,transform:br});In({prop:`size`,cssProperty:`width`,transform:br}),In({prop:`size`,cssProperty:`height`,transform:br}),er(xr,Sr,Cr,wr,Tr,Er,In({prop:`boxSizing`}));var Dr={border:{themeKey:`borders`,transform:tr},borderTop:{themeKey:`borders`,transform:tr},borderRight:{themeKey:`borders`,transform:tr},borderBottom:{themeKey:`borders`,transform:tr},borderLeft:{themeKey:`borders`,transform:tr},borderColor:{themeKey:`palette`},borderTopColor:{themeKey:`palette`},borderRightColor:{themeKey:`palette`},borderBottomColor:{themeKey:`palette`},borderLeftColor:{themeKey:`palette`},outline:{themeKey:`borders`,transform:tr},outlineColor:{themeKey:`palette`},borderRadius:{themeKey:`shape.borderRadius`,style:hr},color:{themeKey:`palette`,transform:yr},bgcolor:{themeKey:`palette`,cssProperty:`backgroundColor`,transform:yr},backgroundColor:{themeKey:`palette`,transform:yr},p:{style:P},pt:{style:P},pr:{style:P},pb:{style:P},pl:{style:P},px:{style:P},py:{style:P},padding:{style:P},paddingTop:{style:P},paddingRight:{style:P},paddingBottom:{style:P},paddingLeft:{style:P},paddingX:{style:P},paddingY:{style:P},paddingInline:{style:P},paddingInlineStart:{style:P},paddingInlineEnd:{style:P},paddingBlock:{style:P},paddingBlockStart:{style:P},paddingBlockEnd:{style:P},m:{style:Zn},mt:{style:Zn},mr:{style:Zn},mb:{style:Zn},ml:{style:Zn},mx:{style:Zn},my:{style:Zn},margin:{style:Zn},marginTop:{style:Zn},marginRight:{style:Zn},marginBottom:{style:Zn},marginLeft:{style:Zn},marginX:{style:Zn},marginY:{style:Zn},marginInline:{style:Zn},marginInlineStart:{style:Zn},marginInlineEnd:{style:Zn},marginBlock:{style:Zn},marginBlockStart:{style:Zn},marginBlockEnd:{style:Zn},displayPrint:{cssProperty:!1,transform:e=>({"@media print":{display:e}})},display:{},overflow:{},textOverflow:{},visibility:{},whiteSpace:{},flexBasis:{},flexDirection:{},flexWrap:{},justifyContent:{},alignItems:{},alignContent:{},order:{},flex:{},flexGrow:{},flexShrink:{},alignSelf:{},justifyItems:{},justifySelf:{},gap:{style:gr},rowGap:{style:vr},columnGap:{style:_r},gridColumn:{},gridRow:{},gridAutoFlow:{},gridAutoColumns:{},gridAutoRows:{},gridTemplateColumns:{},gridTemplateRows:{},gridTemplateAreas:{},gridArea:{},position:{},zIndex:{themeKey:`zIndex`},top:{},right:{},bottom:{},left:{},boxShadow:{themeKey:`shadows`},width:{transform:br},maxWidth:{style:Sr},minWidth:{transform:br},height:{transform:br},maxHeight:{transform:br},minHeight:{transform:br},boxSizing:{},font:{themeKey:`font`},fontFamily:{themeKey:`typography`},fontSize:{themeKey:`typography`},fontStyle:{themeKey:`typography`},fontWeight:{themeKey:`typography`},letterSpacing:{},textTransform:{},lineHeight:{},textAlign:{},typography:{cssProperty:!1,themeKey:`typography`}};function Or(...e){let t=e.reduce((e,t)=>e.concat(Object.keys(t)),[]),n=new Set(t);return e.every(e=>n.size===Object.keys(e).length)}function kr(e,t){return typeof e==`function`?e(t):e}function Ar(){function e(e,t,n,r){let i={[e]:t,theme:n},a=r[e];if(!a)return{[e]:t};let{cssProperty:o=e,themeKey:s,transform:c,style:l}=a;if(t==null)return null;if(s===`typography`&&t===`inherit`)return{[e]:t};let u=Pn(n,s)||{};return l?l(i):An(i,t,t=>{let n=Fn(u,c,t);return t===n&&typeof t==`string`&&(n=Fn(u,c,`${e}${t===`default`?``:Nn(t)}`,t)),o===!1?n:{[o]:n}})}function t(n){let{sx:r,theme:i={},nested:a}=n||{};if(!r)return null;let o=i.unstable_sxConfig??Dr;function s(n){let r=n;if(typeof n==`function`)r=n(i);else if(typeof n!=`object`)return n;if(!r)return null;let s=jn(i.breakpoints),c=Object.keys(s),l=s;return Object.keys(r).forEach(n=>{let a=kr(r[n],i);if(a!=null)if(typeof a==`object`)if(o[n])l=En(l,e(n,a,i,o));else{let e=An({theme:i},a,e=>({[n]:e}));Or(e,a)?l[n]=t({sx:a,theme:i,nested:!0}):l=En(l,e)}else l=En(l,e(n,a,i,o))}),!a&&i.modularCssLayers?{"@layer sx":xn(i,Mn(c,l))}:xn(i,Mn(c,l))}return Array.isArray(r)?r.map(s):s(r)}return t}var jr=Ar();jr.filterProps=[`sx`];function Mr(e,t){let n=this;if(n.vars){if(!n.colorSchemes?.[e]||typeof n.getColorSchemeSelector!=`function`)return{};let r=n.getColorSchemeSelector(e);return r===`&`?t:((r.includes(`data-`)||r.includes(`.`))&&(r=`*:where(${r.replace(/\s*&$/,``)}) &`),{[r]:t})}return n.palette.mode===e?t:{}}function Nr(e={},...t){let{breakpoints:n={},palette:r={},spacing:i,shape:a={},...o}=e,s=bn(n),c=$n(i),l=vn({breakpoints:s,direction:`ltr`,components:{},palette:{mode:`light`,...r},spacing:c,shape:{...Tn,...a}},o);return l=wn(l),l.applyStyles=Mr,l=t.reduce((e,t)=>vn(e,t),l),l.unstable_sxConfig={...Dr,...o?.unstable_sxConfig},l.unstable_sx=function(e){return jr({sx:e,theme:this})},l}function Pr(e){return Object.keys(e).length===0}function Fr(e=null){let t=M.useContext(zt);return!t||Pr(t)?e:t}var Ir=Nr();function Lr(e=Ir){return Fr(e)}function Rr(e){let t=pn(e);return e!==t&&t.styles?(t.styles.match(/^@layer\s+[^{]*$/)||(t.styles=`@layer global{${t.styles}}`),t):e}function zr({styles:e,themeId:t,defaultTheme:n={}}){let r=Lr(n),i=t&&r[t]||r,a=typeof e==`function`?e(i):e;return i.modularCssLayers&&(a=Array.isArray(a)?a.map(e=>Rr(typeof e==`function`?e(i):e)):Rr(a)),(0,N.jsx)(ln,{styles:a})}var Br=e=>{let t={systemProps:{},otherProps:{}},n=e?.theme?.unstable_sxConfig??Dr;return Object.keys(e).forEach(r=>{n[r]?t.systemProps[r]=e[r]:t.otherProps[r]=e[r]}),t};function Vr(e){let{sx:t,...n}=e,{systemProps:r,otherProps:i}=Br(n),a;return a=Array.isArray(t)?[r,...t]:typeof t==`function`?(...e)=>{let n=t(...e);return gn(n)?{...r,...n}:r}:{...r,...t},{...i,sx:a}}var Hr=e=>e,Ur=(()=>{let e=Hr;return{configure(t){e=t},generate(t){return e(t)},reset(){e=Hr}}})();function Wr(e){var t,n,r=``;if(typeof e==`string`||typeof e==`number`)r+=e;else if(typeof e==`object`)if(Array.isArray(e)){var i=e.length;for(t=0;te!==`theme`&&e!==`sx`&&e!==`as`})(jr);return M.forwardRef(function(e,o){let s=Lr(n),{className:c,component:l=`div`,...u}=Vr(e);return(0,N.jsx)(a,{as:l,ref:o,className:Gr(c,i?i(r):r),theme:t&&s[t]||s,...u})})}var qr={active:`active`,checked:`checked`,completed:`completed`,disabled:`disabled`,error:`error`,expanded:`expanded`,focused:`focused`,focusVisible:`focusVisible`,open:`open`,readOnly:`readOnly`,required:`required`,selected:`selected`};function Jr(e,t,n=`Mui`){let r=qr[t];return r?`${n}-${r}`:`${Ur.generate(e)}-${t}`}function Yr(e,t,n=`Mui`){let r={};return t.forEach(t=>{r[t]=Jr(e,t,n)}),r}function Xr(e){let{variants:t,...n}=e,r={variants:t,style:pn(n),isProcessed:!0};return r.style===n||t&&t.forEach(e=>{typeof e.style!=`function`&&(e.style=pn(e.style))}),r}var Zr=Nr();function Qr(e){return e!==`ownerState`&&e!==`theme`&&e!==`sx`&&e!==`as`}function $r(e,t){return t&&e&&typeof e==`object`&&e.styles&&!e.styles.startsWith(`@layer`)&&(e.styles=`@layer ${t}{${String(e.styles)}}`),e}function ei(e){return e?(t,n)=>n[e]:null}function ti(e,t,n){e.theme=ai(e.theme)?n:e.theme[t]||e.theme}function ni(e,t,n){let r=typeof t==`function`?t(e):t;if(Array.isArray(r))return r.flatMap(t=>ni(e,t,n));if(Array.isArray(r?.variants)){let t;if(r.isProcessed)t=n?$r(r.style,n):r.style;else{let{variants:e,...i}=r;t=n?$r(pn(i),n):i}return ri(e,r.variants,[t],n)}return r?.isProcessed?n?$r(pn(r.style),n):r.style:n?$r(pn(r),n):r}function ri(e,t,n=[],r=void 0){let i;variantLoop:for(let a=0;a{dn(e,e=>e.filter(e=>e!==jr));let{name:n,slot:o,skipVariantsResolver:s,skipSx:c,overridesResolver:l=ei(si(o)),...u}=t,d=n&&n.startsWith(`Mui`)||o?`components`:`custom`,f=s===void 0?o&&o!==`Root`&&o!==`root`||!1:s,p=c||!1,m=Qr;o===`Root`||o===`root`?m=r:o?m=i:oi(e)&&(m=void 0);let h=un(e,{shouldForwardProp:m,label:void 0,...u}),g=e=>{if(e.__emotion_real===e)return e;if(typeof e==`function`)return function(t){return ni(t,e,t.theme.modularCssLayers?d:void 0)};if(gn(e)){let t=Xr(e);return function(e){return t.variants?ni(e,t,e.theme.modularCssLayers?d:void 0):e.theme.modularCssLayers?$r(t.style,d):t.style}}return e},_=(...t)=>{let r=[],i=t.map(g),o=[];if(r.push(a),n&&l&&o.push(function(e){let t=e.theme.components?.[n]?.styleOverrides;if(!t)return null;let r={};for(let n in t)r[n]=ni(e,t[n],e.theme.modularCssLayers?`theme`:void 0);return l(e,r)}),n&&!f&&o.push(function(e){let t=e.theme?.components?.[n]?.variants;return t?ri(e,t,[],e.theme.modularCssLayers?`theme`:void 0):null}),p||o.push(jr),Array.isArray(i[0])){let e=i.shift(),t=Array(r.length).fill(``),n=Array(o.length).fill(``),a;a=[...t,...e,...n],a.raw=[...t,...e.raw,...n],r.unshift(a)}let s=h(...r,...i,...o);return e.muiName&&(s.muiName=e.muiName),s};return h.withConfig&&(_.withConfig=h.withConfig),_}}function ai(e){for(let t in e)return!1;return!0}function oi(e){return typeof e==`string`&&e.charCodeAt(0)>96}function si(e){return e&&e.charAt(0).toLowerCase()+e.slice(1)}function ci(e,t,n=!1){let r={...t};for(let i in e)if(Object.prototype.hasOwnProperty.call(e,i)){let a=i;if(a===`components`||a===`slots`)r[a]={...e[a],...r[a]};else if(a===`componentsProps`||a===`slotProps`){let i=e[a],o=t[a];if(!o)r[a]=i||{};else if(!i)r[a]=o;else{r[a]={...o};for(let e in i)if(Object.prototype.hasOwnProperty.call(i,e)){let t=e;r[a][t]=ci(i[t],o[t],n)}}}else a===`className`&&n&&t.className?r.className=Gr(e?.className,t?.className):a===`style`&&n&&t.style?r.style={...e?.style,...t?.style}:r[a]===void 0&&(r[a]=e[a])}return r}var li=typeof window<`u`?M.useLayoutEffect:M.useEffect;function ui(e,t=-(2**53-1),n=2**53-1){return Math.max(t,Math.min(e,n))}function di(e,t=0,n=1){return ui(e,t,n)}function fi(e){e=e.slice(1);let t=RegExp(`.{1,${e.length>=6?2:1}}`,`g`),n=e.match(t);return n&&n[0].length===1&&(n=n.map(e=>e+e)),n?`rgb${n.length===4?`a`:``}(${n.map((e,t)=>t<3?parseInt(e,16):Math.round(parseInt(e,16)/255*1e3)/1e3).join(`, `)})`:``}function pi(e){if(e.type)return e;if(e.charAt(0)===`#`)return pi(fi(e));let t=e.indexOf(`(`),n=e.substring(0,t);if(![`rgb`,`rgba`,`hsl`,`hsla`,`color`].includes(n))throw Error(ee(9,e));let r=e.substring(t+1,e.length-1),i;if(n===`color`){if(r=r.split(` `),i=r.shift(),r.length===4&&r[3].charAt(0)===`/`&&(r[3]=r[3].slice(1)),![`srgb`,`display-p3`,`a98-rgb`,`prophoto-rgb`,`rec-2020`].includes(i))throw Error(ee(10,i))}else r=r.split(`,`);return r=r.map(e=>parseFloat(e)),{type:n,values:r,colorSpace:i}}var mi=e=>{let t=pi(e);return t.values.slice(0,3).map((e,n)=>t.type.includes(`hsl`)&&n!==0?`${e}%`:e).join(` `)},hi=(e,t)=>{try{return mi(e)}catch{return e}};function gi(e){let{type:t,colorSpace:n}=e,{values:r}=e;return t.includes(`rgb`)?r=r.map((e,t)=>t<3?parseInt(e,10):e):t.includes(`hsl`)&&(r[1]=`${r[1]}%`,r[2]=`${r[2]}%`),r=t.includes(`color`)?`${n} ${r.join(` `)}`:`${r.join(`, `)}`,`${t}(${r})`}function _i(e){e=pi(e);let{values:t}=e,n=t[0],r=t[1]/100,i=t[2]/100,a=r*Math.min(i,1-i),o=(e,t=(e+n/30)%12)=>i-a*Math.max(Math.min(t-3,9-t,1),-1),s=`rgb`,c=[Math.round(o(0)*255),Math.round(o(8)*255),Math.round(o(4)*255)];return e.type===`hsla`&&(s+=`a`,c.push(t[3])),gi({type:s,values:c})}function vi(e){e=pi(e);let t=e.type===`hsl`||e.type===`hsla`?pi(_i(e)).values:e.values;return t=t.map(t=>(e.type!==`color`&&(t/=255),t<=.03928?t/12.92:((t+.055)/1.055)**2.4)),Number((.2126*t[0]+.7152*t[1]+.0722*t[2]).toFixed(3))}function yi(e,t){let n=vi(e),r=vi(t);return(Math.max(n,r)+.05)/(Math.min(n,r)+.05)}function bi(e,t){return e=pi(e),t=di(t),(e.type===`rgb`||e.type===`hsl`)&&(e.type+=`a`),e.type===`color`?e.values[3]=`/${t}`:e.values[3]=t,gi(e)}function xi(e,t,n){try{return bi(e,t)}catch{return e}}function Si(e,t){if(e=pi(e),t=di(t),e.type.includes(`hsl`))e.values[2]*=1-t;else if(e.type.includes(`rgb`)||e.type.includes(`color`))for(let n=0;n<3;n+=1)e.values[n]*=1-t;return gi(e)}function F(e,t,n){try{return Si(e,t)}catch{return e}}function Ci(e,t){if(e=pi(e),t=di(t),e.type.includes(`hsl`))e.values[2]+=(100-e.values[2])*t;else if(e.type.includes(`rgb`))for(let n=0;n<3;n+=1)e.values[n]+=(255-e.values[n])*t;else if(e.type.includes(`color`))for(let n=0;n<3;n+=1)e.values[n]+=(1-e.values[n])*t;return gi(e)}function I(e,t,n){try{return Ci(e,t)}catch{return e}}function wi(e,t=.15){return vi(e)>.5?Si(e,t):Ci(e,t)}function Ti(e,t,n){try{return wi(e,t)}catch{return e}}var Ei=M.createContext(),Di=()=>M.useContext(Ei)??!1,Oi=M.createContext(void 0);function ki(e){let{theme:t,name:n,props:r}=e;if(!t||!t.components||!t.components[n])return r;let i=t.components[n];return i.defaultProps?ci(i.defaultProps,r,t.components.mergeClassNameAndStyle):!i.styleOverrides&&!i.variants?ci(i,r,t.components.mergeClassNameAndStyle):r}function Ai({props:e,name:t}){return ki({props:e,name:t,theme:{components:M.useContext(Oi)}})}var ji=0;function Mi(e){let[t,n]=M.useState(e),r=e||t;return M.useEffect(()=>{t??(ji+=1,n(`mui-${ji}`))},[t]),r}var Ni={...M}.useId;function Pi(e){if(Ni!==void 0){let t=Ni();return e??t}return Mi(e)}var Fi={theme:void 0};function L(e){let t,n;return function(r){let i=t;return(i===void 0||r.theme!==n)&&(Fi.theme=r.theme,i=Xr(e(Fi)),t=i,n=r.theme),i}}function R(e=``){function t(...n){if(!n.length)return``;let r=n[0];return typeof r==`string`&&!r.match(/(#|\(|\)|(-?(\d*\.)?\d+)(px|em|%|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc))|^(-?(\d*\.)?\d+)$|(\d+ \d+ \d+)/)?`, var(--${e?`${e}-`:``}${r}${t(...n.slice(1))})`:`, ${r}`}return(n,...r)=>`var(--${e?`${e}-`:``}${n}${t(...r)})`}var Ii=(e,t,n,r=[])=>{let i=e;t.forEach((e,a)=>{a===t.length-1?Array.isArray(i)?i[Number(e)]=n:i&&typeof i==`object`&&(i[e]=n):i&&typeof i==`object`&&(i[e]||(i[e]=r.includes(e)?[]:{}),i=i[e])})},Li=(e,t,n)=>{function r(e,i=[],a=[]){Object.entries(e).forEach(([e,o])=>{(!n||n&&!n([...i,e]))&&o!=null&&(typeof o==`object`&&Object.keys(o).length>0?r(o,[...i,e],Array.isArray(o)?[...a,e]:a):t([...i,e],o,a))})}r(e)},Ri=(e,t)=>typeof t==`number`?[`lineHeight`,`fontWeight`,`opacity`,`zIndex`].some(t=>e.includes(t))||e[e.length-1].toLowerCase().includes(`opacity`)?t:`${t}px`:t;function zi(e,t){let{prefix:n,shouldSkipGeneratingVar:r}=t||{},i={},a={},o={};return Li(e,(e,t,s)=>{if((typeof t==`string`||typeof t==`number`)&&(!r||!r(e,t))){let r=`--${n?`${n}-`:``}${e.join(`-`)}`,c=Ri(e,t);Object.assign(i,{[r]:c}),Ii(a,e,`var(${r})`,s),Ii(o,e,`var(${r}, ${c})`,s)}},e=>e[0]===`vars`),{css:i,vars:a,varsWithDefaults:o}}function Bi(e,t={}){let{getSelector:n=_,disableCssColorScheme:r,colorSchemeSelector:i,enableContrastVars:a}=t,{colorSchemes:o={},components:s,defaultColorScheme:c=`light`,...l}=e,{vars:u,css:d,varsWithDefaults:f}=zi(l,t),p=f,m={},{[c]:h,...g}=o;if(Object.entries(g||{}).forEach(([e,n])=>{let{vars:r,css:i,varsWithDefaults:a}=zi(n,t);p=vn(p,a),m[e]={css:i,vars:r}}),h){let{css:e,vars:n,varsWithDefaults:r}=zi(h,t);p=vn(p,r),m[c]={css:e,vars:n}}function _(t,n){let r=i;if(i===`class`&&(r=`.%s`),i===`data`&&(r=`[data-%s]`),i?.startsWith(`data-`)&&!i.includes(`%s`)&&(r=`[${i}="%s"]`),t){if(r===`media`)return e.defaultColorScheme===t?`:root`:{[`@media (prefers-color-scheme: ${o[t]?.palette?.mode||t})`]:{":root":n}};if(r)return e.defaultColorScheme===t?`:root, ${r.replace(`%s`,String(t))}`:r.replace(`%s`,String(t))}return`:root`}return{vars:p,generateThemeVars:()=>{let e={...u};return Object.entries(m).forEach(([,{vars:t}])=>{e=vn(e,t)}),e},generateStyleSheets:()=>{let t=[],i=e.defaultColorScheme||`light`;function s(e,n){Object.keys(n).length&&t.push(typeof e==`string`?{[e]:{...n}}:e)}s(n(void 0,{...d}),d);let{[i]:c,...l}=m;if(c){let{css:e}=c,t=o[i]?.palette?.mode,a=!r&&t?{colorScheme:t,...e}:{...e};s(n(i,{...a}),a)}return Object.entries(l).forEach(([e,{css:t}])=>{let i=o[e]?.palette?.mode,a=!r&&i?{colorScheme:i,...t}:{...t};s(n(e,{...a}),a)}),a&&t.push({":root":{"--__l-threshold":`0.7`,"--__l":`clamp(0, (l / var(--__l-threshold) - 1) * -infinity, 1)`,"--__a":`clamp(0.87, (l / var(--__l-threshold) - 1) * -infinity, 1)`}}),t}}}function Vi(e){return function(t){return e===`media`?`@media (prefers-color-scheme: ${t})`:e?e.startsWith(`data-`)&&!e.includes(`%s`)?`[${e}="${t}"] &`:e===`class`?`.${t} &`:e===`data`?`[data-${t}] &`:`${e.replace(`%s`,t)} &`:`&`}}function Hi(e,t,n=void 0){let r={};for(let i in e){let a=e[i],o=``,s=!0;for(let e=0;e=n?Ki.text.primary:Wi.text.primary}let p=({color:e,name:t,mainShade:n=500,lightShade:a=300,darkShade:o=700})=>{if(e={...e},!e.main&&e[n]&&(e.main=e[n]),!e.hasOwnProperty(`main`))throw Error(ee(11,t?` (${t})`:``,n));if(typeof e.main!=`string`)throw Error(ee(12,t?` (${t})`:``,JSON.stringify(e.main)));return i?(Ji(i,e,`light`,a,r),Ji(i,e,`dark`,o,r)):(qi(e,`light`,a,r),qi(e,`dark`,o,r)),e.contrastText||=f(e.main),e},m;return t===`light`?m=Ui():t===`dark`&&(m=Gi()),vn({common:{..._},mode:t,primary:p({color:o,name:`primary`}),secondary:p({color:s,name:`secondary`,mainShade:`A400`,lightShade:`A200`,darkShade:`A700`}),error:p({color:c,name:`error`}),warning:p({color:d,name:`warning`}),info:p({color:l,name:`info`}),success:p({color:u,name:`success`}),grey:w,contrastThreshold:n,getContrastText:f,augmentColor:p,tonalOffset:r,...m},a)}function ra(e){let t={};return Object.entries(e).forEach(e=>{let[n,r]=e;typeof r==`object`&&(t[n]=`${r.fontStyle?`${r.fontStyle} `:``}${r.fontVariant?`${r.fontVariant} `:``}${r.fontWeight?`${r.fontWeight} `:``}${r.fontStretch?`${r.fontStretch} `:``}${r.fontSize||``}${r.lineHeight?`/${r.lineHeight} `:``}${r.fontFamily||``}`)}),t}function ia(e,t){return{toolbar:{minHeight:56,[e.up(`xs`)]:{"@media (orientation: landscape)":{minHeight:48}},[e.up(`sm`)]:{minHeight:64}},...t}}function aa(e){return Math.round(e*1e5)/1e5}var oa={textTransform:`uppercase`},sa=`"Roboto", "Helvetica", "Arial", sans-serif`;function ca(e,t){let{fontFamily:n=sa,fontSize:r=14,fontWeightLight:i=300,fontWeightRegular:a=400,fontWeightMedium:o=500,fontWeightBold:s=700,htmlFontSize:c=16,allVariants:l,pxToRem:u,...d}=typeof t==`function`?t(e):t,f=r/14,p=u||(e=>`${e/c*f}rem`),m=(e,t,r,i,a)=>({fontFamily:n,fontWeight:e,fontSize:p(t),lineHeight:r,...n===sa?{letterSpacing:`${aa(i/t)}em`}:{},...a,...l});return vn({htmlFontSize:c,pxToRem:p,fontFamily:n,fontSize:r,fontWeightLight:i,fontWeightRegular:a,fontWeightMedium:o,fontWeightBold:s,h1:m(i,96,1.167,-1.5),h2:m(i,60,1.2,-.5),h3:m(a,48,1.167,0),h4:m(a,34,1.235,.25),h5:m(a,24,1.334,0),h6:m(o,20,1.6,.15),subtitle1:m(a,16,1.75,.15),subtitle2:m(o,14,1.57,.1),body1:m(a,16,1.5,.15),body2:m(a,14,1.43,.15),button:m(o,14,1.75,.4,oa),caption:m(a,12,1.66,.4),overline:m(a,12,2.66,1,oa),inherit:{fontFamily:`inherit`,fontWeight:`inherit`,fontSize:`inherit`,lineHeight:`inherit`,letterSpacing:`inherit`}},d,{clone:!1})}var la=.2,ua=.14,da=.12;function z(...e){return[`${e[0]}px ${e[1]}px ${e[2]}px ${e[3]}px rgba(0,0,0,${la})`,`${e[4]}px ${e[5]}px ${e[6]}px ${e[7]}px rgba(0,0,0,${ua})`,`${e[8]}px ${e[9]}px ${e[10]}px ${e[11]}px rgba(0,0,0,${da})`].join(`,`)}var fa=[`none`,z(0,2,1,-1,0,1,1,0,0,1,3,0),z(0,3,1,-2,0,2,2,0,0,1,5,0),z(0,3,3,-2,0,3,4,0,0,1,8,0),z(0,2,4,-1,0,4,5,0,0,1,10,0),z(0,3,5,-1,0,5,8,0,0,1,14,0),z(0,3,5,-1,0,6,10,0,0,1,18,0),z(0,4,5,-2,0,7,10,1,0,2,16,1),z(0,5,5,-3,0,8,10,1,0,3,14,2),z(0,5,6,-3,0,9,12,1,0,3,16,2),z(0,6,6,-3,0,10,14,1,0,4,18,3),z(0,6,7,-4,0,11,15,1,0,4,20,3),z(0,7,8,-4,0,12,17,2,0,5,22,4),z(0,7,8,-4,0,13,19,2,0,5,24,4),z(0,7,9,-4,0,14,21,2,0,5,26,4),z(0,8,9,-5,0,15,22,2,0,6,28,5),z(0,8,10,-5,0,16,24,2,0,6,30,5),z(0,8,11,-5,0,17,26,2,0,6,32,5),z(0,9,11,-5,0,18,28,2,0,7,34,6),z(0,9,12,-6,0,19,29,2,0,7,36,6),z(0,10,13,-6,0,20,31,3,0,8,38,7),z(0,10,13,-6,0,21,33,3,0,8,40,7),z(0,10,14,-6,0,22,35,3,0,8,42,7),z(0,11,14,-7,0,23,36,3,0,9,44,8),z(0,11,15,-7,0,24,38,3,0,9,46,8)],pa={easeInOut:`cubic-bezier(0.4, 0, 0.2, 1)`,easeOut:`cubic-bezier(0.0, 0, 0.2, 1)`,easeIn:`cubic-bezier(0.4, 0, 1, 1)`,sharp:`cubic-bezier(0.4, 0, 0.6, 1)`},ma={shortest:150,shorter:200,short:250,standard:300,complex:375,enteringScreen:225,leavingScreen:195};function ha(e){return`${Math.round(e)}ms`}function ga(e){if(!e)return 0;let t=e/36;return Math.min(Math.round((4+15*t**.25+t/5)*10),3e3)}function _a(e){let t={...pa,...e.easing},n={...ma,...e.duration};return{getAutoHeightDuration:ga,create:(e=[`all`],r={})=>{let{duration:i=n.standard,easing:a=t.easeInOut,delay:o=0,...s}=r;return(Array.isArray(e)?e:[e]).map(e=>`${e} ${typeof i==`string`?i:ha(i)} ${a} ${typeof o==`string`?o:ha(o)}`).join(`,`)},...e,easing:t,duration:n}}var va={mobileStepper:1e3,fab:1050,speedDial:1050,appBar:1100,drawer:1200,modal:1300,snackbar:1400,tooltip:1500};function ya(e){return gn(e)||e===void 0||typeof e==`string`||typeof e==`boolean`||typeof e==`number`||Array.isArray(e)}function ba(e={}){let t={...e};function n(e){let t=Object.entries(e);for(let r=0;r{if(!Number.isNaN(+e))return+e;let t=e.match(/\d*\.?\d+/g);if(!t)return 0;let n=0;for(let e=0;evn(e,t),p),p.unstable_sxConfig={...Dr,...u?.unstable_sxConfig},p.unstable_sx=function(e){return jr({sx:e,theme:this})},p.toRuntimeSource=ba,Ca(p),p}function Ta(e){let t;return t=e<1?5.11916*e**2:4.5*Math.log(e+1)+2,Math.round(t*10)/1e3}var Ea=[...Array(25)].map((e,t)=>{if(t===0)return`none`;let n=Ta(t);return`linear-gradient(rgba(255 255 255 / ${n}), rgba(255 255 255 / ${n}))`});function Da(e){return{inputPlaceholder:e===`dark`?.5:.42,inputUnderline:e===`dark`?.7:.42,switchTrackDisabled:e===`dark`?.2:.12,switchTrack:e===`dark`?.3:.38}}function Oa(e){return e===`dark`?Ea:[]}function ka(e){let{palette:t={mode:`light`},opacity:n,overlays:r,colorSpace:i,...a}=e,o=na({...t,colorSpace:i});return{palette:o,opacity:{...Da(o.mode),...n},overlays:r||Oa(o.mode),...a}}function Aa(e){return!!e[0].match(/(cssVarPrefix|colorSchemeSelector|modularCssLayers|rootSelector|typography|mixins|breakpoints|direction|transitions)/)||!!e[0].match(/sxConfig$/)||e[0]===`palette`&&!!e[1]?.match(/(mode|contrastThreshold|tonalOffset)/)}var ja=e=>[...[...Array(25)].map((t,n)=>`--${e?`${e}-`:``}overlays-${n}`),`--${e?`${e}-`:``}palette-AppBar-darkBg`,`--${e?`${e}-`:``}palette-AppBar-darkColor`],Ma=e=>(t,n)=>{let r=e.rootSelector||`:root`,i=e.colorSchemeSelector,a=i;if(i===`class`&&(a=`.%s`),i===`data`&&(a=`[data-%s]`),i?.startsWith(`data-`)&&!i.includes(`%s`)&&(a=`[${i}="%s"]`),e.defaultColorScheme===t){if(t===`dark`){let i={};return ja(e.cssVarPrefix).forEach(e=>{i[e]=n[e],delete n[e]}),a===`media`?{[r]:n,"@media (prefers-color-scheme: dark)":{[r]:i}}:a?{[a.replace(`%s`,t)]:i,[`${r}, ${a.replace(`%s`,t)}`]:n}:{[r]:{...n,...i}}}if(a&&a!==`media`)return`${r}, ${a.replace(`%s`,String(t))}`}else if(t){if(a===`media`)return{[`@media (prefers-color-scheme: ${String(t)})`]:{[r]:n}};if(a)return a.replace(`%s`,String(t))}return r};function Na(e,t){t.forEach(t=>{e[t]||(e[t]={})})}function B(e,t,n){!e[t]&&n&&(e[t]=n)}function Pa(e){return typeof e!=`string`||!e.startsWith(`hsl`)?e:_i(e)}function Fa(e,t){`${t}Channel`in e||(e[`${t}Channel`]=hi(Pa(e[t]),`MUI: Can't create \`palette.${t}Channel\` because \`palette.${t}\` is not one of these formats: #nnn, #nnnnnn, rgb(), rgba(), hsl(), hsla(), color(). -To suppress this warning, you need to explicitly provide the \`palette.${t}Channel\` as a string (in rgb format, for example "12 12 12") or undefined if you want to remove the channel token.`))}function Ia(e){return typeof e==`number`?`${e}px`:typeof e==`string`||typeof e==`function`||Array.isArray(e)?e:`8px`}var La=e=>{try{return e()}catch{}},Ra=(e=`mui`)=>R(e);function za(e,t,n,r,i){if(!n)return;n=n===!0?{}:n;let a=i===`dark`?`dark`:`light`;if(!r){t[i]=ka({...n,palette:{mode:a,...n?.palette},colorSpace:e});return}let{palette:o,...s}=wa({...r,palette:{mode:a,...n?.palette},colorSpace:e});return t[i]={...n,palette:o,opacity:{...Da(a),...n?.opacity},overlays:n?.overlays||Oa(a)},s}function Ba(e={},...t){let{colorSchemes:n={light:!0},defaultColorScheme:r,disableCssColorScheme:i=!1,cssVarPrefix:a=`mui`,nativeColor:o=!1,shouldSkipGeneratingVar:s=Aa,colorSchemeSelector:c=n.light&&n.dark?`media`:void 0,rootSelector:l=`:root`,...u}=e,d=Object.keys(n)[0],f=r||(n.light&&d!==`light`?`light`:d),p=Ra(a),{[f]:m,light:h,dark:g,..._}=n,v={..._},y=m;if((f===`dark`&&!(`dark`in n)||f===`light`&&!(`light`in n))&&(y=!0),!y)throw Error(ee(21,f));let b;o&&(b=`oklch`);let x=za(b,v,y,u,f);h&&!v.light&&za(b,v,h,void 0,`light`),g&&!v.dark&&za(b,v,g,void 0,`dark`);let S={defaultColorScheme:f,...x,cssVarPrefix:a,colorSchemeSelector:c,rootSelector:l,getCssVar:p,colorSchemes:v,font:{...ra(x.typography),...x.font},spacing:Ia(u.spacing)};Object.keys(S.colorSchemes).forEach(e=>{let t=S.colorSchemes[e].palette,n=e=>{let n=e.split(`-`),r=n[1],i=n[2];return p(e,t[r][i])};t.mode===`light`&&(B(t.common,`background`,`#fff`),B(t.common,`onBackground`,`#000`)),t.mode===`dark`&&(B(t.common,`background`,`#000`),B(t.common,`onBackground`,`#fff`));function r(e,t,n){if(b){let r;return e===xi&&(r=`transparent ${((1-n)*100).toFixed(0)}%`),e===F&&(r=`#000 ${(n*100).toFixed(0)}%`),e===I&&(r=`#fff ${(n*100).toFixed(0)}%`),`color-mix(in ${b}, ${t}, ${r})`}return e(t,n)}if(Na(t,[`Alert`,`AppBar`,`Avatar`,`Button`,`Chip`,`FilledInput`,`LinearProgress`,`Skeleton`,`Slider`,`SnackbarContent`,`SpeedDialAction`,`StepConnector`,`StepContent`,`Switch`,`TableCell`,`Tooltip`]),t.mode===`light`){B(t.Alert,`errorColor`,r(F,t.error.light,.6)),B(t.Alert,`infoColor`,r(F,t.info.light,.6)),B(t.Alert,`successColor`,r(F,t.success.light,.6)),B(t.Alert,`warningColor`,r(F,t.warning.light,.6)),B(t.Alert,`errorFilledBg`,n(`palette-error-main`)),B(t.Alert,`infoFilledBg`,n(`palette-info-main`)),B(t.Alert,`successFilledBg`,n(`palette-success-main`)),B(t.Alert,`warningFilledBg`,n(`palette-warning-main`)),B(t.Alert,`errorFilledColor`,La(()=>t.getContrastText(t.error.main))),B(t.Alert,`infoFilledColor`,La(()=>t.getContrastText(t.info.main))),B(t.Alert,`successFilledColor`,La(()=>t.getContrastText(t.success.main))),B(t.Alert,`warningFilledColor`,La(()=>t.getContrastText(t.warning.main))),B(t.Alert,`errorStandardBg`,r(I,t.error.light,.9)),B(t.Alert,`infoStandardBg`,r(I,t.info.light,.9)),B(t.Alert,`successStandardBg`,r(I,t.success.light,.9)),B(t.Alert,`warningStandardBg`,r(I,t.warning.light,.9)),B(t.Alert,`errorIconColor`,n(`palette-error-main`)),B(t.Alert,`infoIconColor`,n(`palette-info-main`)),B(t.Alert,`successIconColor`,n(`palette-success-main`)),B(t.Alert,`warningIconColor`,n(`palette-warning-main`)),B(t.AppBar,`defaultBg`,n(`palette-grey-100`)),B(t.Avatar,`defaultBg`,n(`palette-grey-400`)),B(t.Button,`inheritContainedBg`,n(`palette-grey-300`)),B(t.Button,`inheritContainedHoverBg`,n(`palette-grey-A100`)),B(t.Chip,`defaultBorder`,n(`palette-grey-400`)),B(t.Chip,`defaultAvatarColor`,n(`palette-grey-700`)),B(t.Chip,`defaultIconColor`,n(`palette-grey-700`)),B(t.FilledInput,`bg`,`rgba(0, 0, 0, 0.06)`),B(t.FilledInput,`hoverBg`,`rgba(0, 0, 0, 0.09)`),B(t.FilledInput,`disabledBg`,`rgba(0, 0, 0, 0.12)`),B(t.LinearProgress,`primaryBg`,r(I,t.primary.main,.62)),B(t.LinearProgress,`secondaryBg`,r(I,t.secondary.main,.62)),B(t.LinearProgress,`errorBg`,r(I,t.error.main,.62)),B(t.LinearProgress,`infoBg`,r(I,t.info.main,.62)),B(t.LinearProgress,`successBg`,r(I,t.success.main,.62)),B(t.LinearProgress,`warningBg`,r(I,t.warning.main,.62)),B(t.Skeleton,`bg`,b?r(xi,t.text.primary,.11):`rgba(${n(`palette-text-primaryChannel`)} / 0.11)`),B(t.Slider,`primaryTrack`,r(I,t.primary.main,.62)),B(t.Slider,`secondaryTrack`,r(I,t.secondary.main,.62)),B(t.Slider,`errorTrack`,r(I,t.error.main,.62)),B(t.Slider,`infoTrack`,r(I,t.info.main,.62)),B(t.Slider,`successTrack`,r(I,t.success.main,.62)),B(t.Slider,`warningTrack`,r(I,t.warning.main,.62));let e=b?r(F,t.background.default,.6825):Ti(t.background.default,.8);B(t.SnackbarContent,`bg`,e),B(t.SnackbarContent,`color`,La(()=>b?Ki.text.primary:t.getContrastText(e))),B(t.SpeedDialAction,`fabHoverBg`,Ti(t.background.paper,.15)),B(t.StepConnector,`border`,n(`palette-grey-400`)),B(t.StepContent,`border`,n(`palette-grey-400`)),B(t.Switch,`defaultColor`,n(`palette-common-white`)),B(t.Switch,`defaultDisabledColor`,n(`palette-grey-100`)),B(t.Switch,`primaryDisabledColor`,r(I,t.primary.main,.62)),B(t.Switch,`secondaryDisabledColor`,r(I,t.secondary.main,.62)),B(t.Switch,`errorDisabledColor`,r(I,t.error.main,.62)),B(t.Switch,`infoDisabledColor`,r(I,t.info.main,.62)),B(t.Switch,`successDisabledColor`,r(I,t.success.main,.62)),B(t.Switch,`warningDisabledColor`,r(I,t.warning.main,.62)),B(t.TableCell,`border`,r(I,r(xi,t.divider,1),.88)),B(t.Tooltip,`bg`,r(xi,t.grey[700],.92))}if(t.mode===`dark`){B(t.Alert,`errorColor`,r(I,t.error.light,.6)),B(t.Alert,`infoColor`,r(I,t.info.light,.6)),B(t.Alert,`successColor`,r(I,t.success.light,.6)),B(t.Alert,`warningColor`,r(I,t.warning.light,.6)),B(t.Alert,`errorFilledBg`,n(`palette-error-dark`)),B(t.Alert,`infoFilledBg`,n(`palette-info-dark`)),B(t.Alert,`successFilledBg`,n(`palette-success-dark`)),B(t.Alert,`warningFilledBg`,n(`palette-warning-dark`)),B(t.Alert,`errorFilledColor`,La(()=>t.getContrastText(t.error.dark))),B(t.Alert,`infoFilledColor`,La(()=>t.getContrastText(t.info.dark))),B(t.Alert,`successFilledColor`,La(()=>t.getContrastText(t.success.dark))),B(t.Alert,`warningFilledColor`,La(()=>t.getContrastText(t.warning.dark))),B(t.Alert,`errorStandardBg`,r(F,t.error.light,.9)),B(t.Alert,`infoStandardBg`,r(F,t.info.light,.9)),B(t.Alert,`successStandardBg`,r(F,t.success.light,.9)),B(t.Alert,`warningStandardBg`,r(F,t.warning.light,.9)),B(t.Alert,`errorIconColor`,n(`palette-error-main`)),B(t.Alert,`infoIconColor`,n(`palette-info-main`)),B(t.Alert,`successIconColor`,n(`palette-success-main`)),B(t.Alert,`warningIconColor`,n(`palette-warning-main`)),B(t.AppBar,`defaultBg`,n(`palette-grey-900`)),B(t.AppBar,`darkBg`,n(`palette-background-paper`)),B(t.AppBar,`darkColor`,n(`palette-text-primary`)),B(t.Avatar,`defaultBg`,n(`palette-grey-600`)),B(t.Button,`inheritContainedBg`,n(`palette-grey-800`)),B(t.Button,`inheritContainedHoverBg`,n(`palette-grey-700`)),B(t.Chip,`defaultBorder`,n(`palette-grey-700`)),B(t.Chip,`defaultAvatarColor`,n(`palette-grey-300`)),B(t.Chip,`defaultIconColor`,n(`palette-grey-300`)),B(t.FilledInput,`bg`,`rgba(255, 255, 255, 0.09)`),B(t.FilledInput,`hoverBg`,`rgba(255, 255, 255, 0.13)`),B(t.FilledInput,`disabledBg`,`rgba(255, 255, 255, 0.12)`),B(t.LinearProgress,`primaryBg`,r(F,t.primary.main,.5)),B(t.LinearProgress,`secondaryBg`,r(F,t.secondary.main,.5)),B(t.LinearProgress,`errorBg`,r(F,t.error.main,.5)),B(t.LinearProgress,`infoBg`,r(F,t.info.main,.5)),B(t.LinearProgress,`successBg`,r(F,t.success.main,.5)),B(t.LinearProgress,`warningBg`,r(F,t.warning.main,.5)),B(t.Skeleton,`bg`,b?r(xi,t.text.primary,.13):`rgba(${n(`palette-text-primaryChannel`)} / 0.13)`),B(t.Slider,`primaryTrack`,r(F,t.primary.main,.5)),B(t.Slider,`secondaryTrack`,r(F,t.secondary.main,.5)),B(t.Slider,`errorTrack`,r(F,t.error.main,.5)),B(t.Slider,`infoTrack`,r(F,t.info.main,.5)),B(t.Slider,`successTrack`,r(F,t.success.main,.5)),B(t.Slider,`warningTrack`,r(F,t.warning.main,.5));let e=b?r(I,t.background.default,.985):Ti(t.background.default,.98);B(t.SnackbarContent,`bg`,e),B(t.SnackbarContent,`color`,La(()=>b?Wi.text.primary:t.getContrastText(e))),B(t.SpeedDialAction,`fabHoverBg`,Ti(t.background.paper,.15)),B(t.StepConnector,`border`,n(`palette-grey-600`)),B(t.StepContent,`border`,n(`palette-grey-600`)),B(t.Switch,`defaultColor`,n(`palette-grey-300`)),B(t.Switch,`defaultDisabledColor`,n(`palette-grey-600`)),B(t.Switch,`primaryDisabledColor`,r(F,t.primary.main,.55)),B(t.Switch,`secondaryDisabledColor`,r(F,t.secondary.main,.55)),B(t.Switch,`errorDisabledColor`,r(F,t.error.main,.55)),B(t.Switch,`infoDisabledColor`,r(F,t.info.main,.55)),B(t.Switch,`successDisabledColor`,r(F,t.success.main,.55)),B(t.Switch,`warningDisabledColor`,r(F,t.warning.main,.55)),B(t.TableCell,`border`,r(F,r(xi,t.divider,1),.68)),B(t.Tooltip,`bg`,r(xi,t.grey[700],.92))}Fa(t.background,`default`),Fa(t.background,`paper`),Fa(t.common,`background`),Fa(t.common,`onBackground`),Fa(t,`divider`),Object.keys(t).forEach(e=>{let n=t[e];e!==`tonalOffset`&&n&&typeof n==`object`&&(n.main&&B(t[e],`mainChannel`,hi(Pa(n.main))),n.light&&B(t[e],`lightChannel`,hi(Pa(n.light))),n.dark&&B(t[e],`darkChannel`,hi(Pa(n.dark))),n.contrastText&&B(t[e],`contrastTextChannel`,hi(Pa(n.contrastText))),e===`text`&&(Fa(t[e],`primary`),Fa(t[e],`secondary`)),e===`action`&&(n.active&&Fa(t[e],`active`),n.selected&&Fa(t[e],`selected`)))})}),S=t.reduce((e,t)=>vn(e,t),S);let C={prefix:a,disableCssColorScheme:i,shouldSkipGeneratingVar:s,getSelector:Ma(S),enableContrastVars:o},{vars:w,generateThemeVars:te,generateStyleSheets:ne}=Bi(S,C);return S.vars=w,Object.entries(S.colorSchemes[S.defaultColorScheme]).forEach(([e,t])=>{S[e]=t}),S.generateThemeVars=te,S.generateStyleSheets=ne,S.generateSpacing=function(){return $n(u.spacing,Kn(this))},S.getColorSchemeSelector=Vi(c),S.spacing=S.generateSpacing(),S.shouldSkipGeneratingVar=s,S.unstable_sxConfig={...Dr,...u?.unstable_sxConfig},S.unstable_sx=function(e){return jr({sx:e,theme:this})},S.toRuntimeSource=ba,S}function Va(e,t,n){e.colorSchemes&&n&&(e.colorSchemes[t]={...n!==!0&&n,palette:na({...n===!0?{}:n.palette,mode:t})})}function Ha(e={},...t){let{palette:n,cssVariables:r=!1,colorSchemes:i=n?void 0:{light:!0},defaultColorScheme:a=n?.mode,...o}=e,s=a||`light`,c=i?.[s],l={...i,...n?{[s]:{...typeof c!=`boolean`&&c,palette:n}}:void 0};if(r===!1){if(!(`colorSchemes`in e))return wa(e,...t);let r=n;`palette`in e||l[s]&&(l[s]===!0?s===`dark`&&(r={mode:`dark`}):r=l[s].palette);let i=wa({...e,palette:r},...t);return i.defaultColorScheme=s,i.colorSchemes=l,i.palette.mode===`light`&&(i.colorSchemes.light={...l.light!==!0&&l.light,palette:i.palette},Va(i,`dark`,l.dark)),i.palette.mode===`dark`&&(i.colorSchemes.dark={...l.dark!==!0&&l.dark,palette:i.palette},Va(i,`light`,l.light)),i}return!n&&!(`light`in l)&&s===`light`&&(l.light=!0),Ba({...o,colorSchemes:l,defaultColorScheme:s,...typeof r!=`boolean`&&r},...t)}var Ua=Ha();function Wa(e){return e!==`ownerState`&&e!==`theme`&&e!==`sx`&&e!==`as`}var Ga=e=>Wa(e)&&e!==`classes`,Ka=ii({themeId:te,defaultTheme:Ua,rootShouldForwardProp:Ga}),V=Nn;function qa(e){return(0,N.jsx)(zr,{...e,defaultTheme:Ua,themeId:te})}function Ja(e){return function(t){return(0,N.jsx)(qa,{styles:typeof e==`function`?n=>e({theme:n,...t}):e})}}function Ya(){return Vr}var Xa=L;function Za(e){return Ai(e)}var Qa=Pi;function $a(e){let t=M.useRef(e);return li(()=>{t.current=e}),M.useRef((...e)=>(0,t.current)(...e)).current}var eo=$a;function to(...e){let t=M.useRef(void 0),n=M.useCallback(t=>{let n=e.map(e=>{if(e==null)return null;if(typeof e==`function`){let n=e,r=n(t);return typeof r==`function`?r:()=>{n(null)}}return e.current=t,()=>{e.current=null}});return()=>{n.forEach(e=>e?.())}},e);return M.useMemo(()=>e.every(e=>e==null)?null:e=>{t.current&&=(t.current(),void 0),e!=null&&(t.current=n(e))},e)}var no=to;function ro(e,t){if(e==null)return{};var n={};for(var r in e)if({}.hasOwnProperty.call(e,r)){if(t.indexOf(r)!==-1)continue;n[r]=e[r]}return n}function io(e,t){return io=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(e,t){return e.__proto__=t,e},io(e,t)}function ao(e,t){e.prototype=Object.create(t.prototype),e.prototype.constructor=e,io(e,t)}var oo=M.createContext(null);function so(e){if(e===void 0)throw ReferenceError(`this hasn't been initialised - super() hasn't been called`);return e}function co(e,t){var n=function(e){return t&&(0,M.isValidElement)(e)?t(e):e},r=Object.create(null);return e&&M.Children.map(e,function(e){return e}).forEach(function(e){r[e.key]=n(e)}),r}function lo(e,t){e||={},t||={};function n(n){return n in t?t[n]:e[n]}var r=Object.create(null),i=[];for(var a in e)a in t?i.length&&(r[a]=i,i=[]):i.push(a);var o,s={};for(var c in t){if(r[c])for(o=0;o{this.currentId=null,t()},e)}clear=()=>{this.currentId!==null&&(clearTimeout(this.currentId),this.currentId=null)};disposeEffect=()=>this.clear};function bo(){let e=go(yo.create).current;return vo(e.disposeEffect),e}function xo(e){try{return e.matches(`:focus-visible`)}catch{}return!1}var So=class e{static create(){return new e}static use(){let t=go(e.create).current,[n,r]=M.useState(!1);return t.shouldMount=n,t.setShouldMount=r,M.useEffect(t.mountEffect,[n]),t}constructor(){this.ref={current:null},this.mounted=null,this.didMount=!1,this.shouldMount=!1,this.setShouldMount=null}mount(){return this.mounted||(this.mounted=wo(),this.shouldMount=!0,this.setShouldMount(this.shouldMount)),this.mounted}mountEffect=()=>{this.shouldMount&&!this.didMount&&this.ref.current!==null&&(this.didMount=!0,this.mounted.resolve())};start(...e){this.mount().then(()=>this.ref.current?.start(...e))}stop(...e){this.mount().then(()=>this.ref.current?.stop(...e))}pulsate(...e){this.mount().then(()=>this.ref.current?.pulsate(...e))}};function Co(){return So.use()}function wo(){let e,t,n=new Promise((n,r)=>{e=n,t=r});return n.resolve=e,n.reject=t,n}function To(e){let{className:t,classes:n,pulsate:r=!1,rippleX:i,rippleY:a,rippleSize:o,in:s,onExited:c,timeout:l}=e,[u,d]=M.useState(!1),f=Gr(t,n.ripple,n.rippleVisible,r&&n.ripplePulsate),p={width:o,height:o,top:-(o/2)+a,left:-(o/2)+i},m=Gr(n.child,u&&n.childLeaving,r&&n.childPulsate);return!s&&!u&&d(!0),M.useEffect(()=>{if(!s&&c!=null){let e=setTimeout(c,l);return()=>{clearTimeout(e)}}},[c,s,l]),(0,N.jsx)(`span`,{className:f,style:p,children:(0,N.jsx)(`span`,{className:m})})}var Eo=Yr(`MuiTouchRipple`,[`root`,`ripple`,`rippleVisible`,`ripplePulsate`,`child`,`childLeaving`,`childPulsate`]),Do=550,Oo=Jt` - 0% { - transform: scale(0); - opacity: 0.1; - } - - 100% { - transform: scale(1); - opacity: 0.3; - } -`,ko=Jt` - 0% { - opacity: 1; - } - - 100% { - opacity: 0; - } -`,Ao=Jt` - 0% { - transform: scale(1); - } - - 50% { - transform: scale(0.92); - } - - 100% { - transform: scale(1); - } -`,jo=Ka(`span`,{name:`MuiTouchRipple`,slot:`Root`})({overflow:`hidden`,pointerEvents:`none`,position:`absolute`,zIndex:0,top:0,right:0,bottom:0,left:0,borderRadius:`inherit`}),Mo=Ka(To,{name:`MuiTouchRipple`,slot:`Ripple`})` - opacity: 0; - position: absolute; - - &.${Eo.rippleVisible} { - opacity: 0.3; - transform: scale(1); - animation-name: ${Oo}; - animation-duration: ${Do}ms; - animation-timing-function: ${({theme:e})=>e.transitions.easing.easeInOut}; - } - - &.${Eo.ripplePulsate} { - animation-duration: ${({theme:e})=>e.transitions.duration.shorter}ms; - } - - & .${Eo.child} { - opacity: 1; - display: block; - width: 100%; - height: 100%; - border-radius: 50%; - background-color: currentColor; - } - - & .${Eo.childLeaving} { - opacity: 0; - animation-name: ${ko}; - animation-duration: ${Do}ms; - animation-timing-function: ${({theme:e})=>e.transitions.easing.easeInOut}; - } - - & .${Eo.childPulsate} { - position: absolute; - /* @noflip */ - left: 0px; - top: 0; - animation-name: ${Ao}; - animation-duration: 2500ms; - animation-timing-function: ${({theme:e})=>e.transitions.easing.easeInOut}; - animation-iteration-count: infinite; - animation-delay: 200ms; - } -`,No=M.forwardRef(function(e,t){let{center:n=!1,classes:r={},className:i,...a}=Za({props:e,name:`MuiTouchRipple`}),[o,s]=M.useState([]),c=M.useRef(0),l=M.useRef(null);M.useEffect(()=>{l.current&&=(l.current(),null)},[o]);let u=M.useRef(!1),d=bo(),f=M.useRef(null),p=M.useRef(null),m=M.useCallback(e=>{let{pulsate:t,rippleX:n,rippleY:i,rippleSize:a,cb:o}=e;s(e=>[...e,(0,N.jsx)(Mo,{classes:{ripple:Gr(r.ripple,Eo.ripple),rippleVisible:Gr(r.rippleVisible,Eo.rippleVisible),ripplePulsate:Gr(r.ripplePulsate,Eo.ripplePulsate),child:Gr(r.child,Eo.child),childLeaving:Gr(r.childLeaving,Eo.childLeaving),childPulsate:Gr(r.childPulsate,Eo.childPulsate)},timeout:Do,pulsate:t,rippleX:n,rippleY:i,rippleSize:a},c.current)]),c.current+=1,l.current=o},[r]),h=M.useCallback((e={},t={},r=()=>{})=>{let{pulsate:i=!1,center:a=n||t.pulsate,fakeElement:o=!1}=t;if(e?.type===`mousedown`&&u.current){u.current=!1;return}e?.type===`touchstart`&&(u.current=!0);let s=o?null:p.current,c=s?s.getBoundingClientRect():{width:0,height:0,left:0,top:0},l,h,g;if(a||e===void 0||e.clientX===0&&e.clientY===0||!e.clientX&&!e.touches)l=Math.round(c.width/2),h=Math.round(c.height/2);else{let{clientX:t,clientY:n}=e.touches&&e.touches.length>0?e.touches[0]:e;l=Math.round(t-c.left),h=Math.round(n-c.top)}if(a)g=Math.sqrt((2*c.width**2+c.height**2)/3),g%2==0&&(g+=1);else{let e=Math.max(Math.abs((s?s.clientWidth:0)-l),l)*2+2,t=Math.max(Math.abs((s?s.clientHeight:0)-h),h)*2+2;g=Math.sqrt(e**2+t**2)}e?.touches?f.current===null&&(f.current=()=>{m({pulsate:i,rippleX:l,rippleY:h,rippleSize:g,cb:r})},d.start(80,()=>{f.current&&=(f.current(),null)})):m({pulsate:i,rippleX:l,rippleY:h,rippleSize:g,cb:r})},[n,m,d]),g=M.useCallback(()=>{h({},{pulsate:!0})},[h]),_=M.useCallback((e,t)=>{if(d.clear(),e?.type===`touchend`&&f.current){f.current(),f.current=null,d.start(0,()=>{_(e,t)});return}f.current=null,s(e=>e.length>0?e.slice(1):e),l.current=t},[d]);return M.useImperativeHandle(t,()=>({pulsate:g,start:h,stop:_}),[g,h,_]),(0,N.jsx)(jo,{className:Gr(Eo.root,r.root,i),ref:p,...a,children:(0,N.jsx)(mo,{component:null,exit:!0,children:o})})});function Po(e){return Jr(`MuiButtonBase`,e)}var Fo=Yr(`MuiButtonBase`,[`root`,`disabled`,`focusVisible`]),Io=e=>{let{disabled:t,focusVisible:n,focusVisibleClassName:r,classes:i}=e,a=Hi({root:[`root`,t&&`disabled`,n&&`focusVisible`]},Po,i);return n&&r&&(a.root+=` ${r}`),a},Lo=Ka(`button`,{name:`MuiButtonBase`,slot:`Root`})({display:`inline-flex`,alignItems:`center`,justifyContent:`center`,position:`relative`,boxSizing:`border-box`,WebkitTapHighlightColor:`transparent`,backgroundColor:`transparent`,outline:0,border:0,margin:0,borderRadius:0,padding:0,cursor:`pointer`,userSelect:`none`,verticalAlign:`middle`,MozAppearance:`none`,WebkitAppearance:`none`,textDecoration:`none`,color:`inherit`,"&::-moz-focus-inner":{borderStyle:`none`},[`&.${Fo.disabled}`]:{pointerEvents:`none`,cursor:`default`},"@media print":{colorAdjust:`exact`}}),Ro=M.forwardRef(function(e,t){let n=Za({props:e,name:`MuiButtonBase`}),{action:r,centerRipple:i=!1,children:a,className:o,component:s=`button`,disabled:c=!1,disableRipple:l=!1,disableTouchRipple:u=!1,focusRipple:d=!1,focusVisibleClassName:f,LinkComponent:p=`a`,onBlur:m,onClick:h,onContextMenu:g,onDragLeave:_,onFocus:v,onFocusVisible:y,onKeyDown:b,onKeyUp:x,onMouseDown:S,onMouseLeave:C,onMouseUp:w,onTouchEnd:ee,onTouchMove:te,onTouchStart:ne,tabIndex:re=0,TouchRippleProps:ie,touchRippleRef:ae,type:oe,...T}=n,se=M.useRef(null),E=Co(),ce=no(E.ref,ae),[D,O]=M.useState(!1);c&&D&&O(!1),M.useImperativeHandle(r,()=>({focusVisible:()=>{O(!0),se.current.focus()}}),[]);let le=E.shouldMount&&!l&&!c;M.useEffect(()=>{D&&d&&!l&&E.pulsate()},[l,d,D,E]);let ue=zo(E,`start`,S,u),de=zo(E,`stop`,g,u),fe=zo(E,`stop`,_,u),pe=zo(E,`stop`,w,u),k=zo(E,`stop`,e=>{D&&e.preventDefault(),C&&C(e)},u),me=zo(E,`start`,ne,u),he=zo(E,`stop`,ee,u),ge=zo(E,`stop`,te,u),A=zo(E,`stop`,e=>{xo(e.target)||O(!1),m&&m(e)},!1),_e=eo(e=>{se.current||=e.currentTarget,xo(e.target)&&(O(!0),y&&y(e)),v&&v(e)}),j=()=>{let e=se.current;return s&&s!==`button`&&!(e.tagName===`A`&&e.href)},ve=eo(e=>{d&&!e.repeat&&D&&e.key===` `&&E.stop(e,()=>{E.start(e)}),e.target===e.currentTarget&&j()&&e.key===` `&&e.preventDefault(),b&&b(e),e.target===e.currentTarget&&j()&&e.key===`Enter`&&!c&&(e.preventDefault(),h&&h(e))}),ye=eo(e=>{d&&e.key===` `&&D&&!e.defaultPrevented&&E.stop(e,()=>{E.pulsate(e)}),x&&x(e),h&&e.target===e.currentTarget&&j()&&e.key===` `&&!e.defaultPrevented&&h(e)}),be=s;be===`button`&&(T.href||T.to)&&(be=p);let xe={};if(be===`button`){let e=!!T.formAction;xe.type=oe===void 0&&!e?`button`:oe,xe.disabled=c}else !T.href&&!T.to&&(xe.role=`button`),c&&(xe[`aria-disabled`]=c);let Se=no(t,se),Ce={...n,centerRipple:i,component:s,disabled:c,disableRipple:l,disableTouchRipple:u,focusRipple:d,tabIndex:re,focusVisible:D},we=Io(Ce);return(0,N.jsxs)(Lo,{as:be,className:Gr(we.root,o),ownerState:Ce,onBlur:A,onClick:h,onContextMenu:de,onFocus:_e,onKeyDown:ve,onKeyUp:ye,onMouseDown:ue,onMouseLeave:k,onMouseUp:pe,onDragLeave:fe,onTouchEnd:he,onTouchMove:ge,onTouchStart:me,ref:Se,tabIndex:c?-1:re,type:oe,...xe,...T,children:[a,le?(0,N.jsx)(No,{ref:ce,center:i,...ie}):null]})});function zo(e,t,n,r=!1){return eo(i=>(n&&n(i),r||e[t](i),!0))}function Bo(e){return typeof e.main==`string`}function Vo(e,t=[]){if(!Bo(e))return!1;for(let n of t)if(!e.hasOwnProperty(n)||typeof e[n]!=`string`)return!1;return!0}function Ho(e=[]){return([,t])=>t&&Vo(t,e)}function Uo(e){return Jr(`MuiCircularProgress`,e)}Yr(`MuiCircularProgress`,[`root`,`determinate`,`indeterminate`,`colorPrimary`,`colorSecondary`,`svg`,`track`,`circle`,`circleDeterminate`,`circleIndeterminate`,`circleDisableShrink`]);var Wo=44,Go=Jt` - 0% { - transform: rotate(0deg); - } - - 100% { - transform: rotate(360deg); - } -`,Ko=Jt` - 0% { - stroke-dasharray: 1px, 200px; - stroke-dashoffset: 0; - } - - 50% { - stroke-dasharray: 100px, 200px; - stroke-dashoffset: -15px; - } - - 100% { - stroke-dasharray: 1px, 200px; - stroke-dashoffset: -126px; - } -`,qo=typeof Go==`string`?null:qt` - animation: ${Go} 1.4s linear infinite; - `,Jo=typeof Ko==`string`?null:qt` - animation: ${Ko} 1.4s ease-in-out infinite; - `,Yo=e=>{let{classes:t,variant:n,color:r,disableShrink:i}=e;return Hi({root:[`root`,n,`color${V(r)}`],svg:[`svg`],track:[`track`],circle:[`circle`,`circle${V(n)}`,i&&`circleDisableShrink`]},Uo,t)},Xo=Ka(`span`,{name:`MuiCircularProgress`,slot:`Root`,overridesResolver:(e,t)=>{let{ownerState:n}=e;return[t.root,t[n.variant],t[`color${V(n.color)}`]]}})(Xa(({theme:e})=>({display:`inline-block`,variants:[{props:{variant:`determinate`},style:{transition:e.transitions.create(`transform`)}},{props:{variant:`indeterminate`},style:qo||{animation:`${Go} 1.4s linear infinite`}},...Object.entries(e.palette).filter(Ho()).map(([t])=>({props:{color:t},style:{color:(e.vars||e).palette[t].main}}))]}))),Zo=Ka(`svg`,{name:`MuiCircularProgress`,slot:`Svg`})({display:`block`}),Qo=Ka(`circle`,{name:`MuiCircularProgress`,slot:`Circle`,overridesResolver:(e,t)=>{let{ownerState:n}=e;return[t.circle,t[`circle${V(n.variant)}`],n.disableShrink&&t.circleDisableShrink]}})(Xa(({theme:e})=>({stroke:`currentColor`,variants:[{props:{variant:`determinate`},style:{transition:e.transitions.create(`stroke-dashoffset`)}},{props:{variant:`indeterminate`},style:{strokeDasharray:`80px, 200px`,strokeDashoffset:0}},{props:({ownerState:e})=>e.variant===`indeterminate`&&!e.disableShrink,style:Jo||{animation:`${Ko} 1.4s ease-in-out infinite`}}]}))),$o=Ka(`circle`,{name:`MuiCircularProgress`,slot:`Track`})(Xa(({theme:e})=>({stroke:`currentColor`,opacity:(e.vars||e).palette.action.activatedOpacity}))),es=M.forwardRef(function(e,t){let n=Za({props:e,name:`MuiCircularProgress`}),{className:r,color:i=`primary`,disableShrink:a=!1,enableTrackSlot:o=!1,size:s=40,style:c,thickness:l=3.6,value:u=0,variant:d=`indeterminate`,...f}=n,p={...n,color:i,disableShrink:a,size:s,thickness:l,value:u,variant:d,enableTrackSlot:o},m=Yo(p),h={},g={},_={};if(d===`determinate`){let e=2*Math.PI*((Wo-l)/2);h.strokeDasharray=e.toFixed(3),_[`aria-valuenow`]=Math.round(u),h.strokeDashoffset=`${((100-u)/100*e).toFixed(3)}px`,g.transform=`rotate(-90deg)`}return(0,N.jsx)(Xo,{className:Gr(m.root,r),style:{width:s,height:s,...g,...c},ownerState:p,ref:t,role:`progressbar`,..._,...f,children:(0,N.jsxs)(Zo,{className:m.svg,ownerState:p,viewBox:`${Wo/2} ${Wo/2} ${Wo} ${Wo}`,children:[o?(0,N.jsx)($o,{className:m.track,ownerState:p,cx:Wo,cy:Wo,r:(Wo-l)/2,fill:`none`,strokeWidth:l,"aria-hidden":`true`}):null,(0,N.jsx)(Qo,{className:m.circle,style:h,ownerState:p,cx:Wo,cy:Wo,r:(Wo-l)/2,fill:`none`,strokeWidth:l})]})})});function ts(e){return Jr(`MuiTypography`,e)}Yr(`MuiTypography`,[`root`,`h1`,`h2`,`h3`,`h4`,`h5`,`h6`,`subtitle1`,`subtitle2`,`body1`,`body2`,`inherit`,`button`,`caption`,`overline`,`alignLeft`,`alignRight`,`alignCenter`,`alignJustify`,`noWrap`,`gutterBottom`,`paragraph`]);var ns={primary:!0,secondary:!0,error:!0,info:!0,success:!0,warning:!0,textPrimary:!0,textSecondary:!0,textDisabled:!0},rs=Ya(),is=e=>{let{align:t,gutterBottom:n,noWrap:r,paragraph:i,variant:a,classes:o}=e;return Hi({root:[`root`,a,e.align!==`inherit`&&`align${V(t)}`,n&&`gutterBottom`,r&&`noWrap`,i&&`paragraph`]},ts,o)},as=Ka(`span`,{name:`MuiTypography`,slot:`Root`,overridesResolver:(e,t)=>{let{ownerState:n}=e;return[t.root,n.variant&&t[n.variant],n.align!==`inherit`&&t[`align${V(n.align)}`],n.noWrap&&t.noWrap,n.gutterBottom&&t.gutterBottom,n.paragraph&&t.paragraph]}})(Xa(({theme:e})=>({margin:0,variants:[{props:{variant:`inherit`},style:{font:`inherit`,lineHeight:`inherit`,letterSpacing:`inherit`}},...Object.entries(e.typography).filter(([e,t])=>e!==`inherit`&&t&&typeof t==`object`).map(([e,t])=>({props:{variant:e},style:t})),...Object.entries(e.palette).filter(Ho()).map(([t])=>({props:{color:t},style:{color:(e.vars||e).palette[t].main}})),...Object.entries(e.palette?.text||{}).filter(([,e])=>typeof e==`string`).map(([t])=>({props:{color:`text${V(t)}`},style:{color:(e.vars||e).palette.text[t]}})),{props:({ownerState:e})=>e.align!==`inherit`,style:{textAlign:`var(--Typography-textAlign)`}},{props:({ownerState:e})=>e.noWrap,style:{overflow:`hidden`,textOverflow:`ellipsis`,whiteSpace:`nowrap`}},{props:({ownerState:e})=>e.gutterBottom,style:{marginBottom:`0.35em`}},{props:({ownerState:e})=>e.paragraph,style:{marginBottom:16}}]}))),os={h1:`h1`,h2:`h2`,h3:`h3`,h4:`h4`,h5:`h5`,h6:`h6`,subtitle1:`h6`,subtitle2:`h6`,body1:`p`,body2:`p`,inherit:`p`},ss=M.forwardRef(function(e,t){let{color:n,...r}=Za({props:e,name:`MuiTypography`}),i=!ns[n],a=rs({...r,...i&&{color:n}}),{align:o=`inherit`,className:s,component:c,gutterBottom:l=!1,noWrap:u=!1,paragraph:d=!1,variant:f=`body1`,variantMapping:p=os,...m}=a,h={...a,align:o,color:n,className:s,component:c,gutterBottom:l,noWrap:u,paragraph:d,variant:f,variantMapping:p};return(0,N.jsx)(as,{as:c||(d?`p`:p[f]||os[f])||`span`,ref:t,className:Gr(is(h).root,s),...m,ownerState:h,style:{...o!==`inherit`&&{"--Typography-textAlign":o},...m.style}})}),cs=Yr(`MuiBox`,[`root`]),ls=Kr({themeId:te,defaultTheme:Ha(),defaultClassName:cs.root,generateClassName:Ur.generate});function us(e){return Jr(`MuiButton`,e)}var ds=Yr(`MuiButton`,`root.text.textInherit.textPrimary.textSecondary.textSuccess.textError.textInfo.textWarning.outlined.outlinedInherit.outlinedPrimary.outlinedSecondary.outlinedSuccess.outlinedError.outlinedInfo.outlinedWarning.contained.containedInherit.containedPrimary.containedSecondary.containedSuccess.containedError.containedInfo.containedWarning.disableElevation.focusVisible.disabled.colorInherit.colorPrimary.colorSecondary.colorSuccess.colorError.colorInfo.colorWarning.textSizeSmall.textSizeMedium.textSizeLarge.outlinedSizeSmall.outlinedSizeMedium.outlinedSizeLarge.containedSizeSmall.containedSizeMedium.containedSizeLarge.sizeMedium.sizeSmall.sizeLarge.fullWidth.startIcon.endIcon.icon.iconSizeSmall.iconSizeMedium.iconSizeLarge.loading.loadingWrapper.loadingIconPlaceholder.loadingIndicator.loadingPositionCenter.loadingPositionStart.loadingPositionEnd`.split(`.`)),fs=M.createContext({}),ps=M.createContext(void 0),ms=e=>{let{color:t,disableElevation:n,fullWidth:r,size:i,variant:a,loading:o,loadingPosition:s,classes:c}=e,l=Hi({root:[`root`,o&&`loading`,a,`${a}${V(t)}`,`size${V(i)}`,`${a}Size${V(i)}`,`color${V(t)}`,n&&`disableElevation`,r&&`fullWidth`,o&&`loadingPosition${V(s)}`],startIcon:[`icon`,`startIcon`,`iconSize${V(i)}`],endIcon:[`icon`,`endIcon`,`iconSize${V(i)}`],loadingIndicator:[`loadingIndicator`],loadingWrapper:[`loadingWrapper`]},us,c);return{...c,...l}},hs=[{props:{size:`small`},style:{"& > *:nth-of-type(1)":{fontSize:18}}},{props:{size:`medium`},style:{"& > *:nth-of-type(1)":{fontSize:20}}},{props:{size:`large`},style:{"& > *:nth-of-type(1)":{fontSize:22}}}],gs=Ka(Ro,{shouldForwardProp:e=>Ga(e)||e===`classes`,name:`MuiButton`,slot:`Root`,overridesResolver:(e,t)=>{let{ownerState:n}=e;return[t.root,t[n.variant],t[`${n.variant}${V(n.color)}`],t[`size${V(n.size)}`],t[`${n.variant}Size${V(n.size)}`],n.color===`inherit`&&t.colorInherit,n.disableElevation&&t.disableElevation,n.fullWidth&&t.fullWidth,n.loading&&t.loading]}})(Xa(({theme:e})=>{let t=e.palette.mode===`light`?e.palette.grey[300]:e.palette.grey[800],n=e.palette.mode===`light`?e.palette.grey.A100:e.palette.grey[700];return{...e.typography.button,minWidth:64,padding:`6px 16px`,border:0,borderRadius:(e.vars||e).shape.borderRadius,transition:e.transitions.create([`background-color`,`box-shadow`,`border-color`,`color`],{duration:e.transitions.duration.short}),"&:hover":{textDecoration:`none`},[`&.${ds.disabled}`]:{color:(e.vars||e).palette.action.disabled},variants:[{props:{variant:`contained`},style:{color:`var(--variant-containedColor)`,backgroundColor:`var(--variant-containedBg)`,boxShadow:(e.vars||e).shadows[2],"&:hover":{boxShadow:(e.vars||e).shadows[4],"@media (hover: none)":{boxShadow:(e.vars||e).shadows[2]}},"&:active":{boxShadow:(e.vars||e).shadows[8]},[`&.${ds.focusVisible}`]:{boxShadow:(e.vars||e).shadows[6]},[`&.${ds.disabled}`]:{color:(e.vars||e).palette.action.disabled,boxShadow:(e.vars||e).shadows[0],backgroundColor:(e.vars||e).palette.action.disabledBackground}}},{props:{variant:`outlined`},style:{padding:`5px 15px`,border:`1px solid currentColor`,borderColor:`var(--variant-outlinedBorder, currentColor)`,backgroundColor:`var(--variant-outlinedBg)`,color:`var(--variant-outlinedColor)`,[`&.${ds.disabled}`]:{border:`1px solid ${(e.vars||e).palette.action.disabledBackground}`}}},{props:{variant:`text`},style:{padding:`6px 8px`,color:`var(--variant-textColor)`,backgroundColor:`var(--variant-textBg)`}},...Object.entries(e.palette).filter(Ho()).map(([t])=>({props:{color:t},style:{"--variant-textColor":(e.vars||e).palette[t].main,"--variant-outlinedColor":(e.vars||e).palette[t].main,"--variant-outlinedBorder":e.alpha((e.vars||e).palette[t].main,.5),"--variant-containedColor":(e.vars||e).palette[t].contrastText,"--variant-containedBg":(e.vars||e).palette[t].main,"@media (hover: hover)":{"&:hover":{"--variant-containedBg":(e.vars||e).palette[t].dark,"--variant-textBg":e.alpha((e.vars||e).palette[t].main,(e.vars||e).palette.action.hoverOpacity),"--variant-outlinedBorder":(e.vars||e).palette[t].main,"--variant-outlinedBg":e.alpha((e.vars||e).palette[t].main,(e.vars||e).palette.action.hoverOpacity)}}}})),{props:{color:`inherit`},style:{color:`inherit`,borderColor:`currentColor`,"--variant-containedBg":e.vars?e.vars.palette.Button.inheritContainedBg:t,"@media (hover: hover)":{"&:hover":{"--variant-containedBg":e.vars?e.vars.palette.Button.inheritContainedHoverBg:n,"--variant-textBg":e.alpha((e.vars||e).palette.text.primary,(e.vars||e).palette.action.hoverOpacity),"--variant-outlinedBg":e.alpha((e.vars||e).palette.text.primary,(e.vars||e).palette.action.hoverOpacity)}}}},{props:{size:`small`,variant:`text`},style:{padding:`4px 5px`,fontSize:e.typography.pxToRem(13)}},{props:{size:`large`,variant:`text`},style:{padding:`8px 11px`,fontSize:e.typography.pxToRem(15)}},{props:{size:`small`,variant:`outlined`},style:{padding:`3px 9px`,fontSize:e.typography.pxToRem(13)}},{props:{size:`large`,variant:`outlined`},style:{padding:`7px 21px`,fontSize:e.typography.pxToRem(15)}},{props:{size:`small`,variant:`contained`},style:{padding:`4px 10px`,fontSize:e.typography.pxToRem(13)}},{props:{size:`large`,variant:`contained`},style:{padding:`8px 22px`,fontSize:e.typography.pxToRem(15)}},{props:{disableElevation:!0},style:{boxShadow:`none`,"&:hover":{boxShadow:`none`},[`&.${ds.focusVisible}`]:{boxShadow:`none`},"&:active":{boxShadow:`none`},[`&.${ds.disabled}`]:{boxShadow:`none`}}},{props:{fullWidth:!0},style:{width:`100%`}},{props:{loadingPosition:`center`},style:{transition:e.transitions.create([`background-color`,`box-shadow`,`border-color`],{duration:e.transitions.duration.short}),[`&.${ds.loading}`]:{color:`transparent`}}}]}})),_s=Ka(`span`,{name:`MuiButton`,slot:`StartIcon`,overridesResolver:(e,t)=>{let{ownerState:n}=e;return[t.startIcon,n.loading&&t.startIconLoadingStart,t[`iconSize${V(n.size)}`]]}})(({theme:e})=>({display:`inherit`,marginRight:8,marginLeft:-4,variants:[{props:{size:`small`},style:{marginLeft:-2}},{props:{loadingPosition:`start`,loading:!0},style:{transition:e.transitions.create([`opacity`],{duration:e.transitions.duration.short}),opacity:0}},{props:{loadingPosition:`start`,loading:!0,fullWidth:!0},style:{marginRight:-8}},...hs]})),vs=Ka(`span`,{name:`MuiButton`,slot:`EndIcon`,overridesResolver:(e,t)=>{let{ownerState:n}=e;return[t.endIcon,n.loading&&t.endIconLoadingEnd,t[`iconSize${V(n.size)}`]]}})(({theme:e})=>({display:`inherit`,marginRight:-4,marginLeft:8,variants:[{props:{size:`small`},style:{marginRight:-2}},{props:{loadingPosition:`end`,loading:!0},style:{transition:e.transitions.create([`opacity`],{duration:e.transitions.duration.short}),opacity:0}},{props:{loadingPosition:`end`,loading:!0,fullWidth:!0},style:{marginLeft:-8}},...hs]})),ys=Ka(`span`,{name:`MuiButton`,slot:`LoadingIndicator`})(({theme:e})=>({display:`none`,position:`absolute`,visibility:`visible`,variants:[{props:{loading:!0},style:{display:`flex`}},{props:{loadingPosition:`start`},style:{left:14}},{props:{loadingPosition:`start`,size:`small`},style:{left:10}},{props:{variant:`text`,loadingPosition:`start`},style:{left:6}},{props:{loadingPosition:`center`},style:{left:`50%`,transform:`translate(-50%)`,color:(e.vars||e).palette.action.disabled}},{props:{loadingPosition:`end`},style:{right:14}},{props:{loadingPosition:`end`,size:`small`},style:{right:10}},{props:{variant:`text`,loadingPosition:`end`},style:{right:6}},{props:{loadingPosition:`start`,fullWidth:!0},style:{position:`relative`,left:-10}},{props:{loadingPosition:`end`,fullWidth:!0},style:{position:`relative`,right:-10}}]})),bs=Ka(`span`,{name:`MuiButton`,slot:`LoadingIconPlaceholder`})({display:`inline-block`,width:`1em`,height:`1em`}),xs=M.forwardRef(function(e,t){let n=M.useContext(fs),r=M.useContext(ps),i=Za({props:ci(n,e),name:`MuiButton`}),{children:a,color:o=`primary`,component:s=`button`,className:c,disabled:l=!1,disableElevation:u=!1,disableFocusRipple:d=!1,endIcon:f,focusVisibleClassName:p,fullWidth:m=!1,id:h,loading:g=null,loadingIndicator:_,loadingPosition:v=`center`,size:y=`medium`,startIcon:b,type:x,variant:S=`text`,...C}=i,w=Qa(h),ee=_??(0,N.jsx)(es,{"aria-labelledby":w,color:`inherit`,size:16}),te={...i,color:o,component:s,disabled:l,disableElevation:u,disableFocusRipple:d,fullWidth:m,loading:g,loadingIndicator:ee,loadingPosition:v,size:y,type:x,variant:S},ne=ms(te),re=(b||g&&v===`start`)&&(0,N.jsx)(_s,{className:ne.startIcon,ownerState:te,children:b||(0,N.jsx)(bs,{className:ne.loadingIconPlaceholder,ownerState:te})}),ie=(f||g&&v===`end`)&&(0,N.jsx)(vs,{className:ne.endIcon,ownerState:te,children:f||(0,N.jsx)(bs,{className:ne.loadingIconPlaceholder,ownerState:te})}),ae=r||``,oe=typeof g==`boolean`?(0,N.jsx)(`span`,{className:ne.loadingWrapper,style:{display:`contents`},children:g&&(0,N.jsx)(ys,{className:ne.loadingIndicator,ownerState:te,children:ee})}):null;return(0,N.jsxs)(gs,{ownerState:te,className:Gr(n.className,ne.root,c,ae),component:s,disabled:l||g,focusRipple:!d,focusVisibleClassName:Gr(ne.focusVisible,p),ref:t,type:x,id:g?w:h,...C,classes:ne,children:[re,v!==`end`&&oe,a,v===`end`&&oe,ie]})}),Ss=typeof Ja({})==`function`,Cs=(e,t)=>({WebkitFontSmoothing:`antialiased`,MozOsxFontSmoothing:`grayscale`,boxSizing:`border-box`,WebkitTextSizeAdjust:`100%`,...t&&!e.vars&&{colorScheme:e.palette.mode}}),ws=e=>({color:(e.vars||e).palette.text.primary,...e.typography.body1,backgroundColor:(e.vars||e).palette.background.default,"@media print":{backgroundColor:(e.vars||e).palette.common.white}}),Ts=(e,t=!1)=>{let n={};t&&e.colorSchemes&&typeof e.getColorSchemeSelector==`function`&&Object.entries(e.colorSchemes).forEach(([t,r])=>{let i=e.getColorSchemeSelector(t);i.startsWith(`@`)?n[i]={":root":{colorScheme:r.palette?.mode}}:n[i.replace(/\s*&/,``)]={colorScheme:r.palette?.mode}});let r={html:Cs(e,t),"*, *::before, *::after":{boxSizing:`inherit`},"strong, b":{fontWeight:e.typography.fontWeightBold},body:{margin:0,...ws(e),"&::backdrop":{backgroundColor:(e.vars||e).palette.background.default}},...n},i=e.components?.MuiCssBaseline?.styleOverrides;return i&&(r=[r,i]),r},Es=`mui-ecs`,Ds=e=>{let t=Ts(e,!1),n=Array.isArray(t)?t[0]:t;return!e.vars&&n&&(n.html[`:root:has(${Es})`]={colorScheme:e.palette.mode}),e.colorSchemes&&Object.entries(e.colorSchemes).forEach(([t,r])=>{let i=e.getColorSchemeSelector(t);i.startsWith(`@`)?n[i]={[`:root:not(:has(.${Es}))`]:{colorScheme:r.palette?.mode}}:n[i.replace(/\s*&/,``)]={[`&:not(:has(.${Es}))`]:{colorScheme:r.palette?.mode}}}),t},Os=Ja(Ss?({theme:e,enableColorScheme:t})=>Ts(e,t):({theme:e})=>Ds(e));function ks(e){let{children:t,enableColorScheme:n=!1}=Za({props:e,name:`MuiCssBaseline`});return(0,N.jsxs)(M.Fragment,{children:[Ss&&(0,N.jsx)(Os,{enableColorScheme:n}),!Ss&&!n&&(0,N.jsx)(`span`,{className:Es,style:{display:`none`}}),t]})}function As(e){return Jr(`MuiLinearProgress`,e)}Yr(`MuiLinearProgress`,[`root`,`colorPrimary`,`colorSecondary`,`determinate`,`indeterminate`,`buffer`,`query`,`dashed`,`dashedColorPrimary`,`dashedColorSecondary`,`bar`,`bar1`,`bar2`,`barColorPrimary`,`barColorSecondary`,`bar1Indeterminate`,`bar1Determinate`,`bar1Buffer`,`bar2Indeterminate`,`bar2Buffer`]);var js=4,Ms=Jt` - 0% { - left: -35%; - right: 100%; - } - - 60% { - left: 100%; - right: -90%; - } - - 100% { - left: 100%; - right: -90%; - } -`,Ns=typeof Ms==`string`?null:qt` - animation: ${Ms} 2.1s cubic-bezier(0.65, 0.815, 0.735, 0.395) infinite; - `,Ps=Jt` - 0% { - left: -200%; - right: 100%; - } - - 60% { - left: 107%; - right: -8%; - } - - 100% { - left: 107%; - right: -8%; - } -`,Fs=typeof Ps==`string`?null:qt` - animation: ${Ps} 2.1s cubic-bezier(0.165, 0.84, 0.44, 1) 1.15s infinite; - `,Is=Jt` - 0% { - opacity: 1; - background-position: 0 -23px; - } - - 60% { - opacity: 0; - background-position: 0 -23px; - } - - 100% { - opacity: 1; - background-position: -200px -23px; - } -`,Ls=typeof Is==`string`?null:qt` - animation: ${Is} 3s infinite linear; - `,Rs=e=>{let{classes:t,variant:n,color:r}=e;return Hi({root:[`root`,`color${V(r)}`,n],dashed:[`dashed`,`dashedColor${V(r)}`],bar1:[`bar`,`bar1`,`barColor${V(r)}`,(n===`indeterminate`||n===`query`)&&`bar1Indeterminate`,n===`determinate`&&`bar1Determinate`,n===`buffer`&&`bar1Buffer`],bar2:[`bar`,`bar2`,n!==`buffer`&&`barColor${V(r)}`,n===`buffer`&&`color${V(r)}`,(n===`indeterminate`||n===`query`)&&`bar2Indeterminate`,n===`buffer`&&`bar2Buffer`]},As,t)},zs=(e,t)=>e.vars?e.vars.palette.LinearProgress[`${t}Bg`]:e.palette.mode===`light`?e.lighten(e.palette[t].main,.62):e.darken(e.palette[t].main,.5),Bs=Ka(`span`,{name:`MuiLinearProgress`,slot:`Root`,overridesResolver:(e,t)=>{let{ownerState:n}=e;return[t.root,t[`color${V(n.color)}`],t[n.variant]]}})(Xa(({theme:e})=>({position:`relative`,overflow:`hidden`,display:`block`,height:4,zIndex:0,"@media print":{colorAdjust:`exact`},variants:[...Object.entries(e.palette).filter(Ho()).map(([t])=>({props:{color:t},style:{backgroundColor:zs(e,t)}})),{props:({ownerState:e})=>e.color===`inherit`&&e.variant!==`buffer`,style:{"&::before":{content:`""`,position:`absolute`,left:0,top:0,right:0,bottom:0,backgroundColor:`currentColor`,opacity:.3}}},{props:{variant:`buffer`},style:{backgroundColor:`transparent`}},{props:{variant:`query`},style:{transform:`rotate(180deg)`}}]}))),Vs=Ka(`span`,{name:`MuiLinearProgress`,slot:`Dashed`,overridesResolver:(e,t)=>{let{ownerState:n}=e;return[t.dashed,t[`dashedColor${V(n.color)}`]]}})(Xa(({theme:e})=>({position:`absolute`,marginTop:0,height:`100%`,width:`100%`,backgroundSize:`10px 10px`,backgroundPosition:`0 -23px`,variants:[{props:{color:`inherit`},style:{opacity:.3,backgroundImage:`radial-gradient(currentColor 0%, currentColor 16%, transparent 42%)`}},...Object.entries(e.palette).filter(Ho()).map(([t])=>{let n=zs(e,t);return{props:{color:t},style:{backgroundImage:`radial-gradient(${n} 0%, ${n} 16%, transparent 42%)`}}})]})),Ls||{animation:`${Is} 3s infinite linear`}),Hs=Ka(`span`,{name:`MuiLinearProgress`,slot:`Bar1`,overridesResolver:(e,t)=>{let{ownerState:n}=e;return[t.bar,t.bar1,t[`barColor${V(n.color)}`],(n.variant===`indeterminate`||n.variant===`query`)&&t.bar1Indeterminate,n.variant===`determinate`&&t.bar1Determinate,n.variant===`buffer`&&t.bar1Buffer]}})(Xa(({theme:e})=>({width:`100%`,position:`absolute`,left:0,bottom:0,top:0,transition:`transform 0.2s linear`,transformOrigin:`left`,variants:[{props:{color:`inherit`},style:{backgroundColor:`currentColor`}},...Object.entries(e.palette).filter(Ho()).map(([t])=>({props:{color:t},style:{backgroundColor:(e.vars||e).palette[t].main}})),{props:{variant:`determinate`},style:{transition:`transform .${js}s linear`}},{props:{variant:`buffer`},style:{zIndex:1,transition:`transform .${js}s linear`}},{props:({ownerState:e})=>e.variant===`indeterminate`||e.variant===`query`,style:{width:`auto`}},{props:({ownerState:e})=>e.variant===`indeterminate`||e.variant===`query`,style:Ns||{animation:`${Ms} 2.1s cubic-bezier(0.65, 0.815, 0.735, 0.395) infinite`}}]}))),Us=Ka(`span`,{name:`MuiLinearProgress`,slot:`Bar2`,overridesResolver:(e,t)=>{let{ownerState:n}=e;return[t.bar,t.bar2,t[`barColor${V(n.color)}`],(n.variant===`indeterminate`||n.variant===`query`)&&t.bar2Indeterminate,n.variant===`buffer`&&t.bar2Buffer]}})(Xa(({theme:e})=>({width:`100%`,position:`absolute`,left:0,bottom:0,top:0,transition:`transform 0.2s linear`,transformOrigin:`left`,variants:[...Object.entries(e.palette).filter(Ho()).map(([t])=>({props:{color:t},style:{"--LinearProgressBar2-barColor":(e.vars||e).palette[t].main}})),{props:({ownerState:e})=>e.variant!==`buffer`&&e.color!==`inherit`,style:{backgroundColor:`var(--LinearProgressBar2-barColor, currentColor)`}},{props:({ownerState:e})=>e.variant!==`buffer`&&e.color===`inherit`,style:{backgroundColor:`currentColor`}},{props:{color:`inherit`},style:{opacity:.3}},...Object.entries(e.palette).filter(Ho()).map(([t])=>({props:{color:t,variant:`buffer`},style:{backgroundColor:zs(e,t),transition:`transform .${js}s linear`}})),{props:({ownerState:e})=>e.variant===`indeterminate`||e.variant===`query`,style:{width:`auto`}},{props:({ownerState:e})=>e.variant===`indeterminate`||e.variant===`query`,style:Fs||{animation:`${Ps} 2.1s cubic-bezier(0.165, 0.84, 0.44, 1) 1.15s infinite`}}]}))),Ws=M.forwardRef(function(e,t){let n=Za({props:e,name:`MuiLinearProgress`}),{className:r,color:i=`primary`,value:a,valueBuffer:o,variant:s=`indeterminate`,...c}=n,l={...n,color:i,variant:s},u=Rs(l),d=Di(),f={},p={bar1:{},bar2:{}};if((s===`determinate`||s===`buffer`)&&a!==void 0){f[`aria-valuenow`]=Math.round(a),f[`aria-valuemin`]=0,f[`aria-valuemax`]=100;let e=a-100;d&&(e=-e),p.bar1.transform=`translateX(${e}%)`}if(s===`buffer`&&o!==void 0){let e=(o||0)-100;d&&(e=-e),p.bar2.transform=`translateX(${e}%)`}return(0,N.jsxs)(Bs,{className:Gr(u.root,r),ownerState:l,role:`progressbar`,...f,ref:t,...c,children:[s===`buffer`?(0,N.jsx)(Vs,{className:u.dashed,ownerState:l}):null,(0,N.jsx)(Hs,{className:u.bar1,ownerState:l,style:p.bar1}),s===`determinate`?null:(0,N.jsx)(Us,{className:u.bar2,ownerState:l,style:p.bar2})]})}),Gs=g();function Ks(e,t,n,r){if(n===`a`&&!r)throw TypeError(`Private accessor was defined without a getter`);if(typeof t==`function`?e!==t||!r:!t.has(e))throw TypeError(`Cannot read private member from an object whose class did not declare it`);return n===`m`?r:n===`a`?r.call(e):r?r.value:t.get(e)}function qs(e,t,n,r,i){if(r===`m`)throw TypeError(`Private method is not writable`);if(r===`a`&&!i)throw TypeError(`Private accessor was defined without a setter`);if(typeof t==`function`?e!==t||!i:!t.has(e))throw TypeError(`Cannot write private member to an object whose class did not declare it`);return r===`a`?i.call(e,n):i?i.value=n:t.set(e,n),n}var Js,Ys=`__TAURI_TO_IPC_KEY__`;function Xs(e,t=!1){return window.__TAURI_INTERNALS__.transformCallback(e,t)}async function W(e,t={},n){return window.__TAURI_INTERNALS__.invoke(e,t,n)}var Zs=class{get rid(){return Ks(this,Js,`f`)}constructor(e){Js.set(this,void 0),qs(this,Js,e,`f`)}async close(){return W(`plugin:resources|close`,{rid:this.rid})}};Js=new WeakMap;var Qs=class{constructor(...e){this.type=`Logical`,e.length===1?`Logical`in e[0]?(this.width=e[0].Logical.width,this.height=e[0].Logical.height):(this.width=e[0].width,this.height=e[0].height):(this.width=e[0],this.height=e[1])}toPhysical(e){return new $s(this.width*e,this.height*e)}[Ys](){return{width:this.width,height:this.height}}toJSON(){return this[Ys]()}},$s=class{constructor(...e){this.type=`Physical`,e.length===1?`Physical`in e[0]?(this.width=e[0].Physical.width,this.height=e[0].Physical.height):(this.width=e[0].width,this.height=e[0].height):(this.width=e[0],this.height=e[1])}toLogical(e){return new Qs(this.width/e,this.height/e)}[Ys](){return{width:this.width,height:this.height}}toJSON(){return this[Ys]()}},ec=class{constructor(e){this.size=e}toLogical(e){return this.size instanceof Qs?this.size:this.size.toLogical(e)}toPhysical(e){return this.size instanceof $s?this.size:this.size.toPhysical(e)}[Ys](){return{[`${this.size.type}`]:{width:this.size.width,height:this.size.height}}}toJSON(){return this[Ys]()}},tc=class{constructor(...e){this.type=`Logical`,e.length===1?`Logical`in e[0]?(this.x=e[0].Logical.x,this.y=e[0].Logical.y):(this.x=e[0].x,this.y=e[0].y):(this.x=e[0],this.y=e[1])}toPhysical(e){return new G(this.x*e,this.y*e)}[Ys](){return{x:this.x,y:this.y}}toJSON(){return this[Ys]()}},G=class{constructor(...e){this.type=`Physical`,e.length===1?`Physical`in e[0]?(this.x=e[0].Physical.x,this.y=e[0].Physical.y):(this.x=e[0].x,this.y=e[0].y):(this.x=e[0],this.y=e[1])}toLogical(e){return new tc(this.x/e,this.y/e)}[Ys](){return{x:this.x,y:this.y}}toJSON(){return this[Ys]()}},nc=class{constructor(e){this.position=e}toLogical(e){return this.position instanceof tc?this.position:this.position.toLogical(e)}toPhysical(e){return this.position instanceof G?this.position:this.position.toPhysical(e)}[Ys](){return{[`${this.position.type}`]:{x:this.position.x,y:this.position.y}}}toJSON(){return this[Ys]()}},rc;(function(e){e.WINDOW_RESIZED=`tauri://resize`,e.WINDOW_MOVED=`tauri://move`,e.WINDOW_CLOSE_REQUESTED=`tauri://close-requested`,e.WINDOW_DESTROYED=`tauri://destroyed`,e.WINDOW_FOCUS=`tauri://focus`,e.WINDOW_BLUR=`tauri://blur`,e.WINDOW_SCALE_FACTOR_CHANGED=`tauri://scale-change`,e.WINDOW_THEME_CHANGED=`tauri://theme-changed`,e.WINDOW_CREATED=`tauri://window-created`,e.WEBVIEW_CREATED=`tauri://webview-created`,e.DRAG_ENTER=`tauri://drag-enter`,e.DRAG_OVER=`tauri://drag-over`,e.DRAG_DROP=`tauri://drag-drop`,e.DRAG_LEAVE=`tauri://drag-leave`})(rc||={});async function ic(e,t){window.__TAURI_EVENT_PLUGIN_INTERNALS__.unregisterListener(e,t),await W(`plugin:event|unlisten`,{event:e,eventId:t})}async function ac(e,t,n){return W(`plugin:event|listen`,{event:e,target:typeof n?.target==`string`?{kind:`AnyLabel`,label:n.target}:n?.target??{kind:`Any`},handler:Xs(t)}).then(t=>async()=>ic(e,t))}async function oc(e,t,n){return ac(e,n=>{ic(e,n.id),t(n)},n)}async function sc(e,t){await W(`plugin:event|emit`,{event:e,payload:t})}async function cc(e,t,n){await W(`plugin:event|emit_to`,{target:typeof e==`string`?{kind:`AnyLabel`,label:e}:e,event:t,payload:n})}var lc=class e extends Zs{constructor(e){super(e)}static async new(t,n,r){return W(`plugin:image|new`,{rgba:uc(t),width:n,height:r}).then(t=>new e(t))}static async fromBytes(t){return W(`plugin:image|from_bytes`,{bytes:uc(t)}).then(t=>new e(t))}static async fromPath(t){return W(`plugin:image|from_path`,{path:t}).then(t=>new e(t))}async rgba(){return W(`plugin:image|rgba`,{rid:this.rid}).then(e=>new Uint8Array(e))}async size(){return W(`plugin:image|size`,{rid:this.rid})}};function uc(e){return e==null?null:typeof e==`string`?e:e instanceof lc?e.rid:e}var dc;(function(e){e[e.Critical=1]=`Critical`,e[e.Informational=2]=`Informational`})(dc||={});var fc=class{constructor(e){this._preventDefault=!1,this.event=e.event,this.id=e.id}preventDefault(){this._preventDefault=!0}isPreventDefault(){return this._preventDefault}},pc;(function(e){e.None=`none`,e.Normal=`normal`,e.Indeterminate=`indeterminate`,e.Paused=`paused`,e.Error=`error`})(pc||={});function mc(){return new _c(window.__TAURI_INTERNALS__.metadata.currentWindow.label,{skip:!0})}async function hc(){return W(`plugin:window|get_all_windows`).then(e=>e.map(e=>new _c(e,{skip:!0})))}var gc=[`tauri://created`,`tauri://error`],_c=class{constructor(e,t={}){this.label=e,this.listeners=Object.create(null),t?.skip||W(`plugin:window|create`,{options:{...t,parent:typeof t.parent==`string`?t.parent:t.parent?.label,label:e}}).then(async()=>this.emit(`tauri://created`)).catch(async e=>this.emit(`tauri://error`,e))}static async getByLabel(e){return(await hc()).find(t=>t.label===e)??null}static getCurrent(){return mc()}static async getAll(){return hc()}static async getFocusedWindow(){for(let e of await hc())if(await e.isFocused())return e;return null}async listen(e,t){return this._handleTauriEvent(e,t)?()=>{let n=this.listeners[e];n.splice(n.indexOf(t),1)}:ac(e,t,{target:{kind:`Window`,label:this.label}})}async once(e,t){return this._handleTauriEvent(e,t)?()=>{let n=this.listeners[e];n.splice(n.indexOf(t),1)}:oc(e,t,{target:{kind:`Window`,label:this.label}})}async emit(e,t){if(gc.includes(e)){for(let n of this.listeners[e]||[])n({event:e,id:-1,payload:t});return}return sc(e,t)}async emitTo(e,t,n){if(gc.includes(t)){for(let e of this.listeners[t]||[])e({event:t,id:-1,payload:n});return}return cc(e,t,n)}_handleTauriEvent(e,t){return gc.includes(e)?(e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t],!0):!1}async scaleFactor(){return W(`plugin:window|scale_factor`,{label:this.label})}async innerPosition(){return W(`plugin:window|inner_position`,{label:this.label}).then(e=>new G(e))}async outerPosition(){return W(`plugin:window|outer_position`,{label:this.label}).then(e=>new G(e))}async innerSize(){return W(`plugin:window|inner_size`,{label:this.label}).then(e=>new $s(e))}async outerSize(){return W(`plugin:window|outer_size`,{label:this.label}).then(e=>new $s(e))}async isFullscreen(){return W(`plugin:window|is_fullscreen`,{label:this.label})}async isMinimized(){return W(`plugin:window|is_minimized`,{label:this.label})}async isMaximized(){return W(`plugin:window|is_maximized`,{label:this.label})}async isFocused(){return W(`plugin:window|is_focused`,{label:this.label})}async isDecorated(){return W(`plugin:window|is_decorated`,{label:this.label})}async isResizable(){return W(`plugin:window|is_resizable`,{label:this.label})}async isMaximizable(){return W(`plugin:window|is_maximizable`,{label:this.label})}async isMinimizable(){return W(`plugin:window|is_minimizable`,{label:this.label})}async isClosable(){return W(`plugin:window|is_closable`,{label:this.label})}async isVisible(){return W(`plugin:window|is_visible`,{label:this.label})}async title(){return W(`plugin:window|title`,{label:this.label})}async theme(){return W(`plugin:window|theme`,{label:this.label})}async isAlwaysOnTop(){return W(`plugin:window|is_always_on_top`,{label:this.label})}async center(){return W(`plugin:window|center`,{label:this.label})}async requestUserAttention(e){let t=null;return e&&(t=e===dc.Critical?{type:`Critical`}:{type:`Informational`}),W(`plugin:window|request_user_attention`,{label:this.label,value:t})}async setResizable(e){return W(`plugin:window|set_resizable`,{label:this.label,value:e})}async setEnabled(e){return W(`plugin:window|set_enabled`,{label:this.label,value:e})}async isEnabled(){return W(`plugin:window|is_enabled`,{label:this.label})}async setMaximizable(e){return W(`plugin:window|set_maximizable`,{label:this.label,value:e})}async setMinimizable(e){return W(`plugin:window|set_minimizable`,{label:this.label,value:e})}async setClosable(e){return W(`plugin:window|set_closable`,{label:this.label,value:e})}async setTitle(e){return W(`plugin:window|set_title`,{label:this.label,value:e})}async maximize(){return W(`plugin:window|maximize`,{label:this.label})}async unmaximize(){return W(`plugin:window|unmaximize`,{label:this.label})}async toggleMaximize(){return W(`plugin:window|toggle_maximize`,{label:this.label})}async minimize(){return W(`plugin:window|minimize`,{label:this.label})}async unminimize(){return W(`plugin:window|unminimize`,{label:this.label})}async show(){return W(`plugin:window|show`,{label:this.label})}async hide(){return W(`plugin:window|hide`,{label:this.label})}async close(){return W(`plugin:window|close`,{label:this.label})}async destroy(){return W(`plugin:window|destroy`,{label:this.label})}async setDecorations(e){return W(`plugin:window|set_decorations`,{label:this.label,value:e})}async setShadow(e){return W(`plugin:window|set_shadow`,{label:this.label,value:e})}async setEffects(e){return W(`plugin:window|set_effects`,{label:this.label,value:e})}async clearEffects(){return W(`plugin:window|set_effects`,{label:this.label,value:null})}async setAlwaysOnTop(e){return W(`plugin:window|set_always_on_top`,{label:this.label,value:e})}async setAlwaysOnBottom(e){return W(`plugin:window|set_always_on_bottom`,{label:this.label,value:e})}async setContentProtected(e){return W(`plugin:window|set_content_protected`,{label:this.label,value:e})}async setSize(e){return W(`plugin:window|set_size`,{label:this.label,value:e instanceof ec?e:new ec(e)})}async setMinSize(e){return W(`plugin:window|set_min_size`,{label:this.label,value:e instanceof ec?e:e?new ec(e):null})}async setMaxSize(e){return W(`plugin:window|set_max_size`,{label:this.label,value:e instanceof ec?e:e?new ec(e):null})}async setSizeConstraints(e){function t(e){return e?{Logical:e}:null}return W(`plugin:window|set_size_constraints`,{label:this.label,value:{minWidth:t(e?.minWidth),minHeight:t(e?.minHeight),maxWidth:t(e?.maxWidth),maxHeight:t(e?.maxHeight)}})}async setPosition(e){return W(`plugin:window|set_position`,{label:this.label,value:e instanceof nc?e:new nc(e)})}async setFullscreen(e){return W(`plugin:window|set_fullscreen`,{label:this.label,value:e})}async setSimpleFullscreen(e){return W(`plugin:window|set_simple_fullscreen`,{label:this.label,value:e})}async setFocus(){return W(`plugin:window|set_focus`,{label:this.label})}async setFocusable(e){return W(`plugin:window|set_focusable`,{label:this.label,value:e})}async setIcon(e){return W(`plugin:window|set_icon`,{label:this.label,value:uc(e)})}async setSkipTaskbar(e){return W(`plugin:window|set_skip_taskbar`,{label:this.label,value:e})}async setCursorGrab(e){return W(`plugin:window|set_cursor_grab`,{label:this.label,value:e})}async setCursorVisible(e){return W(`plugin:window|set_cursor_visible`,{label:this.label,value:e})}async setCursorIcon(e){return W(`plugin:window|set_cursor_icon`,{label:this.label,value:e})}async setBackgroundColor(e){return W(`plugin:window|set_background_color`,{color:e})}async setCursorPosition(e){return W(`plugin:window|set_cursor_position`,{label:this.label,value:e instanceof nc?e:new nc(e)})}async setIgnoreCursorEvents(e){return W(`plugin:window|set_ignore_cursor_events`,{label:this.label,value:e})}async startDragging(){return W(`plugin:window|start_dragging`,{label:this.label})}async startResizeDragging(e){return W(`plugin:window|start_resize_dragging`,{label:this.label,value:e})}async setBadgeCount(e){return W(`plugin:window|set_badge_count`,{label:this.label,value:e})}async setBadgeLabel(e){return W(`plugin:window|set_badge_label`,{label:this.label,value:e})}async setOverlayIcon(e){return W(`plugin:window|set_overlay_icon`,{label:this.label,value:e?uc(e):void 0})}async setProgressBar(e){return W(`plugin:window|set_progress_bar`,{label:this.label,value:e})}async setVisibleOnAllWorkspaces(e){return W(`plugin:window|set_visible_on_all_workspaces`,{label:this.label,value:e})}async setTitleBarStyle(e){return W(`plugin:window|set_title_bar_style`,{label:this.label,value:e})}async setTheme(e){return W(`plugin:window|set_theme`,{label:this.label,value:e})}async onResized(e){return this.listen(rc.WINDOW_RESIZED,t=>{t.payload=new $s(t.payload),e(t)})}async onMoved(e){return this.listen(rc.WINDOW_MOVED,t=>{t.payload=new G(t.payload),e(t)})}async onCloseRequested(e){return this.listen(rc.WINDOW_CLOSE_REQUESTED,async t=>{let n=new fc(t);await e(n),n.isPreventDefault()||await this.destroy()})}async onDragDropEvent(e){let t=await this.listen(rc.DRAG_ENTER,t=>{e({...t,payload:{type:`enter`,paths:t.payload.paths,position:new G(t.payload.position)}})}),n=await this.listen(rc.DRAG_OVER,t=>{e({...t,payload:{type:`over`,position:new G(t.payload.position)}})}),r=await this.listen(rc.DRAG_DROP,t=>{e({...t,payload:{type:`drop`,paths:t.payload.paths,position:new G(t.payload.position)}})}),i=await this.listen(rc.DRAG_LEAVE,t=>{e({...t,payload:{type:`leave`}})});return()=>{t(),r(),n(),i()}}async onFocusChanged(e){let t=await this.listen(rc.WINDOW_FOCUS,t=>{e({...t,payload:!0})}),n=await this.listen(rc.WINDOW_BLUR,t=>{e({...t,payload:!1})});return()=>{t(),n()}}async onScaleChanged(e){return this.listen(rc.WINDOW_SCALE_FACTOR_CHANGED,e)}async onThemeChanged(e){return this.listen(rc.WINDOW_THEME_CHANGED,e)}},vc;(function(e){e.Disabled=`disabled`,e.Throttle=`throttle`,e.Suspend=`suspend`})(vc||={});var yc;(function(e){e.Default=`default`,e.FluentOverlay=`fluentOverlay`})(yc||={});var bc;(function(e){e.AppearanceBased=`appearanceBased`,e.Light=`light`,e.Dark=`dark`,e.MediumLight=`mediumLight`,e.UltraDark=`ultraDark`,e.Titlebar=`titlebar`,e.Selection=`selection`,e.Menu=`menu`,e.Popover=`popover`,e.Sidebar=`sidebar`,e.HeaderView=`headerView`,e.Sheet=`sheet`,e.WindowBackground=`windowBackground`,e.HudWindow=`hudWindow`,e.FullScreenUI=`fullScreenUI`,e.Tooltip=`tooltip`,e.ContentBackground=`contentBackground`,e.UnderWindowBackground=`underWindowBackground`,e.UnderPageBackground=`underPageBackground`,e.Mica=`mica`,e.Blur=`blur`,e.Acrylic=`acrylic`,e.Tabbed=`tabbed`,e.TabbedDark=`tabbedDark`,e.TabbedLight=`tabbedLight`})(bc||={});var xc;(function(e){e.FollowsWindowActiveState=`followsWindowActiveState`,e.Active=`active`,e.Inactive=`inactive`})(xc||={});var Sc=`/assets/icon-BlfaAlWe.svg`,Cc=mc();function wc(){let[e,t]=(0,M.useState)(null);return(0,M.useEffect)(()=>{let e=Cc.listen(`app://update-progress`,e=>{t(e.payload)});return()=>{e.then(e=>e())}},[]),e}function Tc(){let[e,t]=(0,M.useState)(!1);(0,M.useEffect)(()=>{Cc.emit(`app://update`);let e=Cc.listen(`app://update-error`,()=>{t(!0)});return()=>{e.then(e=>e())}},[]);let n=()=>{t(!1),Cc.emit(`app://update`)};return(0,N.jsxs)(N.Fragment,{children:[(0,N.jsx)(ks,{}),(0,N.jsx)(ls,{sx:{position:`absolute`,inset:0},display:`flex`,alignItems:`center`,px:2,"data-tauri-drag-region":!0,children:(0,N.jsxs)(ls,{display:`flex`,alignItems:`center`,flex:`1`,"data-tauri-drag-region":!0,children:[(0,N.jsx)(ls,{component:`img`,src:Sc,alt:`logo`,sx:{width:`4rem`,height:`4rem`},"data-tauri-drag-region":!0}),(0,N.jsx)(ls,{flex:1,ml:2,children:e?(0,N.jsx)(Dc,{onRetry:n}):(0,N.jsx)(Ec,{})})]})})]})}function Ec(){let e=wc();return(0,N.jsxs)(N.Fragment,{children:[(0,N.jsx)(ss,{variant:`h1`,fontSize:`1rem`,"data-tauri-drag-region":!0,children:`Updating the GUI components...`}),(0,N.jsx)(ls,{mt:1,children:(0,N.jsx)(Oc,{value:e})})]})}function Dc({onRetry:e}){return(0,N.jsxs)(N.Fragment,{children:[(0,N.jsx)(ss,{variant:`h1`,fontSize:`1rem`,"data-tauri-drag-region":!0,children:`Failed to update the GUI components.`}),(0,N.jsx)(ls,{mt:1,"data-tauri-drag-region":!0,children:(0,N.jsx)(xs,{variant:`contained`,color:`primary`,size:`small`,onClick:e,sx:{textTransform:`none`},children:`Retry`})})]})}function Oc(e){let{value:t}=e;return(0,N.jsxs)(ls,{sx:{display:`flex`,alignItems:`center`},children:[(0,N.jsx)(ls,{flex:`1`,children:(0,N.jsx)(Ws,{variant:t===null?`indeterminate`:`determinate`,value:t??0,sx:{py:1.2,".MuiLinearProgress-bar":{transition:`none`}}})}),t!==null&&(0,N.jsx)(ls,{sx:{minWidth:35,textAlign:`right`,ml:1},children:(0,N.jsx)(ss,{variant:`body2`,color:`text.secondary`,children:`${Math.round(t)}%`})})]})}(0,Gs.createRoot)(document.getElementById(`root`)).render((0,N.jsx)(Tc,{})); \ No newline at end of file diff --git a/apps/gpgui-helper/dist/assets/main-DiWGniCh.css b/apps/gpgui-helper/dist/assets/main-DiWGniCh.css new file mode 100644 index 0000000..718afda --- /dev/null +++ b/apps/gpgui-helper/dist/assets/main-DiWGniCh.css @@ -0,0 +1 @@ +html,body,#root{box-sizing:border-box;-webkit-user-select:none;user-select:none;cursor:default;height:100%;margin:0;padding:0;overflow:hidden}body{color:#2e3436;background:#f6f5f4;font-family:Inter,ui-sans-serif,-apple-system,BlinkMacSystemFont,Segoe UI,sans-serif}button{font:inherit}.update-window{box-sizing:border-box;background:#f6f5f4;align-items:center;gap:15px;width:100%;height:100%;padding:16px 18px;display:flex}.update-logo{flex:none;width:48px;height:48px}.update-content,.update-status{width:100%;min-width:0}.update-title{color:#2e3436;letter-spacing:-.01em;margin:0;font-size:16px;font-weight:600;line-height:1.25}.update-description{color:#5e5c64;margin:3px 0 0;font-size:12px;line-height:1.4}.progress-summary{justify-content:space-between;align-items:baseline;gap:12px;margin-top:3px;display:flex}.progress-summary .update-description{margin:0}.progress-bar{background-color:#d5d3d1;border-radius:3px;width:100%;height:6px;margin-top:9px;position:relative;overflow:hidden}.progress-fill{background:#3584e4;border-radius:3px;height:100%;transition:width .18s ease-out}.progress-bar-indeterminate .progress-fill{width:35%;animation:1.4s ease-in-out infinite progress-indeterminate}@keyframes progress-indeterminate{0%{transform:translate(-110%)}to{transform:translate(300%)}}@media (prefers-reduced-motion:reduce){.progress-fill{transition:none}.progress-bar-indeterminate .progress-fill{animation:none;transform:translate(90%)}}.progress-label{color:#3d3846;font-variant-numeric:tabular-nums;text-align:right;white-space:nowrap;flex:none;font-size:12px;font-weight:500}.error-status{justify-content:space-between;align-items:center;gap:16px;display:flex}.error-status .update-title{color:#9c2f2f}.error-copy{min-width:0}.retry-button{color:#fff;cursor:pointer;background:#1c71d8;border:0;border-radius:8px;min-width:68px;padding:4px 14px;font-size:12px;font-weight:600;line-height:1.5}.retry-button:hover{background:#1a5fb4}.retry-button:active{background:#174a8b}.retry-button:focus-visible{outline-offset:2px;outline:2px solid #1a5fb4} diff --git a/apps/gpgui-helper/dist/index.html b/apps/gpgui-helper/dist/index.html index 81e65d6..fb2e606 100644 --- a/apps/gpgui-helper/dist/index.html +++ b/apps/gpgui-helper/dist/index.html @@ -2,11 +2,11 @@ - + - GP Connect Helper - - + GPGUI Downloader + +