dumtruck/konobangu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deps: update deps

Browse Source
This commit is contained in:
master 2025-01-08 00:49:03 +08:00
parent 2ed2b864b2
commit 8f76e92804
19 changed files with 541 additions and 3934 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.vscode/launch.json vendored
View File

@ -4,25 +4,6 @@
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "lldb",
"request": "launch",
"name": "debug quirks_path lib",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=quirks_path"
],
"filter": {
"name": "quirks_path",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
@ -39,8 +20,9 @@
}
},
"args": [
"start",
"--environment",
"recorder/development"
"development"
],
"cwd": "${workspaceFolder}"
},
@ -61,14 +43,14 @@
},
"args": [
"--environment",
"recorder/development"
"development"
],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "debug record lib",
"name": "debug recorder lib",
"cargo": {
"args": [
"test",

814
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
Cargo.toml
View File

@ -4,6 +4,10 @@ resolver = "2"
[patch.crates-io]
testcontainers = { git = "https://github.com/testcontainers/testcontainers-rs.git", rev = "af21727" }
loco-rs = { git = "https://github.com/lonelyhentxi/loco.git", rev = "beb890e" }
# loco-rs = { git = "https://github.com/loco-rs/loco.git" }
async-graphql = { git = "https://github.com/aumetra/async-graphql.git", rev = "690ece7" }
async-graphql-axum = { git = "https://github.com/aumetra/async-graphql.git", rev = "690ece7" }
# [patch."https://github.com/lonelyhentxi/qbit.git"]
# qbit-rs = { path = "./patches/qbit-rs" }

4
apps/recorder/Cargo.toml
View File

@ -38,7 +38,7 @@ sea-orm = { version = "1", features = [
] }
figment = { version = "0.10", features = ["toml", "json", "env", "yaml"] }
axum = "0.7.9"
axum = "0.8"
uuid = { version = "1.6.0", features = ["v4"] }
tracing-subscriber = { version = "0.3", features = ["env-filter", "json"] }
sea-orm-migration = { version = "1", features = ["runtime-tokio-rustls"] }
@ -64,7 +64,6 @@ scraper = "0.22.0"
leaky-bucket = "1.1.2"
serde_with = "3"
jwt-authorizer = "0.15.0"
axum-auth = "0.7.0"
futures = "0.3.31"
librqbit-core = "4"
qbit-rs = { git = "https://github.com/lonelyhentxi/qbit.git", rev = "72d53138ebe", features = [
@ -91,6 +90,7 @@ async-graphql-axum = "7.0.13"
fastrand = "2.3.0"
seaography = "1.1.2"
quirks_path = "0.1.0"
base64 = "0.22.1"
[dev-dependencies]
serial_test = "3"

2
config/development.yaml → apps/recorder/config/development.yaml
View File

@ -58,6 +58,8 @@ server:
# - POST
# Set the value of the [`Access-Control-Max-Age`][mdn] header in seconds
# max_age: 3600
fallback:
enable: false
# Worker Configuration
workers:

0
config/production.yaml → apps/recorder/config/production.yaml
View File

0
config/test.yaml → apps/recorder/config/test.yaml
View File

16
apps/recorder/examples/playground.rs
View File

@ -19,7 +19,6 @@ use recorder::{
use sea_orm_migration::MigratorTrait;
async fn pull_mikan_bangumi_rss(ctx: &AppContext) -> color_eyre::eyre::Result<()> {
color_eyre::install()?;
let rss_link = "https://mikanani.me/RSS/Bangumi?bangumiId=3416&subgroupid=370";
// let rss_link =
@ -49,10 +48,7 @@ async fn pull_mikan_bangumi_rss(ctx: &AppContext) -> color_eyre::eyre::Result<()
}
async fn init() -> color_eyre::eyre::Result<AppContext> {
tracing_subscriber::fmt()
.with_max_level(tracing::Level::INFO)
.with_test_writer()
.init();
color_eyre::install()?;
let ctx = loco_rs::cli::playground::<App>().await?;
let BootResult {
app_context: ctx, ..
@ -66,15 +62,5 @@ async fn main() -> color_eyre::eyre::Result<()> {
let ctx = init().await?;
pull_mikan_bangumi_rss(&ctx).await?;
// let active_model: articles::ActiveModel = ActiveModel {
// title: Set(Some("how to build apps in 3 steps".to_string())),
// content: Set(Some("use Loco: https://loco.rs".to_string())),
// ..Default::default()
// };
// active_model.insert(&ctx.db).await.unwrap();
// let res = articles::Entity::find().all(&ctx.db).await.unwrap();
// println!("{:?}", res);
Ok(())
}

25
apps/recorder/src/app.rs
View File

@ -5,6 +5,7 @@ use loco_rs::{
app::{AppContext, Hooks},
boot::{create_app, BootResult, StartMode},
cache,
config::Config,
controller::AppRoutes,
db::truncate_table,
environment::Environment,
@ -25,6 +26,8 @@ use crate::{
workers::subscription_worker::SubscriptionWorker,
};
pub const CONFIG_FOLDER: &str = "LOCO_CONFIG_FOLDER";
pub trait AppContextExt {
fn get_dal_client(&self) -> &AppDalClient {
AppDalClient::app_instance()
@ -49,6 +52,20 @@ pub struct App;
#[async_trait]
impl Hooks for App {
async fn load_config(env: &Environment) -> Result<Config> {
std::env::var(CONFIG_FOLDER).map_or_else(
|_| {
let monorepo_project_config_dir = Path::new("./apps/recorder/config");
if monorepo_project_config_dir.exists() && monorepo_project_config_dir.is_dir() {
return env.load_from_folder(monorepo_project_config_dir);
}
let current_config_dir = Path::new("./config");
env.load_from_folder(current_config_dir)
},
|config_folder| env.load_from_folder(Path::new(&config_folder)),
)
}
fn app_name() -> &'static str {
env!("CARGO_CRATE_NAME")
}
@ -73,8 +90,12 @@ impl Hooks for App {
)
}
async fn boot(mode: StartMode, environment: &Environment) -> Result<BootResult> {
create_app::<Self, Migrator>(mode, environment).await
async fn boot(
mode: StartMode,
environment: &Environment,
config: Config,
) -> Result<BootResult> {
create_app::<Self, Migrator>(mode, environment, config).await
}
fn routes(ctx: &AppContext) -> AppRoutes {

53
apps/recorder/src/auth/basic.rs
View File

@ -1,6 +1,7 @@
use async_trait::async_trait;
use axum::{http::request::Parts, RequestPartsExt};
use axum_auth::AuthBasic;
use axum::http::request::Parts;
use base64::{self, Engine};
use reqwest::header::AUTHORIZATION;
use super::{
config::BasicAuthConfig,
@ -9,6 +10,48 @@ use super::{
};
use crate::models::{auth::AuthType, subscribers::SEED_SUBSCRIBER};
#[derive(Debug, PartialEq, Eq, Clone)]
pub struct AuthBasic {
pub user: String,
pub password: Option<String>,
}
impl AuthBasic {
fn decode_request_parts(req: &mut Parts) -> Result<Self, AuthError> {
let authorization = req
.headers
.get(AUTHORIZATION)
.and_then(|s| s.to_str().ok())
.ok_or_else(|| AuthError::BasicInvalidCredentials)?;
let split = authorization.split_once(' ');
match split {
Some((name, contents)) if name == "Basic" => {
let decoded = base64::engine::general_purpose::STANDARD
.decode(contents)
.map_err(|_| AuthError::BasicInvalidCredentials)?;
let decoded =
String::from_utf8(decoded).map_err(|_| AuthError::BasicInvalidCredentials)?;
Ok(if let Some((user, password)) = decoded.split_once(':') {
Self {
user: String::from(user),
password: Some(String::from(password)),
}
} else {
Self {
user: decoded,
password: None,
}
})
}
_ => Err(AuthError::BasicInvalidCredentials),
}
}
}
#[derive(Debug)]
pub struct BasicAuthService {
pub config: BasicAuthConfig,
@ -17,7 +60,11 @@ pub struct BasicAuthService {
#[async_trait]
impl AuthService for BasicAuthService {
async fn extract_user_info(&self, request: &mut Parts) -> Result<AuthUserInfo, AuthError> {
if let Ok(AuthBasic((found_user, found_password))) = request.extract().await {
if let Ok(AuthBasic {
user: found_user,
password: found_password,
}) = AuthBasic::decode_request_parts(request)
{
if self.config.user == found_user
&& self.config.password == found_password.unwrap_or_default()
{

1
apps/recorder/src/auth/service.rs
View File

@ -22,7 +22,6 @@ pub struct AuthUserInfo {
pub auth_type: AuthType,
}
#[async_trait]
impl<S> FromRequestParts<S> for AuthUserInfo
where
S: Send + Sync,

14
apps/recorder/src/controllers/graphql.rs
View File

@ -1,7 +1,10 @@
use async_graphql::http::{playground_source, GraphQLPlaygroundConfig};
use async_graphql_axum::GraphQL;
use axum::response::Html;
use loco_rs::prelude::*;
use axum::{
response::{Html, IntoResponse},
routing::{get, post_service},
};
use loco_rs::prelude::Routes;
use crate::graphql::service::AppGraphQLService;
@ -12,8 +15,11 @@ pub async fn graphql_playground() -> impl IntoResponse {
}
pub fn routes(graphql_service: &AppGraphQLService) -> Routes {
Routes::new().prefix("/graphql").add(
Routes::new()
.prefix("/graphql")
.add("/playground", get(graphql_playground))
.add(
"/",
get(graphql_playground).post_service(GraphQL::new(graphql_service.schema.clone())),
post_service(GraphQL::new(graphql_service.schema.clone())),
)
}

2
apps/recorder/src/graphql/query_root.rs
View File

@ -15,7 +15,6 @@ pub fn schema(
seaography::register_entities!(
builder,
[
auth,
bangumi,
downloaders,
downloads,
@ -28,7 +27,6 @@ pub fn schema(
);
{
builder.register_enumeration::<auth::AuthType>();
builder.register_enumeration::<downloads::DownloadStatus>();
builder.register_enumeration::<subscriptions::SubscriptionCategory>();
builder.register_enumeration::<downloaders::DownloaderCategory>();

9
apps/recorder/src/migrations/m20220101_000001_init.rs
View File

@ -1,5 +1,4 @@
use async_trait::async_trait;
use loco_rs::schema::jsonb_null;
use sea_orm_migration::{prelude::*, schema::*};
use super::defs::{
@ -27,7 +26,7 @@ impl MigrationTrait for Migration {
.col(pk_auto(Subscribers::Id))
.col(string_len_uniq(Subscribers::Pid, 64))
.col(string(Subscribers::DisplayName))
.col(jsonb_null(Subscribers::BangumiConf))
.col(json_binary_null(Subscribers::BangumiConf))
.to_owned(),
)
.await?;
@ -101,13 +100,13 @@ impl MigrationTrait for Migration {
.col(text_null(Bangumi::SeasonRaw))
.col(text_null(Bangumi::Fansub))
.col(text_null(Bangumi::MikanFansubId))
.col(jsonb_null(Bangumi::Filter))
.col(json_binary_null(Bangumi::Filter))
.col(text_null(Bangumi::RssLink))
.col(text_null(Bangumi::PosterLink))
.col(text_null(Bangumi::SavePath))
.col(boolean(Bangumi::Deleted).default(false))
.col(text_null(Bangumi::Homepage))
.col(jsonb_null(Bangumi::Extra))
.col(json_binary_null(Bangumi::Extra))
.foreign_key(
ForeignKey::create()
.name("fk_bangumi_subscriber_id")
@ -214,7 +213,7 @@ impl MigrationTrait for Migration {
.col(text_null(Episodes::Subtitle))
.col(boolean(Episodes::Deleted).default(false))
.col(text_null(Episodes::Source))
.col(jsonb_null(Episodes::Extra))
.col(json_binary_null(Episodes::Extra))
.foreign_key(
ForeignKey::create()
.name("fk_episodes_bangumi_id")

6
apps/recorder/src/models/auth.rs
View File

@ -45,11 +45,5 @@ impl Related<super::subscribers::Entity> for Entity {
}
}
#[derive(Copy, Clone, Debug, EnumIter, DeriveRelatedEntity)]
pub enum RelatedEntity {
#[sea_orm(entity = "super::subscribers::Entity")]
Subscriber,
}
#[async_trait]
impl ActiveModelBehavior for ActiveModel {}

4
apps/recorder/src/models/episodes.rs
View File

@ -45,7 +45,7 @@ pub struct Model {
pub poster_link: Option<String>,
pub episode_index: i32,
pub homepage: Option<String>,
pub subtitle: Option<Vec<String>>,
pub subtitle: Option<String>,
#[sea_orm(default = "false")]
pub deleted: bool,
pub source: Option<String>,
@ -218,7 +218,7 @@ impl ActiveModel {
poster_link: ActiveValue::Set(bgm.poster_link.clone()),
episode_index: ActiveValue::Set(raw_meta.episode_index),
homepage: ActiveValue::Set(Some(homepage.to_string())),
subtitle: ActiveValue::Set(raw_meta.subtitle.map(|s| vec![s])),
subtitle: ActiveValue::Set(raw_meta.subtitle),
source: ActiveValue::Set(raw_meta.source),
extra: ActiveValue::Set(EpisodeExtra {
name_zh: raw_meta.name_zh,

2
apps/recorder/src/models/subscribers.rs
View File

@ -80,8 +80,6 @@ pub enum RelatedEntity {
Bangumi,
#[sea_orm(entity = "super::episodes::Entity")]
Episode,
#[sea_orm(entity = "super::auth::Entity")]
Auth,
}
#[derive(Debug, Deserialize, Serialize)]

3487
apps/recorder/user_agents
View File

File diff suppressed because it is too large Load Diff

2
justfile
View File

@ -10,7 +10,7 @@ dev-webui:
pnpm run dev
dev-recorder:
cargo watch -w apps/recorder -w config -x 'recorder start'
cargo watch -w apps/recorder -x 'recorder start'
down-recorder:
cargo run -p recorder --bin recorder_cli -- db down 999 --environment development