+ + Konobangu +
+ Kono bangumi?
\ No newline at end of file diff --git a/apps/app/.env.development b/apps/app/.env.development index 9ced364..d0abda2 100644 --- a/apps/app/.env.development +++ b/apps/app/.env.development @@ -7,8 +7,8 @@ BASIC_PASSWORD="konobangu" OIDC_PROVIDER_ENDPOINT="https://some-oidc-auth.com/oidc/.well-known/openid-configuration" OIDC_CLIENT_ID="" OIDC_CLIENT_SECRET="" -OIDC_API_ISSUER="https://some-oidc-auth.com/oidc" -OIDC_API_AUDIENCE="https://konobangu.com/api" +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="" diff --git a/apps/app/.env.example b/apps/app/.env.example index 3144d50..059e679 100644 --- a/apps/app/.env.example +++ b/apps/app/.env.example @@ -5,8 +5,8 @@ NEXT_PUBLIC_OIDC_PROVIDER_ENDPOINT="https://some-oidc-auth.com/oidc/.well-known/ NEXT_PUBLIC_OIDC_CLIENT_ID="" NEXT_PUBLIC_OIDC_CLIENT_SECRET="" NEXT_PUBLIC_OIDC_ICON_URL="" -OIDC_API_ISSUER="https://some-oidc-auth.com/oidc" -OIDC_API_AUDIENCE="https://konobangu.com/api" +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="" diff --git a/apps/proxy/.whistle/rules/files/0.konobangu b/apps/proxy/.whistle/rules/files/0.konobangu new file mode 100644 index 0000000..dc04a88 --- /dev/null +++ b/apps/proxy/.whistle/rules/files/0.konobangu @@ -0,0 +1,12 @@ +```x-forwarded.json +{ + "X-Forwarded-Host": "konobangu.com", + "X-Forwarded-Proto": "https" +} +``` + +^https://konobangu.com/api/playground*** reqHeaders://{x-forwarded.json} http://127.0.0.1:5002/api/playground$1 +^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 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*** + diff --git a/apps/proxy/.whistle/rules/files/0.webui b/apps/proxy/.whistle/rules/files/0.webui deleted file mode 100644 index 18f51f8..0000000 --- a/apps/proxy/.whistle/rules/files/0.webui +++ /dev/null @@ -1,2 +0,0 @@ -^https://konobangu.com/*** http://127.0.0.1:5000/$1 excludeFilter://^https://konobangu.com/api/*** -^wss://konobangu.com/*** ws://127.0.0.1:5000/$1 ^excludeFilter://^wss://konobangu.com/api/*** \ No newline at end of file diff --git a/apps/proxy/.whistle/rules/files/2.recorder b/apps/proxy/.whistle/rules/files/2.recorder deleted file mode 100644 index f9998e7..0000000 --- a/apps/proxy/.whistle/rules/files/2.recorder +++ /dev/null @@ -1 +0,0 @@ -^https://konobangu.com/api/*** http://127.0.0.1:5001/api/$1 \ No newline at end of file diff --git a/apps/proxy/.whistle/rules/properties b/apps/proxy/.whistle/rules/properties index 8528bff..6cf4660 100644 --- a/apps/proxy/.whistle/rules/properties +++ b/apps/proxy/.whistle/rules/properties @@ -1 +1 @@ -{"filesOrder":["webui","recorder"],"selectedList":["webui","recorder"],"disabledDefalutRules":true} +{"filesOrder":["konobangu"],"selectedList":["konobangu"],"disabledDefalutRules":true} diff --git a/apps/proxy/.whistle/values/properties b/apps/proxy/.whistle/values/properties index e69de29..960e778 100644 --- a/apps/proxy/.whistle/values/properties +++ b/apps/proxy/.whistle/values/properties @@ -0,0 +1 @@ +{"filesOrder":[]} diff --git a/apps/proxy/package.json b/apps/proxy/package.json index 18bc1c5..495c299 100644 --- a/apps/proxy/package.json +++ b/apps/proxy/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "scripts": { - "start": "cross-env WHISTLE_MODE=\"prod|capture|keepXFF\" whistle run -p 8899 -t 30000 -D . --no-global-plugins", + "start": "cross-env WHISTLE_MODE=\"prod|capture|keepXFF|x-forwarded-host|x-forwarded-proto\" whistle run -p 8899 -t 30000 -D .", "dev": "pnpm run start" }, "keywords": [], @@ -12,4 +12,4 @@ "whistle": "^2.9.61", "cross-env": "^7.0.3" } -} \ No newline at end of file +} diff --git a/apps/recorder/.gitignore b/apps/recorder/.gitignore index 3a6a884..cacf1e1 100644 --- a/apps/recorder/.gitignore +++ b/apps/recorder/.gitignore @@ -25,8 +25,3 @@ Cargo.lock # Dist node_modules dist/ - -# IDE -.vscode/* -!.vscode/extensions.json -.idea diff --git a/apps/recorder/Cargo.toml b/apps/recorder/Cargo.toml index 3075aa1..e556635 100644 --- a/apps/recorder/Cargo.toml +++ b/apps/recorder/Cargo.toml @@ -84,10 +84,7 @@ testcontainers = { version = "0.23.1", features = [ "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 } @@ -102,6 +99,19 @@ axum-extra = "0.10.0" tower-http = "0.6.2" serde_yaml = "0.9.34" tera = "1.20.0" +openidconnect = "4.0.0-rc.1" +http-cache-reqwest = { version = "0.15", features = [ + "manager-cacache", + "manager-moka", +] } +moka = "0.12.10" +http-cache = { version = "0.20.0", features = [ + "cacache-tokio", + "manager-cacache", + "manager-moka", +], default-features = false } +http-cache-semantics = "2.1.0" +dotenv = "0.15.0" [dev-dependencies] serial_test = "3" diff --git a/apps/recorder/config/development.yaml b/apps/recorder/config/development.yaml index 2932a9b..ef30ae4 100644 --- a/apps/recorder/config/development.yaml +++ b/apps/recorder/config/development.yaml @@ -18,8 +18,9 @@ logger: 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: http://webui.konobangu.com + 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 @@ -68,7 +69,7 @@ workers: # - BackgroundQueue - Workers operate asynchronously in the background, processing queued. # - ForegroundBlocking - Workers operate in the foreground and block until tasks are completed. # - BackgroundAsync - Workers operate asynchronously in the background, processing tasks with async capabilities. - mode: BackgroundQueue + mode: BackgroundAsync # Mailer Configuration. mailer: @@ -89,7 +90,7 @@ mailer: # Database Configuration database: # Database connection URI - uri: '{{ get_env(name="DATABASE_URL", default="postgres://konobangu:konobangu@127.0.0.1:5432/konobangu") }}' + 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. @@ -110,13 +111,13 @@ database: # Redis Configuration redis: # Redis connection URI - uri: '{{ get_env(name="REDIS_URL", default="redis://127.0.0.1:6379") }}' + uri: '{{ get_env(name="REDIS_URL", default="redis://localhost:6379") }}' # Dangerously flush all data in Redis on startup. dangerous operation, make sure that you using this flag only on dev environments or test mode dangerously_flush: false settings: dal: - data_dir: ./data + data_dir: '{{ get_env(name="DAL_DATA_DIR", default="./data") }}' mikan: base_url: "https://mikanani.me/" @@ -128,11 +129,17 @@ settings: leaky_bucket_refill_interval: 500 auth: - auth_type: "oidc" # or "basic" - basic_user: "konobangu" - basic_password: "konobangu" - oidc_api_issuer: "https://some-oidc-auth.com/oidc" - oidc_api_audience: "https://konobangu.com/api" - oidc_extra_scopes: "read:konobangu,write:konobangu" - oidc_extra_claim_key: "" - oidc_extra_claim_value: "" + 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 diff --git a/apps/recorder/package.json b/apps/recorder/package.json index 8c53afb..57f6716 100644 --- a/apps/recorder/package.json +++ b/apps/recorder/package.json @@ -1,7 +1,28 @@ { "name": "recorder", "version": "1.0.0", + "scripts": { + "dev": "rsbuild dev", + "build": "rsbuild build", + "preview": "rsbuild preview" + }, "dependencies": { - "altair-static": "^8.1.3" + "@graphiql/react": "^0.28.2", + "@graphiql/toolkit": "^0.11.1", + "@tanstack/react-router": "^1.95.5", + "@tanstack/router-devtools": "^1.95.5", + "graphql-ws": "^5.16.2", + "oidc-client-ts": "^3.1.0", + "react": "^19.0.0", + "react-dom": "^19.0.0", + "react-oidc-context": "^3.2.0" + }, + "devDependencies": { + "@rsbuild/core": "^1.1.8", + "@rsbuild/plugin-react": "^1.0.7", + "@tanstack/router-plugin": "^1.95.5", + "@types/react": "^19.0.0", + "@types/react-dom": "^19.0.0", + "typescript": "^5.7.2" } } diff --git a/apps/recorder/assets/.gitkeep b/apps/recorder/public/.gitkeep similarity index 100% rename from apps/recorder/assets/.gitkeep rename to apps/recorder/public/.gitkeep diff --git a/apps/recorder/assets/static/404.html b/apps/recorder/public/assets/404.html similarity index 100% rename from apps/recorder/assets/static/404.html rename to apps/recorder/public/assets/404.html diff --git a/apps/recorder/public/assets/favicon.ico b/apps/recorder/public/assets/favicon.ico new file mode 100644 index 0000000..a314325 Binary files /dev/null and b/apps/recorder/public/assets/favicon.ico differ diff --git a/apps/recorder/rsbuild.config.ts b/apps/recorder/rsbuild.config.ts new file mode 100644 index 0000000..2aacdf0 --- /dev/null +++ b/apps/recorder/rsbuild.config.ts @@ -0,0 +1,72 @@ +import { defineConfig } from '@rsbuild/core'; +import { pluginReact } from '@rsbuild/plugin-react'; +import { TanStackRouterRspack } from '@tanstack/router-plugin/rspack'; + +export default defineConfig({ + plugins: [pluginReact()], + html: { + favicon: './public/assets/favicon.ico', + tags: [ + { + tag: 'script', + attrs: { src: 'https://cdn.tailwindcss.com' }, + }, + ], + }, + tools: { + rspack: { + plugins: [TanStackRouterRspack()], + }, + }, + source: { + define: { + 'process.env.AUTH_TYPE': JSON.stringify(process.env.AUTH_TYPE), + 'process.env.OIDC_CLIENT_ID': JSON.stringify(process.env.OIDC_CLIENT_ID), + 'process.env.OIDC_CLIENT_SECRET': JSON.stringify( + process.env.OIDC_CLIENT_SECRET + ), + 'process.env.OIDC_ISSUER': JSON.stringify(process.env.OIDC_ISSUER), + 'process.env.OIDC_AUDIENCE': JSON.stringify(process.env.OIDC_AUDIENCE), + 'process.env.OIDC_EXTRA_SCOPES': JSON.stringify( + process.env.OIDC_EXTRA_SCOPES + ), + }, + }, + dev: { + client: { + path: '/api/playground/rsbuild-hmr', + }, + setupMiddlewares: [ + (middlewares) => { + middlewares.unshift((req, res, next) => { + if (process.env.AUTH_TYPE === 'basic') { + res.setHeader('WWW-Authenticate', 'Basic realm="konobangu"'); + + const authorization = + (req.headers.authorization || '').split(' ')[1] || ''; + const [user, password] = Buffer.from(authorization, 'base64') + .toString() + .split(':'); + + if ( + user !== process.env.BASIC_USER || + password !== process.env.BASIC_PASSWORD + ) { + res.statusCode = 401; + res.write('Unauthorized'); + res.end(); + return; + } + } + next(); + }); + return middlewares; + }, + ], + }, + server: { + base: '/api/playground/', + host: '0.0.0.0', + port: 5002, + }, +}); diff --git a/apps/recorder/src/app/ext.rs b/apps/recorder/src/app/ext.rs index 0057abd..31b2c5b 100644 --- a/apps/recorder/src/app/ext.rs +++ b/apps/recorder/src/app/ext.rs @@ -1,4 +1,4 @@ -use loco_rs::app::AppContext; +use loco_rs::{app::AppContext, environment::Environment}; use crate::{ auth::service::AppAuthService, dal::AppDalClient, extract::mikan::AppMikanClient, @@ -21,6 +21,14 @@ pub trait AppContextExt { fn get_graphql_service(&self) -> &AppGraphQLService { AppGraphQLService::app_instance() } + + fn get_node_env(&self) -> Environment { + let node_env = std::env::var("NODE_ENV"); + match node_env.as_deref() { + Ok("production") => Environment::Production, + _ => Environment::Development, + } + } } impl AppContextExt for AppContext {} diff --git a/apps/recorder/src/app/index.tsx b/apps/recorder/src/app/index.tsx new file mode 100644 index 0000000..97e7434 --- /dev/null +++ b/apps/recorder/src/app/index.tsx @@ -0,0 +1,53 @@ +import { RouterProvider, createRouter } from '@tanstack/react-router'; +import type { UserManager } from 'oidc-client-ts'; +import { useMemo } from 'react'; +import { AuthProvider, useAuth } from 'react-oidc-context'; +import { buildUserManager } from '../auth/config'; +import { routeTree } from '../routeTree.gen'; + +// Set up a Router instance +const router = createRouter({ + routeTree, + basepath: '/api/playground', + defaultPreload: 'intent', + context: { + isAuthenticated: process.env.AUTH_TYPE === 'basic', + auth: undefined!, + userManager: undefined!, + }, +}); + +// Register things for typesafety +declare module '@tanstack/react-router' { + interface Register { + router: typeof router; + } +} + +const AppWithBasicAuth = () => { + return