Compare commits
27 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 165adb2775 | |||
| e832ccf07e | |||
| 6df6de098b | |||
| 364b23e62a | |||
| 7b2ed32043 | |||
| d094f7bbef | |||
| f98429159f | |||
| 3dca408356 | |||
| 1655e342b7 | |||
| 7223c35658 | |||
| b85bcd1c7a | |||
| 8536d335bc | |||
| b34f7436c2 | |||
| 8b5803c085 | |||
| 5e2a7b53c9 | |||
| d88cfa2cd3 | |||
| cd30876beb | |||
| 544645b73b | |||
| 76be6dc8e7 | |||
| bc8a4414cd | |||
| 7427bbb576 | |||
| cc64675c9c | |||
| 5a34860fca | |||
| 56106622b2 | |||
| 21c11446d7 | |||
| 0093128001 | |||
| 4d80c71f92 |
46
.github/workflows/.woodpecker.yaml
vendored
Normal file
46
.github/workflows/.woodpecker.yaml
vendored
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
pipeline:
|
||||||
|
build-and-push:
|
||||||
|
image: plugins/docker
|
||||||
|
settings:
|
||||||
|
dockerfile: AobaServer/Dockerfile
|
||||||
|
context: .
|
||||||
|
repo: git.kaisei.app/amatsugu/aoba
|
||||||
|
tags: latest
|
||||||
|
username:
|
||||||
|
from_secret: docker_user
|
||||||
|
password:
|
||||||
|
from_secret: docker_pass
|
||||||
|
|
||||||
|
deploy:
|
||||||
|
image: appleboy/ssh
|
||||||
|
settings:
|
||||||
|
host: your-app-host.internal
|
||||||
|
username: deploy
|
||||||
|
key:
|
||||||
|
from_secret: ssh_key
|
||||||
|
port: 22
|
||||||
|
script:
|
||||||
|
- docker pull git.kaisei.app/amatsugu/aoba:latest
|
||||||
|
|
||||||
|
# Run temporary container on docker network, no port binding
|
||||||
|
- docker run -d --rm \
|
||||||
|
--name aoba-temp \
|
||||||
|
--network aoba-net \
|
||||||
|
git.kaisei.app/amatsugu/aoba:latest
|
||||||
|
|
||||||
|
# Wait for it to become healthy
|
||||||
|
- sleep 3
|
||||||
|
- curl -f http://aoba-temp:8080 --connect-timeout 2 || (echo "Health check failed" && docker stop aoba-temp && exit 1)
|
||||||
|
|
||||||
|
# Stop old container (bound to host port)
|
||||||
|
- docker stop aoba || true
|
||||||
|
|
||||||
|
# Start new container on network and bind to host port 8080
|
||||||
|
- docker run -d --rm \
|
||||||
|
--name aoba \
|
||||||
|
--network aoba-net \
|
||||||
|
-p 9432:8080 \
|
||||||
|
git.kaisei.app/amatsugu/aoba:latest
|
||||||
|
|
||||||
|
# Stop temp container
|
||||||
|
- docker stop aoba-temp || true
|
||||||
57
.github/workflows/release.yaml
vendored
57
.github/workflows/release.yaml
vendored
@@ -1,36 +1,39 @@
|
|||||||
name: "Build and Push Image"
|
name: "Build and Push Image"
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
- "v*"
|
- "v*"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-and-push:
|
build-and-push:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkou code
|
- name: Checkou code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set up Docker Build
|
|
||||||
uses: docker/setup-buildx-action@v3
|
|
||||||
|
|
||||||
- name: Login
|
- name: Set up Docker Build
|
||||||
uses: docker/login-action@v3
|
uses: docker/setup-buildx-action@v3
|
||||||
with:
|
|
||||||
registry: git.kaisei.app
|
|
||||||
username: ${{ secrets.DOCKER_USER }}
|
|
||||||
password: ${{ secrets.DOCKER_PASS }}
|
|
||||||
|
|
||||||
- name: Extract tag version
|
- name: Login
|
||||||
id: extract_tag
|
uses: docker/login-action@v3
|
||||||
run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
|
with:
|
||||||
|
registry: git.kaisei.app
|
||||||
|
username: ${{ secrets.DOCKER_USER }}
|
||||||
|
password: ${{ secrets.DOCKER_PASS }}
|
||||||
|
|
||||||
- name: Build and Push
|
- name: Extract tag version
|
||||||
uses: docker/build-push-action@v5
|
id: extract_tag
|
||||||
with:
|
run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
|
||||||
file: AobaServer/Dockerfile
|
|
||||||
context: .
|
- name: Build and Push
|
||||||
push: true
|
uses: docker/build-push-action@v5
|
||||||
tags: git.kaisei.app/amatsugu/aoba:${{ env.VERSION }}
|
with:
|
||||||
|
file: AobaServer/Dockerfile
|
||||||
|
context: .
|
||||||
|
push: true
|
||||||
|
tags: |
|
||||||
|
git.kaisei.app/amatsugu/aoba:${{ env.VERSION }}
|
||||||
|
git.kaisei.app/amatsugu/aoba:latest
|
||||||
|
build-args: VERSION=${{ env.VERSION }}
|
||||||
|
|||||||
1
AobaClient/.env
Normal file
1
AobaClient/.env
Normal file
@@ -0,0 +1 @@
|
|||||||
|
APP_VERSION=Debug
|
||||||
4923
AobaClient/Cargo.lock
generated
4923
AobaClient/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -19,6 +19,7 @@ web-sys = { version = "0.3.77", features = ["Storage", "Window"] }
|
|||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
tonic-build = { version = "*", default-features = false, features = ["prost"] }
|
tonic-build = { version = "*", default-features = false, features = ["prost"] }
|
||||||
|
dotenv = "0.15.0"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = ["web"]
|
default = ["web"]
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
$mainBGColor: #584577;
|
$mainBGColor: #584577;
|
||||||
$featureColor: #ce2d4f;
|
$featureColor: #ce2d4f;
|
||||||
$accentColor: #f0eaf8;
|
$focusColor: #ff3862;
|
||||||
|
$accentColor: #f0eaf8;
|
||||||
$mainTextColor: #eee;
|
|
||||||
$brightTextColor: #fff;
|
$mainTextColor: #eee;
|
||||||
$invertTextColor: #222;
|
$brightTextColor: #fff;
|
||||||
$invertBrightTextColor: #000;
|
$invertTextColor: #222;
|
||||||
|
$invertBrightTextColor: #000;
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
@import "colors";
|
@import "colors";
|
||||||
* {
|
* {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
scrollbar-color: $accentColor transparent;
|
||||||
|
scrollbar-width: thin;
|
||||||
}
|
}
|
||||||
|
|
||||||
:root {
|
:root {
|
||||||
@@ -18,6 +20,7 @@
|
|||||||
.stickyTop {
|
.stickyTop {
|
||||||
top: 0;
|
top: 0;
|
||||||
position: sticky;
|
position: sticky;
|
||||||
|
z-index: 100;
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
@@ -34,6 +37,8 @@ body {
|
|||||||
#content {
|
#content {
|
||||||
grid-area: Content;
|
grid-area: Content;
|
||||||
overflow-x: hidden;
|
overflow-x: hidden;
|
||||||
|
overflow-y: auto;
|
||||||
|
height: 100dvh;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
/* margin-left: $navBarSize; */
|
/* margin-left: $navBarSize; */
|
||||||
}
|
}
|
||||||
@@ -152,3 +157,41 @@ form {
|
|||||||
padding: 5px;
|
padding: 5px;
|
||||||
user-select: all;
|
user-select: all;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.contextMenu {
|
||||||
|
backdrop-filter: blur(10px) brightness(0.5) grayscale(1);
|
||||||
|
position: absolute;
|
||||||
|
z-index: 100;
|
||||||
|
|
||||||
|
.itemList {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
max-width: 300px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.contextItem {
|
||||||
|
border-left: 4px solid $featureColor;
|
||||||
|
$size: 30px;
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: $size 1fr auto;
|
||||||
|
height: $size;
|
||||||
|
transition: border 0.1s ease-out;
|
||||||
|
cursor: default;
|
||||||
|
|
||||||
|
&.clickable {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.label {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
padding: 5px 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
background-color: $accentColor;
|
||||||
|
color: $invertTextColor;
|
||||||
|
border-left: 10px solid $focusColor;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,11 +1,41 @@
|
|||||||
|
use dotenv::dotenv;
|
||||||
|
use std::env;
|
||||||
|
use std::fs::File;
|
||||||
|
use std::io::Write;
|
||||||
|
|
||||||
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
tonic_build::configure()
|
tonic_build::configure()
|
||||||
.build_server(false)
|
.build_server(false)
|
||||||
.build_client(true)
|
.build_client(true)
|
||||||
.compile_protos(
|
.compile_protos(
|
||||||
&["../AobaServer/Proto/Aoba.proto", "../AobaServer/Proto/Auth.proto"],
|
&[
|
||||||
&["../AobaServer/Proto/"],
|
"../AobaServer/Proto/Aoba.proto",
|
||||||
|
"../AobaServer/Proto/Auth.proto",
|
||||||
|
"../AobaServer/Proto/Metrics.proto",
|
||||||
|
"../AobaServer/Proto/Types.proto",
|
||||||
|
],
|
||||||
|
&["../AobaServer/"],
|
||||||
)?;
|
)?;
|
||||||
|
forward_env();
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn forward_env() {
|
||||||
|
let dest_path = "./src/env.rs";
|
||||||
|
let mut f = File::create(&dest_path).unwrap();
|
||||||
|
f.write_all(b"// This file is automatically generated by build.rs\n\n")
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
dotenv().ok();
|
||||||
|
for (key, value) in env::vars() {
|
||||||
|
if key.starts_with("APP_") {
|
||||||
|
f.write_all("#[allow(dead_code)]\n".as_bytes()).unwrap();
|
||||||
|
let line = format!(
|
||||||
|
"pub const {}: &'static str = \"{}\";\n",
|
||||||
|
key,
|
||||||
|
value.replace("\"", "\\\"")
|
||||||
|
);
|
||||||
|
f.write_all(line.as_bytes()).unwrap();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ pub struct InputProps {
|
|||||||
pub label: Option<String>,
|
pub label: Option<String>,
|
||||||
pub placeholder: Option<String>,
|
pub placeholder: Option<String>,
|
||||||
pub name: String,
|
pub name: String,
|
||||||
pub oninput: Option<EventHandler<FormEvent>>,
|
pub oninput: Option<EventHandler<Event<FormData>>>,
|
||||||
pub required: Option<bool>,
|
pub required: Option<bool>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22,9 +22,12 @@ pub fn Input(props: InputProps) -> Element {
|
|||||||
r#type: props.r#type.unwrap_or("text".into()),
|
r#type: props.r#type.unwrap_or("text".into()),
|
||||||
value: props.value,
|
value: props.value,
|
||||||
oninput: move |e| {
|
oninput: move |e| {
|
||||||
if let Some(mut s) = props.value {
|
if let Some(mut s) = props.value {
|
||||||
s.set(e.value());
|
s.set(e.value());
|
||||||
}
|
}
|
||||||
|
if let Some(handler) = props.oninput{
|
||||||
|
handler.call(e);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
name: props.name,
|
name: props.name,
|
||||||
placeholder: ph,
|
placeholder: ph,
|
||||||
|
|||||||
97
AobaClient/src/components/context_menu.rs
Normal file
97
AobaClient/src/components/context_menu.rs
Normal file
@@ -0,0 +1,97 @@
|
|||||||
|
use core::str;
|
||||||
|
|
||||||
|
use dioxus::prelude::*;
|
||||||
|
|
||||||
|
mod props {
|
||||||
|
use dioxus::prelude::*;
|
||||||
|
|
||||||
|
#[derive(PartialEq, Clone, Props)]
|
||||||
|
pub struct ContextMenu {
|
||||||
|
pub top: f64,
|
||||||
|
pub left: f64,
|
||||||
|
pub items: Element,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(PartialEq, Clone, Props, Default)]
|
||||||
|
pub struct ContextMenuItem {
|
||||||
|
pub name: String,
|
||||||
|
pub sub_items: Option<Element>,
|
||||||
|
pub onclick: Option<EventHandler<MouseEvent>>,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Copy, Default)]
|
||||||
|
pub struct ContextMenuRenderer {
|
||||||
|
pub menu: Signal<Option<Element>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ContextMenuRenderer {
|
||||||
|
pub fn close(&mut self) {
|
||||||
|
self.menu.set(None);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn render(&self) -> Element {
|
||||||
|
if let Some(menu) = self.menu.cloned() {
|
||||||
|
rsx! {
|
||||||
|
{menu}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
rsx! {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[component]
|
||||||
|
pub fn ContextMenuRoot() -> Element {
|
||||||
|
let renderer = use_context::<ContextMenuRenderer>();
|
||||||
|
rsx! {
|
||||||
|
{renderer.render()}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[component]
|
||||||
|
pub fn ContextMenu(props: props::ContextMenu) -> Element {
|
||||||
|
rsx! {
|
||||||
|
div {
|
||||||
|
class: "contextMenu",
|
||||||
|
style: "left: {props.left}px; top: {props.top}px;",
|
||||||
|
ItemList { items: props.items }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[component]
|
||||||
|
fn ItemList(items: Element) -> Element {
|
||||||
|
rsx! {
|
||||||
|
div{
|
||||||
|
class: "itemList",
|
||||||
|
{items}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[component]
|
||||||
|
pub fn ContextMenuItem(props: props::ContextMenuItem) -> Element {
|
||||||
|
let mut renderer = use_context::<ContextMenuRenderer>();
|
||||||
|
if let Some(_sub) = props.sub_items {
|
||||||
|
todo!("Sub Menu");
|
||||||
|
}
|
||||||
|
rsx! {
|
||||||
|
div{
|
||||||
|
onclick: move |e|{
|
||||||
|
if let Some(handler) = props.onclick{
|
||||||
|
handler.call(e);
|
||||||
|
}
|
||||||
|
renderer.close();
|
||||||
|
},
|
||||||
|
class: "contextItem",
|
||||||
|
div {
|
||||||
|
class: "icon"
|
||||||
|
},
|
||||||
|
div {
|
||||||
|
class: "label",
|
||||||
|
{props.name}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -51,8 +51,11 @@ pub fn MediaGrid(props: MediaGridProps) -> Element {
|
|||||||
Ok(result) => rsx! {
|
Ok(result) => rsx! {
|
||||||
div {
|
div {
|
||||||
class: "mediaGrid",
|
class: "mediaGrid",
|
||||||
|
// oncontextmenu: oncontext,
|
||||||
{result.items.iter().map(|itm| rsx!{
|
{result.items.iter().map(|itm| rsx!{
|
||||||
MediaItem { item: Some(itm.clone()) }
|
MediaItem {
|
||||||
|
item: itm.clone()
|
||||||
|
}
|
||||||
})},
|
})},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -69,7 +72,7 @@ pub fn MediaGrid(props: MediaGridProps) -> Element {
|
|||||||
div{
|
div{
|
||||||
class: "mediaGrid",
|
class: "mediaGrid",
|
||||||
{(0..50).map(|_| rsx!{
|
{(0..50).map(|_| rsx!{
|
||||||
MediaItem {}
|
MediaItem { }
|
||||||
})}
|
})}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,21 +1,73 @@
|
|||||||
use dioxus::prelude::*;
|
use dioxus::prelude::*;
|
||||||
|
use web_sys::window;
|
||||||
|
|
||||||
use crate::{HOST, rpc::aoba::MediaModel};
|
use crate::{
|
||||||
|
HOST,
|
||||||
|
components::{ContextMenu, ContextMenuItem, ContextMenuRenderer},
|
||||||
|
rpc::aoba::MediaModel,
|
||||||
|
};
|
||||||
|
|
||||||
#[derive(PartialEq, Clone, Props)]
|
#[derive(PartialEq, Clone, Props)]
|
||||||
pub struct MediaItemProps {
|
pub struct MediaItemProps {
|
||||||
pub item: Option<MediaModel>,
|
pub item: Option<MediaModel>,
|
||||||
|
// pub oncontextmenu: Option<EventHandler<Event<MouseData>>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn MediaItem(props: MediaItemProps) -> Element {
|
pub fn MediaItem(props: MediaItemProps) -> Element {
|
||||||
|
let mut ct_renderer = use_context::<ContextMenuRenderer>();
|
||||||
|
|
||||||
if let Some(item) = props.item {
|
if let Some(item) = props.item {
|
||||||
let mtype = item.media_type().as_str_name();
|
let mtype = item.media_type().as_str_name();
|
||||||
let filename = item.file_name;
|
let filename = item.file_name;
|
||||||
let id = item.id.unwrap().value;
|
let id = item.id.unwrap().value;
|
||||||
let thumb = item.thumb_url;
|
let thumb = item.thumb_url;
|
||||||
|
let url = item.media_url;
|
||||||
|
let download = format!("{HOST}{url}");
|
||||||
|
|
||||||
|
let oncontext = move |event: Event<MouseData>| {
|
||||||
|
println!("ContextMenu");
|
||||||
|
event.prevent_default();
|
||||||
|
event.stop_propagation();
|
||||||
|
let data = event.data();
|
||||||
|
if data.modifiers().ctrl() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
let pos = data.coordinates().client();
|
||||||
|
let left = pos.x;
|
||||||
|
let top = pos.y;
|
||||||
|
let download = download.clone();
|
||||||
|
|
||||||
|
let menu: Element = rsx! {
|
||||||
|
ContextMenu {
|
||||||
|
left: left,
|
||||||
|
top: top,
|
||||||
|
items: rsx! {
|
||||||
|
ContextMenuItem {
|
||||||
|
name: "Details",
|
||||||
|
},
|
||||||
|
ContextMenuItem {
|
||||||
|
name: "Download",
|
||||||
|
onclick: move |_|{
|
||||||
|
_ = window().unwrap().open_with_url_and_target(&download, "_blank");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
ContextMenuItem {
|
||||||
|
name: "Delete",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
};
|
||||||
|
ct_renderer.menu.set(Some(menu));
|
||||||
|
};
|
||||||
|
|
||||||
return rsx! {
|
return rsx! {
|
||||||
a { class: "mediaItem", href: "{HOST}/m/{id}", target: "_blank",
|
a {
|
||||||
|
class: "mediaItem",
|
||||||
|
href: "{HOST}{url}",
|
||||||
|
target: "_blank",
|
||||||
|
oncontextmenu: oncontext,
|
||||||
|
"data-id" : id,
|
||||||
img { src: "{HOST}{thumb}" }
|
img { src: "{HOST}{thumb}" }
|
||||||
span { class: "info",
|
span { class: "info",
|
||||||
span { class: "name", "{filename}" }
|
span { class: "name", "{filename}" }
|
||||||
@@ -24,7 +76,7 @@ pub fn MediaItem(props: MediaItemProps) -> Element {
|
|||||||
span { "{item.view_count}" }
|
span { "{item.view_count}" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
};
|
};
|
||||||
} else {
|
} else {
|
||||||
return rsx! {
|
return rsx! {
|
||||||
|
|||||||
25
AobaClient/src/components/metrics_token.rs
Normal file
25
AobaClient/src/components/metrics_token.rs
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
use dioxus::prelude::*;
|
||||||
|
|
||||||
|
use crate::rpc::get_metrics_rpc_client;
|
||||||
|
|
||||||
|
#[component]
|
||||||
|
pub fn MetricsToken() -> Element {
|
||||||
|
let token = use_resource(async move || {
|
||||||
|
let response = get_metrics_rpc_client().get_token(()).await;
|
||||||
|
|
||||||
|
if let Ok(d) = response {
|
||||||
|
let jwt = d.into_inner();
|
||||||
|
return jwt.token;
|
||||||
|
}
|
||||||
|
return "".to_string();
|
||||||
|
});
|
||||||
|
|
||||||
|
let token_value = token.cloned().unwrap_or("".to_string());
|
||||||
|
|
||||||
|
return rsx! {
|
||||||
|
pre {
|
||||||
|
class: "codeSelect",
|
||||||
|
"{token_value}"
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,11 +1,15 @@
|
|||||||
pub mod basic;
|
pub mod basic;
|
||||||
|
mod context_menu;
|
||||||
mod media_grid;
|
mod media_grid;
|
||||||
mod media_item;
|
mod media_item;
|
||||||
|
mod metrics_token;
|
||||||
mod navbar;
|
mod navbar;
|
||||||
mod notif;
|
mod notif;
|
||||||
mod search;
|
mod search;
|
||||||
|
pub use context_menu::*;
|
||||||
pub use media_grid::*;
|
pub use media_grid::*;
|
||||||
pub use media_item::*;
|
pub use media_item::*;
|
||||||
|
pub use metrics_token::*;
|
||||||
pub use navbar::*;
|
pub use navbar::*;
|
||||||
pub use notif::*;
|
pub use notif::*;
|
||||||
pub use search::*;
|
pub use search::*;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
use dioxus::prelude::*;
|
use dioxus::prelude::*;
|
||||||
|
|
||||||
use crate::{Route, contexts::AuthContext};
|
use crate::{Route, contexts::AuthContext, env::APP_VERSION};
|
||||||
|
|
||||||
const NAV_CSS: Asset = asset!("/assets/style/nav.scss");
|
const NAV_CSS: Asset = asset!("/assets/style/nav.scss");
|
||||||
const NAV_ICON: Asset = asset!("/assets/favicon.ico");
|
const NAV_ICON: Asset = asset!("/assets/favicon.ico");
|
||||||
@@ -47,9 +47,10 @@ pub fn Widgets() -> Element {
|
|||||||
#[component]
|
#[component]
|
||||||
pub fn Utils() -> Element {
|
pub fn Utils() -> Element {
|
||||||
let mut auth_context = use_context::<AuthContext>();
|
let mut auth_context = use_context::<AuthContext>();
|
||||||
|
let version = APP_VERSION;
|
||||||
rsx! {
|
rsx! {
|
||||||
div { class: "utils",
|
div { class: "utils",
|
||||||
|
div { "{version}" }
|
||||||
div { onclick: move |_| auth_context.logout(), "Logout" }
|
div { onclick: move |_| auth_context.logout(), "Logout" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
4
AobaClient/src/env.rs
Normal file
4
AobaClient/src/env.rs
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
// This file is automatically generated by build.rs
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
|
pub const APP_VERSION: &'static str = "Debug";
|
||||||
@@ -1,6 +1,11 @@
|
|||||||
use dioxus::prelude::*;
|
use dioxus::prelude::*;
|
||||||
|
|
||||||
use crate::{Route, components::Navbar, contexts::AuthContext, views::Login};
|
use crate::{
|
||||||
|
Route,
|
||||||
|
components::{ContextMenuRenderer, ContextMenuRoot, Navbar},
|
||||||
|
contexts::AuthContext,
|
||||||
|
views::Login,
|
||||||
|
};
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn MainLayout() -> Element {
|
pub fn MainLayout() -> Element {
|
||||||
@@ -8,12 +13,24 @@ pub fn MainLayout() -> Element {
|
|||||||
|
|
||||||
if auth_context.jwt.cloned().is_none() {
|
if auth_context.jwt.cloned().is_none() {
|
||||||
return rsx! {
|
return rsx! {
|
||||||
Login {}
|
Login { }
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let mut ct_renderer = use_context::<ContextMenuRenderer>();
|
||||||
|
|
||||||
return rsx! {
|
return rsx! {
|
||||||
Navbar {}
|
ContextMenuRoot { }
|
||||||
div { id: "content", Outlet::<Route> {} }
|
Navbar { }
|
||||||
|
div {
|
||||||
|
id: "content",
|
||||||
|
onclick: move |_| {
|
||||||
|
ct_renderer.close();
|
||||||
|
},
|
||||||
|
oncontextmenu: move |_| {
|
||||||
|
ct_renderer.close();
|
||||||
|
},
|
||||||
|
Outlet::<Route> { }
|
||||||
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
pub mod components;
|
pub mod components;
|
||||||
pub mod contexts;
|
pub mod contexts;
|
||||||
|
mod env;
|
||||||
mod layouts;
|
mod layouts;
|
||||||
pub mod models;
|
pub mod models;
|
||||||
pub mod route;
|
pub mod route;
|
||||||
@@ -10,6 +11,8 @@ use contexts::AuthContext;
|
|||||||
use dioxus::prelude::*;
|
use dioxus::prelude::*;
|
||||||
use route::Route;
|
use route::Route;
|
||||||
|
|
||||||
|
use crate::components::ContextMenuRenderer;
|
||||||
|
|
||||||
#[cfg(debug_assertions)]
|
#[cfg(debug_assertions)]
|
||||||
pub const HOST: &'static str = "http://localhost:8081";
|
pub const HOST: &'static str = "http://localhost:8081";
|
||||||
#[cfg(debug_assertions)]
|
#[cfg(debug_assertions)]
|
||||||
@@ -29,7 +32,8 @@ fn main() {
|
|||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
fn App() -> Element {
|
fn App() -> Element {
|
||||||
let _auth_state = use_context_provider(|| AuthContext::new());
|
use_context_provider(|| AuthContext::new());
|
||||||
|
use_context_provider(|| ContextMenuRenderer::default());
|
||||||
rsx! {
|
rsx! {
|
||||||
document::Link { rel: "icon", href: FAVICON }
|
document::Link { rel: "icon", href: FAVICON }
|
||||||
document::Link { rel: "preconnect", href: "https://fonts.googleapis.com" }
|
document::Link { rel: "preconnect", href: "https://fonts.googleapis.com" }
|
||||||
@@ -40,6 +44,7 @@ fn App() -> Element {
|
|||||||
rel: "stylesheet",
|
rel: "stylesheet",
|
||||||
href: "https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,100..900;1,100..900&display=swap",
|
href: "https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,100..900;1,100..900&display=swap",
|
||||||
}
|
}
|
||||||
Router::<Route> {}
|
|
||||||
|
Router::<Route> { }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,19 +1,22 @@
|
|||||||
use std::sync::RwLock;
|
use std::sync::RwLock;
|
||||||
|
|
||||||
use aoba::{aoba_rpc_client::AobaRpcClient, auth_rpc_client::AuthRpcClient};
|
use aoba::aoba_rpc_client::AobaRpcClient;
|
||||||
use tonic::service::{Interceptor, interceptor::InterceptedService};
|
use tonic::service::{Interceptor, interceptor::InterceptedService};
|
||||||
use tonic_web_wasm_client::Client;
|
use tonic_web_wasm_client::Client;
|
||||||
|
|
||||||
use crate::RPC_HOST;
|
use crate::{
|
||||||
|
RPC_HOST,
|
||||||
|
rpc::aoba::{auth_rpc_client::AuthRpcClient, metrics_rpc_client::MetricsRpcClient},
|
||||||
|
};
|
||||||
|
|
||||||
pub mod aoba {
|
pub mod aoba {
|
||||||
tonic::include_proto!("aoba");
|
tonic::include_proto!("aoba");
|
||||||
tonic::include_proto!("aoba.auth");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static RPC_CLIENT: RpcConnection = RpcConnection {
|
static RPC_CLIENT: RpcConnection = RpcConnection {
|
||||||
aoba: RwLock::new(None),
|
aoba: RwLock::new(None),
|
||||||
auth: RwLock::new(None),
|
auth: RwLock::new(None),
|
||||||
|
metrics: RwLock::new(None),
|
||||||
jwt: RwLock::new(None),
|
jwt: RwLock::new(None),
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -21,6 +24,7 @@ static RPC_CLIENT: RpcConnection = RpcConnection {
|
|||||||
pub struct RpcConnection {
|
pub struct RpcConnection {
|
||||||
aoba: RwLock<Option<AobaRpcClient<InterceptedService<Client, AuthInterceptor>>>>,
|
aoba: RwLock<Option<AobaRpcClient<InterceptedService<Client, AuthInterceptor>>>>,
|
||||||
auth: RwLock<Option<AuthRpcClient<Client>>>,
|
auth: RwLock<Option<AuthRpcClient<Client>>>,
|
||||||
|
metrics: RwLock<Option<MetricsRpcClient<InterceptedService<Client, AuthInterceptor>>>>,
|
||||||
jwt: RwLock<Option<String>>,
|
jwt: RwLock<Option<String>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -35,12 +39,19 @@ impl RpcConnection {
|
|||||||
return self.auth.read().unwrap().clone().unwrap();
|
return self.auth.read().unwrap().clone().unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn get_metrics_client(&self) -> MetricsRpcClient<InterceptedService<Client, AuthInterceptor>> {
|
||||||
|
self.ensure_client();
|
||||||
|
return self.metrics.read().unwrap().clone().unwrap();
|
||||||
|
}
|
||||||
|
|
||||||
fn ensure_client(&self) {
|
fn ensure_client(&self) {
|
||||||
if self.aoba.read().unwrap().is_none() {
|
if self.aoba.read().unwrap().is_none() {
|
||||||
let wasm_client = Client::new(RPC_HOST.into());
|
let wasm_client = Client::new(RPC_HOST.into());
|
||||||
let aoba_client = AobaRpcClient::with_interceptor(wasm_client.clone(), AuthInterceptor);
|
let aoba_client = AobaRpcClient::with_interceptor(wasm_client.clone(), AuthInterceptor);
|
||||||
*self.aoba.write().unwrap() = Some(aoba_client);
|
*self.aoba.write().unwrap() = Some(aoba_client);
|
||||||
*self.auth.write().unwrap() = Some(AuthRpcClient::new(wasm_client.clone()));
|
*self.auth.write().unwrap() = Some(AuthRpcClient::new(wasm_client.clone()));
|
||||||
|
*self.metrics.write().unwrap() =
|
||||||
|
Some(MetricsRpcClient::with_interceptor(wasm_client.clone(), AuthInterceptor));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -66,6 +77,9 @@ pub fn get_auth_rpc_client() -> AuthRpcClient<Client> {
|
|||||||
return RPC_CLIENT.get_auth_client();
|
return RPC_CLIENT.get_auth_client();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn get_metrics_rpc_client() -> MetricsRpcClient<InterceptedService<Client, AuthInterceptor>> {
|
||||||
|
return RPC_CLIENT.get_metrics_client();
|
||||||
|
}
|
||||||
pub fn login(jwt: String) {
|
pub fn login(jwt: String) {
|
||||||
*RPC_CLIENT.jwt.write().unwrap() = Some(jwt);
|
*RPC_CLIENT.jwt.write().unwrap() = Some(jwt);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
use dioxus::prelude::*;
|
use dioxus::prelude::*;
|
||||||
|
|
||||||
use crate::rpc::get_rpc_client;
|
use crate::{components::MetricsToken, rpc::get_rpc_client};
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn Settings() -> Element {
|
pub fn Settings() -> Element {
|
||||||
@@ -27,5 +27,6 @@ pub fn Settings() -> Element {
|
|||||||
div {
|
div {
|
||||||
pre { class: "codeSelect", "{d}" }
|
pre { class: "codeSelect", "{d}" }
|
||||||
}
|
}
|
||||||
|
MetricsToken { }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,14 +9,14 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="FFMpegCore" Version="5.2.0" />
|
<PackageReference Include="FFMpegCore" Version="5.2.0" />
|
||||||
<PackageReference Include="Isopoh.Cryptography.Argon2" Version="2.0.0" />
|
<PackageReference Include="Isopoh.Cryptography.Argon2" Version="2.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.6" />
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.7" />
|
||||||
<PackageReference Include="MaybeError" Version="1.1.0" />
|
<PackageReference Include="MaybeError" Version="1.1.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.6" />
|
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.7" />
|
||||||
<PackageReference Include="MongoDB.Driver" Version="3.4.0" />
|
<PackageReference Include="MongoDB.Driver" Version="3.4.1" />
|
||||||
<PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="2.1.0" />
|
<PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="2.1.0" />
|
||||||
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.6" />
|
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.6" />
|
||||||
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.12.1" />
|
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.12.1" />
|
||||||
<PackageReference Include="ZLinq" Version="1.4.12" />
|
<PackageReference Include="ZLinq" Version="1.5.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -16,15 +16,9 @@ using System.Threading.Tasks;
|
|||||||
namespace AobaCore;
|
namespace AobaCore;
|
||||||
public static class Extensions
|
public static class Extensions
|
||||||
{
|
{
|
||||||
public static IServiceCollection AddAoba(this IServiceCollection services, string dbString)
|
public static IServiceCollection AddAoba(this IServiceCollection services)
|
||||||
{
|
{
|
||||||
var settings = MongoClientSettings.FromConnectionString(dbString);
|
|
||||||
settings.ClusterConfigurator = cb => cb.Subscribe(new DiagnosticsActivityEventSubscriber());
|
|
||||||
var dbClient = new MongoClient(settings);
|
|
||||||
var db = dbClient.GetDatabase("Aoba");
|
|
||||||
|
|
||||||
services.AddSingleton(dbClient);
|
|
||||||
services.AddSingleton<IMongoDatabase>(db);
|
|
||||||
services.AddSingleton<AobaService>();
|
services.AddSingleton<AobaService>();
|
||||||
services.AddSingleton<ThumbnailService>();
|
services.AddSingleton<ThumbnailService>();
|
||||||
services.AddSingleton<AccountsService>();
|
services.AddSingleton<AccountsService>();
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
using MongoDB.Bson;
|
using MongoDB.Bson;
|
||||||
using MongoDB.Bson.Serialization.Attributes;
|
using MongoDB.Bson.Serialization.Attributes;
|
||||||
|
|
||||||
|
using SixLabors.ImageSharp;
|
||||||
|
|
||||||
namespace AobaCore.Models;
|
namespace AobaCore.Models;
|
||||||
|
|
||||||
[BsonIgnoreExtraElements]
|
[BsonIgnoreExtraElements]
|
||||||
@@ -16,23 +18,27 @@ public class Media
|
|||||||
public ObjectId Owner { get; set; }
|
public ObjectId Owner { get; set; }
|
||||||
public DateTime UploadDate { get; set; }
|
public DateTime UploadDate { get; set; }
|
||||||
public string[] Tags { get; set; } = [];
|
public string[] Tags { get; set; } = [];
|
||||||
|
public Size? Dimensions { get; set; }
|
||||||
public Dictionary<ThumbnailSize, ObjectId> Thumbnails { get; set; } = [];
|
public Dictionary<ThumbnailSize, ObjectId> Thumbnails { get; set; } = [];
|
||||||
|
|
||||||
|
|
||||||
public static readonly Dictionary<string, MediaType> KnownTypes = new()
|
public static readonly Dictionary<string, MediaType> KnownTypes = new()
|
||||||
{
|
{
|
||||||
{ ".jpg", MediaType.Image },
|
{ ".jpg", MediaType.Image },
|
||||||
{ ".avif", MediaType.Image },
|
|
||||||
{ ".jpeg", MediaType.Image },
|
{ ".jpeg", MediaType.Image },
|
||||||
|
{ ".jxr", MediaType.Image },
|
||||||
|
{ ".avif", MediaType.Image },
|
||||||
{ ".png", MediaType.Image },
|
{ ".png", MediaType.Image },
|
||||||
{ ".apng", MediaType.Image },
|
{ ".apng", MediaType.Image },
|
||||||
{ ".webp", MediaType.Image },
|
{ ".webp", MediaType.Image },
|
||||||
|
{ ".qoi", MediaType.Image },
|
||||||
{ ".ico", MediaType.Image },
|
{ ".ico", MediaType.Image },
|
||||||
{ ".gif", MediaType.Image },
|
{ ".gif", MediaType.Image },
|
||||||
{ ".mp3", MediaType.Audio },
|
{ ".mp3", MediaType.Audio },
|
||||||
{ ".flac", MediaType.Audio },
|
{ ".flac", MediaType.Audio },
|
||||||
{ ".alac", MediaType.Audio },
|
{ ".alac", MediaType.Audio },
|
||||||
{ ".mp4", MediaType.Video },
|
{ ".mp4", MediaType.Video },
|
||||||
|
{ ".m4v", MediaType.Video },
|
||||||
{ ".webm", MediaType.Video },
|
{ ".webm", MediaType.Video },
|
||||||
{ ".mov", MediaType.Video },
|
{ ".mov", MediaType.Video },
|
||||||
{ ".avi", MediaType.Video },
|
{ ".avi", MediaType.Video },
|
||||||
@@ -50,6 +56,10 @@ public class Media
|
|||||||
{ ".xml", MediaType.Code },
|
{ ".xml", MediaType.Code },
|
||||||
{ ".json", MediaType.Code },
|
{ ".json", MediaType.Code },
|
||||||
{ ".py", MediaType.Code },
|
{ ".py", MediaType.Code },
|
||||||
|
{ ".rs", MediaType.Code },
|
||||||
|
{ ".zed", MediaType.Code },
|
||||||
|
{ ".ts", MediaType.Code },
|
||||||
|
{ ".astro", MediaType.Code },
|
||||||
};
|
};
|
||||||
|
|
||||||
[BsonConstructor]
|
[BsonConstructor]
|
||||||
@@ -75,7 +85,7 @@ public class Media
|
|||||||
{
|
{
|
||||||
return this switch
|
return this switch
|
||||||
{
|
{
|
||||||
//Media { MediaType: MediaType.Raw or MediaType.Text or MediaType.Code} => $"/i/dl/{MediaId}/{Filename}",
|
Media { MediaType: MediaType.Raw or MediaType.Text or MediaType.Code } => $"/m/{MediaId}/{Uri.EscapeDataString(Filename)}",
|
||||||
_ => $"/m/{MediaId}"
|
_ => $"/m/{MediaId}"
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ using AobaCore.Models;
|
|||||||
|
|
||||||
using MaybeError.Errors;
|
using MaybeError.Errors;
|
||||||
|
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
using MongoDB.Bson;
|
using MongoDB.Bson;
|
||||||
using MongoDB.Driver;
|
using MongoDB.Driver;
|
||||||
using MongoDB.Driver.GridFS;
|
using MongoDB.Driver.GridFS;
|
||||||
@@ -69,6 +71,7 @@ public class AobaService(IMongoDatabase db)
|
|||||||
{
|
{
|
||||||
var fileId = await _gridFs.UploadFromStreamAsync(filename, data, cancellationToken: cancellationToken);
|
var fileId = await _gridFs.UploadFromStreamAsync(filename, data, cancellationToken: cancellationToken);
|
||||||
var media = new Media(fileId, filename, owner);
|
var media = new Media(fileId, filename, owner);
|
||||||
|
|
||||||
await AddMediaAsync(media, cancellationToken);
|
await AddMediaAsync(media, cancellationToken);
|
||||||
return media;
|
return media;
|
||||||
}
|
}
|
||||||
@@ -76,6 +79,10 @@ public class AobaService(IMongoDatabase db)
|
|||||||
{
|
{
|
||||||
return ex;
|
return ex;
|
||||||
}
|
}
|
||||||
|
finally
|
||||||
|
{
|
||||||
|
data.Dispose();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<MaybeEx<GridFSDownloadStream, GridFSException>> GetFileStreamAsync(ObjectId mediaId, bool seekable = false, CancellationToken cancellationToken = default)
|
public async Task<MaybeEx<GridFSDownloadStream, GridFSException>> GetFileStreamAsync(ObjectId mediaId, bool seekable = false, CancellationToken cancellationToken = default)
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
using FFMpegCore;
|
using FFMpegCore;
|
||||||
using FFMpegCore.Pipes;
|
using FFMpegCore.Pipes;
|
||||||
|
|
||||||
|
|
||||||
using MaybeError.Errors;
|
using MaybeError.Errors;
|
||||||
|
|
||||||
using MongoDB.Bson;
|
using MongoDB.Bson;
|
||||||
@@ -10,6 +11,7 @@ using MongoDB.Driver;
|
|||||||
using MongoDB.Driver.GridFS;
|
using MongoDB.Driver.GridFS;
|
||||||
|
|
||||||
using SixLabors.ImageSharp;
|
using SixLabors.ImageSharp;
|
||||||
|
using SixLabors.ImageSharp.Formats;
|
||||||
using SixLabors.ImageSharp.Processing;
|
using SixLabors.ImageSharp.Processing;
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
@@ -24,7 +26,6 @@ namespace AobaCore.Services;
|
|||||||
public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
|
public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
|
||||||
{
|
{
|
||||||
private readonly GridFSBucket _gridfs = new GridFSBucket(db);
|
private readonly GridFSBucket _gridfs = new GridFSBucket(db);
|
||||||
private Lock _lock = new();
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
///
|
///
|
||||||
@@ -92,17 +93,29 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
|
|||||||
{
|
{
|
||||||
return type switch
|
return type switch
|
||||||
{
|
{
|
||||||
MediaType.Image => await GenerateImageThumbnailAsync(stream, size, cancellationToken),
|
MediaType.Image => await GenerateImageThumbnailAsync(stream, size, ext, cancellationToken),
|
||||||
MediaType.Video => GenerateVideoThumbnail(stream, size, cancellationToken),
|
MediaType.Video => GenerateVideoThumbnail(stream, size, cancellationToken),
|
||||||
MediaType.Text or MediaType.Code => await GenerateDocumentThumbnailAsync(stream, size, cancellationToken),
|
MediaType.Text or MediaType.Code => await GenerateDocumentThumbnailAsync(stream, size, cancellationToken),
|
||||||
_ => new Error($"No Thumbnail for {type}"),
|
_ => new Error($"No Thumbnail for {type}"),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async Task<Stream> GenerateImageThumbnailAsync(Stream stream, ThumbnailSize size, CancellationToken cancellationToken = default)
|
private static Maybe<Image> LoadImage(Stream stream, string ext)
|
||||||
{
|
{
|
||||||
var img = Image.Load(stream);
|
if (ext is ".heif" or ".avif")
|
||||||
img.Mutate(o =>
|
{
|
||||||
|
return new Error("Unsupported image type");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
return Image.Load(stream);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static async Task<Maybe<Stream>> GenerateImageThumbnailAsync(Stream stream, ThumbnailSize size, string ext, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
var img = LoadImage(stream, ext);
|
||||||
|
if (img.HasError)
|
||||||
|
return img.Error;
|
||||||
|
img.Value.Mutate(o =>
|
||||||
{
|
{
|
||||||
var size =
|
var size =
|
||||||
o.Resize(new ResizeOptions
|
o.Resize(new ResizeOptions
|
||||||
@@ -113,7 +126,8 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
var result = new MemoryStream();
|
var result = new MemoryStream();
|
||||||
await img.SaveAsWebpAsync(result, cancellationToken);
|
await img.Value.SaveAsWebpAsync(result, cancellationToken);
|
||||||
|
img.Value.Dispose();
|
||||||
result.Position = 0;
|
result.Position = 0;
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
@@ -121,20 +135,35 @@ public class ThumbnailService(IMongoDatabase db, AobaService aobaService)
|
|||||||
public Maybe<Stream> GenerateVideoThumbnail(Stream data, ThumbnailSize size, CancellationToken cancellationToken = default)
|
public Maybe<Stream> GenerateVideoThumbnail(Stream data, ThumbnailSize size, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
var w = (int)size;
|
var w = (int)size;
|
||||||
var source = new MemoryStream();
|
var fn = ObjectId.GenerateNewId().ToString();
|
||||||
|
var filePath = $"/tmp/{fn}.in";
|
||||||
|
using var source = new FileStream(filePath, FileMode.CreateNew);
|
||||||
data.CopyTo(source);
|
data.CopyTo(source);
|
||||||
source.Position = 0;
|
source.Flush();
|
||||||
var output = new MemoryStream();
|
source.Dispose();
|
||||||
FFMpegArguments.FromPipeInput(new StreamPipeSource(source), opt =>
|
data.Dispose();
|
||||||
|
try
|
||||||
{
|
{
|
||||||
opt.WithCustomArgument("-t 5");
|
var output = new MemoryStream();
|
||||||
}).OutputToPipe(new StreamPipeSink(output), opt =>
|
FFMpegArguments.FromFileInput(filePath, false, opt =>
|
||||||
|
{
|
||||||
|
opt.WithCustomArgument("-t 5");
|
||||||
|
}).OutputToPipe(new StreamPipeSink(output), opt =>
|
||||||
|
{
|
||||||
|
opt.WithCustomArgument($"-vf \"crop='min(in_w,in_h)':'min(in_w,in_h)',scale={w}:{w}\" -loop 0 -r 15")
|
||||||
|
.ForceFormat("webp");
|
||||||
|
}).ProcessSynchronously();
|
||||||
|
output.Position = 0;
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
opt.WithCustomArgument($"-vf \"crop='min(in_w,in_h)':'min(in_w,in_h)',scale={w}:{w}\" -loop 0 -r 15")
|
return ex;
|
||||||
.ForceFormat("webp");
|
}
|
||||||
}).ProcessSynchronously();
|
finally
|
||||||
output.Position = 0;
|
{
|
||||||
return output;
|
File.Delete(filePath);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<Maybe<Stream>> GenerateDocumentThumbnailAsync(Stream data, ThumbnailSize size, CancellationToken cancellationToken = default)
|
public async Task<Maybe<Stream>> GenerateDocumentThumbnailAsync(Stream data, ThumbnailSize size, CancellationToken cancellationToken = default)
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Isopoh.Cryptography.Argon2" Version="2.0.0" />
|
<PackageReference Include="Isopoh.Cryptography.Argon2" Version="2.0.0" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.6" />
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.7" />
|
||||||
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.12.1" />
|
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.12.1" />
|
||||||
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
|
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
|
||||||
<PackageReference Include="MimeTypesMap" Version="1.0.9" />
|
<PackageReference Include="MimeTypesMap" Version="1.0.9" />
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.9.0-beta.2" />
|
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.9.0-beta.2" />
|
||||||
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
|
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
|
||||||
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
|
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
|
||||||
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
|
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -34,6 +34,8 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Protobuf Include="Proto\Aoba.proto"></Protobuf>
|
<Protobuf Include="Proto\Aoba.proto"></Protobuf>
|
||||||
<Protobuf Include="Proto\Auth.proto"></Protobuf>
|
<Protobuf Include="Proto\Auth.proto"></Protobuf>
|
||||||
|
<Protobuf Include="Proto\Metrics.proto"></Protobuf>
|
||||||
|
<Protobuf Include="Proto\Types.proto"></Protobuf>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ public class MediaApi(AobaService aoba) : ControllerBase
|
|||||||
if (media.HasError)
|
if (media.HasError)
|
||||||
return Problem(detail: media.Error.Message, statusCode: StatusCodes.Status400BadRequest);
|
return Problem(detail: media.Error.Message, statusCode: StatusCodes.Status400BadRequest);
|
||||||
|
|
||||||
|
|
||||||
return Ok(new
|
return Ok(new
|
||||||
{
|
{
|
||||||
media = media.Value,
|
media = media.Value,
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using AobaCore.Services;
|
using AobaCore.Services;
|
||||||
|
|
||||||
using AobaServer.Models;
|
using AobaServer.Models;
|
||||||
|
using AobaServer.Services;
|
||||||
using AobaServer.Utils;
|
using AobaServer.Utils;
|
||||||
|
|
||||||
using Microsoft.AspNetCore.Authorization;
|
using Microsoft.AspNetCore.Authorization;
|
||||||
@@ -16,7 +17,7 @@ namespace AobaServer.Controllers;
|
|||||||
#if DEBUG
|
#if DEBUG
|
||||||
[AllowAnonymous]
|
[AllowAnonymous]
|
||||||
[Route("auth")]
|
[Route("auth")]
|
||||||
public class AuthController(AccountsService accountsService, AuthInfo authInfo) : Controller
|
public class AuthController(AccountsService accountsService, AuthConfigService authConfig) : Controller
|
||||||
{
|
{
|
||||||
[HttpPost("login")]
|
[HttpPost("login")]
|
||||||
public async Task<IActionResult> Login([FromForm] string username, [FromForm] string password, CancellationToken cancellationToken)
|
public async Task<IActionResult> Login([FromForm] string username, [FromForm] string password, CancellationToken cancellationToken)
|
||||||
@@ -25,6 +26,7 @@ public class AuthController(AccountsService accountsService, AuthInfo authInfo)
|
|||||||
|
|
||||||
if (user == null)
|
if (user == null)
|
||||||
return Problem("Invalid login Credentials", statusCode: StatusCodes.Status400BadRequest);
|
return Problem("Invalid login Credentials", statusCode: StatusCodes.Status400BadRequest);
|
||||||
|
var authInfo = await authConfig.GetDefaultAuthInfoAsync();
|
||||||
Response.Cookies.Append("token", user.GetToken(authInfo), new CookieOptions
|
Response.Cookies.Append("token", user.GetToken(authInfo), new CookieOptions
|
||||||
{
|
{
|
||||||
IsEssential = true,
|
IsEssential = true,
|
||||||
|
|||||||
@@ -14,10 +14,11 @@ namespace AobaServer.Controllers;
|
|||||||
public class MediaController(AobaService aobaService, ILogger<MediaController> logger) : Controller
|
public class MediaController(AobaService aobaService, ILogger<MediaController> logger) : Controller
|
||||||
{
|
{
|
||||||
[HttpGet("{id}")]
|
[HttpGet("{id}")]
|
||||||
|
[HttpGet("{id}/*")]
|
||||||
[ResponseCache(Duration = int.MaxValue)]
|
[ResponseCache(Duration = int.MaxValue)]
|
||||||
public async Task<IActionResult> MediaAsync(ObjectId id, [FromServices] MongoClient client, CancellationToken cancellationToken)
|
public async Task<IActionResult> MediaAsync(ObjectId id, [FromServices] MongoClient client, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var file = await aobaService.GetFileStreamAsync(id, cancellationToken: cancellationToken);
|
var file = await aobaService.GetFileStreamAsync(id, seekable: true, cancellationToken: cancellationToken);
|
||||||
if (file.HasError)
|
if (file.HasError)
|
||||||
{
|
{
|
||||||
logger.LogError(file.Error.Exception, "Failed to load media stream");
|
logger.LogError(file.Error.Exception, "Failed to load media stream");
|
||||||
@@ -58,6 +59,7 @@ public class MediaController(AobaService aobaService, ILogger<MediaController> l
|
|||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet("/t/{id}")]
|
[HttpGet("/t/{id}")]
|
||||||
|
[ResponseCache(Duration = int.MaxValue)]
|
||||||
public async Task<IActionResult> ThumbAsync(ObjectId id, [FromServices] ThumbnailService thumbnailService, CancellationToken cancellationToken = default)
|
public async Task<IActionResult> ThumbAsync(ObjectId id, [FromServices] ThumbnailService thumbnailService, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
var thumb = await thumbnailService.GetThumbnailByFileIdAsync(id, cancellationToken);
|
var thumb = await thumbnailService.GetThumbnailByFileIdAsync(id, cancellationToken);
|
||||||
|
|||||||
@@ -24,20 +24,22 @@ RUN apt install -y protobuf-compiler libprotobuf-dev ffmpeg
|
|||||||
RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
|
RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
|
||||||
RUN cargo binstall dioxus-cli --root /.cargo -y --force
|
RUN cargo binstall dioxus-cli --root /.cargo -y --force
|
||||||
ENV PATH="/.cargo/bin:$PATH"
|
ENV PATH="/.cargo/bin:$PATH"
|
||||||
|
ARG VERSION
|
||||||
|
ENV APP_VERSION=$VERSION
|
||||||
# Create the final bundle folder. Bundle always executes in release mode with optimizations enabled
|
# Create the final bundle folder. Bundle always executes in release mode with optimizations enabled
|
||||||
RUN dx bundle --platform web
|
RUN dx bundle --platform web
|
||||||
|
|
||||||
# Server Build
|
# Server Build
|
||||||
# This stage is used when running from VS in fast mode (Default for Debug configuration)
|
# This stage is used when running from VS in fast mode (Default for Debug configuration)
|
||||||
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
|
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
|
||||||
|
RUN apt-get update && apt-get install -y ffmpeg
|
||||||
USER $APP_UID
|
USER $APP_UID
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
EXPOSE 8081
|
EXPOSE 8081
|
||||||
|
|
||||||
# This stage is used to build the service project
|
# This stage is used to build the service project
|
||||||
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
|
FROM mcr.microsoft.com/dotnet/sdk:9.0-noble AS build
|
||||||
ARG BUILD_CONFIGURATION=Release
|
ARG BUILD_CONFIGURATION=Release
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
COPY ["AobaServer/AobaServer.csproj", "AobaServer/"]
|
COPY ["AobaServer/AobaServer.csproj", "AobaServer/"]
|
||||||
@@ -46,7 +48,7 @@ COPY . .
|
|||||||
# Copy Built bundle from client builder
|
# Copy Built bundle from client builder
|
||||||
COPY --from=client-builder /app/AobaClient/target/dx/aoba-client/release/web/public /src/AobaServer/wwwroot
|
COPY --from=client-builder /app/AobaClient/target/dx/aoba-client/release/web/public /src/AobaServer/wwwroot
|
||||||
WORKDIR "/src/AobaServer"
|
WORKDIR "/src/AobaServer"
|
||||||
RUN dotnet build "./AobaServer.csproj" -c $BUILD_CONFIGURATION -o /app/build
|
# RUN dotnet build "./AobaServer.csproj" -c $BUILD_CONFIGURATION #-o /app/build
|
||||||
|
|
||||||
# This stage is used to publish the service project to be copied to the final stage
|
# This stage is used to publish the service project to be copied to the final stage
|
||||||
FROM build AS publish
|
FROM build AS publish
|
||||||
@@ -57,6 +59,7 @@ RUN dotnet publish "./AobaServer.csproj" -c $BUILD_CONFIGURATION -o /app/publish
|
|||||||
FROM base AS final
|
FROM base AS final
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --from=publish /app/publish .
|
COPY --from=publish /app/publish .
|
||||||
COPY --from=client-builder /bin/ffmpeg /bin/ffprobe /bin/ffplay /usr/bin/
|
ARG VERSION
|
||||||
|
|
||||||
|
ENV APP_VERSION=$VERSION
|
||||||
ENTRYPOINT ["dotnet", "AobaServer.dll"]
|
ENTRYPOINT ["dotnet", "AobaServer.dll"]
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
using MongoDB.Bson.IO;
|
using MongoDB.Bson;
|
||||||
|
using MongoDB.Bson.IO;
|
||||||
|
using MongoDB.Bson.Serialization.Attributes;
|
||||||
|
|
||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
@@ -7,6 +9,8 @@ namespace AobaServer.Models;
|
|||||||
|
|
||||||
public class AuthInfo
|
public class AuthInfo
|
||||||
{
|
{
|
||||||
|
[BsonId]
|
||||||
|
public ObjectId Id { get; set; }
|
||||||
public required string Issuer { get; set; }
|
public required string Issuer { get; set; }
|
||||||
public required string Audience { get; set; }
|
public required string Audience { get; set; }
|
||||||
public required byte[] SecureKey { get; set; }
|
public required byte[] SecureKey { get; set; }
|
||||||
|
|||||||
@@ -10,6 +10,9 @@ using Microsoft.AspNetCore.Authentication.JwtBearer;
|
|||||||
using Microsoft.AspNetCore.Http.Features;
|
using Microsoft.AspNetCore.Http.Features;
|
||||||
using Microsoft.IdentityModel.Tokens;
|
using Microsoft.IdentityModel.Tokens;
|
||||||
|
|
||||||
|
using MongoDB.Driver;
|
||||||
|
using MongoDB.Driver.Core.Extensions.DiagnosticSources;
|
||||||
|
|
||||||
var builder = WebApplication.CreateBuilder(args);
|
var builder = WebApplication.CreateBuilder(args);
|
||||||
|
|
||||||
builder.WebHost.ConfigureKestrel(o =>
|
builder.WebHost.ConfigureKestrel(o =>
|
||||||
@@ -33,8 +36,21 @@ builder.Services.AddControllers(opt => opt.ModelBinderProviders.Add(new BsonIdMo
|
|||||||
builder.Services.AddObersability(builder.Configuration);
|
builder.Services.AddObersability(builder.Configuration);
|
||||||
builder.Services.AddGrpc();
|
builder.Services.AddGrpc();
|
||||||
|
|
||||||
var authInfo = AuthInfo.LoadOrCreate("Auth.json", "aobaV2", "aoba");
|
//DB
|
||||||
builder.Services.AddSingleton(authInfo);
|
var dbString = config["DB_STRING"];
|
||||||
|
var settings = MongoClientSettings.FromConnectionString(dbString);
|
||||||
|
settings.ClusterConfigurator = cb => cb.Subscribe(new DiagnosticsActivityEventSubscriber());
|
||||||
|
var dbClient = new MongoClient(settings);
|
||||||
|
var db = dbClient.GetDatabase("Aoba");
|
||||||
|
|
||||||
|
builder.Services.AddSingleton(dbClient);
|
||||||
|
builder.Services.AddSingleton<IMongoDatabase>(db);
|
||||||
|
|
||||||
|
var authCfg = new AuthConfigService(db);
|
||||||
|
builder.Services.AddSingleton(authCfg);
|
||||||
|
|
||||||
|
|
||||||
|
var authInfo = authCfg.GetDefaultAuthInfoAsync().GetAwaiter().GetResult();
|
||||||
var signingKey = new SymmetricSecurityKey(authInfo.SecureKey);
|
var signingKey = new SymmetricSecurityKey(authInfo.SecureKey);
|
||||||
|
|
||||||
var validationParams = new TokenValidationParameters
|
var validationParams = new TokenValidationParameters
|
||||||
@@ -66,6 +82,7 @@ builder.Services.AddCors(o =>
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
var metricsAuthInfo = authCfg.GetAuthInfoAsync("aoba", "metrics").GetAwaiter().GetResult();
|
||||||
builder.Services.AddAuthentication(options =>
|
builder.Services.AddAuthentication(options =>
|
||||||
{
|
{
|
||||||
options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
|
options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
|
||||||
@@ -73,7 +90,7 @@ builder.Services.AddAuthentication(options =>
|
|||||||
}).AddJwtBearer(JwtBearerDefaults.AuthenticationScheme, options => //Bearer auth
|
}).AddJwtBearer(JwtBearerDefaults.AuthenticationScheme, options => //Bearer auth
|
||||||
{
|
{
|
||||||
options.TokenValidationParameters = validationParams;
|
options.TokenValidationParameters = validationParams;
|
||||||
options.TokenHandlers.Add(new MetricsTokenValidator(authInfo));
|
options.TokenHandlers.Add(new MetricsTokenValidator(metricsAuthInfo));
|
||||||
options.Events = new JwtBearerEvents
|
options.Events = new JwtBearerEvents
|
||||||
{
|
{
|
||||||
OnMessageReceived = ctx => //Retreive token from cookie if not found in headers
|
OnMessageReceived = ctx => //Retreive token from cookie if not found in headers
|
||||||
@@ -102,8 +119,8 @@ builder.Services.AddAuthentication(options =>
|
|||||||
};
|
};
|
||||||
}).AddScheme<AuthenticationSchemeOptions, AobaAuthenticationHandler>("Aoba", null);
|
}).AddScheme<AuthenticationSchemeOptions, AobaAuthenticationHandler>("Aoba", null);
|
||||||
|
|
||||||
var dbString = config["DB_STRING"];
|
|
||||||
builder.Services.AddAoba(dbString ?? "mongodb://localhost:27017");
|
builder.Services.AddAoba();
|
||||||
builder.Services.Configure<FormOptions>(opt =>
|
builder.Services.Configure<FormOptions>(opt =>
|
||||||
{
|
{
|
||||||
opt.ValueLengthLimit = int.MaxValue;
|
opt.ValueLengthLimit = int.MaxValue;
|
||||||
@@ -136,6 +153,9 @@ app.MapObserability();
|
|||||||
app.MapGrpcService<AobaRpcService>()
|
app.MapGrpcService<AobaRpcService>()
|
||||||
.RequireAuthorization()
|
.RequireAuthorization()
|
||||||
.RequireCors("RPC");
|
.RequireCors("RPC");
|
||||||
|
app.MapGrpcService<MetricsRpcService>()
|
||||||
|
.RequireAuthorization()
|
||||||
|
.RequireCors("RPC");
|
||||||
app.MapGrpcService<AobaAuthService>()
|
app.MapGrpcService<AobaAuthService>()
|
||||||
.AllowAnonymous()
|
.AllowAnonymous()
|
||||||
.RequireCors("RPC");
|
.RequireCors("RPC");
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import "google/protobuf/empty.proto";
|
|||||||
|
|
||||||
option csharp_namespace = "Aoba.RPC";
|
option csharp_namespace = "Aoba.RPC";
|
||||||
package aoba;
|
package aoba;
|
||||||
|
import "Proto/Types.proto";
|
||||||
|
|
||||||
service AobaRpc {
|
service AobaRpc {
|
||||||
rpc GetMedia (Id) returns (MediaResponse);
|
rpc GetMedia (Id) returns (MediaResponse);
|
||||||
@@ -13,73 +14,3 @@ service AobaRpc {
|
|||||||
rpc GetShareXDestination(google.protobuf.Empty) returns (ShareXResponse);
|
rpc GetShareXDestination(google.protobuf.Empty) returns (ShareXResponse);
|
||||||
}
|
}
|
||||||
|
|
||||||
message PageFilter {
|
|
||||||
optional int32 page = 1;
|
|
||||||
optional int32 pageSize = 2;
|
|
||||||
optional string query = 3;
|
|
||||||
}
|
|
||||||
|
|
||||||
message Id {
|
|
||||||
string value = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message MediaResponse {
|
|
||||||
oneof result {
|
|
||||||
MediaModel value = 1;
|
|
||||||
google.protobuf.Empty empty = 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
message ListResponse {
|
|
||||||
repeated MediaModel items = 1;
|
|
||||||
Pagination pagination = 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
message Pagination {
|
|
||||||
int32 page = 1;
|
|
||||||
int32 pageSize = 2;
|
|
||||||
int64 totalPages = 3;
|
|
||||||
int64 totalItems = 4;
|
|
||||||
optional string query = 5;
|
|
||||||
}
|
|
||||||
|
|
||||||
message UserResponse {
|
|
||||||
oneof userResult {
|
|
||||||
UserModel user = 1;
|
|
||||||
google.protobuf.Empty empty = 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
message UserModel {
|
|
||||||
Id id = 1;
|
|
||||||
string username = 2;
|
|
||||||
string email = 3;
|
|
||||||
bool isAdmin = 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
message MediaModel {
|
|
||||||
Id id = 1;
|
|
||||||
string fileName = 2;
|
|
||||||
MediaType mediaType = 3;
|
|
||||||
string ext = 4;
|
|
||||||
int32 viewCount = 5;
|
|
||||||
Id owner = 6;
|
|
||||||
string thumbUrl = 7;
|
|
||||||
}
|
|
||||||
|
|
||||||
enum MediaType {
|
|
||||||
Image = 0;
|
|
||||||
Audio = 1;
|
|
||||||
Video = 2;
|
|
||||||
Text = 3;
|
|
||||||
Code = 4;
|
|
||||||
Raw = 5;
|
|
||||||
}
|
|
||||||
|
|
||||||
message ShareXResponse {
|
|
||||||
oneof dstResult {
|
|
||||||
string destination = 1;
|
|
||||||
string error = 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,33 +1,12 @@
|
|||||||
syntax = "proto3";
|
syntax = "proto3";
|
||||||
|
|
||||||
option csharp_namespace = "Aoba.RPC.Auth";
|
option csharp_namespace = "Aoba.RPC.Auth";
|
||||||
package aoba.Auth;
|
package aoba;
|
||||||
|
|
||||||
|
import "Proto/Types.proto";
|
||||||
|
|
||||||
service AuthRpc {
|
service AuthRpc {
|
||||||
rpc Login(Credentials) returns (LoginResponse);
|
rpc Login(Credentials) returns (LoginResponse);
|
||||||
rpc LoginPasskey(PassKeyPayload) returns (LoginResponse);
|
rpc LoginPasskey(PassKeyPayload) returns (LoginResponse);
|
||||||
}
|
}
|
||||||
|
|
||||||
message Credentials{
|
|
||||||
string user = 1;
|
|
||||||
string password = 2;
|
|
||||||
}
|
|
||||||
|
|
||||||
message PassKeyPayload {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
message Jwt{
|
|
||||||
string token = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
message LoginResponse{
|
|
||||||
oneof result {
|
|
||||||
Jwt jwt = 1;
|
|
||||||
LoginError error = 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
message LoginError{
|
|
||||||
string message = 1;
|
|
||||||
}
|
|
||||||
12
AobaServer/Proto/Metrics.proto
Normal file
12
AobaServer/Proto/Metrics.proto
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option csharp_namespace = "Aoba.RPC.Metrics";
|
||||||
|
package aoba;
|
||||||
|
|
||||||
|
import "google/protobuf/empty.proto";
|
||||||
|
import "Proto/Types.proto";
|
||||||
|
|
||||||
|
|
||||||
|
service MetricsRpc {
|
||||||
|
rpc GetToken(google.protobuf.Empty) returns (Jwt);
|
||||||
|
}
|
||||||
113
AobaServer/Proto/Types.proto
Normal file
113
AobaServer/Proto/Types.proto
Normal file
@@ -0,0 +1,113 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
option csharp_namespace = "Aoba.RPC";
|
||||||
|
package aoba;
|
||||||
|
import "google/protobuf/empty.proto";
|
||||||
|
|
||||||
|
message Credentials{
|
||||||
|
string user = 1;
|
||||||
|
string password = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message PassKeyPayload {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
message Jwt{
|
||||||
|
string token = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
message LoginResponse{
|
||||||
|
oneof result {
|
||||||
|
Jwt jwt = 1;
|
||||||
|
LoginError error = 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
message LoginError{
|
||||||
|
string message = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
message PageFilter {
|
||||||
|
optional int32 page = 1;
|
||||||
|
optional int32 pageSize = 2;
|
||||||
|
optional string query = 3;
|
||||||
|
}
|
||||||
|
|
||||||
|
message Id {
|
||||||
|
string value = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
message MediaResponse {
|
||||||
|
oneof result {
|
||||||
|
MediaModel value = 1;
|
||||||
|
google.protobuf.Empty empty = 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
message ListResponse {
|
||||||
|
repeated MediaModel items = 1;
|
||||||
|
Pagination pagination = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message Pagination {
|
||||||
|
int32 page = 1;
|
||||||
|
int32 pageSize = 2;
|
||||||
|
int64 totalPages = 3;
|
||||||
|
int64 totalItems = 4;
|
||||||
|
optional string query = 5;
|
||||||
|
}
|
||||||
|
|
||||||
|
message UserResponse {
|
||||||
|
oneof userResult {
|
||||||
|
UserModel user = 1;
|
||||||
|
google.protobuf.Empty empty = 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
message UserModel {
|
||||||
|
Id id = 1;
|
||||||
|
string username = 2;
|
||||||
|
string email = 3;
|
||||||
|
bool isAdmin = 4;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
message MediaModel {
|
||||||
|
Id id = 1;
|
||||||
|
string fileName = 2;
|
||||||
|
MediaType mediaType = 3;
|
||||||
|
string ext = 4;
|
||||||
|
int32 viewCount = 5;
|
||||||
|
Id owner = 6;
|
||||||
|
string thumbUrl = 7;
|
||||||
|
string mediaUrl = 8;
|
||||||
|
}
|
||||||
|
|
||||||
|
enum MediaType {
|
||||||
|
Image = 0;
|
||||||
|
Audio = 1;
|
||||||
|
Video = 2;
|
||||||
|
Text = 3;
|
||||||
|
Code = 4;
|
||||||
|
Raw = 5;
|
||||||
|
}
|
||||||
|
|
||||||
|
message ShareXResponse {
|
||||||
|
oneof dstResult {
|
||||||
|
string destination = 1;
|
||||||
|
string error = 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
message SearchQuery {
|
||||||
|
optional string queryText = 1;
|
||||||
|
repeated Filter filters = 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
message Filter {
|
||||||
|
string key = 1;
|
||||||
|
repeated string values = 2;
|
||||||
|
}
|
||||||
@@ -9,13 +9,12 @@ using AobaServer.Utils;
|
|||||||
using Grpc.Core;
|
using Grpc.Core;
|
||||||
|
|
||||||
using Microsoft.AspNetCore.Authorization;
|
using Microsoft.AspNetCore.Authorization;
|
||||||
using Microsoft.IdentityModel.Tokens;
|
using Aoba.RPC;
|
||||||
|
|
||||||
using System.IdentityModel.Tokens.Jwt;
|
|
||||||
|
|
||||||
namespace AobaServer.Services;
|
namespace AobaServer.Services;
|
||||||
|
|
||||||
public class AobaAuthService(AccountsService accountsService, AuthInfo authInfo) : Aoba.RPC.Auth.AuthRpc.AuthRpcBase
|
public class AobaAuthService(AccountsService accountsService, AuthConfigService authConfig) : AuthRpc.AuthRpcBase
|
||||||
{
|
{
|
||||||
[AllowAnonymous]
|
[AllowAnonymous]
|
||||||
public override async Task<LoginResponse> Login(Credentials request, ServerCallContext context)
|
public override async Task<LoginResponse> Login(Credentials request, ServerCallContext context)
|
||||||
@@ -29,10 +28,11 @@ public class AobaAuthService(AccountsService accountsService, AuthInfo authInfo)
|
|||||||
Message = "Invalid login credentials"
|
Message = "Invalid login credentials"
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
var authInfo = await authConfig.GetDefaultAuthInfoAsync();
|
||||||
var token = user.GetToken(authInfo);
|
var token = user.GetToken(authInfo);
|
||||||
return new LoginResponse
|
return new LoginResponse
|
||||||
{
|
{
|
||||||
Jwt = new Jwt
|
Jwt = new ()
|
||||||
{
|
{
|
||||||
Token = token
|
Token = token
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ using System.Text.Json.Serialization;
|
|||||||
|
|
||||||
namespace AobaServer.Services;
|
namespace AobaServer.Services;
|
||||||
|
|
||||||
public class AobaRpcService(AobaService aobaService, AccountsService accountsService, AuthInfo authInfo) : AobaRpc.AobaRpcBase
|
public class AobaRpcService(AobaService aobaService, AccountsService accountsService, AuthConfigService authConfig) : AobaRpc.AobaRpcBase
|
||||||
{
|
{
|
||||||
public override async Task<MediaResponse> GetMedia(Id request, ServerCallContext context)
|
public override async Task<MediaResponse> GetMedia(Id request, ServerCallContext context)
|
||||||
{
|
{
|
||||||
@@ -37,6 +37,7 @@ public class AobaRpcService(AobaService aobaService, AccountsService accountsSer
|
|||||||
var user = await accountsService.GetUserAsync(userId, context.CancellationToken);
|
var user = await accountsService.GetUserAsync(userId, context.CancellationToken);
|
||||||
if (user == null)
|
if (user == null)
|
||||||
return new ShareXResponse { Error = "User does not exist" };
|
return new ShareXResponse { Error = "User does not exist" };
|
||||||
|
var authInfo = await authConfig.GetDefaultAuthInfoAsync();
|
||||||
var token = user.GetToken(authInfo);
|
var token = user.GetToken(authInfo);
|
||||||
var dest = new ShareXDestination
|
var dest = new ShareXDestination
|
||||||
{
|
{
|
||||||
|
|||||||
26
AobaServer/Services/AuthConfigService.cs
Normal file
26
AobaServer/Services/AuthConfigService.cs
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
using AobaServer.Models;
|
||||||
|
|
||||||
|
using MongoDB.Driver;
|
||||||
|
|
||||||
|
namespace AobaServer.Services;
|
||||||
|
|
||||||
|
public class AuthConfigService(IMongoDatabase db)
|
||||||
|
{
|
||||||
|
public IMongoCollection<AuthInfo> _authInfo = db.GetCollection<AuthInfo>("auth_config");
|
||||||
|
|
||||||
|
public async Task<AuthInfo> GetAuthInfoAsync(string issuer, string audience)
|
||||||
|
{
|
||||||
|
var info = await _authInfo.Find("{}").FirstOrDefaultAsync();
|
||||||
|
if(info != null)
|
||||||
|
return info;
|
||||||
|
|
||||||
|
info = AuthInfo.Create(issuer, audience);
|
||||||
|
await _authInfo.InsertOneAsync(info);
|
||||||
|
return info;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<AuthInfo> GetDefaultAuthInfoAsync()
|
||||||
|
{
|
||||||
|
return GetAuthInfoAsync("aobaV2", "aoba");
|
||||||
|
}
|
||||||
|
}
|
||||||
32
AobaServer/Services/MetricsRpcService.cs
Normal file
32
AobaServer/Services/MetricsRpcService.cs
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
using Aoba.RPC;
|
||||||
|
using Aoba.RPC.Auth;
|
||||||
|
|
||||||
|
using Google.Protobuf.WellKnownTypes;
|
||||||
|
|
||||||
|
using Grpc.Core;
|
||||||
|
|
||||||
|
using Microsoft.AspNetCore.Authorization;
|
||||||
|
using Microsoft.IdentityModel.Tokens;
|
||||||
|
|
||||||
|
using System.IdentityModel.Tokens.Jwt;
|
||||||
|
|
||||||
|
namespace AobaServer.Services;
|
||||||
|
|
||||||
|
public class MetricsRpcService(AuthConfigService authConfig): Aoba.RPC.Metrics.MetricsRpc.MetricsRpcBase
|
||||||
|
{
|
||||||
|
public override async Task<Jwt> GetToken(Empty request, ServerCallContext context)
|
||||||
|
{
|
||||||
|
var authInfo = await authConfig.GetAuthInfoAsync("aoba", "metrics");
|
||||||
|
var handler = new JwtSecurityTokenHandler();
|
||||||
|
|
||||||
|
var jwt = handler.CreateEncodedJwt(new SecurityTokenDescriptor
|
||||||
|
{
|
||||||
|
Audience = authInfo.Audience,
|
||||||
|
Issuer = authInfo.Issuer,
|
||||||
|
IssuedAt = DateTime.UtcNow,
|
||||||
|
SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(authInfo.SecureKey), SecurityAlgorithms.HmacSha256)
|
||||||
|
});
|
||||||
|
|
||||||
|
return new Jwt { Token = jwt };
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -56,6 +56,7 @@ public static class ProtoExtensions
|
|||||||
Owner = media.Owner.ToId(),
|
Owner = media.Owner.ToId(),
|
||||||
ViewCount = media.ViewCount,
|
ViewCount = media.ViewCount,
|
||||||
ThumbUrl = thumbUrl,
|
ThumbUrl = thumbUrl,
|
||||||
|
MediaUrl = media.GetMediaUrl()
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user