Compare commits
88 Commits
2844e1fc32
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 9fd3ae6563 | |||
| cde3361458 | |||
| f055011b86 | |||
| 16429a44b4 | |||
| fe0b7e88e6 | |||
| 28dd9da6ac | |||
| 02c16a2972 | |||
| 324427513c | |||
| c12b9b360a | |||
| cc06142050 | |||
| 6726cafff4 | |||
| 35312ea1ff | |||
| 721eee9c88 | |||
| 421f9d0293 | |||
| 7eb4e41708 | |||
| a2254bbe80 | |||
| 1b5bdadf10 | |||
| 882b29d7a1 | |||
| c60f6f511e | |||
| 07955286f1 | |||
| 258eeddc74 | |||
| b09e9e6aaa | |||
| 0df371adb7 | |||
| 8144986a48 | |||
| d2aab7369d | |||
| 946d4e8c2c | |||
| 0b5f25a263 | |||
| c669d66969 | |||
| 082e08e7f4 | |||
| a3fd03d32a | |||
| 5645645c5f | |||
| ac7d1efb8d | |||
| a676061b3e | |||
| 1c34cebbde | |||
| 22a2ce0559 | |||
| 313b1bf1ba | |||
| 66413f92e3 | |||
| 0fcbc6bbe9 | |||
| f1d8318500 | |||
| b2f327d48f | |||
| b772937354 | |||
| a3b9543d0e | |||
| d0a423df9f | |||
| 8600bf216a | |||
| bf270e4e87 | |||
| 760cb2344e | |||
| ed2c1038e6 | |||
| d4bdc677a9 | |||
| 9d58d961bd | |||
| 791b75b3af | |||
| a7f52fe0eb | |||
| 439353d318 | |||
| f245a68790 | |||
| 3fe0538468 | |||
| dbded94324 | |||
| 4301f1dbab | |||
| 9fdb778330 | |||
| 0300d7baf6 | |||
| ee1b1ae5e6 | |||
| b20f7cd1ad | |||
| eb8f0be004 | |||
| 68aa13e216 | |||
| 2a5c2b18e7 | |||
| e64086b7cf | |||
| 08946059ad | |||
| 10b17dc66b | |||
| 1ff8a311ae | |||
| 2686fa1d76 | |||
| 376d2b28d3 | |||
| a3609696c7 | |||
| b0c12acbc6 | |||
| 3dfcf2a536 | |||
| ecb56013a5 | |||
| 27b52f7fd1 | |||
| 234441e6a3 | |||
| 011f62829a | |||
| c34584a215 | |||
| 1fca69fa66 | |||
| a0fc4c04d9 | |||
| 07ac7e3376 | |||
| f94e175082 | |||
| e66573b315 | |||
| 27cdcdef58 | |||
| 383e6340ea | |||
| 5a4a4d7e3a | |||
| 6e4c136614 | |||
| e2fdeaabb2 | |||
| 408d211f27 |
@@ -1,34 +1,5 @@
|
|||||||
[alias]
|
[alias]
|
||||||
recorder = "run -p recorder --bin recorder_cli -- --environment development"
|
|
||||||
recorder-playground = "run -p recorder --example playground -- --environment development"
|
recorder-playground = "run -p recorder --example playground -- --environment development"
|
||||||
|
|
||||||
[build]
|
[build]
|
||||||
rustflags = ["-Zthreads=8"]
|
rustflags = ["-Zthreads=8", "-Zshare-generics=y"]
|
||||||
|
|
||||||
[target.x86_64-unknown-linux-gnu]
|
|
||||||
linker = "clang"
|
|
||||||
rustflags = ["-Zthreads=8", "-Clink-arg=-fuse-ld=lld", "-Zshare-generics=y"]
|
|
||||||
|
|
||||||
[target.x86_64-pc-windows-msvc]
|
|
||||||
linker = "rust-lld.exe"
|
|
||||||
rustflags = ["-Zthreads=8", "-Zshare-generics=n"]
|
|
||||||
|
|
||||||
# NOTE: you must install [Mach-O LLD Port](https://lld.llvm.org/MachO/index.html) on mac. you can easily do this by installing llvm which includes lld with the "brew" package manager:
|
|
||||||
# `brew install llvm`
|
|
||||||
#[target.x86_64-apple-darwin]
|
|
||||||
#rustflags = [
|
|
||||||
# "-Zthreads=8",
|
|
||||||
# "-C",
|
|
||||||
# "link-arg=-fuse-ld=/usr/local/opt/llvm/bin/ld64.lld",
|
|
||||||
# "-Zshare-generics=y",
|
|
||||||
#]
|
|
||||||
|
|
||||||
# NOTE: you must install [Mach-O LLD Port](https://lld.llvm.org/MachO/index.html) on mac. you can easily do this by installing llvm which includes lld with the "brew" package manager:
|
|
||||||
# `brew install llvm`
|
|
||||||
#[target.aarch64-apple-darwin]
|
|
||||||
#rustflags = [
|
|
||||||
# "-Zthreads=8",
|
|
||||||
# "-C",
|
|
||||||
# "link-arg=-fuse-ld=/opt/homebrew/opt/llvm/bin/ld64.lld",
|
|
||||||
# "-Zshare-generics=y",
|
|
||||||
#]
|
|
||||||
|
|||||||
@@ -1,107 +0,0 @@
|
|||||||
name: CI
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- master
|
|
||||||
- main
|
|
||||||
pull_request:
|
|
||||||
|
|
||||||
env:
|
|
||||||
RUST_TOOLCHAIN: stable
|
|
||||||
TOOLCHAIN_PROFILE: minimal
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
rustfmt:
|
|
||||||
name: Check Style
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout the code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- uses: actions-rs/toolchain@v1
|
|
||||||
with:
|
|
||||||
profile: ${{ env.TOOLCHAIN_PROFILE }}
|
|
||||||
toolchain: ${{ env.RUST_TOOLCHAIN }}
|
|
||||||
override: true
|
|
||||||
components: rustfmt
|
|
||||||
- name: Run cargo fmt
|
|
||||||
uses: actions-rs/cargo@v1
|
|
||||||
with:
|
|
||||||
command: fmt
|
|
||||||
args: --all -- --check
|
|
||||||
|
|
||||||
clippy:
|
|
||||||
name: Run Clippy
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout the code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- uses: actions-rs/toolchain@v1
|
|
||||||
with:
|
|
||||||
profile: ${{ env.TOOLCHAIN_PROFILE }}
|
|
||||||
toolchain: ${{ env.RUST_TOOLCHAIN }}
|
|
||||||
override: true
|
|
||||||
- name: Setup Rust cache
|
|
||||||
uses: Swatinem/rust-cache@v2
|
|
||||||
- name: Run cargo clippy
|
|
||||||
uses: actions-rs/cargo@v1
|
|
||||||
with:
|
|
||||||
command: clippy
|
|
||||||
args: --all-features -- -D warnings -W clippy::pedantic -W clippy::nursery -W rust-2018-idioms
|
|
||||||
|
|
||||||
test:
|
|
||||||
name: Run Tests
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
|
|
||||||
services:
|
|
||||||
redis:
|
|
||||||
image: redis
|
|
||||||
options: >-
|
|
||||||
--health-cmd "redis-cli ping"
|
|
||||||
--health-interval 10s
|
|
||||||
--health-timeout 5s
|
|
||||||
--health-retries 5
|
|
||||||
ports:
|
|
||||||
- "6379:6379"
|
|
||||||
postgres:
|
|
||||||
image: postgres
|
|
||||||
env:
|
|
||||||
POSTGRES_DB: postgress_test
|
|
||||||
POSTGRES_USER: postgress
|
|
||||||
POSTGRES_PASSWORD: postgress
|
|
||||||
ports:
|
|
||||||
- "5432:5432"
|
|
||||||
# Set health checks to wait until postgres has started
|
|
||||||
options: --health-cmd pg_isready
|
|
||||||
--health-interval 10s
|
|
||||||
--health-timeout 5s
|
|
||||||
--health-retries 5
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Checkout the code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- uses: actions-rs/toolchain@v1
|
|
||||||
with:
|
|
||||||
profile: ${{ env.TOOLCHAIN_PROFILE }}
|
|
||||||
toolchain: ${{ env.RUST_TOOLCHAIN }}
|
|
||||||
override: true
|
|
||||||
- name: Setup Rust cache
|
|
||||||
uses: Swatinem/rust-cache@v2
|
|
||||||
- name: Run cargo test
|
|
||||||
uses: actions-rs/cargo@v1
|
|
||||||
with:
|
|
||||||
command: test
|
|
||||||
args: --all-features --all
|
|
||||||
env:
|
|
||||||
REDIS_URL: redis://localhost:${{job.services.redis.ports[6379]}}
|
|
||||||
DATABASE_URL: postgres://postgress:postgress@localhost:5432/postgress_test
|
|
||||||
36
.github/workflows/testing-torrents-container.yaml
vendored
Normal file
36
.github/workflows/testing-torrents-container.yaml
vendored
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
name: Testing Torrents Container
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
env:
|
||||||
|
REGISTRY: ghcr.io
|
||||||
|
ORG: dumtruck
|
||||||
|
PROJECT: konobangu
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-container:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
packages: write
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v3
|
||||||
|
- name: Log in to GHCR
|
||||||
|
uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: ${{ env.REGISTRY }}
|
||||||
|
username: ${{ github.actor }}
|
||||||
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
- name: Build and push Docker image
|
||||||
|
uses: docker/build-push-action@v5
|
||||||
|
with:
|
||||||
|
context: 'packages/testing-torrents'
|
||||||
|
file: 'packages/testing-torrents/Dockerfile'
|
||||||
|
push: true
|
||||||
|
tags: '${{ env.REGISTRY }}/${{ env.ORG }}/${{ env.PROJECT }}-testing-torrents:latest'
|
||||||
|
cache-from: type=gha
|
||||||
|
cache-to: type=gha,mode=max
|
||||||
6
.gitignore
vendored
6
.gitignore
vendored
@@ -158,11 +158,8 @@ web_modules/
|
|||||||
.yarn-integrity
|
.yarn-integrity
|
||||||
|
|
||||||
# Local env files
|
# Local env files
|
||||||
.env
|
|
||||||
.env.local
|
.env.local
|
||||||
.env.development.local
|
.env.*.local
|
||||||
.env.test.local
|
|
||||||
.env.production.local
|
|
||||||
|
|
||||||
# parcel-bundler cache (https://parceljs.org/)
|
# parcel-bundler cache (https://parceljs.org/)
|
||||||
.cache
|
.cache
|
||||||
@@ -219,6 +216,7 @@ index.d.ts.map
|
|||||||
# Added by cargo
|
# Added by cargo
|
||||||
|
|
||||||
/target
|
/target
|
||||||
|
/ide-target
|
||||||
!/examples/.gitkeep
|
!/examples/.gitkeep
|
||||||
/.env
|
/.env
|
||||||
/.env.bk
|
/.env.bk
|
||||||
|
|||||||
3
.vscode/extensions.json
vendored
3
.vscode/extensions.json
vendored
@@ -5,6 +5,7 @@
|
|||||||
"unifiedjs.vscode-mdx",
|
"unifiedjs.vscode-mdx",
|
||||||
"mikestead.dotenv",
|
"mikestead.dotenv",
|
||||||
"christian-kohler.npm-intellisense",
|
"christian-kohler.npm-intellisense",
|
||||||
"skellock.just"
|
"skellock.just",
|
||||||
|
"zerotaskx.rust-extension-pack"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
25
.vscode/settings.json
vendored
25
.vscode/settings.json
vendored
@@ -1,6 +1,5 @@
|
|||||||
{
|
{
|
||||||
"npm.packageManager": "pnpm",
|
"npm.packageManager": "pnpm",
|
||||||
"rust-analyzer.showUnlinkedFileNotification": false,
|
|
||||||
"[javascript]": {
|
"[javascript]": {
|
||||||
"editor.defaultFormatter": "vscode.typescript-language-features",
|
"editor.defaultFormatter": "vscode.typescript-language-features",
|
||||||
"editor.formatOnSave": true
|
"editor.formatOnSave": true
|
||||||
@@ -27,7 +26,27 @@
|
|||||||
},
|
},
|
||||||
"emmet.showExpandedAbbreviation": "never",
|
"emmet.showExpandedAbbreviation": "never",
|
||||||
"prettier.enable": false,
|
"prettier.enable": false,
|
||||||
"tailwindCSS.experimental.configFile": "./packages/tailwind-config/config.ts",
|
|
||||||
"typescript.tsdk": "node_modules/typescript/lib",
|
"typescript.tsdk": "node_modules/typescript/lib",
|
||||||
"rust-analyzer.cargo.features": ["testcontainers"]
|
"rust-analyzer.showUnlinkedFileNotification": false,
|
||||||
|
"sqltools.connections": [
|
||||||
|
{
|
||||||
|
"previewLimit": 50,
|
||||||
|
"server": "localhost",
|
||||||
|
"port": 5432,
|
||||||
|
"driver": "PostgreSQL",
|
||||||
|
"name": "konobangu-dev",
|
||||||
|
"database": "konobangu",
|
||||||
|
"username": "konobangu"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"rust-analyzer.cargo.features": "all",
|
||||||
|
"rust-analyzer.testExplorer": true
|
||||||
|
// https://github.com/rust-lang/rust/issues/141540
|
||||||
|
// "rust-analyzer.cargo.targetDir": "target/rust-analyzer",
|
||||||
|
// "rust-analyzer.check.extraEnv": {
|
||||||
|
// "CARGO_TARGET_DIR": "target/rust-analyzer"
|
||||||
|
// },
|
||||||
|
// "rust-analyzer.cargo.extraEnv": {
|
||||||
|
// "CARGO_TARGET_DIR": "target/analyzer"
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
112
.vscode/tasks.json
vendored
Normal file
112
.vscode/tasks.json
vendored
Normal file
@@ -0,0 +1,112 @@
|
|||||||
|
{
|
||||||
|
"version": "2.0.0",
|
||||||
|
"tasks": [
|
||||||
|
{
|
||||||
|
"label": "dev-all",
|
||||||
|
"dependsOn": [
|
||||||
|
"dev-webui",
|
||||||
|
"dev-recorder",
|
||||||
|
"dev-proxy",
|
||||||
|
"dev-codegen-wait",
|
||||||
|
"dev-deps",
|
||||||
|
],
|
||||||
|
"dependsOrder": "parallel",
|
||||||
|
"group": {
|
||||||
|
"kind": "build",
|
||||||
|
"isDefault": false,
|
||||||
|
},
|
||||||
|
"presentation": {
|
||||||
|
"group": "new-group",
|
||||||
|
"echo": true,
|
||||||
|
"reveal": "always",
|
||||||
|
"panel": "shared",
|
||||||
|
"clear": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "dev-webui",
|
||||||
|
"type": "shell",
|
||||||
|
"command": "just",
|
||||||
|
"args": [
|
||||||
|
"dev-webui"
|
||||||
|
],
|
||||||
|
"isBackground": true,
|
||||||
|
"problemMatcher": [],
|
||||||
|
"presentation": {
|
||||||
|
"panel": "dedicated",
|
||||||
|
"reveal": "always",
|
||||||
|
"focus": true,
|
||||||
|
"showReuseMessage": true,
|
||||||
|
"clear": true,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "dev-deps",
|
||||||
|
"type": "shell",
|
||||||
|
"command": "just",
|
||||||
|
"args": [
|
||||||
|
"dev-deps"
|
||||||
|
],
|
||||||
|
"isBackground": true,
|
||||||
|
"problemMatcher": [],
|
||||||
|
"presentation": {
|
||||||
|
"panel": "dedicated",
|
||||||
|
"reveal": "never",
|
||||||
|
"focus": false,
|
||||||
|
"showReuseMessage": true,
|
||||||
|
"clear": true,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "dev-codegen-wait",
|
||||||
|
"type": "shell",
|
||||||
|
"command": "just",
|
||||||
|
"args": [
|
||||||
|
"dev-codegen-wait"
|
||||||
|
],
|
||||||
|
"isBackground": true,
|
||||||
|
"problemMatcher": [],
|
||||||
|
"presentation": {
|
||||||
|
"panel": "dedicated",
|
||||||
|
"reveal": "never",
|
||||||
|
"focus": false,
|
||||||
|
"showReuseMessage": true,
|
||||||
|
"clear": true,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "dev-recorder",
|
||||||
|
"type": "shell",
|
||||||
|
"command": "just",
|
||||||
|
"args": [
|
||||||
|
"dev-recorder"
|
||||||
|
],
|
||||||
|
"isBackground": true,
|
||||||
|
"problemMatcher": [],
|
||||||
|
"presentation": {
|
||||||
|
"panel": "dedicated",
|
||||||
|
"reveal": "never",
|
||||||
|
"focus": false,
|
||||||
|
"showReuseMessage": true,
|
||||||
|
"clear": true,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "dev-proxy",
|
||||||
|
"type": "shell",
|
||||||
|
"command": "just",
|
||||||
|
"args": [
|
||||||
|
"dev-proxy",
|
||||||
|
],
|
||||||
|
"isBackground": true,
|
||||||
|
"problemMatcher": [],
|
||||||
|
"presentation": {
|
||||||
|
"panel": "dedicated",
|
||||||
|
"reveal": "never",
|
||||||
|
"focus": false,
|
||||||
|
"showReuseMessage": true,
|
||||||
|
"clear": true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
5323
Cargo.lock
generated
5323
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
91
Cargo.toml
91
Cargo.toml
@@ -1,9 +1,90 @@
|
|||||||
|
# cargo-features = ["codegen-backend"]
|
||||||
|
|
||||||
[workspace]
|
[workspace]
|
||||||
members = ["apps/recorder"]
|
members = [
|
||||||
|
"packages/testing-torrents",
|
||||||
|
"packages/util",
|
||||||
|
"packages/util-derive",
|
||||||
|
"packages/fetch",
|
||||||
|
"packages/downloader",
|
||||||
|
"apps/recorder",
|
||||||
|
"apps/proxy",
|
||||||
|
]
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
|
|
||||||
[patch.crates-io]
|
[profile.dev]
|
||||||
jwt-authorizer = { git = "https://github.com/blablacio/jwt-authorizer.git", rev = "e956774" }
|
debug = 0
|
||||||
|
# https://github.com/rust-lang/rust/issues/141540
|
||||||
|
incremental = false
|
||||||
|
# [simd not supported by cranelift](https://github.com/rust-lang/rustc_codegen_cranelift/issues/171)
|
||||||
|
# codegen-backend = "cranelift"
|
||||||
|
|
||||||
# [patch."https://github.com/lonelyhentxi/qbit.git"]
|
[workspace.dependencies]
|
||||||
# qbit-rs = { path = "./patches/qbit-rs" }
|
testing-torrents = { path = "./packages/testing-torrents" }
|
||||||
|
util = { path = "./packages/util" }
|
||||||
|
util-derive = { path = "./packages/util-derive" }
|
||||||
|
fetch = { path = "./packages/fetch" }
|
||||||
|
downloader = { path = "./packages/downloader" }
|
||||||
|
recorder = { path = "./apps/recorder" }
|
||||||
|
|
||||||
|
reqwest = { version = "0.12.20", features = [
|
||||||
|
"charset",
|
||||||
|
"http2",
|
||||||
|
"json",
|
||||||
|
"macos-system-configuration",
|
||||||
|
"cookies",
|
||||||
|
] }
|
||||||
|
moka = "0.12"
|
||||||
|
futures = "0.3"
|
||||||
|
quirks_path = "0.1"
|
||||||
|
snafu = { version = "0.8", features = ["futures"] }
|
||||||
|
testcontainers = { version = "0.24" }
|
||||||
|
testcontainers-modules = { version = "0.12.1" }
|
||||||
|
testcontainers-ext = { version = "0.1.0", features = ["tracing"] }
|
||||||
|
serde = { version = "1", features = ["derive"] }
|
||||||
|
tokio = { version = "1.45.1", features = [
|
||||||
|
"macros",
|
||||||
|
"fs",
|
||||||
|
"rt-multi-thread",
|
||||||
|
"signal",
|
||||||
|
] }
|
||||||
|
serde_json = "1"
|
||||||
|
async-trait = "0.1"
|
||||||
|
tracing = "0.1"
|
||||||
|
url = "2.5.2"
|
||||||
|
anyhow = "1"
|
||||||
|
itertools = "0.14"
|
||||||
|
chrono = "0.4"
|
||||||
|
bytes = "1"
|
||||||
|
serde_with = "3"
|
||||||
|
regex = "1.11"
|
||||||
|
lazy_static = "1.5"
|
||||||
|
axum = { version = "0.8.3", features = ["macros"] }
|
||||||
|
tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
|
||||||
|
axum-extra = { version = "0.10", features = ["typed-header"] }
|
||||||
|
mockito = { version = "1.6.1" }
|
||||||
|
convert_case = "0.8"
|
||||||
|
color-eyre = "0.6.5"
|
||||||
|
inquire = "0.7.5"
|
||||||
|
image = "0.25.6"
|
||||||
|
uuid = { version = "1.6.0", features = ["v4"] }
|
||||||
|
maplit = "1.0.2"
|
||||||
|
once_cell = "1.20.2"
|
||||||
|
rand = "0.9.1"
|
||||||
|
rust_decimal = "1.37.2"
|
||||||
|
base64 = "0.22.1"
|
||||||
|
nom = "8.0.0"
|
||||||
|
percent-encoding = "2.3.1"
|
||||||
|
num-traits = "0.2.19"
|
||||||
|
http = "1.2.0"
|
||||||
|
async-stream = "0.3.6"
|
||||||
|
serde_variant = "0.1.3"
|
||||||
|
tracing-appender = "0.2.3"
|
||||||
|
clap = "4.5.40"
|
||||||
|
ipnetwork = "0.21.1"
|
||||||
|
typed-builder = "0.21.0"
|
||||||
|
nanoid = "0.4.0"
|
||||||
|
webp = "0.3.0"
|
||||||
|
|
||||||
|
[patch.crates-io]
|
||||||
|
seaography = { git = "https://github.com/dumtruck/seaography.git", rev = "a787c3a" }
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
# Server
|
|
||||||
AUTH_TYPE="basic" #
|
|
||||||
|
|
||||||
BASIC_USER="konobangu"
|
|
||||||
BASIC_PASSWORD="konobangu"
|
|
||||||
|
|
||||||
OIDC_PROVIDER_ENDPOINT="https://some-oidc-auth.com/oidc/.well-known/openid-configuration"
|
|
||||||
OIDC_CLIENT_ID=""
|
|
||||||
OIDC_CLIENT_SECRET=""
|
|
||||||
OIDC_ISSUER="https://some-oidc-auth.com/oidc"
|
|
||||||
OIDC_AUDIENCE="https://konobangu.com/api"
|
|
||||||
OIDC_ICON_URL=""
|
|
||||||
OIDC_EXTRA_SCOPE_REGEX=""
|
|
||||||
OIDC_EXTRA_CLAIM_KEY=""
|
|
||||||
OIDC_EXTRA_CLAIM_VALUE=""
|
|
||||||
|
|
||||||
DATABASE_URL="postgres://konobangu:konobangu@127.0.0.1:5432/konobangu"
|
|
||||||
BETTERSTACK_API_KEY=""
|
|
||||||
BETTERSTACK_URL=""
|
|
||||||
FLAGS_SECRET=""
|
|
||||||
ARCJET_KEY=""
|
|
||||||
SVIX_TOKEN=""
|
|
||||||
LIVEBLOCKS_SECRET=""
|
|
||||||
|
|
||||||
# Client
|
|
||||||
NEXT_PUBLIC_APP_URL="http://localhost:5000"
|
|
||||||
NEXT_PUBLIC_WEB_URL="http://localhost:5001"
|
|
||||||
NEXT_PUBLIC_DOCS_URL="http://localhost:5004"
|
|
||||||
NEXT_PUBLIC_VERCEL_PROJECT_PRODUCTION_URL="https://konobangu.com"
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
# AUTH
|
|
||||||
AUTH_TYPE="basic"
|
|
||||||
|
|
||||||
NEXT_PUBLIC_OIDC_PROVIDER_ENDPOINT="https://some-oidc-auth.com/oidc/.well-known/openid-configuration"
|
|
||||||
NEXT_PUBLIC_OIDC_CLIENT_ID=""
|
|
||||||
NEXT_PUBLIC_OIDC_CLIENT_SECRET=""
|
|
||||||
NEXT_PUBLIC_OIDC_ICON_URL=""
|
|
||||||
OIDC_ISSUER="https://some-oidc-auth.com/oidc"
|
|
||||||
OIDC_AUDIENCE="https://konobangu.com/api"
|
|
||||||
OIDC_EXTRA_SCOPES="" # 如 "read:konobangu,write:konobangu"
|
|
||||||
OIDC_EXTRA_CLAIM_KEY=""
|
|
||||||
OIDC_EXTRA_CLAIM_VALUE=""
|
|
||||||
|
|
||||||
# DATABASE
|
|
||||||
DATABASE_URL="postgres://konobangu:konobangu@127.0.0.1:5432/konobangu"
|
|
||||||
|
|
||||||
# SERVER MISC
|
|
||||||
BETTERSTACK_API_KEY=""
|
|
||||||
BETTERSTACK_URL=""
|
|
||||||
FLAGS_SECRET=""
|
|
||||||
ARCJET_KEY=""
|
|
||||||
SVIX_TOKEN=""
|
|
||||||
LIVEBLOCKS_SECRET=""
|
|
||||||
|
|
||||||
# WEBUI
|
|
||||||
NEXT_PUBLIC_APP_URL="http://localhost:5000"
|
|
||||||
NEXT_PUBLIC_WEB_URL="http://localhost:5001"
|
|
||||||
NEXT_PUBLIC_DOCS_URL="http://localhost:5004"
|
|
||||||
NEXT_PUBLIC_VERCEL_PROJECT_PRODUCTION_URL="https://konobangu.com"
|
|
||||||
45
apps/app/.gitignore
vendored
45
apps/app/.gitignore
vendored
@@ -1,45 +0,0 @@
|
|||||||
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
|
|
||||||
|
|
||||||
# dependencies
|
|
||||||
/node_modules
|
|
||||||
/.pnp
|
|
||||||
.pnp.js
|
|
||||||
|
|
||||||
# testing
|
|
||||||
/coverage
|
|
||||||
|
|
||||||
# next.js
|
|
||||||
/.next/
|
|
||||||
/out/
|
|
||||||
|
|
||||||
# production
|
|
||||||
/build
|
|
||||||
|
|
||||||
# misc
|
|
||||||
.DS_Store
|
|
||||||
*.pem
|
|
||||||
|
|
||||||
# debug
|
|
||||||
npm-debug.log*
|
|
||||||
yarn-debug.log*
|
|
||||||
yarn-error.log*
|
|
||||||
.pnpm-debug.log*
|
|
||||||
|
|
||||||
# local env files
|
|
||||||
.env*.local
|
|
||||||
|
|
||||||
# vercel
|
|
||||||
.vercel
|
|
||||||
|
|
||||||
# typescript
|
|
||||||
*.tsbuildinfo
|
|
||||||
next-env.d.ts
|
|
||||||
|
|
||||||
# prisma
|
|
||||||
.env
|
|
||||||
|
|
||||||
# react.email
|
|
||||||
.react-email
|
|
||||||
|
|
||||||
# Sentry
|
|
||||||
.sentryclirc
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
import { render, screen } from '@testing-library/react';
|
|
||||||
import { expect, test } from 'vitest';
|
|
||||||
import Page from '../app/(unauthenticated)/sign-in/[[...sign-in]]/page';
|
|
||||||
|
|
||||||
test('Sign In Page', () => {
|
|
||||||
render(<Page />);
|
|
||||||
expect(
|
|
||||||
screen.getByRole('heading', {
|
|
||||||
level: 1,
|
|
||||||
name: 'Welcome back',
|
|
||||||
})
|
|
||||||
).toBeDefined();
|
|
||||||
});
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
import { render, screen } from '@testing-library/react';
|
|
||||||
import { expect, test } from 'vitest';
|
|
||||||
import Page from '../app/(unauthenticated)/sign-up/[[...sign-up]]/page';
|
|
||||||
|
|
||||||
test('Sign Up Page', () => {
|
|
||||||
render(<Page />);
|
|
||||||
expect(
|
|
||||||
screen.getByRole('heading', {
|
|
||||||
level: 1,
|
|
||||||
name: 'Create an account',
|
|
||||||
})
|
|
||||||
).toBeDefined();
|
|
||||||
});
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
'use client';
|
|
||||||
|
|
||||||
import { useOthers, useSelf } from '@konobangu/collaboration/hooks';
|
|
||||||
import {
|
|
||||||
Avatar,
|
|
||||||
AvatarFallback,
|
|
||||||
AvatarImage,
|
|
||||||
} from '@konobangu/design-system/components/ui/avatar';
|
|
||||||
import {
|
|
||||||
Tooltip,
|
|
||||||
TooltipContent,
|
|
||||||
TooltipTrigger,
|
|
||||||
} from '@konobangu/design-system/components/ui/tooltip';
|
|
||||||
import { tailwind } from '@konobangu/tailwind-config';
|
|
||||||
|
|
||||||
type PresenceAvatarProps = {
|
|
||||||
info?: Liveblocks['UserMeta']['info'];
|
|
||||||
};
|
|
||||||
|
|
||||||
const PresenceAvatar = ({ info }: PresenceAvatarProps) => (
|
|
||||||
<Tooltip delayDuration={0}>
|
|
||||||
<TooltipTrigger>
|
|
||||||
<Avatar className="h-7 w-7 bg-secondary ring-1 ring-background">
|
|
||||||
<AvatarImage src={info?.avatar} alt={info?.name} />
|
|
||||||
<AvatarFallback className="text-xs">
|
|
||||||
{info?.name?.slice(0, 2)}
|
|
||||||
</AvatarFallback>
|
|
||||||
</Avatar>
|
|
||||||
</TooltipTrigger>
|
|
||||||
<TooltipContent collisionPadding={4}>
|
|
||||||
<p>{info?.name ?? 'Unknown'}</p>
|
|
||||||
</TooltipContent>
|
|
||||||
</Tooltip>
|
|
||||||
);
|
|
||||||
|
|
||||||
export const AvatarStack = () => {
|
|
||||||
const others = useOthers();
|
|
||||||
const self = useSelf();
|
|
||||||
const hasMoreUsers = others.length > 3;
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="-space-x-1 flex items-center px-4">
|
|
||||||
{others.slice(0, 3).map(({ connectionId, info }) => (
|
|
||||||
<PresenceAvatar key={connectionId} info={info} />
|
|
||||||
))}
|
|
||||||
|
|
||||||
{hasMoreUsers && (
|
|
||||||
<PresenceAvatar
|
|
||||||
info={{
|
|
||||||
name: `+${others.length - 3}`,
|
|
||||||
color: tailwind.theme.colors.gray[500],
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{self && <PresenceAvatar info={self.info} />}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
'use client';
|
|
||||||
|
|
||||||
import { getUsers } from '@/app/actions/users/get';
|
|
||||||
import { searchUsers } from '@/app/actions/users/search';
|
|
||||||
import { Room } from '@konobangu/collaboration/room';
|
|
||||||
import type { ReactNode } from 'react';
|
|
||||||
|
|
||||||
export const CollaborationProvider = ({
|
|
||||||
orgId,
|
|
||||||
children,
|
|
||||||
}: {
|
|
||||||
orgId: string;
|
|
||||||
children: ReactNode;
|
|
||||||
}) => {
|
|
||||||
const resolveUsers = async ({ userIds }: { userIds: string[] }) => {
|
|
||||||
const response = await getUsers(userIds);
|
|
||||||
|
|
||||||
if ('error' in response) {
|
|
||||||
throw new Error('Problem resolving users');
|
|
||||||
}
|
|
||||||
|
|
||||||
return response.data;
|
|
||||||
};
|
|
||||||
|
|
||||||
const resolveMentionSuggestions = async ({ text }: { text: string }) => {
|
|
||||||
const response = await searchUsers(text);
|
|
||||||
|
|
||||||
if ('error' in response) {
|
|
||||||
throw new Error('Problem resolving mention suggestions');
|
|
||||||
}
|
|
||||||
|
|
||||||
return response.data;
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Room
|
|
||||||
id={`${orgId}:presence`}
|
|
||||||
authEndpoint="/api/collaboration/auth"
|
|
||||||
fallback={
|
|
||||||
<div className="px-3 text-muted-foreground text-xs">Loading...</div>
|
|
||||||
}
|
|
||||||
resolveUsers={resolveUsers}
|
|
||||||
resolveMentionSuggestions={resolveMentionSuggestions}
|
|
||||||
>
|
|
||||||
{children}
|
|
||||||
</Room>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@@ -1,106 +0,0 @@
|
|||||||
'use client';
|
|
||||||
|
|
||||||
import { useMyPresence, useOthers } from '@konobangu/collaboration/hooks';
|
|
||||||
import { useEffect } from 'react';
|
|
||||||
|
|
||||||
const Cursor = ({
|
|
||||||
name,
|
|
||||||
color,
|
|
||||||
x,
|
|
||||||
y,
|
|
||||||
}: {
|
|
||||||
name: string | undefined;
|
|
||||||
color: string;
|
|
||||||
x: number;
|
|
||||||
y: number;
|
|
||||||
}) => (
|
|
||||||
<div
|
|
||||||
className="pointer-events-none absolute top-0 left-0 z-[999] select-none transition-transform duration-100"
|
|
||||||
style={{
|
|
||||||
transform: `translateX(${x}px) translateY(${y}px)`,
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
className="absolute top-0 left-0"
|
|
||||||
width="24"
|
|
||||||
height="36"
|
|
||||||
viewBox="0 0 24 36"
|
|
||||||
fill="none"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
>
|
|
||||||
<title>Cursor</title>
|
|
||||||
<path
|
|
||||||
d="M5.65376 12.3673H5.46026L5.31717 12.4976L0.500002 16.8829L0.500002 1.19841L11.7841 12.3673H5.65376Z"
|
|
||||||
fill={color}
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
<div
|
|
||||||
className="absolute top-4 left-1.5 whitespace-nowrap rounded-full px-2 py-0.5 text-white text-xs"
|
|
||||||
style={{
|
|
||||||
backgroundColor: color,
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{name}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
|
|
||||||
export const Cursors = () => {
|
|
||||||
/**
|
|
||||||
* useMyPresence returns the presence of the current user and a function to update it.
|
|
||||||
* updateMyPresence is different than the setState function returned by the useState hook from React.
|
|
||||||
* You don't need to pass the full presence object to update it.
|
|
||||||
* See https://liveblocks.io/docs/api-reference/liveblocks-react#useMyPresence for more information
|
|
||||||
*/
|
|
||||||
const [_cursor, updateMyPresence] = useMyPresence();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Return all the other users in the room and their presence (a cursor position in this case)
|
|
||||||
*/
|
|
||||||
const others = useOthers();
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const onPointerMove = (event: PointerEvent) => {
|
|
||||||
// Update the user cursor position on every pointer move
|
|
||||||
updateMyPresence({
|
|
||||||
cursor: {
|
|
||||||
x: Math.round(event.clientX),
|
|
||||||
y: Math.round(event.clientY),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
const onPointerLeave = () => {
|
|
||||||
// When the pointer goes out, set cursor to null
|
|
||||||
updateMyPresence({
|
|
||||||
cursor: null,
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
document.body.addEventListener('pointermove', onPointerMove);
|
|
||||||
document.body.addEventListener('pointerleave', onPointerLeave);
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
document.body.removeEventListener('pointermove', onPointerMove);
|
|
||||||
document.body.removeEventListener('pointerleave', onPointerLeave);
|
|
||||||
};
|
|
||||||
}, [updateMyPresence]);
|
|
||||||
|
|
||||||
return others.map(({ connectionId, presence, info }) => {
|
|
||||||
if (!presence.cursor) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Cursor
|
|
||||||
key={`cursor-${connectionId}`}
|
|
||||||
// connectionId is an integer that is incremented at every new connections
|
|
||||||
// Assigning a color with a modulo makes sure that a specific user has the same colors on every clients
|
|
||||||
color={info.color}
|
|
||||||
x={presence.cursor.x}
|
|
||||||
y={presence.cursor.y}
|
|
||||||
name={info?.name}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
});
|
|
||||||
};
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
import {
|
|
||||||
Breadcrumb,
|
|
||||||
BreadcrumbItem,
|
|
||||||
BreadcrumbLink,
|
|
||||||
BreadcrumbList,
|
|
||||||
BreadcrumbPage,
|
|
||||||
BreadcrumbSeparator,
|
|
||||||
} from '@konobangu/design-system/components/ui/breadcrumb';
|
|
||||||
import { Separator } from '@konobangu/design-system/components/ui/separator';
|
|
||||||
import { SidebarTrigger } from '@konobangu/design-system/components/ui/sidebar';
|
|
||||||
import { Fragment, type ReactNode } from 'react';
|
|
||||||
|
|
||||||
type HeaderProps = {
|
|
||||||
pages: string[];
|
|
||||||
page: string;
|
|
||||||
children?: ReactNode;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const Header = ({ pages, page, children }: HeaderProps) => (
|
|
||||||
<header className="flex h-16 shrink-0 items-center justify-between gap-2">
|
|
||||||
<div className="flex items-center gap-2 px-4">
|
|
||||||
<SidebarTrigger className="-ml-1" />
|
|
||||||
<Separator orientation="vertical" className="mr-2 h-4" />
|
|
||||||
<Breadcrumb>
|
|
||||||
<BreadcrumbList>
|
|
||||||
{pages.map((page, index) => (
|
|
||||||
<Fragment key={page}>
|
|
||||||
{index > 0 && <BreadcrumbSeparator className="hidden md:block" />}
|
|
||||||
<BreadcrumbItem className="hidden md:block">
|
|
||||||
<BreadcrumbLink href="#">{page}</BreadcrumbLink>
|
|
||||||
</BreadcrumbItem>
|
|
||||||
</Fragment>
|
|
||||||
))}
|
|
||||||
<BreadcrumbSeparator className="hidden md:block" />
|
|
||||||
<BreadcrumbItem>
|
|
||||||
<BreadcrumbPage>{page}</BreadcrumbPage>
|
|
||||||
</BreadcrumbItem>
|
|
||||||
</BreadcrumbList>
|
|
||||||
</Breadcrumb>
|
|
||||||
</div>
|
|
||||||
{children}
|
|
||||||
</header>
|
|
||||||
);
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
'use client';
|
|
||||||
|
|
||||||
import { analytics } from '@konobangu/analytics/client';
|
|
||||||
import { useSession } from '@konobangu/auth/client';
|
|
||||||
import { usePathname, useSearchParams } from 'next/navigation';
|
|
||||||
import { useEffect, useRef } from 'react';
|
|
||||||
|
|
||||||
export const PostHogIdentifier = () => {
|
|
||||||
const session = useSession();
|
|
||||||
const user = session?.data?.user;
|
|
||||||
const identified = useRef(false);
|
|
||||||
const pathname = usePathname();
|
|
||||||
const searchParams = useSearchParams();
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
// Track pageviews
|
|
||||||
if (pathname && analytics) {
|
|
||||||
let url = window.origin + pathname;
|
|
||||||
if (searchParams.toString()) {
|
|
||||||
url = `${url}?${searchParams.toString()}`;
|
|
||||||
}
|
|
||||||
analytics.capture('$pageview', {
|
|
||||||
$current_url: url,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}, [pathname, searchParams]);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!user || identified.current) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
analytics.identify(user.id, {
|
|
||||||
email: user.email,
|
|
||||||
name: user.name,
|
|
||||||
createdAt: user.createdAt,
|
|
||||||
avatar: user.image,
|
|
||||||
});
|
|
||||||
|
|
||||||
identified.current = true;
|
|
||||||
}, [user]);
|
|
||||||
|
|
||||||
return null;
|
|
||||||
};
|
|
||||||
@@ -1,342 +0,0 @@
|
|||||||
'use client';
|
|
||||||
|
|
||||||
// import { OrganizationSwitcher, UserButton } from '@konobangu/auth/client';
|
|
||||||
import { ModeToggle } from '@konobangu/design-system/components/mode-toggle';
|
|
||||||
import {
|
|
||||||
Collapsible,
|
|
||||||
CollapsibleContent,
|
|
||||||
CollapsibleTrigger,
|
|
||||||
} from '@konobangu/design-system/components/ui/collapsible';
|
|
||||||
import {
|
|
||||||
DropdownMenu,
|
|
||||||
DropdownMenuContent,
|
|
||||||
DropdownMenuItem,
|
|
||||||
DropdownMenuSeparator,
|
|
||||||
DropdownMenuTrigger,
|
|
||||||
} from '@konobangu/design-system/components/ui/dropdown-menu';
|
|
||||||
import {
|
|
||||||
Sidebar,
|
|
||||||
SidebarContent,
|
|
||||||
SidebarFooter,
|
|
||||||
SidebarGroup,
|
|
||||||
SidebarGroupContent,
|
|
||||||
SidebarGroupLabel,
|
|
||||||
SidebarHeader,
|
|
||||||
SidebarInset,
|
|
||||||
SidebarMenu,
|
|
||||||
SidebarMenuAction,
|
|
||||||
SidebarMenuButton,
|
|
||||||
SidebarMenuItem,
|
|
||||||
SidebarMenuSub,
|
|
||||||
SidebarMenuSubButton,
|
|
||||||
SidebarMenuSubItem,
|
|
||||||
useSidebar,
|
|
||||||
} from '@konobangu/design-system/components/ui/sidebar';
|
|
||||||
import { cn } from '@konobangu/design-system/lib/utils';
|
|
||||||
import {
|
|
||||||
AnchorIcon,
|
|
||||||
BookOpenIcon,
|
|
||||||
BotIcon,
|
|
||||||
ChevronRightIcon,
|
|
||||||
FolderIcon,
|
|
||||||
FrameIcon,
|
|
||||||
LifeBuoyIcon,
|
|
||||||
MapIcon,
|
|
||||||
MoreHorizontalIcon,
|
|
||||||
PieChartIcon,
|
|
||||||
SendIcon,
|
|
||||||
Settings2Icon,
|
|
||||||
ShareIcon,
|
|
||||||
SquareTerminalIcon,
|
|
||||||
Trash2Icon,
|
|
||||||
} from 'lucide-react';
|
|
||||||
import type { ReactNode } from 'react';
|
|
||||||
|
|
||||||
type GlobalSidebarProperties = {
|
|
||||||
readonly children: ReactNode;
|
|
||||||
};
|
|
||||||
|
|
||||||
const data = {
|
|
||||||
user: {
|
|
||||||
name: 'shadcn',
|
|
||||||
email: 'm@example.com',
|
|
||||||
avatar: '/avatars/shadcn.jpg',
|
|
||||||
},
|
|
||||||
navMain: [
|
|
||||||
{
|
|
||||||
title: 'Playground',
|
|
||||||
url: '#',
|
|
||||||
icon: SquareTerminalIcon,
|
|
||||||
isActive: true,
|
|
||||||
items: [
|
|
||||||
{
|
|
||||||
title: 'History',
|
|
||||||
url: '#',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: 'Starred',
|
|
||||||
url: '#',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: 'Settings',
|
|
||||||
url: '#',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: 'Models',
|
|
||||||
url: '#',
|
|
||||||
icon: BotIcon,
|
|
||||||
items: [
|
|
||||||
{
|
|
||||||
title: 'Genesis',
|
|
||||||
url: '#',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: 'Explorer',
|
|
||||||
url: '#',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: 'Quantum',
|
|
||||||
url: '#',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: 'Documentation',
|
|
||||||
url: '#',
|
|
||||||
icon: BookOpenIcon,
|
|
||||||
items: [
|
|
||||||
{
|
|
||||||
title: 'Introduction',
|
|
||||||
url: '#',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: 'Get Started',
|
|
||||||
url: '#',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: 'Tutorials',
|
|
||||||
url: '#',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: 'Changelog',
|
|
||||||
url: '#',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: 'Settings',
|
|
||||||
url: '#',
|
|
||||||
icon: Settings2Icon,
|
|
||||||
items: [
|
|
||||||
{
|
|
||||||
title: 'General',
|
|
||||||
url: '#',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: 'Team',
|
|
||||||
url: '#',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: 'Billing',
|
|
||||||
url: '#',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: 'Limits',
|
|
||||||
url: '#',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
navSecondary: [
|
|
||||||
{
|
|
||||||
title: 'Webhooks',
|
|
||||||
url: '/webhooks',
|
|
||||||
icon: AnchorIcon,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: 'Support',
|
|
||||||
url: '#',
|
|
||||||
icon: LifeBuoyIcon,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: 'Feedback',
|
|
||||||
url: '#',
|
|
||||||
icon: SendIcon,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
projects: [
|
|
||||||
{
|
|
||||||
name: 'Design Engineering',
|
|
||||||
url: '#',
|
|
||||||
icon: FrameIcon,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: 'Sales & Marketing',
|
|
||||||
url: '#',
|
|
||||||
icon: PieChartIcon,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: 'Travel',
|
|
||||||
url: '#',
|
|
||||||
icon: MapIcon,
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
|
||||||
|
|
||||||
export const GlobalSidebar = ({ children }: GlobalSidebarProperties) => {
|
|
||||||
const sidebar = useSidebar();
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<Sidebar variant="inset">
|
|
||||||
<SidebarHeader>
|
|
||||||
<SidebarMenu>
|
|
||||||
<SidebarMenuItem>
|
|
||||||
<div
|
|
||||||
className={cn(
|
|
||||||
'h-[36px] overflow-hidden transition-all [&>div]:w-full',
|
|
||||||
sidebar.open ? '' : '-mx-1'
|
|
||||||
)}
|
|
||||||
>
|
|
||||||
{/* <OrganizationSwitcher
|
|
||||||
hidePersonal
|
|
||||||
afterSelectOrganizationUrl="/"
|
|
||||||
/> */}
|
|
||||||
</div>
|
|
||||||
</SidebarMenuItem>
|
|
||||||
</SidebarMenu>
|
|
||||||
</SidebarHeader>
|
|
||||||
<SidebarContent>
|
|
||||||
<SidebarGroup>
|
|
||||||
<SidebarGroupLabel>Platform</SidebarGroupLabel>
|
|
||||||
<SidebarMenu>
|
|
||||||
{data.navMain.map((item) => (
|
|
||||||
<Collapsible
|
|
||||||
key={item.title}
|
|
||||||
asChild
|
|
||||||
defaultOpen={item.isActive}
|
|
||||||
>
|
|
||||||
<SidebarMenuItem>
|
|
||||||
<SidebarMenuButton asChild tooltip={item.title}>
|
|
||||||
<a href={item.url}>
|
|
||||||
<item.icon />
|
|
||||||
<span>{item.title}</span>
|
|
||||||
</a>
|
|
||||||
</SidebarMenuButton>
|
|
||||||
{item.items?.length ? (
|
|
||||||
<>
|
|
||||||
<CollapsibleTrigger asChild>
|
|
||||||
<SidebarMenuAction className="data-[state=open]:rotate-90">
|
|
||||||
<ChevronRightIcon />
|
|
||||||
<span className="sr-only">Toggle</span>
|
|
||||||
</SidebarMenuAction>
|
|
||||||
</CollapsibleTrigger>
|
|
||||||
<CollapsibleContent>
|
|
||||||
<SidebarMenuSub>
|
|
||||||
{item.items?.map((subItem) => (
|
|
||||||
<SidebarMenuSubItem key={subItem.title}>
|
|
||||||
<SidebarMenuSubButton asChild>
|
|
||||||
<a href={subItem.url}>
|
|
||||||
<span>{subItem.title}</span>
|
|
||||||
</a>
|
|
||||||
</SidebarMenuSubButton>
|
|
||||||
</SidebarMenuSubItem>
|
|
||||||
))}
|
|
||||||
</SidebarMenuSub>
|
|
||||||
</CollapsibleContent>
|
|
||||||
</>
|
|
||||||
) : null}
|
|
||||||
</SidebarMenuItem>
|
|
||||||
</Collapsible>
|
|
||||||
))}
|
|
||||||
</SidebarMenu>
|
|
||||||
</SidebarGroup>
|
|
||||||
<SidebarGroup className="group-data-[collapsible=icon]:hidden">
|
|
||||||
<SidebarGroupLabel>Projects</SidebarGroupLabel>
|
|
||||||
<SidebarMenu>
|
|
||||||
{data.projects.map((item) => (
|
|
||||||
<SidebarMenuItem key={item.name}>
|
|
||||||
<SidebarMenuButton asChild>
|
|
||||||
<a href={item.url}>
|
|
||||||
<item.icon />
|
|
||||||
<span>{item.name}</span>
|
|
||||||
</a>
|
|
||||||
</SidebarMenuButton>
|
|
||||||
<DropdownMenu>
|
|
||||||
<DropdownMenuTrigger asChild>
|
|
||||||
<SidebarMenuAction showOnHover>
|
|
||||||
<MoreHorizontalIcon />
|
|
||||||
<span className="sr-only">More</span>
|
|
||||||
</SidebarMenuAction>
|
|
||||||
</DropdownMenuTrigger>
|
|
||||||
<DropdownMenuContent
|
|
||||||
className="w-48"
|
|
||||||
side="bottom"
|
|
||||||
align="end"
|
|
||||||
>
|
|
||||||
<DropdownMenuItem>
|
|
||||||
<FolderIcon className="text-muted-foreground" />
|
|
||||||
<span>View Project</span>
|
|
||||||
</DropdownMenuItem>
|
|
||||||
<DropdownMenuItem>
|
|
||||||
<ShareIcon className="text-muted-foreground" />
|
|
||||||
<span>Share Project</span>
|
|
||||||
</DropdownMenuItem>
|
|
||||||
<DropdownMenuSeparator />
|
|
||||||
<DropdownMenuItem>
|
|
||||||
<Trash2Icon className="text-muted-foreground" />
|
|
||||||
<span>Delete Project</span>
|
|
||||||
</DropdownMenuItem>
|
|
||||||
</DropdownMenuContent>
|
|
||||||
</DropdownMenu>
|
|
||||||
</SidebarMenuItem>
|
|
||||||
))}
|
|
||||||
<SidebarMenuItem>
|
|
||||||
<SidebarMenuButton>
|
|
||||||
<MoreHorizontalIcon />
|
|
||||||
<span>More</span>
|
|
||||||
</SidebarMenuButton>
|
|
||||||
</SidebarMenuItem>
|
|
||||||
</SidebarMenu>
|
|
||||||
</SidebarGroup>
|
|
||||||
<SidebarGroup className="mt-auto">
|
|
||||||
<SidebarGroupContent>
|
|
||||||
<SidebarMenu>
|
|
||||||
{data.navSecondary.map((item) => (
|
|
||||||
<SidebarMenuItem key={item.title}>
|
|
||||||
<SidebarMenuButton asChild>
|
|
||||||
<a href={item.url}>
|
|
||||||
<item.icon />
|
|
||||||
<span>{item.title}</span>
|
|
||||||
</a>
|
|
||||||
</SidebarMenuButton>
|
|
||||||
</SidebarMenuItem>
|
|
||||||
))}
|
|
||||||
</SidebarMenu>
|
|
||||||
</SidebarGroupContent>
|
|
||||||
</SidebarGroup>
|
|
||||||
</SidebarContent>
|
|
||||||
<SidebarFooter>
|
|
||||||
<SidebarMenu>
|
|
||||||
<SidebarMenuItem className="flex items-center gap-2">
|
|
||||||
{/* <UserButton
|
|
||||||
showName
|
|
||||||
appearance={{
|
|
||||||
elements: {
|
|
||||||
rootBox: 'flex overflow-hidden w-full',
|
|
||||||
userButtonBox: 'flex-row-reverse',
|
|
||||||
userButtonOuterIdentifier: 'truncate pl-0',
|
|
||||||
},
|
|
||||||
}}
|
|
||||||
/> */}
|
|
||||||
<ModeToggle />
|
|
||||||
</SidebarMenuItem>
|
|
||||||
</SidebarMenu>
|
|
||||||
</SidebarFooter>
|
|
||||||
</Sidebar>
|
|
||||||
<SidebarInset>{children}</SidebarInset>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
import { getSessionFromHeaders } from '@konobangu/auth/server';
|
|
||||||
import { SidebarProvider } from '@konobangu/design-system/components/ui/sidebar';
|
|
||||||
import { env } from '@konobangu/env';
|
|
||||||
import { showBetaFeature } from '@konobangu/feature-flags';
|
|
||||||
import { secure } from '@konobangu/security';
|
|
||||||
import { redirect } from 'next/navigation';
|
|
||||||
import type { ReactNode } from 'react';
|
|
||||||
import { PostHogIdentifier } from './components/posthog-identifier';
|
|
||||||
import { GlobalSidebar } from './components/sidebar';
|
|
||||||
|
|
||||||
type AppLayoutProperties = {
|
|
||||||
readonly children: ReactNode;
|
|
||||||
};
|
|
||||||
|
|
||||||
const AppLayout = async ({ children }: AppLayoutProperties) => {
|
|
||||||
if (env.ARCJET_KEY) {
|
|
||||||
await secure(['CATEGORY:PREVIEW']);
|
|
||||||
}
|
|
||||||
|
|
||||||
const { user } = await getSessionFromHeaders();
|
|
||||||
|
|
||||||
if (!user) {
|
|
||||||
return redirect('/sign-in'); // from next/navigation
|
|
||||||
}
|
|
||||||
const betaFeature = await showBetaFeature();
|
|
||||||
|
|
||||||
return (
|
|
||||||
<SidebarProvider>
|
|
||||||
<GlobalSidebar>
|
|
||||||
{betaFeature && (
|
|
||||||
<div className="m-4 rounded-full bg-success p-1.5 text-center text-sm text-success-foreground">
|
|
||||||
Beta feature now available
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
{children}
|
|
||||||
</GlobalSidebar>
|
|
||||||
<PostHogIdentifier />
|
|
||||||
</SidebarProvider>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default AppLayout;
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
import { getSessionFromHeaders } from '@konobangu/auth/server';
|
|
||||||
import { database } from '@konobangu/database';
|
|
||||||
import { env } from '@konobangu/env';
|
|
||||||
import type { Metadata } from 'next';
|
|
||||||
import dynamic from 'next/dynamic';
|
|
||||||
import { notFound } from 'next/navigation';
|
|
||||||
import { AvatarStack } from './components/avatar-stack';
|
|
||||||
import { Cursors } from './components/cursors';
|
|
||||||
import { Header } from './components/header';
|
|
||||||
|
|
||||||
const title = 'Acme Inc';
|
|
||||||
const description = 'My application.';
|
|
||||||
|
|
||||||
const CollaborationProvider = dynamic(() =>
|
|
||||||
import('./components/collaboration-provider').then(
|
|
||||||
(mod) => mod.CollaborationProvider
|
|
||||||
)
|
|
||||||
);
|
|
||||||
|
|
||||||
export const metadata: Metadata = {
|
|
||||||
title,
|
|
||||||
description,
|
|
||||||
};
|
|
||||||
|
|
||||||
const App = async () => {
|
|
||||||
const pages = await database.selectFrom('page').selectAll().execute();
|
|
||||||
const { orgId } = await getSessionFromHeaders();
|
|
||||||
|
|
||||||
if (!orgId) {
|
|
||||||
notFound();
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<Header pages={['Building Your Application']} page="Data Fetching">
|
|
||||||
{env.LIVEBLOCKS_SECRET && (
|
|
||||||
<CollaborationProvider orgId={orgId}>
|
|
||||||
<AvatarStack />
|
|
||||||
<Cursors />
|
|
||||||
</CollaborationProvider>
|
|
||||||
)}
|
|
||||||
</Header>
|
|
||||||
<div className="flex flex-1 flex-col gap-4 p-4 pt-0">
|
|
||||||
<div className="grid auto-rows-min gap-4 md:grid-cols-3">
|
|
||||||
{pages.map((page) => (
|
|
||||||
<div key={page.id} className="aspect-video rounded-xl bg-muted/50">
|
|
||||||
{page.name}
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
<div className="min-h-[100vh] flex-1 rounded-xl bg-muted/50 md:min-h-min" />
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default App;
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
import { webhooks } from '@konobangu/webhooks';
|
|
||||||
import { notFound } from 'next/navigation';
|
|
||||||
|
|
||||||
export const metadata = {
|
|
||||||
title: 'Webhooks',
|
|
||||||
description: 'Send webhooks to your users.',
|
|
||||||
};
|
|
||||||
|
|
||||||
const WebhooksPage = async () => {
|
|
||||||
const response = await webhooks.getAppPortal();
|
|
||||||
|
|
||||||
if (!response?.url) {
|
|
||||||
notFound();
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="h-full w-full overflow-hidden">
|
|
||||||
<iframe
|
|
||||||
title="Webhooks"
|
|
||||||
src={response.url}
|
|
||||||
className="h-full w-full border-none"
|
|
||||||
allow="clipboard-write"
|
|
||||||
loading="lazy"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default WebhooksPage;
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
import { ModeToggle } from '@konobangu/design-system/components/mode-toggle';
|
|
||||||
import { env } from '@konobangu/env';
|
|
||||||
import { CommandIcon } from 'lucide-react';
|
|
||||||
import Link from 'next/link';
|
|
||||||
import type { ReactNode } from 'react';
|
|
||||||
|
|
||||||
type AuthLayoutProps = {
|
|
||||||
readonly children: ReactNode;
|
|
||||||
};
|
|
||||||
|
|
||||||
const AuthLayout = ({ children }: AuthLayoutProps) => (
|
|
||||||
<div className="container relative grid h-dvh flex-col items-center justify-center lg:max-w-none lg:grid-cols-2 lg:px-0">
|
|
||||||
<div className="relative hidden h-full flex-col bg-muted p-10 text-white lg:flex dark:border-r">
|
|
||||||
<div className="absolute inset-0 bg-zinc-900" />
|
|
||||||
<div className="relative z-20 flex items-center font-medium text-lg">
|
|
||||||
<CommandIcon className="mr-2 h-6 w-6" />
|
|
||||||
Acme Inc
|
|
||||||
</div>
|
|
||||||
<div className="absolute top-4 right-4">
|
|
||||||
<ModeToggle />
|
|
||||||
</div>
|
|
||||||
<div className="relative z-20 mt-auto">
|
|
||||||
<blockquote className="space-y-2">
|
|
||||||
<p className="text-lg">
|
|
||||||
“This library has saved me countless hours of work and helped
|
|
||||||
me deliver stunning designs to my clients faster than ever
|
|
||||||
before.”
|
|
||||||
</p>
|
|
||||||
<footer className="text-sm">Sofia Davis</footer>
|
|
||||||
</blockquote>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div className="lg:p-8">
|
|
||||||
<div className="mx-auto flex w-full max-w-[400px] flex-col justify-center space-y-6">
|
|
||||||
{children}
|
|
||||||
<p className="px-8 text-center text-muted-foreground text-sm">
|
|
||||||
By clicking continue, you agree to our{' '}
|
|
||||||
<Link
|
|
||||||
href={new URL('/legal/terms', env.NEXT_PUBLIC_WEB_URL).toString()}
|
|
||||||
className="underline underline-offset-4 hover:text-primary"
|
|
||||||
>
|
|
||||||
Terms of Service
|
|
||||||
</Link>{' '}
|
|
||||||
and{' '}
|
|
||||||
<Link
|
|
||||||
href={new URL('/legal/privacy', env.NEXT_PUBLIC_WEB_URL).toString()}
|
|
||||||
className="underline underline-offset-4 hover:text-primary"
|
|
||||||
>
|
|
||||||
Privacy Policy
|
|
||||||
</Link>
|
|
||||||
.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
|
|
||||||
export default AuthLayout;
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
import { createMetadata } from '@konobangu/seo/metadata';
|
|
||||||
import type { Metadata } from 'next';
|
|
||||||
import dynamic from 'next/dynamic';
|
|
||||||
|
|
||||||
const title = 'Welcome back';
|
|
||||||
const description = 'Enter your details to sign in.';
|
|
||||||
const SignIn = dynamic(() =>
|
|
||||||
import('@konobangu/auth/components/sign-in').then((mod) => mod.SignIn)
|
|
||||||
);
|
|
||||||
|
|
||||||
export const metadata: Metadata = createMetadata({ title, description });
|
|
||||||
|
|
||||||
const SignInPage = () => (
|
|
||||||
<>
|
|
||||||
<div className="flex flex-col space-y-2 text-center">
|
|
||||||
<h1 className="font-semibold text-2xl tracking-tight">{title}</h1>
|
|
||||||
<p className="text-muted-foreground text-sm">{description}</p>
|
|
||||||
</div>
|
|
||||||
<SignIn />
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
|
|
||||||
export default SignInPage;
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
import { createMetadata } from '@konobangu/seo/metadata';
|
|
||||||
import type { Metadata } from 'next';
|
|
||||||
import dynamic from 'next/dynamic';
|
|
||||||
|
|
||||||
const title = 'Create an account';
|
|
||||||
const description = 'Enter your details to get started.';
|
|
||||||
const SignUp = dynamic(() =>
|
|
||||||
import('@konobangu/auth/components/sign-up').then((mod) => mod.SignUp)
|
|
||||||
);
|
|
||||||
|
|
||||||
export const metadata: Metadata = createMetadata({ title, description });
|
|
||||||
|
|
||||||
const SignUpPage = () => (
|
|
||||||
<>
|
|
||||||
<div className="flex flex-col space-y-2 text-center">
|
|
||||||
<h1 className="font-semibold text-2xl tracking-tight">{title}</h1>
|
|
||||||
<p className="text-muted-foreground text-sm">{description}</p>
|
|
||||||
</div>
|
|
||||||
<SignUp />
|
|
||||||
</>
|
|
||||||
);
|
|
||||||
|
|
||||||
export default SignUpPage;
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
import { getFlags } from '@konobangu/feature-flags/access';
|
|
||||||
|
|
||||||
export const GET = getFlags;
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
'use server';
|
|
||||||
|
|
||||||
import {
|
|
||||||
getFullOrganizationFromSession,
|
|
||||||
getSessionFromHeaders,
|
|
||||||
} from '@konobangu/auth/server';
|
|
||||||
import { tailwind } from '@konobangu/tailwind-config';
|
|
||||||
|
|
||||||
const colors = [
|
|
||||||
tailwind.theme.colors.red[500],
|
|
||||||
tailwind.theme.colors.orange[500],
|
|
||||||
tailwind.theme.colors.amber[500],
|
|
||||||
tailwind.theme.colors.yellow[500],
|
|
||||||
tailwind.theme.colors.lime[500],
|
|
||||||
tailwind.theme.colors.green[500],
|
|
||||||
tailwind.theme.colors.emerald[500],
|
|
||||||
tailwind.theme.colors.teal[500],
|
|
||||||
tailwind.theme.colors.cyan[500],
|
|
||||||
tailwind.theme.colors.sky[500],
|
|
||||||
tailwind.theme.colors.blue[500],
|
|
||||||
tailwind.theme.colors.indigo[500],
|
|
||||||
tailwind.theme.colors.violet[500],
|
|
||||||
tailwind.theme.colors.purple[500],
|
|
||||||
tailwind.theme.colors.fuchsia[500],
|
|
||||||
tailwind.theme.colors.pink[500],
|
|
||||||
tailwind.theme.colors.rose[500],
|
|
||||||
];
|
|
||||||
|
|
||||||
export const getUsers = async (
|
|
||||||
userIds: string[]
|
|
||||||
): Promise<
|
|
||||||
| {
|
|
||||||
data: Liveblocks['UserMeta']['info'][];
|
|
||||||
}
|
|
||||||
| {
|
|
||||||
error: unknown;
|
|
||||||
}
|
|
||||||
> => {
|
|
||||||
try {
|
|
||||||
const session = await getSessionFromHeaders();
|
|
||||||
const { orgId } = session;
|
|
||||||
|
|
||||||
if (!orgId) {
|
|
||||||
throw new Error('Not logged in');
|
|
||||||
}
|
|
||||||
|
|
||||||
const { fullOrganization } = await getFullOrganizationFromSession(session);
|
|
||||||
|
|
||||||
const members = fullOrganization?.members || [];
|
|
||||||
|
|
||||||
const data: Liveblocks['UserMeta']['info'][] = members
|
|
||||||
.filter((user) => user?.userId && userIds.includes(user?.userId))
|
|
||||||
.map((user) => ({
|
|
||||||
name: user.user.name ?? user.user.email ?? 'Unknown user',
|
|
||||||
picture: user.user.image,
|
|
||||||
color: colors[Math.floor(Math.random() * colors.length)],
|
|
||||||
}));
|
|
||||||
|
|
||||||
return { data };
|
|
||||||
} catch (error) {
|
|
||||||
return { error };
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
'use server';
|
|
||||||
|
|
||||||
import {
|
|
||||||
getFullOrganizationFromSession,
|
|
||||||
getSessionFromHeaders,
|
|
||||||
} from '@konobangu/auth/server';
|
|
||||||
import Fuse from 'fuse.js';
|
|
||||||
|
|
||||||
export const searchUsers = async (
|
|
||||||
query: string
|
|
||||||
): Promise<
|
|
||||||
| {
|
|
||||||
data: string[];
|
|
||||||
}
|
|
||||||
| {
|
|
||||||
error: unknown;
|
|
||||||
}
|
|
||||||
> => {
|
|
||||||
try {
|
|
||||||
const session = await getSessionFromHeaders();
|
|
||||||
const { orgId } = session;
|
|
||||||
|
|
||||||
if (!orgId) {
|
|
||||||
throw new Error('Not logged in');
|
|
||||||
}
|
|
||||||
|
|
||||||
const { fullOrganization } = await getFullOrganizationFromSession(session);
|
|
||||||
|
|
||||||
const members = fullOrganization?.members || [];
|
|
||||||
|
|
||||||
const users = members.map((user) => ({
|
|
||||||
id: user.id,
|
|
||||||
name: user.user.name ?? user.user.email ?? 'Unknown user',
|
|
||||||
imageUrl: user.user.image,
|
|
||||||
}));
|
|
||||||
|
|
||||||
const fuse = new Fuse(users, {
|
|
||||||
keys: ['name'],
|
|
||||||
minMatchCharLength: 1,
|
|
||||||
threshold: 0.3,
|
|
||||||
});
|
|
||||||
|
|
||||||
const results = fuse.search(query);
|
|
||||||
const data = results.map((result) => result.item.id);
|
|
||||||
|
|
||||||
return { data };
|
|
||||||
} catch (error) {
|
|
||||||
return { error };
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
import { getSessionFromHeaders } from '@konobangu/auth/server';
|
|
||||||
import { authenticate } from '@konobangu/collaboration/auth';
|
|
||||||
import { tailwind } from '@konobangu/tailwind-config';
|
|
||||||
|
|
||||||
const COLORS = [
|
|
||||||
tailwind.theme.colors.red[500],
|
|
||||||
tailwind.theme.colors.orange[500],
|
|
||||||
tailwind.theme.colors.amber[500],
|
|
||||||
tailwind.theme.colors.yellow[500],
|
|
||||||
tailwind.theme.colors.lime[500],
|
|
||||||
tailwind.theme.colors.green[500],
|
|
||||||
tailwind.theme.colors.emerald[500],
|
|
||||||
tailwind.theme.colors.teal[500],
|
|
||||||
tailwind.theme.colors.cyan[500],
|
|
||||||
tailwind.theme.colors.sky[500],
|
|
||||||
tailwind.theme.colors.blue[500],
|
|
||||||
tailwind.theme.colors.indigo[500],
|
|
||||||
tailwind.theme.colors.violet[500],
|
|
||||||
tailwind.theme.colors.purple[500],
|
|
||||||
tailwind.theme.colors.fuchsia[500],
|
|
||||||
tailwind.theme.colors.pink[500],
|
|
||||||
tailwind.theme.colors.rose[500],
|
|
||||||
];
|
|
||||||
|
|
||||||
export const POST = async () => {
|
|
||||||
const session = await getSessionFromHeaders();
|
|
||||||
const { orgId, user } = session;
|
|
||||||
|
|
||||||
if (!user || !orgId) {
|
|
||||||
return new Response('Unauthorized', { status: 401 });
|
|
||||||
}
|
|
||||||
|
|
||||||
return authenticate({
|
|
||||||
userId: user.id,
|
|
||||||
orgId,
|
|
||||||
userInfo: {
|
|
||||||
name: user.name ?? user.email ?? undefined,
|
|
||||||
avatar: user.image ?? undefined,
|
|
||||||
color: COLORS[Math.floor(Math.random() * COLORS.length)],
|
|
||||||
},
|
|
||||||
});
|
|
||||||
};
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 216 B |
@@ -1,17 +0,0 @@
|
|||||||
import { database } from '@konobangu/database';
|
|
||||||
|
|
||||||
export const POST = async () => {
|
|
||||||
const newPage = await database
|
|
||||||
.insertInto('page')
|
|
||||||
.values([
|
|
||||||
{
|
|
||||||
name: 'cron-temp',
|
|
||||||
},
|
|
||||||
])
|
|
||||||
.returning('id')
|
|
||||||
.executeTakeFirstOrThrow();
|
|
||||||
|
|
||||||
await database.deleteFrom('page').where('id', '=', newPage.id);
|
|
||||||
|
|
||||||
return new Response('OK', { status: 200 });
|
|
||||||
};
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
'use client';
|
|
||||||
|
|
||||||
import { Button } from '@konobangu/design-system/components/ui/button';
|
|
||||||
import { fonts } from '@konobangu/design-system/lib/fonts';
|
|
||||||
import { captureException } from '@sentry/nextjs';
|
|
||||||
import type NextError from 'next/error';
|
|
||||||
import { useEffect } from 'react';
|
|
||||||
|
|
||||||
type GlobalErrorProperties = {
|
|
||||||
readonly error: NextError & { digest?: string };
|
|
||||||
readonly reset: () => void;
|
|
||||||
};
|
|
||||||
|
|
||||||
const GlobalError = ({ error, reset }: GlobalErrorProperties) => {
|
|
||||||
useEffect(() => {
|
|
||||||
captureException(error);
|
|
||||||
}, [error]);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<html lang="en" className={fonts}>
|
|
||||||
<body>
|
|
||||||
<h1>Oops, something went wrong</h1>
|
|
||||||
<Button onClick={() => reset()}>Try again</Button>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default GlobalError;
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
export const runtime = 'edge';
|
|
||||||
|
|
||||||
export const GET = (): Response => new Response('OK', { status: 200 });
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 96 B |
@@ -1,18 +0,0 @@
|
|||||||
import '@konobangu/design-system/styles/globals.css';
|
|
||||||
import { DesignSystemProvider } from '@konobangu/design-system';
|
|
||||||
import { fonts } from '@konobangu/design-system/lib/fonts';
|
|
||||||
import type { ReactNode } from 'react';
|
|
||||||
|
|
||||||
type RootLayoutProperties = {
|
|
||||||
readonly children: ReactNode;
|
|
||||||
};
|
|
||||||
|
|
||||||
const RootLayout = ({ children }: RootLayoutProperties) => (
|
|
||||||
<html lang="en" className={fonts} suppressHydrationWarning>
|
|
||||||
<body>
|
|
||||||
<DesignSystemProvider>{children}</DesignSystemProvider>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
);
|
|
||||||
|
|
||||||
export default RootLayout;
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 57 KiB |
@@ -1,3 +0,0 @@
|
|||||||
import { initializeSentry } from '@konobangu/next-config/instrumentation';
|
|
||||||
|
|
||||||
export const register = initializeSentry();
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export * from '@konobangu/collaboration/config';
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
import { authMiddleware } from '@konobangu/auth/middleware';
|
|
||||||
import {
|
|
||||||
noseconeConfig,
|
|
||||||
noseconeMiddleware,
|
|
||||||
} from '@konobangu/security/middleware';
|
|
||||||
import type { NextRequest } from 'next/server';
|
|
||||||
|
|
||||||
const securityHeaders = noseconeMiddleware(noseconeConfig);
|
|
||||||
|
|
||||||
export async function middleware(_request: NextRequest) {
|
|
||||||
const response = await securityHeaders();
|
|
||||||
return authMiddleware(response as any);
|
|
||||||
}
|
|
||||||
|
|
||||||
export const config = {
|
|
||||||
matcher: [
|
|
||||||
// Skip Next.js internals and all static files, unless found in search params
|
|
||||||
'/((?!_next|[^?]*\\.(?:html?|css|js(?!on)|jpe?g|webp|png|gif|svg|ttf|woff2?|ico|csv|docx?|xlsx?|zip|webmanifest)).*)',
|
|
||||||
// Always run for API routes
|
|
||||||
'/(api|trpc)(.*)',
|
|
||||||
],
|
|
||||||
};
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
import { env } from '@konobangu/env';
|
|
||||||
import { config, withAnalyzer, withSentry } from '@konobangu/next-config';
|
|
||||||
import type { NextConfig } from 'next';
|
|
||||||
|
|
||||||
let nextConfig: NextConfig = { ...config };
|
|
||||||
|
|
||||||
if (env.VERCEL) {
|
|
||||||
nextConfig = withSentry(nextConfig);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (env.ANALYZE === 'true') {
|
|
||||||
nextConfig = withAnalyzer(nextConfig);
|
|
||||||
}
|
|
||||||
|
|
||||||
export default nextConfig;
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "app",
|
|
||||||
"private": true,
|
|
||||||
"scripts": {
|
|
||||||
"dev": "next dev -p 5000 --turbopack",
|
|
||||||
"build": "next build",
|
|
||||||
"start": "next start",
|
|
||||||
"analyze": "ANALYZE=true pnpm build",
|
|
||||||
"test": "vitest run",
|
|
||||||
"clean": "git clean -xdf .cache .turbo dist node_modules",
|
|
||||||
"typecheck": "tsc --noEmit --emitDeclarationOnly false"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"@konobangu/analytics": "workspace:*",
|
|
||||||
"@konobangu/auth": "workspace:*",
|
|
||||||
"@konobangu/collaboration": "workspace:*",
|
|
||||||
"@konobangu/database": "workspace:*",
|
|
||||||
"@konobangu/design-system": "workspace:*",
|
|
||||||
"@konobangu/env": "workspace:*",
|
|
||||||
"@konobangu/feature-flags": "workspace:*",
|
|
||||||
"@konobangu/migrate": "workspace:*",
|
|
||||||
"@konobangu/next-config": "workspace:*",
|
|
||||||
"@konobangu/security": "workspace:*",
|
|
||||||
"@konobangu/seo": "workspace:*",
|
|
||||||
"@konobangu/tailwind-config": "workspace:*",
|
|
||||||
"@konobangu/webhooks": "workspace:*",
|
|
||||||
"@prisma/client": "6.0.1",
|
|
||||||
"@sentry/nextjs": "^8.48.0",
|
|
||||||
"fuse.js": "^7.0.0",
|
|
||||||
"import-in-the-middle": "^1.12.0",
|
|
||||||
"lucide-react": "^0.468.0",
|
|
||||||
"next": "^15.1.4",
|
|
||||||
"next-themes": "^0.4.4",
|
|
||||||
"react": "^19.0.0",
|
|
||||||
"react-dom": "^19.0.0",
|
|
||||||
"require-in-the-middle": "^7.4.0"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@konobangu/testing": "workspace:*",
|
|
||||||
"@konobangu/typescript-config": "workspace:*",
|
|
||||||
"@testing-library/dom": "^10.4.0",
|
|
||||||
"@testing-library/react": "^16.1.0",
|
|
||||||
"@types/node": "22.10.1",
|
|
||||||
"@types/react": "19.0.1",
|
|
||||||
"@types/react-dom": "19.0.2",
|
|
||||||
"jsdom": "^25.0.1",
|
|
||||||
"tailwindcss": "^3.4.17",
|
|
||||||
"typescript": "^5.7.3",
|
|
||||||
"vitest": "^2.1.8"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export { default } from '@konobangu/design-system/postcss.config.mjs';
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file configures the initialization of Sentry on the client.
|
|
||||||
* The config you add here will be used whenever a users loads a page in their browser.
|
|
||||||
* https://docs.sentry.io/platforms/javascript/guides/nextjs/
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { init, replayIntegration } from '@sentry/nextjs';
|
|
||||||
|
|
||||||
init({
|
|
||||||
dsn: process.env.NEXT_PUBLIC_SENTRY_DSN,
|
|
||||||
|
|
||||||
// Adjust this value in production, or use tracesSampler for greater control
|
|
||||||
tracesSampleRate: 1,
|
|
||||||
|
|
||||||
// Setting this option to true will print useful information to the console while you're setting up Sentry.
|
|
||||||
debug: false,
|
|
||||||
|
|
||||||
replaysOnErrorSampleRate: 1,
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This sets the sample rate to be 10%. You may want this to be 100% while
|
|
||||||
* in development and sample at a lower rate in production
|
|
||||||
*/
|
|
||||||
replaysSessionSampleRate: 0.1,
|
|
||||||
|
|
||||||
// You can remove this option if you're not planning to use the Sentry Session Replay feature:
|
|
||||||
integrations: [
|
|
||||||
replayIntegration({
|
|
||||||
// Additional Replay configuration goes in here, for example:
|
|
||||||
maskAllText: true,
|
|
||||||
blockAllMedia: true,
|
|
||||||
}),
|
|
||||||
],
|
|
||||||
});
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export { config as default } from '@konobangu/tailwind-config/config';
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
{
|
|
||||||
"extends": "@konobangu/typescript-config/nextjs.json",
|
|
||||||
"compilerOptions": {
|
|
||||||
"baseUrl": ".",
|
|
||||||
"paths": {
|
|
||||||
"@/*": ["./*"],
|
|
||||||
"@konobangu/*": ["../../packages/*"]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"include": [
|
|
||||||
"next-env.d.ts",
|
|
||||||
"next.config.ts",
|
|
||||||
"**/*.ts",
|
|
||||||
"**/*.tsx",
|
|
||||||
".next/types/**/*.ts"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
"crons": [
|
|
||||||
{
|
|
||||||
"path": "/cron/keep-alive",
|
|
||||||
"schedule": "0 1 * * *"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
export { default } from '@konobangu/testing';
|
|
||||||
@@ -4,8 +4,5 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "npx --yes mintlify dev --port 5004",
|
"dev": "npx --yes mintlify dev --port 5004",
|
||||||
"lint": "npx --yes mintlify broken-links"
|
"lint": "npx --yes mintlify broken-links"
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"typescript": "^5.7.3"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,19 +6,16 @@
|
|||||||
"build": "email build",
|
"build": "email build",
|
||||||
"dev": "email dev --port 5003",
|
"dev": "email dev --port 5003",
|
||||||
"export": "email export",
|
"export": "email export",
|
||||||
"clean": "git clean -xdf .cache .turbo dist node_modules",
|
"clean": "git clean -xdf .cache dist node_modules",
|
||||||
"typecheck": "tsc --noEmit --emitDeclarationOnly false"
|
"typecheck": "tsc --noEmit --emitDeclarationOnly false"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@konobangu/email": "workspace:*",
|
"@react-email/components": "^0.0.42",
|
||||||
"@react-email/components": "0.0.31",
|
|
||||||
"react": "^19.0.0",
|
"react": "^19.0.0",
|
||||||
"react-email": "3.0.4"
|
"react-email": "^4.0.16",
|
||||||
|
"@konobangu/email": "workspace:*"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@konobangu/typescript-config": "workspace:*",
|
"@types/react": "19.0.1"
|
||||||
"@types/node": "22.10.1",
|
|
||||||
"@types/react": "19.0.1",
|
|
||||||
"typescript": "^5.7.3"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,13 @@
|
|||||||
{
|
{
|
||||||
"extends": "@konobangu/typescript-config/nextjs.json",
|
"extends": "../../tsconfig.base.json",
|
||||||
|
"compilerOptions": {
|
||||||
|
"composite": true,
|
||||||
|
"jsx": "react-jsx",
|
||||||
|
"jsxImportSource": "react",
|
||||||
|
"module": "ESNext",
|
||||||
|
"moduleResolution": "bundler"
|
||||||
|
},
|
||||||
|
"references": [{ "path": "../../packages/email" }],
|
||||||
"include": ["**/*.ts", "**/*.tsx"],
|
"include": ["**/*.ts", "**/*.tsx"],
|
||||||
"exclude": ["node_modules"]
|
"exclude": ["node_modules"]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,8 +5,7 @@
|
|||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
^https://konobangu.com/api/playground*** reqHeaders://{x-forwarded.json} http://127.0.0.1:5002/api/playground$1
|
#^https://konobangu.com/api*** statusCode://500
|
||||||
^wss://konobangu.com/api/playground*** reqHeaders://{x-forwarded.json} ws://127.0.0.1:5002/api/playground$1
|
^https://konobangu.com/api*** reqHeaders://{x-forwarded.json} http://127.0.0.1:5001/api$1
|
||||||
^https://konobangu.com/api*** reqHeaders://{x-forwarded.json} http://127.0.0.1:5001/api$1 excludeFilter://^^https://konobangu.com/api/playground***
|
^https://konobangu.com/*** reqHeaders://{x-forwarded.json} http://127.0.0.1:5000/$1 excludeFilter://^https://konobangu.com/api***
|
||||||
^https://konobangu.com*** reqHeaders://{x-forwarded.json} http://127.0.0.1:5000$1 excludeFilter://^https://konobangu.com/api***
|
^wss://konobangu.com/*** reqHeaders://{x-forwarded.json} ws://127.0.0.1:5000/$1 excludeFilter://^wss://konobangu.com/api
|
||||||
|
|
||||||
1
apps/proxy/.whistle/rules/files/1.mikan_doppel
Normal file
1
apps/proxy/.whistle/rules/files/1.mikan_doppel
Normal file
@@ -0,0 +1 @@
|
|||||||
|
^https://mikanani.me/*** http://127.0.0.1:5005/$1 excludeFilter://^**/***.svg excludeFilter://^**/***.css excludeFilter://^**/***.js
|
||||||
@@ -1 +1 @@
|
|||||||
{"filesOrder":["konobangu"],"selectedList":["konobangu"],"disabledDefalutRules":true}
|
{"filesOrder":["konobangu","mikan_doppel"],"selectedList":["konobangu","mikan_doppel"],"disabledDefalutRules":true,"defalutRules":""}
|
||||||
|
|||||||
19
apps/proxy/Cargo.toml
Normal file
19
apps/proxy/Cargo.toml
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
[package]
|
||||||
|
name = "proxy"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2024"
|
||||||
|
|
||||||
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
[lib]
|
||||||
|
name = "proxy"
|
||||||
|
path = "src/lib.rs"
|
||||||
|
|
||||||
|
[[bin]]
|
||||||
|
name = "mikan_doppel"
|
||||||
|
path = "src/bin/mikan_doppel.rs"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
recorder = { workspace = true }
|
||||||
|
tokio = { workspace = true }
|
||||||
|
tracing-subscriber = { workspace = true }
|
||||||
|
tracing = { workspace = true }
|
||||||
@@ -3,13 +3,13 @@
|
|||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "cross-env WHISTLE_MODE=\"prod|capture|keepXFF|x-forwarded-host|x-forwarded-proto\" whistle run -p 8899 -t 30000 -D .",
|
"whistle": "cross-env WHISTLE_MODE=\"prod|capture|keepXFF|x-forwarded-host|x-forwarded-proto\" whistle run -p 8899 -t 30000 -D .",
|
||||||
"dev": "pnpm run start"
|
"mikan_doppel": "cargo run -p proxy --bin mikan_doppel",
|
||||||
|
"dev": "npm-run-all -p mikan_doppel whistle"
|
||||||
},
|
},
|
||||||
"keywords": [],
|
"keywords": [],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"cross-env": "^7.0.3",
|
"whistle": "^2.9.99"
|
||||||
"whistle": "^2.9.93"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
22
apps/proxy/src/bin/mikan_doppel.rs
Normal file
22
apps/proxy/src/bin/mikan_doppel.rs
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use recorder::{errors::RecorderResult, test_utils::mikan::MikanMockServer};
|
||||||
|
use tracing::Level;
|
||||||
|
|
||||||
|
#[allow(unused_variables)]
|
||||||
|
#[tokio::main]
|
||||||
|
async fn main() -> RecorderResult<()> {
|
||||||
|
tracing_subscriber::fmt()
|
||||||
|
.with_max_level(Level::DEBUG)
|
||||||
|
.init();
|
||||||
|
|
||||||
|
let mut mikan_server = MikanMockServer::new_with_port(5005).await.unwrap();
|
||||||
|
|
||||||
|
let resources_mock = mikan_server.mock_resources_with_doppel();
|
||||||
|
|
||||||
|
let login_mock = mikan_server.mock_get_login_page();
|
||||||
|
|
||||||
|
loop {
|
||||||
|
tokio::time::sleep(Duration::from_secs(1)).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
FROM mcr.microsoft.com/vscode/devcontainers/rust:0-1
|
|
||||||
|
|
||||||
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
|
|
||||||
&& apt-get -y install --no-install-recommends postgresql-client \
|
|
||||||
&& cargo install sea-orm-cli cargo-insta \
|
|
||||||
&& chown -R vscode /usr/local/cargo
|
|
||||||
|
|
||||||
COPY .env /.env
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "Konobangu Recorder",
|
|
||||||
"dockerComposeFile": "docker-compose.yml",
|
|
||||||
"service": "app",
|
|
||||||
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
|
|
||||||
"forwardPorts": [5001]
|
|
||||||
}
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
version: "3"
|
|
||||||
|
|
||||||
services:
|
|
||||||
app:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
command: sleep infinity
|
|
||||||
networks:
|
|
||||||
- db
|
|
||||||
- redis
|
|
||||||
volumes:
|
|
||||||
- ../..:/workspaces:cached
|
|
||||||
env_file:
|
|
||||||
- .env
|
|
||||||
db:
|
|
||||||
image: postgres:15.3-alpine
|
|
||||||
restart: unless-stopped
|
|
||||||
ports:
|
|
||||||
- 5432:5432
|
|
||||||
networks:
|
|
||||||
- db
|
|
||||||
volumes:
|
|
||||||
- postgres-data:/var/lib/postgresql/data
|
|
||||||
env_file:
|
|
||||||
- .env
|
|
||||||
redis:
|
|
||||||
image: redis:latest
|
|
||||||
restart: unless-stopped
|
|
||||||
ports:
|
|
||||||
- 6379:6379
|
|
||||||
networks:
|
|
||||||
- redis
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
postgres-data:
|
|
||||||
|
|
||||||
networks:
|
|
||||||
db:
|
|
||||||
redis:
|
|
||||||
17
apps/recorder/.env
Normal file
17
apps/recorder/.env
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
HOST="konobangu.com"
|
||||||
|
DATABASE_URL = "postgres://konobangu:konobangu@localhost:5432/konobangu"
|
||||||
|
STORAGE_DATA_DIR = "./data"
|
||||||
|
AUTH_TYPE = "basic" # or oidc
|
||||||
|
BASIC_USER = "konobangu"
|
||||||
|
BASIC_PASSWORD = "konobangu"
|
||||||
|
# OIDC_ISSUER="https://auth.logto.io/oidc"
|
||||||
|
# OIDC_AUDIENCE = "https://konobangu.com/api"
|
||||||
|
# OIDC_CLIENT_ID = "client_id"
|
||||||
|
# OIDC_CLIENT_SECRET = "client_secret" # optional
|
||||||
|
# OIDC_EXTRA_SCOPES = "read:konobangu write:konobangu"
|
||||||
|
# OIDC_EXTRA_CLAIM_KEY = ""
|
||||||
|
# OIDC_EXTRA_CLAIM_VALUE = ""
|
||||||
|
# MIKAN_PROXY = ""
|
||||||
|
# MIKAN_PROXY_AUTH_HEADER = ""
|
||||||
|
# MIKAN_NO_PROXY = ""
|
||||||
|
# MIKAN_PROXY_ACCEPT_INVALID_CERTS = "true"
|
||||||
17
apps/recorder/.env.dev
Normal file
17
apps/recorder/.env.dev
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
HOST="konobangu.com"
|
||||||
|
DATABASE_URL = "postgres://konobangu:konobangu@localhost:5432/konobangu"
|
||||||
|
STORAGE_DATA_DIR = "./data"
|
||||||
|
AUTH_TYPE = "basic" # or oidc
|
||||||
|
BASIC_USER = "konobangu"
|
||||||
|
BASIC_PASSWORD = "konobangu"
|
||||||
|
# OIDC_ISSUER="https://auth.logto.io/oidc"
|
||||||
|
# OIDC_AUDIENCE = "https://konobangu.com/api"
|
||||||
|
# OIDC_CLIENT_ID = "client_id"
|
||||||
|
# OIDC_CLIENT_SECRET = "client_secret" # optional
|
||||||
|
# OIDC_EXTRA_SCOPES = "read:konobangu write:konobangu"
|
||||||
|
# OIDC_EXTRA_CLAIM_KEY = ""
|
||||||
|
# OIDC_EXTRA_CLAIM_VALUE = ""
|
||||||
|
MIKAN_PROXY = "http://127.0.0.1:8899"
|
||||||
|
# MIKAN_PROXY_AUTH_HEADER = ""
|
||||||
|
# MIKAN_NO_PROXY = ""
|
||||||
|
MIKAN_PROXY_ACCEPT_INVALID_CERTS = true
|
||||||
4
apps/recorder/.gitignore
vendored
4
apps/recorder/.gitignore
vendored
@@ -25,3 +25,7 @@ Cargo.lock
|
|||||||
# Dist
|
# Dist
|
||||||
node_modules
|
node_modules
|
||||||
dist/
|
dist/
|
||||||
|
temp/*
|
||||||
|
!temp/.gitkeep
|
||||||
|
tests/resources/mikan/classic_episodes/*/*
|
||||||
|
!tests/resources/mikan/classic_episodes/parquet/tiny.parquet
|
||||||
@@ -2,8 +2,20 @@
|
|||||||
name = "recorder"
|
name = "recorder"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
|
[features]
|
||||||
|
default = ["jxl"]
|
||||||
|
playground = ["dep:inquire", "dep:color-eyre", "dep:polars"]
|
||||||
|
testcontainers = [
|
||||||
|
"dep:testcontainers",
|
||||||
|
"dep:testcontainers-modules",
|
||||||
|
"dep:testcontainers-ext",
|
||||||
|
"downloader/testcontainers",
|
||||||
|
"testcontainers-modules/postgres",
|
||||||
|
]
|
||||||
|
jxl = ["dep:jpegxl-rs", "dep:jpegxl-sys"]
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
name = "recorder"
|
name = "recorder"
|
||||||
path = "src/lib.rs"
|
path = "src/lib.rs"
|
||||||
@@ -13,89 +25,108 @@ name = "recorder_cli"
|
|||||||
path = "src/bin/main.rs"
|
path = "src/bin/main.rs"
|
||||||
required-features = []
|
required-features = []
|
||||||
|
|
||||||
[features]
|
[[example]]
|
||||||
default = []
|
name = "mikan_collect_classic_eps"
|
||||||
testcontainers = [
|
path = "examples/mikan_collect_classic_eps.rs"
|
||||||
"dep:testcontainers",
|
required-features = ["playground"]
|
||||||
"dep:testcontainers-modules",
|
|
||||||
"dep:bollard",
|
[[example]]
|
||||||
]
|
name = "mikan_doppel_season_subscription"
|
||||||
|
path = "examples/mikan_doppel_season_subscription.rs"
|
||||||
|
required-features = ["playground"]
|
||||||
|
|
||||||
|
[[example]]
|
||||||
|
name = "mikan_doppel_subscriber_subscription"
|
||||||
|
path = "examples/mikan_doppel_subscriber_subscription.rs"
|
||||||
|
required-features = ["playground"]
|
||||||
|
|
||||||
|
[[example]]
|
||||||
|
name = "playground"
|
||||||
|
path = "examples/playground.rs"
|
||||||
|
required-features = ["playground"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
serde = { version = "1", features = ["derive"] }
|
downloader = { workspace = true }
|
||||||
serde_json = "1"
|
util = { workspace = true }
|
||||||
tokio = { version = "1.42", features = ["macros", "fs", "rt-multi-thread"] }
|
util-derive = { workspace = true }
|
||||||
async-trait = "0.1.83"
|
fetch = { workspace = true }
|
||||||
tracing = "0.1"
|
|
||||||
chrono = "0.4"
|
serde = { workspace = true }
|
||||||
|
tokio = { workspace = true }
|
||||||
|
serde_json = { workspace = true }
|
||||||
|
async-trait = { workspace = true }
|
||||||
|
testcontainers = { workspace = true, optional = true }
|
||||||
|
testcontainers-modules = { workspace = true, optional = true }
|
||||||
|
testcontainers-ext = { workspace = true, optional = true, features = [
|
||||||
|
"tracing",
|
||||||
|
] }
|
||||||
|
tracing = { workspace = true }
|
||||||
|
axum = { workspace = true }
|
||||||
|
axum-extra = { workspace = true }
|
||||||
|
snafu = { workspace = true }
|
||||||
|
itertools = { workspace = true }
|
||||||
|
url = { workspace = true }
|
||||||
|
regex = { workspace = true }
|
||||||
|
lazy_static = { workspace = true }
|
||||||
|
quirks_path = { workspace = true }
|
||||||
|
futures = { workspace = true }
|
||||||
|
bytes = { workspace = true }
|
||||||
|
serde_with = { workspace = true }
|
||||||
|
moka = { workspace = true }
|
||||||
|
chrono = { workspace = true }
|
||||||
|
tracing-subscriber = { workspace = true }
|
||||||
|
mockito = { workspace = true }
|
||||||
|
color-eyre = { workspace = true, optional = true }
|
||||||
|
inquire = { workspace = true, optional = true }
|
||||||
|
convert_case = { workspace = true }
|
||||||
|
image = { workspace = true }
|
||||||
|
uuid = { workspace = true }
|
||||||
|
maplit = { workspace = true }
|
||||||
|
once_cell = { workspace = true }
|
||||||
|
rand = { workspace = true }
|
||||||
|
rust_decimal = { workspace = true }
|
||||||
|
base64 = { workspace = true }
|
||||||
|
nom = { workspace = true }
|
||||||
|
percent-encoding = { workspace = true }
|
||||||
|
num-traits = { workspace = true }
|
||||||
|
http = { workspace = true }
|
||||||
|
async-stream = { workspace = true }
|
||||||
|
serde_variant = { workspace = true }
|
||||||
|
tracing-appender = { workspace = true }
|
||||||
|
clap = { workspace = true }
|
||||||
|
ipnetwork = { workspace = true }
|
||||||
|
typed-builder = { workspace = true }
|
||||||
|
nanoid = { workspace = true }
|
||||||
|
webp = { workspace = true }
|
||||||
|
|
||||||
sea-orm = { version = "1.1", features = [
|
sea-orm = { version = "1.1", features = [
|
||||||
"sqlx-sqlite",
|
"sqlx-sqlite",
|
||||||
"sqlx-postgres",
|
"sqlx-postgres",
|
||||||
"runtime-tokio-rustls",
|
"runtime-tokio",
|
||||||
"macros",
|
"macros",
|
||||||
"debug-print",
|
"debug-print",
|
||||||
] }
|
] }
|
||||||
figment = { version = "0.10", features = ["toml", "json", "env", "yaml"] }
|
figment = { version = "0.10", features = ["toml", "json", "env", "yaml"] }
|
||||||
|
sea-orm-migration = { version = "1.1", features = ["runtime-tokio"] }
|
||||||
axum = "0.8"
|
|
||||||
uuid = { version = "1.6.0", features = ["v4"] }
|
|
||||||
tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
|
|
||||||
sea-orm-migration = { version = "1.1", features = ["runtime-tokio-rustls"] }
|
|
||||||
reqwest = { version = "0.12", default-features = false, features = [
|
|
||||||
"charset",
|
|
||||||
"http2",
|
|
||||||
"json",
|
|
||||||
"macos-system-configuration",
|
|
||||||
"rustls-tls",
|
|
||||||
"cookies",
|
|
||||||
] }
|
|
||||||
thiserror = "2"
|
|
||||||
rss = "2"
|
rss = "2"
|
||||||
bytes = "1.9"
|
|
||||||
itertools = "0.14"
|
|
||||||
url = "2.5"
|
|
||||||
fancy-regex = "0.14"
|
fancy-regex = "0.14"
|
||||||
regex = "1.11"
|
lightningcss = "1.0.0-alpha.66"
|
||||||
lazy_static = "1.5"
|
|
||||||
maplit = "1.0.2"
|
|
||||||
lightningcss = "1.0.0-alpha.61"
|
|
||||||
html-escape = "0.2.13"
|
html-escape = "0.2.13"
|
||||||
opendal = { version = "0.51.0", features = ["default", "services-fs"] }
|
opendal = { version = "0.53", features = ["default", "services-fs"] }
|
||||||
zune-image = "0.4.15"
|
scraper = "0.23.1"
|
||||||
once_cell = "1.20.2"
|
async-graphql = { version = "7", features = ["dynamic-schema"] }
|
||||||
reqwest-middleware = "0.4.0"
|
async-graphql-axum = "7"
|
||||||
reqwest-retry = "0.7.0"
|
seaography = { version = "1.1", features = [
|
||||||
reqwest-tracing = "0.5.5"
|
"with-json",
|
||||||
scraper = "0.22.0"
|
"with-chrono",
|
||||||
leaky-bucket = "1.1.2"
|
"with-time",
|
||||||
serde_with = "3"
|
"with-uuid",
|
||||||
jwt-authorizer = "0.15.0"
|
"with-decimal",
|
||||||
futures = "0.3.31"
|
"with-bigdecimal",
|
||||||
librqbit-core = "4"
|
"with-postgres-array",
|
||||||
qbit-rs = { git = "https://github.com/lonelyhentxi/qbit.git", rev = "72d53138ebe", features = [
|
"with-json-as-scalar",
|
||||||
"default",
|
|
||||||
"builder",
|
|
||||||
] }
|
] }
|
||||||
testcontainers = { version = "0.23.3", features = [
|
|
||||||
"default",
|
|
||||||
"properties-config",
|
|
||||||
"watchdog",
|
|
||||||
"http_wait",
|
|
||||||
"reusable-containers",
|
|
||||||
], optional = true }
|
|
||||||
testcontainers-modules = { version = "0.11.4", optional = true }
|
|
||||||
color-eyre = "0.6"
|
|
||||||
log = "0.4.22"
|
|
||||||
anyhow = "1.0.95"
|
|
||||||
bollard = { version = "0.18", optional = true }
|
|
||||||
async-graphql = { version = "7.0.15", features = [] }
|
|
||||||
async-graphql-axum = "7.0.15"
|
|
||||||
fastrand = "2.3.0"
|
|
||||||
seaography = { version = "1.1" }
|
|
||||||
quirks_path = "0.1.1"
|
|
||||||
base64 = "0.22.1"
|
|
||||||
tower = "0.5.2"
|
tower = "0.5.2"
|
||||||
axum-extra = "0.10"
|
|
||||||
tower-http = { version = "0.6", features = [
|
tower-http = { version = "0.6", features = [
|
||||||
"trace",
|
"trace",
|
||||||
"catch-panic",
|
"catch-panic",
|
||||||
@@ -106,34 +137,33 @@ tower-http = { version = "0.6", features = [
|
|||||||
"set-header",
|
"set-header",
|
||||||
"compression-full",
|
"compression-full",
|
||||||
] }
|
] }
|
||||||
serde_yaml = "0.9.34"
|
|
||||||
tera = "1.20.0"
|
tera = "1.20.0"
|
||||||
openidconnect = { version = "4", features = ["rustls-tls"] }
|
openidconnect = { version = "4" }
|
||||||
http-cache-reqwest = { version = "0.15", features = [
|
dotenvy = "0.15.7"
|
||||||
"manager-cacache",
|
jpegxl-rs = { version = "0.11.2", optional = true }
|
||||||
"manager-moka",
|
jpegxl-sys = { version = "0.11.2", optional = true }
|
||||||
] }
|
|
||||||
moka = "0.12.10"
|
apalis = { version = "0.7", features = ["limit", "tracing", "catch-panic"] }
|
||||||
http-cache = { version = "0.20.0", features = [
|
apalis-sql = { version = "0.7", features = ["postgres"] }
|
||||||
"cacache-tokio",
|
cocoon = { version = "0.4.3", features = ["getrandom", "thiserror"] }
|
||||||
"manager-cacache",
|
reqwest_cookie_store = "0.8.0"
|
||||||
"manager-moka",
|
jwtk = "0.4.0"
|
||||||
], default-features = false }
|
mime_guess = "2.0.5"
|
||||||
http-cache-semantics = "2.1.0"
|
icu_properties = "2.0.1"
|
||||||
dotenv = "0.15.0"
|
icu = "2.0.0"
|
||||||
nom = "8.0.0"
|
tracing-tree = "0.4.0"
|
||||||
secrecy = { version = "0.10.3", features = ["serde"] }
|
num_cpus = "1.17.0"
|
||||||
http = "1.2.0"
|
headers-accept = "0.1.4"
|
||||||
cookie = "0.18.1"
|
polars = { version = "0.49.1", features = [
|
||||||
async-stream = "0.3.6"
|
"parquet",
|
||||||
serde_variant = "0.1.3"
|
"lazy",
|
||||||
tracing-appender = "0.2.3"
|
"diagonal_concat",
|
||||||
clap = "4.5.31"
|
], optional = true }
|
||||||
futures-util = "0.3.31"
|
|
||||||
ipnetwork = "0.21.1"
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
|
inquire = { workspace = true }
|
||||||
|
color-eyre = { workspace = true }
|
||||||
serial_test = "3"
|
serial_test = "3"
|
||||||
insta = { version = "1", features = ["redactions", "yaml", "filters"] }
|
insta = { version = "1", features = ["redactions", "toml", "filters"] }
|
||||||
mockito = "1.6.1"
|
rstest = "0.25"
|
||||||
rstest = "0.24.0"
|
ctor = "0.4.0"
|
||||||
|
|||||||
584
apps/recorder/examples/mikan_collect_classic_eps.rs
Normal file
584
apps/recorder/examples/mikan_collect_classic_eps.rs
Normal file
@@ -0,0 +1,584 @@
|
|||||||
|
use std::collections::HashSet;
|
||||||
|
|
||||||
|
use chrono::{DateTime, Duration, FixedOffset, NaiveDate, NaiveTime, TimeZone, Utc};
|
||||||
|
use fetch::{HttpClientConfig, fetch_html};
|
||||||
|
use itertools::Itertools;
|
||||||
|
use lazy_static::lazy_static;
|
||||||
|
use nom::{
|
||||||
|
IResult, Parser,
|
||||||
|
branch::alt,
|
||||||
|
bytes::complete::{tag, take, take_till1},
|
||||||
|
character::complete::space1,
|
||||||
|
combinator::map,
|
||||||
|
};
|
||||||
|
use recorder::{
|
||||||
|
errors::{RecorderError, RecorderResult},
|
||||||
|
extract::{
|
||||||
|
html::extract_inner_text_from_element_ref,
|
||||||
|
mikan::{MikanClient, MikanConfig, MikanEpisodeHash, MikanFansubHash},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
use regex::Regex;
|
||||||
|
use scraper::{ElementRef, Html, Selector};
|
||||||
|
use snafu::FromString;
|
||||||
|
use url::Url;
|
||||||
|
|
||||||
|
lazy_static! {
|
||||||
|
static ref TEST_FOLDER: std::path::PathBuf =
|
||||||
|
if cfg!(any(test, debug_assertions, feature = "playground")) {
|
||||||
|
std::path::PathBuf::from(format!(
|
||||||
|
"{}/tests/resources/mikan/classic_episodes",
|
||||||
|
env!("CARGO_MANIFEST_DIR")
|
||||||
|
))
|
||||||
|
} else {
|
||||||
|
std::path::PathBuf::from("tests/resources/mikan/classic_episodes")
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
lazy_static! {
|
||||||
|
static ref TOTAL_PAGE_REGEX: Regex =
|
||||||
|
Regex::new(r#"\$\(\'\.classic-view-pagination2\'\)\.bootpag\(\{\s*total:\s*(\d+)"#)
|
||||||
|
.unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct MikanClassicEpisodeTableRow {
|
||||||
|
pub id: i32,
|
||||||
|
pub publish_at: DateTime<Utc>,
|
||||||
|
pub mikan_fansub_id: Option<String>,
|
||||||
|
pub fansub_name: Option<String>,
|
||||||
|
pub mikan_episode_id: String,
|
||||||
|
pub original_name: String,
|
||||||
|
pub magnet_link: Option<String>,
|
||||||
|
pub file_size: Option<String>,
|
||||||
|
pub torrent_link: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl MikanClassicEpisodeTableRow {
|
||||||
|
fn timezone() -> FixedOffset {
|
||||||
|
FixedOffset::east_opt(8 * 3600).unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn fixed_date_parser(input: &str) -> IResult<&str, NaiveDate> {
|
||||||
|
alt((
|
||||||
|
map(tag("今天"), move |_| {
|
||||||
|
Utc::now().with_timezone(&Self::timezone()).date_naive()
|
||||||
|
}),
|
||||||
|
map(tag("昨天"), move |_| {
|
||||||
|
Utc::now().with_timezone(&Self::timezone()).date_naive() - Duration::days(1)
|
||||||
|
}),
|
||||||
|
))
|
||||||
|
.parse(input)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn formatted_date_parser(input: &str) -> IResult<&str, NaiveDate> {
|
||||||
|
let (remain, date_str) = take_till1(|c: char| c.is_whitespace()).parse(input)?;
|
||||||
|
let date = NaiveDate::parse_from_str(date_str, "%Y/%m/%d").map_err(|_| {
|
||||||
|
nom::Err::Error(nom::error::Error::new(input, nom::error::ErrorKind::Verify))
|
||||||
|
})?;
|
||||||
|
Ok((remain, date))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn date_parser(input: &str) -> IResult<&str, NaiveDate> {
|
||||||
|
alt((Self::fixed_date_parser, Self::formatted_date_parser)).parse(input)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn time_parser(input: &str) -> IResult<&str, NaiveTime> {
|
||||||
|
let (remain, time_str) = take(5usize).parse(input)?;
|
||||||
|
let time = NaiveTime::parse_from_str(time_str, "%H:%M").map_err(|_| {
|
||||||
|
nom::Err::Error(nom::error::Error::new(input, nom::error::ErrorKind::Verify))
|
||||||
|
})?;
|
||||||
|
Ok((remain, time))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn extract_publish_at(text: &str) -> Option<DateTime<Utc>> {
|
||||||
|
let (_, (date, _, time)) = (Self::date_parser, space1, Self::time_parser)
|
||||||
|
.parse(text)
|
||||||
|
.ok()?;
|
||||||
|
let local_dt = Self::timezone()
|
||||||
|
.from_local_datetime(&date.and_time(time))
|
||||||
|
.single()?;
|
||||||
|
Some(local_dt.with_timezone(&Utc))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn from_element_ref(
|
||||||
|
row: ElementRef<'_>,
|
||||||
|
rev_id: i32,
|
||||||
|
idx: i32,
|
||||||
|
mikan_base_url: &Url,
|
||||||
|
) -> RecorderResult<Self> {
|
||||||
|
let publish_at_selector = &Selector::parse("td:nth-of-type(1)").unwrap();
|
||||||
|
let fansub_selector = &Selector::parse("td:nth-of-type(2) > a").unwrap();
|
||||||
|
let original_name_selector =
|
||||||
|
&Selector::parse("td:nth-of-type(3) > a:nth-of-type(1)").unwrap();
|
||||||
|
let magnet_link_selector =
|
||||||
|
&Selector::parse("td:nth-of-type(3) > a:nth-of-type(2)").unwrap();
|
||||||
|
let file_size_selector = &Selector::parse("td:nth-of-type(4)").unwrap();
|
||||||
|
let torrent_link_selector = &Selector::parse("td:nth-of-type(5) > a").unwrap();
|
||||||
|
|
||||||
|
let publish_at = row
|
||||||
|
.select(publish_at_selector)
|
||||||
|
.next()
|
||||||
|
.map(extract_inner_text_from_element_ref)
|
||||||
|
.and_then(|e| Self::extract_publish_at(&e));
|
||||||
|
|
||||||
|
let (mikan_fansub_hash, fansub_name) = row
|
||||||
|
.select(fansub_selector)
|
||||||
|
.next()
|
||||||
|
.and_then(|e| {
|
||||||
|
e.attr("href")
|
||||||
|
.and_then(|s| mikan_base_url.join(s).ok())
|
||||||
|
.and_then(|u| MikanFansubHash::from_homepage_url(&u))
|
||||||
|
.map(|h| (h, extract_inner_text_from_element_ref(e)))
|
||||||
|
})
|
||||||
|
.unzip();
|
||||||
|
|
||||||
|
let (mikan_episode_hash, original_name) = row
|
||||||
|
.select(original_name_selector)
|
||||||
|
.next()
|
||||||
|
.and_then(|el| {
|
||||||
|
el.attr("href")
|
||||||
|
.and_then(|s| mikan_base_url.join(s).ok())
|
||||||
|
.and_then(|u| MikanEpisodeHash::from_homepage_url(&u))
|
||||||
|
.map(|h| (h, extract_inner_text_from_element_ref(el)))
|
||||||
|
})
|
||||||
|
.unzip();
|
||||||
|
|
||||||
|
let magnet_link = row
|
||||||
|
.select(magnet_link_selector)
|
||||||
|
.next()
|
||||||
|
.and_then(|el| el.attr("data-clipboard-text"));
|
||||||
|
|
||||||
|
let file_size = row
|
||||||
|
.select(file_size_selector)
|
||||||
|
.next()
|
||||||
|
.map(extract_inner_text_from_element_ref);
|
||||||
|
|
||||||
|
let torrent_link = row
|
||||||
|
.select(torrent_link_selector)
|
||||||
|
.next()
|
||||||
|
.and_then(|el| el.attr("href"));
|
||||||
|
|
||||||
|
if let (Some(mikan_episode_hash), Some(original_name), Some(publish_at)) = (
|
||||||
|
mikan_episode_hash.as_ref(),
|
||||||
|
original_name.as_ref(),
|
||||||
|
publish_at.as_ref(),
|
||||||
|
) {
|
||||||
|
Ok(Self {
|
||||||
|
id: rev_id * 1000 + idx,
|
||||||
|
publish_at: *publish_at,
|
||||||
|
mikan_fansub_id: mikan_fansub_hash.map(|h| h.mikan_fansub_id.clone()),
|
||||||
|
fansub_name,
|
||||||
|
mikan_episode_id: mikan_episode_hash.mikan_episode_id.clone(),
|
||||||
|
original_name: original_name.clone(),
|
||||||
|
magnet_link: magnet_link.map(|s| s.to_string()),
|
||||||
|
file_size: file_size.map(|s| s.to_string()),
|
||||||
|
torrent_link: torrent_link.map(|s| s.to_string()),
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
let mut missing_fields = vec![];
|
||||||
|
if mikan_episode_hash.is_none() {
|
||||||
|
missing_fields.push("mikan_episode_id");
|
||||||
|
}
|
||||||
|
if original_name.is_none() {
|
||||||
|
missing_fields.push("original_name");
|
||||||
|
}
|
||||||
|
if publish_at.is_none() {
|
||||||
|
missing_fields.push("publish_at");
|
||||||
|
}
|
||||||
|
Err(RecorderError::without_source(format!(
|
||||||
|
"Failed to parse episode table row, missing fields: {missing_fields:?}, row \
|
||||||
|
index: {idx}"
|
||||||
|
)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct MikanClassicEpisodeTablePage {
|
||||||
|
pub page: i32,
|
||||||
|
pub total: i32,
|
||||||
|
pub html: String,
|
||||||
|
pub rows: Vec<MikanClassicEpisodeTableRow>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl MikanClassicEpisodeTablePage {
|
||||||
|
pub fn from_html(
|
||||||
|
html: String,
|
||||||
|
mikan_base_url: &Url,
|
||||||
|
page: i32,
|
||||||
|
updated_info: Option<(i32, i32)>,
|
||||||
|
) -> RecorderResult<Self> {
|
||||||
|
let tr_selector = &Selector::parse("tbody tr").unwrap();
|
||||||
|
let doc = Html::parse_document(&html);
|
||||||
|
if let Some(mut total) = TOTAL_PAGE_REGEX
|
||||||
|
.captures(&html)
|
||||||
|
.and_then(|c| c.get(1))
|
||||||
|
.and_then(|s| s.as_str().parse::<i32>().ok())
|
||||||
|
{
|
||||||
|
if let Some((_, update_total)) = updated_info {
|
||||||
|
total = update_total;
|
||||||
|
}
|
||||||
|
|
||||||
|
let rev_id = total - page;
|
||||||
|
let rows = doc
|
||||||
|
.select(tr_selector)
|
||||||
|
.rev()
|
||||||
|
.enumerate()
|
||||||
|
.map(|(idx, tr)| {
|
||||||
|
MikanClassicEpisodeTableRow::from_element_ref(
|
||||||
|
tr,
|
||||||
|
rev_id,
|
||||||
|
idx as i32,
|
||||||
|
mikan_base_url,
|
||||||
|
)
|
||||||
|
})
|
||||||
|
.collect::<RecorderResult<Vec<_>>>()?;
|
||||||
|
Ok(Self {
|
||||||
|
page,
|
||||||
|
total,
|
||||||
|
html,
|
||||||
|
rows,
|
||||||
|
})
|
||||||
|
} else {
|
||||||
|
Err(RecorderError::without_source(
|
||||||
|
"Failed to parse pagination meta and rows".into(),
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn save_to_files(&self) -> RecorderResult<()> {
|
||||||
|
use polars::prelude::*;
|
||||||
|
|
||||||
|
let rev_id = self.total - self.page;
|
||||||
|
let parquet_path = TEST_FOLDER.join(format!("parquet/rev_{rev_id}.parquet"));
|
||||||
|
let csv_path = TEST_FOLDER.join(format!("csv/rev_{rev_id}.csv"));
|
||||||
|
let html_path = TEST_FOLDER.join(format!("html/rev_{rev_id}.html"));
|
||||||
|
|
||||||
|
std::fs::write(html_path, self.html.clone())?;
|
||||||
|
|
||||||
|
let mut id_vec = Vec::new();
|
||||||
|
let mut publish_at_vec = Vec::new();
|
||||||
|
let mut mikan_fansub_id_vec = Vec::new();
|
||||||
|
let mut fansub_name_vec = Vec::new();
|
||||||
|
let mut mikan_episode_id_vec = Vec::new();
|
||||||
|
let mut original_name_vec = Vec::new();
|
||||||
|
let mut magnet_link_vec = Vec::new();
|
||||||
|
let mut file_size_vec = Vec::new();
|
||||||
|
let mut torrent_link_vec = Vec::new();
|
||||||
|
|
||||||
|
for row in &self.rows {
|
||||||
|
id_vec.push(row.id);
|
||||||
|
publish_at_vec.push(row.publish_at.to_rfc3339());
|
||||||
|
mikan_fansub_id_vec.push(row.mikan_fansub_id.clone());
|
||||||
|
fansub_name_vec.push(row.fansub_name.clone());
|
||||||
|
mikan_episode_id_vec.push(row.mikan_episode_id.clone());
|
||||||
|
original_name_vec.push(row.original_name.clone());
|
||||||
|
magnet_link_vec.push(row.magnet_link.clone());
|
||||||
|
file_size_vec.push(row.file_size.clone());
|
||||||
|
torrent_link_vec.push(row.torrent_link.clone());
|
||||||
|
}
|
||||||
|
|
||||||
|
let df = df! [
|
||||||
|
"id" => id_vec,
|
||||||
|
"publish_at_timestamp" => publish_at_vec,
|
||||||
|
"mikan_fansub_id" => mikan_fansub_id_vec,
|
||||||
|
"fansub_name" => fansub_name_vec,
|
||||||
|
"mikan_episode_id" => mikan_episode_id_vec,
|
||||||
|
"original_name" => original_name_vec,
|
||||||
|
"magnet_link" => magnet_link_vec,
|
||||||
|
"file_size" => file_size_vec,
|
||||||
|
"torrent_link" => torrent_link_vec,
|
||||||
|
]
|
||||||
|
.map_err(|e| {
|
||||||
|
let message = format!("Failed to create DataFrame: {e}");
|
||||||
|
RecorderError::with_source(Box::new(e), message)
|
||||||
|
})?;
|
||||||
|
|
||||||
|
let mut parquet_file = std::fs::File::create(&parquet_path)?;
|
||||||
|
|
||||||
|
ParquetWriter::new(&mut parquet_file)
|
||||||
|
.finish(&mut df.clone())
|
||||||
|
.map_err(|e| {
|
||||||
|
let message = format!("Failed to write parquet file: {e}");
|
||||||
|
RecorderError::with_source(Box::new(e), message)
|
||||||
|
})?;
|
||||||
|
|
||||||
|
let mut csv_file = std::fs::File::create(&csv_path)?;
|
||||||
|
|
||||||
|
CsvWriter::new(&mut csv_file)
|
||||||
|
.include_header(true)
|
||||||
|
.with_quote_style(QuoteStyle::Always)
|
||||||
|
.finish(&mut df.clone())
|
||||||
|
.map_err(|e| {
|
||||||
|
let message = format!("Failed to write csv file: {e}");
|
||||||
|
RecorderError::with_source(Box::new(e), message)
|
||||||
|
})?;
|
||||||
|
|
||||||
|
println!(
|
||||||
|
"[{}/{}] Saved {} rows to rev_{}.{{parquet,html,csv}}",
|
||||||
|
self.page,
|
||||||
|
self.total,
|
||||||
|
self.rows.len(),
|
||||||
|
rev_id
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn waiting_rev_ids(total: i32) -> RecorderResult<Vec<i32>> {
|
||||||
|
let dir = TEST_FOLDER.join("csv");
|
||||||
|
|
||||||
|
let files = std::fs::read_dir(dir)?;
|
||||||
|
|
||||||
|
let rev_ids = files
|
||||||
|
.filter_map(|f| f.ok())
|
||||||
|
.filter_map(|f| {
|
||||||
|
f.path().file_stem().and_then(|s| {
|
||||||
|
s.to_str().and_then(|s| {
|
||||||
|
if s.starts_with("rev_") {
|
||||||
|
s.replace("rev_", "").parse::<i32>().ok()
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
|
.collect::<HashSet<_>>();
|
||||||
|
|
||||||
|
Ok((0..total)
|
||||||
|
.filter(|rev_id| !rev_ids.contains(rev_id))
|
||||||
|
.collect::<Vec<_>>())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn scrape_mikan_classic_episode_table_page(
|
||||||
|
mikan_client: &MikanClient,
|
||||||
|
page: i32,
|
||||||
|
updated_info: Option<(i32, i32)>,
|
||||||
|
) -> RecorderResult<MikanClassicEpisodeTablePage> {
|
||||||
|
let mikan_base_url = mikan_client.base_url();
|
||||||
|
let url = mikan_base_url.join(&format!("/Home/Classic/{page}"))?;
|
||||||
|
|
||||||
|
if let Some((rev_id, update_total)) = updated_info.as_ref() {
|
||||||
|
let html_path = TEST_FOLDER.join(format!("html/rev_{rev_id}.html"));
|
||||||
|
if html_path.exists() {
|
||||||
|
let html = std::fs::read_to_string(&html_path)?;
|
||||||
|
println!("[{page}/{update_total}] html exists, skipping fetch");
|
||||||
|
return MikanClassicEpisodeTablePage::from_html(
|
||||||
|
html,
|
||||||
|
mikan_base_url,
|
||||||
|
page,
|
||||||
|
updated_info,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let total = if let Some((_, update_total)) = updated_info.as_ref() {
|
||||||
|
update_total.to_string()
|
||||||
|
} else {
|
||||||
|
"Unknown".to_string()
|
||||||
|
};
|
||||||
|
|
||||||
|
println!("[{page}/{total}] fetching html...");
|
||||||
|
|
||||||
|
let html = fetch_html(mikan_client, url).await?;
|
||||||
|
|
||||||
|
println!("[{page}/{total}] fetched html done");
|
||||||
|
|
||||||
|
std::fs::write(TEST_FOLDER.join("html/temp.html"), html.clone())?;
|
||||||
|
|
||||||
|
MikanClassicEpisodeTablePage::from_html(html, mikan_base_url, page, updated_info)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn scrape_mikan_classic_episode_table_page_from_rev_id(
|
||||||
|
mikan_client: &MikanClient,
|
||||||
|
total: i32,
|
||||||
|
rev_idx: i32,
|
||||||
|
) -> RecorderResult<MikanClassicEpisodeTablePage> {
|
||||||
|
let page = total - rev_idx;
|
||||||
|
|
||||||
|
scrape_mikan_classic_episode_table_page(mikan_client, page, Some((rev_idx, total))).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn merge_mikan_classic_episodes_and_strip_columns() -> RecorderResult<()> {
|
||||||
|
use polars::prelude::*;
|
||||||
|
|
||||||
|
let dir = TEST_FOLDER.join("parquet");
|
||||||
|
let files = std::fs::read_dir(dir)?;
|
||||||
|
|
||||||
|
let parquet_paths = files
|
||||||
|
.filter_map(|f| f.ok())
|
||||||
|
.filter_map(|f| {
|
||||||
|
let path = f.path();
|
||||||
|
if let Some(ext) = path.extension()
|
||||||
|
&& ext == "parquet"
|
||||||
|
&& path
|
||||||
|
.file_stem()
|
||||||
|
.is_some_and(|f| f.to_string_lossy().starts_with("rev_"))
|
||||||
|
{
|
||||||
|
Some(path)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
|
||||||
|
if parquet_paths.is_empty() {
|
||||||
|
return Err(RecorderError::without_source(
|
||||||
|
"No parquet files found to merge".into(),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
println!("Found {} parquet files to merge", parquet_paths.len());
|
||||||
|
|
||||||
|
// 读取并合并所有 parquet 文件
|
||||||
|
let mut all_dfs = Vec::new();
|
||||||
|
for path in &parquet_paths {
|
||||||
|
println!("Reading {path:?}");
|
||||||
|
let file = std::fs::File::open(path)?;
|
||||||
|
let df = ParquetReader::new(file).finish().map_err(|e| {
|
||||||
|
let message = format!("Failed to read parquet file {path:?}: {e}");
|
||||||
|
RecorderError::with_source(Box::new(e), message)
|
||||||
|
})?;
|
||||||
|
all_dfs.push(df);
|
||||||
|
}
|
||||||
|
|
||||||
|
let lazy_frames: Vec<LazyFrame> = all_dfs.into_iter().map(|df| df.lazy()).collect();
|
||||||
|
|
||||||
|
let merged_df = concat_lf_diagonal(&lazy_frames, UnionArgs::default())
|
||||||
|
.map_err(|e| {
|
||||||
|
let message = format!("Failed to concat DataFrames: {e}");
|
||||||
|
RecorderError::with_source(Box::new(e), message)
|
||||||
|
})?
|
||||||
|
.sort(
|
||||||
|
["publish_at_timestamp"],
|
||||||
|
SortMultipleOptions::default().with_order_descending(true),
|
||||||
|
)
|
||||||
|
.unique(
|
||||||
|
Some(vec![
|
||||||
|
"mikan_fansub_id".to_string(),
|
||||||
|
"mikan_episode_id".to_string(),
|
||||||
|
]),
|
||||||
|
UniqueKeepStrategy::First,
|
||||||
|
)
|
||||||
|
.collect()
|
||||||
|
.map_err(|e| {
|
||||||
|
let message = format!("Failed to collect lazy DataFrame: {e}");
|
||||||
|
RecorderError::with_source(Box::new(e), message)
|
||||||
|
})?;
|
||||||
|
|
||||||
|
fn select_columns_and_write(
|
||||||
|
merged_df: DataFrame,
|
||||||
|
name: &str,
|
||||||
|
columns: &[&str],
|
||||||
|
) -> RecorderResult<()> {
|
||||||
|
let result_df = merged_df
|
||||||
|
.lazy()
|
||||||
|
.sort(["publish_at_timestamp"], SortMultipleOptions::default())
|
||||||
|
.select(columns.iter().map(|c| col(*c)).collect_vec())
|
||||||
|
.collect()
|
||||||
|
.map_err(|e| {
|
||||||
|
let message = format!("Failed to sort and select columns: {e}");
|
||||||
|
RecorderError::with_source(Box::new(e), message)
|
||||||
|
})?;
|
||||||
|
|
||||||
|
let output_path = TEST_FOLDER.join(format!("parquet/{name}.parquet"));
|
||||||
|
let mut output_file = std::fs::File::create(&output_path)?;
|
||||||
|
|
||||||
|
ParquetWriter::new(&mut output_file)
|
||||||
|
.set_parallel(true)
|
||||||
|
.with_compression(ParquetCompression::Zstd(Some(
|
||||||
|
ZstdLevel::try_new(22).unwrap(),
|
||||||
|
)))
|
||||||
|
.finish(&mut result_df.clone())
|
||||||
|
.map_err(|e| {
|
||||||
|
let message = format!("Failed to write merged parquet file: {e}");
|
||||||
|
RecorderError::with_source(Box::new(e), message)
|
||||||
|
})?;
|
||||||
|
|
||||||
|
println!("Merged {} rows into {output_path:?}", result_df.height());
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
select_columns_and_write(merged_df.clone(), "tiny", &["fansub_name", "original_name"])?;
|
||||||
|
// select_columns_and_write(
|
||||||
|
// merged_df.clone(),
|
||||||
|
// "lite",
|
||||||
|
// &[
|
||||||
|
// "mikan_fansub_id",
|
||||||
|
// "fansub_name",
|
||||||
|
// "mikan_episode_id",
|
||||||
|
// "original_name",
|
||||||
|
// ],
|
||||||
|
// )?;
|
||||||
|
// select_columns_and_write(
|
||||||
|
// merged_df,
|
||||||
|
// "full",
|
||||||
|
// &[
|
||||||
|
// "id",
|
||||||
|
// "publish_at_timestamp",
|
||||||
|
// "mikan_fansub_id",
|
||||||
|
// "fansub_name",
|
||||||
|
// "mikan_episode_id",
|
||||||
|
// "original_name",
|
||||||
|
// "magnet_link",
|
||||||
|
// "file_size",
|
||||||
|
// "torrent_link",
|
||||||
|
// ],
|
||||||
|
// )?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::main]
|
||||||
|
async fn main() -> RecorderResult<()> {
|
||||||
|
std::fs::create_dir_all(TEST_FOLDER.join("html"))?;
|
||||||
|
std::fs::create_dir_all(TEST_FOLDER.join("parquet"))?;
|
||||||
|
std::fs::create_dir_all(TEST_FOLDER.join("csv"))?;
|
||||||
|
|
||||||
|
let mikan_scrape_client = MikanClient::from_config(MikanConfig {
|
||||||
|
http_client: HttpClientConfig {
|
||||||
|
exponential_backoff_max_retries: Some(3),
|
||||||
|
leaky_bucket_max_tokens: Some(2),
|
||||||
|
leaky_bucket_initial_tokens: Some(1),
|
||||||
|
leaky_bucket_refill_tokens: Some(1),
|
||||||
|
leaky_bucket_refill_interval: Some(std::time::Duration::from_millis(1000)),
|
||||||
|
user_agent: Some(
|
||||||
|
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) \
|
||||||
|
Chrome/136.0.0.0 Safari/537.36 Edg/136.0.0.0"
|
||||||
|
.to_string(),
|
||||||
|
),
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
base_url: Url::parse("https://mikanani.me")?,
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let first_page_and_pagination_info =
|
||||||
|
scrape_mikan_classic_episode_table_page(&mikan_scrape_client, 1, None).await?;
|
||||||
|
|
||||||
|
let total_page = first_page_and_pagination_info.total;
|
||||||
|
|
||||||
|
first_page_and_pagination_info.save_to_files()?;
|
||||||
|
|
||||||
|
let next_rev_ids = MikanClassicEpisodeTablePage::waiting_rev_ids(total_page)?;
|
||||||
|
|
||||||
|
for todo_rev_id in next_rev_ids {
|
||||||
|
let page = scrape_mikan_classic_episode_table_page_from_rev_id(
|
||||||
|
&mikan_scrape_client,
|
||||||
|
total_page,
|
||||||
|
todo_rev_id,
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
page.save_to_files()?;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 合并所有 parquet 文件
|
||||||
|
println!("\nMerging all parquet files...");
|
||||||
|
|
||||||
|
merge_mikan_classic_episodes_and_strip_columns().await?;
|
||||||
|
|
||||||
|
println!("Merge completed!");
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
249
apps/recorder/examples/mikan_doppel_season_subscription.rs
Normal file
249
apps/recorder/examples/mikan_doppel_season_subscription.rs
Normal file
@@ -0,0 +1,249 @@
|
|||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use color_eyre::{Result, eyre::OptionExt};
|
||||||
|
use fetch::{FetchError, HttpClientConfig, fetch_bytes, fetch_html, fetch_image, reqwest};
|
||||||
|
use inquire::{Password, Text, validator::Validation};
|
||||||
|
use recorder::{
|
||||||
|
crypto::UserPassCredential,
|
||||||
|
extract::mikan::{
|
||||||
|
MikanClient, MikanConfig, MikanRssEpisodeItem, build_mikan_bangumi_expand_subscribed_url,
|
||||||
|
extract_mikan_bangumi_index_meta_list_from_season_flow_fragment,
|
||||||
|
extract_mikan_bangumi_meta_from_expand_subscribed_fragment,
|
||||||
|
},
|
||||||
|
test_utils::mikan::{MikanDoppelMeta, MikanDoppelPath},
|
||||||
|
};
|
||||||
|
use scraper::Html;
|
||||||
|
use tokio::fs;
|
||||||
|
use url::Url;
|
||||||
|
|
||||||
|
#[tokio::main]
|
||||||
|
async fn main() -> Result<()> {
|
||||||
|
tracing_subscriber::fmt()
|
||||||
|
.with_max_level(tracing::Level::INFO)
|
||||||
|
.init();
|
||||||
|
std::env::set_current_dir(std::path::Path::new("apps/recorder"))?;
|
||||||
|
|
||||||
|
let mikan_scrape_client = MikanClient::from_config(MikanConfig {
|
||||||
|
http_client: HttpClientConfig {
|
||||||
|
exponential_backoff_max_retries: Some(3),
|
||||||
|
leaky_bucket_max_tokens: Some(2),
|
||||||
|
leaky_bucket_initial_tokens: Some(0),
|
||||||
|
leaky_bucket_refill_tokens: Some(1),
|
||||||
|
leaky_bucket_refill_interval: Some(Duration::from_millis(1000)),
|
||||||
|
user_agent: Some(
|
||||||
|
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) \
|
||||||
|
Chrome/136.0.0.0 Safari/537.36 Edg/136.0.0.0"
|
||||||
|
.to_string(),
|
||||||
|
),
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
base_url: Url::parse("https://mikanani.me")?,
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let username_validator = |input: &str| {
|
||||||
|
if input.trim().is_empty() {
|
||||||
|
Ok(Validation::Invalid("Username cannot be empty".into()))
|
||||||
|
} else {
|
||||||
|
Ok(Validation::Valid)
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let password_validator = |input: &str| {
|
||||||
|
if input.trim().is_empty() {
|
||||||
|
Ok(Validation::Invalid("Password cannot be empty".into()))
|
||||||
|
} else {
|
||||||
|
Ok(Validation::Valid)
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let username = Text::new("Please enter your mikan username:")
|
||||||
|
.with_validator(username_validator)
|
||||||
|
.prompt()?;
|
||||||
|
let password = Password::new("Please enter your mikan password:")
|
||||||
|
.without_confirmation()
|
||||||
|
.with_display_mode(inquire::PasswordDisplayMode::Masked)
|
||||||
|
.with_validator(password_validator)
|
||||||
|
.prompt()?;
|
||||||
|
|
||||||
|
let mikan_scrape_client = mikan_scrape_client
|
||||||
|
.fork_with_userpass_credential(UserPassCredential {
|
||||||
|
username,
|
||||||
|
password,
|
||||||
|
user_agent: None,
|
||||||
|
cookies: None,
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
tracing::info!("Checking if logged in...");
|
||||||
|
if !mikan_scrape_client.has_login().await? {
|
||||||
|
tracing::info!("Logging in to mikan...");
|
||||||
|
mikan_scrape_client.login().await?;
|
||||||
|
tracing::info!("Logged in to mikan");
|
||||||
|
}
|
||||||
|
|
||||||
|
let mikan_base_url = mikan_scrape_client.base_url().clone();
|
||||||
|
tracing::info!("Scraping season subscription...");
|
||||||
|
let season_subscription =
|
||||||
|
fs::read("tests/resources/mikan/BangumiCoverFlow-2025-spring.html").await?;
|
||||||
|
let html = Html::parse_fragment(String::from_utf8(season_subscription)?.as_str());
|
||||||
|
let bangumi_index_list =
|
||||||
|
extract_mikan_bangumi_index_meta_list_from_season_flow_fragment(&html, &mikan_base_url);
|
||||||
|
|
||||||
|
for bangumi_index in bangumi_index_list {
|
||||||
|
let bangumi_meta = {
|
||||||
|
let bangumi_expand_subscribed_url = build_mikan_bangumi_expand_subscribed_url(
|
||||||
|
mikan_base_url.clone(),
|
||||||
|
bangumi_index.mikan_bangumi_id.as_ref(),
|
||||||
|
);
|
||||||
|
let bangumi_expand_subscribed_doppel_path =
|
||||||
|
MikanDoppelPath::new(bangumi_expand_subscribed_url.clone());
|
||||||
|
tracing::info!(
|
||||||
|
bangumi_title = bangumi_index.bangumi_title,
|
||||||
|
"Scraping bangumi expand subscribed..."
|
||||||
|
);
|
||||||
|
let bangumi_expand_subscribed_data =
|
||||||
|
if !bangumi_expand_subscribed_doppel_path.exists_any() {
|
||||||
|
let bangumi_expand_subscribed_data =
|
||||||
|
fetch_html(&mikan_scrape_client, bangumi_expand_subscribed_url).await?;
|
||||||
|
bangumi_expand_subscribed_doppel_path.write(&bangumi_expand_subscribed_data)?;
|
||||||
|
tracing::info!(
|
||||||
|
bangumi_title = bangumi_index.bangumi_title,
|
||||||
|
"Bangumi expand subscribed saved"
|
||||||
|
);
|
||||||
|
bangumi_expand_subscribed_data
|
||||||
|
} else {
|
||||||
|
tracing::info!(
|
||||||
|
bangumi_title = bangumi_index.bangumi_title,
|
||||||
|
"Bangumi expand subscribed already exists"
|
||||||
|
);
|
||||||
|
String::from_utf8(bangumi_expand_subscribed_doppel_path.read()?)?
|
||||||
|
};
|
||||||
|
|
||||||
|
let html = Html::parse_fragment(&bangumi_expand_subscribed_data);
|
||||||
|
extract_mikan_bangumi_meta_from_expand_subscribed_fragment(
|
||||||
|
&html,
|
||||||
|
bangumi_index.clone(),
|
||||||
|
mikan_base_url.clone(),
|
||||||
|
)
|
||||||
|
.ok_or_eyre(format!(
|
||||||
|
"Failed to extract bangumi meta from expand subscribed fragment: {:?}",
|
||||||
|
bangumi_index.bangumi_title
|
||||||
|
))
|
||||||
|
}?;
|
||||||
|
{
|
||||||
|
if let Some(poster_url) = bangumi_meta.origin_poster_src.as_ref() {
|
||||||
|
let poster_doppel_path = MikanDoppelPath::new(poster_url.clone());
|
||||||
|
tracing::info!(
|
||||||
|
title = bangumi_meta.bangumi_title,
|
||||||
|
"Scraping bangumi poster..."
|
||||||
|
);
|
||||||
|
if !poster_doppel_path.exists_any() {
|
||||||
|
let poster_data = fetch_image(&mikan_scrape_client, poster_url.clone()).await?;
|
||||||
|
poster_doppel_path.write(&poster_data)?;
|
||||||
|
tracing::info!(title = bangumi_meta.bangumi_title, "Bangumi poster saved");
|
||||||
|
} else {
|
||||||
|
tracing::info!(
|
||||||
|
title = bangumi_meta.bangumi_title,
|
||||||
|
"Bangumi poster already exists"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
let bangumi_homepage_url = bangumi_meta
|
||||||
|
.bangumi_hash()
|
||||||
|
.build_homepage_url(mikan_base_url.clone());
|
||||||
|
let bangumi_homepage_doppel_path = MikanDoppelPath::new(bangumi_homepage_url.clone());
|
||||||
|
tracing::info!(
|
||||||
|
title = bangumi_meta.bangumi_title,
|
||||||
|
"Scraping bangumi homepage..."
|
||||||
|
);
|
||||||
|
if !bangumi_homepage_doppel_path.exists_any() {
|
||||||
|
let bangumi_homepage_data =
|
||||||
|
fetch_html(&mikan_scrape_client, bangumi_homepage_url).await?;
|
||||||
|
bangumi_homepage_doppel_path.write(&bangumi_homepage_data)?;
|
||||||
|
tracing::info!(title = bangumi_meta.bangumi_title, "Bangumi homepage saved");
|
||||||
|
} else {
|
||||||
|
tracing::info!(
|
||||||
|
title = bangumi_meta.bangumi_title,
|
||||||
|
"Bangumi homepage already exists"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let rss_items = {
|
||||||
|
let bangumi_rss_url = bangumi_meta
|
||||||
|
.bangumi_hash()
|
||||||
|
.build_rss_url(mikan_base_url.clone());
|
||||||
|
let bangumi_rss_doppel_path = MikanDoppelPath::new(bangumi_rss_url.clone());
|
||||||
|
tracing::info!(
|
||||||
|
title = bangumi_meta.bangumi_title,
|
||||||
|
"Scraping bangumi rss..."
|
||||||
|
);
|
||||||
|
let bangumi_rss_data = if !bangumi_rss_doppel_path.exists_any() {
|
||||||
|
let bangumi_rss_data = fetch_html(&mikan_scrape_client, bangumi_rss_url).await?;
|
||||||
|
bangumi_rss_doppel_path.write(&bangumi_rss_data)?;
|
||||||
|
tracing::info!(title = bangumi_meta.bangumi_title, "Bangumi rss saved");
|
||||||
|
bangumi_rss_data
|
||||||
|
} else {
|
||||||
|
tracing::info!(
|
||||||
|
title = bangumi_meta.bangumi_title,
|
||||||
|
"Bangumi rss already exists"
|
||||||
|
);
|
||||||
|
String::from_utf8(bangumi_rss_doppel_path.read()?)?
|
||||||
|
};
|
||||||
|
let rss_items = rss::Channel::read_from(bangumi_rss_data.as_bytes())?.items;
|
||||||
|
rss_items
|
||||||
|
.into_iter()
|
||||||
|
.map(MikanRssEpisodeItem::try_from)
|
||||||
|
.collect::<Result<Vec<_>, _>>()
|
||||||
|
}?;
|
||||||
|
for rss_item in rss_items {
|
||||||
|
{
|
||||||
|
let episode_homepage_url = rss_item.build_homepage_url(mikan_base_url.clone());
|
||||||
|
let episode_homepage_doppel_path =
|
||||||
|
MikanDoppelPath::new(episode_homepage_url.clone());
|
||||||
|
tracing::info!(title = rss_item.title, "Scraping episode...");
|
||||||
|
if !episode_homepage_doppel_path.exists_any() {
|
||||||
|
let episode_homepage_data =
|
||||||
|
fetch_html(&mikan_scrape_client, episode_homepage_url).await?;
|
||||||
|
episode_homepage_doppel_path.write(&episode_homepage_data)?;
|
||||||
|
tracing::info!(title = rss_item.title, "Episode saved");
|
||||||
|
} else {
|
||||||
|
tracing::info!(title = rss_item.title, "Episode already exists");
|
||||||
|
};
|
||||||
|
}
|
||||||
|
{
|
||||||
|
let episode_torrent_url = rss_item.torrent_link;
|
||||||
|
let episode_torrent_doppel_path = MikanDoppelPath::new(episode_torrent_url.clone());
|
||||||
|
tracing::info!(title = rss_item.title, "Scraping episode torrent...");
|
||||||
|
if !episode_torrent_doppel_path.exists_any() {
|
||||||
|
match fetch_bytes(&mikan_scrape_client, episode_torrent_url).await {
|
||||||
|
Ok(episode_torrent_data) => {
|
||||||
|
episode_torrent_doppel_path.write(&episode_torrent_data)?;
|
||||||
|
tracing::info!(title = rss_item.title, "Episode torrent saved");
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
if let FetchError::ReqwestError { source } = &e
|
||||||
|
&& source
|
||||||
|
.status()
|
||||||
|
.is_some_and(|status| status == reqwest::StatusCode::NOT_FOUND)
|
||||||
|
{
|
||||||
|
tracing::warn!(
|
||||||
|
title = rss_item.title,
|
||||||
|
"Episode torrent not found, maybe deleted since new version"
|
||||||
|
);
|
||||||
|
episode_torrent_doppel_path
|
||||||
|
.write_meta(MikanDoppelMeta { status: 404 })?;
|
||||||
|
} else {
|
||||||
|
Err(e)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
tracing::info!(title = rss_item.title, "Episode torrent already exists");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tracing::info!("Scraping season subscription done");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
215
apps/recorder/examples/mikan_doppel_subscriber_subscription.rs
Normal file
215
apps/recorder/examples/mikan_doppel_subscriber_subscription.rs
Normal file
@@ -0,0 +1,215 @@
|
|||||||
|
use std::time::Duration;
|
||||||
|
|
||||||
|
use fetch::{FetchError, HttpClientConfig, fetch_bytes, fetch_html, fetch_image, reqwest};
|
||||||
|
use recorder::{
|
||||||
|
errors::RecorderResult,
|
||||||
|
extract::mikan::{
|
||||||
|
MikanClient, MikanConfig, MikanRssEpisodeItem,
|
||||||
|
extract_mikan_episode_meta_from_episode_homepage_html,
|
||||||
|
},
|
||||||
|
test_utils::mikan::{MikanDoppelMeta, MikanDoppelPath},
|
||||||
|
};
|
||||||
|
use scraper::Html;
|
||||||
|
use tokio::fs;
|
||||||
|
use url::Url;
|
||||||
|
|
||||||
|
#[tokio::main]
|
||||||
|
async fn main() -> RecorderResult<()> {
|
||||||
|
tracing_subscriber::fmt()
|
||||||
|
.with_max_level(tracing::Level::INFO)
|
||||||
|
.init();
|
||||||
|
std::env::set_current_dir(std::path::Path::new("apps/recorder"))?;
|
||||||
|
|
||||||
|
let mikan_scrape_client = MikanClient::from_config(MikanConfig {
|
||||||
|
http_client: HttpClientConfig {
|
||||||
|
exponential_backoff_max_retries: Some(3),
|
||||||
|
leaky_bucket_max_tokens: Some(2),
|
||||||
|
leaky_bucket_initial_tokens: Some(0),
|
||||||
|
leaky_bucket_refill_tokens: Some(1),
|
||||||
|
leaky_bucket_refill_interval: Some(Duration::from_millis(500)),
|
||||||
|
user_agent: Some(
|
||||||
|
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) \
|
||||||
|
Chrome/136.0.0.0 Safari/537.36 Edg/136.0.0.0"
|
||||||
|
.to_string(),
|
||||||
|
),
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
base_url: Url::parse("https://mikanani.me")?,
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let mikan_base_url = mikan_scrape_client.base_url().clone();
|
||||||
|
tracing::info!("Scraping subscriber subscription...");
|
||||||
|
let subscriber_subscription =
|
||||||
|
fs::read("tests/resources/mikan/doppel/RSS/MyBangumi-token%3Dtest.html").await?;
|
||||||
|
let channel = rss::Channel::read_from(&subscriber_subscription[..])?;
|
||||||
|
let rss_items: Vec<MikanRssEpisodeItem> = channel
|
||||||
|
.items
|
||||||
|
.into_iter()
|
||||||
|
.map(MikanRssEpisodeItem::try_from)
|
||||||
|
.collect::<Result<Vec<_>, _>>()?;
|
||||||
|
for rss_item in rss_items {
|
||||||
|
let episode_homepage_meta = {
|
||||||
|
tracing::info!(title = rss_item.title, "Scraping episode homepage...");
|
||||||
|
let episode_homepage_url = rss_item.build_homepage_url(mikan_base_url.clone());
|
||||||
|
let episode_homepage_doppel_path = MikanDoppelPath::new(episode_homepage_url.clone());
|
||||||
|
let episode_homepage_data = if !episode_homepage_doppel_path.exists_any() {
|
||||||
|
let episode_homepage_data =
|
||||||
|
fetch_html(&mikan_scrape_client, episode_homepage_url.clone()).await?;
|
||||||
|
episode_homepage_doppel_path.write(&episode_homepage_data)?;
|
||||||
|
tracing::info!(title = rss_item.title, "Episode homepage saved");
|
||||||
|
episode_homepage_data
|
||||||
|
} else {
|
||||||
|
tracing::info!(title = rss_item.title, "Episode homepage already exists");
|
||||||
|
String::from_utf8(episode_homepage_doppel_path.read()?)?
|
||||||
|
};
|
||||||
|
let html = Html::parse_document(&episode_homepage_data);
|
||||||
|
extract_mikan_episode_meta_from_episode_homepage_html(
|
||||||
|
&html,
|
||||||
|
mikan_base_url.clone(),
|
||||||
|
episode_homepage_url,
|
||||||
|
)
|
||||||
|
}?;
|
||||||
|
|
||||||
|
{
|
||||||
|
let episode_torrent_url = rss_item.torrent_link;
|
||||||
|
let episode_torrent_doppel_path = MikanDoppelPath::new(episode_torrent_url.clone());
|
||||||
|
tracing::info!(title = rss_item.title, "Scraping episode torrent...");
|
||||||
|
if !episode_torrent_doppel_path.exists_any() {
|
||||||
|
match fetch_bytes(&mikan_scrape_client, episode_torrent_url).await {
|
||||||
|
Ok(episode_torrent_data) => {
|
||||||
|
episode_torrent_doppel_path.write(&episode_torrent_data)?;
|
||||||
|
tracing::info!(title = rss_item.title, "Episode torrent saved");
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
if let FetchError::ReqwestError { source } = &e
|
||||||
|
&& source
|
||||||
|
.status()
|
||||||
|
.is_some_and(|status| status == reqwest::StatusCode::NOT_FOUND)
|
||||||
|
{
|
||||||
|
tracing::warn!(
|
||||||
|
title = rss_item.title,
|
||||||
|
"Episode torrent not found, maybe deleted since new version"
|
||||||
|
);
|
||||||
|
episode_torrent_doppel_path
|
||||||
|
.write_meta(MikanDoppelMeta { status: 404 })?;
|
||||||
|
} else {
|
||||||
|
Err(e)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tracing::info!(title = rss_item.title, "Episode torrent saved");
|
||||||
|
} else {
|
||||||
|
tracing::info!(title = rss_item.title, "Episode torrent already exists");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
if let Some(episode_poster_url) = episode_homepage_meta.origin_poster_src.as_ref() {
|
||||||
|
let episode_poster_doppel_path = MikanDoppelPath::new(episode_poster_url.clone());
|
||||||
|
tracing::info!(title = rss_item.title, "Scraping episode poster...");
|
||||||
|
if !episode_poster_doppel_path.exists_any() {
|
||||||
|
let episode_poster_data =
|
||||||
|
fetch_image(&mikan_scrape_client, episode_poster_url.clone()).await?;
|
||||||
|
episode_poster_doppel_path.write(&episode_poster_data)?;
|
||||||
|
tracing::info!(title = rss_item.title, "Episode poster saved");
|
||||||
|
} else {
|
||||||
|
tracing::info!(title = rss_item.title, "Episode poster already exists");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
let bangumi_homepage_url = episode_homepage_meta
|
||||||
|
.bangumi_hash()
|
||||||
|
.build_homepage_url(mikan_base_url.clone());
|
||||||
|
let bangumi_homepage_doppel_path = MikanDoppelPath::new(bangumi_homepage_url.clone());
|
||||||
|
tracing::info!(title = rss_item.title, "Scraping bangumi homepage...");
|
||||||
|
if !bangumi_homepage_doppel_path.exists_any() {
|
||||||
|
let bangumi_homepage_data =
|
||||||
|
fetch_html(&mikan_scrape_client, bangumi_homepage_url).await?;
|
||||||
|
bangumi_homepage_doppel_path.write(&bangumi_homepage_data)?;
|
||||||
|
tracing::info!(title = rss_item.title, "Bangumi homepage saved");
|
||||||
|
} else {
|
||||||
|
tracing::info!(title = rss_item.title, "Bangumi homepage already exists");
|
||||||
|
};
|
||||||
|
}
|
||||||
|
{
|
||||||
|
let bangumi_rss_url = episode_homepage_meta
|
||||||
|
.bangumi_hash()
|
||||||
|
.build_rss_url(mikan_base_url.clone());
|
||||||
|
let bangumi_rss_doppel_path = MikanDoppelPath::new(bangumi_rss_url.clone());
|
||||||
|
tracing::info!(title = rss_item.title, "Scraping bangumi rss...");
|
||||||
|
let bangumi_rss_data = if !bangumi_rss_doppel_path.exists_any() {
|
||||||
|
let bangumi_rss_data = fetch_html(&mikan_scrape_client, bangumi_rss_url).await?;
|
||||||
|
bangumi_rss_doppel_path.write(&bangumi_rss_data)?;
|
||||||
|
tracing::info!(title = rss_item.title, "Bangumi rss saved");
|
||||||
|
bangumi_rss_data
|
||||||
|
} else {
|
||||||
|
tracing::info!(title = rss_item.title, "Bangumi rss already exists");
|
||||||
|
String::from_utf8(bangumi_rss_doppel_path.read()?)?
|
||||||
|
};
|
||||||
|
|
||||||
|
let channel = rss::Channel::read_from(bangumi_rss_data.as_bytes())?;
|
||||||
|
let rss_items: Vec<MikanRssEpisodeItem> = channel
|
||||||
|
.items
|
||||||
|
.into_iter()
|
||||||
|
.map(MikanRssEpisodeItem::try_from)
|
||||||
|
.collect::<Result<Vec<_>, _>>()?;
|
||||||
|
for rss_item in rss_items {
|
||||||
|
{
|
||||||
|
tracing::info!(title = rss_item.title, "Scraping episode homepage...");
|
||||||
|
let episode_homepage_url = rss_item.build_homepage_url(mikan_base_url.clone());
|
||||||
|
let episode_homepage_doppel_path =
|
||||||
|
MikanDoppelPath::new(episode_homepage_url.clone());
|
||||||
|
if !episode_homepage_doppel_path.exists_any() {
|
||||||
|
let episode_homepage_data =
|
||||||
|
fetch_html(&mikan_scrape_client, episode_homepage_url.clone()).await?;
|
||||||
|
episode_homepage_doppel_path.write(&episode_homepage_data)?;
|
||||||
|
tracing::info!(title = rss_item.title, "Episode homepage saved");
|
||||||
|
} else {
|
||||||
|
tracing::info!(title = rss_item.title, "Episode homepage already exists");
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
{
|
||||||
|
let episode_torrent_url = rss_item.torrent_link;
|
||||||
|
let episode_torrent_doppel_path =
|
||||||
|
MikanDoppelPath::new(episode_torrent_url.clone());
|
||||||
|
tracing::info!(title = rss_item.title, "Scraping episode torrent...");
|
||||||
|
if !episode_torrent_doppel_path.exists_any() {
|
||||||
|
match fetch_bytes(&mikan_scrape_client, episode_torrent_url).await {
|
||||||
|
Ok(episode_torrent_data) => {
|
||||||
|
episode_torrent_doppel_path.write(&episode_torrent_data)?;
|
||||||
|
tracing::info!(title = rss_item.title, "Episode torrent saved");
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
if let FetchError::ReqwestError { source } = &e
|
||||||
|
&& source.status().is_some_and(|status| {
|
||||||
|
status == reqwest::StatusCode::NOT_FOUND
|
||||||
|
})
|
||||||
|
{
|
||||||
|
tracing::warn!(
|
||||||
|
title = rss_item.title,
|
||||||
|
"Episode torrent not found, maybe deleted since new \
|
||||||
|
version"
|
||||||
|
);
|
||||||
|
episode_torrent_doppel_path
|
||||||
|
.write_meta(MikanDoppelMeta { status: 404 })?;
|
||||||
|
} else {
|
||||||
|
Err(e)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tracing::info!(title = rss_item.title, "Episode torrent saved");
|
||||||
|
} else {
|
||||||
|
tracing::info!(title = rss_item.title, "Episode torrent already exists");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tracing::info!("Scraping subscriber subscription done");
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
@@ -1,68 +1,33 @@
|
|||||||
// #![allow(unused_imports)]
|
#![feature(duration_constructors_lite)]
|
||||||
// use color_eyre::eyre::Context;
|
use std::{sync::Arc, time::Duration};
|
||||||
// use itertools::Itertools;
|
|
||||||
// use loco_rs::{
|
|
||||||
// app::Hooks,
|
|
||||||
// boot::{BootResult, StartMode},
|
|
||||||
// environment::Environment,
|
|
||||||
// prelude::AppContext as LocoContext,
|
|
||||||
// };
|
|
||||||
// use recorder::{
|
|
||||||
// app::{App1, AppContext},
|
|
||||||
// errors::RResult,
|
|
||||||
// migrations::Migrator,
|
|
||||||
// models::{
|
|
||||||
// subscribers::SEED_SUBSCRIBER,
|
|
||||||
// subscriptions::{self, SubscriptionCreateFromRssDto},
|
|
||||||
// },
|
|
||||||
// };
|
|
||||||
// use sea_orm::ColumnTrait;
|
|
||||||
// use sea_orm_migration::MigratorTrait;
|
|
||||||
|
|
||||||
// async fn pull_mikan_bangumi_rss(ctx: &AppContext) -> RResult<()> {
|
use apalis_sql::postgres::PostgresStorage;
|
||||||
// let rss_link = "https://mikanani.me/RSS/Bangumi?bangumiId=3416&subgroupid=370";
|
use recorder::{
|
||||||
|
app::AppContextTrait,
|
||||||
|
errors::RecorderResult,
|
||||||
|
test_utils::{
|
||||||
|
app::TestingAppContext,
|
||||||
|
database::{TestingDatabaseServiceConfig, build_testing_database_service},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
// // let rss_link =
|
#[tokio::main]
|
||||||
// // "https://mikanani.me/RSS/MyBangumi?token=FE9tccsML2nBPUUqpCuJW2uJZydAXCntHJ7RpD9LDP8%3d";
|
async fn main() -> RecorderResult<()> {
|
||||||
// let subscription = if let Some(subscription) =
|
let app_ctx = {
|
||||||
// subscriptions::Entity::find()
|
let db_service = build_testing_database_service(TestingDatabaseServiceConfig {
|
||||||
// .filter(subscriptions::Column::SourceUrl.eq(String::from(rss_link)))
|
auto_migrate: false,
|
||||||
// .one(&ctx.db)
|
})
|
||||||
// .await?
|
.await?;
|
||||||
// {
|
Arc::new(TestingAppContext::builder().db(db_service).build())
|
||||||
// subscription
|
};
|
||||||
// } else {
|
|
||||||
// subscriptions::Model::add_subscription(
|
|
||||||
// ctx,
|
|
||||||
//
|
|
||||||
// subscriptions::SubscriptionCreateDto::Mikan(SubscriptionCreateFromRssDto {
|
|
||||||
// rss_link: rss_link.to_string(),
|
|
||||||
// display_name: String::from("Mikan Project - 我的番组"),
|
|
||||||
// enabled: Some(true),
|
|
||||||
// }),
|
|
||||||
// 1,
|
|
||||||
// )
|
|
||||||
// .await?
|
|
||||||
// };
|
|
||||||
|
|
||||||
// subscription.pull_subscription(ctx).await?;
|
let db = app_ctx.db();
|
||||||
|
|
||||||
// Ok(())
|
PostgresStorage::setup(db.get_postgres_connection_pool()).await?;
|
||||||
// }
|
|
||||||
|
|
||||||
// async fn init() -> RResult<LocoContext> {
|
dbg!(db.get_postgres_connection_pool().connect_options());
|
||||||
// let ctx = loco_rs::cli::playground::<App1>().await?;
|
|
||||||
// let BootResult {
|
|
||||||
// app_context: ctx, ..
|
|
||||||
// } = loco_rs::boot::run_app::<App1>(&StartMode::ServerOnly, ctx).await?;
|
|
||||||
// Migrator::up(&ctx.db, None).await?;
|
|
||||||
// Ok(ctx)
|
|
||||||
// }
|
|
||||||
|
|
||||||
// #[tokio::main]
|
tokio::time::sleep(Duration::from_hours(1)).await;
|
||||||
// async fn main() -> color_eyre::eyre::Result<()> {
|
|
||||||
// pull_mikan_bangumi_rss(&ctx).await?;
|
|
||||||
|
|
||||||
// Ok(())
|
Ok(())
|
||||||
// }
|
}
|
||||||
fn main() {}
|
|
||||||
|
|||||||
@@ -1,37 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "recorder",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"type": "module",
|
|
||||||
"scripts": {
|
|
||||||
"dev": "rsbuild dev",
|
|
||||||
"build": "rsbuild build",
|
|
||||||
"preview": "rsbuild preview"
|
|
||||||
},
|
|
||||||
"dependencies": {
|
|
||||||
"@abraham/reflection": "^0.12.0",
|
|
||||||
"@graphiql/react": "^0.28.2",
|
|
||||||
"@graphiql/toolkit": "^0.11.1",
|
|
||||||
"@konobangu/design-system": "workspace:*",
|
|
||||||
"@konobangu/tailwind-config": "workspace:*",
|
|
||||||
"@outposts/injection-js": "^2.5.1",
|
|
||||||
"@tanstack/react-router": "^1.95.6",
|
|
||||||
"@tanstack/router-devtools": "^1.95.6",
|
|
||||||
"graphiql": "^3.8.3",
|
|
||||||
"graphql-ws": "^5.16.2",
|
|
||||||
"observable-hooks": "^4.2.4",
|
|
||||||
"oidc-client-rx": "0.1.0-alpha.6",
|
|
||||||
"react": "^19.0.0",
|
|
||||||
"react-dom": "^19.0.0",
|
|
||||||
"rxjs": "^7.8.1"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@konobangu/typescript-config": "workspace:*",
|
|
||||||
"@rsbuild/core": "1.1.3",
|
|
||||||
"@rsbuild/plugin-react": "^1.1.1",
|
|
||||||
"@tanstack/router-plugin": "^1.95.6",
|
|
||||||
"@types/react": "^19.0.7",
|
|
||||||
"@types/react-dom": "^19.0.3",
|
|
||||||
"tailwindcss": "^3.4.17",
|
|
||||||
"typescript": "^5.7.3"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB |
114
apps/recorder/recorder.config.toml
Normal file
114
apps/recorder/recorder.config.toml
Normal file
@@ -0,0 +1,114 @@
|
|||||||
|
# Application logging configuration
|
||||||
|
[logger]
|
||||||
|
# Enable or disable logging.
|
||||||
|
enable = true
|
||||||
|
# Enable pretty backtrace (sets RUST_BACKTRACE=1)
|
||||||
|
pretty_backtrace = true
|
||||||
|
# Log level, options: trace, debug, info, warn or error.
|
||||||
|
level = "debug"
|
||||||
|
# Define the logging format. options: compact, pretty or Json
|
||||||
|
format = "compact"
|
||||||
|
# By default the logger has filtering only logs that came from your code or logs that came from `loco` framework. to see all third party libraries
|
||||||
|
# Uncomment the line below to override to see all third party libraries you can enable this config and override the logger filters.
|
||||||
|
# override_filter: trace
|
||||||
|
|
||||||
|
# Web server configuration
|
||||||
|
[server]
|
||||||
|
# Port on which the server will listen. the server binding is 0.0.0.0:{PORT}
|
||||||
|
port = 5001
|
||||||
|
binding = "0.0.0.0"
|
||||||
|
# The UI hostname or IP address that mailers will point to.
|
||||||
|
host = '{{ get_env(name="HOST", default="localhost") }}'
|
||||||
|
# Out of the box middleware configuration. to disable middleware you can changed the `enable` field to `false` of comment the middleware block
|
||||||
|
|
||||||
|
# Enable Etag cache header middleware
|
||||||
|
[server.middlewares.etag]
|
||||||
|
enable = true
|
||||||
|
|
||||||
|
# Generating a unique request ID and enhancing logging with additional information such as the start and completion of request processing, latency, status code, and other request details.
|
||||||
|
[server.middlewares.request_id]
|
||||||
|
enable = true
|
||||||
|
|
||||||
|
[server.middlewares.logger]
|
||||||
|
enable = true
|
||||||
|
|
||||||
|
# when your code is panicked, the request still returns 500 status code.
|
||||||
|
[server.middlewares.catch_panic]
|
||||||
|
enable = true
|
||||||
|
|
||||||
|
# Timeout for incoming requests middleware. requests that take more time from the configuration will cute and 408 status code will returned.
|
||||||
|
[server.middlewares.timeout_request]
|
||||||
|
enable = false
|
||||||
|
# Duration time in milliseconds.
|
||||||
|
timeout = 5000
|
||||||
|
|
||||||
|
# Set the value of the [`Access-Control-Allow-Origin`][mdn] header
|
||||||
|
# allow_origins:
|
||||||
|
# - https://konobangu.com
|
||||||
|
# Set the value of the [`Access-Control-Allow-Headers`][mdn] header
|
||||||
|
# allow_headers:
|
||||||
|
# - Content-Type
|
||||||
|
# Set the value of the [`Access-Control-Allow-Methods`][mdn] header
|
||||||
|
# allow_methods:
|
||||||
|
# - POST
|
||||||
|
# Set the value of the [`Access-Control-Max-Age`][mdn] header in seconds
|
||||||
|
# max_age: 3600
|
||||||
|
[server.middlewares.cors]
|
||||||
|
enable = true
|
||||||
|
|
||||||
|
[server.middlewares.compression]
|
||||||
|
enable = true
|
||||||
|
|
||||||
|
# Database Configuration
|
||||||
|
[database]
|
||||||
|
# Database connection URI
|
||||||
|
uri = '{{ get_env(name="DATABASE_URL", default="postgres://konobangu:konobangu@localhost:5432/konobangu") }}'
|
||||||
|
# When enabled, the sql query will be logged.
|
||||||
|
enable_logging = true
|
||||||
|
# Set the timeout duration when acquiring a connection.
|
||||||
|
connect_timeout = 500
|
||||||
|
# Set the idle duration before closing a connection.
|
||||||
|
idle_timeout = 500
|
||||||
|
# Minimum number of connections for a pool.
|
||||||
|
min_connections = 1
|
||||||
|
# Maximum number of connections for a pool.
|
||||||
|
max_connections = 10
|
||||||
|
# Run migration up when application loaded
|
||||||
|
auto_migrate = true
|
||||||
|
|
||||||
|
[storage]
|
||||||
|
data_dir = '{{ get_env(name="STORAGE_DATA_DIR", default="./data") }}'
|
||||||
|
|
||||||
|
[mikan]
|
||||||
|
base_url = "https://mikanani.me/"
|
||||||
|
|
||||||
|
[mikan.http_client]
|
||||||
|
exponential_backoff_max_retries = 3
|
||||||
|
leaky_bucket_max_tokens = 2
|
||||||
|
leaky_bucket_initial_tokens = 1
|
||||||
|
leaky_bucket_refill_tokens = 1
|
||||||
|
leaky_bucket_refill_interval = 500
|
||||||
|
|
||||||
|
|
||||||
|
[mikan.http_client.proxy]
|
||||||
|
server = '{{ get_env(name="MIKAN_PROXY", default = "") }}'
|
||||||
|
auth_header = '{{ get_env(name="MIKAN_PROXY_AUTH_HEADER", default = "") }}'
|
||||||
|
no_proxy = '{{ get_env(name="MIKAN_NO_PROXY", default = "") }}'
|
||||||
|
accept_invalid_certs = '{{ get_env(name="MIKAN_PROXY_ACCEPT_INVALID_CERTS", default = "false") }}'
|
||||||
|
|
||||||
|
|
||||||
|
[auth]
|
||||||
|
auth_type = '{{ get_env(name="AUTH_TYPE", default = "basic") }}'
|
||||||
|
basic_user = '{{ get_env(name="BASIC_USER", default = "konobangu") }}'
|
||||||
|
basic_password = '{{ get_env(name="BASIC_PASSWORD", default = "konobangu") }}'
|
||||||
|
oidc_issuer = '{{ get_env(name="OIDC_ISSUER", default = "") }}'
|
||||||
|
oidc_audience = '{{ get_env(name="OIDC_AUDIENCE", default = "") }}'
|
||||||
|
oidc_client_id = '{{ get_env(name="OIDC_CLIENT_ID", default = "") }}'
|
||||||
|
oidc_client_secret = '{{ get_env(name="OIDC_CLIENT_SECRET", default = "") }}'
|
||||||
|
oidc_extra_scopes = '{{ get_env(name="OIDC_EXTRA_SCOPES", default = "") }}'
|
||||||
|
oidc_extra_claim_key = '{{ get_env(name="OIDC_EXTRA_CLAIM_KEY", default = "") }}'
|
||||||
|
oidc_extra_claim_value = '{{ get_env(name="OIDC_EXTRA_CLAIM_VALUE", default = "") }}'
|
||||||
|
|
||||||
|
[graphql]
|
||||||
|
# depth_limit = inf
|
||||||
|
# complexity_limit = inf
|
||||||
@@ -1,101 +0,0 @@
|
|||||||
# Loco configuration file documentation
|
|
||||||
|
|
||||||
# Application logging configuration
|
|
||||||
logger:
|
|
||||||
# Enable or disable logging.
|
|
||||||
enable: true
|
|
||||||
# Enable pretty backtrace (sets RUST_BACKTRACE=1)
|
|
||||||
pretty_backtrace: true
|
|
||||||
# Log level, options: trace, debug, info, warn or error.
|
|
||||||
level: debug
|
|
||||||
# Define the logging format. options: compact, pretty or Json
|
|
||||||
format: compact
|
|
||||||
# By default the logger has filtering only logs that came from your code or logs that came from `loco` framework. to see all third party libraries
|
|
||||||
# Uncomment the line below to override to see all third party libraries you can enable this config and override the logger filters.
|
|
||||||
# override_filter: trace
|
|
||||||
|
|
||||||
# Web server configuration
|
|
||||||
server:
|
|
||||||
# Port on which the server will listen. the server binding is 0.0.0.0:{PORT}
|
|
||||||
port: 5001
|
|
||||||
binding: "0.0.0.0"
|
|
||||||
# The UI hostname or IP address that mailers will point to.
|
|
||||||
host: '{{ get_env(name="HOST", default="localhost") }}'
|
|
||||||
# Out of the box middleware configuration. to disable middleware you can changed the `enable` field to `false` of comment the middleware block
|
|
||||||
middlewares:
|
|
||||||
# Enable Etag cache header middleware
|
|
||||||
etag:
|
|
||||||
enable: true
|
|
||||||
# Generating a unique request ID and enhancing logging with additional information such as the start and completion of request processing, latency, status code, and other request details.
|
|
||||||
logger:
|
|
||||||
# Enable/Disable the middleware.
|
|
||||||
enable: true
|
|
||||||
# when your code is panicked, the request still returns 500 status code.
|
|
||||||
catch_panic:
|
|
||||||
# Enable/Disable the middleware.
|
|
||||||
enable: true
|
|
||||||
# Timeout for incoming requests middleware. requests that take more time from the configuration will cute and 408 status code will returned.
|
|
||||||
timeout_request:
|
|
||||||
# Enable/Disable the middleware.
|
|
||||||
enable: false
|
|
||||||
# Duration time in milliseconds.
|
|
||||||
timeout: 5000
|
|
||||||
|
|
||||||
cors:
|
|
||||||
enable: true
|
|
||||||
# Set the value of the [`Access-Control-Allow-Origin`][mdn] header
|
|
||||||
# allow_origins:
|
|
||||||
# - https://loco.rs
|
|
||||||
# Set the value of the [`Access-Control-Allow-Headers`][mdn] header
|
|
||||||
# allow_headers:
|
|
||||||
# - Content-Type
|
|
||||||
# Set the value of the [`Access-Control-Allow-Methods`][mdn] header
|
|
||||||
# allow_methods:
|
|
||||||
# - POST
|
|
||||||
# Set the value of the [`Access-Control-Max-Age`][mdn] header in seconds
|
|
||||||
# max_age: 3600
|
|
||||||
|
|
||||||
# Database Configuration
|
|
||||||
database:
|
|
||||||
# Database connection URI
|
|
||||||
uri: '{{ get_env(name="DATABASE_URL", default="postgres://konobangu:konobangu@localhost:5432/konobangu") }}'
|
|
||||||
# When enabled, the sql query will be logged.
|
|
||||||
enable_logging: true
|
|
||||||
# Set the timeout duration when acquiring a connection.
|
|
||||||
connect_timeout: 500
|
|
||||||
# Set the idle duration before closing a connection.
|
|
||||||
idle_timeout: 500
|
|
||||||
# Minimum number of connections for a pool.
|
|
||||||
min_connections: 1
|
|
||||||
# Maximum number of connections for a pool.
|
|
||||||
max_connections: 1
|
|
||||||
# Run migration up when application loaded
|
|
||||||
auto_migrate: true
|
|
||||||
|
|
||||||
storage:
|
|
||||||
data_dir: '{{ get_env(name="STORAGE_DATA_DIR", default="./data") }}'
|
|
||||||
|
|
||||||
mikan:
|
|
||||||
base_url: "https://mikanani.me/"
|
|
||||||
http_client:
|
|
||||||
exponential_backoff_max_retries: 3
|
|
||||||
leaky_bucket_max_tokens: 2
|
|
||||||
leaky_bucket_initial_tokens: 0
|
|
||||||
leaky_bucket_refill_tokens: 1
|
|
||||||
leaky_bucket_refill_interval: 500
|
|
||||||
|
|
||||||
auth:
|
|
||||||
auth_type: '{{ get_env(name="AUTH_TYPE", default = "basic") }}'
|
|
||||||
basic_user: '{{ get_env(name="BASIC_USER", default = "konobangu") }}'
|
|
||||||
basic_password: '{{ get_env(name="BASIC_PASSWORD", default = "konobangu") }}'
|
|
||||||
oidc_issuer: '{{ get_env(name="OIDC_ISSUER", default = "") }}'
|
|
||||||
oidc_audience: '{{ get_env(name="OIDC_AUDIENCE", default = "") }}'
|
|
||||||
oidc_client_id: '{{ get_env(name="OIDC_CLIENT_ID", default = "") }}'
|
|
||||||
oidc_client_secret: '{{ get_env(name="OIDC_CLIENT_SECRET", default = "") }}'
|
|
||||||
oidc_extra_scopes: '{{ get_env(name="OIDC_EXTRA_SCOPES", default = "") }}'
|
|
||||||
oidc_extra_claim_key: '{{ get_env(name="OIDC_EXTRA_CLAIM_KEY", default = "") }}'
|
|
||||||
oidc_extra_claim_value: '{{ get_env(name="OIDC_EXTRA_CLAIM_VALUE", default = "") }}'
|
|
||||||
|
|
||||||
graphql:
|
|
||||||
depth_limit: null
|
|
||||||
complexity_limit: null
|
|
||||||
@@ -1,9 +1,7 @@
|
|||||||
use std::sync::Arc;
|
|
||||||
|
|
||||||
use clap::{Parser, command};
|
use clap::{Parser, command};
|
||||||
|
|
||||||
use super::{AppContext, core::App, env::Environment};
|
use super::{AppContext, core::App, env::Environment};
|
||||||
use crate::{app::config::AppConfig, errors::RResult};
|
use crate::{app::config::AppConfig, errors::RecorderResult};
|
||||||
|
|
||||||
#[derive(Parser, Debug)]
|
#[derive(Parser, Debug)]
|
||||||
#[command(version, about, long_about = None)]
|
#[command(version, about, long_about = None)]
|
||||||
@@ -23,17 +21,21 @@ pub struct MainCliArgs {
|
|||||||
/// Explicit environment
|
/// Explicit environment
|
||||||
#[arg(short, long)]
|
#[arg(short, long)]
|
||||||
environment: Option<Environment>,
|
environment: Option<Environment>,
|
||||||
|
|
||||||
|
#[arg(long)]
|
||||||
|
graceful_shutdown: Option<bool>,
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct AppBuilder {
|
pub struct AppBuilder {
|
||||||
dotenv_file: Option<String>,
|
dotenv_file: Option<String>,
|
||||||
config_file: Option<String>,
|
config_file: Option<String>,
|
||||||
working_dir: String,
|
working_dir: String,
|
||||||
enviornment: Environment,
|
environment: Environment,
|
||||||
|
pub graceful_shutdown: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AppBuilder {
|
impl AppBuilder {
|
||||||
pub async fn from_main_cli(environment: Option<Environment>) -> RResult<Self> {
|
pub async fn from_main_cli(environment: Option<Environment>) -> RecorderResult<Self> {
|
||||||
let args = MainCliArgs::parse();
|
let args = MainCliArgs::parse();
|
||||||
|
|
||||||
let environment = environment.unwrap_or_else(|| {
|
let environment = environment.unwrap_or_else(|| {
|
||||||
@@ -63,29 +65,19 @@ impl AppBuilder {
|
|||||||
builder = builder
|
builder = builder
|
||||||
.config_file(args.config_file)
|
.config_file(args.config_file)
|
||||||
.dotenv_file(args.dotenv_file)
|
.dotenv_file(args.dotenv_file)
|
||||||
.environment(environment);
|
.environment(environment)
|
||||||
|
.graceful_shutdown(args.graceful_shutdown.unwrap_or(true));
|
||||||
|
|
||||||
Ok(builder)
|
Ok(builder)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn build(self) -> RResult<App> {
|
pub async fn build(self) -> RecorderResult<App> {
|
||||||
AppConfig::load_dotenv(
|
self.load_env().await?;
|
||||||
&self.enviornment,
|
|
||||||
&self.working_dir,
|
|
||||||
self.dotenv_file.as_deref(),
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let config = AppConfig::load_config(
|
let config = self.load_config().await?;
|
||||||
&self.enviornment,
|
|
||||||
&self.working_dir,
|
|
||||||
self.config_file.as_deref(),
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let app_context = Arc::new(
|
let app_context =
|
||||||
AppContext::new(self.enviornment.clone(), config, self.working_dir.clone()).await?,
|
AppContext::new(self.environment.clone(), config, self.working_dir.clone()).await?;
|
||||||
);
|
|
||||||
|
|
||||||
Ok(App {
|
Ok(App {
|
||||||
context: app_context,
|
context: app_context,
|
||||||
@@ -93,6 +85,26 @@ impl AppBuilder {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn load_env(&self) -> RecorderResult<()> {
|
||||||
|
AppConfig::load_dotenv(
|
||||||
|
&self.environment,
|
||||||
|
&self.working_dir,
|
||||||
|
self.dotenv_file.as_deref(),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn load_config(&self) -> RecorderResult<AppConfig> {
|
||||||
|
let config = AppConfig::load_config(
|
||||||
|
&self.environment,
|
||||||
|
&self.working_dir,
|
||||||
|
self.config_file.as_deref(),
|
||||||
|
)
|
||||||
|
.await?;
|
||||||
|
Ok(config)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn working_dir(self, working_dir: String) -> Self {
|
pub fn working_dir(self, working_dir: String) -> Self {
|
||||||
let mut ret = self;
|
let mut ret = self;
|
||||||
ret.working_dir = working_dir;
|
ret.working_dir = working_dir;
|
||||||
@@ -101,7 +113,7 @@ impl AppBuilder {
|
|||||||
|
|
||||||
pub fn environment(self, environment: Environment) -> Self {
|
pub fn environment(self, environment: Environment) -> Self {
|
||||||
let mut ret = self;
|
let mut ret = self;
|
||||||
ret.enviornment = environment;
|
ret.environment = environment;
|
||||||
ret
|
ret
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,6 +123,12 @@ impl AppBuilder {
|
|||||||
ret
|
ret
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn graceful_shutdown(self, graceful_shutdown: bool) -> Self {
|
||||||
|
let mut ret = self;
|
||||||
|
ret.graceful_shutdown = graceful_shutdown;
|
||||||
|
ret
|
||||||
|
}
|
||||||
|
|
||||||
pub fn dotenv_file(self, dotenv_file: Option<String>) -> Self {
|
pub fn dotenv_file(self, dotenv_file: Option<String>) -> Self {
|
||||||
let mut ret = self;
|
let mut ret = self;
|
||||||
ret.dotenv_file = dotenv_file;
|
ret.dotenv_file = dotenv_file;
|
||||||
@@ -130,10 +148,11 @@ impl AppBuilder {
|
|||||||
impl Default for AppBuilder {
|
impl Default for AppBuilder {
|
||||||
fn default() -> Self {
|
fn default() -> Self {
|
||||||
Self {
|
Self {
|
||||||
enviornment: Environment::Production,
|
environment: Environment::Production,
|
||||||
dotenv_file: None,
|
dotenv_file: None,
|
||||||
config_file: None,
|
config_file: None,
|
||||||
working_dir: String::from("."),
|
working_dir: String::from("."),
|
||||||
|
graceful_shutdown: true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,8 +11,21 @@ leaky_bucket_initial_tokens = 0
|
|||||||
leaky_bucket_refill_tokens = 1
|
leaky_bucket_refill_tokens = 1
|
||||||
leaky_bucket_refill_interval = 500
|
leaky_bucket_refill_interval = 500
|
||||||
|
|
||||||
|
|
||||||
|
[mikan.http_client.proxy]
|
||||||
|
|
||||||
|
[mikan.http_client.proxy.headers]
|
||||||
|
|
||||||
[graphql]
|
[graphql]
|
||||||
depth_limit = inf
|
depth_limit = inf
|
||||||
complexity_limit = inf
|
complexity_limit = inf
|
||||||
|
|
||||||
[cache]
|
[cache]
|
||||||
|
|
||||||
|
[crypto]
|
||||||
|
|
||||||
|
[task]
|
||||||
|
|
||||||
|
[message]
|
||||||
|
|
||||||
|
[media]
|
||||||
|
|||||||
@@ -9,9 +9,10 @@ use serde::{Deserialize, Serialize};
|
|||||||
|
|
||||||
use super::env::Environment;
|
use super::env::Environment;
|
||||||
use crate::{
|
use crate::{
|
||||||
auth::AuthConfig, cache::CacheConfig, database::DatabaseConfig, errors::RResult,
|
auth::AuthConfig, cache::CacheConfig, crypto::CryptoConfig, database::DatabaseConfig,
|
||||||
extract::mikan::MikanConfig, graphql::GraphQLConfig, logger::LoggerConfig,
|
errors::RecorderResult, extract::mikan::MikanConfig, graphql::GraphQLConfig,
|
||||||
storage::StorageConfig, web::WebServerConfig,
|
logger::LoggerConfig, media::MediaConfig, message::MessageConfig, storage::StorageConfig,
|
||||||
|
task::TaskConfig, web::WebServerConfig,
|
||||||
};
|
};
|
||||||
|
|
||||||
const DEFAULT_CONFIG_MIXIN: &str = include_str!("./default_mixin.toml");
|
const DEFAULT_CONFIG_MIXIN: &str = include_str!("./default_mixin.toml");
|
||||||
@@ -24,9 +25,13 @@ pub struct AppConfig {
|
|||||||
pub auth: AuthConfig,
|
pub auth: AuthConfig,
|
||||||
pub storage: StorageConfig,
|
pub storage: StorageConfig,
|
||||||
pub mikan: MikanConfig,
|
pub mikan: MikanConfig,
|
||||||
|
pub crypto: CryptoConfig,
|
||||||
pub graphql: GraphQLConfig,
|
pub graphql: GraphQLConfig,
|
||||||
|
pub media: MediaConfig,
|
||||||
pub logger: LoggerConfig,
|
pub logger: LoggerConfig,
|
||||||
pub database: DatabaseConfig,
|
pub database: DatabaseConfig,
|
||||||
|
pub task: TaskConfig,
|
||||||
|
pub message: MessageConfig,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AppConfig {
|
impl AppConfig {
|
||||||
@@ -64,7 +69,7 @@ impl AppConfig {
|
|||||||
fig: Figment,
|
fig: Figment,
|
||||||
filepath: impl AsRef<Path>,
|
filepath: impl AsRef<Path>,
|
||||||
ext: &str,
|
ext: &str,
|
||||||
) -> RResult<Figment> {
|
) -> RecorderResult<Figment> {
|
||||||
let content = fs::read_to_string(filepath)?;
|
let content = fs::read_to_string(filepath)?;
|
||||||
|
|
||||||
let rendered = tera::Tera::one_off(
|
let rendered = tera::Tera::one_off(
|
||||||
@@ -85,7 +90,7 @@ impl AppConfig {
|
|||||||
environment: &Environment,
|
environment: &Environment,
|
||||||
working_dir: &str,
|
working_dir: &str,
|
||||||
dotenv_file: Option<&str>,
|
dotenv_file: Option<&str>,
|
||||||
) -> RResult<()> {
|
) -> RecorderResult<()> {
|
||||||
let try_dotenv_file_or_dirs = if dotenv_file.is_some() {
|
let try_dotenv_file_or_dirs = if dotenv_file.is_some() {
|
||||||
vec![dotenv_file]
|
vec![dotenv_file]
|
||||||
} else {
|
} else {
|
||||||
@@ -106,12 +111,12 @@ impl AppConfig {
|
|||||||
for f in try_filenames.iter() {
|
for f in try_filenames.iter() {
|
||||||
let p = try_dotenv_file_or_dir_path.join(f);
|
let p = try_dotenv_file_or_dir_path.join(f);
|
||||||
if p.exists() && p.is_file() {
|
if p.exists() && p.is_file() {
|
||||||
dotenv::from_path(p)?;
|
dotenvy::from_path(p)?;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if try_dotenv_file_or_dir_path.is_file() {
|
} else if try_dotenv_file_or_dir_path.is_file() {
|
||||||
dotenv::from_path(try_dotenv_file_or_dir_path)?;
|
dotenvy::from_path(try_dotenv_file_or_dir_path)?;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -124,7 +129,7 @@ impl AppConfig {
|
|||||||
environment: &Environment,
|
environment: &Environment,
|
||||||
working_dir: &str,
|
working_dir: &str,
|
||||||
config_file: Option<&str>,
|
config_file: Option<&str>,
|
||||||
) -> RResult<AppConfig> {
|
) -> RecorderResult<AppConfig> {
|
||||||
let try_config_file_or_dirs = if config_file.is_some() {
|
let try_config_file_or_dirs = if config_file.is_some() {
|
||||||
vec![config_file]
|
vec![config_file]
|
||||||
} else {
|
} else {
|
||||||
@@ -140,7 +145,7 @@ impl AppConfig {
|
|||||||
.flat_map(|ps| {
|
.flat_map(|ps| {
|
||||||
allowed_extensions
|
allowed_extensions
|
||||||
.iter()
|
.iter()
|
||||||
.map(move |ext| (format!("{}{}{}", convention_prefix, ps, ext), ext))
|
.map(move |ext| (format!("{convention_prefix}{ps}{ext}"), ext))
|
||||||
})
|
})
|
||||||
.collect_vec();
|
.collect_vec();
|
||||||
|
|
||||||
|
|||||||
@@ -1,21 +1,47 @@
|
|||||||
|
use std::{fmt::Debug, sync::Arc};
|
||||||
|
|
||||||
|
use tokio::sync::OnceCell;
|
||||||
|
|
||||||
use super::{Environment, config::AppConfig};
|
use super::{Environment, config::AppConfig};
|
||||||
use crate::{
|
use crate::{
|
||||||
auth::AuthService, cache::CacheService, database::DatabaseService, errors::RResult,
|
auth::AuthService, cache::CacheService, crypto::CryptoService, database::DatabaseService,
|
||||||
extract::mikan::MikanClient, graphql::GraphQLService, logger::LoggerService,
|
errors::RecorderResult, extract::mikan::MikanClient, graphql::GraphQLService,
|
||||||
storage::StorageService,
|
logger::LoggerService, media::MediaService, message::MessageService, storage::StorageService,
|
||||||
|
task::TaskService,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
pub trait AppContextTrait: Send + Sync + Debug {
|
||||||
|
fn logger(&self) -> &LoggerService;
|
||||||
|
fn db(&self) -> &DatabaseService;
|
||||||
|
fn config(&self) -> &AppConfig;
|
||||||
|
fn cache(&self) -> &CacheService;
|
||||||
|
fn mikan(&self) -> &MikanClient;
|
||||||
|
fn auth(&self) -> &AuthService;
|
||||||
|
fn graphql(&self) -> &GraphQLService;
|
||||||
|
fn storage(&self) -> &StorageService;
|
||||||
|
fn working_dir(&self) -> &String;
|
||||||
|
fn environment(&self) -> &Environment;
|
||||||
|
fn crypto(&self) -> &CryptoService;
|
||||||
|
fn task(&self) -> &TaskService;
|
||||||
|
fn message(&self) -> &MessageService;
|
||||||
|
fn media(&self) -> &MediaService;
|
||||||
|
}
|
||||||
|
|
||||||
pub struct AppContext {
|
pub struct AppContext {
|
||||||
pub logger: LoggerService,
|
logger: LoggerService,
|
||||||
pub db: DatabaseService,
|
db: DatabaseService,
|
||||||
pub config: AppConfig,
|
config: AppConfig,
|
||||||
pub cache: CacheService,
|
cache: CacheService,
|
||||||
pub mikan: MikanClient,
|
mikan: MikanClient,
|
||||||
pub auth: AuthService,
|
auth: AuthService,
|
||||||
pub graphql: GraphQLService,
|
storage: StorageService,
|
||||||
pub storage: StorageService,
|
crypto: CryptoService,
|
||||||
pub working_dir: String,
|
working_dir: String,
|
||||||
pub environment: Environment,
|
environment: Environment,
|
||||||
|
message: MessageService,
|
||||||
|
media: MediaService,
|
||||||
|
task: OnceCell<TaskService>,
|
||||||
|
graphql: OnceCell<GraphQLService>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AppContext {
|
impl AppContext {
|
||||||
@@ -23,18 +49,20 @@ impl AppContext {
|
|||||||
environment: Environment,
|
environment: Environment,
|
||||||
config: AppConfig,
|
config: AppConfig,
|
||||||
working_dir: impl ToString,
|
working_dir: impl ToString,
|
||||||
) -> RResult<Self> {
|
) -> RecorderResult<Arc<Self>> {
|
||||||
let config_cloned = config.clone();
|
let config_cloned = config.clone();
|
||||||
|
|
||||||
let logger = LoggerService::from_config(config.logger).await?;
|
let logger = LoggerService::from_config(config.logger).await?;
|
||||||
let cache = CacheService::from_config(config.cache).await?;
|
let cache = CacheService::from_config(config.cache).await?;
|
||||||
let db = DatabaseService::from_config(config.database).await?;
|
let db = DatabaseService::from_config(config.database).await?;
|
||||||
let storage = StorageService::from_config(config.storage).await?;
|
let storage = StorageService::from_config(config.storage).await?;
|
||||||
|
let message = MessageService::from_config(config.message).await?;
|
||||||
let auth = AuthService::from_conf(config.auth).await?;
|
let auth = AuthService::from_conf(config.auth).await?;
|
||||||
let mikan = MikanClient::from_config(config.mikan).await?;
|
let mikan = MikanClient::from_config(config.mikan).await?;
|
||||||
let graphql = GraphQLService::from_config_and_database(config.graphql, db.clone()).await?;
|
let crypto = CryptoService::from_config(config.crypto).await?;
|
||||||
|
let media = MediaService::from_config(config.media).await?;
|
||||||
|
|
||||||
Ok(AppContext {
|
let ctx = Arc::new(AppContext {
|
||||||
config: config_cloned,
|
config: config_cloned,
|
||||||
environment,
|
environment,
|
||||||
logger,
|
logger,
|
||||||
@@ -44,7 +72,76 @@ impl AppContext {
|
|||||||
storage,
|
storage,
|
||||||
mikan,
|
mikan,
|
||||||
working_dir: working_dir.to_string(),
|
working_dir: working_dir.to_string(),
|
||||||
graphql,
|
crypto,
|
||||||
|
message,
|
||||||
|
media,
|
||||||
|
task: OnceCell::new(),
|
||||||
|
graphql: OnceCell::new(),
|
||||||
|
});
|
||||||
|
|
||||||
|
ctx.task
|
||||||
|
.get_or_try_init(async || {
|
||||||
|
TaskService::from_config_and_ctx(config.task, ctx.clone()).await
|
||||||
})
|
})
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
ctx.graphql
|
||||||
|
.get_or_try_init(async || {
|
||||||
|
GraphQLService::from_config_and_ctx(config.graphql, ctx.clone()).await
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(ctx)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Debug for AppContext {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
write!(f, "AppContext")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl AppContextTrait for AppContext {
|
||||||
|
fn logger(&self) -> &LoggerService {
|
||||||
|
&self.logger
|
||||||
|
}
|
||||||
|
fn db(&self) -> &DatabaseService {
|
||||||
|
&self.db
|
||||||
|
}
|
||||||
|
fn config(&self) -> &AppConfig {
|
||||||
|
&self.config
|
||||||
|
}
|
||||||
|
fn cache(&self) -> &CacheService {
|
||||||
|
&self.cache
|
||||||
|
}
|
||||||
|
fn mikan(&self) -> &MikanClient {
|
||||||
|
&self.mikan
|
||||||
|
}
|
||||||
|
fn auth(&self) -> &AuthService {
|
||||||
|
&self.auth
|
||||||
|
}
|
||||||
|
fn graphql(&self) -> &GraphQLService {
|
||||||
|
self.graphql.get().expect("graphql should be set")
|
||||||
|
}
|
||||||
|
fn storage(&self) -> &StorageService {
|
||||||
|
&self.storage
|
||||||
|
}
|
||||||
|
fn working_dir(&self) -> &String {
|
||||||
|
&self.working_dir
|
||||||
|
}
|
||||||
|
fn environment(&self) -> &Environment {
|
||||||
|
&self.environment
|
||||||
|
}
|
||||||
|
fn crypto(&self) -> &CryptoService {
|
||||||
|
&self.crypto
|
||||||
|
}
|
||||||
|
fn task(&self) -> &TaskService {
|
||||||
|
self.task.get().expect("task should be set")
|
||||||
|
}
|
||||||
|
fn message(&self) -> &MessageService {
|
||||||
|
&self.message
|
||||||
|
}
|
||||||
|
fn media(&self) -> &MediaService {
|
||||||
|
&self.media
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,20 +1,22 @@
|
|||||||
use std::{net::SocketAddr, sync::Arc};
|
use std::{net::SocketAddr, sync::Arc};
|
||||||
|
|
||||||
use axum::Router;
|
use axum::Router;
|
||||||
use futures::try_join;
|
use tokio::{net::TcpSocket, signal};
|
||||||
use tokio::signal;
|
use tracing::instrument;
|
||||||
|
|
||||||
use super::{builder::AppBuilder, context::AppContext};
|
use super::{builder::AppBuilder, context::AppContextTrait};
|
||||||
use crate::{
|
use crate::{
|
||||||
errors::RResult,
|
errors::{RecorderError, RecorderResult},
|
||||||
web::{
|
web::{
|
||||||
controller::{self, core::ControllerTrait},
|
controller::{self, core::ControllerTrait},
|
||||||
middleware::default_middleware_stack,
|
middleware::default_middleware_stack,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
pub const PROJECT_NAME: &str = "konobangu";
|
||||||
|
|
||||||
pub struct App {
|
pub struct App {
|
||||||
pub context: Arc<AppContext>,
|
pub context: Arc<dyn AppContextTrait>,
|
||||||
pub builder: AppBuilder,
|
pub builder: AppBuilder,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -23,42 +25,104 @@ impl App {
|
|||||||
AppBuilder::default()
|
AppBuilder::default()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn serve(&self) -> RResult<()> {
|
#[instrument(err, skip(self))]
|
||||||
|
pub async fn serve(&self) -> RecorderResult<()> {
|
||||||
let context = &self.context;
|
let context = &self.context;
|
||||||
let config = &context.config;
|
let config = context.config();
|
||||||
let listener = tokio::net::TcpListener::bind(&format!(
|
|
||||||
"{}:{}",
|
|
||||||
config.server.binding, config.server.port
|
|
||||||
))
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let mut router = Router::<Arc<AppContext>>::new();
|
let listener = {
|
||||||
|
let addr: SocketAddr =
|
||||||
|
format!("{}:{}", config.server.binding, config.server.port).parse()?;
|
||||||
|
|
||||||
let (graphqlc, oidcc) = try_join!(
|
let socket = if addr.is_ipv4() {
|
||||||
|
TcpSocket::new_v4()
|
||||||
|
} else {
|
||||||
|
TcpSocket::new_v6()
|
||||||
|
}?;
|
||||||
|
|
||||||
|
socket.set_reuseaddr(true)?;
|
||||||
|
|
||||||
|
#[cfg(all(unix, not(target_os = "solaris")))]
|
||||||
|
if let Err(e) = socket.set_reuseport(true) {
|
||||||
|
tracing::warn!("Failed to set SO_REUSEPORT: {}", e);
|
||||||
|
}
|
||||||
|
|
||||||
|
socket.bind(addr)?;
|
||||||
|
socket.listen(1024)
|
||||||
|
}?;
|
||||||
|
|
||||||
|
let mut router = Router::<Arc<dyn AppContextTrait>>::new();
|
||||||
|
|
||||||
|
let (graphql_c, oidc_c, metadata_c, static_c, feeds_c) = futures::try_join!(
|
||||||
controller::graphql::create(context.clone()),
|
controller::graphql::create(context.clone()),
|
||||||
controller::oidc::create(context.clone()),
|
controller::oidc::create(context.clone()),
|
||||||
|
controller::metadata::create(context.clone()),
|
||||||
|
controller::r#static::create(context.clone()),
|
||||||
|
controller::feeds::create(context.clone()),
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
for c in [graphqlc, oidcc] {
|
for c in [graphql_c, oidc_c, metadata_c, static_c, feeds_c] {
|
||||||
router = c.apply_to(router);
|
router = c.apply_to(router);
|
||||||
}
|
}
|
||||||
|
|
||||||
let middlewares = default_middleware_stack(context.clone());
|
let middlewares = default_middleware_stack(context.clone());
|
||||||
for mid in middlewares {
|
for mid in middlewares {
|
||||||
|
if mid.is_enabled() {
|
||||||
router = mid.apply(router)?;
|
router = mid.apply(router)?;
|
||||||
tracing::info!(name = mid.name(), "+middleware");
|
tracing::info!(name = mid.name(), "+middleware");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
let router = router
|
let router = router
|
||||||
.with_state(context.clone())
|
.with_state(context.clone())
|
||||||
.into_make_service_with_connect_info::<SocketAddr>();
|
.into_make_service_with_connect_info::<SocketAddr>();
|
||||||
|
|
||||||
axum::serve(listener, router)
|
let task = context.task();
|
||||||
|
|
||||||
|
let graceful_shutdown = self.builder.graceful_shutdown;
|
||||||
|
|
||||||
|
tokio::try_join!(
|
||||||
|
async {
|
||||||
|
let axum_serve = axum::serve(listener, router);
|
||||||
|
|
||||||
|
if graceful_shutdown {
|
||||||
|
axum_serve
|
||||||
.with_graceful_shutdown(async move {
|
.with_graceful_shutdown(async move {
|
||||||
Self::shutdown_signal().await;
|
Self::shutdown_signal().await;
|
||||||
tracing::info!("shutting down...");
|
tracing::info!("axum shutting down...");
|
||||||
})
|
})
|
||||||
.await?;
|
.await?;
|
||||||
|
} else {
|
||||||
|
axum_serve.await?;
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok::<(), RecorderError>(())
|
||||||
|
},
|
||||||
|
async {
|
||||||
|
{
|
||||||
|
let monitor = task.setup_monitor().await?;
|
||||||
|
if graceful_shutdown {
|
||||||
|
monitor
|
||||||
|
.run_with_signal(async move {
|
||||||
|
Self::shutdown_signal().await;
|
||||||
|
tracing::info!("apalis shutting down...");
|
||||||
|
Ok(())
|
||||||
|
})
|
||||||
|
.await?;
|
||||||
|
} else {
|
||||||
|
monitor.run().await?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok::<(), RecorderError>(())
|
||||||
|
},
|
||||||
|
async {
|
||||||
|
let listener = task.setup_listener().await?;
|
||||||
|
listener.listen().await?;
|
||||||
|
|
||||||
|
Ok::<(), RecorderError>(())
|
||||||
|
}
|
||||||
|
)?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -78,12 +142,25 @@ impl App {
|
|||||||
.await;
|
.await;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#[cfg(all(unix, debug_assertions))]
|
||||||
|
let quit = async {
|
||||||
|
signal::unix::signal(signal::unix::SignalKind::quit())
|
||||||
|
.expect("Failed to install SIGQUIT handler")
|
||||||
|
.recv()
|
||||||
|
.await;
|
||||||
|
println!("Received SIGQUIT");
|
||||||
|
};
|
||||||
|
|
||||||
#[cfg(not(unix))]
|
#[cfg(not(unix))]
|
||||||
let terminate = std::future::pending::<()>();
|
let terminate = std::future::pending::<()>();
|
||||||
|
|
||||||
|
#[cfg(not(all(unix, debug_assertions)))]
|
||||||
|
let quit = std::future::pending::<()>();
|
||||||
|
|
||||||
tokio::select! {
|
tokio::select! {
|
||||||
() = ctrl_c => {},
|
() = ctrl_c => {},
|
||||||
() = terminate => {},
|
() = terminate => {},
|
||||||
|
() = quit => {},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,9 +4,9 @@ pub mod context;
|
|||||||
pub mod core;
|
pub mod core;
|
||||||
pub mod env;
|
pub mod env;
|
||||||
|
|
||||||
pub use core::App;
|
pub use core::{App, PROJECT_NAME};
|
||||||
|
|
||||||
pub use builder::AppBuilder;
|
pub use builder::AppBuilder;
|
||||||
pub use config::AppConfig;
|
pub use config::AppConfig;
|
||||||
pub use context::AppContext;
|
pub use context::{AppContext, AppContextTrait};
|
||||||
pub use env::Environment;
|
pub use env::Environment;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use axum::http::{HeaderValue, request::Parts};
|
use axum::http::{HeaderValue, request::Parts};
|
||||||
use base64::{self, Engine};
|
use base64::{self, Engine};
|
||||||
use reqwest::header::AUTHORIZATION;
|
use http::header::AUTHORIZATION;
|
||||||
|
|
||||||
use super::{
|
use super::{
|
||||||
config::BasicAuthConfig,
|
config::BasicAuthConfig,
|
||||||
@@ -9,7 +9,7 @@ use super::{
|
|||||||
service::{AuthServiceTrait, AuthUserInfo},
|
service::{AuthServiceTrait, AuthUserInfo},
|
||||||
};
|
};
|
||||||
use crate::{
|
use crate::{
|
||||||
app::AppContext,
|
app::{AppContextTrait, PROJECT_NAME},
|
||||||
models::{auth::AuthType, subscribers::SEED_SUBSCRIBER},
|
models::{auth::AuthType, subscribers::SEED_SUBSCRIBER},
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -64,15 +64,14 @@ pub struct BasicAuthService {
|
|||||||
impl AuthServiceTrait for BasicAuthService {
|
impl AuthServiceTrait for BasicAuthService {
|
||||||
async fn extract_user_info(
|
async fn extract_user_info(
|
||||||
&self,
|
&self,
|
||||||
ctx: &AppContext,
|
ctx: &dyn AppContextTrait,
|
||||||
request: &mut Parts,
|
request: &mut Parts,
|
||||||
) -> Result<AuthUserInfo, AuthError> {
|
) -> Result<AuthUserInfo, AuthError> {
|
||||||
if let Ok(AuthBasic {
|
if let Ok(AuthBasic {
|
||||||
user: found_user,
|
user: found_user,
|
||||||
password: found_password,
|
password: found_password,
|
||||||
}) = AuthBasic::decode_request_parts(request)
|
}) = AuthBasic::decode_request_parts(request)
|
||||||
{
|
&& self.config.user == found_user
|
||||||
if self.config.user == found_user
|
|
||||||
&& self.config.password == found_password.unwrap_or_default()
|
&& self.config.password == found_password.unwrap_or_default()
|
||||||
{
|
{
|
||||||
let subscriber_auth = crate::models::auth::Model::find_by_pid(ctx, SEED_SUBSCRIBER)
|
let subscriber_auth = crate::models::auth::Model::find_by_pid(ctx, SEED_SUBSCRIBER)
|
||||||
@@ -83,12 +82,11 @@ impl AuthServiceTrait for BasicAuthService {
|
|||||||
auth_type: AuthType::Basic,
|
auth_type: AuthType::Basic,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
|
||||||
Err(AuthError::BasicInvalidCredentials)
|
Err(AuthError::BasicInvalidCredentials)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn www_authenticate_header_value(&self) -> Option<HeaderValue> {
|
fn www_authenticate_header_value(&self) -> Option<HeaderValue> {
|
||||||
Some(HeaderValue::from_static(r#"Basic realm="konobangu""#))
|
Some(HeaderValue::from_str(format!("Basic realm=\"{PROJECT_NAME}\"").as_str()).unwrap())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn auth_type(&self) -> AuthType {
|
fn auth_type(&self) -> AuthType {
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
use jwt_authorizer::OneOrArray;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
|
use jwtk::OneOrMany;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use serde_with::{NoneAsEmptyString, serde_as};
|
use serde_with::serde_as;
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
pub struct BasicAuthConfig {
|
pub struct BasicAuthConfig {
|
||||||
@@ -22,13 +24,9 @@ pub struct OidcAuthConfig {
|
|||||||
#[serde(rename = "oidc_client_secret")]
|
#[serde(rename = "oidc_client_secret")]
|
||||||
pub client_secret: String,
|
pub client_secret: String,
|
||||||
#[serde(rename = "oidc_extra_scopes")]
|
#[serde(rename = "oidc_extra_scopes")]
|
||||||
pub extra_scopes: Option<OneOrArray<String>>,
|
pub extra_scopes: Option<OneOrMany<String>>,
|
||||||
#[serde_as(as = "NoneAsEmptyString")]
|
#[serde(rename = "oidc_extra_claims")]
|
||||||
#[serde(rename = "oidc_extra_claim_key")]
|
pub extra_claims: Option<HashMap<String, Option<String>>>,
|
||||||
pub extra_claim_key: Option<String>,
|
|
||||||
#[serde(rename = "oidc_extra_claim_value")]
|
|
||||||
#[serde_as(as = "NoneAsEmptyString")]
|
|
||||||
pub extra_claim_value: Option<String>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
|
||||||
|
|||||||
@@ -1,82 +1,95 @@
|
|||||||
use std::fmt;
|
|
||||||
|
|
||||||
use async_graphql::dynamic::ResolverContext;
|
use async_graphql::dynamic::ResolverContext;
|
||||||
use axum::{
|
use axum::{
|
||||||
Json,
|
Json,
|
||||||
http::StatusCode,
|
http::StatusCode,
|
||||||
response::{IntoResponse, Response},
|
response::{IntoResponse, Response},
|
||||||
};
|
};
|
||||||
|
use fetch::HttpClientError;
|
||||||
use openidconnect::{
|
use openidconnect::{
|
||||||
ConfigurationError, RequestTokenError, SignatureVerificationError, SigningError,
|
ConfigurationError, RequestTokenError, SignatureVerificationError, SigningError,
|
||||||
StandardErrorResponse, core::CoreErrorResponseType,
|
StandardErrorResponse, core::CoreErrorResponseType,
|
||||||
};
|
};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use thiserror::Error;
|
use snafu::prelude::*;
|
||||||
|
|
||||||
use crate::{fetch::HttpClientError, models::auth::AuthType};
|
use crate::models::auth::AuthType;
|
||||||
|
|
||||||
#[derive(Debug, Error)]
|
#[derive(Debug, Snafu)]
|
||||||
|
#[snafu(visibility(pub(crate)))]
|
||||||
pub enum AuthError {
|
pub enum AuthError {
|
||||||
#[error("Not support auth method")]
|
#[snafu(display("Permission denied"))]
|
||||||
|
PermissionError,
|
||||||
|
#[snafu(display("Not support auth method"))]
|
||||||
NotSupportAuthMethod {
|
NotSupportAuthMethod {
|
||||||
supported: Vec<AuthType>,
|
supported: Vec<AuthType>,
|
||||||
current: AuthType,
|
current: AuthType,
|
||||||
},
|
},
|
||||||
#[error("Failed to find auth record")]
|
#[snafu(display("Failed to find auth record"))]
|
||||||
FindAuthRecordError,
|
FindAuthRecordError,
|
||||||
#[error("Invalid credentials")]
|
#[snafu(display("Invalid credentials"))]
|
||||||
BasicInvalidCredentials,
|
BasicInvalidCredentials,
|
||||||
#[error(transparent)]
|
#[snafu(display("Invalid oidc provider meta client error: {source}"))]
|
||||||
OidcInitError(#[from] jwt_authorizer::error::InitError),
|
OidcProviderHttpClientError { source: HttpClientError },
|
||||||
#[error("Invalid oidc provider meta client error: {0}")]
|
#[snafu(transparent)]
|
||||||
OidcProviderHttpClientError(HttpClientError),
|
OidcProviderMetaError {
|
||||||
#[error(transparent)]
|
source: openidconnect::DiscoveryError<HttpClientError>,
|
||||||
OidcProviderMetaError(#[from] openidconnect::DiscoveryError<HttpClientError>),
|
},
|
||||||
#[error("Invalid oidc provider URL: {0}")]
|
#[snafu(display("Invalid oidc provider URL: {source}"))]
|
||||||
OidcProviderUrlError(url::ParseError),
|
OidcProviderUrlError { source: url::ParseError },
|
||||||
#[error("Invalid oidc redirect URI: {0}")]
|
#[snafu(display("Invalid oidc redirect URI: {source}"))]
|
||||||
OidcRequestRedirectUriError(url::ParseError),
|
OidcRequestRedirectUriError {
|
||||||
#[error("Oidc request session not found or expired")]
|
#[snafu(source)]
|
||||||
|
source: url::ParseError,
|
||||||
|
},
|
||||||
|
#[snafu(display("Oidc request session not found or expired"))]
|
||||||
OidcCallbackRecordNotFoundOrExpiredError,
|
OidcCallbackRecordNotFoundOrExpiredError,
|
||||||
#[error("Invalid oidc request callback nonce")]
|
#[snafu(display("Invalid oidc request callback nonce"))]
|
||||||
OidcInvalidNonceError,
|
OidcInvalidNonceError,
|
||||||
#[error("Invalid oidc request callback state")]
|
#[snafu(display("Invalid oidc request callback state"))]
|
||||||
OidcInvalidStateError,
|
OidcInvalidStateError,
|
||||||
#[error("Invalid oidc request callback code")]
|
#[snafu(display("Invalid oidc request callback code"))]
|
||||||
OidcInvalidCodeError,
|
OidcInvalidCodeError,
|
||||||
#[error(transparent)]
|
#[snafu(transparent)]
|
||||||
OidcCallbackTokenConfigrationError(#[from] ConfigurationError),
|
OidcCallbackTokenConfigurationError { source: ConfigurationError },
|
||||||
#[error(transparent)]
|
#[snafu(transparent)]
|
||||||
OidcRequestTokenError(
|
OidcRequestTokenError {
|
||||||
#[from] RequestTokenError<HttpClientError, StandardErrorResponse<CoreErrorResponseType>>,
|
source: RequestTokenError<HttpClientError, StandardErrorResponse<CoreErrorResponseType>>,
|
||||||
),
|
},
|
||||||
#[error("Invalid oidc id token")]
|
#[snafu(display("Invalid oidc id token"))]
|
||||||
OidcInvalidIdTokenError,
|
OidcInvalidIdTokenError,
|
||||||
#[error("Invalid oidc access token")]
|
#[snafu(display("Invalid oidc access token"))]
|
||||||
OidcInvalidAccessTokenError,
|
OidcInvalidAccessTokenError,
|
||||||
#[error(transparent)]
|
#[snafu(transparent)]
|
||||||
OidcSignatureVerificationError(#[from] SignatureVerificationError),
|
OidcSignatureVerificationError { source: SignatureVerificationError },
|
||||||
#[error(transparent)]
|
#[snafu(transparent)]
|
||||||
OidcSigningError(#[from] SigningError),
|
OidcSigningError { source: SigningError },
|
||||||
#[error(transparent)]
|
#[snafu(display("Missing Bearer token"))]
|
||||||
OidcJwtAuthError(#[from] jwt_authorizer::AuthError),
|
OidcMissingBearerToken,
|
||||||
#[error("Extra scopes {expected} do not match found scopes {found}")]
|
#[snafu(transparent)]
|
||||||
|
OidcJwtkError { source: jwtk::Error },
|
||||||
|
#[snafu(display("Extra scopes {expected} do not match found scopes {found}"))]
|
||||||
OidcExtraScopesMatchError { expected: String, found: String },
|
OidcExtraScopesMatchError { expected: String, found: String },
|
||||||
#[error("Extra claim {key} does not match expected value {expected}, found {found}")]
|
#[snafu(display("Extra claim {key} does not match expected value {expected}, found {found}"))]
|
||||||
OidcExtraClaimMatchError {
|
OidcExtraClaimMatchError {
|
||||||
key: String,
|
key: String,
|
||||||
expected: String,
|
expected: String,
|
||||||
found: String,
|
found: String,
|
||||||
},
|
},
|
||||||
#[error("Extra claim {0} missing")]
|
#[snafu(display("Extra claim {claim} missing"))]
|
||||||
OidcExtraClaimMissingError(String),
|
OidcExtraClaimMissingError { claim: String },
|
||||||
#[error("Audience {0} missing")]
|
#[snafu(display("Audience {aud} missing"))]
|
||||||
OidcAudMissingError(String),
|
OidcAudMissingError { aud: String },
|
||||||
#[error("Subject missing")]
|
#[snafu(display("Subject missing"))]
|
||||||
OidcSubMissingError,
|
OidcSubMissingError,
|
||||||
#[error(fmt = display_graphql_permission_error)]
|
#[snafu(display(
|
||||||
GraphQLPermissionError {
|
"GraphQL permission denied since {context_path}{}{field}{}{column}: {}",
|
||||||
inner_error: async_graphql::Error,
|
(if field.is_empty() { "" } else { "." }),
|
||||||
|
(if column.is_empty() { "" } else { "." }),
|
||||||
|
source.message
|
||||||
|
))]
|
||||||
|
GraphqlDynamicPermissionError {
|
||||||
|
#[snafu(source(false))]
|
||||||
|
source: Box<async_graphql::Error>,
|
||||||
field: String,
|
field: String,
|
||||||
column: String,
|
column: String,
|
||||||
context_path: String,
|
context_path: String,
|
||||||
@@ -84,14 +97,14 @@ pub enum AuthError {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl AuthError {
|
impl AuthError {
|
||||||
pub fn from_graphql_subscribe_id_guard(
|
pub fn from_graphql_dynamic_subscribe_id_guard(
|
||||||
inner_error: async_graphql::Error,
|
source: async_graphql::Error,
|
||||||
context: &ResolverContext,
|
context: &ResolverContext,
|
||||||
field_name: &str,
|
field_name: &str,
|
||||||
column_name: &str,
|
column_name: &str,
|
||||||
) -> AuthError {
|
) -> AuthError {
|
||||||
AuthError::GraphQLPermissionError {
|
AuthError::GraphqlDynamicPermissionError {
|
||||||
inner_error,
|
source: Box::new(source),
|
||||||
field: field_name.to_string(),
|
field: field_name.to_string(),
|
||||||
column: column_name.to_string(),
|
column: column_name.to_string(),
|
||||||
context_path: context
|
context_path: context
|
||||||
@@ -103,39 +116,27 @@ impl AuthError {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn display_graphql_permission_error(
|
|
||||||
inner_error: &async_graphql::Error,
|
|
||||||
field: &String,
|
|
||||||
column: &String,
|
|
||||||
context_path: &String,
|
|
||||||
formatter: &mut fmt::Formatter<'_>,
|
|
||||||
) -> fmt::Result {
|
|
||||||
write!(
|
|
||||||
formatter,
|
|
||||||
"GraphQL permission denied since {context_path}{}{field}{}{column}: {}",
|
|
||||||
(if field.is_empty() { "" } else { "." }),
|
|
||||||
(if column.is_empty() { "" } else { "." }),
|
|
||||||
inner_error.message
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
#[derive(Clone, Debug, Serialize, Deserialize)]
|
||||||
pub struct AuthErrorBody {
|
pub struct AuthErrorResponse {
|
||||||
pub error_code: i32,
|
pub success: bool,
|
||||||
pub error_msg: String,
|
pub message: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl From<AuthError> for AuthErrorBody {
|
impl From<AuthError> for AuthErrorResponse {
|
||||||
fn from(value: AuthError) -> Self {
|
fn from(value: AuthError) -> Self {
|
||||||
AuthErrorBody {
|
AuthErrorResponse {
|
||||||
error_code: StatusCode::UNAUTHORIZED.as_u16() as i32,
|
success: false,
|
||||||
error_msg: value.to_string(),
|
message: value.to_string(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl IntoResponse for AuthError {
|
impl IntoResponse for AuthError {
|
||||||
fn into_response(self) -> Response {
|
fn into_response(self) -> Response {
|
||||||
(StatusCode::UNAUTHORIZED, Json(AuthErrorBody::from(self))).into_response()
|
(
|
||||||
|
StatusCode::UNAUTHORIZED,
|
||||||
|
Json(AuthErrorResponse::from(self)),
|
||||||
|
)
|
||||||
|
.into_response()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,41 +0,0 @@
|
|||||||
import type { Observable } from '@graphiql/toolkit';
|
|
||||||
import { InjectionToken, inject } from '@outposts/injection-js';
|
|
||||||
import {
|
|
||||||
type AuthFeature,
|
|
||||||
EventTypes,
|
|
||||||
PublicEventsService,
|
|
||||||
} from 'oidc-client-rx';
|
|
||||||
import { filter, shareReplay } from 'rxjs';
|
|
||||||
|
|
||||||
export type CheckAuthResultEventType =
|
|
||||||
| { type: EventTypes.CheckingAuthFinished }
|
|
||||||
| {
|
|
||||||
type: EventTypes.CheckingAuthFinishedWithError;
|
|
||||||
value: string;
|
|
||||||
};
|
|
||||||
export const CHECK_AUTH_RESULT_EVENT = new InjectionToken<
|
|
||||||
Observable<CheckAuthResultEventType>
|
|
||||||
>('CHECK_AUTH_RESULT_EVENT');
|
|
||||||
|
|
||||||
export function withCheckAuthResultEvent(): AuthFeature {
|
|
||||||
return {
|
|
||||||
ɵproviders: [
|
|
||||||
{
|
|
||||||
provide: CHECK_AUTH_RESULT_EVENT,
|
|
||||||
useFactory: () => {
|
|
||||||
const publishEventService = inject(PublicEventsService);
|
|
||||||
|
|
||||||
return publishEventService.registerForEvents().pipe(
|
|
||||||
filter(
|
|
||||||
(e) =>
|
|
||||||
e.type === EventTypes.CheckingAuthFinishedWithError ||
|
|
||||||
e.type === EventTypes.CheckingAuthFinished
|
|
||||||
),
|
|
||||||
shareReplay(1)
|
|
||||||
);
|
|
||||||
},
|
|
||||||
deps: [PublicEventsService],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
import { runInInjectionContext } from '@outposts/injection-js';
|
|
||||||
import { autoLoginPartialRoutesGuard } from 'oidc-client-rx';
|
|
||||||
import { firstValueFrom } from 'rxjs';
|
|
||||||
import type { RouterContext } from '../controllers/__root';
|
|
||||||
|
|
||||||
export const beforeLoadGuard = async ({
|
|
||||||
context,
|
|
||||||
}: { context: RouterContext }) => {
|
|
||||||
if (!context.isAuthenticated) {
|
|
||||||
const guard$ = runInInjectionContext(context.injector, () =>
|
|
||||||
autoLoginPartialRoutesGuard()
|
|
||||||
);
|
|
||||||
|
|
||||||
const isAuthenticated = await firstValueFrom(guard$);
|
|
||||||
if (!isAuthenticated) {
|
|
||||||
throw !isAuthenticated;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
import { useObservableEagerState, useObservableState } from 'observable-hooks';
|
|
||||||
import {
|
|
||||||
InjectorContextVoidInjector,
|
|
||||||
useOidcClient,
|
|
||||||
} from 'oidc-client-rx/adapters/react';
|
|
||||||
import { useMemo } from 'react';
|
|
||||||
import { NEVER, type Observable, of } from 'rxjs';
|
|
||||||
import { isBasicAuth } from './config';
|
|
||||||
import {
|
|
||||||
CHECK_AUTH_RESULT_EVENT,
|
|
||||||
type CheckAuthResultEventType,
|
|
||||||
} from './event';
|
|
||||||
|
|
||||||
const BASIC_AUTH_IS_AUTHENTICATED$ = of({
|
|
||||||
isAuthenticated: true,
|
|
||||||
allConfigsAuthenticated: [],
|
|
||||||
});
|
|
||||||
|
|
||||||
const BASIC_AUTH_USER_DATA$ = of({
|
|
||||||
userData: {},
|
|
||||||
allUserData: [],
|
|
||||||
});
|
|
||||||
|
|
||||||
export function useAuth() {
|
|
||||||
const { oidcSecurityService, injector } = isBasicAuth
|
|
||||||
? { oidcSecurityService: undefined, injector: InjectorContextVoidInjector }
|
|
||||||
: // biome-ignore lint/correctness/useHookAtTopLevel: <explanation>
|
|
||||||
useOidcClient();
|
|
||||||
|
|
||||||
const { isAuthenticated } = useObservableEagerState(
|
|
||||||
oidcSecurityService?.isAuthenticated$ ?? BASIC_AUTH_IS_AUTHENTICATED$
|
|
||||||
);
|
|
||||||
|
|
||||||
const { userData } = useObservableEagerState(
|
|
||||||
oidcSecurityService?.userData$ ?? BASIC_AUTH_USER_DATA$
|
|
||||||
);
|
|
||||||
|
|
||||||
const checkAuthResultEvent = useObservableState(
|
|
||||||
useMemo(
|
|
||||||
() => (isBasicAuth ? NEVER : injector.get(CHECK_AUTH_RESULT_EVENT)),
|
|
||||||
[injector]
|
|
||||||
) as Observable<CheckAuthResultEventType>
|
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
|
||||||
oidcSecurityService,
|
|
||||||
isAuthenticated,
|
|
||||||
userData,
|
|
||||||
injector,
|
|
||||||
checkAuthResultEvent,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -7,18 +7,21 @@ use axum::{
|
|||||||
response::{IntoResponse, Response},
|
response::{IntoResponse, Response},
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::{app::AppContext, auth::AuthServiceTrait};
|
use crate::{app::AppContextTrait, auth::AuthServiceTrait};
|
||||||
|
|
||||||
pub async fn header_www_authenticate_middleware(
|
pub async fn auth_middleware(
|
||||||
State(ctx): State<Arc<AppContext>>,
|
State(ctx): State<Arc<dyn AppContextTrait>>,
|
||||||
request: Request,
|
request: Request,
|
||||||
next: Next,
|
next: Next,
|
||||||
) -> Response {
|
) -> Response {
|
||||||
let auth_service = &ctx.auth;
|
let auth_service = ctx.auth();
|
||||||
|
|
||||||
let (mut parts, body) = request.into_parts();
|
let (mut parts, body) = request.into_parts();
|
||||||
|
|
||||||
let mut response = match auth_service.extract_user_info(&ctx, &mut parts).await {
|
let mut response = match auth_service
|
||||||
|
.extract_user_info(ctx.as_ref() as &dyn AppContextTrait, &mut parts)
|
||||||
|
.await
|
||||||
|
{
|
||||||
Ok(auth_user_info) => {
|
Ok(auth_user_info) => {
|
||||||
let mut request = Request::from_parts(parts, body);
|
let mut request = Request::from_parts(parts, body);
|
||||||
request.extensions_mut().insert(auth_user_info);
|
request.extensions_mut().insert(auth_user_info);
|
||||||
|
|||||||
@@ -7,5 +7,5 @@ pub mod service;
|
|||||||
|
|
||||||
pub use config::{AuthConfig, BasicAuthConfig, OidcAuthConfig};
|
pub use config::{AuthConfig, BasicAuthConfig, OidcAuthConfig};
|
||||||
pub use errors::AuthError;
|
pub use errors::AuthError;
|
||||||
pub use middleware::header_www_authenticate_middleware;
|
pub use middleware::auth_middleware;
|
||||||
pub use service::{AuthService, AuthServiceTrait, AuthUserInfo};
|
pub use service::{AuthService, AuthServiceTrait, AuthUserInfo};
|
||||||
|
|||||||
@@ -1,12 +1,20 @@
|
|||||||
use std::{
|
use std::{
|
||||||
collections::{HashMap, HashSet},
|
collections::{HashMap, HashSet},
|
||||||
|
future::Future,
|
||||||
|
ops::Deref,
|
||||||
|
pin::Pin,
|
||||||
sync::Arc,
|
sync::Arc,
|
||||||
};
|
};
|
||||||
|
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use axum::http::{HeaderValue, request::Parts};
|
use axum::{
|
||||||
|
http,
|
||||||
|
http::{HeaderValue, request::Parts},
|
||||||
|
};
|
||||||
|
use fetch::{HttpClient, client::HttpClientError};
|
||||||
|
use http::header::AUTHORIZATION;
|
||||||
use itertools::Itertools;
|
use itertools::Itertools;
|
||||||
use jwt_authorizer::{NumericDate, OneOrArray, authorizer::Authorizer};
|
use jwtk::jwk::RemoteJwksVerifier;
|
||||||
use moka::future::Cache;
|
use moka::future::Cache;
|
||||||
use openidconnect::{
|
use openidconnect::{
|
||||||
AccessTokenHash, AuthorizationCode, ClientId, ClientSecret, CsrfToken, IssuerUrl, Nonce,
|
AccessTokenHash, AuthorizationCode, ClientId, ClientSecret, CsrfToken, IssuerUrl, Nonce,
|
||||||
@@ -16,32 +24,64 @@ use openidconnect::{
|
|||||||
use sea_orm::DbErr;
|
use sea_orm::DbErr;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
|
use snafu::ResultExt;
|
||||||
use url::Url;
|
use url::Url;
|
||||||
|
|
||||||
use super::{
|
use super::{
|
||||||
config::OidcAuthConfig,
|
config::OidcAuthConfig,
|
||||||
errors::AuthError,
|
errors::{AuthError, OidcProviderUrlSnafu, OidcRequestRedirectUriSnafu},
|
||||||
service::{AuthServiceTrait, AuthUserInfo},
|
service::{AuthServiceTrait, AuthUserInfo},
|
||||||
};
|
};
|
||||||
use crate::{app::AppContext, errors::RError, fetch::HttpClient, models::auth::AuthType};
|
use crate::{
|
||||||
|
app::{AppContextTrait, PROJECT_NAME},
|
||||||
|
errors::RecorderError,
|
||||||
|
models::auth::AuthType,
|
||||||
|
};
|
||||||
|
|
||||||
|
pub struct OidcHttpClient(pub Arc<HttpClient>);
|
||||||
|
|
||||||
|
impl Deref for OidcHttpClient {
|
||||||
|
type Target = HttpClient;
|
||||||
|
|
||||||
|
fn deref(&self) -> &Self::Target {
|
||||||
|
&self.0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'c> openidconnect::AsyncHttpClient<'c> for OidcHttpClient {
|
||||||
|
type Error = HttpClientError;
|
||||||
|
|
||||||
|
#[cfg(target_arch = "wasm32")]
|
||||||
|
type Future =
|
||||||
|
Pin<Box<dyn Future<Output = Result<openidconnect::HttpResponse, Self::Error>> + 'c>>;
|
||||||
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
|
type Future =
|
||||||
|
Pin<Box<dyn Future<Output = Result<openidconnect::HttpResponse, Self::Error>> + Send + 'c>>;
|
||||||
|
|
||||||
|
fn call(&'c self, request: openidconnect::HttpRequest) -> Self::Future {
|
||||||
|
Box::pin(async move {
|
||||||
|
let response = self.execute(request.try_into()?).await?;
|
||||||
|
|
||||||
|
let mut builder = http::Response::builder().status(response.status());
|
||||||
|
|
||||||
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
|
{
|
||||||
|
builder = builder.version(response.version());
|
||||||
|
}
|
||||||
|
|
||||||
|
for (name, value) in response.headers().iter() {
|
||||||
|
builder = builder.header(name, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
builder
|
||||||
|
.body(response.bytes().await?.to_vec())
|
||||||
|
.map_err(HttpClientError::from)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Deserialize, Serialize, Clone, Debug)]
|
#[derive(Deserialize, Serialize, Clone, Debug)]
|
||||||
pub struct OidcAuthClaims {
|
pub struct OidcAuthClaims {
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
pub iss: Option<String>,
|
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
pub sub: Option<String>,
|
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
pub aud: Option<OneOrArray<String>>,
|
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
pub exp: Option<NumericDate>,
|
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
pub nbf: Option<NumericDate>,
|
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
pub iat: Option<NumericDate>,
|
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
pub jti: Option<String>,
|
|
||||||
#[serde(skip_serializing_if = "Option::is_none")]
|
|
||||||
pub scope: Option<String>,
|
pub scope: Option<String>,
|
||||||
#[serde(flatten)]
|
#[serde(flatten)]
|
||||||
pub custom: HashMap<String, Value>,
|
pub custom: HashMap<String, Value>,
|
||||||
@@ -51,40 +91,6 @@ impl OidcAuthClaims {
|
|||||||
pub fn scopes(&self) -> std::str::Split<'_, char> {
|
pub fn scopes(&self) -> std::str::Split<'_, char> {
|
||||||
self.scope.as_deref().unwrap_or_default().split(',')
|
self.scope.as_deref().unwrap_or_default().split(',')
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_claim(&self, key: &str) -> Option<String> {
|
|
||||||
match key {
|
|
||||||
"iss" => self.iss.clone(),
|
|
||||||
"sub" => self.sub.clone(),
|
|
||||||
"aud" => self.aud.as_ref().map(|s| s.iter().join(",")),
|
|
||||||
"exp" => self.exp.clone().map(|s| s.0.to_string()),
|
|
||||||
"nbf" => self.nbf.clone().map(|s| s.0.to_string()),
|
|
||||||
"iat" => self.iat.clone().map(|s| s.0.to_string()),
|
|
||||||
"jti" => self.jti.clone(),
|
|
||||||
"scope" => self.scope.clone(),
|
|
||||||
key => self.custom.get(key).map(|s| s.to_string()),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn has_claim(&self, key: &str) -> bool {
|
|
||||||
match key {
|
|
||||||
"iss" => self.iss.is_some(),
|
|
||||||
"sub" => self.sub.is_some(),
|
|
||||||
"aud" => self.aud.is_some(),
|
|
||||||
"exp" => self.exp.is_some(),
|
|
||||||
"nbf" => self.nbf.is_some(),
|
|
||||||
"iat" => self.iat.is_some(),
|
|
||||||
"jti" => self.jti.is_some(),
|
|
||||||
"scope" => self.scope.is_some(),
|
|
||||||
key => self.custom.contains_key(key),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn contains_audience(&self, aud: &str) -> bool {
|
|
||||||
self.aud
|
|
||||||
.as_ref()
|
|
||||||
.is_some_and(|arr| arr.iter().any(|s| s == aud))
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize)]
|
#[derive(Debug, Clone, Serialize)]
|
||||||
@@ -114,8 +120,8 @@ pub struct OidcAuthCallbackPayload {
|
|||||||
|
|
||||||
pub struct OidcAuthService {
|
pub struct OidcAuthService {
|
||||||
pub config: OidcAuthConfig,
|
pub config: OidcAuthConfig,
|
||||||
pub api_authorizer: Authorizer<OidcAuthClaims>,
|
pub jwk_verifier: RemoteJwksVerifier,
|
||||||
pub oidc_provider_client: HttpClient,
|
pub oidc_provider_client: Arc<HttpClient>,
|
||||||
pub oidc_request_cache: Cache<String, OidcAuthRequest>,
|
pub oidc_request_cache: Cache<String, OidcAuthRequest>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -124,14 +130,15 @@ impl OidcAuthService {
|
|||||||
&self,
|
&self,
|
||||||
redirect_uri: &str,
|
redirect_uri: &str,
|
||||||
) -> Result<OidcAuthRequest, AuthError> {
|
) -> Result<OidcAuthRequest, AuthError> {
|
||||||
|
let oidc_provider_client = OidcHttpClient(self.oidc_provider_client.clone());
|
||||||
let provider_metadata = CoreProviderMetadata::discover_async(
|
let provider_metadata = CoreProviderMetadata::discover_async(
|
||||||
IssuerUrl::new(self.config.issuer.clone()).map_err(AuthError::OidcProviderUrlError)?,
|
IssuerUrl::new(self.config.issuer.clone()).context(OidcProviderUrlSnafu)?,
|
||||||
&self.oidc_provider_client,
|
&oidc_provider_client,
|
||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
let redirect_uri = RedirectUrl::new(redirect_uri.to_string())
|
let redirect_uri =
|
||||||
.map_err(AuthError::OidcRequestRedirectUriError)?;
|
RedirectUrl::new(redirect_uri.to_string()).context(OidcRequestRedirectUriSnafu)?;
|
||||||
|
|
||||||
let oidc_client = CoreClient::from_provider_metadata(
|
let oidc_client = CoreClient::from_provider_metadata(
|
||||||
provider_metadata,
|
provider_metadata,
|
||||||
@@ -200,6 +207,7 @@ impl OidcAuthService {
|
|||||||
&self,
|
&self,
|
||||||
query: OidcAuthCallbackQuery,
|
query: OidcAuthCallbackQuery,
|
||||||
) -> Result<OidcAuthCallbackPayload, AuthError> {
|
) -> Result<OidcAuthCallbackPayload, AuthError> {
|
||||||
|
let oidc_http_client = OidcHttpClient(self.oidc_provider_client.clone());
|
||||||
let csrf_token = query.state.ok_or(AuthError::OidcInvalidStateError)?;
|
let csrf_token = query.state.ok_or(AuthError::OidcInvalidStateError)?;
|
||||||
|
|
||||||
let code = query.code.ok_or(AuthError::OidcInvalidCodeError)?;
|
let code = query.code.ok_or(AuthError::OidcInvalidCodeError)?;
|
||||||
@@ -207,8 +215,8 @@ impl OidcAuthService {
|
|||||||
let request_cache = self.load_authorization_request(&csrf_token).await?;
|
let request_cache = self.load_authorization_request(&csrf_token).await?;
|
||||||
|
|
||||||
let provider_metadata = CoreProviderMetadata::discover_async(
|
let provider_metadata = CoreProviderMetadata::discover_async(
|
||||||
IssuerUrl::new(self.config.issuer.clone()).map_err(AuthError::OidcProviderUrlError)?,
|
IssuerUrl::new(self.config.issuer.clone()).context(OidcProviderUrlSnafu)?,
|
||||||
&self.oidc_provider_client,
|
&oidc_http_client,
|
||||||
)
|
)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
@@ -224,7 +232,7 @@ impl OidcAuthService {
|
|||||||
let token_response = oidc_client
|
let token_response = oidc_client
|
||||||
.exchange_code(AuthorizationCode::new(code))?
|
.exchange_code(AuthorizationCode::new(code))?
|
||||||
.set_pkce_verifier(pkce_verifier)
|
.set_pkce_verifier(pkce_verifier)
|
||||||
.request_async(&HttpClient::default())
|
.request_async(&oidc_http_client)
|
||||||
.await?;
|
.await?;
|
||||||
|
|
||||||
let id_token = token_response
|
let id_token = token_response
|
||||||
@@ -245,11 +253,11 @@ impl OidcAuthService {
|
|||||||
id_token.signing_key(id_token_verifier)?,
|
id_token.signing_key(id_token_verifier)?,
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
if let Some(expected_access_token_hash) = claims.access_token_hash() {
|
if let Some(expected_access_token_hash) = claims.access_token_hash()
|
||||||
if actual_access_token_hash != *expected_access_token_hash {
|
&& actual_access_token_hash != *expected_access_token_hash
|
||||||
|
{
|
||||||
return Err(AuthError::OidcInvalidAccessTokenError);
|
return Err(AuthError::OidcInvalidAccessTokenError);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
Ok(OidcAuthCallbackPayload {
|
Ok(OidcAuthCallbackPayload {
|
||||||
access_token: access_token.secret().to_string(),
|
access_token: access_token.secret().to_string(),
|
||||||
@@ -261,57 +269,84 @@ impl OidcAuthService {
|
|||||||
impl AuthServiceTrait for OidcAuthService {
|
impl AuthServiceTrait for OidcAuthService {
|
||||||
async fn extract_user_info(
|
async fn extract_user_info(
|
||||||
&self,
|
&self,
|
||||||
ctx: &AppContext,
|
ctx: &dyn AppContextTrait,
|
||||||
request: &mut Parts,
|
request: &mut Parts,
|
||||||
) -> Result<AuthUserInfo, AuthError> {
|
) -> Result<AuthUserInfo, AuthError> {
|
||||||
let config = &self.config;
|
let config = &self.config;
|
||||||
let token = self.api_authorizer.extract_token(&request.headers).ok_or(
|
let token = request
|
||||||
AuthError::OidcJwtAuthError(jwt_authorizer::AuthError::MissingToken()),
|
.headers
|
||||||
)?;
|
.get(AUTHORIZATION)
|
||||||
|
.and_then(|authorization| {
|
||||||
|
authorization
|
||||||
|
.to_str()
|
||||||
|
.ok()
|
||||||
|
.and_then(|s| s.strip_prefix("Bearer "))
|
||||||
|
})
|
||||||
|
.ok_or(AuthError::OidcMissingBearerToken)?;
|
||||||
|
|
||||||
let token_data = self.api_authorizer.check_auth(&token).await?;
|
let token_data = self.jwk_verifier.verify::<OidcAuthClaims>(token).await?;
|
||||||
let claims = token_data.claims;
|
let claims = token_data.claims();
|
||||||
let sub = if let Some(sub) = claims.sub.as_deref() {
|
let sub = if let Some(sub) = claims.sub.as_deref() {
|
||||||
sub
|
sub
|
||||||
} else {
|
} else {
|
||||||
return Err(AuthError::OidcSubMissingError);
|
return Err(AuthError::OidcSubMissingError);
|
||||||
};
|
};
|
||||||
if !claims.contains_audience(&config.audience) {
|
if !claims.aud.iter().any(|aud| aud == &config.audience) {
|
||||||
return Err(AuthError::OidcAudMissingError(config.audience.clone()));
|
return Err(AuthError::OidcAudMissingError {
|
||||||
|
aud: config.audience.clone(),
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
let extra_claims = &claims.extra;
|
||||||
if let Some(expected_scopes) = config.extra_scopes.as_ref() {
|
if let Some(expected_scopes) = config.extra_scopes.as_ref() {
|
||||||
let found_scopes = claims.scopes().collect::<HashSet<_>>();
|
let found_scopes = extra_claims.scopes().collect::<HashSet<_>>();
|
||||||
if !expected_scopes
|
if !expected_scopes
|
||||||
.iter()
|
.iter()
|
||||||
.all(|es| found_scopes.contains(es as &str))
|
.all(|es| found_scopes.contains(es as &str))
|
||||||
{
|
{
|
||||||
return Err(AuthError::OidcExtraScopesMatchError {
|
return Err(AuthError::OidcExtraScopesMatchError {
|
||||||
expected: expected_scopes.iter().join(","),
|
expected: expected_scopes.iter().join(","),
|
||||||
found: claims.scope.unwrap_or_default(),
|
found: extra_claims
|
||||||
|
.scope
|
||||||
|
.as_deref()
|
||||||
|
.unwrap_or_default()
|
||||||
|
.to_string(),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if let Some(key) = config.extra_claim_key.as_ref() {
|
if let Some(expected_extra_claims) = config.extra_claims.as_ref() {
|
||||||
if !claims.has_claim(key) {
|
for (expected_key, expected_value) in expected_extra_claims.iter() {
|
||||||
return Err(AuthError::OidcExtraClaimMissingError(key.clone()));
|
match (extra_claims.custom.get(expected_key), expected_value) {
|
||||||
}
|
(found_value, Some(expected_value)) => {
|
||||||
if let Some(value) = config.extra_claim_value.as_ref() {
|
if let Some(Value::String(found_value)) = found_value
|
||||||
if claims.get_claim(key).is_none_or(|v| &v != value) {
|
&& expected_value == found_value
|
||||||
|
{
|
||||||
|
} else {
|
||||||
return Err(AuthError::OidcExtraClaimMatchError {
|
return Err(AuthError::OidcExtraClaimMatchError {
|
||||||
expected: value.clone(),
|
expected: expected_value.clone(),
|
||||||
found: claims.get_claim(key).unwrap_or_default().to_string(),
|
found: found_value.map(|v| v.to_string()).unwrap_or_default(),
|
||||||
key: key.clone(),
|
key: expected_key.clone(),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
(None, None) => {
|
||||||
|
return Err(AuthError::OidcExtraClaimMissingError {
|
||||||
|
claim: expected_key.clone(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
_ => {}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
let subscriber_auth = match crate::models::auth::Model::find_by_pid(ctx, sub).await {
|
let subscriber_auth = match crate::models::auth::Model::find_by_pid(ctx, sub).await {
|
||||||
Err(RError::DbError(DbErr::RecordNotFound(..))) => {
|
Err(RecorderError::DbError {
|
||||||
crate::models::auth::Model::create_from_oidc(ctx, sub.to_string()).await
|
source: DbErr::RecordNotFound(..),
|
||||||
}
|
}) => crate::models::auth::Model::create_from_oidc(ctx, sub.to_string()).await,
|
||||||
r => r,
|
r => r,
|
||||||
}
|
}
|
||||||
.map_err(|_| AuthError::FindAuthRecordError)?;
|
.map_err(|e| {
|
||||||
|
tracing::error!("Error finding auth record: {:?}", e);
|
||||||
|
AuthError::FindAuthRecordError
|
||||||
|
})?;
|
||||||
|
|
||||||
Ok(AuthUserInfo {
|
Ok(AuthUserInfo {
|
||||||
subscriber_auth,
|
subscriber_auth,
|
||||||
@@ -320,7 +355,7 @@ impl AuthServiceTrait for OidcAuthService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn www_authenticate_header_value(&self) -> Option<HeaderValue> {
|
fn www_authenticate_header_value(&self) -> Option<HeaderValue> {
|
||||||
Some(HeaderValue::from_static(r#"Bearer realm="konobangu""#))
|
Some(HeaderValue::from_str(format!("Bearer realm=\"{PROJECT_NAME}\"").as_str()).unwrap())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn auth_type(&self) -> AuthType {
|
fn auth_type(&self) -> AuthType {
|
||||||
|
|||||||
@@ -1,29 +1,24 @@
|
|||||||
use std::time::Duration;
|
use std::{sync::Arc, time::Duration};
|
||||||
|
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use axum::{
|
use axum::http::request::Parts;
|
||||||
extract::FromRequestParts,
|
use fetch::{
|
||||||
http::request::Parts,
|
HttpClient, HttpClientConfig,
|
||||||
response::{IntoResponse as _, Response},
|
client::{HttpClientCacheBackendConfig, HttpClientCachePresetConfig},
|
||||||
};
|
};
|
||||||
use jwt_authorizer::{JwtAuthorizer, Validation};
|
use http::header::HeaderValue;
|
||||||
|
use jwtk::jwk::RemoteJwksVerifier;
|
||||||
use moka::future::Cache;
|
use moka::future::Cache;
|
||||||
use reqwest::header::HeaderValue;
|
use openidconnect::{IssuerUrl, core::CoreProviderMetadata};
|
||||||
|
use snafu::prelude::*;
|
||||||
|
|
||||||
use super::{
|
use super::{
|
||||||
AuthConfig,
|
AuthConfig,
|
||||||
basic::BasicAuthService,
|
basic::BasicAuthService,
|
||||||
errors::AuthError,
|
errors::{AuthError, OidcProviderHttpClientSnafu, OidcProviderUrlSnafu},
|
||||||
oidc::{OidcAuthClaims, OidcAuthService},
|
oidc::{OidcAuthService, OidcHttpClient},
|
||||||
};
|
|
||||||
use crate::{
|
|
||||||
app::AppContext,
|
|
||||||
fetch::{
|
|
||||||
HttpClient, HttpClientConfig,
|
|
||||||
client::{HttpClientCacheBackendConfig, HttpClientCachePresetConfig},
|
|
||||||
},
|
|
||||||
models::auth::AuthType,
|
|
||||||
};
|
};
|
||||||
|
use crate::{app::AppContextTrait, models::auth::AuthType};
|
||||||
|
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
pub struct AuthUserInfo {
|
pub struct AuthUserInfo {
|
||||||
@@ -31,27 +26,11 @@ pub struct AuthUserInfo {
|
|||||||
pub auth_type: AuthType,
|
pub auth_type: AuthType,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl FromRequestParts<AppContext> for AuthUserInfo {
|
|
||||||
type Rejection = Response;
|
|
||||||
|
|
||||||
async fn from_request_parts(
|
|
||||||
parts: &mut Parts,
|
|
||||||
state: &AppContext,
|
|
||||||
) -> Result<Self, Self::Rejection> {
|
|
||||||
let auth_service = &state.auth;
|
|
||||||
|
|
||||||
auth_service
|
|
||||||
.extract_user_info(state, parts)
|
|
||||||
.await
|
|
||||||
.map_err(|err| err.into_response())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
pub trait AuthServiceTrait {
|
pub trait AuthServiceTrait {
|
||||||
async fn extract_user_info(
|
async fn extract_user_info(
|
||||||
&self,
|
&self,
|
||||||
ctx: &AppContext,
|
ctx: &dyn AppContextTrait,
|
||||||
request: &mut Parts,
|
request: &mut Parts,
|
||||||
) -> Result<AuthUserInfo, AuthError>;
|
) -> Result<AuthUserInfo, AuthError>;
|
||||||
fn www_authenticate_header_value(&self) -> Option<HeaderValue>;
|
fn www_authenticate_header_value(&self) -> Option<HeaderValue>;
|
||||||
@@ -59,41 +38,47 @@ pub trait AuthServiceTrait {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub enum AuthService {
|
pub enum AuthService {
|
||||||
Basic(BasicAuthService),
|
Basic(Box<BasicAuthService>),
|
||||||
Oidc(OidcAuthService),
|
Oidc(Box<OidcAuthService>),
|
||||||
}
|
}
|
||||||
|
|
||||||
impl AuthService {
|
impl AuthService {
|
||||||
pub async fn from_conf(config: AuthConfig) -> Result<Self, AuthError> {
|
pub async fn from_conf(config: AuthConfig) -> Result<Self, AuthError> {
|
||||||
let result = match config {
|
let result = match config {
|
||||||
AuthConfig::Basic(config) => AuthService::Basic(BasicAuthService { config }),
|
AuthConfig::Basic(config) => AuthService::Basic(Box::new(BasicAuthService { config })),
|
||||||
AuthConfig::Oidc(config) => {
|
AuthConfig::Oidc(config) => {
|
||||||
let validation = Validation::new()
|
let oidc_provider_client = Arc::new(
|
||||||
.iss(&[&config.issuer])
|
HttpClient::from_config(HttpClientConfig {
|
||||||
.aud(&[&config.audience]);
|
|
||||||
|
|
||||||
let oidc_provider_client = HttpClient::from_config(HttpClientConfig {
|
|
||||||
exponential_backoff_max_retries: Some(3),
|
exponential_backoff_max_retries: Some(3),
|
||||||
cache_backend: Some(HttpClientCacheBackendConfig::Moka { cache_size: 1 }),
|
cache_backend: Some(HttpClientCacheBackendConfig::Moka { cache_size: 1 }),
|
||||||
cache_preset: Some(HttpClientCachePresetConfig::RFC7234),
|
cache_preset: Some(HttpClientCachePresetConfig::RFC7234),
|
||||||
..Default::default()
|
..Default::default()
|
||||||
})
|
})
|
||||||
.map_err(AuthError::OidcProviderHttpClientError)?;
|
.context(OidcProviderHttpClientSnafu)?,
|
||||||
|
);
|
||||||
|
|
||||||
let api_authorizer = JwtAuthorizer::<OidcAuthClaims>::from_oidc(&config.issuer)
|
let provider_metadata = {
|
||||||
.validation(validation)
|
let client = OidcHttpClient(oidc_provider_client.clone());
|
||||||
.build()
|
let issuer_url =
|
||||||
.await?;
|
IssuerUrl::new(config.issuer.clone()).context(OidcProviderUrlSnafu)?;
|
||||||
|
CoreProviderMetadata::discover_async(issuer_url, &client).await
|
||||||
|
}?;
|
||||||
|
|
||||||
AuthService::Oidc(OidcAuthService {
|
let jwk_verifier = RemoteJwksVerifier::new(
|
||||||
|
provider_metadata.jwks_uri().to_string().clone(),
|
||||||
|
None,
|
||||||
|
Duration::from_secs(300),
|
||||||
|
);
|
||||||
|
|
||||||
|
AuthService::Oidc(Box::new(OidcAuthService {
|
||||||
config,
|
config,
|
||||||
api_authorizer,
|
jwk_verifier,
|
||||||
oidc_provider_client,
|
oidc_provider_client,
|
||||||
oidc_request_cache: Cache::builder()
|
oidc_request_cache: Cache::builder()
|
||||||
.time_to_live(Duration::from_mins(5))
|
.time_to_live(Duration::from_mins(5))
|
||||||
.name("oidc_request_cache")
|
.name("oidc_request_cache")
|
||||||
.build(),
|
.build(),
|
||||||
})
|
}))
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
Ok(result)
|
Ok(result)
|
||||||
@@ -102,9 +87,10 @@ impl AuthService {
|
|||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl AuthServiceTrait for AuthService {
|
impl AuthServiceTrait for AuthService {
|
||||||
|
#[tracing::instrument(skip(self, ctx, request))]
|
||||||
async fn extract_user_info(
|
async fn extract_user_info(
|
||||||
&self,
|
&self,
|
||||||
ctx: &AppContext,
|
ctx: &dyn AppContextTrait,
|
||||||
request: &mut Parts,
|
request: &mut Parts,
|
||||||
) -> Result<AuthUserInfo, AuthError> {
|
) -> Result<AuthUserInfo, AuthError> {
|
||||||
match self {
|
match self {
|
||||||
|
|||||||
@@ -1,10 +1,7 @@
|
|||||||
use color_eyre::{self, eyre};
|
use recorder::{app::AppBuilder, errors::RecorderResult};
|
||||||
use recorder::app::AppBuilder;
|
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() -> eyre::Result<()> {
|
async fn main() -> RecorderResult<()> {
|
||||||
color_eyre::install()?;
|
|
||||||
|
|
||||||
let builder = AppBuilder::from_main_cli(None).await?;
|
let builder = AppBuilder::from_main_cli(None).await?;
|
||||||
|
|
||||||
let app = builder.build().await?;
|
let app = builder.build().await?;
|
||||||
|
|||||||
16
apps/recorder/src/bin/migrate_down.rs
Normal file
16
apps/recorder/src/bin/migrate_down.rs
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
use recorder::{app::AppBuilder, database::DatabaseService, errors::RecorderResult};
|
||||||
|
|
||||||
|
#[tokio::main]
|
||||||
|
async fn main() -> RecorderResult<()> {
|
||||||
|
let builder = AppBuilder::from_main_cli(None).await?;
|
||||||
|
|
||||||
|
builder.load_env().await?;
|
||||||
|
let mut database_config = builder.load_config().await?.database;
|
||||||
|
database_config.auto_migrate = false;
|
||||||
|
|
||||||
|
let database_service = DatabaseService::from_config(database_config).await?;
|
||||||
|
|
||||||
|
database_service.migrate_down().await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
4
apps/recorder/src/cache/service.rs
vendored
4
apps/recorder/src/cache/service.rs
vendored
@@ -1,10 +1,10 @@
|
|||||||
use super::CacheConfig;
|
use super::CacheConfig;
|
||||||
use crate::errors::RResult;
|
use crate::errors::RecorderResult;
|
||||||
|
|
||||||
pub struct CacheService {}
|
pub struct CacheService {}
|
||||||
|
|
||||||
impl CacheService {
|
impl CacheService {
|
||||||
pub async fn from_config(_config: CacheConfig) -> RResult<Self> {
|
pub async fn from_config(_config: CacheConfig) -> RecorderResult<Self> {
|
||||||
Ok(Self {})
|
Ok(Self {})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
4
apps/recorder/src/crypto/config.rs
Normal file
4
apps/recorder/src/crypto/config.rs
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct CryptoConfig {}
|
||||||
20
apps/recorder/src/crypto/error.rs
Normal file
20
apps/recorder/src/crypto/error.rs
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
use async_graphql::Error as AsyncGraphQLError;
|
||||||
|
use seaography::SeaographyError;
|
||||||
|
|
||||||
|
#[derive(Debug, snafu::Snafu)]
|
||||||
|
pub enum CryptoError {
|
||||||
|
#[snafu(transparent)]
|
||||||
|
Base64DecodeError { source: base64::DecodeError },
|
||||||
|
#[snafu(display("CocoonError: {source:?}"), context(false))]
|
||||||
|
CocoonError { source: cocoon::Error },
|
||||||
|
#[snafu(transparent)]
|
||||||
|
FromUtf8Error { source: std::string::FromUtf8Error },
|
||||||
|
#[snafu(transparent)]
|
||||||
|
SerdeJsonError { source: serde_json::Error },
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<CryptoError> for SeaographyError {
|
||||||
|
fn from(error: CryptoError) -> Self {
|
||||||
|
SeaographyError::AsyncGraphQLError(AsyncGraphQLError::new(error.to_string()))
|
||||||
|
}
|
||||||
|
}
|
||||||
9
apps/recorder/src/crypto/mod.rs
Normal file
9
apps/recorder/src/crypto/mod.rs
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
pub mod config;
|
||||||
|
pub mod error;
|
||||||
|
pub mod service;
|
||||||
|
pub mod userpass;
|
||||||
|
|
||||||
|
pub use config::CryptoConfig;
|
||||||
|
pub use error::CryptoError;
|
||||||
|
pub use service::CryptoService;
|
||||||
|
pub use userpass::UserPassCredential;
|
||||||
62
apps/recorder/src/crypto/service.rs
Normal file
62
apps/recorder/src/crypto/service.rs
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
use base64::prelude::{BASE64_URL_SAFE, *};
|
||||||
|
use cocoon::Cocoon;
|
||||||
|
use rand::Rng;
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use super::CryptoConfig;
|
||||||
|
use crate::crypto::error::CryptoError;
|
||||||
|
|
||||||
|
pub struct CryptoService {
|
||||||
|
#[allow(dead_code)]
|
||||||
|
config: CryptoConfig,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl CryptoService {
|
||||||
|
pub async fn from_config(config: CryptoConfig) -> Result<Self, CryptoError> {
|
||||||
|
Ok(Self { config })
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn encrypt_string(&self, data: String) -> Result<String, CryptoError> {
|
||||||
|
let key = rand::rng().random::<[u8; 32]>();
|
||||||
|
let mut cocoon = Cocoon::new(&key);
|
||||||
|
|
||||||
|
let mut data = data.into_bytes();
|
||||||
|
|
||||||
|
let detached_prefix = cocoon.encrypt(&mut data)?;
|
||||||
|
|
||||||
|
let mut combined = Vec::with_capacity(key.len() + detached_prefix.len() + data.len());
|
||||||
|
combined.extend_from_slice(&key);
|
||||||
|
combined.extend_from_slice(&detached_prefix);
|
||||||
|
combined.extend_from_slice(&data);
|
||||||
|
|
||||||
|
Ok(BASE64_URL_SAFE.encode(combined))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn decrypt_string(&self, data: &str) -> Result<String, CryptoError> {
|
||||||
|
let decoded = BASE64_URL_SAFE.decode(data)?;
|
||||||
|
|
||||||
|
let (key, remain) = decoded.split_at(32);
|
||||||
|
let (detached_prefix, data) = remain.split_at(60);
|
||||||
|
let mut data = data.to_vec();
|
||||||
|
let cocoon = Cocoon::new(key);
|
||||||
|
|
||||||
|
cocoon.decrypt(&mut data, detached_prefix)?;
|
||||||
|
|
||||||
|
String::from_utf8(data).map_err(CryptoError::from)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn encrypt_serialize<T: Serialize>(&self, credentials: &T) -> Result<String, CryptoError> {
|
||||||
|
let json = serde_json::to_string(credentials)?;
|
||||||
|
|
||||||
|
self.encrypt_string(json)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn decrypt_deserialize<T: for<'de> Deserialize<'de>>(
|
||||||
|
&self,
|
||||||
|
encrypted: &str,
|
||||||
|
) -> Result<T, CryptoError> {
|
||||||
|
let data = self.decrypt_string(encrypted)?;
|
||||||
|
|
||||||
|
serde_json::from_str(&data).map_err(CryptoError::from)
|
||||||
|
}
|
||||||
|
}
|
||||||
19
apps/recorder/src/crypto/userpass.rs
Normal file
19
apps/recorder/src/crypto/userpass.rs
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
use std::fmt::Debug;
|
||||||
|
|
||||||
|
pub struct UserPassCredential {
|
||||||
|
pub username: String,
|
||||||
|
pub password: String,
|
||||||
|
pub user_agent: Option<String>,
|
||||||
|
pub cookies: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Debug for UserPassCredential {
|
||||||
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
f.debug_struct("UserPassCredential")
|
||||||
|
.field("username", &"[Secret]")
|
||||||
|
.field("password", &"[Secret]")
|
||||||
|
.field("cookies", &"[Secret]")
|
||||||
|
.field("user_agent", &self.user_agent)
|
||||||
|
.finish()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,20 +1,26 @@
|
|||||||
use std::{ops::Deref, time::Duration};
|
use std::{ops::Deref, time::Duration};
|
||||||
|
|
||||||
|
use apalis_sql::postgres::PostgresStorage;
|
||||||
use sea_orm::{
|
use sea_orm::{
|
||||||
ConnectOptions, ConnectionTrait, Database, DatabaseBackend, DatabaseConnection, DbBackend,
|
ConnectOptions, ConnectionTrait, Database, DatabaseConnection, DbBackend, DbErr, ExecResult,
|
||||||
DbErr, ExecResult, QueryResult, Statement,
|
QueryResult, Statement,
|
||||||
};
|
};
|
||||||
use sea_orm_migration::MigratorTrait;
|
use sea_orm_migration::MigratorTrait;
|
||||||
|
|
||||||
use super::DatabaseConfig;
|
use super::DatabaseConfig;
|
||||||
use crate::{errors::RResult, migrations::Migrator};
|
use crate::{errors::RecorderResult, migrations::Migrator};
|
||||||
|
|
||||||
pub struct DatabaseService {
|
pub struct DatabaseService {
|
||||||
|
pub config: DatabaseConfig,
|
||||||
connection: DatabaseConnection,
|
connection: DatabaseConnection,
|
||||||
|
#[cfg(feature = "testcontainers")]
|
||||||
|
pub container:
|
||||||
|
Option<testcontainers::ContainerAsync<testcontainers_modules::postgres::Postgres>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl DatabaseService {
|
impl DatabaseService {
|
||||||
pub async fn from_config(config: DatabaseConfig) -> RResult<Self> {
|
pub async fn from_config(config: DatabaseConfig) -> RecorderResult<Self> {
|
||||||
|
let db_config = config.clone();
|
||||||
let mut opt = ConnectOptions::new(&config.uri);
|
let mut opt = ConnectOptions::new(&config.uri);
|
||||||
opt.max_connections(config.max_connections)
|
opt.max_connections(config.max_connections)
|
||||||
.min_connections(config.min_connections)
|
.min_connections(config.min_connections)
|
||||||
@@ -28,26 +34,52 @@ impl DatabaseService {
|
|||||||
|
|
||||||
let db = Database::connect(opt).await?;
|
let db = Database::connect(opt).await?;
|
||||||
|
|
||||||
if db.get_database_backend() == DatabaseBackend::Sqlite {
|
// only support postgres for now
|
||||||
db.execute(Statement::from_string(
|
// if db.get_database_backend() == DatabaseBackend::Sqlite {
|
||||||
DatabaseBackend::Sqlite,
|
// db.execute(Statement::from_string(
|
||||||
"
|
// DatabaseBackend::Sqlite,
|
||||||
PRAGMA foreign_keys = ON;
|
// "
|
||||||
PRAGMA journal_mode = WAL;
|
// PRAGMA foreign_keys = ON;
|
||||||
PRAGMA synchronous = NORMAL;
|
// PRAGMA journal_mode = WAL;
|
||||||
PRAGMA mmap_size = 134217728;
|
// PRAGMA synchronous = NORMAL;
|
||||||
PRAGMA journal_size_limit = 67108864;
|
// PRAGMA mmap_size = 134217728;
|
||||||
PRAGMA cache_size = 2000;
|
// PRAGMA journal_size_limit = 67108864;
|
||||||
",
|
// PRAGMA cache_size = 2000;
|
||||||
))
|
// ",
|
||||||
.await?;
|
// ))
|
||||||
}
|
// .await?;
|
||||||
|
// }
|
||||||
|
|
||||||
|
let me = Self {
|
||||||
|
connection: db,
|
||||||
|
#[cfg(feature = "testcontainers")]
|
||||||
|
container: None,
|
||||||
|
config: db_config,
|
||||||
|
};
|
||||||
|
|
||||||
if config.auto_migrate {
|
if config.auto_migrate {
|
||||||
Migrator::up(&db, None).await?;
|
me.migrate_up().await?;
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(Self { connection: db })
|
Ok(me)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn migrate_up(&self) -> RecorderResult<()> {
|
||||||
|
{
|
||||||
|
let pool = &self.get_postgres_connection_pool();
|
||||||
|
PostgresStorage::setup(pool).await?;
|
||||||
|
}
|
||||||
|
Migrator::up(&self.connection, None).await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn migrate_down(&self) -> RecorderResult<()> {
|
||||||
|
Migrator::down(&self.connection, None).await?;
|
||||||
|
{
|
||||||
|
self.execute_unprepared(r#"DROP SCHEMA IF EXISTS apalis CASCADE"#)
|
||||||
|
.await?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
297
apps/recorder/src/errors/app_error.rs
Normal file
297
apps/recorder/src/errors/app_error.rs
Normal file
@@ -0,0 +1,297 @@
|
|||||||
|
use std::borrow::Cow;
|
||||||
|
|
||||||
|
use axum::{
|
||||||
|
Json,
|
||||||
|
response::{IntoResponse, Response},
|
||||||
|
};
|
||||||
|
use fetch::{FetchError, HttpClientError, reqwest, reqwest_middleware};
|
||||||
|
use http::{HeaderMap, StatusCode};
|
||||||
|
use snafu::Snafu;
|
||||||
|
|
||||||
|
use crate::{
|
||||||
|
auth::AuthError,
|
||||||
|
crypto::CryptoError,
|
||||||
|
downloader::DownloaderError,
|
||||||
|
errors::{OptDynErr, response::StandardErrorResponse},
|
||||||
|
};
|
||||||
|
|
||||||
|
#[derive(Snafu, Debug)]
|
||||||
|
#[snafu(visibility(pub(crate)))]
|
||||||
|
pub enum RecorderError {
|
||||||
|
#[snafu(display(
|
||||||
|
"HTTP {status} {reason}, source = {source:?}",
|
||||||
|
status = status,
|
||||||
|
reason = status.canonical_reason().unwrap_or("Unknown")
|
||||||
|
))]
|
||||||
|
HttpResponseError {
|
||||||
|
status: StatusCode,
|
||||||
|
headers: Option<HeaderMap>,
|
||||||
|
#[snafu(source(from(Box<dyn std::error::Error + Send + Sync>, OptDynErr::some)))]
|
||||||
|
source: OptDynErr,
|
||||||
|
},
|
||||||
|
#[snafu(transparent)]
|
||||||
|
ImageError { source: image::ImageError },
|
||||||
|
#[cfg(feature = "jxl")]
|
||||||
|
#[snafu(transparent)]
|
||||||
|
JxlEncodeError { source: jpegxl_rs::EncodeError },
|
||||||
|
#[snafu(transparent, context(false))]
|
||||||
|
HttpError { source: http::Error },
|
||||||
|
#[snafu(transparent, context(false))]
|
||||||
|
FancyRegexError {
|
||||||
|
#[snafu(source(from(fancy_regex::Error, Box::new)))]
|
||||||
|
source: Box<fancy_regex::Error>,
|
||||||
|
},
|
||||||
|
#[snafu(transparent)]
|
||||||
|
NetAddrParseError { source: std::net::AddrParseError },
|
||||||
|
#[snafu(transparent)]
|
||||||
|
RegexError { source: regex::Error },
|
||||||
|
#[snafu(display("Invalid method"))]
|
||||||
|
InvalidMethodError,
|
||||||
|
#[snafu(display("Invalid header value"))]
|
||||||
|
InvalidHeaderValueError,
|
||||||
|
#[snafu(display("Invalid header name"))]
|
||||||
|
InvalidHeaderNameError,
|
||||||
|
#[snafu(display("Missing origin (protocol or host) in headers and forwarded info"))]
|
||||||
|
MissingOriginError,
|
||||||
|
#[snafu(transparent)]
|
||||||
|
TracingAppenderInitError {
|
||||||
|
source: tracing_appender::rolling::InitError,
|
||||||
|
},
|
||||||
|
#[snafu(transparent)]
|
||||||
|
GraphQLSchemaError {
|
||||||
|
source: async_graphql::dynamic::SchemaError,
|
||||||
|
},
|
||||||
|
#[snafu(transparent)]
|
||||||
|
AuthError { source: AuthError },
|
||||||
|
#[snafu(transparent)]
|
||||||
|
DownloadError { source: DownloaderError },
|
||||||
|
#[snafu(transparent)]
|
||||||
|
RSSError { source: rss::Error },
|
||||||
|
#[snafu(transparent)]
|
||||||
|
DotEnvError { source: dotenvy::Error },
|
||||||
|
#[snafu(transparent)]
|
||||||
|
TeraError { source: tera::Error },
|
||||||
|
#[snafu(transparent)]
|
||||||
|
IOError { source: std::io::Error },
|
||||||
|
#[snafu(transparent)]
|
||||||
|
DbError { source: sea_orm::DbErr },
|
||||||
|
#[snafu(transparent)]
|
||||||
|
DbSqlxError { source: sea_orm::SqlxError },
|
||||||
|
#[snafu(transparent, context(false))]
|
||||||
|
FigmentError {
|
||||||
|
#[snafu(source(from(figment::Error, Box::new)))]
|
||||||
|
source: Box<figment::Error>,
|
||||||
|
},
|
||||||
|
#[snafu(transparent)]
|
||||||
|
SerdeJsonError { source: serde_json::Error },
|
||||||
|
#[snafu(transparent)]
|
||||||
|
ParseUrlError { source: url::ParseError },
|
||||||
|
#[snafu(display("{source}"), context(false))]
|
||||||
|
OpenDALError {
|
||||||
|
#[snafu(source(from(opendal::Error, Box::new)))]
|
||||||
|
source: Box<opendal::Error>,
|
||||||
|
},
|
||||||
|
#[snafu(transparent)]
|
||||||
|
HttpClientError { source: HttpClientError },
|
||||||
|
#[cfg(feature = "testcontainers")]
|
||||||
|
#[snafu(transparent)]
|
||||||
|
TestcontainersError {
|
||||||
|
source: testcontainers::TestcontainersError,
|
||||||
|
},
|
||||||
|
#[snafu(display("Extract {desc} with mime error, expected {expected}, but got {found}"))]
|
||||||
|
MimeError {
|
||||||
|
desc: String,
|
||||||
|
expected: String,
|
||||||
|
found: String,
|
||||||
|
},
|
||||||
|
#[snafu(display("Invalid or unknown format in extracting mikan rss"))]
|
||||||
|
MikanRssInvalidFormatError,
|
||||||
|
#[snafu(display("Invalid field {field} in extracting mikan rss"))]
|
||||||
|
MikanRssInvalidFieldError {
|
||||||
|
field: Cow<'static, str>,
|
||||||
|
#[snafu(source(from(Box<dyn std::error::Error + Send + Sync>, OptDynErr::some)))]
|
||||||
|
source: OptDynErr,
|
||||||
|
},
|
||||||
|
#[snafu(display("Missing field {field} in extracting mikan meta"))]
|
||||||
|
MikanMetaMissingFieldError {
|
||||||
|
field: Cow<'static, str>,
|
||||||
|
#[snafu(source(from(Box<dyn std::error::Error + Send + Sync>, OptDynErr::some)))]
|
||||||
|
source: OptDynErr,
|
||||||
|
},
|
||||||
|
#[snafu(display("Model Entity {entity} not found or not belong to subscriber"))]
|
||||||
|
ModelEntityNotFound { entity: Cow<'static, str> },
|
||||||
|
#[snafu(transparent)]
|
||||||
|
FetchError { source: FetchError },
|
||||||
|
#[snafu(display("Credential3rdError: {message}, source = {source}"))]
|
||||||
|
Credential3rdError {
|
||||||
|
message: String,
|
||||||
|
#[snafu(source(from(Box<dyn std::error::Error + Send + Sync>, OptDynErr::some)))]
|
||||||
|
source: OptDynErr,
|
||||||
|
},
|
||||||
|
#[snafu(transparent)]
|
||||||
|
CryptoError { source: CryptoError },
|
||||||
|
#[snafu(transparent)]
|
||||||
|
StringFromUtf8Error { source: std::string::FromUtf8Error },
|
||||||
|
#[snafu(display("{message}"))]
|
||||||
|
Whatever {
|
||||||
|
message: String,
|
||||||
|
#[snafu(source(from(Box<dyn std::error::Error + Send + Sync>, OptDynErr::some)))]
|
||||||
|
source: OptDynErr,
|
||||||
|
},
|
||||||
|
#[snafu(display("Invalid task id: {message}"))]
|
||||||
|
InvalidTaskId { message: String },
|
||||||
|
}
|
||||||
|
|
||||||
|
impl RecorderError {
|
||||||
|
pub fn from_status(status: StatusCode) -> Self {
|
||||||
|
Self::HttpResponseError {
|
||||||
|
status,
|
||||||
|
headers: None,
|
||||||
|
source: None.into(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn from_status_and_headers(status: StatusCode, headers: HeaderMap) -> Self {
|
||||||
|
Self::HttpResponseError {
|
||||||
|
status,
|
||||||
|
headers: Some(headers),
|
||||||
|
source: None.into(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn from_mikan_meta_missing_field(field: Cow<'static, str>) -> Self {
|
||||||
|
Self::MikanMetaMissingFieldError {
|
||||||
|
field,
|
||||||
|
source: None.into(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn from_mikan_rss_invalid_field(field: Cow<'static, str>) -> Self {
|
||||||
|
Self::MikanRssInvalidFieldError {
|
||||||
|
field,
|
||||||
|
source: None.into(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn from_mikan_rss_invalid_field_and_source(
|
||||||
|
field: Cow<'static, str>,
|
||||||
|
source: impl std::error::Error + Send + Sync + 'static,
|
||||||
|
) -> Self {
|
||||||
|
Self::MikanRssInvalidFieldError {
|
||||||
|
field,
|
||||||
|
source: OptDynErr::some_boxed(source),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn from_db_record_not_found<T: ToString>(detail: T) -> Self {
|
||||||
|
Self::DbError {
|
||||||
|
source: sea_orm::DbErr::RecordNotFound(detail.to_string()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl snafu::FromString for RecorderError {
|
||||||
|
type Source = Box<dyn std::error::Error + Send + Sync>;
|
||||||
|
|
||||||
|
fn without_source(message: String) -> Self {
|
||||||
|
Self::Whatever {
|
||||||
|
message,
|
||||||
|
source: OptDynErr::none(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn with_source(source: Self::Source, message: String) -> Self {
|
||||||
|
Self::Whatever {
|
||||||
|
message,
|
||||||
|
source: OptDynErr::some(source),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<StatusCode> for RecorderError {
|
||||||
|
fn from(status: StatusCode) -> Self {
|
||||||
|
Self::HttpResponseError {
|
||||||
|
status,
|
||||||
|
headers: None,
|
||||||
|
source: None.into(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<(StatusCode, HeaderMap)> for RecorderError {
|
||||||
|
fn from((status, headers): (StatusCode, HeaderMap)) -> Self {
|
||||||
|
Self::HttpResponseError {
|
||||||
|
status,
|
||||||
|
headers: Some(headers),
|
||||||
|
source: None.into(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl IntoResponse for RecorderError {
|
||||||
|
fn into_response(self) -> Response {
|
||||||
|
match self {
|
||||||
|
Self::AuthError { source: auth_error } => auth_error.into_response(),
|
||||||
|
Self::HttpResponseError {
|
||||||
|
status,
|
||||||
|
headers,
|
||||||
|
source,
|
||||||
|
} => {
|
||||||
|
let message = source
|
||||||
|
.into_inner()
|
||||||
|
.map(|s| s.to_string())
|
||||||
|
.unwrap_or_else(|| {
|
||||||
|
String::from(status.canonical_reason().unwrap_or("Unknown"))
|
||||||
|
});
|
||||||
|
(
|
||||||
|
status,
|
||||||
|
headers,
|
||||||
|
Json::<StandardErrorResponse>(StandardErrorResponse::from(message)),
|
||||||
|
)
|
||||||
|
.into_response()
|
||||||
|
}
|
||||||
|
Self::ModelEntityNotFound { entity } => (
|
||||||
|
StatusCode::NOT_FOUND,
|
||||||
|
Json::<StandardErrorResponse>(StandardErrorResponse::from(entity.to_string())),
|
||||||
|
)
|
||||||
|
.into_response(),
|
||||||
|
err => (
|
||||||
|
StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
Json::<StandardErrorResponse>(StandardErrorResponse::from(err.to_string())),
|
||||||
|
)
|
||||||
|
.into_response(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<reqwest::Error> for RecorderError {
|
||||||
|
fn from(error: reqwest::Error) -> Self {
|
||||||
|
FetchError::from(error).into()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<reqwest_middleware::Error> for RecorderError {
|
||||||
|
fn from(error: reqwest_middleware::Error) -> Self {
|
||||||
|
FetchError::from(error).into()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<http::header::InvalidHeaderValue> for RecorderError {
|
||||||
|
fn from(_error: http::header::InvalidHeaderValue) -> Self {
|
||||||
|
Self::InvalidHeaderValueError
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<http::header::InvalidHeaderName> for RecorderError {
|
||||||
|
fn from(_error: http::header::InvalidHeaderName) -> Self {
|
||||||
|
Self::InvalidHeaderNameError
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<http::method::InvalidMethod> for RecorderError {
|
||||||
|
fn from(_error: http::method::InvalidMethod) -> Self {
|
||||||
|
Self::InvalidMethodError
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub type RecorderResult<T> = Result<T, RecorderError>;
|
||||||
@@ -1,116 +1,6 @@
|
|||||||
use std::{borrow::Cow, error::Error as StdError};
|
pub mod app_error;
|
||||||
|
pub mod response;
|
||||||
|
|
||||||
use axum::response::{IntoResponse, Response};
|
pub use app_error::{RecorderError, RecorderResult};
|
||||||
use http::StatusCode;
|
pub use response::StandardErrorResponse;
|
||||||
use thiserror::Error as ThisError;
|
pub use util::errors::OptDynErr;
|
||||||
|
|
||||||
use crate::{auth::AuthError, fetch::HttpClientError};
|
|
||||||
|
|
||||||
#[derive(ThisError, Debug)]
|
|
||||||
pub enum RError {
|
|
||||||
#[error(transparent)]
|
|
||||||
InvalidMethodError(#[from] http::method::InvalidMethod),
|
|
||||||
#[error(transparent)]
|
|
||||||
InvalidHeaderNameError(#[from] http::header::InvalidHeaderName),
|
|
||||||
#[error(transparent)]
|
|
||||||
TracingAppenderInitError(#[from] tracing_appender::rolling::InitError),
|
|
||||||
#[error(transparent)]
|
|
||||||
GraphQLSchemaError(#[from] async_graphql::dynamic::SchemaError),
|
|
||||||
#[error(transparent)]
|
|
||||||
AuthError(#[from] AuthError),
|
|
||||||
#[error(transparent)]
|
|
||||||
RSSError(#[from] rss::Error),
|
|
||||||
#[error(transparent)]
|
|
||||||
DotEnvError(#[from] dotenv::Error),
|
|
||||||
#[error(transparent)]
|
|
||||||
TeraError(#[from] tera::Error),
|
|
||||||
#[error(transparent)]
|
|
||||||
IOError(#[from] std::io::Error),
|
|
||||||
#[error(transparent)]
|
|
||||||
DbError(#[from] sea_orm::DbErr),
|
|
||||||
#[error(transparent)]
|
|
||||||
CookieParseError(#[from] cookie::ParseError),
|
|
||||||
#[error(transparent)]
|
|
||||||
FigmentError(#[from] figment::Error),
|
|
||||||
#[error(transparent)]
|
|
||||||
SerdeJsonError(#[from] serde_json::Error),
|
|
||||||
#[error(transparent)]
|
|
||||||
ReqwestMiddlewareError(#[from] reqwest_middleware::Error),
|
|
||||||
#[error(transparent)]
|
|
||||||
ReqwestError(#[from] reqwest::Error),
|
|
||||||
#[error(transparent)]
|
|
||||||
ParseUrlError(#[from] url::ParseError),
|
|
||||||
#[error(transparent)]
|
|
||||||
OpenDALError(#[from] opendal::Error),
|
|
||||||
#[error(transparent)]
|
|
||||||
InvalidHeaderValueError(#[from] http::header::InvalidHeaderValue),
|
|
||||||
#[error(transparent)]
|
|
||||||
HttpClientError(#[from] HttpClientError),
|
|
||||||
#[error("Extract {desc} with mime error, expected {expected}, but got {found}")]
|
|
||||||
MimeError {
|
|
||||||
desc: String,
|
|
||||||
expected: String,
|
|
||||||
found: String,
|
|
||||||
},
|
|
||||||
#[error("Invalid or unknown format in extracting mikan rss")]
|
|
||||||
MikanRssInvalidFormatError,
|
|
||||||
#[error("Invalid field {field} in extracting mikan rss")]
|
|
||||||
MikanRssInvalidFieldError {
|
|
||||||
field: Cow<'static, str>,
|
|
||||||
#[source]
|
|
||||||
source: Option<Box<dyn StdError + Send + Sync>>,
|
|
||||||
},
|
|
||||||
#[error("Missing field {field} in extracting mikan meta")]
|
|
||||||
MikanMetaMissingFieldError {
|
|
||||||
field: Cow<'static, str>,
|
|
||||||
#[source]
|
|
||||||
source: Option<Box<dyn StdError + Send + Sync>>,
|
|
||||||
},
|
|
||||||
#[error("Model Entity {entity} not found")]
|
|
||||||
ModelEntityNotFound { entity: Cow<'static, str> },
|
|
||||||
#[error("{0}")]
|
|
||||||
CustomMessageStr(&'static str),
|
|
||||||
#[error("{0}")]
|
|
||||||
CustomMessageString(String),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl RError {
|
|
||||||
pub fn from_mikan_meta_missing_field(field: Cow<'static, str>) -> Self {
|
|
||||||
Self::MikanMetaMissingFieldError {
|
|
||||||
field,
|
|
||||||
source: None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn from_mikan_rss_invalid_field(field: Cow<'static, str>) -> Self {
|
|
||||||
Self::MikanRssInvalidFieldError {
|
|
||||||
field,
|
|
||||||
source: None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn from_mikan_rss_invalid_field_and_source(
|
|
||||||
field: Cow<'static, str>,
|
|
||||||
source: Box<dyn StdError + Send + Sync>,
|
|
||||||
) -> Self {
|
|
||||||
Self::MikanRssInvalidFieldError {
|
|
||||||
field,
|
|
||||||
source: Some(source),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn from_db_record_not_found<T: ToString>(detail: T) -> Self {
|
|
||||||
Self::DbError(sea_orm::DbErr::RecordNotFound(detail.to_string()))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl IntoResponse for RError {
|
|
||||||
fn into_response(self) -> Response {
|
|
||||||
match self {
|
|
||||||
Self::AuthError(auth_error) => auth_error.into_response(),
|
|
||||||
err => (StatusCode::INTERNAL_SERVER_ERROR, err.to_string()).into_response(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub type RResult<T> = Result<T, RError>;
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user