mirror of
https://github.com/moku-project/Moku.git
synced 2026-06-13 17:29:55 -05:00
Compare commits
65 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1e159bbd73 | |||
| cb3d8d64fa | |||
| c0a95ff899 | |||
| ddaca9d126 | |||
| 77b28e97a4 | |||
| f10b343108 | |||
| a8ad9034fc | |||
| f99fa60e8e | |||
| 915ff66b2f | |||
| abd60f261f | |||
| fc20835dde | |||
| 04631d93ef | |||
| 5c09cd15ad | |||
| 7af69fd77c | |||
| 0b6372bd17 | |||
| 32bdeb92ff | |||
| 22c4a222d8 | |||
| 26cb16ec0f | |||
| 8c2917b698 | |||
| 6d33fb7ae1 | |||
| 0e7ff1a27c | |||
| 685bd9b9da | |||
| 3926b5d064 | |||
| 9f6996dcdb | |||
| 294865fe9d | |||
| 13e760594d | |||
| b44b12ba86 | |||
| 3b8c8dea38 | |||
| 615fa1e92f | |||
| 248b046627 | |||
| 79e5548879 | |||
| ed4c11ca7e | |||
| 5dfbc80bbe | |||
| 8aa92e6b54 | |||
| b55dd16d0d | |||
| 7c6aeb8f4c | |||
| 3e4d322fb7 | |||
| db8a984270 | |||
| 18027baee1 | |||
| c5243ba30c | |||
| 13f2a483ca | |||
| 6de5207ce7 | |||
| 8c250021a0 | |||
| 584b917f98 | |||
| e9929747d2 | |||
| cbdf9e8be1 | |||
| d9a9427e3b | |||
| ae5d9748c7 | |||
| 6c39ef538f | |||
| 081becdd60 | |||
| c891cb349c | |||
| 8cef74bb98 | |||
| bf071dcfc7 | |||
| b0efb183e8 | |||
| 745b6993de | |||
| bd79169f71 | |||
| 6fccf02614 | |||
| fa7cfdc4e6 | |||
| 9c614b38f8 | |||
| 30e50b5a1b | |||
| 8ef0a14363 | |||
| 4e2ad6cae7 | |||
| 9e56b1176c | |||
| d025d07e07 | |||
| f988641446 |
@@ -0,0 +1,78 @@
|
|||||||
|
name: Bug Report
|
||||||
|
description: Something isn't working as expected
|
||||||
|
labels: ["bug"]
|
||||||
|
body:
|
||||||
|
- type: markdown
|
||||||
|
attributes:
|
||||||
|
value: |
|
||||||
|
Thanks for taking the time to report a bug. The more detail you include, the faster it gets fixed.
|
||||||
|
You can use the **Report a Bug** button in **Settings → About** to pre-fill most of this automatically.
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: description
|
||||||
|
attributes:
|
||||||
|
label: Description
|
||||||
|
description: What's broken? A clear, concise summary.
|
||||||
|
placeholder: "e.g. Library card stats don't appear even with 'Always show' enabled"
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: steps
|
||||||
|
attributes:
|
||||||
|
label: Steps to Reproduce
|
||||||
|
description: Exact steps to trigger the bug.
|
||||||
|
placeholder: |
|
||||||
|
1. Open Settings → Library
|
||||||
|
2. Enable "Always show card stats"
|
||||||
|
3. Return to Library
|
||||||
|
4. Unread counts are not visible
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: expected
|
||||||
|
attributes:
|
||||||
|
label: Expected Behavior
|
||||||
|
placeholder: "Unread and download counts should be permanently visible on manga cards"
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: actual
|
||||||
|
attributes:
|
||||||
|
label: Actual Behavior
|
||||||
|
placeholder: "Counts only appear on hover, or not at all"
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: environment
|
||||||
|
attributes:
|
||||||
|
label: Environment
|
||||||
|
description: Copy this from Settings → About → Report a Bug, or fill in manually.
|
||||||
|
placeholder: |
|
||||||
|
- Moku Version: v0.9.4
|
||||||
|
- Platform: Windows / macOS / Linux / Web
|
||||||
|
- OS Version: Windows 11 24H2
|
||||||
|
- Server: Suwayomi v2.2.2196
|
||||||
|
- Server URL: localhost:4567
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: settings
|
||||||
|
attributes:
|
||||||
|
label: Relevant Settings
|
||||||
|
description: Settings related to the bug (auto-filled by the in-app reporter, or paste manually).
|
||||||
|
placeholder: |
|
||||||
|
libraryStatsAlways: true
|
||||||
|
libraryCropCovers: true
|
||||||
|
libraryPageSize: 48
|
||||||
|
render: yaml
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: additional
|
||||||
|
attributes:
|
||||||
|
label: Additional Context
|
||||||
|
description: Screenshots, screen recordings, console errors, anything else helpful.
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
blank_issues_enabled: false
|
||||||
|
contact_links:
|
||||||
|
- name: Discussions (Questions & Support)
|
||||||
|
url: https://github.com/moku-project/Moku/discussions
|
||||||
|
about: Not a bug? Ask questions and get help here.
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
name: Feature Request
|
||||||
|
description: Suggest an improvement or new feature
|
||||||
|
labels: ["enhancement"]
|
||||||
|
body:
|
||||||
|
- type: markdown
|
||||||
|
attributes:
|
||||||
|
value: |
|
||||||
|
Got an idea? Describe what you want and why it would be useful.
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: problem
|
||||||
|
attributes:
|
||||||
|
label: Problem / Motivation
|
||||||
|
description: What's the gap or frustration this would address?
|
||||||
|
placeholder: "e.g. There's no way to bulk-mark chapters as read without opening each series"
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: solution
|
||||||
|
attributes:
|
||||||
|
label: Proposed Solution
|
||||||
|
description: What would you like to see?
|
||||||
|
placeholder: "A 'Mark all read' option in the series long-press context menu"
|
||||||
|
validations:
|
||||||
|
required: true
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: alternatives
|
||||||
|
attributes:
|
||||||
|
label: Alternatives Considered
|
||||||
|
description: Any workarounds you've tried, or other ways this could be solved.
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: environment
|
||||||
|
attributes:
|
||||||
|
label: Environment
|
||||||
|
description: Optional — useful if this is platform-specific.
|
||||||
|
placeholder: |
|
||||||
|
- Moku Version: v0.9.4
|
||||||
|
- Platform: Windows / macOS / Linux / Web
|
||||||
|
|
||||||
|
- type: textarea
|
||||||
|
id: additional
|
||||||
|
attributes:
|
||||||
|
label: Additional Context
|
||||||
|
description: Mockups, references, examples from other apps, etc.
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
# Sourced by CI jobs that need versions from nix/versions.nix.
|
||||||
|
# Usage: source .github/read_versions.sh
|
||||||
|
# Exports: MOKU_VERSION SUWA_VERSION SUWA_HASH_LINUX SUWA_HASH_MACOS_ARM64 SUWA_HASH_MACOS_X64 SUWA_HASH_WINDOWS
|
||||||
|
|
||||||
|
_nix="$( cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd )/nix/versions.nix"
|
||||||
|
_t=$(cat "$_nix")
|
||||||
|
|
||||||
|
_pick() { echo "$_t" | grep -oP "${1}\s*=\s*\"\K[^\"]+"; }
|
||||||
|
|
||||||
|
export MOKU_VERSION=$(_pick "moku")
|
||||||
|
export SUWA_VERSION=$(_pick "version")
|
||||||
|
export SUWA_HASH_WINDOWS=$(_pick "windowsHash")
|
||||||
|
export SUWA_HASH_LINUX=$(_pick "linuxHash")
|
||||||
|
export SUWA_HASH_MACOS_ARM64=$(_pick "macosArm64Hash")
|
||||||
|
export SUWA_HASH_MACOS_X64=$(_pick "macosX64Hash")
|
||||||
|
|
||||||
|
unset _nix _t
|
||||||
|
unset -f _pick
|
||||||
@@ -16,24 +16,15 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- uses: pnpm/action-setup@v4
|
- uses: pnpm/action-setup@v4
|
||||||
with:
|
with: { version: latest }
|
||||||
version: latest
|
|
||||||
|
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 22
|
node-version: 22
|
||||||
cache: pnpm
|
cache: pnpm
|
||||||
|
- run: pnpm install --frozen-lockfile
|
||||||
- name: Install dependencies
|
- run: pnpm build:static
|
||||||
run: pnpm install --frozen-lockfile
|
- uses: actions/upload-artifact@v4
|
||||||
|
|
||||||
- name: Build
|
|
||||||
run: pnpm build
|
|
||||||
|
|
||||||
- name: Upload dist
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
with:
|
||||||
name: frontend-dist-linux
|
name: frontend-dist-linux
|
||||||
path: dist/
|
path: dist/
|
||||||
@@ -43,77 +34,56 @@ jobs:
|
|||||||
name: Tauri (Linux x64)
|
name: Tauri (Linux x64)
|
||||||
needs: frontend
|
needs: frontend
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Download frontend dist
|
- uses: actions/download-artifact@v4
|
||||||
uses: actions/download-artifact@v4
|
with: { name: frontend-dist-linux, path: dist/ }
|
||||||
with:
|
|
||||||
name: frontend-dist-linux
|
- name: Read versions
|
||||||
path: dist/
|
run: |
|
||||||
|
source .github/read_versions.sh
|
||||||
|
echo "MOKU_VERSION=$MOKU_VERSION" >> $GITHUB_ENV
|
||||||
|
echo "SUWA_VERSION=$SUWA_VERSION" >> $GITHUB_ENV
|
||||||
|
echo "SUWA_HASH=$SUWA_HASH_LINUX" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Install system dependencies
|
- name: Install system dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y \
|
sudo apt-get install -y \
|
||||||
libwebkit2gtk-4.1-dev \
|
libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libfuse2
|
||||||
libappindicator3-dev \
|
|
||||||
librsvg2-dev \
|
|
||||||
patchelf \
|
|
||||||
libfuse2
|
|
||||||
|
|
||||||
- name: Install Rust
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
uses: dtolnay/rust-toolchain@stable
|
with: { targets: x86_64-unknown-linux-gnu }
|
||||||
with:
|
|
||||||
targets: x86_64-unknown-linux-gnu
|
|
||||||
|
|
||||||
- name: Rust cache
|
- uses: Swatinem/rust-cache@v2
|
||||||
uses: Swatinem/rust-cache@v2
|
with: { workspaces: src-tauri }
|
||||||
with:
|
|
||||||
workspaces: src-tauri
|
|
||||||
|
|
||||||
- uses: pnpm/action-setup@v4
|
- uses: pnpm/action-setup@v4
|
||||||
with:
|
with: { version: latest }
|
||||||
version: latest
|
|
||||||
|
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 22
|
node-version: 22
|
||||||
cache: pnpm
|
cache: pnpm
|
||||||
|
- run: pnpm install --frozen-lockfile
|
||||||
- name: Install JS dependencies
|
|
||||||
run: pnpm install --frozen-lockfile
|
|
||||||
|
|
||||||
- name: Download Suwayomi (Linux x64)
|
- name: Download Suwayomi (Linux x64)
|
||||||
run: |
|
run: |
|
||||||
curl -fsSL \
|
curl -fsSL \
|
||||||
"https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v2.1.2087/Suwayomi-Server-v2.1.2087-linux-x64.tar.gz" \
|
"https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v${SUWA_VERSION}/Suwayomi-Server-v${SUWA_VERSION}-linux-x64.tar.gz" \
|
||||||
-o suwayomi-linux.tar.gz
|
-o suwayomi-linux.tar.gz
|
||||||
|
echo "${SUWA_HASH} suwayomi-linux.tar.gz" | sha256sum -c -
|
||||||
echo "888bee202649ce7e3e3468a729c4084fb465f024b4033cab3f8ab98b0c66fe76 suwayomi-linux.tar.gz" | sha256sum -c -
|
|
||||||
|
|
||||||
mkdir -p suwayomi-extracted
|
mkdir -p suwayomi-extracted
|
||||||
tar -xzf suwayomi-linux.tar.gz -C suwayomi-extracted --strip-components=1
|
tar -xzf suwayomi-linux.tar.gz -C suwayomi-extracted --strip-components=1
|
||||||
|
|
||||||
- name: Stage Suwayomi bundle
|
- name: Stage Suwayomi bundle
|
||||||
run: |
|
run: |
|
||||||
mkdir -p src-tauri/binaries
|
mkdir -p src-tauri/binaries
|
||||||
|
for f in suwayomi-extracted/bin/Suwayomi-Server.jar \
|
||||||
JAR="suwayomi-extracted/bin/Suwayomi-Server.jar"
|
suwayomi-extracted/jre/bin/java \
|
||||||
JAVA="suwayomi-extracted/jre/bin/java"
|
suwayomi-extracted/bin/catch_abort.so; do
|
||||||
CATCH="suwayomi-extracted/bin/catch_abort.so"
|
[ -e "$f" ] || { echo "ERROR: missing $f"; find suwayomi-extracted -type f | head -40; exit 1; }
|
||||||
|
|
||||||
for f in "$JAR" "$JAVA" "$CATCH"; do
|
|
||||||
if [ ! -e "$f" ]; then
|
|
||||||
echo "ERROR: expected file not found: $f"
|
|
||||||
find suwayomi-extracted -type f | head -40
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "JAR=$JAR JAVA=$JAVA CATCH=$CATCH"
|
|
||||||
|
|
||||||
cp -r suwayomi-extracted src-tauri/binaries/suwayomi-bundle
|
cp -r suwayomi-extracted src-tauri/binaries/suwayomi-bundle
|
||||||
chmod +x src-tauri/binaries/suwayomi-bundle/jre/bin/java
|
chmod +x src-tauri/binaries/suwayomi-bundle/jre/bin/java
|
||||||
|
|
||||||
@@ -129,43 +99,30 @@ jobs:
|
|||||||
|
|
||||||
- name: Build Tauri app
|
- name: Build Tauri app
|
||||||
run: pnpm tauri build --target x86_64-unknown-linux-gnu --config src-tauri/tauri.linux.conf.json --verbose
|
run: pnpm tauri build --target x86_64-unknown-linux-gnu --config src-tauri/tauri.linux.conf.json --verbose
|
||||||
env:
|
env: { NO_STRIP: "true" }
|
||||||
NO_STRIP: "true"
|
|
||||||
|
|
||||||
- name: Upload Linux artifacts to release
|
- name: Upload Linux artifacts to release
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
VERSION: ${{ github.event.inputs.version }}
|
|
||||||
run: |
|
run: |
|
||||||
for i in $(seq 1 12); do
|
for i in $(seq 1 12); do
|
||||||
RELEASE_ID=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
|
RELEASE_ID=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
|
||||||
"https://api.github.com/repos/moku-project/Moku/releases" \
|
"https://api.github.com/repos/moku-project/Moku/releases" \
|
||||||
| jq -r '.[] | select(.tag_name == "v'"$VERSION"'") | .id' | head -1)
|
| jq -r '.[] | select(.tag_name == "v${{ github.event.inputs.version }}") | .id' | head -1)
|
||||||
if [ -n "$RELEASE_ID" ]; then break; fi
|
[ -n "$RELEASE_ID" ] && break
|
||||||
echo "Waiting for release to exist... attempt $i"
|
echo "Waiting for release... attempt $i"; sleep 15
|
||||||
sleep 15
|
|
||||||
done
|
done
|
||||||
|
[ -z "$RELEASE_ID" ] && { echo "ERROR: release not found"; exit 1; }
|
||||||
|
|
||||||
if [ -z "$RELEASE_ID" ]; then
|
upload() {
|
||||||
echo "ERROR: Could not find release for v$VERSION after waiting"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Found release ID: $RELEASE_ID"
|
|
||||||
|
|
||||||
upload_asset() {
|
|
||||||
local file="$1"
|
|
||||||
local name="$2"
|
|
||||||
echo "Uploading $name..."
|
|
||||||
curl -s -X POST \
|
curl -s -X POST \
|
||||||
-H "Authorization: Bearer $GITHUB_TOKEN" \
|
-H "Authorization: Bearer $GITHUB_TOKEN" \
|
||||||
-H "Content-Type: application/octet-stream" \
|
-H "Content-Type: application/octet-stream" \
|
||||||
--data-binary @"$file" \
|
--data-binary @"$1" \
|
||||||
"https://uploads.github.com/repos/moku-project/Moku/releases/$RELEASE_ID/assets?name=$name"
|
"https://uploads.github.com/repos/moku-project/Moku/releases/$RELEASE_ID/assets?name=$2"
|
||||||
}
|
}
|
||||||
|
|
||||||
APPIMAGE=$(find src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/appimage -name "*.AppImage" | head -1)
|
APPIMAGE=$(find src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/appimage -name "*.AppImage" | head -1)
|
||||||
DEB=$(find src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb -name "*.deb" | head -1)
|
DEB=$(find src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb -name "*.deb" | head -1)
|
||||||
|
[ -n "$APPIMAGE" ] && upload "$APPIMAGE" "moku-linux-x64-${{ github.event.inputs.version }}.AppImage"
|
||||||
[ -n "$APPIMAGE" ] && upload_asset "$APPIMAGE" "moku-linux-x64-${VERSION}.AppImage"
|
[ -n "$DEB" ] && upload "$DEB" "moku-linux-x64-${{ github.event.inputs.version }}.deb"
|
||||||
[ -n "$DEB" ] && upload_asset "$DEB" "moku-linux-x64-${VERSION}.deb"
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ on:
|
|||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
version:
|
version:
|
||||||
description: "Version to build (e.g. 0.4.0)"
|
description: "Version to build (e.g. 0.9.0)"
|
||||||
required: true
|
required: true
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
@@ -16,28 +16,16 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- uses: pnpm/action-setup@v4
|
- uses: pnpm/action-setup@v4
|
||||||
with:
|
with: { version: latest }
|
||||||
version: latest
|
|
||||||
|
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 22
|
node-version: 22
|
||||||
cache: pnpm
|
cache: pnpm
|
||||||
|
- run: pnpm install --frozen-lockfile
|
||||||
- name: Install dependencies
|
- run: pnpm build:static
|
||||||
run: pnpm install --frozen-lockfile
|
- uses: actions/upload-artifact@v4
|
||||||
|
with: { name: frontend-dist, path: dist/, retention-days: 1 }
|
||||||
- name: Build
|
|
||||||
run: pnpm build
|
|
||||||
|
|
||||||
- name: Upload dist
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: frontend-dist
|
|
||||||
path: dist/
|
|
||||||
retention-days: 1
|
|
||||||
|
|
||||||
tauri:
|
tauri:
|
||||||
name: Tauri (macOS)
|
name: Tauri (macOS)
|
||||||
@@ -46,149 +34,103 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Download frontend dist
|
- uses: actions/download-artifact@v4
|
||||||
uses: actions/download-artifact@v4
|
with: { name: frontend-dist, path: dist/ }
|
||||||
with:
|
|
||||||
name: frontend-dist
|
|
||||||
path: dist/
|
|
||||||
|
|
||||||
- name: Install Rust
|
- name: Read versions
|
||||||
uses: dtolnay/rust-toolchain@stable
|
run: |
|
||||||
with:
|
source .github/read_versions.sh
|
||||||
targets: aarch64-apple-darwin,x86_64-apple-darwin
|
echo "SUWA_VERSION=$SUWA_VERSION" >> $GITHUB_ENV
|
||||||
|
echo "SUWA_HASH_ARM64=$SUWA_HASH_MACOS_ARM64" >> $GITHUB_ENV
|
||||||
|
echo "SUWA_HASH_X64=$SUWA_HASH_MACOS_X64" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Rust cache
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
uses: Swatinem/rust-cache@v2
|
|
||||||
with:
|
with:
|
||||||
workspaces: src-tauri
|
targets: "aarch64-apple-darwin,x86_64-apple-darwin"
|
||||||
|
|
||||||
|
- uses: Swatinem/rust-cache@v2
|
||||||
|
with: { workspaces: src-tauri }
|
||||||
|
|
||||||
- uses: pnpm/action-setup@v4
|
- uses: pnpm/action-setup@v4
|
||||||
with:
|
with: { version: latest }
|
||||||
version: latest
|
|
||||||
|
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 22
|
node-version: 22
|
||||||
cache: pnpm
|
cache: pnpm
|
||||||
|
- run: pnpm install --frozen-lockfile
|
||||||
- name: Install JS dependencies
|
|
||||||
run: pnpm install --frozen-lockfile
|
|
||||||
|
|
||||||
- name: Download Suwayomi binaries
|
- name: Download Suwayomi binaries
|
||||||
run: |
|
run: |
|
||||||
download_suwayomi() {
|
dl() {
|
||||||
local asset="$1" sha="$2" outdir="$3"
|
local asset="$1" sha="$2" outdir="$3"
|
||||||
curl -fsSL \
|
curl -fsSL \
|
||||||
"https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v2.1.2087/${asset}" \
|
"https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v${SUWA_VERSION}/${asset}" \
|
||||||
-o "${outdir}.tar.gz"
|
-o "${outdir}.tar.gz"
|
||||||
echo "${sha} ${outdir}.tar.gz" | shasum -a 256 -c -
|
echo "${sha} ${outdir}.tar.gz" | shasum -a 256 -c -
|
||||||
mkdir -p "${outdir}"
|
mkdir -p "${outdir}"
|
||||||
tar -xzf "${outdir}.tar.gz" -C "${outdir}" --strip-components=1
|
tar -xzf "${outdir}.tar.gz" -C "${outdir}" --strip-components=1
|
||||||
}
|
}
|
||||||
|
dl "Suwayomi-Server-v${SUWA_VERSION}-macOS-arm64.tar.gz" "$SUWA_HASH_ARM64" suwayomi-arm64
|
||||||
download_suwayomi \
|
dl "Suwayomi-Server-v${SUWA_VERSION}-macOS-x64.tar.gz" "$SUWA_HASH_X64" suwayomi-x64
|
||||||
"Suwayomi-Server-v2.1.2087-macOS-arm64.tar.gz" \
|
|
||||||
"59f73a53a139d5d843e16cab4f3ac425a410add6bee0a60920fa26eb0a4b8a5c" \
|
|
||||||
"suwayomi-arm64"
|
|
||||||
|
|
||||||
download_suwayomi \
|
|
||||||
"Suwayomi-Server-v2.1.2087-macOS-x64.tar.gz" \
|
|
||||||
"da7e664e4c2615a0b9eac09ee38fe979feee1d6c0b266e19dba1ceea8ae3795c" \
|
|
||||||
"suwayomi-x64"
|
|
||||||
|
|
||||||
- name: Stage Suwayomi sidecars
|
- name: Stage Suwayomi sidecars
|
||||||
run: |
|
run: |
|
||||||
mkdir -p src-tauri/binaries
|
mkdir -p src-tauri/binaries
|
||||||
|
stage() {
|
||||||
stage_arch() {
|
local srcdir="$1" arch="$2"
|
||||||
local srcdir="$1"
|
|
||||||
local arch="$2"
|
|
||||||
local sidecar="src-tauri/binaries/suwayomi-server-${arch}"
|
|
||||||
local bundle_dest="src-tauri/binaries/suwayomi-bundle-${arch}"
|
|
||||||
|
|
||||||
JAR=$(find "$srcdir" -name "Suwayomi-Server.jar" | head -1)
|
JAR=$(find "$srcdir" -name "Suwayomi-Server.jar" | head -1)
|
||||||
JAVA=$(find "$srcdir" -path "*/jre/bin/java" | head -1)
|
JAVA=$(find "$srcdir" -path "*/jre/bin/java" | head -1)
|
||||||
|
[ -z "$JAR" ] && { echo "ERROR: jar not found in $srcdir"; find "$srcdir" -type f | head -30; exit 1; }
|
||||||
if [ -z "$JAR" ]; then
|
[ -z "$JAVA" ] && { echo "ERROR: java not found in $srcdir"; find "$srcdir" -type f | head -30; exit 1; }
|
||||||
echo "ERROR: Suwayomi-Server.jar not found in $srcdir"
|
cp -r "$srcdir" "src-tauri/binaries/suwayomi-bundle-${arch}"
|
||||||
find "$srcdir" -type f | head -30
|
cp src-tauri/binaries/suwayomi-launcher.sh "src-tauri/binaries/suwayomi-server-${arch}"
|
||||||
exit 1
|
chmod +x "src-tauri/binaries/suwayomi-server-${arch}"
|
||||||
fi
|
|
||||||
if [ -z "$JAVA" ]; then
|
|
||||||
echo "ERROR: jre/bin/java not found in $srcdir"
|
|
||||||
find "$srcdir" -type f | head -30
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "${arch}: jar=${JAR} java=${JAVA}"
|
|
||||||
|
|
||||||
cp -r "$srcdir" "$bundle_dest"
|
|
||||||
|
|
||||||
# The launcher script is committed at src-tauri/binaries/suwayomi-launcher.sh
|
|
||||||
# to avoid embedding a heredoc in YAML (which breaks GitHub Actions parsing).
|
|
||||||
cp src-tauri/binaries/suwayomi-launcher.sh "$sidecar"
|
|
||||||
chmod +x "$sidecar"
|
|
||||||
echo "Staged sidecar: $sidecar"
|
|
||||||
}
|
}
|
||||||
|
stage suwayomi-arm64 aarch64-apple-darwin
|
||||||
stage_arch suwayomi-arm64 aarch64-apple-darwin
|
stage suwayomi-x64 x86_64-apple-darwin
|
||||||
stage_arch suwayomi-x64 x86_64-apple-darwin
|
|
||||||
|
|
||||||
- name: Patch tauri.conf.json for CI
|
- name: Patch tauri.conf.json for CI
|
||||||
run: |
|
run: |
|
||||||
sed -i '' 's/"beforeBuildCommand": "pnpm build"/"beforeBuildCommand": ""/' src-tauri/tauri.conf.json
|
sed -i '' 's/"beforeBuildCommand": "pnpm build"/"beforeBuildCommand": ""/' src-tauri/tauri.conf.json
|
||||||
|
|
||||||
- name: Swap bundle for aarch64
|
- name: Build Tauri app (aarch64)
|
||||||
run: |
|
run: |
|
||||||
rm -rf src-tauri/binaries/suwayomi-bundle
|
rm -rf src-tauri/binaries/suwayomi-bundle
|
||||||
cp -r src-tauri/binaries/suwayomi-bundle-aarch64-apple-darwin \
|
cp -r src-tauri/binaries/suwayomi-bundle-aarch64-apple-darwin src-tauri/binaries/suwayomi-bundle
|
||||||
src-tauri/binaries/suwayomi-bundle
|
pnpm tauri build --target aarch64-apple-darwin --config src-tauri/tauri.macos.conf.json
|
||||||
|
|
||||||
- name: Build Tauri app (aarch64)
|
|
||||||
run: pnpm tauri build --target aarch64-apple-darwin --config src-tauri/tauri.macos.conf.json
|
|
||||||
env:
|
env:
|
||||||
APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY || '-' }}
|
APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY || '-' }}
|
||||||
|
|
||||||
- name: Swap bundle for x86_64
|
- name: Build Tauri app (x86_64)
|
||||||
run: |
|
run: |
|
||||||
rm -rf src-tauri/binaries/suwayomi-bundle
|
rm -rf src-tauri/binaries/suwayomi-bundle
|
||||||
cp -r src-tauri/binaries/suwayomi-bundle-x86_64-apple-darwin \
|
cp -r src-tauri/binaries/suwayomi-bundle-x86_64-apple-darwin src-tauri/binaries/suwayomi-bundle
|
||||||
src-tauri/binaries/suwayomi-bundle
|
pnpm tauri build --target x86_64-apple-darwin --config src-tauri/tauri.macos.conf.json
|
||||||
|
|
||||||
- name: Build Tauri app (x86_64)
|
|
||||||
run: pnpm tauri build --target x86_64-apple-darwin --config src-tauri/tauri.macos.conf.json
|
|
||||||
env:
|
env:
|
||||||
APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY || '-' }}
|
APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY || '-' }}
|
||||||
|
|
||||||
- name: Upload macOS artifacts to release
|
- name: Upload macOS artifacts to release
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
VERSION: ${{ github.event.inputs.version }}
|
|
||||||
run: |
|
run: |
|
||||||
# Wait for the Windows workflow to have created the draft release
|
|
||||||
for i in $(seq 1 12); do
|
for i in $(seq 1 12); do
|
||||||
RELEASE_ID=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" "https://api.github.com/repos/moku-project/Moku/releases" | jq -r '.[] | select(.tag_name == "v'"$VERSION"'") | .id' | head -1)
|
RELEASE_ID=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
|
||||||
if [ -n "$RELEASE_ID" ]; then break; fi
|
"https://api.github.com/repos/moku-project/Moku/releases" \
|
||||||
echo "Waiting for release to exist... attempt $i"
|
| jq -r '.[] | select(.tag_name == "v${{ github.event.inputs.version }}") | .id' | head -1)
|
||||||
sleep 15
|
[ -n "$RELEASE_ID" ] && break
|
||||||
|
echo "Waiting for release... attempt $i"; sleep 15
|
||||||
done
|
done
|
||||||
|
[ -z "$RELEASE_ID" ] && { echo "ERROR: release not found"; exit 1; }
|
||||||
|
|
||||||
if [ -z "$RELEASE_ID" ]; then
|
upload() {
|
||||||
echo "ERROR: Could not find release for v$VERSION after waiting"
|
curl -s -X POST \
|
||||||
exit 1
|
-H "Authorization: Bearer $GITHUB_TOKEN" \
|
||||||
fi
|
-H "Content-Type: application/octet-stream" \
|
||||||
|
--data-binary @"$1" \
|
||||||
echo "Found release ID: $RELEASE_ID"
|
"https://uploads.github.com/repos/moku-project/Moku/releases/$RELEASE_ID/assets?name=$2"
|
||||||
|
|
||||||
upload_asset() {
|
|
||||||
local file="$1"
|
|
||||||
local name="$2"
|
|
||||||
echo "Uploading $name..."
|
|
||||||
curl -s -X POST -H "Authorization: Bearer $GITHUB_TOKEN" -H "Content-Type: application/octet-stream" --data-binary @"$file" "https://uploads.github.com/repos/moku-project/Moku/releases/$RELEASE_ID/assets?name=$name"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ARM64_DMG=$(find src-tauri/target/aarch64-apple-darwin/release/bundle/dmg -name "*.dmg" | head -1)
|
ARM64=$(find src-tauri/target/aarch64-apple-darwin/release/bundle/dmg -name "*.dmg" | head -1)
|
||||||
X64_DMG=$(find src-tauri/target/x86_64-apple-darwin/release/bundle/dmg -name "*.dmg" | head -1)
|
X64=$(find src-tauri/target/x86_64-apple-darwin/release/bundle/dmg -name "*.dmg" | head -1)
|
||||||
|
[ -n "$ARM64" ] && upload "$ARM64" "moku-macos-arm64-${{ github.event.inputs.version }}.dmg"
|
||||||
[ -n "$ARM64_DMG" ] && upload_asset "$ARM64_DMG" "moku-macos-arm64-${VERSION}.dmg"
|
[ -n "$X64" ] && upload "$X64" "moku-macos-x64-${{ github.event.inputs.version }}.dmg"
|
||||||
[ -n "$X64_DMG" ] && upload_asset "$X64_DMG" "moku-macos-x64-${VERSION}.dmg"
|
|
||||||
|
|||||||
@@ -16,120 +16,81 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- uses: pnpm/action-setup@v4
|
- uses: pnpm/action-setup@v4
|
||||||
with:
|
with: { version: latest }
|
||||||
version: latest
|
|
||||||
|
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 22
|
node-version: 22
|
||||||
cache: pnpm
|
cache: pnpm
|
||||||
|
- run: pnpm install --frozen-lockfile
|
||||||
- name: Install dependencies
|
- run: pnpm build:static
|
||||||
run: pnpm install --frozen-lockfile
|
- uses: actions/upload-artifact@v4
|
||||||
|
with: { name: frontend-dist-windows, path: dist/, retention-days: 1 }
|
||||||
- name: Build
|
|
||||||
run: pnpm build
|
|
||||||
|
|
||||||
- name: Upload dist
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: frontend-dist-windows
|
|
||||||
path: dist/
|
|
||||||
retention-days: 1
|
|
||||||
|
|
||||||
tauri:
|
tauri:
|
||||||
name: Tauri (Windows x64)
|
name: Tauri (Windows x64)
|
||||||
needs: frontend
|
needs: frontend
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Download frontend dist
|
- uses: actions/download-artifact@v4
|
||||||
uses: actions/download-artifact@v4
|
with: { name: frontend-dist-windows, path: dist/ }
|
||||||
with:
|
|
||||||
name: frontend-dist-windows
|
|
||||||
path: dist/
|
|
||||||
|
|
||||||
- name: Install Rust
|
- name: Read versions
|
||||||
uses: dtolnay/rust-toolchain@stable
|
shell: bash
|
||||||
with:
|
run: |
|
||||||
targets: x86_64-pc-windows-msvc
|
source .github/read_versions.sh
|
||||||
|
echo "SUWA_VERSION=$SUWA_VERSION" >> $GITHUB_ENV
|
||||||
|
echo "SUWA_HASH=$SUWA_HASH_WINDOWS" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Rust cache
|
- uses: dtolnay/rust-toolchain@stable
|
||||||
uses: Swatinem/rust-cache@v2
|
with: { targets: x86_64-pc-windows-msvc }
|
||||||
with:
|
|
||||||
workspaces: src-tauri
|
- uses: Swatinem/rust-cache@v2
|
||||||
|
with: { workspaces: src-tauri }
|
||||||
|
|
||||||
- uses: pnpm/action-setup@v4
|
- uses: pnpm/action-setup@v4
|
||||||
with:
|
with: { version: latest }
|
||||||
version: latest
|
|
||||||
|
|
||||||
- uses: actions/setup-node@v4
|
- uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 22
|
node-version: 22
|
||||||
cache: pnpm
|
cache: pnpm
|
||||||
|
- run: pnpm install --frozen-lockfile
|
||||||
- name: Install JS dependencies
|
|
||||||
run: pnpm install --frozen-lockfile
|
|
||||||
|
|
||||||
- name: Download Suwayomi (Windows x64)
|
- name: Download Suwayomi (Windows x64)
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
curl -fsSL \
|
curl -fsSL \
|
||||||
"https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v2.1.2087/Suwayomi-Server-v2.1.2087-windows-x64.zip" \
|
"https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v${SUWA_VERSION}/Suwayomi-Server-v${SUWA_VERSION}-windows-x64.zip" \
|
||||||
-o suwayomi-windows.zip
|
-o suwayomi-windows.zip
|
||||||
echo "65c3ec544190bc4e52f8ba05b49c87448421d9825aaaeb902cb4e34e69ff7207 suwayomi-windows.zip" | sha256sum -c -
|
echo "${SUWA_HASH} suwayomi-windows.zip" | sha256sum -c -
|
||||||
unzip -q suwayomi-windows.zip -d suwayomi-raw
|
unzip -q suwayomi-windows.zip -d suwayomi-raw
|
||||||
|
|
||||||
- name: Extract Suwayomi bundle
|
- name: Stage Suwayomi bundle
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
mkdir -p suwayomi-extracted
|
mkdir -p suwayomi-extracted
|
||||||
TOP_DIRS=$(find suwayomi-raw -mindepth 1 -maxdepth 1 -type d | wc -l)
|
TOP_DIRS=$(find suwayomi-raw -mindepth 1 -maxdepth 1 -type d | wc -l)
|
||||||
TOP_FILES=$(find suwayomi-raw -mindepth 1 -maxdepth 1 -type f | wc -l)
|
TOP_FILES=$(find suwayomi-raw -mindepth 1 -maxdepth 1 -type f | wc -l)
|
||||||
if [ "$TOP_DIRS" -eq 1 ] && [ "$TOP_FILES" -eq 0 ]; then
|
if [ "$TOP_DIRS" -eq 1 ] && [ "$TOP_FILES" -eq 0 ]; then
|
||||||
INNER=$(find suwayomi-raw -mindepth 1 -maxdepth 1 -type d | head -1)
|
cp -r "$(find suwayomi-raw -mindepth 1 -maxdepth 1 -type d | head -1)"/. suwayomi-extracted/
|
||||||
cp -r "$INNER"/. suwayomi-extracted/
|
|
||||||
else
|
else
|
||||||
cp -r suwayomi-raw/. suwayomi-extracted/
|
cp -r suwayomi-raw/. suwayomi-extracted/
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Stage Suwayomi bundle
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
mkdir -p src-tauri/binaries
|
mkdir -p src-tauri/binaries
|
||||||
JAVA=$(find suwayomi-extracted -path "*/jre/bin/java.exe" | head -1)
|
find suwayomi-extracted -path "*/jre/bin/java.exe" | grep -q . \
|
||||||
JAR=$(find suwayomi-extracted -name "Suwayomi-Server.jar" | head -1)
|
|| { echo "ERROR: java.exe not found"; find suwayomi-extracted -type f | head -50; exit 1; }
|
||||||
if [ -z "$JAVA" ]; then
|
find suwayomi-extracted -name "Suwayomi-Server.jar" | grep -q . \
|
||||||
echo "ERROR: jre/bin/java.exe not found"
|
|| { echo "ERROR: Suwayomi-Server.jar not found"; find suwayomi-extracted -type f | head -50; exit 1; }
|
||||||
find suwayomi-extracted -type f | head -50
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
if [ -z "$JAR" ]; then
|
|
||||||
echo "ERROR: Suwayomi-Server.jar not found"
|
|
||||||
find suwayomi-extracted -type f | head -50
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
cp -r suwayomi-extracted src-tauri/binaries/suwayomi-bundle
|
cp -r suwayomi-extracted src-tauri/binaries/suwayomi-bundle
|
||||||
|
|
||||||
- name: Validate staging
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
find src-tauri/binaries/suwayomi-bundle -path "*/jre/bin/java.exe" \
|
|
||||||
| grep -q . || (echo "ERROR: jre/bin/java.exe missing" && exit 1)
|
|
||||||
find src-tauri/binaries/suwayomi-bundle -name "Suwayomi-Server.jar" \
|
|
||||||
| grep -q . || (echo "ERROR: Suwayomi-Server.jar missing" && exit 1)
|
|
||||||
echo "Staging OK"
|
|
||||||
|
|
||||||
- name: Patch tauri.conf.json for CI
|
- name: Patch tauri.conf.json for CI
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
sed -i 's/"beforeBuildCommand": "pnpm build"/"beforeBuildCommand": ""/' src-tauri/tauri.conf.json
|
sed -i 's/"beforeBuildCommand": "pnpm build"/"beforeBuildCommand": ""/' src-tauri/tauri.conf.json
|
||||||
|
|
||||||
- name: Delete existing draft release if present
|
- name: Delete existing draft release
|
||||||
shell: bash
|
shell: bash
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
@@ -138,14 +99,10 @@ jobs:
|
|||||||
"https://api.github.com/repos/moku-project/Moku/releases" \
|
"https://api.github.com/repos/moku-project/Moku/releases" \
|
||||||
| jq -r '.[] | select(.tag_name == "v${{ github.event.inputs.version }}" and .draft == true) | .id')
|
| jq -r '.[] | select(.tag_name == "v${{ github.event.inputs.version }}" and .draft == true) | .id')
|
||||||
if [ -n "$RELEASE_ID" ]; then
|
if [ -n "$RELEASE_ID" ]; then
|
||||||
echo "Deleting existing draft release $RELEASE_ID"
|
|
||||||
curl -s -X DELETE -H "Authorization: Bearer $GITHUB_TOKEN" \
|
curl -s -X DELETE -H "Authorization: Bearer $GITHUB_TOKEN" \
|
||||||
"https://api.github.com/repos/moku-project/Moku/releases/$RELEASE_ID"
|
"https://api.github.com/repos/moku-project/Moku/releases/$RELEASE_ID"
|
||||||
curl -s -X DELETE -H "Authorization: Bearer $GITHUB_TOKEN" \
|
curl -s -X DELETE -H "Authorization: Bearer $GITHUB_TOKEN" \
|
||||||
"https://api.github.com/repos/moku-project/Moku/git/refs/tags/v${{ github.event.inputs.version }}"
|
"https://api.github.com/repos/moku-project/Moku/git/refs/tags/v${{ github.event.inputs.version }}"
|
||||||
echo "Deleted draft release and tag"
|
|
||||||
else
|
|
||||||
echo "No existing draft release found"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Build Tauri app + create draft release
|
- name: Build Tauri app + create draft release
|
||||||
@@ -158,10 +115,10 @@ jobs:
|
|||||||
releaseBody: |
|
releaseBody: |
|
||||||
Moku v${{ github.event.inputs.version }}
|
Moku v${{ github.event.inputs.version }}
|
||||||
|
|
||||||
**Windows:** Download `Moku_${{ github.event.inputs.version }}_x64-setup.exe`
|
**Windows:** `Moku_${{ github.event.inputs.version }}_x64-setup.exe`
|
||||||
**macOS arm64:** Download `moku-macos-arm64-${{ github.event.inputs.version }}.dmg`
|
**macOS arm64:** `moku-macos-arm64-${{ github.event.inputs.version }}.dmg`
|
||||||
**macOS x64:** Download `moku-macos-x64-${{ github.event.inputs.version }}.dmg`
|
**macOS x64:** `moku-macos-x64-${{ github.event.inputs.version }}.dmg`
|
||||||
**Linux:** Download `moku.flatpak`
|
**Linux:** `moku.flatpak`
|
||||||
releaseDraft: true
|
releaseDraft: true
|
||||||
prerelease: false
|
prerelease: false
|
||||||
args: --target x86_64-pc-windows-msvc --config src-tauri/tauri.windows.conf.json
|
args: --target x86_64-pc-windows-msvc --config src-tauri/tauri.windows.conf.json
|
||||||
+17
-10
@@ -1,30 +1,33 @@
|
|||||||
# --- Build Artifacts ---
|
|
||||||
node_modules/
|
node_modules/
|
||||||
suwayomi-raw/
|
suwayomi-raw/
|
||||||
suwayomi-windows.zip
|
suwayomi-windows.zip
|
||||||
suwayomi.zip
|
|
||||||
dist/
|
dist/
|
||||||
dist-tauri/
|
dist-tauri/
|
||||||
target/
|
target/
|
||||||
bin/
|
bin/
|
||||||
out/
|
out/
|
||||||
|
|
||||||
|
|
||||||
# --- Nix ---
|
|
||||||
.direnv/
|
.direnv/
|
||||||
result
|
result
|
||||||
result-*
|
result-*
|
||||||
|
|
||||||
# --- Logs ---
|
|
||||||
*.log
|
*.log
|
||||||
npm-debug.log*
|
npm-debug.log*
|
||||||
yarn-debug.log*
|
yarn-debug.log*
|
||||||
yarn-error.log*
|
|
||||||
.env
|
.env
|
||||||
|
.env.*
|
||||||
|
!.env.example
|
||||||
|
!.env.test
|
||||||
.env.local
|
.env.local
|
||||||
.env.*.local
|
.env.*.local
|
||||||
|
|
||||||
# --- IDEs & OS ---
|
.output
|
||||||
|
.vercel
|
||||||
|
.netlify
|
||||||
|
.wrangler
|
||||||
|
/.svelte-kit
|
||||||
|
/build
|
||||||
|
|
||||||
.vscode/
|
.vscode/
|
||||||
.idea/
|
.idea/
|
||||||
.DS_Store
|
.DS_Store
|
||||||
@@ -34,15 +37,19 @@ yarn-error.log*
|
|||||||
*.sln
|
*.sln
|
||||||
*.swp
|
*.swp
|
||||||
|
|
||||||
# --- Tauri specific ---
|
|
||||||
src-tauri/target/
|
src-tauri/target/
|
||||||
src-tauri/binaries/
|
src-tauri/binaries/
|
||||||
src-tauri/gen/
|
src-tauri/gen/
|
||||||
|
|
||||||
# --- Flatpak build artifacts ---
|
.DS_Store
|
||||||
|
Thumbs.db
|
||||||
|
|
||||||
|
vite.config.js.timestamp-*
|
||||||
|
vite.config.ts.timestamp-*
|
||||||
|
|
||||||
build-dir/
|
build-dir/
|
||||||
repo/
|
repo/
|
||||||
dist/
|
dist/
|
||||||
packaging/frontend-dist.tar.gz
|
packaging/frontend-dist.tar.gz
|
||||||
*.flatpak
|
*.flatpak
|
||||||
.flatpak-builder/\n# --- Staged sidecar binaries (platform-specific, never commit) ---\nsrc-tauri/binaries/
|
./flatpak-builder
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ Moku is a fast, minimal manga reader frontend for [Suwayomi-Server](https://gith
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div align="center">
|
<div align="center">
|
||||||
<a href="docs/screenshots" style="color: #a8c4a8;">View all screenshots →</a>
|
<a href="docs/screenshots">View all screenshots →</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -46,8 +46,8 @@ Moku is a fast, minimal manga reader frontend for [Suwayomi-Server](https://gith
|
|||||||
- **Markers** — pin color-coded notes to any page while reading; markers appear as dots on the progress bar and are browseable under Series Detail → Manage → Markers
|
- **Markers** — pin color-coded notes to any page while reading; markers appear as dots on the progress bar and are browseable under Series Detail → Manage → Markers
|
||||||
- **Extension support** — install and manage Suwayomi extensions directly from the app
|
- **Extension support** — install and manage Suwayomi extensions directly from the app
|
||||||
- **Download management** — queue and monitor chapter downloads with progress toasts
|
- **Download management** — queue and monitor chapter downloads with progress toasts
|
||||||
- **Automation** — pre-download titles automatically and optionally delete chapters after they're marked as read (accessible from Series Detail)
|
- **Automation** — pre-download titles automatically and optionally delete chapters after reading (accessible from Series Detail)
|
||||||
- **Discord Rich Presence** — shows the manga title, current chapter, and an elapsed timer in your Discord status; configurable in Settings → General
|
- **Discord Rich Presence** — shows manga title, current chapter, and elapsed timer in your Discord status; configurable in Settings → General
|
||||||
- **Auto-start server** — optionally launch Suwayomi in the background on startup
|
- **Auto-start server** — optionally launch Suwayomi in the background on startup
|
||||||
- **Multiple themes** — Dark, Light, Midnight, Warm, High Contrast, and more
|
- **Multiple themes** — Dark, Light, Midnight, Warm, High Contrast, and more
|
||||||
- **Auto-updates** — in-app update checker with silent background notifications
|
- **Auto-updates** — in-app update checker with silent background notifications
|
||||||
@@ -61,7 +61,7 @@ Moku is a fast, minimal manga reader frontend for [Suwayomi-Server](https://gith
|
|||||||
|
|
||||||

|

|
||||||

|

|
||||||

|

|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -148,9 +148,9 @@ pnpm tauri:dev
|
|||||||
| | |
|
| | |
|
||||||
|---|---|
|
|---|---|
|
||||||
| [Tauri v2](https://tauri.app) | Native app shell |
|
| [Tauri v2](https://tauri.app) | Native app shell |
|
||||||
| [Svelte 5](https://svelte.dev) + [TypeScript](https://www.typescriptlang.org) | UI |
|
| [Svelte 5](https://svelte.dev) + [SvelteKit 2](https://kit.svelte.dev) + [TypeScript](https://www.typescriptlang.org) | UI |
|
||||||
| [Vite](https://vitejs.dev) | Frontend bundler |
|
| [Vite 8](https://vitejs.dev) | Frontend bundler |
|
||||||
| [Crane](https://github.com/ipetkov/crane) | Nix Rust builds |
|
| [Nixpkgs stdenv](https://nixos.org/manual/nixpkgs/stable/) | Nix builds |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -1,39 +1,4 @@
|
|||||||
Major Revisions:
|
Revival of the TODO List!!!!!
|
||||||
- Moku-Share to Easily Migrate/Share Manga (Investigate Usecase/Feasibility)
|
|
||||||
- Moku-Share allows exporting of Manga
|
|
||||||
- Compressed Format (Storage)
|
|
||||||
- Import as Local-Source
|
|
||||||
- Takes existing Local-Source or Creates Own
|
|
||||||
|
|
||||||
Minor Revisions:
|
|
||||||
- Investigate feasibility of Multi-Page Screenshot (Reader)
|
|
||||||
- Revise Migration (https://github.com/Suwayomi/Suwayomi-WebUI/pull/1073)
|
|
||||||
|
|
||||||
Priority Bugs:
|
- Reminder to Completely Test Settings
|
||||||
- Fix Library-Refresh System (TESTING)
|
|
||||||
|
|
||||||
- Suwayomi RESET
|
|
||||||
- Allow User to Wipe Suwayomi (Scratch)
|
|
||||||
- If Possible, Component based Wipe (Library, Etc)
|
|
||||||
|
|
||||||
Pending/On-Hold:
|
|
||||||
- Enable Cloudflare Bypass (Suwayomi Config) (Requires Patching)
|
|
||||||
- Working on 3D Display Cards
|
|
||||||
- Add Flathub Support (Pending Video)
|
|
||||||
|
|
||||||
- Change Auto-Link Threshold
|
|
||||||
- Fix Auto-Link De-dupe for Images
|
|
||||||
- Optimize Auto-Link Latency (IP)
|
|
||||||
|
|
||||||
In-Progress:
|
|
||||||
- Fix Tracking Login
|
|
||||||
- Pasting OAuth URL is not User-Friendly, Look for Alternatives
|
|
||||||
|
|
||||||
- Apply Syer's Fix for Library on Backup Load (Manga Metadata)
|
|
||||||
- Note User's have to always install extensions manually
|
|
||||||
- Create "Missing Source" for Manga
|
|
||||||
|
|
||||||
- Wire Series-Detail Refresh to Fix Manga-Metadata (MAJOR)
|
|
||||||
|
|
||||||
- UI LOGIN DOES NOT WORK OFFLINE
|
|
||||||
Notes from last time:
|
|
||||||
|
|||||||
@@ -0,0 +1,99 @@
|
|||||||
|
#Requires -Version 7
|
||||||
|
param(
|
||||||
|
[switch]$SkipFrontend,
|
||||||
|
[switch]$SkipSuwayomi
|
||||||
|
)
|
||||||
|
|
||||||
|
Set-StrictMode -Version Latest
|
||||||
|
$ErrorActionPreference = "Stop"
|
||||||
|
|
||||||
|
function Step($msg) { Write-Host "`n==> $msg" -ForegroundColor Cyan }
|
||||||
|
function Need($cmd) {
|
||||||
|
if (-not (Get-Command $cmd -ErrorAction SilentlyContinue)) {
|
||||||
|
Write-Error "Required tool not found: $cmd"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$Root = Split-Path -Parent $MyInvocation.MyCommand.Path
|
||||||
|
Set-Location $Root
|
||||||
|
|
||||||
|
Step "Reading nix/versions.nix"
|
||||||
|
$nix = Get-Content "$Root\nix\versions.nix" -Raw
|
||||||
|
$MOKU_VERSION = if ($nix -match 'moku\s*=\s*"([^"]+)"') { $Matches[1] } else { Write-Error "moku version not found" }
|
||||||
|
$SUWA_VERSION = if ($nix -match 'version\s*=\s*"([^"]+)"') { $Matches[1] } else { Write-Error "suwayomi version not found" }
|
||||||
|
$SUWA_HASH = if ($nix -match 'windowsHash\s*=\s*"([^"]+)"') { $Matches[1] } else { Write-Error "windowsHash not found" }
|
||||||
|
Write-Host " moku=$MOKU_VERSION suwayomi=$SUWA_VERSION"
|
||||||
|
|
||||||
|
Need "pnpm"; Need "cargo"; Need "node"
|
||||||
|
|
||||||
|
if (-not $SkipFrontend) {
|
||||||
|
Step "pnpm install"
|
||||||
|
pnpm install --frozen-lockfile
|
||||||
|
if ($LASTEXITCODE -ne 0) { Write-Error "pnpm install failed" }
|
||||||
|
|
||||||
|
Step "Frontend build"
|
||||||
|
$env:MOKU_TARGET = "static"
|
||||||
|
pnpm build:static
|
||||||
|
if ($LASTEXITCODE -ne 0) { Write-Error "Frontend build failed" }
|
||||||
|
}
|
||||||
|
|
||||||
|
$BundleDir = "$Root\src-tauri\binaries\suwayomi-bundle"
|
||||||
|
$ZipPath = "$env:TEMP\suwayomi-windows-$SUWA_VERSION.zip"
|
||||||
|
$ExtractDir = "$env:TEMP\suwayomi-extracted-$SUWA_VERSION"
|
||||||
|
|
||||||
|
if (-not $SkipSuwayomi) {
|
||||||
|
Step "Downloading Suwayomi v$SUWA_VERSION"
|
||||||
|
$ZipUrl = "https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v${SUWA_VERSION}/Suwayomi-Server-v${SUWA_VERSION}-windows-x64.zip"
|
||||||
|
|
||||||
|
if (-not (Test-Path $ZipPath)) {
|
||||||
|
Invoke-WebRequest -Uri $ZipUrl -OutFile $ZipPath -UseBasicParsing
|
||||||
|
}
|
||||||
|
|
||||||
|
$actual = (Get-FileHash $ZipPath -Algorithm SHA256).Hash.ToLower()
|
||||||
|
if ($actual -ne $SUWA_HASH.ToLower()) {
|
||||||
|
Write-Error "Hash mismatch`n expected: $SUWA_HASH`n got: $actual"
|
||||||
|
}
|
||||||
|
|
||||||
|
Step "Staging bundle"
|
||||||
|
if (Test-Path $ExtractDir) { Remove-Item $ExtractDir -Recurse -Force }
|
||||||
|
Expand-Archive -Path $ZipPath -DestinationPath $ExtractDir
|
||||||
|
|
||||||
|
$topDirs = @(Get-ChildItem $ExtractDir -Directory)
|
||||||
|
$topFiles = @(Get-ChildItem $ExtractDir -File)
|
||||||
|
$SrcDir = if ($topDirs.Count -eq 1 -and $topFiles.Count -eq 0) { $topDirs[0].FullName } else { $ExtractDir }
|
||||||
|
|
||||||
|
if (Test-Path $BundleDir) { Remove-Item $BundleDir -Recurse -Force }
|
||||||
|
Copy-Item $SrcDir $BundleDir -Recurse
|
||||||
|
|
||||||
|
$java = Get-ChildItem $BundleDir -Recurse -Filter "java.exe" | Where-Object { $_.FullName -match "jre.bin" } | Select-Object -First 1
|
||||||
|
$jar = Get-ChildItem $BundleDir -Recurse -Filter "Suwayomi-Server.jar" | Select-Object -First 1
|
||||||
|
if (-not $java) { Write-Error "java.exe not found in staged bundle" }
|
||||||
|
if (-not $jar) { Write-Error "Suwayomi-Server.jar not found in staged bundle" }
|
||||||
|
Write-Host " java: $($java.FullName)"
|
||||||
|
Write-Host " jar: $($jar.FullName)"
|
||||||
|
} elseif (-not (Test-Path $BundleDir)) {
|
||||||
|
Write-Error "Bundle dir missing at $BundleDir — run without -SkipSuwayomi first"
|
||||||
|
}
|
||||||
|
|
||||||
|
Step "Patching tauri.conf.json"
|
||||||
|
$tauriConf = "$Root\src-tauri\tauri.conf.json"
|
||||||
|
$original = Get-Content $tauriConf -Raw
|
||||||
|
Set-Content $tauriConf ($original -replace '"beforeBuildCommand":\s*"pnpm build"', '"beforeBuildCommand": ""') -NoNewline
|
||||||
|
|
||||||
|
Step "Tauri build"
|
||||||
|
$env:TAURI_SKIP_DEVSERVER_CHECK = "true"
|
||||||
|
pnpm tauri build --target x86_64-pc-windows-msvc --config src-tauri/tauri.windows.conf.json
|
||||||
|
$buildExit = $LASTEXITCODE
|
||||||
|
|
||||||
|
Set-Content $tauriConf $original -NoNewline
|
||||||
|
|
||||||
|
if ($buildExit -ne 0) { Write-Error "Tauri build failed (exit $buildExit)" }
|
||||||
|
|
||||||
|
Step "Artifacts"
|
||||||
|
$out = "$Root\src-tauri\target\x86_64-pc-windows-msvc\release\bundle"
|
||||||
|
$msi = Get-ChildItem "$out\msi" -Filter "*.msi" -ErrorAction SilentlyContinue | Select-Object -First 1
|
||||||
|
$exe = Get-ChildItem "$out\nsis" -Filter "*.exe" -ErrorAction SilentlyContinue | Select-Object -First 1
|
||||||
|
Write-Host "`nDone — Moku $MOKU_VERSION" -ForegroundColor Green
|
||||||
|
if ($msi) { Write-Host " MSI: $($msi.FullName)" -ForegroundColor Yellow }
|
||||||
|
if ($exe) { Write-Host " EXE: $($exe.FullName)" -ForegroundColor Yellow }
|
||||||
|
if (-not $msi -and -not $exe) { Write-Host " No artifacts found in $out" -ForegroundColor Red }
|
||||||
Generated
+12
-28
@@ -1,30 +1,15 @@
|
|||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"crane": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1773857772,
|
|
||||||
"narHash": "sha256-5xsK26KRHf0WytBtsBnQYC/lTWDhQuT57HJ7SzuqZcM=",
|
|
||||||
"owner": "ipetkov",
|
|
||||||
"repo": "crane",
|
|
||||||
"rev": "b556d7bbae5ff86e378451511873dfd07e4504cd",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "ipetkov",
|
|
||||||
"repo": "crane",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-parts": {
|
"flake-parts": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs-lib": "nixpkgs-lib"
|
"nixpkgs-lib": "nixpkgs-lib"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772408722,
|
"lastModified": 1778716662,
|
||||||
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
|
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
|
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -35,11 +20,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773821835,
|
"lastModified": 1780243769,
|
||||||
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
|
"narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
|
"rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -51,11 +36,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-lib": {
|
"nixpkgs-lib": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772328832,
|
"lastModified": 1777168982,
|
||||||
"narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
|
"narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixpkgs.lib",
|
"repo": "nixpkgs.lib",
|
||||||
"rev": "c185c7a5e5dd8f9add5b2f8ebeff00888b070742",
|
"rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -66,7 +51,6 @@
|
|||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"crane": "crane",
|
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
@@ -79,11 +63,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773975983,
|
"lastModified": 1780543271,
|
||||||
"narHash": "sha256-zrRVwdfhDdohANqEhzY/ydeza6EXEi8AG6cyMRNYT9Q=",
|
"narHash": "sha256-oPJ7eJN1sM37v92Rp/eyQL7/rUm0BOvXEBAoq/zN0cM=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "cc80954a95f6f356c303ed9f08d0b63ca86216ac",
|
"rev": "c30ca201c5093540cf792f6982f81ba1aa0f3514",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||||
crane.url = "github:ipetkov/crane";
|
|
||||||
rust-overlay = {
|
rust-overlay = {
|
||||||
url = "github:oxalica/rust-overlay";
|
url = "github:oxalica/rust-overlay";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@@ -12,7 +11,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
inputs@{ flake-parts, crane, rust-overlay, ... }:
|
inputs@{ flake-parts, rust-overlay, ... }:
|
||||||
flake-parts.lib.mkFlake { inherit inputs; } {
|
flake-parts.lib.mkFlake { inherit inputs; } {
|
||||||
systems = [
|
systems = [
|
||||||
"x86_64-linux"
|
"x86_64-linux"
|
||||||
@@ -22,7 +21,8 @@
|
|||||||
perSystem =
|
perSystem =
|
||||||
{ system, lib, ... }:
|
{ system, lib, ... }:
|
||||||
let
|
let
|
||||||
version = "0.9.4";
|
versions = import ./nix/versions.nix;
|
||||||
|
version = versions.moku;
|
||||||
|
|
||||||
pkgs = import inputs.nixpkgs {
|
pkgs = import inputs.nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
@@ -36,8 +36,6 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain;
|
|
||||||
|
|
||||||
runtimeLibs = with pkgs; [
|
runtimeLibs = with pkgs; [
|
||||||
webkitgtk_4_1
|
webkitgtk_4_1
|
||||||
gtk3
|
gtk3
|
||||||
@@ -53,7 +51,7 @@
|
|||||||
gsettings-desktop-schemas
|
gsettings-desktop-schemas
|
||||||
];
|
];
|
||||||
|
|
||||||
frontendSrc = lib.cleanSourceWith {
|
src = lib.cleanSourceWith {
|
||||||
src = ./.;
|
src = ./.;
|
||||||
filter =
|
filter =
|
||||||
path: type:
|
path: type:
|
||||||
@@ -61,51 +59,46 @@
|
|||||||
base = builtins.baseNameOf path;
|
base = builtins.baseNameOf path;
|
||||||
in
|
in
|
||||||
(lib.hasInfix "/src" path)
|
(lib.hasInfix "/src" path)
|
||||||
|
|| (lib.hasInfix "/src-tauri/src" path)
|
||||||
|
|| (lib.hasInfix "/src-tauri/icons" path)
|
||||||
|
|| (lib.hasInfix "/src-tauri/capabilities" path)
|
||||||
|
|| (lib.hasInfix "/static" path)
|
||||||
|| base == "index.html"
|
|| base == "index.html"
|
||||||
|| base == "package.json"
|
|| base == "package.json"
|
||||||
|| base == "pnpm-lock.yaml"
|
|| base == "pnpm-lock.yaml"
|
||||||
|
|| base == "pnpm-workspace.yaml"
|
||||||
|| base == "tsconfig.json"
|
|| base == "tsconfig.json"
|
||||||
|| base == "vite.config.ts";
|
|| base == "vite.config.ts"
|
||||||
|
|| base == "svelte.config.js"
|
||||||
|
|| base == "Cargo.toml"
|
||||||
|
|| base == "Cargo.lock"
|
||||||
|
|| base == "build.rs"
|
||||||
|
|| base == "tauri.conf.json";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSrc = lib.cleanSourceWith {
|
suwayomiServer = pkgs.callPackage ./nix/server.nix { inherit versions; };
|
||||||
src = ./src-tauri;
|
|
||||||
filter =
|
moku = pkgs.callPackage ./nix/moku.nix {
|
||||||
path: type:
|
inherit lib pkgs rustToolchain runtimeLibs suwayomiServer version src versions;
|
||||||
(craneLib.filterCargoSources path type)
|
appIcon = ./src/lib/assets/moku-icon.svg;
|
||||||
|| (lib.hasInfix "/icons/" path)
|
|
||||||
|| (lib.hasInfix "/capabilities/" path)
|
|
||||||
|| (builtins.baseNameOf path == "tauri.conf.json");
|
|
||||||
};
|
};
|
||||||
|
|
||||||
suwayomiServer = pkgs.callPackage ./nix/server.nix { };
|
scripts = import ./nix/scripts.nix { inherit pkgs rustToolchain version versions; };
|
||||||
|
|
||||||
frontend = pkgs.callPackage ./nix/frontend.nix {
|
|
||||||
inherit version;
|
|
||||||
src = frontendSrc;
|
|
||||||
};
|
|
||||||
|
|
||||||
moku = import ./nix/moku.nix {
|
|
||||||
inherit lib craneLib pkgs runtimeLibs frontend suwayomiServer version cargoSrc;
|
|
||||||
appIcon = ./src/assets/moku-icon.svg;
|
|
||||||
};
|
|
||||||
|
|
||||||
scripts = import ./nix/scripts.nix { inherit pkgs rustToolchain version; };
|
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
packages = {
|
packages = {
|
||||||
inherit moku frontend suwayomiServer;
|
inherit moku suwayomiServer;
|
||||||
default = moku;
|
default = moku;
|
||||||
};
|
};
|
||||||
|
|
||||||
apps = {
|
apps = {
|
||||||
default = { type = "app"; program = "${moku}/bin/moku"; };
|
default = { type = "app"; program = "${moku}/bin/moku"; };
|
||||||
moku = { type = "app"; program = "${moku}/bin/moku"; };
|
moku = { type = "app"; program = "${moku}/bin/moku"; };
|
||||||
bump = { type = "app"; program = "${scripts.bump}/bin/moku-bump"; };
|
bump = { type = "app"; program = "${scripts.bump}/bin/moku-bump"; };
|
||||||
post-tag-bump = { type = "app"; program = "${scripts.postTagBump}/bin/moku-post-tag-bump"; };
|
update = { type = "app"; program = "${scripts.update}/bin/moku-update"; };
|
||||||
flatpak = { type = "app"; program = "${scripts.flatpak}/bin/moku-flatpak"; };
|
flatpak = { type = "app"; program = "${scripts.flatpak}/bin/moku-flatpak"; };
|
||||||
tunnel = { type = "app"; program = "${scripts.tunnel}/bin/moku-tunnel"; };
|
tunnel = { type = "app"; program = "${scripts.tunnel}/bin/moku-tunnel"; };
|
||||||
};
|
};
|
||||||
|
|
||||||
devShells.default = pkgs.mkShell {
|
devShells.default = pkgs.mkShell {
|
||||||
@@ -132,11 +125,11 @@
|
|||||||
|
|
||||||
echo "Moku dev shell — pnpm install && pnpm tauri:dev"
|
echo "Moku dev shell — pnpm install && pnpm tauri:dev"
|
||||||
echo ""
|
echo ""
|
||||||
echo " nix run .#bump -- <ver>"
|
echo " nix run .#bump -- <ver> bump version + rebuild frontend"
|
||||||
echo " git commit && git tag && git push"
|
echo " git commit && git tag && git push"
|
||||||
echo " nix run .#post-tag-bump -- <ver>"
|
echo " nix run .#update -- <ver> fetch hashes + patch all configs"
|
||||||
echo " nix run .#flatpak -- <ver>"
|
echo " nix run .#flatpak build flatpak bundle"
|
||||||
echo " nix run .#tunnel -- [port]"
|
echo " nix run .#tunnel -- [port] expose local server via cloudflare"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -220,8 +220,8 @@ modules:
|
|||||||
|
|
||||||
sources:
|
sources:
|
||||||
- type: file
|
- type: file
|
||||||
url: https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v2.1.2087/Suwayomi-Server-v2.1.2087.jar
|
url: https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v2.2.2196/Suwayomi-Server-v2.2.2196.jar
|
||||||
sha256: f589a422674252394c13b289a9c8be691905bf583efb7f4d5f1501ae5e91e6b3
|
sha256: 8e7244c269456661a87705f746f0d87275770aa976bab7c6920e4d513e97c3f6
|
||||||
dest-filename: Suwayomi-Server.jar
|
dest-filename: Suwayomi-Server.jar
|
||||||
|
|
||||||
- name: moku
|
- name: moku
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
{ lib, stdenv, nodejs_22, pnpm, pnpmConfigHook, fetchPnpmDeps, version, src }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
pname = "moku-frontend";
|
|
||||||
inherit version src;
|
|
||||||
|
|
||||||
nativeBuildInputs = [ nodejs_22 pnpm pnpmConfigHook ];
|
|
||||||
|
|
||||||
pnpmDeps = fetchPnpmDeps {
|
|
||||||
pname = "moku-frontend";
|
|
||||||
inherit version src;
|
|
||||||
fetcherVersion = 1;
|
|
||||||
hash = "sha256-vM//1/qe9nKDwwlmFbqvBFqF8cCjIIdNKEtktyzBFB8=";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildPhase = "pnpm build";
|
|
||||||
installPhase = "cp -r dist $out";
|
|
||||||
}
|
|
||||||
+51
-26
@@ -1,38 +1,61 @@
|
|||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
craneLib,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
|
rustToolchain,
|
||||||
runtimeLibs,
|
runtimeLibs,
|
||||||
frontend,
|
|
||||||
suwayomiServer,
|
suwayomiServer,
|
||||||
version,
|
version,
|
||||||
cargoSrc,
|
versions,
|
||||||
|
src,
|
||||||
appIcon,
|
appIcon,
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
pkgs.stdenv.mkDerivation {
|
||||||
commonArgs = {
|
pname = "moku";
|
||||||
src = cargoSrc;
|
inherit version src;
|
||||||
|
|
||||||
|
nativeBuildInputs = with pkgs; [
|
||||||
|
rustToolchain
|
||||||
|
nodejs_22
|
||||||
|
pnpm
|
||||||
|
pnpmConfigHook
|
||||||
|
pkg-config
|
||||||
|
wrapGAppsHook3
|
||||||
|
rustPlatform.cargoSetupHook
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = runtimeLibs;
|
||||||
|
|
||||||
|
pnpmDeps = pkgs.fetchPnpmDeps {
|
||||||
pname = "moku";
|
pname = "moku";
|
||||||
inherit version;
|
inherit version src;
|
||||||
strictDeps = true;
|
fetcherVersion = 3;
|
||||||
buildInputs = runtimeLibs;
|
hash = versions.frontend.pnpmHash;
|
||||||
nativeBuildInputs = with pkgs; [ pkg-config wrapGAppsHook3 ];
|
|
||||||
preBuild = ''
|
|
||||||
cp -r ${frontend} ../dist
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoArtifacts = craneLib.buildDepsOnly commonArgs;
|
cargoDeps = pkgs.rustPlatform.importCargoLock {
|
||||||
in
|
lockFile = ../src-tauri/Cargo.lock;
|
||||||
craneLib.buildPackage (commonArgs // {
|
outputHashes = {
|
||||||
inherit cargoArtifacts;
|
"tauri-plugin-discord-rpc-0.1.0" = versions.gitDeps.tauri-plugin-discord-rpc;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
meta.mainProgram = "moku";
|
env = {
|
||||||
|
PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig";
|
||||||
|
TAURI_SKIP_DEVSERVER_CHECK = "true";
|
||||||
|
cargoRoot = "src-tauri";
|
||||||
|
};
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
export HOME=$(mktemp -d)
|
||||||
|
pnpm tauri:build
|
||||||
|
'';
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
install -Dm755 src-tauri/target/release/moku $out/bin/moku
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
mkdir -p "$out/share/applications"
|
mkdir -p "$out/share/applications"
|
||||||
cat > "$out/share/applications/moku.desktop" << EOF
|
cat > "$out/share/applications/moku.desktop" << EOF2
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Version=1.0
|
Version=1.0
|
||||||
Type=Application
|
Type=Application
|
||||||
@@ -44,17 +67,17 @@ Terminal=false
|
|||||||
Categories=Graphics;Viewer;
|
Categories=Graphics;Viewer;
|
||||||
Keywords=manga;comic;reader;suwayomi;
|
Keywords=manga;comic;reader;suwayomi;
|
||||||
StartupWMClass=moku
|
StartupWMClass=moku
|
||||||
EOF
|
EOF2
|
||||||
|
|
||||||
for size in 32x32 128x128 256x256 512x512; do
|
for size in 32x32 128x128 256x256 512x512; do
|
||||||
src="icons/$size.png"
|
f="src-tauri/icons/$size.png"
|
||||||
[ -f "$src" ] && install -Dm644 "$src" \
|
[ -f "$f" ] && install -Dm644 "$f" \
|
||||||
"$out/share/icons/hicolor/$size/apps/moku.png"
|
"$out/share/icons/hicolor/$size/apps/moku.png"
|
||||||
done
|
done
|
||||||
|
|
||||||
for size in 128x128 256x256; do
|
for size in 128x128 256x256; do
|
||||||
src="icons/''${size}@2x.png"
|
f="src-tauri/icons/''${size}@2x.png"
|
||||||
[ -f "$src" ] && install -Dm644 "$src" \
|
[ -f "$f" ] && install -Dm644 "$f" \
|
||||||
"$out/share/icons/hicolor/''${size}@2/apps/moku.png"
|
"$out/share/icons/hicolor/''${size}@2/apps/moku.png"
|
||||||
done
|
done
|
||||||
|
|
||||||
@@ -71,4 +94,6 @@ EOF
|
|||||||
--set GDK_BACKEND wayland \
|
--set GDK_BACKEND wayland \
|
||||||
--set WEBKIT_DISABLE_SANDBOX_THIS_IS_DANGEROUS 1
|
--set WEBKIT_DISABLE_SANDBOX_THIS_IS_DANGEROUS 1
|
||||||
'';
|
'';
|
||||||
})
|
|
||||||
|
meta.mainProgram = "moku";
|
||||||
|
}
|
||||||
|
|||||||
+84
-61
@@ -1,4 +1,4 @@
|
|||||||
{ pkgs, rustToolchain, version }:
|
{ pkgs, rustToolchain, version, versions }:
|
||||||
|
|
||||||
{
|
{
|
||||||
bump = pkgs.writeShellApplication {
|
bump = pkgs.writeShellApplication {
|
||||||
@@ -17,87 +17,114 @@
|
|||||||
VERSION="$1"
|
VERSION="$1"
|
||||||
REPO="$(git rev-parse --show-toplevel)"
|
REPO="$(git rev-parse --show-toplevel)"
|
||||||
|
|
||||||
echo "── Bumping version fields to $VERSION ──"
|
sed -i "s/moku = \"[^\"]*\"/moku = \"$VERSION\"/" "$REPO/nix/versions.nix"
|
||||||
sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$VERSION\"/" \
|
sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$VERSION\"/" "$REPO/src-tauri/tauri.conf.json"
|
||||||
"$REPO/src-tauri/tauri.conf.json"
|
sed -i "0,/^version = \"[^\"]*\"/s//version = \"$VERSION\"/" "$REPO/src-tauri/Cargo.toml"
|
||||||
sed -i "0,/^version = \"[^\"]*\"/s//version = \"$VERSION\"/" \
|
|
||||||
"$REPO/src-tauri/Cargo.toml"
|
|
||||||
sed -i "s/version = \"[^\"]*\";/version = \"$VERSION\";/g" \
|
|
||||||
"$REPO/flake.nix"
|
|
||||||
sed -i "s/^pkgver=.*/pkgver=$VERSION/" "$REPO/PKGBUILD"
|
sed -i "s/^pkgver=.*/pkgver=$VERSION/" "$REPO/PKGBUILD"
|
||||||
sed -i "s/^pkgrel=.*/pkgrel=1/" "$REPO/PKGBUILD"
|
sed -i "s/^pkgrel=.*/pkgrel=1/" "$REPO/PKGBUILD"
|
||||||
echo "Done"
|
|
||||||
|
|
||||||
echo "── Regenerating Cargo.lock ──"
|
|
||||||
(cd "$REPO/src-tauri" && cargo generate-lockfile)
|
(cd "$REPO/src-tauri" && cargo generate-lockfile)
|
||||||
echo "Done"
|
|
||||||
|
|
||||||
echo "── Building frontend ──"
|
|
||||||
cd "$REPO"
|
cd "$REPO"
|
||||||
pnpm install --frozen-lockfile
|
pnpm install --frozen-lockfile
|
||||||
pnpm build
|
pnpm build:static
|
||||||
echo "Done"
|
|
||||||
|
|
||||||
echo "── Repacking frontend-dist.tar.gz ──"
|
|
||||||
tar -czf "$REPO/packaging/frontend-dist.tar.gz" -C "$REPO" dist
|
tar -czf "$REPO/packaging/frontend-dist.tar.gz" -C "$REPO" dist
|
||||||
FRONTEND_SHA=$(sha256sum "$REPO/packaging/frontend-dist.tar.gz" | awk '{print $1}')
|
FRONTEND_SHA_HEX=$(sha256sum "$REPO/packaging/frontend-dist.tar.gz" | awk '{print $1}')
|
||||||
echo "sha256: $FRONTEND_SHA"
|
FRONTEND_SHA_SRI=$(echo "$FRONTEND_SHA_HEX" | xxd -r -p | base64 -w0 | sed 's/^/sha256-/')
|
||||||
|
|
||||||
|
sed -i "s|distHash = \"[^\"]*\"|distHash = \"$FRONTEND_SHA_HEX\"|" "$REPO/nix/versions.nix"
|
||||||
|
sed -i "s|distHashSri = \"[^\"]*\"|distHashSri = \"$FRONTEND_SHA_SRI\"|" "$REPO/nix/versions.nix"
|
||||||
|
|
||||||
|
MANIFEST="$REPO/io.github.moku_project.Moku.yml"
|
||||||
|
sed -i "s/tag: v[^[:space:]]*/tag: v$VERSION/" "$MANIFEST"
|
||||||
|
python3 - "$MANIFEST" "$FRONTEND_SHA_HEX" <<'PYEOF'
|
||||||
|
import re, sys
|
||||||
|
path, sha = sys.argv[1], sys.argv[2]
|
||||||
|
text = open(path).read()
|
||||||
|
updated, n = re.subn(
|
||||||
|
r'(path:\s*packaging/frontend-dist\.tar\.gz\s*\n\s*sha256:\s*)[0-9a-f]+',
|
||||||
|
r'\g<1>' + sha, text)
|
||||||
|
if n == 0:
|
||||||
|
sys.exit("ERROR: could not find frontend-dist sha256 in manifest")
|
||||||
|
open(path, 'w').write(updated)
|
||||||
|
PYEOF
|
||||||
|
|
||||||
echo "── Regenerating cargo-sources.json ──"
|
|
||||||
python3 "$REPO/packaging/flatpak-cargo-generator.py" \
|
python3 "$REPO/packaging/flatpak-cargo-generator.py" \
|
||||||
"$REPO/src-tauri/Cargo.lock" \
|
"$REPO/src-tauri/Cargo.lock" \
|
||||||
-o "$REPO/packaging/cargo-sources.json"
|
-o "$REPO/packaging/cargo-sources.json"
|
||||||
echo "Done"
|
|
||||||
|
|
||||||
echo "── Patching flatpak manifest ──"
|
echo "Bumped to v$VERSION — commit, tag, push, then: nix run .#update -- $VERSION"
|
||||||
MANIFEST="$REPO/io.github.moku_project.Moku.yml"
|
|
||||||
sed -i "s/tag: v[^[:space:]]*/tag: v$VERSION/" "$MANIFEST"
|
|
||||||
python3 - "$MANIFEST" "$FRONTEND_SHA" <<'PYEOF'
|
|
||||||
import re, sys
|
|
||||||
path, sha = sys.argv[1], sys.argv[2]
|
|
||||||
text = open(path).read()
|
|
||||||
updated, n = re.subn(
|
|
||||||
r'(path:\s*packaging/frontend-dist\.tar\.gz\s*\n\s*sha256:\s*)[0-9a-f]+',
|
|
||||||
r'\g<1>' + sha, text)
|
|
||||||
if n == 0:
|
|
||||||
sys.exit("ERROR: could not find frontend-dist sha256 in manifest")
|
|
||||||
open(path, 'w').write(updated)
|
|
||||||
PYEOF
|
|
||||||
echo "Done"
|
|
||||||
|
|
||||||
echo ""
|
|
||||||
echo "Bumped to v$VERSION — commit, tag, push, then: nix run .#post-tag-bump -- $VERSION"
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
postTagBump = pkgs.writeShellApplication {
|
update = pkgs.writeShellApplication {
|
||||||
name = "moku-post-tag-bump";
|
name = "moku-update";
|
||||||
runtimeInputs = with pkgs; [ gnused coreutils git curl ];
|
runtimeInputs = with pkgs; [ gnused coreutils git curl nix xxd ];
|
||||||
text = ''
|
text = ''
|
||||||
[[ $# -lt 1 ]] && { echo "Usage: nix run .#post-tag-bump -- <version>"; exit 1; }
|
|
||||||
VERSION="$1"
|
|
||||||
REPO="$(git rev-parse --show-toplevel)"
|
REPO="$(git rev-parse --show-toplevel)"
|
||||||
|
VERSIONS="$REPO/nix/versions.nix"
|
||||||
MANIFEST="$REPO/io.github.moku_project.Moku.yml"
|
MANIFEST="$REPO/io.github.moku_project.Moku.yml"
|
||||||
PKGBUILD="$REPO/PKGBUILD"
|
PKGBUILD="$REPO/PKGBUILD"
|
||||||
|
|
||||||
echo "── Resolving commit for v$VERSION ──"
|
if [[ $# -ge 1 ]]; then
|
||||||
COMMIT=$(git ls-remote https://github.com/moku-project/Moku.git "refs/tags/v$VERSION" \
|
VERSION="$1"
|
||||||
| awk '{print $1}')
|
else
|
||||||
[[ -z "$COMMIT" ]] && { echo "ERROR: tag v$VERSION not found on remote"; exit 1; }
|
VERSION=$(grep 'moku = "' "$VERSIONS" | head -1 | sed 's/.*"\(.*\)".*/\1/')
|
||||||
echo "commit: $COMMIT"
|
fi
|
||||||
sed -i "s/commit: [0-9a-f]\{40\}/commit: $COMMIT/" "$MANIFEST"
|
|
||||||
echo "Done"
|
COMMIT=$(git ls-remote https://github.com/moku-project/Moku.git "refs/tags/v$VERSION" | awk '{print $1}')
|
||||||
|
[[ -z "$COMMIT" ]] && { echo "ERROR: tag v$VERSION not found on remote"; exit 1; }
|
||||||
|
sed -i "s/gitCommit = \"[^\"]*\"/gitCommit = \"$COMMIT\"/" "$VERSIONS"
|
||||||
|
sed -i "s/commit: [0-9a-f]\{40\}/commit: $COMMIT/" "$MANIFEST"
|
||||||
|
|
||||||
echo "── Fetching PKGBUILD tarball sha256 ──"
|
|
||||||
TARBALL_URL="https://github.com/moku-project/Moku/archive/refs/tags/v$VERSION.tar.gz"
|
TARBALL_URL="https://github.com/moku-project/Moku/archive/refs/tags/v$VERSION.tar.gz"
|
||||||
TARBALL_SHA=$(curl -fsSL "$TARBALL_URL" | sha256sum | awk '{print $1}')
|
TARBALL_SHA=$(curl -fsSL "$TARBALL_URL" | sha256sum | awk '{print $1}')
|
||||||
|
sed -i "s/tarballHash = \"[^\"]*\"/tarballHash = \"$TARBALL_SHA\"/" "$VERSIONS"
|
||||||
sed -i "/sha256sums=/,/)/{ 0,/'/s/'[^']*'/'$TARBALL_SHA'/ }" "$PKGBUILD"
|
sed -i "/sha256sums=/,/)/{ 0,/'/s/'[^']*'/'$TARBALL_SHA'/ }" "$PKGBUILD"
|
||||||
grep -q "$TARBALL_SHA" "$PKGBUILD" \
|
|
||||||
|| { echo "ERROR: PKGBUILD sha256 replacement failed"; exit 1; }
|
|
||||||
echo "Done"
|
|
||||||
|
|
||||||
echo ""
|
if [[ $# -ge 2 ]]; then
|
||||||
echo "post-tag-bump complete for v$VERSION"
|
SUWA_VER="$2"
|
||||||
|
BASE="https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v${SUWA_VER}"
|
||||||
|
|
||||||
|
echo "Fetching Suwayomi v${SUWA_VER} hashes (5 downloads)..."
|
||||||
|
|
||||||
|
sha_of() { curl -fsSL "$1" | sha256sum | awk '{print $1}'; }
|
||||||
|
to_sri() { echo "$1" | xxd -r -p | base64 -w0 | sed 's/^/sha256-/'; }
|
||||||
|
|
||||||
|
JAR_SHA=$(sha_of "${BASE}/Suwayomi-Server-v${SUWA_VER}.jar")
|
||||||
|
WIN_SHA=$(sha_of "${BASE}/Suwayomi-Server-v${SUWA_VER}-windows-x64.zip")
|
||||||
|
LINUX_SHA=$(sha_of "${BASE}/Suwayomi-Server-v${SUWA_VER}-linux-x64.tar.gz")
|
||||||
|
ARM64_SHA=$(sha_of "${BASE}/Suwayomi-Server-v${SUWA_VER}-macOS-arm64.tar.gz")
|
||||||
|
X64_SHA=$(sha_of "${BASE}/Suwayomi-Server-v${SUWA_VER}-macOS-x64.tar.gz")
|
||||||
|
|
||||||
|
JAR_SRI=$(to_sri "$JAR_SHA")
|
||||||
|
|
||||||
|
sed -i "s/version = \"[^\"]*\"/version = \"${SUWA_VER}\"/" "$VERSIONS"
|
||||||
|
sed -i "s|hash = \"sha256-[^\"]*\"|hash = \"${JAR_SRI}\"|" "$VERSIONS"
|
||||||
|
sed -i "s|windowsHash = \"[^\"]*\"|windowsHash = \"${WIN_SHA}\"|" "$VERSIONS"
|
||||||
|
sed -i "s|linuxHash = \"[^\"]*\"|linuxHash = \"${LINUX_SHA}\"|" "$VERSIONS"
|
||||||
|
sed -i "s|macosArm64Hash = \"[^\"]*\"|macosArm64Hash = \"${ARM64_SHA}\"|" "$VERSIONS"
|
||||||
|
sed -i "s|macosX64Hash = \"[^\"]*\"|macosX64Hash = \"${X64_SHA}\"|" "$VERSIONS"
|
||||||
|
|
||||||
|
sed -i "s|Suwayomi-Server-preview/releases/download/v[^/]*/|Suwayomi-Server-preview/releases/download/v${SUWA_VER}/|" "$MANIFEST"
|
||||||
|
sed -i "s|Suwayomi-Server-v[0-9.]*\.jar|Suwayomi-Server-v${SUWA_VER}.jar|g" "$MANIFEST"
|
||||||
|
python3 - "$MANIFEST" "$JAR_SHA" <<'PYEOF'
|
||||||
|
import re, sys
|
||||||
|
path, sha = sys.argv[1], sys.argv[2]
|
||||||
|
text = open(path).read()
|
||||||
|
updated, n = re.subn(
|
||||||
|
r'(dest-filename:\s*Suwayomi-Server\.jar\s*\n\s*sha256:\s*)[0-9a-f]+',
|
||||||
|
r'\g<1>' + sha, text)
|
||||||
|
if n == 0:
|
||||||
|
sys.exit("ERROR: could not find Suwayomi jar sha256 in manifest")
|
||||||
|
open(path, 'w').write(updated)
|
||||||
|
PYEOF
|
||||||
|
|
||||||
|
echo "Suwayomi hashes written."
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Done — versions.nix, flatpak manifest, and PKGBUILD patched for v$VERSION"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -105,19 +132,15 @@
|
|||||||
name = "moku-flatpak";
|
name = "moku-flatpak";
|
||||||
runtimeInputs = with pkgs; [ coreutils git appstream flatpak-builder flatpak ];
|
runtimeInputs = with pkgs; [ coreutils git appstream flatpak-builder flatpak ];
|
||||||
text = ''
|
text = ''
|
||||||
[[ $# -lt 1 ]] && { echo "Usage: nix run .#flatpak -- <version>"; exit 1; }
|
|
||||||
REPO="$(git rev-parse --show-toplevel)"
|
REPO="$(git rev-parse --show-toplevel)"
|
||||||
MANIFEST="$REPO/io.github.moku_project.Moku.yml"
|
|
||||||
|
|
||||||
rm -rf "$REPO/build-dir" "$REPO/repo"
|
rm -rf "$REPO/build-dir" "$REPO/repo"
|
||||||
flatpak-builder \
|
flatpak-builder \
|
||||||
--repo="$REPO/repo" \
|
--repo="$REPO/repo" \
|
||||||
--force-clean \
|
--force-clean \
|
||||||
"$REPO/build-dir" \
|
"$REPO/build-dir" \
|
||||||
"$MANIFEST"
|
"$REPO/io.github.moku_project.Moku.yml"
|
||||||
flatpak build-bundle "$REPO/repo" "$REPO/moku.flatpak" io.github.moku_project.Moku
|
flatpak build-bundle "$REPO/repo" "$REPO/moku.flatpak" io.github.moku_project.Moku
|
||||||
rm -rf "$REPO/build-dir" "$REPO/repo"
|
rm -rf "$REPO/build-dir" "$REPO/repo"
|
||||||
|
|
||||||
echo "moku.flatpak created"
|
echo "moku.flatpak created"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|||||||
+8
-6
@@ -4,17 +4,19 @@
|
|||||||
fetchurl,
|
fetchurl,
|
||||||
makeWrapper,
|
makeWrapper,
|
||||||
jdk21_headless,
|
jdk21_headless,
|
||||||
|
versions,
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
jdk = jdk21_headless;
|
jdk = jdk21_headless;
|
||||||
|
ver = versions.suwayomi;
|
||||||
in
|
in
|
||||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
stdenvNoCC.mkDerivation {
|
||||||
pname = "suwayomi-server";
|
pname = "suwayomi-server";
|
||||||
version = "2.1.2087";
|
version = ver.version;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v${finalAttrs.version}/Suwayomi-Server-v${finalAttrs.version}.jar";
|
url = "https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v${ver.version}/Suwayomi-Server-v${ver.version}.jar";
|
||||||
hash = "sha256-9YmkImdCUjlME7KJqci+aRkFv1g++39NXxUBrl6R5rM=";
|
hash = ver.hash;
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
@@ -37,10 +39,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
|||||||
description = "Free and open source manga reader server that runs extensions built for Mihon (Tachiyomi)";
|
description = "Free and open source manga reader server that runs extensions built for Mihon (Tachiyomi)";
|
||||||
homepage = "https://github.com/Suwayomi/Suwayomi-Server";
|
homepage = "https://github.com/Suwayomi/Suwayomi-Server";
|
||||||
downloadPage = "https://github.com/Suwayomi/Suwayomi-Server-preview/releases";
|
downloadPage = "https://github.com/Suwayomi/Suwayomi-Server-preview/releases";
|
||||||
changelog = "https://github.com/Suwayomi/Suwayomi-Server-preview/releases/tag/v${finalAttrs.version}";
|
changelog = "https://github.com/Suwayomi/Suwayomi-Server-preview/releases/tag/v${ver.version}";
|
||||||
license = lib.licenses.mpl20;
|
license = lib.licenses.mpl20;
|
||||||
platforms = jdk.meta.platforms;
|
platforms = jdk.meta.platforms;
|
||||||
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
|
sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
|
||||||
mainProgram = "suwayomi-server";
|
mainProgram = "suwayomi-server";
|
||||||
};
|
};
|
||||||
})
|
}
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
{
|
||||||
|
moku = "0.9.4";
|
||||||
|
|
||||||
|
suwayomi = {
|
||||||
|
version = "2.2.2196";
|
||||||
|
hash = "sha256-jnJEwmlFZmGodwX3RvDYcnV3Cql2urfGkg5NUT6Xw/Y=";
|
||||||
|
windowsHash = "457ca4a64a57e0d274a87203d25e962103bcb456ee30ada3ea47328a3093329d";
|
||||||
|
linuxHash = "e13d63ceb7e2b15e83d0a78281e8c1c04ac4a833caa73e5a2b68fbaf0cb20c1f";
|
||||||
|
macosArm64Hash = "9e3dbebc7475707e8d11c56a473385c00b09bde0103d013bc1cb3d06c89e5c43";
|
||||||
|
macosX64Hash = "eadee02060b780a5febfb8dada2f89c7bd7db5905cfd20d47eaca02fcde8c9c5";
|
||||||
|
};
|
||||||
|
|
||||||
|
frontend = {
|
||||||
|
pnpmHash = "sha256-18twdFhprV9v9hzvqxuVDHD6Tm4zHNDJs7s6l/7ClBo=";
|
||||||
|
distHash = "7db288b4b54277aa82b6ec5b21fc31a1e71f8246c50a74777500083b806c1fa5";
|
||||||
|
distHashSri = "sha256-fbiiu0tCd6qCtu+SIfw+aR8Yj2bFCnR3dQAIO4BvwfM=";
|
||||||
|
};
|
||||||
|
|
||||||
|
gitDeps = {
|
||||||
|
tauri-plugin-discord-rpc = "sha256-xq0qyK2NrwSAFDhXo0vbvcygRD2/7uqBaLpqfpfxkrc=";
|
||||||
|
};
|
||||||
|
|
||||||
|
gitCommit = "239960683b6c7f1347e1798b0e179a8a46628728";
|
||||||
|
tarballHash = "";
|
||||||
|
}
|
||||||
+33
-18
@@ -1,33 +1,48 @@
|
|||||||
{
|
{
|
||||||
"name": "moku",
|
"name": "moku",
|
||||||
"version": "0.5.0",
|
"private": true,
|
||||||
|
"version": "0.9.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite dev",
|
||||||
"build": "vite build",
|
|
||||||
"preview": "vite preview",
|
"preview": "vite preview",
|
||||||
"tauri": "tauri",
|
"prepare": "svelte-kit sync || echo ''",
|
||||||
"tauri:dev": "tauri dev --config src-tauri/tauri.dev.conf.json"
|
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
|
||||||
|
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
|
||||||
|
"build:static": "MOKU_TARGET=static vite build",
|
||||||
|
"build:node": "MOKU_TARGET=node vite build",
|
||||||
|
"build:android": "MOKU_TARGET=static vite build",
|
||||||
|
"tauri:dev": "tauri dev --config src-tauri/tauri.dev.conf.json",
|
||||||
|
"tauri:build": "tauri build"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@sveltejs/adapter-node": "^5.5.4",
|
||||||
|
"@sveltejs/adapter-static": "^3.0.10",
|
||||||
|
"@sveltejs/kit": "^2.62.0",
|
||||||
|
"@sveltejs/vite-plugin-svelte": "^7.1.2",
|
||||||
|
"@tauri-apps/cli": "^2.11.2",
|
||||||
|
"svelte": "^5.56.1",
|
||||||
|
"svelte-check": "^4.5.0",
|
||||||
|
"typescript": "^6.0.3",
|
||||||
|
"vite": "^8.0.16"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@capacitor/app": "^8.1.0",
|
||||||
|
"@capacitor/browser": "^8.0.3",
|
||||||
|
"@capacitor/core": "^8.4.0",
|
||||||
|
"@capacitor/filesystem": "^8.1.2",
|
||||||
|
"@capacitor/preferences": "^8.0.1",
|
||||||
"@tauri-apps/api": "^2.11.0",
|
"@tauri-apps/api": "^2.11.0",
|
||||||
"@tauri-apps/plugin-http": "^2.5.8",
|
"@tauri-apps/plugin-dialog": "^2.7.1",
|
||||||
|
"@tauri-apps/plugin-fs": "^2.5.1",
|
||||||
|
"@tauri-apps/plugin-http": "^2.5.9",
|
||||||
"@tauri-apps/plugin-os": "^2.3.2",
|
"@tauri-apps/plugin-os": "^2.3.2",
|
||||||
"@tauri-apps/plugin-process": "^2.3.1",
|
"@tauri-apps/plugin-process": "^2.3.1",
|
||||||
"@tauri-apps/plugin-shell": "^2.3.5",
|
"@tauri-apps/plugin-shell": "^2.3.5",
|
||||||
"@tauri-apps/plugin-store": "~2.4.2",
|
"@tauri-apps/plugin-store": "^2.4.3",
|
||||||
|
"capacitor-native-biometric": "^4.2.2",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"phosphor-svelte": "^3.1.0",
|
"phosphor-svelte": "^3.1.0",
|
||||||
"svelte-spa-router": "^5.1.0",
|
"tauri-plugin-discord-rpc-api": "github:Youwes09/tauri-plugin-discord-rpc"
|
||||||
"tauri-plugin-discord-rpc-api": "github:Youwes09/tauri-plugin-discord-rpc",
|
|
||||||
"tauri-plugin-drpc": "^1.0.3"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@sveltejs/vite-plugin-svelte": "^7.0.0",
|
|
||||||
"@tauri-apps/cli": "^2.11.0",
|
|
||||||
"svelte": "^5.55.5",
|
|
||||||
"svelte-check": "^4.4.7",
|
|
||||||
"typescript": "^6.0.3",
|
|
||||||
"vite": "^8.0.10"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Generated
+813
-234
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,2 @@
|
|||||||
|
onlyBuiltDependencies:
|
||||||
|
- esbuild
|
||||||
Generated
+111
-111
@@ -78,9 +78,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "autocfg"
|
name = "autocfg"
|
||||||
version = "1.5.0"
|
version = "1.5.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
|
checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "base64"
|
name = "base64"
|
||||||
@@ -117,9 +117,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bitflags"
|
name = "bitflags"
|
||||||
version = "2.11.1"
|
version = "2.12.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
|
checksum = "84d7ced0ae9557296835c32bf1b1e02b44c746701f898460fb000d7eaa84f00a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde_core",
|
"serde_core",
|
||||||
]
|
]
|
||||||
@@ -144,9 +144,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "brotli"
|
name = "brotli"
|
||||||
version = "8.0.2"
|
version = "8.0.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560"
|
checksum = "8119e4516436f5708bbc474a9d395bf12f1b5395e93a92a56e647ac3388c8610"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"alloc-no-stdlib",
|
"alloc-no-stdlib",
|
||||||
"alloc-stdlib",
|
"alloc-stdlib",
|
||||||
@@ -155,9 +155,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "brotli-decompressor"
|
name = "brotli-decompressor"
|
||||||
version = "5.0.0"
|
version = "5.0.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03"
|
checksum = "5962523e1b92ce1b5e793d9169b9943eece10d39f62550bc04bb605d75b94924"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"alloc-no-stdlib",
|
"alloc-no-stdlib",
|
||||||
"alloc-stdlib",
|
"alloc-stdlib",
|
||||||
@@ -174,9 +174,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bumpalo"
|
name = "bumpalo"
|
||||||
version = "3.20.2"
|
version = "3.20.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
|
checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bytemuck"
|
name = "bytemuck"
|
||||||
@@ -205,7 +205,7 @@ version = "0.18.5"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
|
checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"cairo-sys-rs",
|
"cairo-sys-rs",
|
||||||
"glib",
|
"glib",
|
||||||
"libc",
|
"libc",
|
||||||
@@ -268,9 +268,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cc"
|
name = "cc"
|
||||||
version = "1.2.62"
|
version = "1.2.63"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98"
|
checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"find-msvc-tools",
|
"find-msvc-tools",
|
||||||
"shlex",
|
"shlex",
|
||||||
@@ -290,7 +290,7 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"byteorder",
|
"byteorder",
|
||||||
"fnv",
|
"fnv",
|
||||||
"uuid 1.23.1",
|
"uuid 1.23.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -398,7 +398,7 @@ version = "0.25.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "064badf302c3194842cf2c5d61f56cc88e54a759313879cdf03abdd27d0c3b97"
|
checksum = "064badf302c3194842cf2c5d61f56cc88e54a759313879cdf03abdd27d0c3b97"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"core-foundation 0.10.1",
|
"core-foundation 0.10.1",
|
||||||
"core-graphics-types",
|
"core-graphics-types",
|
||||||
"foreign-types 0.5.0",
|
"foreign-types 0.5.0",
|
||||||
@@ -411,7 +411,7 @@ version = "0.2.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
|
checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"core-foundation 0.10.1",
|
"core-foundation 0.10.1",
|
||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
@@ -672,7 +672,7 @@ version = "0.3.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
|
checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"block2",
|
"block2",
|
||||||
"libc",
|
"libc",
|
||||||
"objc2",
|
"objc2",
|
||||||
@@ -680,9 +680,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "displaydoc"
|
name = "displaydoc"
|
||||||
version = "0.2.5"
|
version = "0.2.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
|
checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@@ -789,9 +789,9 @@ checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "either"
|
name = "either"
|
||||||
version = "1.15.0"
|
version = "1.16.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
|
checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "embed-resource"
|
name = "embed-resource"
|
||||||
@@ -1228,7 +1228,7 @@ version = "0.18.5"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
|
checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"futures-channel",
|
"futures-channel",
|
||||||
"futures-core",
|
"futures-core",
|
||||||
"futures-executor",
|
"futures-executor",
|
||||||
@@ -1408,9 +1408,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "http"
|
name = "http"
|
||||||
version = "1.4.0"
|
version = "1.4.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
|
checksum = "8be7462df143984c4598a256ef469b251d7d7f9e271135073e78fc535414f3d0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"itoa",
|
"itoa",
|
||||||
@@ -1447,9 +1447,9 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hyper"
|
name = "hyper"
|
||||||
version = "1.9.0"
|
version = "1.10.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca"
|
checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"atomic-waker",
|
"atomic-waker",
|
||||||
"bytes",
|
"bytes",
|
||||||
@@ -1804,9 +1804,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "js-sys"
|
name = "js-sys"
|
||||||
version = "0.3.98"
|
version = "0.3.99"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08"
|
checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
@@ -1842,7 +1842,7 @@ version = "0.7.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
|
checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"serde",
|
"serde",
|
||||||
"unicode-segmentation",
|
"unicode-segmentation",
|
||||||
]
|
]
|
||||||
@@ -1904,9 +1904,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libredox"
|
name = "libredox"
|
||||||
version = "0.1.16"
|
version = "0.1.17"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c"
|
checksum = "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
]
|
]
|
||||||
@@ -1940,9 +1940,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "log"
|
name = "log"
|
||||||
version = "0.4.29"
|
version = "0.4.31"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
|
checksum = "113b30b4cd05f7c06868fdb2854f66a7b9fece9a48425351cd532e810d74024f"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lru-slab"
|
name = "lru-slab"
|
||||||
@@ -1963,9 +1963,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "memchr"
|
name = "memchr"
|
||||||
version = "2.8.0"
|
version = "2.8.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
|
checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "memoffset"
|
name = "memoffset"
|
||||||
@@ -1994,9 +1994,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mio"
|
name = "mio"
|
||||||
version = "1.2.0"
|
version = "1.2.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
|
checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"wasi",
|
"wasi",
|
||||||
@@ -2029,9 +2029,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "muda"
|
name = "muda"
|
||||||
version = "0.19.1"
|
version = "0.19.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0ae8844f63b5b118e334e205585b8c5c17b984121dbdb179d44aeb087ffad3cb"
|
checksum = "47a2e3dff89cd322c66647942668faee0a2b1f88ea6cbb4d374b4a8d7e92528c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"crossbeam-channel",
|
"crossbeam-channel",
|
||||||
"dpi",
|
"dpi",
|
||||||
@@ -2071,7 +2071,7 @@ version = "0.9.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
|
checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"jni-sys 0.3.1",
|
"jni-sys 0.3.1",
|
||||||
"log",
|
"log",
|
||||||
"ndk-sys",
|
"ndk-sys",
|
||||||
@@ -2097,11 +2097,11 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "nix"
|
name = "nix"
|
||||||
version = "0.30.1"
|
version = "0.31.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
|
checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"cfg_aliases",
|
"cfg_aliases",
|
||||||
"libc",
|
"libc",
|
||||||
@@ -2118,9 +2118,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-conv"
|
name = "num-conv"
|
||||||
version = "0.2.1"
|
version = "0.2.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967"
|
checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-traits"
|
name = "num-traits"
|
||||||
@@ -2169,7 +2169,7 @@ version = "0.3.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
|
checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"block2",
|
"block2",
|
||||||
"objc2",
|
"objc2",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
@@ -2182,7 +2182,7 @@ version = "0.3.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
|
checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"objc2",
|
"objc2",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
]
|
]
|
||||||
@@ -2203,7 +2203,7 @@ version = "0.3.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
|
checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"dispatch2",
|
"dispatch2",
|
||||||
"objc2",
|
"objc2",
|
||||||
]
|
]
|
||||||
@@ -2214,7 +2214,7 @@ version = "0.3.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
|
checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"dispatch2",
|
"dispatch2",
|
||||||
"objc2",
|
"objc2",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
@@ -2247,7 +2247,7 @@ version = "0.3.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
|
checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"objc2",
|
"objc2",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
"objc2-core-graphics",
|
"objc2-core-graphics",
|
||||||
@@ -2274,7 +2274,7 @@ version = "0.3.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
|
checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"block2",
|
"block2",
|
||||||
"libc",
|
"libc",
|
||||||
"objc2",
|
"objc2",
|
||||||
@@ -2297,7 +2297,7 @@ version = "0.3.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
|
checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"objc2",
|
"objc2",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
]
|
]
|
||||||
@@ -2308,7 +2308,7 @@ version = "0.3.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
|
checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"objc2",
|
"objc2",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
"objc2-foundation",
|
"objc2-foundation",
|
||||||
@@ -2320,7 +2320,7 @@ version = "0.3.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
|
checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"block2",
|
"block2",
|
||||||
"objc2",
|
"objc2",
|
||||||
"objc2-cloud-kit",
|
"objc2-cloud-kit",
|
||||||
@@ -2351,7 +2351,7 @@ version = "0.3.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f"
|
checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"block2",
|
"block2",
|
||||||
"objc2",
|
"objc2",
|
||||||
"objc2-app-kit",
|
"objc2-app-kit",
|
||||||
@@ -2383,7 +2383,7 @@ version = "0.10.80"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967"
|
checksum = "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"foreign-types 0.3.2",
|
"foreign-types 0.3.2",
|
||||||
"libc",
|
"libc",
|
||||||
@@ -2428,9 +2428,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "os_info"
|
name = "os_info"
|
||||||
version = "3.14.0"
|
version = "3.15.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e4022a17595a00d6a369236fdae483f0de7f0a339960a53118b818238e132224"
|
checksum = "9cf20a545b305cf1da722b236b5155c9bb35f1d5ceb28c048bd96ca842f41b5b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"android_system_properties",
|
"android_system_properties",
|
||||||
"log",
|
"log",
|
||||||
@@ -2609,7 +2609,7 @@ version = "0.18.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
|
checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"crc32fast",
|
"crc32fast",
|
||||||
"fdeflate",
|
"fdeflate",
|
||||||
"flate2",
|
"flate2",
|
||||||
@@ -2682,7 +2682,7 @@ version = "3.5.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
|
checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"toml_edit 0.25.11+spec-1.1.0",
|
"toml_edit 0.25.12+spec-1.1.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -2880,7 +2880,7 @@ version = "0.5.18"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
|
checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -3004,9 +3004,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "reqwest"
|
name = "reqwest"
|
||||||
version = "0.13.3"
|
version = "0.13.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "62e0021ea2c22aed41653bc7e1419abb2c97e038ff2c33d0e1309e49a97deec0"
|
checksum = "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"bytes",
|
"bytes",
|
||||||
@@ -3095,7 +3095,7 @@ version = "1.1.4"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
|
checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"errno",
|
"errno",
|
||||||
"libc",
|
"libc",
|
||||||
"linux-raw-sys",
|
"linux-raw-sys",
|
||||||
@@ -3179,7 +3179,7 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"url",
|
"url",
|
||||||
"uuid 1.23.1",
|
"uuid 1.23.2",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -3230,7 +3230,7 @@ version = "3.7.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
|
checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"core-foundation 0.10.1",
|
"core-foundation 0.10.1",
|
||||||
"core-foundation-sys",
|
"core-foundation-sys",
|
||||||
"libc",
|
"libc",
|
||||||
@@ -3253,7 +3253,7 @@ version = "0.36.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c"
|
checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"cssparser",
|
"cssparser",
|
||||||
"derive_more",
|
"derive_more",
|
||||||
"log",
|
"log",
|
||||||
@@ -3331,9 +3331,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_json"
|
name = "serde_json"
|
||||||
version = "1.0.149"
|
version = "1.0.150"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
|
checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"itoa",
|
"itoa",
|
||||||
"memchr",
|
"memchr",
|
||||||
@@ -3470,9 +3470,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "shlex"
|
name = "shlex"
|
||||||
version = "1.3.0"
|
version = "2.0.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
|
checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sigchld"
|
name = "sigchld"
|
||||||
@@ -3531,9 +3531,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "socket2"
|
name = "socket2"
|
||||||
version = "0.6.3"
|
version = "0.6.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"
|
checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"windows-sys 0.61.2",
|
"windows-sys 0.61.2",
|
||||||
@@ -3724,7 +3724,7 @@ version = "0.7.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
|
checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"core-foundation 0.9.4",
|
"core-foundation 0.9.4",
|
||||||
"system-configuration-sys",
|
"system-configuration-sys",
|
||||||
]
|
]
|
||||||
@@ -3754,11 +3754,11 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tao"
|
name = "tao"
|
||||||
version = "0.35.2"
|
version = "0.35.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a33f7f9e486ade65fcf1e45c440f9236c904f5c1002cdc7fc6ae582777345ce4"
|
checksum = "d1c93047acf68669466a34690ac58cca7010bd1b201e1ec86f1fd0a75d3dd4a9"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"block2",
|
"block2",
|
||||||
"core-foundation 0.10.1",
|
"core-foundation 0.10.1",
|
||||||
"core-graphics",
|
"core-graphics",
|
||||||
@@ -3839,7 +3839,7 @@ dependencies = [
|
|||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
"plist",
|
"plist",
|
||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
"reqwest 0.13.3",
|
"reqwest 0.13.4",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"serde_repr",
|
"serde_repr",
|
||||||
@@ -3904,7 +3904,7 @@ dependencies = [
|
|||||||
"thiserror 2.0.18",
|
"thiserror 2.0.18",
|
||||||
"time",
|
"time",
|
||||||
"url",
|
"url",
|
||||||
"uuid 1.23.1",
|
"uuid 1.23.2",
|
||||||
"walkdir",
|
"walkdir",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -4171,7 +4171,7 @@ dependencies = [
|
|||||||
"toml 1.1.2+spec-1.1.0",
|
"toml 1.1.2+spec-1.1.0",
|
||||||
"url",
|
"url",
|
||||||
"urlpattern",
|
"urlpattern",
|
||||||
"uuid 1.23.1",
|
"uuid 1.23.2",
|
||||||
"walkdir",
|
"walkdir",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -4459,9 +4459,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "toml_edit"
|
name = "toml_edit"
|
||||||
version = "0.25.11+spec-1.1.0"
|
version = "0.25.12+spec-1.1.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b"
|
checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"indexmap 2.14.0",
|
"indexmap 2.14.0",
|
||||||
"toml_datetime 1.1.1+spec-1.1.0",
|
"toml_datetime 1.1.1+spec-1.1.0",
|
||||||
@@ -4501,11 +4501,11 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tower-http"
|
name = "tower-http"
|
||||||
version = "0.6.10"
|
version = "0.6.11"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "68d6fdd9f81c2819c9a8b0e0cd91660e7746a8e6ea2ba7c6b2b057985f6bcb51"
|
checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"bytes",
|
"bytes",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"http",
|
"http",
|
||||||
@@ -4596,9 +4596,9 @@ checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "typenum"
|
name = "typenum"
|
||||||
version = "1.20.0"
|
version = "1.20.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de"
|
checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unic-char-property"
|
name = "unic-char-property"
|
||||||
@@ -4649,9 +4649,9 @@ checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-segmentation"
|
name = "unicode-segmentation"
|
||||||
version = "1.13.2"
|
version = "1.13.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c"
|
checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-xid"
|
name = "unicode-xid"
|
||||||
@@ -4719,9 +4719,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uuid"
|
name = "uuid"
|
||||||
version = "1.23.1"
|
version = "1.23.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76"
|
checksum = "d258b83ceec21034727ecee8c382cfa6c3e133699b0742c64571814fb420c9f7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"getrandom 0.4.2",
|
"getrandom 0.4.2",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
@@ -4812,9 +4812,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen"
|
name = "wasm-bindgen"
|
||||||
version = "0.2.121"
|
version = "0.2.122"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790"
|
checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
@@ -4825,9 +4825,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-futures"
|
name = "wasm-bindgen-futures"
|
||||||
version = "0.4.71"
|
version = "0.4.72"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "96492d0d3ffba25305a7dc88720d250b1401d7edca02cc3bcd50633b424673b8"
|
checksum = "9473dbd2991ae90b6291c3c32c30c6187ac49aa32f9905d1cce280ec1e110b0f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"js-sys",
|
"js-sys",
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
@@ -4835,9 +4835,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-macro"
|
name = "wasm-bindgen-macro"
|
||||||
version = "0.2.121"
|
version = "0.2.122"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578"
|
checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"quote",
|
"quote",
|
||||||
"wasm-bindgen-macro-support",
|
"wasm-bindgen-macro-support",
|
||||||
@@ -4845,9 +4845,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-macro-support"
|
name = "wasm-bindgen-macro-support"
|
||||||
version = "0.2.121"
|
version = "0.2.122"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2"
|
checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bumpalo",
|
"bumpalo",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
@@ -4858,9 +4858,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wasm-bindgen-shared"
|
name = "wasm-bindgen-shared"
|
||||||
version = "0.2.121"
|
version = "0.2.122"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441"
|
checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"unicode-ident",
|
"unicode-ident",
|
||||||
]
|
]
|
||||||
@@ -4906,7 +4906,7 @@ version = "0.244.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
|
checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"hashbrown 0.15.5",
|
"hashbrown 0.15.5",
|
||||||
"indexmap 2.14.0",
|
"indexmap 2.14.0",
|
||||||
"semver",
|
"semver",
|
||||||
@@ -4914,9 +4914,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "web-sys"
|
name = "web-sys"
|
||||||
version = "0.3.98"
|
version = "0.3.99"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4b572dff8bcf38bad0fa19729c89bb5748b2b9b1d8be70cf90df697e3a8f32aa"
|
checksum = "6d621441cfc37b84979402712047321980c178f299193a3589d05b99e8763436"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"js-sys",
|
"js-sys",
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
@@ -5759,7 +5759,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
|
checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bitflags 2.11.1",
|
"bitflags 2.12.1",
|
||||||
"indexmap 2.14.0",
|
"indexmap 2.14.0",
|
||||||
"log",
|
"log",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -5862,9 +5862,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "yoke"
|
name = "yoke"
|
||||||
version = "0.8.2"
|
version = "0.8.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
|
checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"stable_deref_trait",
|
"stable_deref_trait",
|
||||||
"yoke-derive",
|
"yoke-derive",
|
||||||
@@ -5885,18 +5885,18 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zerocopy"
|
name = "zerocopy"
|
||||||
version = "0.8.48"
|
version = "0.8.50"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
|
checksum = "3b065d4f0e55f82fae73202e189638116a87c55ab6b8e6c2721e13dd9d854ad1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"zerocopy-derive",
|
"zerocopy-derive",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zerocopy-derive"
|
name = "zerocopy-derive"
|
||||||
version = "0.8.48"
|
version = "0.8.50"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
|
checksum = "0b631b19d36a892ab55420c92dbc83ccd79274f25be714855d3074aa71cab639"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
|
|||||||
@@ -43,6 +43,8 @@
|
|||||||
"discord-rpc:allow-disconnect",
|
"discord-rpc:allow-disconnect",
|
||||||
"discord-rpc:allow-set-activity",
|
"discord-rpc:allow-set-activity",
|
||||||
"discord-rpc:allow-clear-activity",
|
"discord-rpc:allow-clear-activity",
|
||||||
"discord-rpc:allow-is-running"
|
"discord-rpc:allow-is-running",
|
||||||
|
"dialog:default",
|
||||||
|
"dialog:allow-open"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -2,10 +2,58 @@ use serde::Serialize;
|
|||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use sysinfo::Disks;
|
use sysinfo::Disks;
|
||||||
use tauri::Emitter;
|
use tauri::Emitter;
|
||||||
|
use tauri_plugin_store::StoreExt;
|
||||||
use walkdir::WalkDir;
|
use walkdir::WalkDir;
|
||||||
|
|
||||||
use crate::server::resolve::suwayomi_data_dir;
|
use crate::server::resolve::suwayomi_data_dir;
|
||||||
|
|
||||||
|
// ── Key-value store (used by the frontend via platformService) ────────────────
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn load_store(app: tauri::AppHandle, key: String) -> Result<Option<String>, String> {
|
||||||
|
let store = app
|
||||||
|
.store(format!("{}.json", key))
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
let value = store.get(&key);
|
||||||
|
Ok(value.map(|v| v.to_string()))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn save_store(app: tauri::AppHandle, key: String, value: String) -> Result<(), String> {
|
||||||
|
let store = app
|
||||||
|
.store(format!("{}.json", key))
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
let parsed: serde_json::Value =
|
||||||
|
serde_json::from_str(&value).map_err(|e| e.to_string())?;
|
||||||
|
store.set(key, parsed);
|
||||||
|
store.save().map_err(|e| e.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Credential store (PIN-encrypted vault, auth tokens) ──────────────────────
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn store_credential(app: tauri::AppHandle, key: String, value: String) -> Result<(), String> {
|
||||||
|
let store = app
|
||||||
|
.store("credentials.json")
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
if value.is_empty() {
|
||||||
|
store.delete(&key);
|
||||||
|
} else {
|
||||||
|
store.set(&key, serde_json::Value::String(value));
|
||||||
|
}
|
||||||
|
store.save().map_err(|e| e.to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tauri::command]
|
||||||
|
pub fn get_credential(app: tauri::AppHandle, key: String) -> Result<Option<String>, String> {
|
||||||
|
let store = app
|
||||||
|
.store("credentials.json")
|
||||||
|
.map_err(|e| e.to_string())?;
|
||||||
|
Ok(store.get(&key).and_then(|v| v.as_str().map(|s| s.to_owned())))
|
||||||
|
}
|
||||||
|
|
||||||
|
// ── Disk / downloads storage ─────────────────────────────────────────────────
|
||||||
|
|
||||||
#[derive(Serialize)]
|
#[derive(Serialize)]
|
||||||
pub struct StorageInfo {
|
pub struct StorageInfo {
|
||||||
pub manga_bytes: u64,
|
pub manga_bytes: u64,
|
||||||
|
|||||||
@@ -108,6 +108,10 @@ pub fn run() {
|
|||||||
commands::backup::auto_backup_app_data,
|
commands::backup::auto_backup_app_data,
|
||||||
commands::backup::get_auto_backup_dir,
|
commands::backup::get_auto_backup_dir,
|
||||||
commands::backup::read_store_files,
|
commands::backup::read_store_files,
|
||||||
|
commands::storage::load_store,
|
||||||
|
commands::storage::save_store,
|
||||||
|
commands::storage::store_credential,
|
||||||
|
commands::storage::get_credential,
|
||||||
commands::updater::list_releases,
|
commands::updater::list_releases,
|
||||||
commands::updater::download_and_install_update,
|
commands::updater::download_and_install_update,
|
||||||
commands::biometric::windows_hello_authenticate,
|
commands::biometric::windows_hello_authenticate,
|
||||||
|
|||||||
@@ -4,8 +4,9 @@
|
|||||||
"version": "0.9.4",
|
"version": "0.9.4",
|
||||||
"identifier": "io.github.MokuProject.Moku",
|
"identifier": "io.github.MokuProject.Moku",
|
||||||
"build": {
|
"build": {
|
||||||
|
"devUrl": "http://localhost:1420",
|
||||||
"frontendDist": "../dist",
|
"frontendDist": "../dist",
|
||||||
"beforeBuildCommand": "pnpm build"
|
"beforeBuildCommand": "pnpm build:static"
|
||||||
},
|
},
|
||||||
"app": {
|
"app": {
|
||||||
"windows": [
|
"windows": [
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
{
|
{
|
||||||
"build": {
|
"build": {
|
||||||
"devUrl": "http://localhost:1420",
|
|
||||||
"beforeDevCommand": "pnpm dev"
|
"beforeDevCommand": "pnpm dev"
|
||||||
},
|
},
|
||||||
"app": {
|
"app": {
|
||||||
|
|||||||
-364
@@ -1,364 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { onMount } from "svelte";
|
|
||||||
import { invoke } from "@tauri-apps/api/core";
|
|
||||||
import { listen } from "@tauri-apps/api/event";
|
|
||||||
import { getCurrentWindow } from "@tauri-apps/api/window";
|
|
||||||
import { platform } from "@tauri-apps/plugin-os";
|
|
||||||
import { store, updateSettings, setActiveDownloads } from "@store/state.svelte";
|
|
||||||
import { downloadStore } from "@features/downloads/store/downloadState.svelte";
|
|
||||||
import { boot, initStore, startProbe, stopProbe, retryBoot, bypassBoot } from "@store/boot.svelte";
|
|
||||||
import { initRpc, setIdle, clearReading, destroyRpc } from "@store/discord";
|
|
||||||
import { applyTheme } from "@core/theme";
|
|
||||||
import { applyZoom, mountZoomKey, mountIdleDetection } from "@core/ui";
|
|
||||||
import { checkForUpdateSilently } from "@core/updater";
|
|
||||||
import Layout from "@shared/chrome/Layout.svelte";
|
|
||||||
import Reader from "@features/reader/components/Reader.svelte";
|
|
||||||
import Settings from "@features/settings/components/Settings.svelte";
|
|
||||||
import ThemeEditor from "@features/settings/components/ThemeEditor.svelte";
|
|
||||||
import TitleBar from "@shared/chrome/TitleBar.svelte";
|
|
||||||
import Toaster from "@shared/chrome/Toaster.svelte";
|
|
||||||
import SplashScreen from "@shared/chrome/SplashScreen.svelte";
|
|
||||||
import MangaPreview from "@shared/manga/MangaPreview.svelte";
|
|
||||||
import AuthGate from "@shared/chrome/AuthGate.svelte";
|
|
||||||
|
|
||||||
const win = getCurrentWindow();
|
|
||||||
void platform();
|
|
||||||
|
|
||||||
let appReady = $state(false);
|
|
||||||
let idle = $state(false);
|
|
||||||
let devSplash = $state(false);
|
|
||||||
|
|
||||||
let themeEditorOpen = $state(false);
|
|
||||||
let themeEditorEditId = $state<string | null>(null);
|
|
||||||
|
|
||||||
let closeDialogOpen = $state(false);
|
|
||||||
let closeRemember = $state(false);
|
|
||||||
|
|
||||||
function openThemeEditor(id?: string | null) {
|
|
||||||
themeEditorEditId = id ?? null;
|
|
||||||
themeEditorOpen = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
function closeThemeEditor() {
|
|
||||||
themeEditorOpen = false;
|
|
||||||
themeEditorEditId = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function doQuit() {
|
|
||||||
if (store.settings.autoStartServer) {
|
|
||||||
await Promise.race([
|
|
||||||
invoke("kill_server").catch(() => {}),
|
|
||||||
new Promise(res => setTimeout(res, 2000)),
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
await invoke("exit_app");
|
|
||||||
}
|
|
||||||
|
|
||||||
async function doHide() {
|
|
||||||
await win.hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function handleCloseRequested() {
|
|
||||||
const action = store.settings.closeAction ?? "ask";
|
|
||||||
if (action === "tray") { await doHide(); return; }
|
|
||||||
if (action === "quit") { await doQuit(); return; }
|
|
||||||
closeDialogOpen = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function confirmClose(choice: "tray" | "quit") {
|
|
||||||
closeDialogOpen = false;
|
|
||||||
if (closeRemember) updateSettings({ closeAction: choice });
|
|
||||||
closeRemember = false;
|
|
||||||
if (choice === "tray") await doHide();
|
|
||||||
else await doQuit();
|
|
||||||
}
|
|
||||||
|
|
||||||
$effect(() => { void store.settings.theme; applyTheme(); });
|
|
||||||
$effect(() => { void store.settings.uiZoom; applyZoom(); });
|
|
||||||
$effect(() => mountZoomKey());
|
|
||||||
|
|
||||||
$effect(() => {
|
|
||||||
if (!appReady) return;
|
|
||||||
return mountIdleDetection(
|
|
||||||
() => { idle = true; },
|
|
||||||
() => { if (idle) idle = false; },
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
$effect(() => {
|
|
||||||
if (!appReady) return;
|
|
||||||
const timer = setTimeout(checkForUpdateSilently, 5_000);
|
|
||||||
return () => clearTimeout(timer);
|
|
||||||
});
|
|
||||||
|
|
||||||
$effect(() => {
|
|
||||||
if (!appReady) return;
|
|
||||||
downloadStore.poll();
|
|
||||||
const dlInterval = setInterval(() => downloadStore.poll(), 2000);
|
|
||||||
return () => clearInterval(dlInterval);
|
|
||||||
});
|
|
||||||
|
|
||||||
$effect(() => {
|
|
||||||
if (store.settings.discordRpc) {
|
|
||||||
initRpc();
|
|
||||||
} else {
|
|
||||||
clearReading();
|
|
||||||
destroyRpc();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
$effect(() => {
|
|
||||||
if (!store.activeChapter && store.settings.discordRpc) setIdle();
|
|
||||||
});
|
|
||||||
|
|
||||||
$effect(() => {
|
|
||||||
const next = downloadStore.queue.slice();
|
|
||||||
downloadStore.detectTransitions(next);
|
|
||||||
});
|
|
||||||
|
|
||||||
onMount(async () => {
|
|
||||||
document.addEventListener("contextmenu", e => e.preventDefault());
|
|
||||||
(window as any).__mokuShowSplash = () => { devSplash = true; };
|
|
||||||
|
|
||||||
applyZoom();
|
|
||||||
|
|
||||||
store.isFullscreen = await win.isFullscreen();
|
|
||||||
|
|
||||||
const unlistenResize = await win.onResized(async () => {
|
|
||||||
store.isFullscreen = await win.isFullscreen();
|
|
||||||
});
|
|
||||||
|
|
||||||
const unlistenScale = await win.onScaleChanged(async () => {
|
|
||||||
applyZoom();
|
|
||||||
});
|
|
||||||
|
|
||||||
const unlistenClose = await win.listen("tauri://close-requested", handleCloseRequested);
|
|
||||||
|
|
||||||
await initStore();
|
|
||||||
startProbe();
|
|
||||||
|
|
||||||
if (store.settings.autoStartServer) {
|
|
||||||
invoke<void>("spawn_server", {
|
|
||||||
binary: store.settings.serverBinary,
|
|
||||||
webUiEnabled: store.settings.suwayomiWebUI ?? false,
|
|
||||||
}).catch((err: any) => {
|
|
||||||
if (err?.kind === "NotConfigured") boot.notConfigured = true;
|
|
||||||
else console.warn("Could not start server:", err);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
const unlistenDownload = await listen<{ chapterId: number; mangaId: number; progress: number }[]>(
|
|
||||||
"download-progress",
|
|
||||||
e => setActiveDownloads(e.payload),
|
|
||||||
);
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
stopProbe();
|
|
||||||
unlistenResize();
|
|
||||||
unlistenScale();
|
|
||||||
unlistenDownload();
|
|
||||||
unlistenClose();
|
|
||||||
destroyRpc();
|
|
||||||
delete (window as any).__mokuShowSplash;
|
|
||||||
};
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
{#if devSplash}
|
|
||||||
<SplashScreen mode="idle" showFps showCards={store.settings.splashCards ?? true}
|
|
||||||
onDismiss={() => setTimeout(() => devSplash = false, 340)} />
|
|
||||||
|
|
||||||
{:else if !appReady && !boot.loginRequired}
|
|
||||||
<SplashScreen mode="loading" ringFull={boot.serverProbeOk}
|
|
||||||
failed={boot.failed} notConfigured={boot.notConfigured}
|
|
||||||
showCards={store.settings.splashCards ?? true}
|
|
||||||
onReady={() => { appReady = true; }}
|
|
||||||
onRetry={retryBoot}
|
|
||||||
onBypass={() => bypassBoot(() => { appReady = true; })} />
|
|
||||||
|
|
||||||
{:else if boot.loginRequired}
|
|
||||||
<SplashScreen mode="loading" ringFull={true} showCards={store.settings.splashCards ?? true} />
|
|
||||||
<AuthGate onReady={() => { appReady = true; }} />
|
|
||||||
|
|
||||||
{:else}
|
|
||||||
{#if idle && !store.activeChapter}
|
|
||||||
<SplashScreen mode="idle" showCards={store.settings.splashCards ?? true}
|
|
||||||
onDismiss={() => { idle = false; }} />
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
{#if boot.sessionExpired}
|
|
||||||
<SplashScreen mode="loading" ringFull={true} showCards={store.settings.splashCards ?? true} />
|
|
||||||
<AuthGate onReady={() => { boot.sessionExpired = false; }} />
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
<div id="app-shell" class="root">
|
|
||||||
{#if !store.activeChapter}<TitleBar onClose={handleCloseRequested} />{/if}
|
|
||||||
<div class="content">
|
|
||||||
{#if store.activeChapter}<Reader />{:else}<Layout />{/if}
|
|
||||||
</div>
|
|
||||||
{#if store.settingsOpen}<Settings onOpenThemeEditor={openThemeEditor} />{/if}
|
|
||||||
{#if themeEditorOpen}
|
|
||||||
<ThemeEditor bind:editingId={themeEditorEditId} onClose={closeThemeEditor} />
|
|
||||||
{/if}
|
|
||||||
<MangaPreview />
|
|
||||||
<Toaster />
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
{#if closeDialogOpen}
|
|
||||||
<div class="close-backdrop" role="presentation" onclick={() => { closeDialogOpen = false; closeRemember = false; }}>
|
|
||||||
<div class="close-dialog" role="dialog" aria-modal="true" onclick={(e) => e.stopPropagation()}>
|
|
||||||
<div class="close-header">
|
|
||||||
<p class="close-title">Close Moku?</p>
|
|
||||||
<p class="close-sub">Choose how the app should exit.</p>
|
|
||||||
</div>
|
|
||||||
<div class="close-actions">
|
|
||||||
<button class="close-btn" onclick={() => confirmClose("tray")}>
|
|
||||||
<span class="close-btn-label">Minimize to Tray</span>
|
|
||||||
<span class="close-btn-desc">Keep running in the background</span>
|
|
||||||
</button>
|
|
||||||
<button class="close-btn close-btn-danger" onclick={() => confirmClose("quit")}>
|
|
||||||
<span class="close-btn-label">Quit</span>
|
|
||||||
<span class="close-btn-desc">Stop Moku entirely</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<button class="close-remember" onclick={() => closeRemember = !closeRemember}>
|
|
||||||
<span class="close-remember-toggle" class:on={closeRemember}><span class="close-remember-thumb"></span></span>
|
|
||||||
<span class="close-remember-label">Remember my choice</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
<style>
|
|
||||||
.root { display: flex; flex-direction: column; height: 100%; overflow: hidden; }
|
|
||||||
.content { flex: 1; overflow: hidden; }
|
|
||||||
|
|
||||||
.close-backdrop {
|
|
||||||
position: fixed;
|
|
||||||
inset: 0;
|
|
||||||
background: rgba(0, 0, 0, 0.55);
|
|
||||||
backdrop-filter: blur(6px);
|
|
||||||
-webkit-backdrop-filter: blur(6px);
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
z-index: var(--z-modal);
|
|
||||||
}
|
|
||||||
|
|
||||||
.close-dialog {
|
|
||||||
background: var(--bg-surface);
|
|
||||||
border: 1px solid var(--border-base);
|
|
||||||
border-radius: var(--radius-2xl);
|
|
||||||
padding: var(--sp-5);
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: var(--sp-3);
|
|
||||||
width: 300px;
|
|
||||||
box-shadow:
|
|
||||||
0 0 0 1px rgba(255,255,255,0.04) inset,
|
|
||||||
0 20px 60px rgba(0,0,0,0.65),
|
|
||||||
0 6px 20px rgba(0,0,0,0.35);
|
|
||||||
}
|
|
||||||
|
|
||||||
.close-header { display: flex; flex-direction: column; gap: 3px; }
|
|
||||||
|
|
||||||
.close-title {
|
|
||||||
font-family: var(--font-ui);
|
|
||||||
font-size: var(--text-base);
|
|
||||||
font-weight: var(--weight-medium);
|
|
||||||
color: var(--text-primary);
|
|
||||||
letter-spacing: var(--tracking-tight);
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.close-sub {
|
|
||||||
font-family: var(--font-ui);
|
|
||||||
font-size: var(--text-xs);
|
|
||||||
color: var(--text-faint);
|
|
||||||
letter-spacing: var(--tracking-wide);
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.close-actions { display: flex; flex-direction: column; gap: var(--sp-1); }
|
|
||||||
|
|
||||||
.close-btn {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: flex-start;
|
|
||||||
gap: 2px;
|
|
||||||
width: 100%;
|
|
||||||
padding: 10px var(--sp-3);
|
|
||||||
border-radius: var(--radius-lg);
|
|
||||||
border: 1px solid var(--border-dim);
|
|
||||||
background: var(--bg-raised);
|
|
||||||
cursor: pointer;
|
|
||||||
text-align: left;
|
|
||||||
transition: background var(--t-base), border-color var(--t-base);
|
|
||||||
}
|
|
||||||
.close-btn:hover { background: var(--bg-overlay); border-color: var(--border-strong); }
|
|
||||||
|
|
||||||
.close-btn-danger { border-color: color-mix(in srgb, var(--color-error) 30%, transparent); }
|
|
||||||
.close-btn-danger:hover { background: var(--color-error-bg); border-color: color-mix(in srgb, var(--color-error) 55%, transparent); }
|
|
||||||
.close-btn-danger .close-btn-label { color: var(--color-error); }
|
|
||||||
.close-btn-danger .close-btn-desc { color: color-mix(in srgb, var(--color-error) 55%, var(--text-faint)); }
|
|
||||||
|
|
||||||
.close-btn-label {
|
|
||||||
font-family: var(--font-ui);
|
|
||||||
font-size: var(--text-sm);
|
|
||||||
color: var(--text-secondary);
|
|
||||||
font-weight: var(--weight-medium);
|
|
||||||
}
|
|
||||||
|
|
||||||
.close-btn-desc {
|
|
||||||
font-family: var(--font-ui);
|
|
||||||
font-size: var(--text-2xs);
|
|
||||||
color: var(--text-faint);
|
|
||||||
letter-spacing: var(--tracking-wide);
|
|
||||||
}
|
|
||||||
|
|
||||||
.close-remember {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: var(--sp-2);
|
|
||||||
padding: var(--sp-1) 0 0;
|
|
||||||
background: none;
|
|
||||||
border: none;
|
|
||||||
cursor: pointer;
|
|
||||||
user-select: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.close-remember-toggle {
|
|
||||||
position: relative;
|
|
||||||
width: 28px;
|
|
||||||
height: 16px;
|
|
||||||
border-radius: var(--radius-full);
|
|
||||||
border: 1px solid var(--border-strong);
|
|
||||||
background: var(--bg-overlay);
|
|
||||||
flex-shrink: 0;
|
|
||||||
transition: background var(--t-base), border-color var(--t-base);
|
|
||||||
}
|
|
||||||
.close-remember-toggle.on { background: var(--accent); border-color: var(--accent); }
|
|
||||||
|
|
||||||
.close-remember-thumb {
|
|
||||||
position: absolute;
|
|
||||||
top: 1px;
|
|
||||||
left: 1px;
|
|
||||||
width: 12px;
|
|
||||||
height: 12px;
|
|
||||||
border-radius: 50%;
|
|
||||||
background: var(--text-faint);
|
|
||||||
transition: transform var(--t-base), background var(--t-base);
|
|
||||||
}
|
|
||||||
.close-remember-toggle.on .close-remember-thumb {
|
|
||||||
transform: translateX(12px);
|
|
||||||
background: var(--bg-void);
|
|
||||||
}
|
|
||||||
|
|
||||||
.close-remember-label {
|
|
||||||
font-family: var(--font-ui);
|
|
||||||
font-size: var(--text-xs);
|
|
||||||
color: var(--text-faint);
|
|
||||||
letter-spacing: var(--tracking-wide);
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -1,151 +0,0 @@
|
|||||||
import { store } from "@store/state.svelte";
|
|
||||||
import { fetchAuthenticated, AuthRequiredError, refreshUiAccessToken } from "../core/auth";
|
|
||||||
import { boot } from "@store/boot.svelte";
|
|
||||||
import { getBlobUrl } from "@core/cache/imageCache";
|
|
||||||
|
|
||||||
const DEFAULT_URL = "http://127.0.0.1:4567";
|
|
||||||
|
|
||||||
type ReauthResolver = () => void;
|
|
||||||
let _reauthQueue: ReauthResolver[] = [];
|
|
||||||
|
|
||||||
export function notifyReauthSuccess() {
|
|
||||||
const queue = _reauthQueue;
|
|
||||||
_reauthQueue = [];
|
|
||||||
queue.forEach(resolve => resolve());
|
|
||||||
}
|
|
||||||
|
|
||||||
function waitForReauth(): Promise<void> {
|
|
||||||
return new Promise(resolve => { _reauthQueue.push(resolve); });
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getServerUrl(): string {
|
|
||||||
const url = store.settings.serverUrl;
|
|
||||||
return typeof url === "string" && url.trim() ? url.replace(/\/$/, "") : DEFAULT_URL;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function plainThumbUrl(path: string): string {
|
|
||||||
if (!path) return "";
|
|
||||||
if (path.startsWith("http")) return path;
|
|
||||||
return `${getServerUrl()}${path}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function resolveImageUrl(path: string): Promise<string> {
|
|
||||||
if (!path) return "";
|
|
||||||
const url = path.startsWith("http") ? path : `${getServerUrl()}${path}`;
|
|
||||||
const mode = store.settings.serverAuthMode ?? "NONE";
|
|
||||||
if (mode === "NONE") return url;
|
|
||||||
return getBlobUrl(url);
|
|
||||||
}
|
|
||||||
|
|
||||||
export const thumbUrl = plainThumbUrl;
|
|
||||||
|
|
||||||
interface GQLResponse<T> {
|
|
||||||
data: T;
|
|
||||||
errors?: { message: string }[];
|
|
||||||
}
|
|
||||||
|
|
||||||
function abortableSleep(ms: number, signal?: AbortSignal): Promise<void> {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
if (signal?.aborted) { reject(new DOMException("Aborted", "AbortError")); return; }
|
|
||||||
const timer = setTimeout(resolve, ms);
|
|
||||||
signal?.addEventListener("abort", () => {
|
|
||||||
clearTimeout(timer);
|
|
||||||
reject(new DOMException("Aborted", "AbortError"));
|
|
||||||
}, { once: true });
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
async function fetchWithRetry(
|
|
||||||
url: string,
|
|
||||||
init: RequestInit,
|
|
||||||
signal?: AbortSignal,
|
|
||||||
retries = 3,
|
|
||||||
delayMs = 300,
|
|
||||||
): Promise<Response> {
|
|
||||||
if (signal?.aborted) throw new DOMException("Aborted", "AbortError");
|
|
||||||
for (let i = 0; i < retries; i++) {
|
|
||||||
if (signal?.aborted) throw new DOMException("Aborted", "AbortError");
|
|
||||||
try {
|
|
||||||
const res = await fetchAuthenticated(url, init, signal, boot.skipped);
|
|
||||||
if (signal?.aborted) throw new DOMException("Aborted", "AbortError");
|
|
||||||
return res;
|
|
||||||
} catch (e: any) {
|
|
||||||
if (e?.authRequired) throw e;
|
|
||||||
if (e?.name === "AbortError" || signal?.aborted) throw new DOMException("Aborted", "AbortError");
|
|
||||||
if (e instanceof AuthRequiredError) throw e;
|
|
||||||
if (i === retries - 1) throw e;
|
|
||||||
await abortableSleep(delayMs * Math.pow(1.5, i), signal);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
throw new Error("unreachable");
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function fetchImage(
|
|
||||||
path: string,
|
|
||||||
signal?: AbortSignal,
|
|
||||||
): Promise<{ src: string; revoke: () => void }> {
|
|
||||||
if (!path) return { src: "", revoke: () => {} };
|
|
||||||
|
|
||||||
const url = path.startsWith("http") ? path : `${getServerUrl()}${path}`;
|
|
||||||
const mode = store.settings.serverAuthMode ?? "NONE";
|
|
||||||
|
|
||||||
if (mode === "NONE") return { src: url, revoke: () => {} };
|
|
||||||
|
|
||||||
const res = await fetchWithRetry(url, { method: "GET" }, signal);
|
|
||||||
if (!res.ok) throw new Error(`Image fetch failed: ${res.status}`);
|
|
||||||
|
|
||||||
const blob = await res.blob();
|
|
||||||
const src = URL.createObjectURL(blob);
|
|
||||||
return { src, revoke: () => URL.revokeObjectURL(src) };
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function gql<T>(
|
|
||||||
query: string,
|
|
||||||
variables?: Record<string, unknown>,
|
|
||||||
signal?: AbortSignal,
|
|
||||||
): Promise<T> {
|
|
||||||
const tryRefreshAndRetry = async (): Promise<T | null> => {
|
|
||||||
const mode = store.settings.serverAuthMode ?? "NONE";
|
|
||||||
if (mode !== "UI_LOGIN" || boot.skipped) return null;
|
|
||||||
const refreshed = await refreshUiAccessToken(true);
|
|
||||||
if (!refreshed) return null;
|
|
||||||
if (signal?.aborted) throw new DOMException("Aborted", "AbortError");
|
|
||||||
return attempt();
|
|
||||||
};
|
|
||||||
|
|
||||||
const attempt = async (): Promise<T> => {
|
|
||||||
const res = await fetchWithRetry(
|
|
||||||
`${getServerUrl()}/api/graphql`,
|
|
||||||
{ method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ query, variables }) },
|
|
||||||
signal,
|
|
||||||
);
|
|
||||||
if (signal?.aborted) throw new DOMException("Aborted", "AbortError");
|
|
||||||
if (!res.ok) {
|
|
||||||
if (res.status === 401 || res.status === 403) {
|
|
||||||
const retried = await tryRefreshAndRetry();
|
|
||||||
if (retried) return retried;
|
|
||||||
}
|
|
||||||
throw new Error(`Suwayomi HTTP ${res.status}`);
|
|
||||||
}
|
|
||||||
const json: GQLResponse<T> = await res.json();
|
|
||||||
if (signal?.aborted) throw new DOMException("Aborted", "AbortError");
|
|
||||||
if (json.errors?.length) {
|
|
||||||
const isAuthError = json.errors.some(e => /unauthorized|unauthenticated/i.test(e.message));
|
|
||||||
if (isAuthError && !boot.skipped) {
|
|
||||||
const retried = await tryRefreshAndRetry();
|
|
||||||
if (retried) return retried;
|
|
||||||
|
|
||||||
boot.sessionExpired = true;
|
|
||||||
boot.loginRequired = true;
|
|
||||||
boot.loginUser = store.settings.serverAuthUser ?? "";
|
|
||||||
await waitForReauth();
|
|
||||||
if (signal?.aborted) throw new DOMException("Aborted", "AbortError");
|
|
||||||
return attempt();
|
|
||||||
}
|
|
||||||
throw new Error(json.errors[0].message);
|
|
||||||
}
|
|
||||||
return json.data;
|
|
||||||
};
|
|
||||||
|
|
||||||
return attempt();
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
export * from "./client";
|
|
||||||
export * from "./queries/manga";
|
|
||||||
export * from "./queries/chapters";
|
|
||||||
export * from "./queries/downloads";
|
|
||||||
export * from "./queries/extensions";
|
|
||||||
export * from "./queries/tracking";
|
|
||||||
export * from "./mutations/manga";
|
|
||||||
export * from "./mutations/chapters";
|
|
||||||
export * from "./mutations/downloads";
|
|
||||||
export * from "./mutations/extensions";
|
|
||||||
export * from "./mutations/tracking";
|
|
||||||
@@ -1,215 +0,0 @@
|
|||||||
export const FETCH_EXTENSIONS = `
|
|
||||||
mutation FetchExtensions {
|
|
||||||
fetchExtensions(input: {}) {
|
|
||||||
extensions {
|
|
||||||
apkName pkgName name lang versionName
|
|
||||||
isInstalled isObsolete hasUpdate iconUrl
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const UPDATE_EXTENSION = `
|
|
||||||
mutation UpdateExtension($id: String!, $install: Boolean, $uninstall: Boolean, $update: Boolean) {
|
|
||||||
updateExtension(input: { id: $id, patch: { install: $install, uninstall: $uninstall, update: $update } }) {
|
|
||||||
extension { apkName pkgName name isInstalled hasUpdate }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const UPDATE_EXTENSIONS = `
|
|
||||||
mutation UpdateExtensions($ids: [String!]!, $install: Boolean, $uninstall: Boolean, $update: Boolean) {
|
|
||||||
updateExtensions(input: { ids: $ids, patch: { install: $install, uninstall: $uninstall, update: $update } }) {
|
|
||||||
extensions { apkName pkgName name isInstalled hasUpdate }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const INSTALL_EXTERNAL_EXTENSION = `
|
|
||||||
mutation InstallExternalExtension($url: String!) {
|
|
||||||
installExternalExtension(input: { extensionUrl: $url }) {
|
|
||||||
extension { apkName pkgName name isInstalled }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const UPDATE_SOURCE_PREFERENCE = `
|
|
||||||
mutation UpdateSourcePreference($source: LongString!, $change: SourcePreferenceChangeInput!) {
|
|
||||||
updateSourcePreference(input: { source: $source, change: $change }) {
|
|
||||||
source { id displayName }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const SET_SOURCE_METAS = `
|
|
||||||
mutation SetSourceMetas($input: SetSourceMetasInput!) {
|
|
||||||
setSourceMetas(input: $input) {
|
|
||||||
metas { sourceId key value }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const DELETE_SOURCE_METAS = `
|
|
||||||
mutation DeleteSourceMetas($input: DeleteSourceMetasInput!) {
|
|
||||||
deleteSourceMetas(input: $input) {
|
|
||||||
metas { sourceId key value }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const UPDATE_SOURCE_METADATA = `
|
|
||||||
mutation UpdateSourceMetadata(
|
|
||||||
$preUpdateDeleteInput: DeleteSourceMetasInput!
|
|
||||||
$hasPreUpdateDeletions: Boolean!
|
|
||||||
$updateInput: SetSourceMetasInput!
|
|
||||||
$hasUpdates: Boolean!
|
|
||||||
$postUpdateDeleteInput: DeleteSourceMetasInput!
|
|
||||||
$hasPostUpdateDeletions: Boolean!
|
|
||||||
$migrateInput: SetSourceMetasInput!
|
|
||||||
$isMigration: Boolean!
|
|
||||||
) {
|
|
||||||
preUpdateDeletedMeta: deleteSourceMetas(input: $preUpdateDeleteInput) @include(if: $hasPreUpdateDeletions) {
|
|
||||||
metas { sourceId key value }
|
|
||||||
}
|
|
||||||
updatedMeta: setSourceMetas(input: $updateInput) @include(if: $hasUpdates) {
|
|
||||||
metas { sourceId key value }
|
|
||||||
}
|
|
||||||
postUpdateDeletedMeta: deleteSourceMetas(input: $postUpdateDeleteInput) @include(if: $hasPostUpdateDeletions) {
|
|
||||||
metas { sourceId key value }
|
|
||||||
}
|
|
||||||
migrationMeta: setSourceMetas(input: $migrateInput) @include(if: $isMigration) {
|
|
||||||
metas { sourceId key value }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const SET_SOURCE_META = `
|
|
||||||
mutation SetSourceMeta($sourceId: LongString!, $key: String!, $value: String!) {
|
|
||||||
setSourceMeta(input: { meta: { sourceId: $sourceId, key: $key, value: $value } }) {
|
|
||||||
meta { key value }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const DELETE_SOURCE_META = `
|
|
||||||
mutation DeleteSourceMeta($sourceId: LongString!, $key: String!) {
|
|
||||||
deleteSourceMeta(input: { sourceId: $sourceId, key: $key }) {
|
|
||||||
meta { key value }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const SET_CATEGORY_META = `
|
|
||||||
mutation SetCategoryMeta($categoryId: Int!, $key: String!, $value: String!) {
|
|
||||||
setCategoryMeta(input: { meta: { categoryId: $categoryId, key: $key, value: $value } }) {
|
|
||||||
meta { key value }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const DELETE_CATEGORY_META = `
|
|
||||||
mutation DeleteCategoryMeta($categoryId: Int!, $key: String!) {
|
|
||||||
deleteCategoryMeta(input: { categoryId: $categoryId, key: $key }) {
|
|
||||||
meta { key value }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const SET_GLOBAL_META = `
|
|
||||||
mutation SetGlobalMeta($key: String!, $value: String!) {
|
|
||||||
setGlobalMeta(input: { meta: { key: $key, value: $value } }) {
|
|
||||||
meta { key value }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const DELETE_GLOBAL_META = `
|
|
||||||
mutation DeleteGlobalMeta($key: String!) {
|
|
||||||
deleteGlobalMeta(input: { key: $key }) {
|
|
||||||
meta { key value }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const CLEAR_CACHED_IMAGES = `
|
|
||||||
mutation ClearCachedImages($cachedPages: Boolean, $cachedThumbnails: Boolean, $downloadedThumbnails: Boolean) {
|
|
||||||
clearCachedImages(input: {
|
|
||||||
cachedPages: $cachedPages
|
|
||||||
cachedThumbnails: $cachedThumbnails
|
|
||||||
downloadedThumbnails: $downloadedThumbnails
|
|
||||||
}) {
|
|
||||||
cachedPages cachedThumbnails downloadedThumbnails
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const RESET_SETTINGS = `
|
|
||||||
mutation ResetSettings {
|
|
||||||
resetSettings(input: {}) {
|
|
||||||
settings { extensionRepos }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const SET_EXTENSION_REPOS = `
|
|
||||||
mutation SetExtensionRepos($repos: [String!]!) {
|
|
||||||
setSettings(input: { settings: { extensionRepos: $repos } }) {
|
|
||||||
settings { extensionRepos }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const SET_SERVER_AUTH = `
|
|
||||||
mutation SetServerAuth($authMode: AuthMode!, $authUsername: String!, $authPassword: String!) {
|
|
||||||
setSettings(input: { settings: { authMode: $authMode, authUsername: $authUsername, authPassword: $authPassword } }) {
|
|
||||||
settings { authMode authUsername }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const SET_SOCKS_PROXY = `
|
|
||||||
mutation SetSocksProxy(
|
|
||||||
$socksProxyEnabled: Boolean!
|
|
||||||
$socksProxyHost: String!
|
|
||||||
$socksProxyPort: String!
|
|
||||||
$socksProxyVersion: Int!
|
|
||||||
$socksProxyUsername: String!
|
|
||||||
$socksProxyPassword: String!
|
|
||||||
) {
|
|
||||||
setSettings(input: { settings: {
|
|
||||||
socksProxyEnabled: $socksProxyEnabled
|
|
||||||
socksProxyHost: $socksProxyHost
|
|
||||||
socksProxyPort: $socksProxyPort
|
|
||||||
socksProxyVersion: $socksProxyVersion
|
|
||||||
socksProxyUsername: $socksProxyUsername
|
|
||||||
socksProxyPassword: $socksProxyPassword
|
|
||||||
}}) {
|
|
||||||
settings { socksProxyEnabled socksProxyHost socksProxyPort socksProxyVersion socksProxyUsername }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const SET_FLARESOLVERR = `
|
|
||||||
mutation SetFlareSolverr(
|
|
||||||
$flareSolverrEnabled: Boolean!
|
|
||||||
$flareSolverrUrl: String!
|
|
||||||
$flareSolverrTimeout: Int!
|
|
||||||
$flareSolverrSessionName: String!
|
|
||||||
$flareSolverrSessionTtl: Int!
|
|
||||||
$flareSolverrAsResponseFallback: Boolean!
|
|
||||||
) {
|
|
||||||
setSettings(input: { settings: {
|
|
||||||
flareSolverrEnabled: $flareSolverrEnabled
|
|
||||||
flareSolverrUrl: $flareSolverrUrl
|
|
||||||
flareSolverrTimeout: $flareSolverrTimeout
|
|
||||||
flareSolverrSessionName: $flareSolverrSessionName
|
|
||||||
flareSolverrSessionTtl: $flareSolverrSessionTtl
|
|
||||||
flareSolverrAsResponseFallback: $flareSolverrAsResponseFallback
|
|
||||||
}}) {
|
|
||||||
settings {
|
|
||||||
flareSolverrEnabled flareSolverrUrl flareSolverrTimeout
|
|
||||||
flareSolverrSessionName flareSolverrSessionTtl flareSolverrAsResponseFallback
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
export * from "./manga";
|
|
||||||
export * from "./chapters";
|
|
||||||
export * from "./downloads";
|
|
||||||
export * from "./extensions";
|
|
||||||
export * from "./tracking";
|
|
||||||
@@ -1,130 +0,0 @@
|
|||||||
# Mutations
|
|
||||||
|
|
||||||
## Manga (`mutations/manga.ts`)
|
|
||||||
|
|
||||||
| Mutation | Variables | Description |
|
|
||||||
|----------|-----------|-------------|
|
|
||||||
| `FETCH_MANGA` | `id: Int!` | Fetch and refresh manga metadata from its source |
|
|
||||||
| `UPDATE_MANGA` | `id: Int!`, `inLibrary: Boolean` | Update a single manga's library membership |
|
|
||||||
| `UPDATE_MANGAS` | `ids: [Int!]!`, `inLibrary: Boolean` | Bulk-update library membership for multiple manga |
|
|
||||||
| `UPDATE_MANGA_CATEGORIES` | `mangaId: Int!`, `addTo: [Int!]!`, `removeFrom: [Int!]!` | Add or remove a single manga from categories |
|
|
||||||
| `UPDATE_MANGAS_CATEGORIES` | `ids: [Int!]!`, `addTo: [Int!]!`, `removeFrom: [Int!]!` | Bulk add/remove multiple manga from categories |
|
|
||||||
| `CREATE_CATEGORY` | `name: String!` | Create a new category |
|
|
||||||
| `UPDATE_CATEGORY` | `id: Int!`, `name: String` | Update a category's name |
|
|
||||||
| `UPDATE_CATEGORIES` | `ids: [Int!]!`, `patch: UpdateCategoryPatchInput!` | Bulk-update multiple categories |
|
|
||||||
| `DELETE_CATEGORY` | `id: Int!` | Delete a category |
|
|
||||||
| `UPDATE_CATEGORY_ORDER` | `id: Int!`, `position: Int!` | Move a category to a new position |
|
|
||||||
| `UPDATE_CATEGORY_MANGA` | `categoryId: Int!` | Trigger a metadata update for all manga in a category |
|
|
||||||
| `UPDATE_LIBRARY` | — | Trigger a full library metadata refresh |
|
|
||||||
| `UPDATE_LIBRARY_MANGA` | `mangaId: Int!` | Trigger a metadata update for a single manga |
|
|
||||||
| `UPDATE_STOP` | — | Stop the currently running library update job |
|
|
||||||
| `CREATE_BACKUP` | — | Create a backup and return its download URL |
|
|
||||||
| `RESTORE_BACKUP` | `backup: Upload!` | Restore a backup file and return the restore job status |
|
|
||||||
| `SET_MANGA_META` | `mangaId: Int!`, `key: String!`, `value: String!` | Set a key/value meta entry on a manga |
|
|
||||||
| `DELETE_MANGA_META` | `mangaId: Int!`, `key: String!` | Delete a key/value meta entry from a manga |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Chapters (`mutations/chapters.ts`)
|
|
||||||
|
|
||||||
| Mutation | Variables | Description |
|
|
||||||
|----------|-----------|-------------|
|
|
||||||
| `FETCH_CHAPTERS` | `mangaId: Int!` | Fetch/refresh the chapter list for a manga from its source |
|
|
||||||
| `FETCH_CHAPTER_PAGES` | `chapterId: Int!` | Fetch the page URLs for a specific chapter |
|
|
||||||
| `MARK_CHAPTER_READ` | `id: Int!`, `isRead: Boolean!` | Mark a single chapter read or unread |
|
|
||||||
| `MARK_CHAPTERS_READ` | `ids: [Int!]!`, `isRead: Boolean!` | Bulk mark chapters read or unread |
|
|
||||||
| `UPDATE_CHAPTERS_PROGRESS` | `ids: [Int!]!`, `isRead: Boolean`, `isBookmarked: Boolean`, `lastPageRead: Int` | Bulk update read state, bookmark state, and last page read |
|
|
||||||
| `DELETE_DOWNLOADED_CHAPTERS` | `ids: [Int!]!` | Delete downloaded chapter files |
|
|
||||||
| `SET_CHAPTER_META` | `chapterId: Int!`, `key: String!`, `value: String!` | Set a key/value meta entry on a chapter |
|
|
||||||
| `DELETE_CHAPTER_META` | `chapterId: Int!`, `key: String!` | Delete a key/value meta entry from a chapter |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Downloads (`mutations/downloads.ts`)
|
|
||||||
|
|
||||||
| Mutation | Variables | Description |
|
|
||||||
|----------|-----------|-------------|
|
|
||||||
| `ENQUEUE_DOWNLOAD` | `chapterId: Int!` | Add a single chapter to the download queue |
|
|
||||||
| `ENQUEUE_CHAPTERS_DOWNLOAD` | `chapterIds: [Int!]!` | Add multiple chapters to the download queue |
|
|
||||||
| `DEQUEUE_DOWNLOAD` | `chapterId: Int!` | Remove a single chapter from the download queue |
|
|
||||||
| `DEQUEUE_CHAPTERS_DOWNLOAD` | `chapterIds: [Int!]!` | Remove multiple chapters from the download queue |
|
|
||||||
| `REORDER_DOWNLOAD` | `chapterId: Int!`, `to: Int!` | Move a queued chapter to a new position |
|
|
||||||
| `START_DOWNLOADER` | — | Start the downloader |
|
|
||||||
| `STOP_DOWNLOADER` | — | Stop the downloader |
|
|
||||||
| `CLEAR_DOWNLOADER` | — | Clear all items from the download queue |
|
|
||||||
| `FETCH_SOURCE_MANGA` | `source: LongString!`, `type: FetchSourceMangaType!`, `page: Int!`, `query: String`, `filters: [FilterChangeInput!]` | Fetch manga from a source (browse/search) with pagination |
|
|
||||||
| `SET_DOWNLOADS_PATH` | `path: String!` | Set the downloads directory path |
|
|
||||||
| `SET_LOCAL_SOURCE_PATH` | `path: String!` | Set the local source directory path |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Extensions (`mutations/extensions.ts`)
|
|
||||||
|
|
||||||
| Mutation | Variables | Description |
|
|
||||||
|----------|-----------|-------------|
|
|
||||||
| `FETCH_EXTENSIONS` | — | Fetch the latest extension list from configured repos |
|
|
||||||
| `UPDATE_EXTENSION` | `id: String!`, `install: Boolean`, `uninstall: Boolean`, `update: Boolean` | Install, uninstall, or update a single extension |
|
|
||||||
| `UPDATE_EXTENSIONS` | `ids: [String!]!`, `install: Boolean`, `uninstall: Boolean`, `update: Boolean` | Bulk install, uninstall, or update multiple extensions |
|
|
||||||
| `INSTALL_EXTERNAL_EXTENSION` | `url: String!` | Install an extension from an external APK URL |
|
|
||||||
| `UPDATE_SOURCE_PREFERENCE` | `source: LongString!`, `change: SourcePreferenceChangeInput!` | Update a source-specific preference value |
|
|
||||||
| `SET_SOURCE_META` | `sourceId: LongString!`, `key: String!`, `value: String!` | Set a key/value meta entry on a source |
|
|
||||||
| `DELETE_SOURCE_META` | `sourceId: LongString!`, `key: String!` | Delete a key/value meta entry from a source |
|
|
||||||
| `SET_CATEGORY_META` | `categoryId: Int!`, `key: String!`, `value: String!` | Set a key/value meta entry on a category |
|
|
||||||
| `DELETE_CATEGORY_META` | `categoryId: Int!`, `key: String!` | Delete a key/value meta entry from a category |
|
|
||||||
| `SET_GLOBAL_META` | `key: String!`, `value: String!` | Set a global key/value meta entry |
|
|
||||||
| `DELETE_GLOBAL_META` | `key: String!` | Delete a global key/value meta entry |
|
|
||||||
| `CLEAR_CACHED_IMAGES` | `cachedPages: Boolean`, `cachedThumbnails: Boolean`, `downloadedThumbnails: Boolean` | Selectively clear cached page images, cached thumbnails, or downloaded thumbnails |
|
|
||||||
| `RESET_SETTINGS` | — | Reset all server settings to defaults |
|
|
||||||
| `UPDATE_WEBUI` | — | Trigger a WebUI update and return live status |
|
|
||||||
| `RESET_WEBUI_UPDATE_STATUS` | — | Reset the WebUI update status back to idle |
|
|
||||||
| `SET_EXTENSION_REPOS` | `repos: [String!]!` | Set the list of extension repository URLs |
|
|
||||||
| `SET_SERVER_AUTH` | `authMode: AuthMode!`, `authUsername: String!`, `authPassword: String!` | Configure server auth mode and credentials |
|
|
||||||
| `SET_SOCKS_PROXY` | `socksProxyEnabled: Boolean!`, `socksProxyHost: String!`, `socksProxyPort: String!`, `socksProxyVersion: Int!`, `socksProxyUsername: String!`, `socksProxyPassword: String!` | Configure SOCKS proxy settings |
|
|
||||||
| `SET_FLARESOLVERR` | `flareSolverrEnabled: Boolean!`, `flareSolverrUrl: String!`, `flareSolverrTimeout: Int!`, `flareSolverrSessionName: String!`, `flareSolverrSessionTtl: Int!`, `flareSolverrAsResponseFallback: Boolean!` | Configure FlareSolverr integration |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Tracking (`mutations/tracking.ts`)
|
|
||||||
|
|
||||||
| Mutation | Variables | Description |
|
|
||||||
|----------|-----------|-------------|
|
|
||||||
| `BIND_TRACK` | `mangaId: Int!`, `trackerId: Int!`, `remoteId: LongString!` | Bind a manga to a remote tracker entry |
|
|
||||||
| `UPDATE_TRACK` | `recordId: Int!`, `status: Int`, `lastChapterRead: Float`, `scoreString: String`, `startDate: LongString`, `finishDate: LongString`, `private: Boolean` | Update tracking progress, status, score, and dates |
|
|
||||||
| `UNBIND_TRACK` | `recordId: Int!` | Unbind a manga from a tracker record |
|
|
||||||
| `FETCH_TRACK` | `recordId: Int!` | Refresh a track record from the remote tracker |
|
|
||||||
| `TRACK_PROGRESS` | `mangaId: Int!` | Sync current reading progress to all bound trackers for a manga |
|
|
||||||
| `LOGIN_TRACKER_OAUTH` | `trackerId: Int!`, `callbackUrl: String!` | Initiate OAuth login for a tracker |
|
|
||||||
| `LOGIN_TRACKER_CREDENTIALS` | `trackerId: Int!`, `username: String!`, `password: String!` | Log into a tracker with username and password |
|
|
||||||
| `LOGOUT_TRACKER` | `trackerId: Int!` | Log out of a tracker |
|
|
||||||
| `CONNECT_KOSYNC` | `username: String!`, `password: String!`, `serverAddress: String!` | Connect a KOReader sync account |
|
|
||||||
| `LOGOUT_KOSYNC` | — | Disconnect the KOReader sync account |
|
|
||||||
| `PULL_KOSYNC_PROGRESS` | `chapterId: Int!` | Pull reading progress from KOReader sync for a chapter |
|
|
||||||
| `PUSH_KOSYNC_PROGRESS` | `chapterId: Int!` | Push reading progress to KOReader sync for a chapter |
|
|
||||||
| `LOGIN_USER` | `username: String!`, `password: String!` | Authenticate and return access + refresh tokens |
|
|
||||||
| `REFRESH_TOKEN` | — | Refresh the current access token |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## New in Preview
|
|
||||||
|
|
||||||
Mutations now available and not yet wired to any feature in Moku:
|
|
||||||
|
|
||||||
| Mutation | Potential Feature |
|
|
||||||
|----------|-------------------|
|
|
||||||
| `UPDATE_MANGAS_CATEGORIES` | Bulk category editor — move/assign multiple manga at once |
|
|
||||||
| `UPDATE_CATEGORIES` | Bulk category settings — toggle update/download flags for multiple categories at once |
|
|
||||||
| `UPDATE_CATEGORY_MANGA` | Per-category refresh button — update only one category's manga |
|
|
||||||
| `UPDATE_LIBRARY_MANGA` | Single manga refresh — trigger from series detail without a full library update |
|
|
||||||
| `UPDATE_STOP` | Cancel button for library update jobs |
|
|
||||||
| `UPDATE_EXTENSIONS` | Bulk extension updater — "update all" button in extensions page |
|
|
||||||
| `UPDATE_SOURCE_PREFERENCE` | Source settings page — persist source-specific preferences |
|
|
||||||
| `SET_SOURCE_META` / `DELETE_SOURCE_META` | Per-source client state — store browse position, last filter, etc. |
|
|
||||||
| `SET_CATEGORY_META` / `DELETE_CATEGORY_META` | Per-category client state — store sort/filter preferences per category |
|
|
||||||
| `SET_CHAPTER_META` / `DELETE_CHAPTER_META` | Per-chapter client state — annotations, custom notes |
|
|
||||||
| `SET_GLOBAL_META` / `DELETE_GLOBAL_META` | Server-synced app state — replace local persistence for settings that should roam |
|
|
||||||
| `CLEAR_CACHED_IMAGES` | Storage settings — granular cache clearing (pages, thumbnails, downloaded) |
|
|
||||||
| `RESET_SETTINGS` | Settings page — factory reset button |
|
|
||||||
| `UPDATE_WEBUI` / `RESET_WEBUI_UPDATE_STATUS` | WebUI update flow in settings — trigger and monitor update progress |
|
|
||||||
| `TRACK_PROGRESS` | One-tap sync — push current reading position to all trackers without opening tracking panel |
|
|
||||||
| `CONNECT_KOSYNC` / `LOGOUT_KOSYNC` | KOReader sync settings section — connect/disconnect account |
|
|
||||||
| `PULL_KOSYNC_PROGRESS` / `PUSH_KOSYNC_PROGRESS` | KOReader sync — manual pull/push per chapter, or auto-sync on chapter open/close |
|
|
||||||
@@ -1,127 +0,0 @@
|
|||||||
const TRACK_RECORD_FRAGMENT = `
|
|
||||||
id trackerId remoteId title status score displayScore
|
|
||||||
lastChapterRead totalChapters remoteUrl startDate finishDate private libraryId
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const BIND_TRACK = `
|
|
||||||
mutation BindTrack($mangaId: Int!, $trackerId: Int!, $remoteId: LongString!) {
|
|
||||||
bindTrack(input: { mangaId: $mangaId, trackerId: $trackerId, remoteId: $remoteId }) {
|
|
||||||
trackRecord { ${TRACK_RECORD_FRAGMENT} }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const UPDATE_TRACK = `
|
|
||||||
mutation UpdateTrack($recordId: Int!, $status: Int, $lastChapterRead: Float, $scoreString: String, $startDate: LongString, $finishDate: LongString, $private: Boolean) {
|
|
||||||
updateTrack(input: { recordId: $recordId, status: $status, lastChapterRead: $lastChapterRead, scoreString: $scoreString, startDate: $startDate, finishDate: $finishDate, private: $private }) {
|
|
||||||
trackRecord {
|
|
||||||
id trackerId status score displayScore lastChapterRead totalChapters startDate finishDate private libraryId
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const UNBIND_TRACK = `
|
|
||||||
mutation UnbindTrack($recordId: Int!) {
|
|
||||||
unbindTrack(input: { recordId: $recordId }) {
|
|
||||||
trackRecord { id }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const FETCH_TRACK = `
|
|
||||||
mutation FetchTrack($recordId: Int!) {
|
|
||||||
fetchTrack(input: { recordId: $recordId }) {
|
|
||||||
trackRecord {
|
|
||||||
id trackerId status score displayScore lastChapterRead totalChapters startDate finishDate libraryId
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const TRACK_PROGRESS = `
|
|
||||||
mutation TrackProgress($mangaId: Int!) {
|
|
||||||
trackProgress(input: { mangaId: $mangaId }) {
|
|
||||||
trackRecords {
|
|
||||||
id trackerId lastChapterRead status
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const LOGIN_TRACKER_OAUTH = `
|
|
||||||
mutation LoginTrackerOAuth($trackerId: Int!, $callbackUrl: String!) {
|
|
||||||
loginTrackerOAuth(input: { trackerId: $trackerId, callbackUrl: $callbackUrl }) {
|
|
||||||
isLoggedIn
|
|
||||||
tracker { id name isLoggedIn isTokenExpired authUrl }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const LOGIN_TRACKER_CREDENTIALS = `
|
|
||||||
mutation LoginTrackerCredentials($trackerId: Int!, $username: String!, $password: String!) {
|
|
||||||
loginTrackerCredentials(input: { trackerId: $trackerId, username: $username, password: $password }) {
|
|
||||||
isLoggedIn
|
|
||||||
tracker { id name isLoggedIn isTokenExpired authUrl }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const LOGOUT_TRACKER = `
|
|
||||||
mutation LogoutTracker($trackerId: Int!) {
|
|
||||||
logoutTracker(input: { trackerId: $trackerId }) {
|
|
||||||
tracker { id name isLoggedIn isTokenExpired authUrl }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const CONNECT_KOSYNC = `
|
|
||||||
mutation ConnectKoSync($username: String!, $password: String!, $serverAddress: String!) {
|
|
||||||
connectKoSyncAccount(input: { username: $username, password: $password, serverAddress: $serverAddress }) {
|
|
||||||
isConnected
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const LOGOUT_KOSYNC = `
|
|
||||||
mutation LogoutKoSync {
|
|
||||||
logoutKoSyncAccount(input: {}) {
|
|
||||||
isConnected
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const PULL_KOSYNC_PROGRESS = `
|
|
||||||
mutation PullKoSyncProgress($chapterId: Int!) {
|
|
||||||
pullKoSyncProgress(input: { chapterId: $chapterId }) {
|
|
||||||
chapter { id lastPageRead isRead }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const PUSH_KOSYNC_PROGRESS = `
|
|
||||||
mutation PushKoSyncProgress($chapterId: Int!) {
|
|
||||||
pushKoSyncProgress(input: { chapterId: $chapterId }) {
|
|
||||||
chapter { id lastPageRead isRead }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const LOGIN_USER = `
|
|
||||||
mutation Login($username: String!, $password: String!, $clientMutationId: String) {
|
|
||||||
login(input: { username: $username, password: $password, clientMutationId: $clientMutationId }) {
|
|
||||||
accessToken
|
|
||||||
refreshToken
|
|
||||||
clientMutationId
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const REFRESH_TOKEN = `
|
|
||||||
mutation RefreshToken($refreshToken: String!, $clientMutationId: String) {
|
|
||||||
refreshToken(input: { refreshToken: $refreshToken, clientMutationId: $clientMutationId }) {
|
|
||||||
accessToken
|
|
||||||
clientMutationId
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
export const GET_RECENTLY_UPDATED = `
|
|
||||||
query GetRecentlyUpdated {
|
|
||||||
chapters(orderBy: FETCHED_AT, orderByType: DESC, first: 300) {
|
|
||||||
nodes {
|
|
||||||
mangaId
|
|
||||||
fetchedAt
|
|
||||||
manga { id title thumbnailUrl inLibrary }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const GET_CHAPTERS = `
|
|
||||||
query GetChapters($mangaId: Int!) {
|
|
||||||
chapters(condition: { mangaId: $mangaId }) {
|
|
||||||
nodes {
|
|
||||||
id name chapterNumber sourceOrder isRead isDownloaded isBookmarked
|
|
||||||
pageCount mangaId uploadDate realUrl lastPageRead lastReadAt scanlator
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
export const GET_DOWNLOAD_STATUS = `
|
|
||||||
query GetDownloadStatus {
|
|
||||||
downloadStatus {
|
|
||||||
state
|
|
||||||
queue {
|
|
||||||
progress state tries
|
|
||||||
chapter {
|
|
||||||
id name pageCount mangaId
|
|
||||||
manga { id title thumbnailUrl }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
@@ -1,117 +0,0 @@
|
|||||||
export const GET_LOCAL_MANGA = `
|
|
||||||
query GetLocalManga {
|
|
||||||
mangas(condition: { sourceId: "0" }) {
|
|
||||||
nodes { id title thumbnailUrl inLibrary }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const GET_EXTENSIONS = `
|
|
||||||
query GetExtensions {
|
|
||||||
extensions {
|
|
||||||
nodes {
|
|
||||||
apkName pkgName name lang versionName
|
|
||||||
isInstalled isObsolete hasUpdate iconUrl
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const GET_SOURCES = `
|
|
||||||
query GetSources {
|
|
||||||
sources {
|
|
||||||
nodes {
|
|
||||||
id name lang displayName iconUrl isNsfw
|
|
||||||
isConfigurable supportsLatest
|
|
||||||
extension { pkgName }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const GET_SOURCE_SETTINGS = `
|
|
||||||
query GetSourceSettings($id: LongString!) {
|
|
||||||
source(id: $id) {
|
|
||||||
id
|
|
||||||
displayName
|
|
||||||
preferences {
|
|
||||||
... on CheckBoxPreference {
|
|
||||||
type: __typename
|
|
||||||
CheckBoxTitle: title
|
|
||||||
CheckBoxSummary: summary
|
|
||||||
CheckBoxDefault: default
|
|
||||||
CheckBoxCurrentValue: currentValue
|
|
||||||
key
|
|
||||||
}
|
|
||||||
... on SwitchPreference {
|
|
||||||
type: __typename
|
|
||||||
SwitchPreferenceTitle: title
|
|
||||||
SwitchPreferenceSummary: summary
|
|
||||||
SwitchPreferenceDefault: default
|
|
||||||
SwitchPreferenceCurrentValue: currentValue
|
|
||||||
key
|
|
||||||
}
|
|
||||||
... on ListPreference {
|
|
||||||
type: __typename
|
|
||||||
ListPreferenceTitle: title
|
|
||||||
ListPreferenceSummary: summary
|
|
||||||
ListPreferenceDefault: default
|
|
||||||
ListPreferenceCurrentValue: currentValue
|
|
||||||
entries
|
|
||||||
entryValues
|
|
||||||
key
|
|
||||||
}
|
|
||||||
... on EditTextPreference {
|
|
||||||
type: __typename
|
|
||||||
EditTextPreferenceTitle: title
|
|
||||||
EditTextPreferenceSummary: summary
|
|
||||||
EditTextPreferenceDefault: default
|
|
||||||
EditTextPreferenceCurrentValue: currentValue
|
|
||||||
dialogTitle
|
|
||||||
dialogMessage
|
|
||||||
key
|
|
||||||
}
|
|
||||||
... on MultiSelectListPreference {
|
|
||||||
type: __typename
|
|
||||||
MultiSelectListPreferenceTitle: title
|
|
||||||
MultiSelectListPreferenceSummary: summary
|
|
||||||
MultiSelectListPreferenceDefault: default
|
|
||||||
MultiSelectListPreferenceCurrentValue: currentValue
|
|
||||||
entries
|
|
||||||
entryValues
|
|
||||||
key
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const GET_MIGRATABLE_SOURCES = `
|
|
||||||
query GetMigratableSources {
|
|
||||||
mangas(condition: { inLibrary: true }) {
|
|
||||||
nodes {
|
|
||||||
sourceId
|
|
||||||
source {
|
|
||||||
id name lang displayName iconUrl isNsfw isConfigurable supportsLatest
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const GET_SETTINGS = `
|
|
||||||
query GetSettings {
|
|
||||||
settings { extensionRepos }
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const GET_SERVER_SECURITY = `
|
|
||||||
query GetServerSecurity {
|
|
||||||
settings {
|
|
||||||
authMode authUsername
|
|
||||||
socksProxyEnabled socksProxyHost socksProxyPort socksProxyVersion socksProxyUsername
|
|
||||||
flareSolverrEnabled flareSolverrUrl flareSolverrTimeout
|
|
||||||
flareSolverrSessionName flareSolverrSessionTtl flareSolverrAsResponseFallback
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
export * from "./manga";
|
|
||||||
export * from "./chapters";
|
|
||||||
export * from "./downloads";
|
|
||||||
export * from "./extensions";
|
|
||||||
export * from "./tracking";
|
|
||||||
export * from "./updater";
|
|
||||||
export * from "./meta";
|
|
||||||
@@ -1,107 +0,0 @@
|
|||||||
export const GET_LIBRARY = `
|
|
||||||
query GetLibrary {
|
|
||||||
mangas(condition: { inLibrary: true }) {
|
|
||||||
nodes {
|
|
||||||
id title thumbnailUrl inLibrary downloadCount unreadCount bookmarkCount
|
|
||||||
description status author artist genre
|
|
||||||
inLibraryAt lastFetchedAt chaptersLastFetchedAt thumbnailUrlLastFetched
|
|
||||||
source { id name displayName }
|
|
||||||
chapters { totalCount }
|
|
||||||
latestFetchedChapter { id uploadDate }
|
|
||||||
latestUploadedChapter { id uploadDate }
|
|
||||||
lastReadChapter { id chapterNumber }
|
|
||||||
firstUnreadChapter { id chapterNumber }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const GET_ALL_MANGA = `
|
|
||||||
query GetAllManga {
|
|
||||||
mangas {
|
|
||||||
nodes { id title thumbnailUrl inLibrary downloadCount }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const GET_MANGA = `
|
|
||||||
query GetManga($id: Int!) {
|
|
||||||
manga(id: $id) {
|
|
||||||
id title description thumbnailUrl status author artist genre inLibrary realUrl
|
|
||||||
inLibraryAt lastFetchedAt thumbnailUrlLastFetched updateStrategy
|
|
||||||
source { id name displayName }
|
|
||||||
lastReadChapter { id chapterNumber lastPageRead }
|
|
||||||
firstUnreadChapter { id chapterNumber }
|
|
||||||
highestNumberedChapter { id chapterNumber }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const GET_CATEGORIES = `
|
|
||||||
query GetCategories {
|
|
||||||
categories {
|
|
||||||
nodes {
|
|
||||||
id name order default includeInUpdate includeInDownload
|
|
||||||
mangas {
|
|
||||||
nodes { id title thumbnailUrl inLibrary downloadCount unreadCount }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const GET_DOWNLOADED_CHAPTERS_PAGES = `
|
|
||||||
query GetDownloadedChaptersPages {
|
|
||||||
chapters(condition: { isDownloaded: true }) {
|
|
||||||
nodes { pageCount }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const GET_DOWNLOADS_PATH = `
|
|
||||||
query GetDownloadsPath {
|
|
||||||
settings { downloadsPath localSourcePath }
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const LIBRARY_UPDATE_STATUS = `
|
|
||||||
query LibraryUpdateStatus {
|
|
||||||
libraryUpdateStatus {
|
|
||||||
jobsInfo {
|
|
||||||
isRunning finishedJobs totalJobs skippedMangasCount skippedCategoriesCount
|
|
||||||
}
|
|
||||||
mangaUpdates {
|
|
||||||
status
|
|
||||||
manga { id title thumbnailUrl unreadCount }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const GET_RESTORE_STATUS = `
|
|
||||||
query GetRestoreStatus($id: String!) {
|
|
||||||
restoreStatus(id: $id) { mangaProgress state totalManga }
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const VALIDATE_BACKUP = `
|
|
||||||
query ValidateBackup($backup: Upload!) {
|
|
||||||
validateBackup(input: { backup: $backup }) {
|
|
||||||
missingSources { id name }
|
|
||||||
missingTrackers { name }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const MANGAS_BY_GENRE = `
|
|
||||||
query MangasByGenre($filter: MangaFilterInput, $first: Int, $offset: Int) {
|
|
||||||
mangas(filter: $filter, first: $first, offset: $offset, orderBy: IN_LIBRARY_AT, orderByType: DESC) {
|
|
||||||
nodes {
|
|
||||||
id title thumbnailUrl inLibrary genre status
|
|
||||||
source { id displayName }
|
|
||||||
}
|
|
||||||
pageInfo { hasNextPage }
|
|
||||||
totalCount
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
export const GET_META = `
|
|
||||||
query GetMeta($key: String!) {
|
|
||||||
meta(key: $key) {
|
|
||||||
key value
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const GET_METAS = `
|
|
||||||
query GetMetas {
|
|
||||||
metas {
|
|
||||||
nodes { key value }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
@@ -1,117 +0,0 @@
|
|||||||
# Queries
|
|
||||||
|
|
||||||
## Manga (`queries/manga.ts`)
|
|
||||||
|
|
||||||
| Query | Variables | Description |
|
|
||||||
|-------|-----------|-------------|
|
|
||||||
| `GET_LIBRARY` | — | All in-library manga with metadata, source, chapter counts, download count, unread count, bookmark count, and read progress anchors (`lastReadChapter`, `firstUnreadChapter`) |
|
|
||||||
| `GET_ALL_MANGA` | — | Minimal manga list — id, title, thumbnail, library flag, download count |
|
|
||||||
| `GET_MANGA` | `id: Int!` | Full detail for a single manga — includes `updateStrategy`, `lastReadChapter`, `firstUnreadChapter`, `highestNumberedChapter` |
|
|
||||||
| `GET_CATEGORIES` | — | All categories with order/settings and their assigned manga (minimal fields) |
|
|
||||||
| `GET_DOWNLOADED_CHAPTERS_PAGES` | — | Page counts for all downloaded chapters — used for storage stats |
|
|
||||||
| `GET_DOWNLOADS_PATH` | — | `downloadsPath` and `localSourcePath` from settings |
|
|
||||||
| `LIBRARY_UPDATE_STATUS` | — | Current library update job — `jobsInfo` progress and `mangaUpdates` list with new chapters |
|
|
||||||
| `GET_RESTORE_STATUS` | `id: String!` | Backup restore job status by job ID — `mangaProgress`, `state`, `totalManga` |
|
|
||||||
| `VALIDATE_BACKUP` | `backup: Upload!` | Validate a backup file before restore — returns missing sources and trackers |
|
|
||||||
| `MANGAS_BY_GENRE` | `filter: MangaFilterInput`, `first: Int`, `offset: Int` | Paginated manga filtered by genre, ordered by `IN_LIBRARY_AT DESC` |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Chapters (`queries/chapters.ts`)
|
|
||||||
|
|
||||||
| Query | Variables | Description |
|
|
||||||
|-------|-----------|-------------|
|
|
||||||
| `GET_RECENTLY_UPDATED` | — | Latest 300 chapters ordered by `FETCHED_AT DESC` with parent manga info |
|
|
||||||
| `GET_CHAPTERS` | `mangaId: Int!` | All chapters for a manga — includes `lastReadAt`, `lastPageRead`, read/download/bookmark state, page count, scanlator |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Downloads (`queries/downloads.ts`)
|
|
||||||
|
|
||||||
| Query | Variables | Description |
|
|
||||||
|-------|-----------|-------------|
|
|
||||||
| `GET_DOWNLOAD_STATUS` | — | Downloader state (`DownloaderState` enum) and full queue with chapter and manga info |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Extensions (`queries/extensions.ts`)
|
|
||||||
|
|
||||||
| Query | Variables | Description |
|
|
||||||
|-------|-----------|-------------|
|
|
||||||
| `GET_LOCAL_MANGA` | — | Manga from the local source (`sourceId: "0"`) |
|
|
||||||
| `GET_EXTENSIONS` | — | All extensions — install status, update flag, obsolete flag, metadata |
|
|
||||||
| `GET_SOURCES` | — | All sources — id, name, lang, display name, icon, NSFW flag, `isConfigurable`, `supportsLatest`, `baseUrl` |
|
|
||||||
| `GET_SETTINGS` | — | `extensionRepos` from settings |
|
|
||||||
| `GET_SERVER_SECURITY` | — | Full security config — auth mode, SOCKS proxy settings, FlareSolverr settings |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Tracking (`queries/tracking.ts`)
|
|
||||||
|
|
||||||
| Query | Variables | Description |
|
|
||||||
|-------|-----------|-------------|
|
|
||||||
| `GET_TRACKERS` | — | All trackers with login state, token expiry, capability flags (`supportsPrivateTracking`, `supportsReadingDates`, `supportsTrackDeletion`), scores, and statuses |
|
|
||||||
| `GET_MANGA_TRACK_RECORDS` | `mangaId: Int!` | All track records for a specific manga — includes `libraryId`, score, dates, privacy flag |
|
|
||||||
| `SEARCH_TRACKER` | `trackerId: Int!`, `query: String!` | Search a tracker by query string — returns id, title, cover, summary, publishing info |
|
|
||||||
| `GET_ALL_TRACKER_RECORDS` | — | All trackers and their full record lists with associated manga — includes `isTokenExpired`, `libraryId` |
|
|
||||||
| `GET_TRACKER_RECORDS` | `trackerId: Int!` | Records for a specific tracker with associated manga |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Updater (`queries/updater.ts`)
|
|
||||||
|
|
||||||
| Query | Variables | Description |
|
|
||||||
|-------|-----------|-------------|
|
|
||||||
| `GET_ABOUT_SERVER` | — | Server name, version, build type, build time, GitHub and Discord links |
|
|
||||||
| `GET_ABOUT_WEBUI` | — | WebUI channel, tag, and last update timestamp |
|
|
||||||
| `CHECK_FOR_SERVER_UPDATES` | — | Available server updates — channel, tag, download URL |
|
|
||||||
| `CHECK_FOR_WEBUI_UPDATE` | — | Available WebUI updates — channel and tag |
|
|
||||||
| `GET_WEBUI_UPDATE_STATUS` | — | Live WebUI update state (`UpdateState` enum), progress percent, and info block |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Meta (`queries/meta.ts`)
|
|
||||||
|
|
||||||
| Query | Variables | Description |
|
|
||||||
|-------|-----------|-------------|
|
|
||||||
| `GET_META` | `key: String!` | Single server-side key/value meta entry |
|
|
||||||
| `GET_METAS` | — | All global meta entries as a node list |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## KoSync (`queries/kosync.ts`)
|
|
||||||
|
|
||||||
| Query | Variables | Description |
|
|
||||||
|-------|-----------|-------------|
|
|
||||||
| `GET_KOSYNC_STATUS` | — | KOReader sync connection status |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## New in Preview
|
|
||||||
|
|
||||||
Queries and fields now available but not yet wired to any feature in Moku:
|
|
||||||
|
|
||||||
| Query / Field | Potential Feature |
|
|
||||||
|---------------|-------------------|
|
|
||||||
| `GET_ABOUT_SERVER` | About page — server version, build info, links to GitHub and Discord |
|
|
||||||
| `GET_ABOUT_WEBUI` | About page — WebUI version and release channel |
|
|
||||||
| `CHECK_FOR_SERVER_UPDATES` | Update available banner or settings badge |
|
|
||||||
| `CHECK_FOR_WEBUI_UPDATE` | Update available banner or settings badge |
|
|
||||||
| `GET_WEBUI_UPDATE_STATUS` | Update progress indicator in settings |
|
|
||||||
| `GET_META` / `GET_METAS` | Server-side persistence — sync app state across clients without local storage |
|
|
||||||
| `GET_KOSYNC_STATUS` | KOReader sync settings section — show connection state |
|
|
||||||
| `trackRecords` (top-level) | Flat tracker record browser — filter by score, privacy, tracker |
|
|
||||||
| `category` (single by id) | Direct category detail without fetching all categories |
|
|
||||||
| `chapter` (single by id) | Direct chapter lookup without fetching full manga chapter list |
|
|
||||||
| `source` (single by id) | Source detail page — preferences, filters, browse |
|
|
||||||
| `tracker` (single by id) | Individual tracker detail — statuses, records |
|
|
||||||
| `trackRecord` (single by id) | Direct track record lookup for deep linking |
|
|
||||||
| `lastUpdateTimestamp` | Stale data detection — poll before refetching library |
|
|
||||||
| `MangaType.hasDuplicateChapters` | Library health view — flag manga with duplicate chapter numbers |
|
|
||||||
| `MangaType.age` / `chaptersAge` | Stale manga indicator — highlight series with no updates in N days |
|
|
||||||
| `MangaType.initialized` | Loading skeleton gating — skip detail render until manga is fully fetched |
|
|
||||||
| `SourceType.isConfigurable` | Source list — show gear icon only when source is configurable |
|
|
||||||
| `SourceType.supportsLatest` | Source browse UI — conditionally show Latest tab |
|
|
||||||
| `TrackerType.supportsTrackDeletion` | Tracking panel — show remove button only when tracker supports it |
|
|
||||||
| `TrackerType.supportsReadingDates` | Tracking panel — show date fields only when tracker supports them |
|
|
||||||
| `TrackerType.isTokenExpired` | Re-auth prompt — detect expired tokens before a request fails |
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
export const GET_TRACKERS = `
|
|
||||||
query GetTrackers {
|
|
||||||
trackers {
|
|
||||||
nodes {
|
|
||||||
id name icon isLoggedIn isTokenExpired authUrl
|
|
||||||
supportsPrivateTracking supportsReadingDates supportsTrackDeletion
|
|
||||||
scores
|
|
||||||
statuses { value name }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const GET_MANGA_TRACK_RECORDS = `
|
|
||||||
query GetMangaTrackRecords($mangaId: Int!) {
|
|
||||||
manga(id: $mangaId) {
|
|
||||||
trackRecords {
|
|
||||||
nodes {
|
|
||||||
id trackerId remoteId title status score displayScore
|
|
||||||
lastChapterRead totalChapters remoteUrl startDate finishDate private libraryId
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const SEARCH_TRACKER = `
|
|
||||||
query SearchTracker($trackerId: Int!, $query: String!) {
|
|
||||||
searchTracker(input: { trackerId: $trackerId, query: $query }) {
|
|
||||||
trackSearches {
|
|
||||||
id trackerId remoteId title coverUrl summary
|
|
||||||
publishingStatus publishingType startDate totalChapters trackingUrl
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const GET_ALL_TRACKER_RECORDS = `
|
|
||||||
query GetAllTrackerRecords {
|
|
||||||
trackers {
|
|
||||||
nodes {
|
|
||||||
id name icon isLoggedIn isTokenExpired scores
|
|
||||||
statuses { value name }
|
|
||||||
trackRecords {
|
|
||||||
nodes {
|
|
||||||
id trackerId title status displayScore lastChapterRead
|
|
||||||
totalChapters remoteUrl private libraryId
|
|
||||||
manga { id title thumbnailUrl inLibrary }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const GET_TRACKER_RECORDS = `
|
|
||||||
query GetTrackerRecords($trackerId: Int!) {
|
|
||||||
trackers(condition: { id: $trackerId }) {
|
|
||||||
nodes {
|
|
||||||
id name
|
|
||||||
statuses { value name }
|
|
||||||
trackRecords {
|
|
||||||
nodes {
|
|
||||||
id title status displayScore lastChapterRead totalChapters remoteUrl
|
|
||||||
manga { id title thumbnailUrl }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
export const GET_ABOUT_SERVER = `
|
|
||||||
query GetAboutServer {
|
|
||||||
aboutServer {
|
|
||||||
name version buildType buildTime github discord
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const GET_ABOUT_WEBUI = `
|
|
||||||
query GetAboutWebUI {
|
|
||||||
aboutWebUI {
|
|
||||||
channel tag updateTimestamp
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
|
|
||||||
export const CHECK_FOR_SERVER_UPDATES = `
|
|
||||||
query CheckForServerUpdates {
|
|
||||||
checkForServerUpdates {
|
|
||||||
channel tag url
|
|
||||||
}
|
|
||||||
}
|
|
||||||
`;
|
|
||||||
+203
@@ -0,0 +1,203 @@
|
|||||||
|
@import '$lib/components/settings/Settings.css';
|
||||||
|
@import '$lib/styles/themes.css';
|
||||||
|
|
||||||
|
:root {
|
||||||
|
--bg-void: #080808;
|
||||||
|
--bg-base: #0c0c0c;
|
||||||
|
--bg-surface: #101010;
|
||||||
|
--bg-raised: #151515;
|
||||||
|
--bg-overlay: #1a1a1a;
|
||||||
|
--bg-subtle: #202020;
|
||||||
|
|
||||||
|
--border-dim: #1c1c1c;
|
||||||
|
--border-base: #242424;
|
||||||
|
--border-strong: #2e2e2e;
|
||||||
|
--border-focus: #4a5c4a;
|
||||||
|
|
||||||
|
--text-primary: #f0efec;
|
||||||
|
--text-secondary: #c8c6c0;
|
||||||
|
--text-muted: #8a8880;
|
||||||
|
--text-faint: #4e4d4a;
|
||||||
|
--text-disabled: #2a2a28;
|
||||||
|
|
||||||
|
--accent: #6b8f6b;
|
||||||
|
--accent-dim: #2a3d2a;
|
||||||
|
--accent-muted: #1a251a;
|
||||||
|
--accent-fg: #a8c4a8;
|
||||||
|
--accent-bright: #8fb88f;
|
||||||
|
|
||||||
|
--color-error: #c47a7a;
|
||||||
|
--color-error-bg: #1f1212;
|
||||||
|
--color-success: #7aab7a;
|
||||||
|
--color-info: #7a9ec4;
|
||||||
|
--color-info-bg: #121a1f;
|
||||||
|
--color-read: #2e2e2c;
|
||||||
|
|
||||||
|
--dot-active: var(--accent);
|
||||||
|
--dot-inactive: var(--text-faint);
|
||||||
|
|
||||||
|
--t-fast: 0.08s ease;
|
||||||
|
--t-base: 0.14s ease;
|
||||||
|
--t-slow: 0.22s ease;
|
||||||
|
|
||||||
|
--radius-sm: 3px;
|
||||||
|
--radius-md: 5px;
|
||||||
|
--radius-lg: 7px;
|
||||||
|
--radius-xl: 10px;
|
||||||
|
--radius-2xl: 14px;
|
||||||
|
--radius-full: 9999px;
|
||||||
|
|
||||||
|
--sp-1: 4px;
|
||||||
|
--sp-2: 8px;
|
||||||
|
--sp-3: 12px;
|
||||||
|
--sp-4: 16px;
|
||||||
|
--sp-5: 20px;
|
||||||
|
--sp-6: 24px;
|
||||||
|
--sp-8: 32px;
|
||||||
|
--sp-10: 40px;
|
||||||
|
|
||||||
|
--sidebar-width: 52px;
|
||||||
|
--titlebar-height: 36px;
|
||||||
|
|
||||||
|
--font-ui: "DM Mono", "Fira Mono", ui-monospace, monospace;
|
||||||
|
--font-sans: "DM Sans", ui-sans-serif, system-ui, sans-serif;
|
||||||
|
|
||||||
|
--text-2xs: 10px;
|
||||||
|
--text-xs: 11px;
|
||||||
|
--text-sm: 12px;
|
||||||
|
--text-base: 13px;
|
||||||
|
--text-md: 14px;
|
||||||
|
--text-lg: 15px;
|
||||||
|
--text-xl: 17px;
|
||||||
|
--text-2xl: 20px;
|
||||||
|
--text-3xl: 24px;
|
||||||
|
|
||||||
|
--weight-normal: 400;
|
||||||
|
--weight-medium: 500;
|
||||||
|
--weight-semi: 600;
|
||||||
|
|
||||||
|
--leading-none: 1;
|
||||||
|
--leading-tight: 1.3;
|
||||||
|
--leading-snug: 1.45;
|
||||||
|
--leading-base: 1.6;
|
||||||
|
|
||||||
|
--tracking-tight: -0.02em;
|
||||||
|
--tracking-normal: 0;
|
||||||
|
--tracking-wide: 0.06em;
|
||||||
|
--tracking-wider: 0.1em;
|
||||||
|
|
||||||
|
--z-reader: 50;
|
||||||
|
--z-modal: 100;
|
||||||
|
--z-settings: 150;
|
||||||
|
}
|
||||||
|
|
||||||
|
*, *::before, *::after {
|
||||||
|
box-sizing: border-box;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
html, body {
|
||||||
|
height: 100%;
|
||||||
|
overflow: hidden;
|
||||||
|
background: var(--bg-void);
|
||||||
|
color: var(--text-primary);
|
||||||
|
}
|
||||||
|
|
||||||
|
#svelte {
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
cursor: pointer;
|
||||||
|
font: inherit;
|
||||||
|
color: inherit;
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
input, textarea, select {
|
||||||
|
font: inherit;
|
||||||
|
color: inherit;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
color: inherit;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
ul, ol { list-style: none; }
|
||||||
|
|
||||||
|
img, svg { display: block; max-width: 100%; }
|
||||||
|
|
||||||
|
p { margin: 0; }
|
||||||
|
|
||||||
|
body {
|
||||||
|
font-family: var(--font-sans);
|
||||||
|
font-size: var(--text-base);
|
||||||
|
font-weight: var(--weight-normal);
|
||||||
|
line-height: var(--leading-base);
|
||||||
|
-webkit-font-smoothing: antialiased;
|
||||||
|
-moz-osx-font-smoothing: grayscale;
|
||||||
|
text-rendering: optimizeLegibility;
|
||||||
|
}
|
||||||
|
|
||||||
|
* {
|
||||||
|
scrollbar-width: thin;
|
||||||
|
scrollbar-color: transparent transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
*::-webkit-scrollbar { width: 4px; height: 4px; }
|
||||||
|
*::-webkit-scrollbar-track { background: transparent; }
|
||||||
|
*::-webkit-scrollbar-thumb { background: transparent; border-radius: 99px; }
|
||||||
|
*::-webkit-scrollbar-thumb:hover { background: transparent; }
|
||||||
|
|
||||||
|
@keyframes fadeIn {
|
||||||
|
from { opacity: 0; }
|
||||||
|
to { opacity: 1; }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes fadeUp {
|
||||||
|
from { opacity: 0; transform: translateY(5px); }
|
||||||
|
to { opacity: 1; transform: translateY(0); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes fadeDown {
|
||||||
|
from { opacity: 0; transform: translateY(-5px); }
|
||||||
|
to { opacity: 1; transform: translateY(0); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes scaleIn {
|
||||||
|
from { opacity: 0; transform: scale(0.97); }
|
||||||
|
to { opacity: 1; transform: scale(1); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes spin {
|
||||||
|
from { transform: rotate(0deg); }
|
||||||
|
to { transform: rotate(360deg); }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes pulse {
|
||||||
|
0%, 100% { opacity: 1; }
|
||||||
|
50% { opacity: 0.35; }
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes shimmer {
|
||||||
|
from { background-position: -200% 0; }
|
||||||
|
to { background-position: 200% 0; }
|
||||||
|
}
|
||||||
|
|
||||||
|
.anim-fade-in { animation: fadeIn 0.14s ease both; }
|
||||||
|
.anim-fade-up { animation: fadeUp 0.18s ease both; }
|
||||||
|
.anim-fade-down { animation: fadeDown 0.18s ease both; }
|
||||||
|
.anim-scale-in { animation: scaleIn 0.14s ease both; }
|
||||||
|
.anim-pulse { animation: pulse 1.6s ease infinite; }
|
||||||
|
.anim-spin { animation: spin 0.7s linear infinite; }
|
||||||
|
|
||||||
|
.skeleton {
|
||||||
|
background: linear-gradient(90deg, var(--bg-raised) 25%, var(--bg-overlay) 50%, var(--bg-raised) 75%);
|
||||||
|
background-size: 200% 100%;
|
||||||
|
animation: shimmer 1.4s ease infinite;
|
||||||
|
border-radius: var(--radius-sm);
|
||||||
|
}
|
||||||
Vendored
+5
@@ -0,0 +1,5 @@
|
|||||||
|
declare global {
|
||||||
|
namespace App {}
|
||||||
|
const __APP_VERSION__: string
|
||||||
|
}
|
||||||
|
export {}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||||
|
<link rel="icon" href="%sveltekit.assets%/favicon.svg" />
|
||||||
|
%sveltekit.head%
|
||||||
|
</head>
|
||||||
|
<body data-theme="dark">
|
||||||
|
<div id="svelte">%sveltekit.body%</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -1 +0,0 @@
|
|||||||
export * from "./selectPortal";
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
import type { Attachment } from "svelte/attachments";
|
|
||||||
|
|
||||||
export function selectPortal(triggerEl: HTMLElement & { __selectMenuEl?: HTMLElement | null }): Attachment {
|
|
||||||
return (menuEl: HTMLElement) => {
|
|
||||||
function position() {
|
|
||||||
const zoom = parseFloat(document.documentElement.style.zoom) / 100 || 1;
|
|
||||||
const r = triggerEl.getBoundingClientRect();
|
|
||||||
|
|
||||||
const top = r.bottom / zoom + 4;
|
|
||||||
const right = r.right / zoom;
|
|
||||||
const width = menuEl.offsetWidth;
|
|
||||||
const left = Math.max(8, right - width);
|
|
||||||
|
|
||||||
menuEl.style.position = "fixed";
|
|
||||||
menuEl.style.top = `${top}px`;
|
|
||||||
menuEl.style.left = `${left}px`;
|
|
||||||
}
|
|
||||||
|
|
||||||
menuEl.style.visibility = "hidden";
|
|
||||||
document.body.appendChild(menuEl);
|
|
||||||
triggerEl.__selectMenuEl = menuEl;
|
|
||||||
|
|
||||||
requestAnimationFrame(() => {
|
|
||||||
position();
|
|
||||||
menuEl.style.visibility = "";
|
|
||||||
});
|
|
||||||
|
|
||||||
window.addEventListener("scroll", position, true);
|
|
||||||
window.addEventListener("resize", position);
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
window.removeEventListener("scroll", position, true);
|
|
||||||
window.removeEventListener("resize", position);
|
|
||||||
triggerEl.__selectMenuEl = null;
|
|
||||||
menuEl.remove();
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
export * from './sort';
|
|
||||||
export * from './filter';
|
|
||||||
export * from './paginate';
|
|
||||||
export * from './search';
|
|
||||||
export * from './queue';
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
export interface AsyncQueue<T> {
|
|
||||||
enqueue(item: T): void;
|
|
||||||
drain(): void;
|
|
||||||
clear(): void;
|
|
||||||
size(): number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function createAsyncQueue<T>(
|
|
||||||
worker: (item: T) => Promise<void>,
|
|
||||||
concurrency = 1,
|
|
||||||
): AsyncQueue<T> {
|
|
||||||
const queue: T[] = [];
|
|
||||||
let active = 0;
|
|
||||||
|
|
||||||
function next() {
|
|
||||||
while (active < concurrency && queue.length > 0) {
|
|
||||||
const item = queue.shift()!;
|
|
||||||
active++;
|
|
||||||
worker(item).finally(() => { active--; next(); });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
enqueue(item) { queue.push(item); next(); },
|
|
||||||
drain() { next(); },
|
|
||||||
clear() { queue.length = 0; },
|
|
||||||
size() { return queue.length; },
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
export interface SearchResult<T> {
|
|
||||||
item: T;
|
|
||||||
score: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function searchItems<T>(
|
|
||||||
items: T[],
|
|
||||||
query: string,
|
|
||||||
getField: (item: T) => string,
|
|
||||||
): T[] {
|
|
||||||
const q = query.trim().toLowerCase();
|
|
||||||
if (!q) return items;
|
|
||||||
return items.filter(item => getField(item).toLowerCase().includes(q));
|
|
||||||
}
|
|
||||||
|
|
||||||
export function searchWithScore<T>(
|
|
||||||
items: T[],
|
|
||||||
query: string,
|
|
||||||
getField: (item: T) => string,
|
|
||||||
): SearchResult<T>[] {
|
|
||||||
const q = query.trim().toLowerCase();
|
|
||||||
if (!q) return items.map(item => ({ item, score: 0 }));
|
|
||||||
|
|
||||||
return items
|
|
||||||
.map(item => {
|
|
||||||
const field = getField(item).toLowerCase();
|
|
||||||
if (!field.includes(q)) return null;
|
|
||||||
const score = field === q ? 2 : field.startsWith(q) ? 1 : 0;
|
|
||||||
return { item, score };
|
|
||||||
})
|
|
||||||
.filter((r): r is SearchResult<T> => r !== null)
|
|
||||||
.sort((a, b) => b.score - a.score);
|
|
||||||
}
|
|
||||||
@@ -1,61 +0,0 @@
|
|||||||
/**
|
|
||||||
* Runs an async task over every item in `items`, with at most `concurrency`
|
|
||||||
* tasks in-flight at once. Respects the provided AbortSignal — each worker
|
|
||||||
* exits early if the signal fires. Errors thrown by individual tasks are
|
|
||||||
* swallowed so one failure does not cancel the whole batch.
|
|
||||||
*/
|
|
||||||
export async function runConcurrent<T>(
|
|
||||||
items: T[],
|
|
||||||
fn: (item: T) => Promise<void>,
|
|
||||||
signal: AbortSignal,
|
|
||||||
concurrency = 6,
|
|
||||||
): Promise<void> {
|
|
||||||
let i = 0;
|
|
||||||
async function worker() {
|
|
||||||
while (i < items.length) {
|
|
||||||
if (signal.aborted) return;
|
|
||||||
const item = items[i++];
|
|
||||||
await fn(item).catch(() => {});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
await Promise.all(
|
|
||||||
Array.from({ length: Math.min(concurrency, items.length) }, worker),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Deduplicates in-flight async calls by key.
|
|
||||||
*
|
|
||||||
* Two call signatures are supported:
|
|
||||||
*
|
|
||||||
* 1. Direct call — supply a key and a zero-arg factory each time:
|
|
||||||
* dedupeRequest("my-key", () => fetchSomething())
|
|
||||||
* If a request with that key is already pending, the existing Promise is
|
|
||||||
* returned and the factory is not called again.
|
|
||||||
*
|
|
||||||
* 2. Curried wrapper — supply a key-based fetcher once, get back a
|
|
||||||
* single-arg function you can call repeatedly:
|
|
||||||
* const get = dedupeRequest((key) => fetchSomething(key))
|
|
||||||
* get("my-key")
|
|
||||||
*/
|
|
||||||
const _inflight = new Map<string, Promise<unknown>>();
|
|
||||||
|
|
||||||
export function dedupeRequest<T>(key: string, factory: () => Promise<T>): Promise<T>;
|
|
||||||
export function dedupeRequest<T>(fn: (key: string) => Promise<T>): (key: string) => Promise<T>;
|
|
||||||
export function dedupeRequest<T>(
|
|
||||||
keyOrFn: string | ((key: string) => Promise<T>),
|
|
||||||
factory?: () => Promise<T>,
|
|
||||||
): Promise<T> | ((key: string) => Promise<T>) {
|
|
||||||
// Curried wrapper form
|
|
||||||
if (typeof keyOrFn === 'function') {
|
|
||||||
const fn = keyOrFn;
|
|
||||||
return (key: string) => dedupeRequest(key, () => fn(key));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Direct call form
|
|
||||||
const key = keyOrFn;
|
|
||||||
if (_inflight.has(key)) return _inflight.get(key) as Promise<T>;
|
|
||||||
const p = factory!().finally(() => _inflight.delete(key));
|
|
||||||
_inflight.set(key, p);
|
|
||||||
return p;
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
export interface PaginatedQuery<T> {
|
|
||||||
fetchPage(page: number): Promise<T[]>;
|
|
||||||
reset(): void;
|
|
||||||
hasMore(): boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface PaginatedQueryConfig<T> {
|
|
||||||
fetcher: (page: number) => Promise<{ items: T[]; hasNextPage: boolean }>;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function createPaginatedQuery<T>(
|
|
||||||
config: PaginatedQueryConfig<T>,
|
|
||||||
): PaginatedQuery<T> {
|
|
||||||
let _hasMore = true;
|
|
||||||
|
|
||||||
return {
|
|
||||||
async fetchPage(page) {
|
|
||||||
const { items, hasNextPage } = await config.fetcher(page);
|
|
||||||
_hasMore = hasNextPage;
|
|
||||||
return items;
|
|
||||||
},
|
|
||||||
reset() { _hasMore = true; },
|
|
||||||
hasMore() { return _hasMore; },
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
export * from './fetchWithRetry';
|
|
||||||
export * from './batchRequests';
|
|
||||||
export * from './createPaginatedQuery';
|
|
||||||
@@ -1,629 +0,0 @@
|
|||||||
import { store, updateSettings } from "@store/state.svelte";
|
|
||||||
|
|
||||||
export type AuthMode = "NONE" | "BASIC_AUTH" | "UI_LOGIN";
|
|
||||||
|
|
||||||
export class AuthRequiredError extends Error {
|
|
||||||
constructor(msg = "Authentication required") {
|
|
||||||
super(msg);
|
|
||||||
this.name = "AuthRequiredError";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const TOKEN_KEY = "moku_access_token";
|
|
||||||
const UI_SESSION_KEY = "moku_ui_auth_session";
|
|
||||||
const TOKEN_REFRESH_SKEW_MS = 30_000;
|
|
||||||
const AUTH_DEBUG = Boolean((import.meta as ImportMeta & { env?: { DEV?: boolean } }).env?.DEV);
|
|
||||||
|
|
||||||
interface StoredAccessToken {
|
|
||||||
base: string;
|
|
||||||
token: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface StoredUiAuthSession {
|
|
||||||
base: string;
|
|
||||||
accessToken: string;
|
|
||||||
refreshToken?: string;
|
|
||||||
clientMutationId?: string;
|
|
||||||
accessExpiresAt?: number | null;
|
|
||||||
refreshExpiresAt?: number | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface JwtSettings {
|
|
||||||
jwtAudience?: string | null;
|
|
||||||
jwtRefreshExpiry?: string | null;
|
|
||||||
jwtTokenExpiry?: string | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface UiAuthDebugStatus {
|
|
||||||
mode: AuthMode;
|
|
||||||
serverBase: string;
|
|
||||||
hasSession: boolean;
|
|
||||||
hasRefreshToken: boolean;
|
|
||||||
accessExpiresAt: number | null;
|
|
||||||
refreshExpiresAt: number | null;
|
|
||||||
accessExpiresInMs: number | null;
|
|
||||||
refreshExpiresInMs: number | null;
|
|
||||||
shouldRefreshSoon: boolean;
|
|
||||||
refreshInFlight: boolean;
|
|
||||||
skewMs: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
let _accessToken: string | null = null;
|
|
||||||
let _accessTokenBase: string | null = null;
|
|
||||||
let _uiSession: StoredUiAuthSession | null = null;
|
|
||||||
let _refreshPromise: Promise<string | null> | null = null;
|
|
||||||
let _jwtSettingsBase: string | null = null;
|
|
||||||
let _jwtSettings: JwtSettings | null = null;
|
|
||||||
let _jwtSettingsFetchedAt = 0;
|
|
||||||
|
|
||||||
function authDebug(event: string, fields?: Record<string, unknown>) {
|
|
||||||
if (!AUTH_DEBUG) return;
|
|
||||||
if (fields) {
|
|
||||||
console.debug(`[auth] ${event}`, fields);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
console.debug(`[auth] ${event}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
function parseIsoDuration(duration: string): number | null {
|
|
||||||
try {
|
|
||||||
const match = duration.match(
|
|
||||||
/^P(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)D)?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:([\d.]+)S)?)?$/
|
|
||||||
);
|
|
||||||
if (!match) return null;
|
|
||||||
const [, years, months, days, hours, minutes, seconds] = match;
|
|
||||||
let ms = 0;
|
|
||||||
if (years) ms += parseInt(years) * 365.25 * 24 * 60 * 60 * 1000;
|
|
||||||
if (months) ms += parseInt(months) * 30.44 * 24 * 60 * 60 * 1000;
|
|
||||||
if (days) ms += parseInt(days) * 24 * 60 * 60 * 1000;
|
|
||||||
if (hours) ms += parseInt(hours) * 60 * 60 * 1000;
|
|
||||||
if (minutes) ms += parseInt(minutes) * 60 * 1000;
|
|
||||||
if (seconds) ms += parseFloat(seconds) * 1000;
|
|
||||||
return ms;
|
|
||||||
} catch {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function decodeJwtExpiryMs(token: string): number | null {
|
|
||||||
try {
|
|
||||||
const payload = token.split(".")[1];
|
|
||||||
if (!payload) return null;
|
|
||||||
const normalized = payload.replace(/-/g, "+").replace(/_/g, "/");
|
|
||||||
const padded = normalized.padEnd(normalized.length + ((4 - (normalized.length % 4)) % 4), "=");
|
|
||||||
const decoded = atob(padded);
|
|
||||||
const json = JSON.parse(decoded) as { exp?: number };
|
|
||||||
return typeof json.exp === "number" ? json.exp * 1000 : null;
|
|
||||||
} catch {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function isExpired(expiresAt?: number | null, skewMs = TOKEN_REFRESH_SKEW_MS): boolean {
|
|
||||||
if (!expiresAt || !Number.isFinite(expiresAt)) return false;
|
|
||||||
return Date.now() >= expiresAt - skewMs;
|
|
||||||
}
|
|
||||||
|
|
||||||
function withExpiryFromSettings(
|
|
||||||
accessToken: string,
|
|
||||||
jwt: JwtSettings | null,
|
|
||||||
): Pick<StoredUiAuthSession, "accessExpiresAt" | "refreshExpiresAt"> {
|
|
||||||
const now = Date.now();
|
|
||||||
const accessExpiresAt =
|
|
||||||
decodeJwtExpiryMs(accessToken)
|
|
||||||
?? (typeof jwt?.jwtTokenExpiry === "string" ? now + (parseIsoDuration(jwt.jwtTokenExpiry) ?? 0) : null);
|
|
||||||
const refreshExpiresAt =
|
|
||||||
typeof jwt?.jwtRefreshExpiry === "string" ? now + (parseIsoDuration(jwt.jwtRefreshExpiry) ?? 0) : null;
|
|
||||||
return { accessExpiresAt, refreshExpiresAt };
|
|
||||||
}
|
|
||||||
|
|
||||||
async function fetchJwtSettings(base: string): Promise<JwtSettings | null> {
|
|
||||||
const res = await fetchAuthenticated(
|
|
||||||
`${base}/api/graphql`,
|
|
||||||
{
|
|
||||||
method: "POST",
|
|
||||||
headers: { "Content-Type": "application/json" },
|
|
||||||
body: gqlBody(
|
|
||||||
`query GetJWTSettings {
|
|
||||||
settings {
|
|
||||||
jwtAudience
|
|
||||||
jwtRefreshExpiry
|
|
||||||
jwtTokenExpiry
|
|
||||||
}
|
|
||||||
}`,
|
|
||||||
),
|
|
||||||
},
|
|
||||||
timeoutSignal(5000),
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!res.ok) {
|
|
||||||
authDebug("JWT settings fetch failed", { status: res.status });
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const json = await res.json();
|
|
||||||
if (json?.errors?.length) {
|
|
||||||
authDebug("JWT settings query error", { errors: json.errors });
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
const settings = json?.data?.settings;
|
|
||||||
if (!settings || typeof settings !== "object") {
|
|
||||||
authDebug("JWT settings missing or invalid", { settings });
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
authDebug("JWT settings fetched", {
|
|
||||||
hasAudience: !!settings.jwtAudience,
|
|
||||||
tokenExpiry: settings.jwtTokenExpiry,
|
|
||||||
refreshExpiry: settings.jwtRefreshExpiry,
|
|
||||||
});
|
|
||||||
|
|
||||||
return {
|
|
||||||
jwtAudience: typeof settings.jwtAudience === "string" ? settings.jwtAudience : null,
|
|
||||||
jwtRefreshExpiry: typeof settings.jwtRefreshExpiry === "string" ? settings.jwtRefreshExpiry : null,
|
|
||||||
jwtTokenExpiry: typeof settings.jwtTokenExpiry === "string" ? settings.jwtTokenExpiry : null,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
async function getJwtSettings(force = false): Promise<JwtSettings | null> {
|
|
||||||
const base = getServerBase();
|
|
||||||
const freshEnough = Date.now() - _jwtSettingsFetchedAt < 60_000;
|
|
||||||
if (!force && _jwtSettingsBase === base && _jwtSettings && freshEnough) return _jwtSettings;
|
|
||||||
|
|
||||||
const jwt = await fetchJwtSettings(base);
|
|
||||||
_jwtSettingsBase = base;
|
|
||||||
_jwtSettings = jwt;
|
|
||||||
_jwtSettingsFetchedAt = Date.now();
|
|
||||||
return jwt;
|
|
||||||
}
|
|
||||||
|
|
||||||
export const uiAuth = {
|
|
||||||
getSession: () => {
|
|
||||||
const base = getServerBase();
|
|
||||||
if (_uiSession && _uiSession.base === base) return _uiSession;
|
|
||||||
|
|
||||||
const stored = readStoredSession();
|
|
||||||
if (!stored) return null;
|
|
||||||
if (stored.base !== base) {
|
|
||||||
sessionStorage.removeItem(UI_SESSION_KEY);
|
|
||||||
sessionStorage.removeItem(TOKEN_KEY);
|
|
||||||
_uiSession = null;
|
|
||||||
_accessToken = null;
|
|
||||||
_accessTokenBase = null;
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
_uiSession = stored;
|
|
||||||
_accessToken = stored.accessToken;
|
|
||||||
_accessTokenBase = stored.base;
|
|
||||||
return _uiSession;
|
|
||||||
},
|
|
||||||
setSession: (session: Omit<StoredUiAuthSession, "base">) => {
|
|
||||||
const base = getServerBase();
|
|
||||||
_uiSession = { ...session, base };
|
|
||||||
_accessToken = session.accessToken;
|
|
||||||
_accessTokenBase = base;
|
|
||||||
sessionStorage.setItem(UI_SESSION_KEY, JSON.stringify(_uiSession));
|
|
||||||
sessionStorage.removeItem(TOKEN_KEY);
|
|
||||||
},
|
|
||||||
getToken: () => {
|
|
||||||
const session = uiAuth.getSession();
|
|
||||||
if (!session) return null;
|
|
||||||
|
|
||||||
if (isExpired(session.accessExpiresAt, 0)) return null;
|
|
||||||
|
|
||||||
const base = getServerBase();
|
|
||||||
if (_accessToken && _accessTokenBase === base) return _accessToken;
|
|
||||||
const stored = readStoredToken();
|
|
||||||
if (!stored) return null;
|
|
||||||
if (stored.base !== base) {
|
|
||||||
sessionStorage.removeItem(TOKEN_KEY);
|
|
||||||
sessionStorage.removeItem(UI_SESSION_KEY);
|
|
||||||
_accessToken = null;
|
|
||||||
_accessTokenBase = null;
|
|
||||||
_uiSession = null;
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
_accessToken = stored.token;
|
|
||||||
_accessTokenBase = stored.base;
|
|
||||||
return _accessToken;
|
|
||||||
},
|
|
||||||
setToken: (t: string) => {
|
|
||||||
const existing = uiAuth.getSession();
|
|
||||||
if (existing?.refreshToken) {
|
|
||||||
uiAuth.setSession({
|
|
||||||
...existing,
|
|
||||||
accessToken: t,
|
|
||||||
...withExpiryFromSettings(t, _jwtSettings),
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const base = getServerBase();
|
|
||||||
_accessToken = t;
|
|
||||||
_accessTokenBase = base;
|
|
||||||
sessionStorage.setItem(TOKEN_KEY, JSON.stringify({ base, token: t }));
|
|
||||||
},
|
|
||||||
setLoginSession: (payload: { accessToken: string; refreshToken: string; clientMutationId?: string }, jwt: JwtSettings | null) => {
|
|
||||||
uiAuth.setSession({
|
|
||||||
accessToken: payload.accessToken,
|
|
||||||
refreshToken: payload.refreshToken,
|
|
||||||
clientMutationId: payload.clientMutationId,
|
|
||||||
...withExpiryFromSettings(payload.accessToken, jwt),
|
|
||||||
});
|
|
||||||
},
|
|
||||||
updateAccessToken: (payload: { accessToken: string; clientMutationId?: string }, jwt: JwtSettings | null) => {
|
|
||||||
const existing = uiAuth.getSession();
|
|
||||||
if (!existing?.refreshToken) {
|
|
||||||
uiAuth.setToken(payload.accessToken);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
uiAuth.setSession({
|
|
||||||
...existing,
|
|
||||||
accessToken: payload.accessToken,
|
|
||||||
clientMutationId: payload.clientMutationId ?? existing.clientMutationId,
|
|
||||||
...withExpiryFromSettings(payload.accessToken, jwt),
|
|
||||||
refreshToken: existing.refreshToken,
|
|
||||||
});
|
|
||||||
},
|
|
||||||
clearToken: () => {
|
|
||||||
_accessToken = null;
|
|
||||||
_accessTokenBase = null;
|
|
||||||
_uiSession = null;
|
|
||||||
sessionStorage.removeItem(TOKEN_KEY);
|
|
||||||
sessionStorage.removeItem(UI_SESSION_KEY);
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export const authSession = {
|
|
||||||
clearTokens() {
|
|
||||||
_refreshPromise = null;
|
|
||||||
_jwtSettings = null;
|
|
||||||
_jwtSettingsBase = null;
|
|
||||||
_jwtSettingsFetchedAt = 0;
|
|
||||||
uiAuth.clearToken();
|
|
||||||
},
|
|
||||||
hasSession(): boolean {
|
|
||||||
const mode = store.settings.serverAuthMode ?? "NONE";
|
|
||||||
if (mode === "UI_LOGIN") return uiAuth.getSession() !== null;
|
|
||||||
return true;
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
function getServerBase(): string {
|
|
||||||
const url = store.settings.serverUrl;
|
|
||||||
return typeof url === "string" && url.trim() ? url.replace(/\/$/, "") : "http://127.0.0.1:4567";
|
|
||||||
}
|
|
||||||
|
|
||||||
function readStoredToken(): StoredAccessToken | null {
|
|
||||||
const session = readStoredSession();
|
|
||||||
if (session) return { base: session.base, token: session.accessToken };
|
|
||||||
|
|
||||||
const raw = sessionStorage.getItem(TOKEN_KEY);
|
|
||||||
if (raw?.trim()) {
|
|
||||||
try {
|
|
||||||
const parsed = JSON.parse(raw);
|
|
||||||
if (typeof parsed?.base === "string" && typeof parsed?.token === "string")
|
|
||||||
return { base: parsed.base, token: parsed.token };
|
|
||||||
} catch {}
|
|
||||||
|
|
||||||
const migrated = { base: getServerBase(), token: raw.trim() };
|
|
||||||
sessionStorage.setItem(TOKEN_KEY, JSON.stringify(migrated));
|
|
||||||
return migrated;
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
function readStoredSession(): StoredUiAuthSession | null {
|
|
||||||
const raw = sessionStorage.getItem(UI_SESSION_KEY);
|
|
||||||
if (raw?.trim()) {
|
|
||||||
try {
|
|
||||||
const parsed = JSON.parse(raw);
|
|
||||||
if (typeof parsed?.base === "string" && typeof parsed?.accessToken === "string") {
|
|
||||||
return {
|
|
||||||
base: parsed.base,
|
|
||||||
accessToken: parsed.accessToken,
|
|
||||||
refreshToken: typeof parsed.refreshToken === "string" ? parsed.refreshToken : undefined,
|
|
||||||
clientMutationId: typeof parsed.clientMutationId === "string" ? parsed.clientMutationId : undefined,
|
|
||||||
accessExpiresAt: typeof parsed.accessExpiresAt === "number" ? parsed.accessExpiresAt : null,
|
|
||||||
refreshExpiresAt: typeof parsed.refreshExpiresAt === "number" ? parsed.refreshExpiresAt : null,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
} catch {}
|
|
||||||
}
|
|
||||||
|
|
||||||
const legacy = sessionStorage.getItem(TOKEN_KEY);
|
|
||||||
if (!legacy?.trim()) return null;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const parsed = JSON.parse(legacy);
|
|
||||||
if (typeof parsed?.base === "string" && typeof parsed?.token === "string") {
|
|
||||||
const migrated: StoredUiAuthSession = { base: parsed.base, accessToken: parsed.token };
|
|
||||||
sessionStorage.setItem(UI_SESSION_KEY, JSON.stringify(migrated));
|
|
||||||
return migrated;
|
|
||||||
}
|
|
||||||
} catch {}
|
|
||||||
|
|
||||||
const migrated: StoredUiAuthSession = { base: getServerBase(), accessToken: legacy.trim() };
|
|
||||||
sessionStorage.setItem(UI_SESSION_KEY, JSON.stringify(migrated));
|
|
||||||
return migrated;
|
|
||||||
}
|
|
||||||
|
|
||||||
function timeoutSignal(ms: number): AbortSignal {
|
|
||||||
const controller = new AbortController();
|
|
||||||
setTimeout(() => controller.abort(), ms);
|
|
||||||
return controller.signal;
|
|
||||||
}
|
|
||||||
|
|
||||||
function basicHeader(user: string, pass: string): Record<string, string> {
|
|
||||||
return { Authorization: `Basic ${btoa(`${user}:${pass}`)}` };
|
|
||||||
}
|
|
||||||
|
|
||||||
function bearerHeader(token: string): Record<string, string> {
|
|
||||||
return { Authorization: `Bearer ${token}` };
|
|
||||||
}
|
|
||||||
|
|
||||||
function gqlBody(query: string, variables?: Record<string, unknown>): string {
|
|
||||||
return JSON.stringify({ query, ...(variables ? { variables } : {}) });
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function fetchAuthenticated(
|
|
||||||
url: string,
|
|
||||||
init: RequestInit,
|
|
||||||
signal?: AbortSignal,
|
|
||||||
skipped = false,
|
|
||||||
): Promise<Response> {
|
|
||||||
const mode = store.settings.serverAuthMode ?? "NONE";
|
|
||||||
const baseHeaders = (init.headers ?? {}) as Record<string, string>;
|
|
||||||
|
|
||||||
if (mode === "BASIC_AUTH") {
|
|
||||||
const user = store.settings.serverAuthUser?.trim() ?? "";
|
|
||||||
const pass = store.settings.serverAuthPass?.trim() ?? "";
|
|
||||||
return fetch(url, {
|
|
||||||
...init, signal, credentials: "omit",
|
|
||||||
headers: { ...baseHeaders, ...(user && pass ? basicHeader(user, pass) : {}) },
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mode === "UI_LOGIN") {
|
|
||||||
const token = await getUIAccessToken();
|
|
||||||
if (!token) {
|
|
||||||
if (skipped) return fetch(url, { ...init, signal, credentials: "omit", headers: baseHeaders });
|
|
||||||
throw new AuthRequiredError();
|
|
||||||
}
|
|
||||||
|
|
||||||
let res = await fetch(url, {
|
|
||||||
...init, signal, credentials: "omit",
|
|
||||||
headers: { ...baseHeaders, ...bearerHeader(token) },
|
|
||||||
});
|
|
||||||
|
|
||||||
if (res.status !== 401 || skipped) return res;
|
|
||||||
|
|
||||||
const refreshed = await refreshUiAccessToken(true);
|
|
||||||
if (!refreshed) return res;
|
|
||||||
|
|
||||||
res = await fetch(url, {
|
|
||||||
...init, signal, credentials: "omit",
|
|
||||||
headers: { ...baseHeaders, ...bearerHeader(refreshed) },
|
|
||||||
});
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
|
|
||||||
return fetch(url, { ...init, signal, credentials: "omit" });
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function getUIAccessToken(forceRefresh = false): Promise<string | null> {
|
|
||||||
const session = uiAuth.getSession();
|
|
||||||
if (!session) return null;
|
|
||||||
if (forceRefresh || isExpired(session.accessExpiresAt)) {
|
|
||||||
return refreshUiAccessToken(true);
|
|
||||||
}
|
|
||||||
return session.accessToken;
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function refreshUiAccessToken(force = false): Promise<string | null> {
|
|
||||||
const session = uiAuth.getSession();
|
|
||||||
if (!session) return null;
|
|
||||||
if (!session.refreshToken) {
|
|
||||||
if (force && isExpired(session.accessExpiresAt, 0)) return null;
|
|
||||||
return session.accessToken;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!force && !isExpired(session.accessExpiresAt)) return session.accessToken;
|
|
||||||
if (isExpired(session.refreshExpiresAt)) {
|
|
||||||
authDebug("refresh skipped: refresh token expired", {
|
|
||||||
force,
|
|
||||||
refreshExpiresAt: session.refreshExpiresAt ?? null,
|
|
||||||
});
|
|
||||||
uiAuth.clearToken();
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (_refreshPromise) {
|
|
||||||
authDebug("refresh joined existing request");
|
|
||||||
return _refreshPromise;
|
|
||||||
}
|
|
||||||
|
|
||||||
authDebug("refresh start", {
|
|
||||||
force,
|
|
||||||
accessExpiresAt: session.accessExpiresAt ?? null,
|
|
||||||
refreshExpiresAt: session.refreshExpiresAt ?? null,
|
|
||||||
});
|
|
||||||
|
|
||||||
_refreshPromise = (async () => {
|
|
||||||
const base = getServerBase();
|
|
||||||
const jwt = await getJwtSettings().catch(() => null);
|
|
||||||
|
|
||||||
const res = await fetch(`${base}/api/graphql`, {
|
|
||||||
method: "POST",
|
|
||||||
credentials: "omit",
|
|
||||||
headers: { "Content-Type": "application/json" },
|
|
||||||
body: gqlBody(
|
|
||||||
`mutation RefreshToken($refreshToken: String!, $clientMutationId: String) {
|
|
||||||
refreshToken(input: { refreshToken: $refreshToken, clientMutationId: $clientMutationId }) {
|
|
||||||
accessToken
|
|
||||||
clientMutationId
|
|
||||||
}
|
|
||||||
}`,
|
|
||||||
{ refreshToken: session.refreshToken, clientMutationId: session.clientMutationId ?? undefined },
|
|
||||||
),
|
|
||||||
signal: timeoutSignal(5000),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!res.ok) {
|
|
||||||
if (res.status === 401 || res.status === 403) {
|
|
||||||
authDebug("refresh rejected by server", { status: res.status });
|
|
||||||
uiAuth.clearToken();
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
authDebug("refresh failed with HTTP error", { status: res.status });
|
|
||||||
throw new Error(`Token refresh failed (${res.status})`);
|
|
||||||
}
|
|
||||||
|
|
||||||
const json = await res.json();
|
|
||||||
const refreshed = json?.data?.refreshToken;
|
|
||||||
const nextAccessToken: string | undefined = refreshed?.accessToken;
|
|
||||||
if (!nextAccessToken) {
|
|
||||||
const msg = json?.errors?.[0]?.message;
|
|
||||||
if (msg && /unauthorized|unauthenticated|forbidden/i.test(msg)) {
|
|
||||||
authDebug("refresh rejected by GraphQL error", { message: msg });
|
|
||||||
uiAuth.clearToken();
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
authDebug("refresh returned no access token", { message: msg ?? null });
|
|
||||||
throw new Error(msg ?? "Token refresh failed");
|
|
||||||
}
|
|
||||||
|
|
||||||
uiAuth.updateAccessToken(
|
|
||||||
{
|
|
||||||
accessToken: nextAccessToken,
|
|
||||||
clientMutationId: typeof refreshed?.clientMutationId === "string"
|
|
||||||
? refreshed.clientMutationId
|
|
||||||
: session.clientMutationId,
|
|
||||||
},
|
|
||||||
jwt,
|
|
||||||
);
|
|
||||||
authDebug("refresh success", {
|
|
||||||
nextAccessExpiresAt: uiAuth.getSession()?.accessExpiresAt ?? null,
|
|
||||||
});
|
|
||||||
return nextAccessToken;
|
|
||||||
})()
|
|
||||||
.catch((e: unknown) => {
|
|
||||||
authDebug("refresh threw error", {
|
|
||||||
message: e instanceof Error ? e.message : String(e),
|
|
||||||
});
|
|
||||||
throw e;
|
|
||||||
})
|
|
||||||
.finally(() => {
|
|
||||||
_refreshPromise = null;
|
|
||||||
});
|
|
||||||
|
|
||||||
return _refreshPromise;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getUiAuthDebugStatus(now = Date.now()): UiAuthDebugStatus {
|
|
||||||
const session = uiAuth.getSession();
|
|
||||||
const accessExpiresAt = session?.accessExpiresAt ?? null;
|
|
||||||
const refreshExpiresAt = session?.refreshExpiresAt ?? null;
|
|
||||||
|
|
||||||
return {
|
|
||||||
mode: (store.settings.serverAuthMode ?? "NONE") as AuthMode,
|
|
||||||
serverBase: getServerBase(),
|
|
||||||
hasSession: !!session,
|
|
||||||
hasRefreshToken: !!session?.refreshToken,
|
|
||||||
accessExpiresAt,
|
|
||||||
refreshExpiresAt,
|
|
||||||
accessExpiresInMs: accessExpiresAt ? accessExpiresAt - now : null,
|
|
||||||
refreshExpiresInMs: refreshExpiresAt ? refreshExpiresAt - now : null,
|
|
||||||
shouldRefreshSoon: isExpired(accessExpiresAt),
|
|
||||||
refreshInFlight: _refreshPromise !== null,
|
|
||||||
skewMs: TOKEN_REFRESH_SKEW_MS,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function loginUI(user: string, pass: string): Promise<void> {
|
|
||||||
const res = await fetch(`${getServerBase()}/api/graphql`, {
|
|
||||||
method: "POST", credentials: "omit",
|
|
||||||
headers: { "Content-Type": "application/json" },
|
|
||||||
body: gqlBody(
|
|
||||||
`mutation Login($username: String!, $password: String!) {
|
|
||||||
login(input: { username: $username, password: $password }) {
|
|
||||||
accessToken
|
|
||||||
refreshToken
|
|
||||||
clientMutationId
|
|
||||||
}
|
|
||||||
}`,
|
|
||||||
{ username: user, password: pass },
|
|
||||||
),
|
|
||||||
signal: timeoutSignal(8000),
|
|
||||||
});
|
|
||||||
if (!res.ok) throw new Error(`Login request failed (${res.status})`);
|
|
||||||
const json = await res.json();
|
|
||||||
const payload = json?.data?.login;
|
|
||||||
const accessToken: string | undefined = payload?.accessToken;
|
|
||||||
const refreshToken: string | undefined = payload?.refreshToken;
|
|
||||||
if (!accessToken || !refreshToken) throw new Error(json?.errors?.[0]?.message ?? "Login failed");
|
|
||||||
|
|
||||||
authDebug("login success", { user });
|
|
||||||
|
|
||||||
const preliminarySession = {
|
|
||||||
accessToken,
|
|
||||||
refreshToken,
|
|
||||||
clientMutationId: typeof payload?.clientMutationId === "string" ? payload.clientMutationId : undefined,
|
|
||||||
};
|
|
||||||
|
|
||||||
uiAuth.setLoginSession(preliminarySession, null);
|
|
||||||
updateSettings({ serverAuthMode: "UI_LOGIN", serverAuthUser: user, serverAuthPass: "" });
|
|
||||||
|
|
||||||
const jwt = await getJwtSettings(true).catch(() => null);
|
|
||||||
uiAuth.setLoginSession(preliminarySession, jwt);
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function loginBasic(user: string, pass: string): Promise<void> {
|
|
||||||
const res = await fetch(`${getServerBase()}/api/graphql`, {
|
|
||||||
method: "POST", credentials: "omit",
|
|
||||||
headers: { "Content-Type": "application/json", ...basicHeader(user, pass) },
|
|
||||||
body: gqlBody("{ __typename }"),
|
|
||||||
signal: timeoutSignal(5000),
|
|
||||||
});
|
|
||||||
if (!res.ok) throw new Error(`Authentication failed (${res.status})`);
|
|
||||||
updateSettings({ serverAuthMode: "BASIC_AUTH", serverAuthUser: user, serverAuthPass: pass });
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function logout(): Promise<void> {
|
|
||||||
uiAuth.clearToken();
|
|
||||||
updateSettings({ serverAuthPass: "", serverAuthMode: "NONE" });
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function probeServer(): Promise<"ok" | "auth_required" | "unreachable"> {
|
|
||||||
const base = getServerBase();
|
|
||||||
const mode = store.settings.serverAuthMode ?? "NONE";
|
|
||||||
const s = store.settings;
|
|
||||||
const token = mode === "UI_LOGIN" ? await getUIAccessToken() : null;
|
|
||||||
|
|
||||||
if (mode === "UI_LOGIN" && !token) return "auth_required";
|
|
||||||
|
|
||||||
try {
|
|
||||||
const headers: Record<string, string> = { "Content-Type": "application/json" };
|
|
||||||
if (mode === "BASIC_AUTH") {
|
|
||||||
const user = s.serverAuthUser?.trim() ?? "";
|
|
||||||
const pass = s.serverAuthPass?.trim() ?? "";
|
|
||||||
if (user && pass) Object.assign(headers, basicHeader(user, pass));
|
|
||||||
} else if (mode === "UI_LOGIN" && token) {
|
|
||||||
Object.assign(headers, bearerHeader(token));
|
|
||||||
}
|
|
||||||
|
|
||||||
const res = await fetch(`${base}/api/graphql`, {
|
|
||||||
method: "POST", credentials: "omit", headers,
|
|
||||||
body: gqlBody("{ __typename }"),
|
|
||||||
signal: timeoutSignal(5000),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (res.ok) return "ok";
|
|
||||||
if (res.status === 401) return "auth_required";
|
|
||||||
return "unreachable";
|
|
||||||
} catch {
|
|
||||||
return "unreachable";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Vendored
-4
@@ -1,4 +0,0 @@
|
|||||||
export * from './memoryCache';
|
|
||||||
export * from './pageCache';
|
|
||||||
export * from './imageCache';
|
|
||||||
export * from './queryCache';
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
import { store, linkManga } from "@store/state.svelte";
|
|
||||||
import type { Manga } from "@types";
|
|
||||||
|
|
||||||
export function autoLinkLibrary(focal: Manga, allManga: Manga[]): Promise<number> {
|
|
||||||
return new Promise((resolve) => {
|
|
||||||
const worker = new Worker(
|
|
||||||
new URL("./autoLinkWorker.ts", import.meta.url),
|
|
||||||
{ type: "module" },
|
|
||||||
);
|
|
||||||
|
|
||||||
worker.onmessage = (e: MessageEvent<number[]>) => {
|
|
||||||
const matches = e.data;
|
|
||||||
for (const id of matches) linkManga(focal.id, id);
|
|
||||||
worker.terminate();
|
|
||||||
resolve(matches.length);
|
|
||||||
};
|
|
||||||
|
|
||||||
worker.onerror = () => { worker.terminate(); resolve(0); };
|
|
||||||
|
|
||||||
worker.postMessage({
|
|
||||||
focalTitle: focal.title,
|
|
||||||
focalId: focal.id,
|
|
||||||
allManga: allManga.map(m => ({ id: m.id, title: m.title })),
|
|
||||||
linkedIds: store.settings.mangaLinks?.[focal.id] ?? [],
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
interface WorkerMsg {
|
|
||||||
focalTitle: string;
|
|
||||||
focalId: number;
|
|
||||||
allManga: { id: number; title: string }[];
|
|
||||||
linkedIds: number[];
|
|
||||||
}
|
|
||||||
|
|
||||||
function titleSimilarity(a: string, b: string): number {
|
|
||||||
const norm = (s: string) =>
|
|
||||||
s.toLowerCase().replace(/[^a-z0-9\s]/g, "").split(/\s+/).filter(Boolean);
|
|
||||||
const wa = new Set(norm(a));
|
|
||||||
const wb = new Set(norm(b));
|
|
||||||
if (!wa.size || !wb.size) return 0;
|
|
||||||
const intersection = [...wa].filter(w => wb.has(w)).length;
|
|
||||||
return intersection / new Set([...wa, ...wb]).size;
|
|
||||||
}
|
|
||||||
|
|
||||||
self.onmessage = (e: MessageEvent<WorkerMsg>) => {
|
|
||||||
const { focalTitle, focalId, allManga, linkedIds } = e.data;
|
|
||||||
const matches: number[] = [];
|
|
||||||
|
|
||||||
for (const m of allManga) {
|
|
||||||
if (m.id === focalId) continue;
|
|
||||||
if (linkedIds.includes(m.id)) continue;
|
|
||||||
if (titleSimilarity(focalTitle, m.title) >= 0.65) matches.push(m.id);
|
|
||||||
}
|
|
||||||
|
|
||||||
self.postMessage(matches);
|
|
||||||
};
|
|
||||||
@@ -1,54 +0,0 @@
|
|||||||
const THUMB_SIZE = 16;
|
|
||||||
const DUPE_THRESH = 0.12;
|
|
||||||
|
|
||||||
const hashCache = new Map<string, Uint8ClampedArray>();
|
|
||||||
|
|
||||||
function toGray(data: Uint8ClampedArray, pixels: number): Uint8ClampedArray {
|
|
||||||
const gray = new Uint8ClampedArray(pixels);
|
|
||||||
for (let i = 0; i < pixels; i++) {
|
|
||||||
const o = i * 4;
|
|
||||||
gray[i] = (data[o] * 299 + data[o + 1] * 587 + data[o + 2] * 114) / 1000;
|
|
||||||
}
|
|
||||||
return gray;
|
|
||||||
}
|
|
||||||
|
|
||||||
function loadThumb(url: string): Promise<Uint8ClampedArray> {
|
|
||||||
return new Promise((resolve, reject) => {
|
|
||||||
const img = new Image();
|
|
||||||
img.crossOrigin = "anonymous";
|
|
||||||
img.onload = () => {
|
|
||||||
const canvas = document.createElement("canvas");
|
|
||||||
canvas.width = canvas.height = THUMB_SIZE;
|
|
||||||
const ctx = canvas.getContext("2d")!;
|
|
||||||
ctx.drawImage(img, 0, 0, THUMB_SIZE, THUMB_SIZE);
|
|
||||||
resolve(toGray(ctx.getImageData(0, 0, THUMB_SIZE, THUMB_SIZE).data, THUMB_SIZE * THUMB_SIZE));
|
|
||||||
};
|
|
||||||
img.onerror = reject;
|
|
||||||
img.src = url;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function similarity(a: Uint8ClampedArray, b: Uint8ClampedArray): number {
|
|
||||||
let diff = 0;
|
|
||||||
for (let i = 0; i < a.length; i++) diff += Math.abs(a[i] - b[i]);
|
|
||||||
return diff / (a.length * 255);
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function getHash(url: string): Promise<Uint8ClampedArray | null> {
|
|
||||||
if (hashCache.has(url)) return hashCache.get(url)!;
|
|
||||||
try {
|
|
||||||
const thumb = await loadThumb(url);
|
|
||||||
hashCache.set(url, thumb);
|
|
||||||
return thumb;
|
|
||||||
} catch {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function areDuplicates(a: Uint8ClampedArray, b: Uint8ClampedArray): boolean {
|
|
||||||
return similarity(a, b) <= DUPE_THRESH;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function clearHashCache(): void {
|
|
||||||
hashCache.clear();
|
|
||||||
}
|
|
||||||
@@ -1,95 +0,0 @@
|
|||||||
import { store } from "@store/state.svelte";
|
|
||||||
import { searchWithScore } from "@core/algorithms/search";
|
|
||||||
import { getHash, areDuplicates } from "@core/cover/coverHash";
|
|
||||||
|
|
||||||
type CoverManga = { id: number; thumbnailUrl: string; source?: { displayName: string } | null };
|
|
||||||
|
|
||||||
export type CoverCandidate = {
|
|
||||||
mangaId: number;
|
|
||||||
url: string;
|
|
||||||
label: string;
|
|
||||||
isActive: boolean;
|
|
||||||
};
|
|
||||||
|
|
||||||
const FUZZY_SCORE_THRESHOLD = 0.65;
|
|
||||||
|
|
||||||
function normalizeUrl(url: string): string {
|
|
||||||
try {
|
|
||||||
const u = new URL(url);
|
|
||||||
u.search = "";
|
|
||||||
return u.href.toLowerCase();
|
|
||||||
} catch {
|
|
||||||
return url.toLowerCase();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function resolvedCover(mangaId: number, ownUrl: string): string {
|
|
||||||
return store.settings.mangaPrefs?.[mangaId]?.coverUrl ?? ownUrl;
|
|
||||||
}
|
|
||||||
|
|
||||||
function fuzzyMatchIds(
|
|
||||||
mangaId: number,
|
|
||||||
title: string,
|
|
||||||
mangaById: Map<number, CoverManga & { title: string }>,
|
|
||||||
): number[] {
|
|
||||||
const results = searchWithScore(
|
|
||||||
[...mangaById.values()].filter(m => m.id !== mangaId),
|
|
||||||
title,
|
|
||||||
m => m.title,
|
|
||||||
);
|
|
||||||
return results
|
|
||||||
.filter(r => r.score >= FUZZY_SCORE_THRESHOLD)
|
|
||||||
.map(r => r.item.id);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function coverCandidatesSync(
|
|
||||||
mangaId: number,
|
|
||||||
title: string,
|
|
||||||
ownUrl: string,
|
|
||||||
mangaById: Map<number, CoverManga & { title: string }>,
|
|
||||||
): CoverCandidate[] {
|
|
||||||
const linkedIds = store.getLinkedMangaIds(mangaId);
|
|
||||||
const fuzzyIds = fuzzyMatchIds(mangaId, title, mangaById);
|
|
||||||
const current = store.settings.mangaPrefs?.[mangaId]?.coverUrl ?? ownUrl;
|
|
||||||
|
|
||||||
const allIds = Array.from(new Set([...linkedIds, ...fuzzyIds]));
|
|
||||||
|
|
||||||
const raw: { mangaId: number; url: string; label: string }[] = [
|
|
||||||
{ mangaId, url: ownUrl, label: "This source" },
|
|
||||||
...allIds.flatMap(id => {
|
|
||||||
const m = mangaById.get(id);
|
|
||||||
return m ? [{ mangaId: m.id, url: m.thumbnailUrl, label: m.source?.displayName ?? `ID ${m.id}` }] : [];
|
|
||||||
}),
|
|
||||||
];
|
|
||||||
|
|
||||||
const seen = new Set<string>();
|
|
||||||
return raw
|
|
||||||
.filter(c => {
|
|
||||||
const key = normalizeUrl(c.url);
|
|
||||||
if (seen.has(key)) return false;
|
|
||||||
seen.add(key);
|
|
||||||
return true;
|
|
||||||
})
|
|
||||||
.map(c => ({ ...c, isActive: normalizeUrl(c.url) === normalizeUrl(current) }));
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function dedupeByImage(candidates: CoverCandidate[]): Promise<CoverCandidate[]> {
|
|
||||||
const hashes = await Promise.all(candidates.map(c => getHash(c.url)));
|
|
||||||
|
|
||||||
const groups: number[][] = [];
|
|
||||||
|
|
||||||
for (let i = 0; i < candidates.length; i++) {
|
|
||||||
const hi = hashes[i];
|
|
||||||
const existing = hi
|
|
||||||
? groups.find(g => { const hj = hashes[g[0]]; return hj ? areDuplicates(hi, hj) : false; })
|
|
||||||
: undefined;
|
|
||||||
if (existing) existing.push(i);
|
|
||||||
else groups.push([i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
return groups.map(group => {
|
|
||||||
const active = group.find(i => candidates[i].isActive) ?? group[0];
|
|
||||||
const labels = [...new Set(group.map(i => candidates[i].label))];
|
|
||||||
return { ...candidates[active], label: labels.join(" · ") };
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
export { getHash, areDuplicates, clearHashCache } from "./coverHash";
|
|
||||||
export { resolvedCover, coverCandidatesSync, dedupeByImage } from "./coverResolver";
|
|
||||||
export type { CoverCandidate } from "./coverResolver";
|
|
||||||
export { autoLinkLibrary } from "./autoLink";
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
export { eventToKeybind, matchesKeybind, toggleFullscreen } from "./keybindEngine";
|
|
||||||
export { DEFAULT_KEYBINDS, KEYBIND_LABELS } from "./defaultBinds";
|
|
||||||
export type { Keybinds } from "./defaultBinds";
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
const VAULT_KEY = "moku-credential-vault";
|
|
||||||
const SALT_ITERATIONS = 200_000;
|
|
||||||
const KEY_USAGE: KeyUsage[] = ["encrypt", "decrypt"];
|
|
||||||
|
|
||||||
export interface VaultPayload {
|
|
||||||
refreshToken?: string;
|
|
||||||
basicUser?: string;
|
|
||||||
basicPass?: string;
|
|
||||||
authMode: "UI_LOGIN" | "BASIC_AUTH" | "NONE";
|
|
||||||
}
|
|
||||||
|
|
||||||
interface StoredVault {
|
|
||||||
salt: string;
|
|
||||||
iv: string;
|
|
||||||
data: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
function toB64(buf: ArrayBuffer): string {
|
|
||||||
return btoa(String.fromCharCode(...new Uint8Array(buf)));
|
|
||||||
}
|
|
||||||
|
|
||||||
function fromB64(s: string): Uint8Array {
|
|
||||||
return Uint8Array.from(atob(s), (c) => c.charCodeAt(0));
|
|
||||||
}
|
|
||||||
|
|
||||||
async function deriveKey(pin: string, salt: Uint8Array): Promise<CryptoKey> {
|
|
||||||
const enc = new TextEncoder();
|
|
||||||
const keyMat = await crypto.subtle.importKey("raw", enc.encode(pin), "PBKDF2", false, ["deriveKey"]);
|
|
||||||
return crypto.subtle.deriveKey(
|
|
||||||
{ name: "PBKDF2", salt, iterations: SALT_ITERATIONS, hash: "SHA-256" },
|
|
||||||
keyMat,
|
|
||||||
{ name: "AES-GCM", length: 256 },
|
|
||||||
false,
|
|
||||||
KEY_USAGE,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function vaultExists(): boolean {
|
|
||||||
return !!localStorage.getItem(VAULT_KEY);
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function lockVault(pin: string, payload: VaultPayload): Promise<void> {
|
|
||||||
const salt = crypto.getRandomValues(new Uint8Array(16));
|
|
||||||
const iv = crypto.getRandomValues(new Uint8Array(12));
|
|
||||||
const key = await deriveKey(pin, salt);
|
|
||||||
|
|
||||||
const enc = new TextEncoder();
|
|
||||||
const cipher = await crypto.subtle.encrypt(
|
|
||||||
{ name: "AES-GCM", iv },
|
|
||||||
key,
|
|
||||||
enc.encode(JSON.stringify(payload)),
|
|
||||||
);
|
|
||||||
|
|
||||||
localStorage.setItem(VAULT_KEY, JSON.stringify({
|
|
||||||
salt: toB64(salt),
|
|
||||||
iv: toB64(iv),
|
|
||||||
data: toB64(cipher),
|
|
||||||
} satisfies StoredVault));
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function unlockVault(pin: string): Promise<VaultPayload | null> {
|
|
||||||
const raw = localStorage.getItem(VAULT_KEY);
|
|
||||||
if (!raw) return null;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const stored = JSON.parse(raw) as StoredVault;
|
|
||||||
const key = await deriveKey(pin, fromB64(stored.salt));
|
|
||||||
const plain = await crypto.subtle.decrypt(
|
|
||||||
{ name: "AES-GCM", iv: fromB64(stored.iv) },
|
|
||||||
key,
|
|
||||||
fromB64(stored.data),
|
|
||||||
);
|
|
||||||
return JSON.parse(new TextDecoder().decode(plain)) as VaultPayload;
|
|
||||||
} catch {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function clearVault(): void {
|
|
||||||
localStorage.removeItem(VAULT_KEY);
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function rekeyVault(oldPin: string, newPin: string): Promise<boolean> {
|
|
||||||
const payload = await unlockVault(oldPin);
|
|
||||||
if (!payload) return false;
|
|
||||||
await lockVault(newPin, payload);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
export { loadAllStores, persistSettings, persistLibrary, persistUpdates } from "./persist";
|
|
||||||
export type { PersistedData } from "./persist";
|
|
||||||
|
|
||||||
export { vaultExists, lockVault, unlockVault, clearVault, rekeyVault } from "./credentialVault";
|
|
||||||
export type { VaultPayload } from "./credentialVault";
|
|
||||||
@@ -1,166 +0,0 @@
|
|||||||
import { LazyStore } from "@tauri-apps/plugin-store";
|
|
||||||
|
|
||||||
const settingsStore = new LazyStore("settings.json", { autoSave: false });
|
|
||||||
const libraryStore = new LazyStore("library.json", { autoSave: false });
|
|
||||||
const updatesStore = new LazyStore("updates.json", { autoSave: false });
|
|
||||||
const backupsStore = new LazyStore("backups.json", { autoSave: false });
|
|
||||||
|
|
||||||
export interface PersistedData {
|
|
||||||
settings: any;
|
|
||||||
storeVersion: number | null;
|
|
||||||
history: any[];
|
|
||||||
bookmarks: any[];
|
|
||||||
markers: any[];
|
|
||||||
readLog: any[];
|
|
||||||
readingStats: any | null;
|
|
||||||
dailyReadCounts: Record<string, number>;
|
|
||||||
libraryUpdates: any[];
|
|
||||||
lastLibraryRefresh: number;
|
|
||||||
acknowledgedUpdateIds: number[];
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function loadAllStores(): Promise<PersistedData> {
|
|
||||||
const migrated = await migrateFromLocalStorage();
|
|
||||||
if (migrated) return migrated;
|
|
||||||
|
|
||||||
const [sv, s, hist, bk, mk, rl, rs, dc, lu, llr, au] = await Promise.all([
|
|
||||||
settingsStore.get<number>("storeVersion"),
|
|
||||||
settingsStore.get<any>("settings"),
|
|
||||||
libraryStore.get<any[]>("history"),
|
|
||||||
libraryStore.get<any[]>("bookmarks"),
|
|
||||||
libraryStore.get<any[]>("markers"),
|
|
||||||
libraryStore.get<any[]>("readLog"),
|
|
||||||
libraryStore.get<any>("readingStats"),
|
|
||||||
libraryStore.get<Record<string, number>>("dailyReadCounts"),
|
|
||||||
updatesStore.get<any[]>("libraryUpdates"),
|
|
||||||
updatesStore.get<number>("lastLibraryRefresh"),
|
|
||||||
updatesStore.get<number[]>("acknowledgedUpdateIds"),
|
|
||||||
]);
|
|
||||||
|
|
||||||
return {
|
|
||||||
storeVersion: sv ?? null,
|
|
||||||
settings: s ?? null,
|
|
||||||
history: hist ?? [],
|
|
||||||
bookmarks: bk ?? [],
|
|
||||||
markers: mk ?? [],
|
|
||||||
readLog: rl ?? [],
|
|
||||||
readingStats: rs ?? null,
|
|
||||||
dailyReadCounts: dc ?? {},
|
|
||||||
libraryUpdates: lu ?? [],
|
|
||||||
lastLibraryRefresh: llr ?? 0,
|
|
||||||
acknowledgedUpdateIds: au ?? [],
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
async function migrateFromLocalStorage(): Promise<PersistedData | null> {
|
|
||||||
try {
|
|
||||||
const raw = localStorage.getItem("moku-store");
|
|
||||||
if (!raw) return null;
|
|
||||||
const data = JSON.parse(raw);
|
|
||||||
|
|
||||||
await Promise.all([
|
|
||||||
persistSettings({ settings: data.settings ?? null, storeVersion: data.storeVersion ?? 1 }),
|
|
||||||
persistLibrary({
|
|
||||||
history: data.history ?? [],
|
|
||||||
bookmarks: data.bookmarks ?? [],
|
|
||||||
markers: data.markers ?? [],
|
|
||||||
readLog: data.readLog ?? [],
|
|
||||||
readingStats: data.readingStats ?? null,
|
|
||||||
dailyReadCounts: data.dailyReadCounts ?? {},
|
|
||||||
}),
|
|
||||||
persistUpdates({
|
|
||||||
libraryUpdates: data.libraryUpdates ?? [],
|
|
||||||
lastLibraryRefresh: data.lastLibraryRefresh ?? 0,
|
|
||||||
acknowledgedUpdateIds: data.acknowledgedUpdateIds ?? [],
|
|
||||||
}),
|
|
||||||
]);
|
|
||||||
|
|
||||||
localStorage.removeItem("moku-store");
|
|
||||||
|
|
||||||
return {
|
|
||||||
storeVersion: data.storeVersion ?? null,
|
|
||||||
settings: data.settings ?? null,
|
|
||||||
history: data.history ?? [],
|
|
||||||
bookmarks: data.bookmarks ?? [],
|
|
||||||
markers: data.markers ?? [],
|
|
||||||
readLog: data.readLog ?? [],
|
|
||||||
readingStats: data.readingStats ?? null,
|
|
||||||
dailyReadCounts: data.dailyReadCounts ?? {},
|
|
||||||
libraryUpdates: data.libraryUpdates ?? [],
|
|
||||||
lastLibraryRefresh: data.lastLibraryRefresh ?? 0,
|
|
||||||
acknowledgedUpdateIds: data.acknowledgedUpdateIds ?? [],
|
|
||||||
};
|
|
||||||
} catch {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function persistSettings(data: { settings: any; storeVersion: number }) {
|
|
||||||
await Promise.all([
|
|
||||||
settingsStore.set("settings", data.settings),
|
|
||||||
settingsStore.set("storeVersion", data.storeVersion),
|
|
||||||
]);
|
|
||||||
await settingsStore.save();
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function persistLibrary(data: {
|
|
||||||
history: any[];
|
|
||||||
bookmarks: any[];
|
|
||||||
markers: any[];
|
|
||||||
readLog: any[];
|
|
||||||
readingStats: any;
|
|
||||||
dailyReadCounts: Record<string, number>;
|
|
||||||
}) {
|
|
||||||
await Promise.all([
|
|
||||||
libraryStore.set("history", data.history),
|
|
||||||
libraryStore.set("bookmarks", data.bookmarks),
|
|
||||||
libraryStore.set("markers", data.markers),
|
|
||||||
libraryStore.set("readLog", data.readLog),
|
|
||||||
libraryStore.set("readingStats", data.readingStats),
|
|
||||||
libraryStore.set("dailyReadCounts", data.dailyReadCounts),
|
|
||||||
]);
|
|
||||||
await libraryStore.save();
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function persistUpdates(data: {
|
|
||||||
libraryUpdates: any[];
|
|
||||||
lastLibraryRefresh: number;
|
|
||||||
acknowledgedUpdateIds: number[];
|
|
||||||
}) {
|
|
||||||
await Promise.all([
|
|
||||||
updatesStore.set("libraryUpdates", data.libraryUpdates),
|
|
||||||
updatesStore.set("lastLibraryRefresh", data.lastLibraryRefresh),
|
|
||||||
updatesStore.set("acknowledgedUpdateIds", data.acknowledgedUpdateIds),
|
|
||||||
]);
|
|
||||||
await updatesStore.save();
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface BackupEntry { url: string; name: string; }
|
|
||||||
|
|
||||||
export async function loadBackups(): Promise<BackupEntry[]> {
|
|
||||||
const fromStore = await backupsStore.get<BackupEntry[]>("backupList");
|
|
||||||
if (fromStore) return fromStore;
|
|
||||||
try {
|
|
||||||
const raw = localStorage.getItem("moku_backups");
|
|
||||||
if (!raw) return [];
|
|
||||||
const migrated: BackupEntry[] = JSON.parse(raw);
|
|
||||||
await persistBackups(migrated);
|
|
||||||
localStorage.removeItem("moku_backups");
|
|
||||||
return migrated;
|
|
||||||
} catch { return []; }
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function persistBackups(list: BackupEntry[]): Promise<void> {
|
|
||||||
await backupsStore.set("backupList", list);
|
|
||||||
await backupsStore.save();
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function resetAuthSettings(): Promise<void> {
|
|
||||||
const current = await settingsStore.get<any>("settings") ?? {};
|
|
||||||
current.serverAuthMode = "NONE";
|
|
||||||
current.serverAuthUser = "";
|
|
||||||
current.serverAuthPass = "";
|
|
||||||
await settingsStore.set("settings", current);
|
|
||||||
await settingsStore.save();
|
|
||||||
localStorage.removeItem("moku-credential-vault");
|
|
||||||
}
|
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
import { store, updateSettings } from "@store/state.svelte";
|
|
||||||
|
|
||||||
let themeStyleEl: HTMLStyleElement | null = null;
|
|
||||||
let mediaQuery: MediaQueryList | null = null;
|
|
||||||
let mediaHandler: (() => void) | null = null;
|
|
||||||
|
|
||||||
export function applyTheme() {
|
|
||||||
const themeId = store.settings.theme ?? "dark";
|
|
||||||
const isCustom = themeId.startsWith("custom:");
|
|
||||||
|
|
||||||
if (!isCustom) {
|
|
||||||
themeStyleEl?.remove();
|
|
||||||
themeStyleEl = null;
|
|
||||||
document.documentElement.setAttribute("data-theme", themeId);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const custom = store.settings.customThemes?.find(t => t.id === themeId);
|
|
||||||
if (!custom) {
|
|
||||||
themeStyleEl?.remove();
|
|
||||||
themeStyleEl = null;
|
|
||||||
document.documentElement.setAttribute("data-theme", "dark");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const vars = Object.entries(custom.tokens)
|
|
||||||
.map(([k, v]) => ` --${k}: ${v};`)
|
|
||||||
.join("\n");
|
|
||||||
const css = `[data-theme="custom"] {\n${vars}\n}`;
|
|
||||||
|
|
||||||
if (!themeStyleEl) {
|
|
||||||
themeStyleEl = document.createElement("style");
|
|
||||||
themeStyleEl.id = "moku-custom-theme";
|
|
||||||
document.head.appendChild(themeStyleEl);
|
|
||||||
}
|
|
||||||
themeStyleEl.textContent = css;
|
|
||||||
document.documentElement.setAttribute("data-theme", "custom");
|
|
||||||
}
|
|
||||||
|
|
||||||
function applySystemTheme(dark: boolean) {
|
|
||||||
const themeId = dark
|
|
||||||
? (store.settings.systemThemeDark ?? "dark")
|
|
||||||
: (store.settings.systemThemeLight ?? "light");
|
|
||||||
updateSettings({ theme: themeId });
|
|
||||||
}
|
|
||||||
|
|
||||||
export function mountSystemThemeSync() {
|
|
||||||
if (mediaQuery && mediaHandler) {
|
|
||||||
mediaQuery.removeEventListener("change", mediaHandler);
|
|
||||||
mediaHandler = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!store.settings.systemThemeSync) return;
|
|
||||||
|
|
||||||
mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
|
|
||||||
mediaHandler = () => applySystemTheme(mediaQuery!.matches);
|
|
||||||
mediaQuery.addEventListener("change", mediaHandler);
|
|
||||||
applySystemTheme(mediaQuery.matches);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function unmountSystemThemeSync() {
|
|
||||||
if (mediaQuery && mediaHandler) {
|
|
||||||
mediaQuery.removeEventListener("change", mediaHandler);
|
|
||||||
mediaHandler = null;
|
|
||||||
mediaQuery = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
import { store } from "@store/state.svelte";
|
|
||||||
|
|
||||||
const IDLE_EVENTS = ["mousemove", "mousedown", "keydown", "touchstart", "wheel"] as const;
|
|
||||||
|
|
||||||
export function mountIdleDetection(onIdle: () => void, onActive: () => void): () => void {
|
|
||||||
let timer: ReturnType<typeof setTimeout> | null = null;
|
|
||||||
|
|
||||||
function reset() {
|
|
||||||
if (timer) clearTimeout(timer);
|
|
||||||
const ms = (store.settings.idleTimeoutMin ?? 5) * 60 * 1000;
|
|
||||||
if (ms === 0) return;
|
|
||||||
timer = setTimeout(onIdle, ms);
|
|
||||||
onActive();
|
|
||||||
}
|
|
||||||
|
|
||||||
IDLE_EVENTS.forEach(e => window.addEventListener(e, reset, { passive: true }));
|
|
||||||
reset();
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
if (timer) clearTimeout(timer);
|
|
||||||
IDLE_EVENTS.forEach(e => window.removeEventListener(e, reset));
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
export * from './idle';
|
|
||||||
export * from './zoom';
|
|
||||||
export * from './touchscreen';
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
import { invoke } from "@tauri-apps/api/core";
|
|
||||||
import { getVersion } from "@tauri-apps/api/app";
|
|
||||||
import { addToast } from "@store/state.svelte";
|
|
||||||
|
|
||||||
function parse(tag: string): number[] {
|
|
||||||
return tag.replace(/^v/, "").split(".").map(Number);
|
|
||||||
}
|
|
||||||
|
|
||||||
function compare(a: number[], b: number[]): number {
|
|
||||||
for (let i = 0; i < 3; i++) {
|
|
||||||
if ((a[i] ?? 0) !== (b[i] ?? 0)) return (b[i] ?? 0) - (a[i] ?? 0);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function checkForUpdateSilently(): Promise<void> {
|
|
||||||
try {
|
|
||||||
const [currentVersion, releases] = await Promise.all([
|
|
||||||
getVersion(),
|
|
||||||
invoke<Array<{ tag_name: string; html_url: string }>>("list_releases"),
|
|
||||||
]);
|
|
||||||
|
|
||||||
const valid = releases.filter(r => typeof r.tag_name === "string" && r.tag_name.trim());
|
|
||||||
if (!valid.length) return;
|
|
||||||
|
|
||||||
const latestTag = valid
|
|
||||||
.map(r => r.tag_name)
|
|
||||||
.sort((a, b) => compare(parse(a), parse(b)))[0]
|
|
||||||
.replace(/^v/, "");
|
|
||||||
|
|
||||||
if (compare(parse(latestTag), parse(currentVersion)) < 0) {
|
|
||||||
addToast({
|
|
||||||
kind: "info",
|
|
||||||
title: `Update available — v${latestTag}`,
|
|
||||||
body: "Open Settings → About to install.",
|
|
||||||
duration: 8000,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} catch {}
|
|
||||||
}
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
@keyframes fadeIn {
|
|
||||||
from { opacity: 0; }
|
|
||||||
to { opacity: 1; }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes fadeUp {
|
|
||||||
from { opacity: 0; transform: translateY(5px); }
|
|
||||||
to { opacity: 1; transform: translateY(0); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes fadeDown {
|
|
||||||
from { opacity: 0; transform: translateY(-5px); }
|
|
||||||
to { opacity: 1; transform: translateY(0); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes scaleIn {
|
|
||||||
from { opacity: 0; transform: scale(0.97); }
|
|
||||||
to { opacity: 1; transform: scale(1); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes spin {
|
|
||||||
from { transform: rotate(0deg); }
|
|
||||||
to { transform: rotate(360deg); }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes pulse {
|
|
||||||
0%, 100% { opacity: 1; }
|
|
||||||
50% { opacity: 0.35; }
|
|
||||||
}
|
|
||||||
|
|
||||||
@keyframes shimmer {
|
|
||||||
from { background-position: -200% 0; }
|
|
||||||
to { background-position: 200% 0; }
|
|
||||||
}
|
|
||||||
|
|
||||||
.anim-fade-in { animation: fadeIn 0.14s ease both; }
|
|
||||||
.anim-fade-up { animation: fadeUp 0.18s ease both; }
|
|
||||||
.anim-fade-down { animation: fadeDown 0.18s ease both; }
|
|
||||||
.anim-scale-in { animation: scaleIn 0.14s ease both; }
|
|
||||||
.anim-pulse { animation: pulse 1.6s ease infinite; }
|
|
||||||
.anim-spin { animation: spin 0.7s linear infinite; }
|
|
||||||
|
|
||||||
.skeleton {
|
|
||||||
background: linear-gradient(90deg, var(--bg-raised) 25%, var(--bg-overlay) 50%, var(--bg-raised) 75%);
|
|
||||||
background-size: 200% 100%;
|
|
||||||
animation: shimmer 1.4s ease infinite;
|
|
||||||
border-radius: var(--radius-sm);
|
|
||||||
}
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
@import "./reset.css";
|
|
||||||
@import "./animations.css";
|
|
||||||
@import "./scrollbars.css";
|
|
||||||
@import "./typography.css";
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
*, *::before, *::after {
|
|
||||||
box-sizing: border-box;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
html, body {
|
|
||||||
height: 100%;
|
|
||||||
overflow: hidden;
|
|
||||||
background: var(--bg-void);
|
|
||||||
color: var(--text-primary);
|
|
||||||
}
|
|
||||||
|
|
||||||
#app {
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
button {
|
|
||||||
cursor: pointer;
|
|
||||||
font: inherit;
|
|
||||||
color: inherit;
|
|
||||||
background: none;
|
|
||||||
border: none;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
input, textarea, select {
|
|
||||||
font: inherit;
|
|
||||||
color: inherit;
|
|
||||||
}
|
|
||||||
|
|
||||||
a {
|
|
||||||
color: inherit;
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
ul, ol { list-style: none; }
|
|
||||||
|
|
||||||
img, svg { display: block; max-width: 100%; }
|
|
||||||
|
|
||||||
p { margin: 0; }
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
* {
|
|
||||||
scrollbar-width: thin;
|
|
||||||
scrollbar-color: transparent transparent;
|
|
||||||
}
|
|
||||||
|
|
||||||
*::-webkit-scrollbar { width: 4px; height: 4px; }
|
|
||||||
*::-webkit-scrollbar-track { background: transparent; }
|
|
||||||
*::-webkit-scrollbar-thumb { background: transparent; border-radius: 99px; }
|
|
||||||
*::-webkit-scrollbar-thumb:hover { background: transparent; }
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
body {
|
|
||||||
font-family: var(--font-sans);
|
|
||||||
font-size: var(--text-base);
|
|
||||||
font-weight: var(--weight-normal);
|
|
||||||
line-height: var(--leading-base);
|
|
||||||
-webkit-font-smoothing: antialiased;
|
|
||||||
-moz-osx-font-smoothing: grayscale;
|
|
||||||
text-rendering: optimizeLegibility;
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
[data-theme="dark"] {
|
|
||||||
--bg-void: #000000;
|
|
||||||
--bg-base: #080808;
|
|
||||||
--bg-surface: #0d0d0d;
|
|
||||||
--bg-raised: #111111;
|
|
||||||
--bg-overlay: #171717;
|
|
||||||
--bg-subtle: #1e1e1e;
|
|
||||||
|
|
||||||
--border-dim: #252525;
|
|
||||||
--border-base: #303030;
|
|
||||||
--border-strong: #3e3e3e;
|
|
||||||
--border-focus: #5a7a5a;
|
|
||||||
|
|
||||||
--text-primary: #ffffff;
|
|
||||||
--text-secondary: #e8e6e0;
|
|
||||||
--text-muted: #b0aea8;
|
|
||||||
--text-faint: #6e6c68;
|
|
||||||
--text-disabled: #303030;
|
|
||||||
|
|
||||||
--accent: #7aaa7a;
|
|
||||||
--accent-dim: #2e4a2e;
|
|
||||||
--accent-muted: #1e2e1e;
|
|
||||||
--accent-fg: #bcd8bc;
|
|
||||||
--accent-bright: #9fcf9f;
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
@import "./original.css";
|
|
||||||
@import "./dark.css";
|
|
||||||
@import "./light.css";
|
|
||||||
@import "./midnight.css";
|
|
||||||
@import "./warm.css";
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
[data-theme="light"] {
|
|
||||||
--bg-void: #d8d4ce;
|
|
||||||
--bg-base: #e2deda;
|
|
||||||
--bg-surface: #ece8e2;
|
|
||||||
--bg-raised: #f5f2ec;
|
|
||||||
--bg-overlay: #ffffff;
|
|
||||||
--bg-subtle: #e4e0d8;
|
|
||||||
|
|
||||||
--border-dim: #c4c0b8;
|
|
||||||
--border-base: #b0aca4;
|
|
||||||
--border-strong: #989490;
|
|
||||||
--border-focus: #3a5a3a;
|
|
||||||
|
|
||||||
--text-primary: #080806;
|
|
||||||
--text-secondary: #181612;
|
|
||||||
--text-muted: #38342e;
|
|
||||||
--text-faint: #706c64;
|
|
||||||
--text-disabled: #b0aca4;
|
|
||||||
|
|
||||||
--accent: #2a5a2a;
|
|
||||||
--accent-dim: #b0ccb0;
|
|
||||||
--accent-muted: #c8dcc8;
|
|
||||||
--accent-fg: #183818;
|
|
||||||
--accent-bright: #1e4e1e;
|
|
||||||
|
|
||||||
--color-error: #8a1a1a;
|
|
||||||
--color-error-bg: #f8e0e0;
|
|
||||||
--color-read: #e0dcd4;
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
[data-theme="midnight"] {
|
|
||||||
--bg-void: #050810;
|
|
||||||
--bg-base: #080c18;
|
|
||||||
--bg-surface: #0c1020;
|
|
||||||
--bg-raised: #101428;
|
|
||||||
--bg-overlay: #151a30;
|
|
||||||
--bg-subtle: #1a2038;
|
|
||||||
|
|
||||||
--border-dim: #1a2035;
|
|
||||||
--border-base: #222840;
|
|
||||||
--border-strong: #2c3450;
|
|
||||||
--border-focus: #4a5c8a;
|
|
||||||
|
|
||||||
--text-primary: #eeeef8;
|
|
||||||
--text-secondary: #c0c4d8;
|
|
||||||
--text-muted: #808498;
|
|
||||||
--text-faint: #404860;
|
|
||||||
--text-disabled: #202840;
|
|
||||||
|
|
||||||
--accent: #6a7ab8;
|
|
||||||
--accent-dim: #252d50;
|
|
||||||
--accent-muted: #181e38;
|
|
||||||
--accent-fg: #a8b4e8;
|
|
||||||
--accent-bright: #8896d0;
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
[data-theme="original"] {
|
|
||||||
--bg-void: #080808;
|
|
||||||
--bg-base: #0c0c0c;
|
|
||||||
--bg-surface: #101010;
|
|
||||||
--bg-raised: #151515;
|
|
||||||
--bg-overlay: #1a1a1a;
|
|
||||||
--bg-subtle: #202020;
|
|
||||||
|
|
||||||
--border-dim: #1c1c1c;
|
|
||||||
--border-base: #242424;
|
|
||||||
--border-strong: #2e2e2e;
|
|
||||||
--border-focus: #4a5c4a;
|
|
||||||
|
|
||||||
--text-primary: #f0efec;
|
|
||||||
--text-secondary: #c8c6c0;
|
|
||||||
--text-muted: #8a8880;
|
|
||||||
--text-faint: #4e4d4a;
|
|
||||||
--text-disabled: #2a2a28;
|
|
||||||
|
|
||||||
--accent: #6b8f6b;
|
|
||||||
--accent-dim: #2a3d2a;
|
|
||||||
--accent-muted: #1a251a;
|
|
||||||
--accent-fg: #a8c4a8;
|
|
||||||
--accent-bright: #8fb88f;
|
|
||||||
|
|
||||||
--color-error: #c47a7a;
|
|
||||||
--color-error-bg: #1f1212;
|
|
||||||
--color-success: #7aab7a;
|
|
||||||
--color-info: #7a9ec4;
|
|
||||||
--color-info-bg: #121a1f;
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
[data-theme="warm"] {
|
|
||||||
--bg-void: #0c0a06;
|
|
||||||
--bg-base: #100e08;
|
|
||||||
--bg-surface: #16130c;
|
|
||||||
--bg-raised: #1c1810;
|
|
||||||
--bg-overlay: #221e14;
|
|
||||||
--bg-subtle: #28241a;
|
|
||||||
|
|
||||||
--border-dim: #201c10;
|
|
||||||
--border-base: #2c2818;
|
|
||||||
--border-strong: #3a3420;
|
|
||||||
--border-focus: #6a5a30;
|
|
||||||
|
|
||||||
--text-primary: #f5f0e0;
|
|
||||||
--text-secondary: #d8d0b0;
|
|
||||||
--text-muted: #988c60;
|
|
||||||
--text-faint: #584e30;
|
|
||||||
--text-disabled: #302a18;
|
|
||||||
|
|
||||||
--accent: #c0902a;
|
|
||||||
--accent-dim: #3a2c10;
|
|
||||||
--accent-muted: #261e0c;
|
|
||||||
--accent-fg: #e0b860;
|
|
||||||
--accent-bright: #d0a040;
|
|
||||||
}
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
:root {
|
|
||||||
--bg-void: #080808;
|
|
||||||
--bg-base: #0c0c0c;
|
|
||||||
--bg-surface: #101010;
|
|
||||||
--bg-raised: #151515;
|
|
||||||
--bg-overlay: #1a1a1a;
|
|
||||||
--bg-subtle: #202020;
|
|
||||||
|
|
||||||
--border-dim: #1c1c1c;
|
|
||||||
--border-base: #242424;
|
|
||||||
--border-strong: #2e2e2e;
|
|
||||||
--border-focus: #4a5c4a;
|
|
||||||
|
|
||||||
--text-primary: #f0efec;
|
|
||||||
--text-secondary: #c8c6c0;
|
|
||||||
--text-muted: #8a8880;
|
|
||||||
--text-faint: #4e4d4a;
|
|
||||||
--text-disabled: #2a2a28;
|
|
||||||
|
|
||||||
--accent: #6b8f6b;
|
|
||||||
--accent-dim: #2a3d2a;
|
|
||||||
--accent-muted: #1a251a;
|
|
||||||
--accent-fg: #a8c4a8;
|
|
||||||
--accent-bright: #8fb88f;
|
|
||||||
|
|
||||||
--color-error: #c47a7a;
|
|
||||||
--color-error-bg: #1f1212;
|
|
||||||
--color-success: #7aab7a;
|
|
||||||
--color-info: #7a9ec4;
|
|
||||||
--color-info-bg: #121a1f;
|
|
||||||
--color-read: #2e2e2c;
|
|
||||||
|
|
||||||
--dot-active: var(--accent);
|
|
||||||
--dot-inactive: var(--text-faint);
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
@import "./colors.css";
|
|
||||||
@import "./typography.css";
|
|
||||||
@import "./spacing.css";
|
|
||||||
@import "./radius.css";
|
|
||||||
@import "./motion.css";
|
|
||||||
@import "./shadows.css";
|
|
||||||
@import "./zindex.css";
|
|
||||||
@import "../themes/index.css";
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
:root {
|
|
||||||
--t-fast: 0.08s ease;
|
|
||||||
--t-base: 0.14s ease;
|
|
||||||
--t-slow: 0.22s ease;
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
:root {
|
|
||||||
--radius-sm: 3px;
|
|
||||||
--radius-md: 5px;
|
|
||||||
--radius-lg: 7px;
|
|
||||||
--radius-xl: 10px;
|
|
||||||
--radius-2xl: 14px;
|
|
||||||
--radius-full: 9999px;
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
:root {
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
:root {
|
|
||||||
--sp-1: 4px;
|
|
||||||
--sp-2: 8px;
|
|
||||||
--sp-3: 12px;
|
|
||||||
--sp-4: 16px;
|
|
||||||
--sp-5: 20px;
|
|
||||||
--sp-6: 24px;
|
|
||||||
--sp-8: 32px;
|
|
||||||
--sp-10: 40px;
|
|
||||||
|
|
||||||
--sidebar-width: 52px;
|
|
||||||
--titlebar-height: 36px;
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
:root {
|
|
||||||
--font-ui: "DM Mono", "Fira Mono", ui-monospace, monospace;
|
|
||||||
--font-sans: "DM Sans", ui-sans-serif, system-ui, sans-serif;
|
|
||||||
|
|
||||||
--text-2xs: 10px;
|
|
||||||
--text-xs: 11px;
|
|
||||||
--text-sm: 12px;
|
|
||||||
--text-base: 13px;
|
|
||||||
--text-md: 14px;
|
|
||||||
--text-lg: 15px;
|
|
||||||
--text-xl: 17px;
|
|
||||||
--text-2xl: 20px;
|
|
||||||
--text-3xl: 24px;
|
|
||||||
|
|
||||||
--weight-normal: 400;
|
|
||||||
--weight-medium: 500;
|
|
||||||
--weight-semi: 600;
|
|
||||||
|
|
||||||
--leading-none: 1;
|
|
||||||
--leading-tight: 1.3;
|
|
||||||
--leading-snug: 1.45;
|
|
||||||
--leading-base: 1.6;
|
|
||||||
|
|
||||||
--tracking-tight: -0.02em;
|
|
||||||
--tracking-normal: 0;
|
|
||||||
--tracking-wide: 0.06em;
|
|
||||||
--tracking-wider: 0.1em;
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
:root {
|
|
||||||
--z-reader: 50;
|
|
||||||
--z-modal: 100;
|
|
||||||
--z-settings: 150;
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
export { default as Search } from "./components/Search.svelte";
|
|
||||||
export * from "./lib/searchFilter";
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { CircleNotch } from "phosphor-svelte";
|
|
||||||
import DownloadItem from "./DownloadItem.svelte";
|
|
||||||
import type { DownloadQueueItem } from "@types/index";
|
|
||||||
|
|
||||||
interface Props {
|
|
||||||
queue: DownloadQueueItem[];
|
|
||||||
loading: boolean;
|
|
||||||
isRunning: boolean;
|
|
||||||
dequeueing: Set<number>;
|
|
||||||
selected: Set<number>;
|
|
||||||
onRemove: (chapterId: number) => void;
|
|
||||||
onRetry: (chapterId: number) => void;
|
|
||||||
onReorder: (chapterId: number, dir: "up" | "down") => void;
|
|
||||||
onReorderEdge: (chapterId: number, edge: "top" | "bottom") => void;
|
|
||||||
onSelect: (chapterId: number, e: MouseEvent) => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
const {
|
|
||||||
queue, loading, isRunning, dequeueing, selected,
|
|
||||||
onRemove, onRetry, onReorder, onReorderEdge, onSelect,
|
|
||||||
}: Props = $props();
|
|
||||||
</script>
|
|
||||||
|
|
||||||
{#if loading}
|
|
||||||
<div class="empty">
|
|
||||||
<CircleNotch size={16} weight="light" class="anim-spin" style="color:var(--text-faint)" />
|
|
||||||
</div>
|
|
||||||
{:else if queue.length === 0}
|
|
||||||
<div class="empty">Queue is empty.</div>
|
|
||||||
{:else}
|
|
||||||
<div class="list">
|
|
||||||
{#each queue as item, i (item.chapter.id)}
|
|
||||||
<DownloadItem
|
|
||||||
{item}
|
|
||||||
isActive={i === 0 && isRunning}
|
|
||||||
isRemoving={dequeueing.has(item.chapter.id)}
|
|
||||||
isSelected={selected.has(item.chapter.id)}
|
|
||||||
{onRemove}
|
|
||||||
{onRetry}
|
|
||||||
{onReorder}
|
|
||||||
{onReorderEdge}
|
|
||||||
{onSelect}
|
|
||||||
/>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
<style>
|
|
||||||
.list { display: flex; flex-direction: column; gap: var(--sp-2); }
|
|
||||||
.empty { display: flex; align-items: center; justify-content: center; height: 160px; color: var(--text-faint); font-family: var(--font-ui); font-size: var(--text-xs); letter-spacing: var(--tracking-wide); }
|
|
||||||
</style>
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
export { downloadStore } from "./store/downloadState.svelte";
|
|
||||||
export { toActiveDownloads, optimisticRemove, isRunning, pageProgress } from "./lib/downloadQueue";
|
|
||||||
@@ -1,84 +0,0 @@
|
|||||||
import type { DownloadQueueItem, ActiveDownload } from "@types/index";
|
|
||||||
|
|
||||||
export function toActiveDownloads(queue: DownloadQueueItem[]): ActiveDownload[] {
|
|
||||||
return queue.map((item) => ({
|
|
||||||
chapterId: item.chapter.id,
|
|
||||||
mangaId: item.chapter.mangaId,
|
|
||||||
progress: item.progress,
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
export function optimisticRemove(queue: DownloadQueueItem[], chapterId: number): DownloadQueueItem[] {
|
|
||||||
return queue.filter((i) => i.chapter.id !== chapterId);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function optimisticRemoveMany(queue: DownloadQueueItem[], chapterIds: Set<number>): DownloadQueueItem[] {
|
|
||||||
return queue.filter((i) => !chapterIds.has(i.chapter.id));
|
|
||||||
}
|
|
||||||
|
|
||||||
export function isRunning(state: string | undefined): boolean {
|
|
||||||
return state === "STARTED";
|
|
||||||
}
|
|
||||||
|
|
||||||
export function getErrored(queue: DownloadQueueItem[]): DownloadQueueItem[] {
|
|
||||||
return queue.filter((i) => i.state === "ERROR");
|
|
||||||
}
|
|
||||||
|
|
||||||
export function pageProgress(progress: number, pageCount: number): { done: number; total: number } {
|
|
||||||
return { done: Math.round(progress * pageCount), total: pageCount };
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface SpeedSample {
|
|
||||||
ts: number;
|
|
||||||
progress: number;
|
|
||||||
pages: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function calcSpeed(prev: SpeedSample | null, current: SpeedSample): number | null {
|
|
||||||
if (!prev) return null;
|
|
||||||
const dt = (current.ts - prev.ts) / 1000;
|
|
||||||
if (dt <= 0) return null;
|
|
||||||
const prevDone = Math.round(prev.progress * prev.pages);
|
|
||||||
const curDone = Math.round(current.progress * current.pages);
|
|
||||||
const delta = curDone - prevDone;
|
|
||||||
if (delta <= 0) return null;
|
|
||||||
return delta / dt;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function estimateEta(pagesPerSec: number, queue: DownloadQueueItem[]): number | null {
|
|
||||||
if (pagesPerSec <= 0 || queue.length === 0) return null;
|
|
||||||
let remaining = 0;
|
|
||||||
for (const item of queue) {
|
|
||||||
const pages = item.chapter.pageCount ?? 0;
|
|
||||||
remaining += pages - Math.round(item.progress * pages);
|
|
||||||
}
|
|
||||||
return remaining / pagesPerSec;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function reorderSelectedToEdge(
|
|
||||||
queue: DownloadQueueItem[],
|
|
||||||
selected: Set<number>,
|
|
||||||
edge: "top" | "bottom",
|
|
||||||
): DownloadQueueItem[] {
|
|
||||||
const pinned = queue.filter((i) => selected.has(i.chapter.id));
|
|
||||||
const rest = queue.filter((i) => !selected.has(i.chapter.id));
|
|
||||||
return edge === "top" ? [...pinned, ...rest] : [...rest, ...pinned];
|
|
||||||
}
|
|
||||||
|
|
||||||
const AVG_BYTES_PER_PAGE = 1_500_000;
|
|
||||||
|
|
||||||
export function estimateQueueBytes(queue: DownloadQueueItem[]): number {
|
|
||||||
let total = 0;
|
|
||||||
for (const item of queue) {
|
|
||||||
const pages = item.chapter.pageCount ?? 0;
|
|
||||||
const remaining = pages - Math.round(item.progress * pages);
|
|
||||||
total += remaining * AVG_BYTES_PER_PAGE;
|
|
||||||
}
|
|
||||||
return total;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function formatEta(seconds: number): string {
|
|
||||||
if (seconds < 60) return `~${Math.ceil(seconds)}s`;
|
|
||||||
if (seconds < 3600) return `~${Math.ceil(seconds / 60)}m`;
|
|
||||||
return `~${(seconds / 3600).toFixed(1)}h`;
|
|
||||||
}
|
|
||||||
@@ -1,407 +0,0 @@
|
|||||||
import { gql } from "@api/client";
|
|
||||||
import { GET_DOWNLOAD_STATUS } from "@api/queries";
|
|
||||||
import {
|
|
||||||
START_DOWNLOADER, STOP_DOWNLOADER, CLEAR_DOWNLOADER,
|
|
||||||
DEQUEUE_DOWNLOAD, DEQUEUE_CHAPTERS_DOWNLOAD,
|
|
||||||
ENQUEUE_DOWNLOAD, REORDER_DOWNLOAD,
|
|
||||||
} from "@api/mutations";
|
|
||||||
import { addToast, setActiveDownloads, store, updateSettings } from "@store/state.svelte";
|
|
||||||
import { boot } from "@store/boot.svelte";
|
|
||||||
import type { DownloadStatus, DownloadQueueItem } from "@types/index";
|
|
||||||
import {
|
|
||||||
toActiveDownloads, optimisticRemove, optimisticRemoveMany,
|
|
||||||
isRunning, getErrored, calcSpeed, estimateEta, estimateQueueBytes,
|
|
||||||
type SpeedSample,
|
|
||||||
} from "../lib/downloadQueue";
|
|
||||||
import { startAutoRetry, type AutoRetryHandle } from "../lib/autoRetry";
|
|
||||||
import { invoke } from "@tauri-apps/api/core";
|
|
||||||
|
|
||||||
class DownloadStore {
|
|
||||||
status: DownloadStatus | null = $state(null);
|
|
||||||
loading = $state(true);
|
|
||||||
togglingPlay = $state(false);
|
|
||||||
clearing = $state(false);
|
|
||||||
dequeueing = $state(new Set<number>());
|
|
||||||
selected = $state(new Set<number>());
|
|
||||||
batchWorking = $state(false);
|
|
||||||
pagesPerSec: number | null = $state(null);
|
|
||||||
eta: number | null = $state(null);
|
|
||||||
storageWarning: boolean = $state(false);
|
|
||||||
|
|
||||||
private freeBytes: number | null = null;
|
|
||||||
|
|
||||||
get toastsEnabled() { return store.settings.downloadToastsEnabled ?? true; }
|
|
||||||
get autoRetryEnabled() { return store.settings.downloadAutoRetry ?? false; }
|
|
||||||
|
|
||||||
private lastSample: SpeedSample | null = null;
|
|
||||||
private prevQueue: DownloadQueueItem[] = [];
|
|
||||||
private autoRetryHnd: AutoRetryHandle | null = null;
|
|
||||||
|
|
||||||
get queue() { return this.status?.queue ?? []; }
|
|
||||||
get isRunning() { return isRunning(this.status?.state); }
|
|
||||||
get erroredIds() { return new Set(getErrored(this.queue).map((i) => i.chapter.id)); }
|
|
||||||
get hasErrored() { return this.erroredIds.size > 0; }
|
|
||||||
|
|
||||||
toggleToasts() {
|
|
||||||
const next = !this.toastsEnabled;
|
|
||||||
updateSettings({ downloadToastsEnabled: next });
|
|
||||||
addToast({ kind: "info", title: next ? "Notifications enabled" : "Notifications muted", body: next ? "You'll be notified when chapters finish downloading" : "Download notifications are silenced", duration: 2500 });
|
|
||||||
}
|
|
||||||
|
|
||||||
toggleAutoRetry() {
|
|
||||||
if (this.autoRetryEnabled) {
|
|
||||||
this.autoRetryHnd?.stop();
|
|
||||||
this.autoRetryHnd = null;
|
|
||||||
updateSettings({ downloadAutoRetry: false });
|
|
||||||
addToast({ kind: "info", title: "Auto-retry disabled", body: "Failed downloads will no longer retry automatically", duration: 2500 });
|
|
||||||
} else {
|
|
||||||
updateSettings({ downloadAutoRetry: true });
|
|
||||||
this.autoRetryHnd = startAutoRetry(
|
|
||||||
() => this.queue,
|
|
||||||
() => this.isRunning,
|
|
||||||
() => this.retryAllErrored(),
|
|
||||||
);
|
|
||||||
addToast({ kind: "info", title: "Auto-retry enabled", body: "Errored downloads will retry automatically", duration: 3000 });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
detectTransitions(next: DownloadQueueItem[]) {
|
|
||||||
if (!this.toastsEnabled) return;
|
|
||||||
const nextMap = new Map(next.map(i => [i.chapter.id, i]));
|
|
||||||
for (const item of this.prevQueue) {
|
|
||||||
if (item.state !== "DOWNLOADING") continue;
|
|
||||||
const nextItem = nextMap.get(item.chapter.id);
|
|
||||||
const manga = item.chapter.manga;
|
|
||||||
const label = manga ? `${manga.title} — ${item.chapter.name}` : item.chapter.name;
|
|
||||||
if (!nextItem) {
|
|
||||||
addToast({ kind: "download", title: "Chapter downloaded", body: label, duration: 4000 });
|
|
||||||
} else if (nextItem.state === "ERROR") {
|
|
||||||
addToast({ kind: "error", title: "Download failed", body: label, duration: 5000 });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.prevQueue = next.slice();
|
|
||||||
}
|
|
||||||
|
|
||||||
applyStatus(ds: DownloadStatus) {
|
|
||||||
this.status = ds;
|
|
||||||
setActiveDownloads(toActiveDownloads(ds.queue));
|
|
||||||
this.updateSpeed(ds);
|
|
||||||
this.fetchFreeBytes(ds);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async fetchFreeBytes(ds: DownloadStatus) {
|
|
||||||
const path = store.settings.serverDownloadsPath ?? "";
|
|
||||||
if (!path) return;
|
|
||||||
try {
|
|
||||||
const info = await invoke<{ free_bytes: number }>("get_storage_info", { downloadsPath: path });
|
|
||||||
this.freeBytes = info.free_bytes;
|
|
||||||
this.storageWarning = estimateQueueBytes(ds.queue) > info.free_bytes * 0.95;
|
|
||||||
} catch { }
|
|
||||||
}
|
|
||||||
|
|
||||||
private confirmStorageOverrun(): Promise<boolean> {
|
|
||||||
return new Promise(resolve => {
|
|
||||||
const backdrop = document.createElement("div");
|
|
||||||
backdrop.style.cssText = "position:fixed;inset:0;z-index:10000;background:rgba(0,0,0,0.5);display:flex;align-items:center;justify-content:center;animation:s-fade-in 0.15s ease both";
|
|
||||||
const panel = document.createElement("div");
|
|
||||||
panel.style.cssText = "background:var(--bg-surface);border:1px solid var(--border-base);border-radius:var(--radius-2xl);box-shadow:0 24px 80px rgba(0,0,0,0.7),0 0 0 1px rgba(255,255,255,0.04) inset;width:min(380px,calc(100vw - 40px));overflow:hidden;animation:s-scale-in 0.2s cubic-bezier(0.16,1,0.3,1) both";
|
|
||||||
panel.innerHTML = `
|
|
||||||
<div style="padding:var(--sp-4) var(--sp-5) var(--sp-3);border-bottom:1px solid var(--border-dim)">
|
|
||||||
<p style="margin:0;font-size:var(--text-sm);font-weight:var(--weight-medium);color:var(--text-primary);letter-spacing:0.01em">Low disk space</p>
|
|
||||||
</div>
|
|
||||||
<div style="padding:var(--sp-4) var(--sp-5);display:flex;flex-direction:column;gap:var(--sp-2)">
|
|
||||||
<p style="margin:0;font-family:var(--font-ui);font-size:var(--text-xs);color:var(--text-muted);letter-spacing:var(--tracking-wide);line-height:var(--leading-snug)">
|
|
||||||
The download queue is estimated to exceed 95% of your available storage. Download anyway?
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div style="padding:var(--sp-3) var(--sp-5);border-top:1px solid var(--border-dim);display:flex;justify-content:flex-end;gap:var(--sp-2)">
|
|
||||||
<button id="_moku-storage-cancel" style="font-family:var(--font-ui);font-size:var(--text-xs);letter-spacing:var(--tracking-wide);padding:5px var(--sp-3);border-radius:var(--radius-sm);border:1px solid var(--border-dim);background:none;color:var(--text-muted);cursor:pointer">Cancel</button>
|
|
||||||
<button id="_moku-storage-confirm" style="font-family:var(--font-ui);font-size:var(--text-xs);letter-spacing:var(--tracking-wide);padding:5px var(--sp-3);border-radius:var(--radius-sm);border:1px solid color-mix(in srgb,var(--color-error) 40%,transparent);background:color-mix(in srgb,var(--color-error) 10%,transparent);color:var(--color-error);cursor:pointer">Download anyway</button>
|
|
||||||
</div>
|
|
||||||
`;
|
|
||||||
backdrop.appendChild(panel);
|
|
||||||
document.body.appendChild(backdrop);
|
|
||||||
function finish(result: boolean) { backdrop.remove(); resolve(result); }
|
|
||||||
panel.querySelector("#_moku-storage-cancel")!.addEventListener("click", () => finish(false));
|
|
||||||
panel.querySelector("#_moku-storage-confirm")!.addEventListener("click", () => finish(true));
|
|
||||||
backdrop.addEventListener("click", (e) => { if (e.target === backdrop) finish(false); });
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
private async guardStorage(queueAfter: DownloadQueueItem[]): Promise<boolean> {
|
|
||||||
if (this.freeBytes === null) return true;
|
|
||||||
if (estimateQueueBytes(queueAfter) <= this.freeBytes * 0.95) return true;
|
|
||||||
return this.confirmStorageOverrun();
|
|
||||||
}
|
|
||||||
|
|
||||||
private updateSpeed(ds: DownloadStatus) {
|
|
||||||
const active = ds.queue[0];
|
|
||||||
if (!active || active.state !== "DOWNLOADING") {
|
|
||||||
this.lastSample = null;
|
|
||||||
this.pagesPerSec = null;
|
|
||||||
this.eta = null;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const sample: SpeedSample = {
|
|
||||||
ts: Date.now(),
|
|
||||||
progress: active.progress,
|
|
||||||
pages: active.chapter.pageCount ?? 0,
|
|
||||||
};
|
|
||||||
const speed = calcSpeed(this.lastSample, sample);
|
|
||||||
this.lastSample = sample;
|
|
||||||
if (speed !== null) {
|
|
||||||
this.pagesPerSec = speed;
|
|
||||||
this.eta = estimateEta(speed, ds.queue);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async poll() {
|
|
||||||
if (boot.sessionExpired) return;
|
|
||||||
gql<{ downloadStatus: DownloadStatus }>(GET_DOWNLOAD_STATUS)
|
|
||||||
.then((d) => this.applyStatus(d.downloadStatus))
|
|
||||||
.catch(console.error)
|
|
||||||
.finally(() => { this.loading = false; });
|
|
||||||
}
|
|
||||||
|
|
||||||
async togglePlay() {
|
|
||||||
if (this.togglingPlay) return;
|
|
||||||
this.togglingPlay = true;
|
|
||||||
const wasRunning = this.isRunning;
|
|
||||||
if (this.status) this.status = { ...this.status, state: wasRunning ? "STOPPED" : "STARTED" };
|
|
||||||
try {
|
|
||||||
if (wasRunning) {
|
|
||||||
const d = await gql<{ stopDownloader: { downloadStatus: DownloadStatus } }>(STOP_DOWNLOADER);
|
|
||||||
this.applyStatus(d.stopDownloader.downloadStatus);
|
|
||||||
} else {
|
|
||||||
const d = await gql<{ startDownloader: { downloadStatus: DownloadStatus } }>(START_DOWNLOADER);
|
|
||||||
this.applyStatus(d.startDownloader.downloadStatus);
|
|
||||||
}
|
|
||||||
} catch (e) { console.error(e); this.poll(); }
|
|
||||||
finally {
|
|
||||||
this.togglingPlay = false;
|
|
||||||
addToast({ kind: "info", title: wasRunning ? "Downloads paused" : "Downloads resumed", body: wasRunning ? "The download queue has been paused" : "The download queue is running", duration: 2500 });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async clear() {
|
|
||||||
if (this.clearing) return;
|
|
||||||
this.clearing = true;
|
|
||||||
this.selected = new Set();
|
|
||||||
if (this.status) this.status = { ...this.status, queue: [] };
|
|
||||||
setActiveDownloads([]);
|
|
||||||
try {
|
|
||||||
const d = await gql<{ clearDownloader: { downloadStatus: DownloadStatus } }>(CLEAR_DOWNLOADER);
|
|
||||||
this.applyStatus(d.clearDownloader.downloadStatus);
|
|
||||||
addToast({ kind: "info", title: "Queue cleared", body: "All pending downloads have been removed", duration: 2500 });
|
|
||||||
} catch (e) { console.error(e); this.poll(); }
|
|
||||||
finally { this.clearing = false; }
|
|
||||||
}
|
|
||||||
|
|
||||||
async dequeue(chapterId: number) {
|
|
||||||
if (this.dequeueing.has(chapterId)) return;
|
|
||||||
this.dequeueing = new Set(this.dequeueing).add(chapterId);
|
|
||||||
if (this.status) this.status = { ...this.status, queue: optimisticRemove(this.status.queue, chapterId) };
|
|
||||||
this.selected.delete(chapterId);
|
|
||||||
this.selected = new Set(this.selected);
|
|
||||||
try { await gql(DEQUEUE_DOWNLOAD, { chapterId }); this.poll(); }
|
|
||||||
catch (e) { console.error(e); this.poll(); }
|
|
||||||
finally { this.dequeueing.delete(chapterId); this.dequeueing = new Set(this.dequeueing); }
|
|
||||||
}
|
|
||||||
|
|
||||||
async dequeueSelected() {
|
|
||||||
if (this.batchWorking || this.selected.size === 0) return;
|
|
||||||
this.batchWorking = true;
|
|
||||||
const ids = [...this.selected];
|
|
||||||
if (this.status) this.status = { ...this.status, queue: optimisticRemoveMany(this.status.queue, this.selected) };
|
|
||||||
this.selected = new Set();
|
|
||||||
try {
|
|
||||||
await gql(DEQUEUE_CHAPTERS_DOWNLOAD, { chapterIds: ids });
|
|
||||||
this.poll();
|
|
||||||
addToast({ kind: "info", title: `Removed ${ids.length} download${ids.length !== 1 ? "s" : ""}`, body: "Selected items have been removed from the queue", duration: 2500 });
|
|
||||||
} catch (e) { console.error(e); this.poll(); }
|
|
||||||
finally { this.batchWorking = false; }
|
|
||||||
}
|
|
||||||
|
|
||||||
async enqueue(chapterId: number): Promise<boolean> {
|
|
||||||
const projected = [...this.queue, { chapter: { id: chapterId, pageCount: 0 }, progress: 0, state: "QUEUED" } as any];
|
|
||||||
if (!(await this.guardStorage(projected))) return false;
|
|
||||||
try { await gql(ENQUEUE_DOWNLOAD, { chapterId }); this.poll(); }
|
|
||||||
catch (e) { console.error(e); }
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
async retryOne(chapterId: number) {
|
|
||||||
if (this.dequeueing.has(chapterId)) return;
|
|
||||||
this.dequeueing = new Set(this.dequeueing).add(chapterId);
|
|
||||||
try {
|
|
||||||
await gql(DEQUEUE_DOWNLOAD, { chapterId });
|
|
||||||
const projected = this.queue.filter(i => i.chapter.id !== chapterId);
|
|
||||||
if (!(await this.guardStorage(projected))) { this.poll(); return; }
|
|
||||||
await gql(ENQUEUE_DOWNLOAD, { chapterId });
|
|
||||||
this.poll();
|
|
||||||
} catch (e) { console.error(e); this.poll(); }
|
|
||||||
finally { this.dequeueing.delete(chapterId); this.dequeueing = new Set(this.dequeueing); }
|
|
||||||
}
|
|
||||||
|
|
||||||
async retryAllErrored() {
|
|
||||||
if (this.batchWorking || !this.hasErrored) return;
|
|
||||||
this.batchWorking = true;
|
|
||||||
const ids = [...this.erroredIds];
|
|
||||||
try {
|
|
||||||
await gql(DEQUEUE_CHAPTERS_DOWNLOAD, { chapterIds: ids });
|
|
||||||
const projected = this.queue.filter(i => !this.erroredIds.has(i.chapter.id));
|
|
||||||
if (!(await this.guardStorage(projected))) { this.poll(); return; }
|
|
||||||
for (const id of ids) await gql(ENQUEUE_DOWNLOAD, { chapterId: id });
|
|
||||||
this.poll();
|
|
||||||
addToast({ kind: "info", title: `Retrying ${ids.length} failed download${ids.length !== 1 ? "s" : ""}`, duration: 3000 });
|
|
||||||
} catch (e) { console.error(e); this.poll(); }
|
|
||||||
finally { this.batchWorking = false; }
|
|
||||||
}
|
|
||||||
|
|
||||||
async retrySelected() {
|
|
||||||
if (this.batchWorking || this.selected.size === 0) return;
|
|
||||||
this.batchWorking = true;
|
|
||||||
const ids = [...this.selected].filter((id) => this.erroredIds.has(id));
|
|
||||||
this.selected = new Set();
|
|
||||||
try {
|
|
||||||
if (ids.length > 0) {
|
|
||||||
await gql(DEQUEUE_CHAPTERS_DOWNLOAD, { chapterIds: ids });
|
|
||||||
const projected = this.queue.filter(i => !new Set(ids).has(i.chapter.id));
|
|
||||||
if (!(await this.guardStorage(projected))) { this.poll(); return; }
|
|
||||||
for (const id of ids) await gql(ENQUEUE_DOWNLOAD, { chapterId: id });
|
|
||||||
addToast({ kind: "info", title: `Retrying ${ids.length} failed download${ids.length !== 1 ? "s" : ""}`, duration: 3000 });
|
|
||||||
}
|
|
||||||
this.poll();
|
|
||||||
} catch (e) { console.error(e); this.poll(); }
|
|
||||||
finally { this.batchWorking = false; }
|
|
||||||
}
|
|
||||||
|
|
||||||
async reorder(chapterId: number, direction: "up" | "down") {
|
|
||||||
const idx = this.queue.findIndex((i) => i.chapter.id === chapterId);
|
|
||||||
if (idx === -1) return;
|
|
||||||
const to = direction === "up" ? idx - 1 : idx + 1;
|
|
||||||
if (to < 0 || to >= this.queue.length) return;
|
|
||||||
const newQueue = [...this.queue];
|
|
||||||
[newQueue[idx], newQueue[to]] = [newQueue[to], newQueue[idx]];
|
|
||||||
if (this.status) this.status = { ...this.status, queue: newQueue };
|
|
||||||
try {
|
|
||||||
const d = await gql<{ reorderChapterDownload: { downloadStatus: DownloadStatus } }>(
|
|
||||||
REORDER_DOWNLOAD, { chapterId, to },
|
|
||||||
);
|
|
||||||
this.applyStatus(d.reorderChapterDownload.downloadStatus);
|
|
||||||
} catch (e) { console.error(e); this.poll(); }
|
|
||||||
}
|
|
||||||
|
|
||||||
async reorderSelected(direction: "up" | "down") {
|
|
||||||
if (this.batchWorking || this.selected.size === 0) return;
|
|
||||||
this.batchWorking = true;
|
|
||||||
|
|
||||||
const queue = [...this.queue];
|
|
||||||
const selectedIndices = queue
|
|
||||||
.map((item, i) => ({ id: item.chapter.id, i }))
|
|
||||||
.filter(({ id }) => this.selected.has(id))
|
|
||||||
.map(({ i }) => i)
|
|
||||||
.sort((a, b) => direction === "up" ? a - b : b - a);
|
|
||||||
|
|
||||||
if (direction === "up" && selectedIndices[0] === 0) { this.batchWorking = false; return; }
|
|
||||||
if (direction === "down" && selectedIndices[0] === queue.length - 1) { this.batchWorking = false; return; }
|
|
||||||
|
|
||||||
const newQueue = [...queue];
|
|
||||||
for (const idx of selectedIndices) {
|
|
||||||
const to = direction === "up" ? idx - 1 : idx + 1;
|
|
||||||
if (to < 0 || to >= newQueue.length) break;
|
|
||||||
[newQueue[idx], newQueue[to]] = [newQueue[to], newQueue[idx]];
|
|
||||||
}
|
|
||||||
if (this.status) this.status = { ...this.status, queue: newQueue };
|
|
||||||
|
|
||||||
try {
|
|
||||||
for (const idx of selectedIndices) {
|
|
||||||
const to = direction === "up" ? idx - 1 : idx + 1;
|
|
||||||
if (to < 0 || to >= queue.length) break;
|
|
||||||
const chapterId = queue[idx].chapter.id;
|
|
||||||
await gql<{ reorderChapterDownload: { downloadStatus: DownloadStatus } }>(
|
|
||||||
REORDER_DOWNLOAD, { chapterId, to },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
this.poll();
|
|
||||||
} catch (e) { console.error(e); this.poll(); }
|
|
||||||
finally { this.batchWorking = false; }
|
|
||||||
}
|
|
||||||
|
|
||||||
async reorderToEdge(chapterId: number, edge: "top" | "bottom") {
|
|
||||||
const idx = this.queue.findIndex((i) => i.chapter.id === chapterId);
|
|
||||||
if (idx === -1) return;
|
|
||||||
const first = this.isRunning ? 1 : 0;
|
|
||||||
const last = this.queue.length - 1;
|
|
||||||
const to = edge === "top" ? first : last;
|
|
||||||
if (idx === to) return;
|
|
||||||
const newQueue = [...this.queue];
|
|
||||||
newQueue.splice(idx, 1);
|
|
||||||
newQueue.splice(to, 0, this.queue[idx]);
|
|
||||||
if (this.status) this.status = { ...this.status, queue: newQueue };
|
|
||||||
try {
|
|
||||||
const d = await gql<{ reorderChapterDownload: { downloadStatus: DownloadStatus } }>(
|
|
||||||
REORDER_DOWNLOAD, { chapterId, to },
|
|
||||||
);
|
|
||||||
this.applyStatus(d.reorderChapterDownload.downloadStatus);
|
|
||||||
} catch (e) { console.error(e); this.poll(); }
|
|
||||||
}
|
|
||||||
|
|
||||||
async reorderSelectedToEdge(edge: "top" | "bottom") {
|
|
||||||
if (this.batchWorking || this.selected.size === 0) return;
|
|
||||||
this.batchWorking = true;
|
|
||||||
|
|
||||||
const first = this.isRunning ? 1 : 0;
|
|
||||||
const active = this.queue.slice(0, first);
|
|
||||||
const moveable = this.queue.slice(first);
|
|
||||||
const pinned = moveable.filter((i) => this.selected.has(i.chapter.id));
|
|
||||||
const rest = moveable.filter((i) => !this.selected.has(i.chapter.id));
|
|
||||||
const newQueue = edge === "top"
|
|
||||||
? [...active, ...pinned, ...rest]
|
|
||||||
: [...active, ...rest, ...pinned];
|
|
||||||
if (this.status) this.status = { ...this.status, queue: newQueue };
|
|
||||||
|
|
||||||
const last = this.queue.length - 1;
|
|
||||||
|
|
||||||
try {
|
|
||||||
if (edge === "top") {
|
|
||||||
for (let i = 0; i < pinned.length; i++) {
|
|
||||||
await gql<{ reorderChapterDownload: { downloadStatus: DownloadStatus } }>(
|
|
||||||
REORDER_DOWNLOAD, { chapterId: pinned[i].chapter.id, to: first + i },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
for (let i = 0; i < pinned.length; i++) {
|
|
||||||
await gql<{ reorderChapterDownload: { downloadStatus: DownloadStatus } }>(
|
|
||||||
REORDER_DOWNLOAD, { chapterId: pinned[i].chapter.id, to: last - (pinned.length - 1 - i) },
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.poll();
|
|
||||||
} catch (e) { console.error(e); this.poll(); }
|
|
||||||
finally { this.batchWorking = false; }
|
|
||||||
}
|
|
||||||
|
|
||||||
selectOnly(chapterId: number) { this.selected = new Set([chapterId]); }
|
|
||||||
toggleSelect(chapterId: number) {
|
|
||||||
const next = new Set(this.selected);
|
|
||||||
if (next.has(chapterId)) next.delete(chapterId);
|
|
||||||
else next.add(chapterId);
|
|
||||||
this.selected = next;
|
|
||||||
}
|
|
||||||
|
|
||||||
selectRange(fromId: number, toId: number) {
|
|
||||||
const ids = this.queue.map((i) => i.chapter.id);
|
|
||||||
const a = ids.indexOf(fromId), b = ids.indexOf(toId);
|
|
||||||
if (a === -1 || b === -1) return;
|
|
||||||
const [lo, hi] = a < b ? [a, b] : [b, a];
|
|
||||||
const next = new Set(this.selected);
|
|
||||||
for (let i = lo; i <= hi; i++) next.add(ids[i]);
|
|
||||||
this.selected = next;
|
|
||||||
}
|
|
||||||
|
|
||||||
selectAll() { this.selected = new Set(this.queue.map((i) => i.chapter.id)); }
|
|
||||||
clearSelection() { this.selected = new Set(); }
|
|
||||||
}
|
|
||||||
|
|
||||||
export const downloadStore = new DownloadStore();
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
export { default as Extensions } from "./components/Extensions.svelte";
|
|
||||||
export * from "./lib/extensionHelpers";
|
|
||||||
@@ -1,285 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
let {
|
|
||||||
dailyReadCounts,
|
|
||||||
}: {
|
|
||||||
dailyReadCounts: Record<string, number>;
|
|
||||||
} = $props();
|
|
||||||
|
|
||||||
function intensity(count: number): 0 | 1 | 2 | 3 | 4 {
|
|
||||||
if (count === 0) return 0;
|
|
||||||
if (count === 1) return 1;
|
|
||||||
if (count <= 3) return 2;
|
|
||||||
if (count <= 6) return 3;
|
|
||||||
return 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
let tip: { text: string; x: number; y: number } | null = $state(null);
|
|
||||||
|
|
||||||
function showTip(e: MouseEvent, cell: { dateStr: string; count: number }) {
|
|
||||||
const rect = (e.currentTarget as HTMLElement).getBoundingClientRect();
|
|
||||||
const label = cell.count === 0
|
|
||||||
? `No chapters — ${fmtDate(cell.dateStr)}`
|
|
||||||
: `${cell.count} chapter${cell.count !== 1 ? "s" : ""} — ${fmtDate(cell.dateStr)}`;
|
|
||||||
tip = { text: label, x: rect.left + rect.width / 2, y: rect.top - 6 };
|
|
||||||
}
|
|
||||||
|
|
||||||
function hideTip() { tip = null; }
|
|
||||||
|
|
||||||
function fmtDate(d: string): string {
|
|
||||||
return new Date(d + "T00:00:00").toLocaleDateString("en-US", { month: "short", day: "numeric" });
|
|
||||||
}
|
|
||||||
|
|
||||||
function localDateStr(d: Date): string {
|
|
||||||
return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
let wrapEl: HTMLElement;
|
|
||||||
let cellSize = $state(12);
|
|
||||||
let numWeeks = $state(26);
|
|
||||||
|
|
||||||
const GAP = 3;
|
|
||||||
const DAY_GUTTER = 28;
|
|
||||||
const LEGEND_H = 20;
|
|
||||||
const MONTH_H = 14;
|
|
||||||
const ROWS = 7;
|
|
||||||
|
|
||||||
$effect(() => {
|
|
||||||
if (!wrapEl) return;
|
|
||||||
const obs = new ResizeObserver(() => {
|
|
||||||
const h = wrapEl.clientHeight;
|
|
||||||
const w = wrapEl.clientWidth;
|
|
||||||
const cs = Math.max(8, Math.floor((h - LEGEND_H - MONTH_H - 2 * GAP - (ROWS - 1) * GAP) / ROWS));
|
|
||||||
cellSize = cs;
|
|
||||||
numWeeks = Math.max(4, Math.floor((w - DAY_GUTTER - GAP * 3) / (cs + GAP)));
|
|
||||||
});
|
|
||||||
obs.observe(wrapEl);
|
|
||||||
return () => obs.disconnect();
|
|
||||||
});
|
|
||||||
|
|
||||||
const visibleWeeks = $derived((() => {
|
|
||||||
const today = new Date();
|
|
||||||
today.setHours(0, 0, 0, 0);
|
|
||||||
const todayStr = localDateStr(today);
|
|
||||||
const endDow = today.getDay(); // 0=Sun ... 6=Sat
|
|
||||||
const weekEnd = new Date(today);
|
|
||||||
weekEnd.setDate(weekEnd.getDate() + (6 - endDow)); // advance to Saturday
|
|
||||||
|
|
||||||
const weeks: { dateStr: string; count: number; isToday: boolean; isFuture: boolean }[][] = [];
|
|
||||||
for (let wi = numWeeks - 1; wi >= 0; wi--) {
|
|
||||||
const week: typeof weeks[0] = [];
|
|
||||||
for (let di = 0; di < 7; di++) {
|
|
||||||
const d = new Date(weekEnd);
|
|
||||||
d.setDate(d.getDate() - wi * 7 - (6 - di));
|
|
||||||
const dateStr = localDateStr(d);
|
|
||||||
week.push({ dateStr, count: dailyReadCounts[dateStr] ?? 0, isToday: dateStr === todayStr, isFuture: d > today });
|
|
||||||
}
|
|
||||||
weeks.push(week);
|
|
||||||
}
|
|
||||||
return weeks;
|
|
||||||
})());
|
|
||||||
|
|
||||||
const monthLabels = $derived((() => {
|
|
||||||
const labels: { label: string; colIndex: number }[] = [];
|
|
||||||
let lastMonth = -1;
|
|
||||||
visibleWeeks.forEach((week, ci) => {
|
|
||||||
const first = week[0];
|
|
||||||
if (!first) return;
|
|
||||||
const m = new Date(first.dateStr + "T00:00:00").getMonth();
|
|
||||||
if (m !== lastMonth) {
|
|
||||||
labels.push({ label: new Date(first.dateStr + "T00:00:00").toLocaleDateString("en-US", { month: "short" }), colIndex: ci });
|
|
||||||
lastMonth = m;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return labels;
|
|
||||||
})());
|
|
||||||
|
|
||||||
const DAY_LABELS = ["Sun", "", "Tue", "", "Thu", "", "Sat"];
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div class="heatmap-wrap" bind:this={wrapEl} style="--cell:{cellSize}px; --cols:{numWeeks};">
|
|
||||||
|
|
||||||
<div class="month-row">
|
|
||||||
<div class="day-gutter"></div>
|
|
||||||
<div class="month-cells">
|
|
||||||
{#each visibleWeeks as _week, ci}
|
|
||||||
{@const lbl = monthLabels.find(l => l.colIndex === ci)}
|
|
||||||
<div class="month-label">{lbl?.label ?? ""}</div>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="grid-row">
|
|
||||||
<div class="day-labels">
|
|
||||||
{#each DAY_LABELS as d}
|
|
||||||
<span class="day-label">{d}</span>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
<div class="cell-grid">
|
|
||||||
{#each visibleWeeks as week}
|
|
||||||
<div class="week-col">
|
|
||||||
{#each week as cell}
|
|
||||||
<!-- svelte-ignore a11y_mouse_events_have_key_events -->
|
|
||||||
<button
|
|
||||||
class="cell intensity-{intensity(cell.count)}"
|
|
||||||
class:cell-today={cell.isToday}
|
|
||||||
class:cell-future={cell.isFuture}
|
|
||||||
onmouseover={(e) => showTip(e, cell)}
|
|
||||||
onmouseleave={hideTip}
|
|
||||||
aria-label="{cell.count} chapters on {cell.dateStr}"
|
|
||||||
></button>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="legend">
|
|
||||||
<span class="legend-label">Less</span>
|
|
||||||
{#each [0, 1, 2, 3, 4] as lvl}
|
|
||||||
<div class="legend-cell intensity-{lvl}"></div>
|
|
||||||
{/each}
|
|
||||||
<span class="legend-label">More</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{#if tip}
|
|
||||||
<div class="heatmap-tip" style="left:{tip.x}px; top:{tip.y}px;">{tip.text}</div>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
<style>
|
|
||||||
.heatmap-wrap {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
justify-content: center;
|
|
||||||
gap: 4px;
|
|
||||||
width: 100%;
|
|
||||||
height: 100%;
|
|
||||||
min-width: 0;
|
|
||||||
min-height: 0;
|
|
||||||
overflow: hidden;
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
|
||||||
|
|
||||||
.month-row {
|
|
||||||
display: flex;
|
|
||||||
gap: 4px;
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
.day-gutter { width: 28px; flex-shrink: 0; }
|
|
||||||
.month-cells {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(var(--cols), var(--cell));
|
|
||||||
gap: 3px;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
.month-label {
|
|
||||||
font-family: var(--font-ui);
|
|
||||||
font-size: 9px;
|
|
||||||
color: var(--text-faint);
|
|
||||||
letter-spacing: var(--tracking-wide);
|
|
||||||
padding-left: 1px;
|
|
||||||
white-space: nowrap;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
|
|
||||||
.grid-row {
|
|
||||||
display: flex;
|
|
||||||
gap: 4px;
|
|
||||||
align-items: flex-start;
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
.day-labels {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 3px;
|
|
||||||
flex-shrink: 0;
|
|
||||||
width: 28px;
|
|
||||||
}
|
|
||||||
.day-label {
|
|
||||||
font-family: var(--font-ui);
|
|
||||||
font-size: 8px;
|
|
||||||
color: var(--text-faint);
|
|
||||||
letter-spacing: var(--tracking-wide);
|
|
||||||
height: var(--cell);
|
|
||||||
line-height: var(--cell);
|
|
||||||
text-align: right;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cell-grid {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: repeat(var(--cols), var(--cell));
|
|
||||||
gap: 3px;
|
|
||||||
overflow: visible;
|
|
||||||
padding: 4px;
|
|
||||||
margin: -4px;
|
|
||||||
}
|
|
||||||
.week-col {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
gap: 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.cell {
|
|
||||||
width: var(--cell);
|
|
||||||
height: var(--cell);
|
|
||||||
border-radius: 3px;
|
|
||||||
border: none;
|
|
||||||
padding: 0;
|
|
||||||
cursor: pointer;
|
|
||||||
transition: filter var(--t-fast), transform var(--t-fast);
|
|
||||||
}
|
|
||||||
.cell:hover:not(.cell-future) {
|
|
||||||
filter: brightness(1.5);
|
|
||||||
transform: scale(1.2);
|
|
||||||
z-index: 1;
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
.intensity-0 { background: var(--bg-subtle); border: 1px solid var(--border-dim); }
|
|
||||||
.intensity-1 { background: var(--accent-muted); border: 1px solid var(--accent-dim); }
|
|
||||||
.intensity-2 { background: var(--accent-dim); border: 1px solid var(--accent); opacity: 0.7; }
|
|
||||||
.intensity-3 { background: var(--accent); border: 1px solid var(--accent-bright); opacity: 0.85; }
|
|
||||||
.intensity-4 { background: var(--accent-bright); border: 1px solid var(--accent-fg); }
|
|
||||||
|
|
||||||
.cell-today { outline: 1.5px solid var(--accent-fg); outline-offset: 1px; }
|
|
||||||
.cell-future { opacity: 0.2; cursor: default; pointer-events: none; }
|
|
||||||
|
|
||||||
.legend {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 3px;
|
|
||||||
justify-content: flex-end;
|
|
||||||
flex-shrink: 0;
|
|
||||||
padding-top: 2px;
|
|
||||||
}
|
|
||||||
.legend-cell {
|
|
||||||
width: 10px;
|
|
||||||
height: 10px;
|
|
||||||
border-radius: 3px;
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
.legend-label {
|
|
||||||
font-family: var(--font-ui);
|
|
||||||
font-size: 9px;
|
|
||||||
color: var(--text-faint);
|
|
||||||
letter-spacing: var(--tracking-wide);
|
|
||||||
}
|
|
||||||
|
|
||||||
.heatmap-tip {
|
|
||||||
position: fixed;
|
|
||||||
transform: translate(-50%, -100%);
|
|
||||||
background: var(--bg-overlay);
|
|
||||||
border: 1px solid var(--border-base);
|
|
||||||
border-radius: var(--radius-sm);
|
|
||||||
padding: 4px 8px;
|
|
||||||
font-family: var(--font-ui);
|
|
||||||
font-size: var(--text-2xs);
|
|
||||||
color: var(--text-secondary);
|
|
||||||
letter-spacing: var(--tracking-wide);
|
|
||||||
white-space: nowrap;
|
|
||||||
pointer-events: none;
|
|
||||||
z-index: 9999;
|
|
||||||
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.5);
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user