refactor proto files + added metrics token

AobaClient/build.rs

@@ -8,8 +8,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 		.build_server(false)
 		.build_client(true)
 		.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(())

AobaClient/src/components/metrics_token.rs

@@ -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}"
+		}
+	};
+}

AobaClient/src/components/mod.rs

@@ -1,11 +1,13 @@
 pub mod basic;
 mod media_grid;
 mod media_item;
+mod metrics_token;
 mod navbar;
 mod notif;
 mod search;
 pub use media_grid::*;
 pub use media_item::*;
+pub use metrics_token::*;
 pub use navbar::*;
 pub use notif::*;
 pub use search::*;

AobaClient/src/components/navbar.rs

@@ -1,5 +1,3 @@
-use std::env;
-
 use dioxus::prelude::*;
 
 use crate::{Route, contexts::AuthContext, env::APP_VERSION};

AobaClient/src/rpc.rs

@@ -1,19 +1,22 @@
 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_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 {
 	tonic::include_proto!("aoba");
-	tonic::include_proto!("aoba.auth");
 }
 
 static RPC_CLIENT: RpcConnection = RpcConnection {
 	aoba: RwLock::new(None),
 	auth: RwLock::new(None),
+	metrics: RwLock::new(None),
 	jwt: RwLock::new(None),
 };
 
@@ -21,6 +24,7 @@ static RPC_CLIENT: RpcConnection = RpcConnection {
 pub struct RpcConnection {
 	aoba: RwLock<Option<AobaRpcClient<InterceptedService<Client, AuthInterceptor>>>>,
 	auth: RwLock<Option<AuthRpcClient<Client>>>,
+	metrics: RwLock<Option<MetricsRpcClient<InterceptedService<Client, AuthInterceptor>>>>,
 	jwt: RwLock<Option<String>>,
 }
 
@@ -35,12 +39,19 @@ impl RpcConnection {
 		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) {
 		if self.aoba.read().unwrap().is_none() {
 			let wasm_client = Client::new(RPC_HOST.into());
 			let aoba_client = AobaRpcClient::with_interceptor(wasm_client.clone(), AuthInterceptor);
 			*self.aoba.write().unwrap() = Some(aoba_client);
 			*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();
 }
 
+pub fn get_metrics_rpc_client() -> MetricsRpcClient<InterceptedService<Client, AuthInterceptor>> {
+	return RPC_CLIENT.get_metrics_client();
+}
 pub fn login(jwt: String) {
 	*RPC_CLIENT.jwt.write().unwrap() = Some(jwt);
 }

AobaClient/src/views/settings.rs

@@ -1,6 +1,6 @@
 use dioxus::prelude::*;
 
-use crate::rpc::get_rpc_client;
+use crate::{components::MetricsToken, rpc::get_rpc_client};
 
 #[component]
 pub fn Settings() -> Element {
@@ -27,5 +27,6 @@ pub fn Settings() -> Element {
 		div {
 			pre { class: "codeSelect", "{d}" }
 		}
+		MetricsToken {  }
 	}
 }

AobaServer/AobaServer.csproj

@@ -35,6 +35,7 @@
 	  <Protobuf Include="Proto\Aoba.proto"></Protobuf>
 	  <Protobuf Include="Proto\Auth.proto"></Protobuf>
 	  <Protobuf Include="Proto\Metrics.proto"></Protobuf>
+	  <Protobuf Include="Proto\Types.proto"></Protobuf>
   </ItemGroup>
 
 </Project>

AobaServer/Program.cs

@@ -153,6 +153,9 @@ app.MapObserability();
 app.MapGrpcService<AobaRpcService>()
 	.RequireAuthorization()
 	.RequireCors("RPC");
+app.MapGrpcService<MetricsRpcService>()
+	.RequireAuthorization()
+	.RequireCors("RPC");
 app.MapGrpcService<AobaAuthService>()
 	.AllowAnonymous()
 	.RequireCors("RPC");

AobaServer/Proto/Aoba.proto

@@ -3,6 +3,7 @@ import "google/protobuf/empty.proto";
 
 option csharp_namespace = "Aoba.RPC";
 package aoba;
+import "Proto/Types.proto";
 
 service AobaRpc {
   rpc GetMedia (Id) returns (MediaResponse);
@@ -13,73 +14,3 @@ service AobaRpc {
   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;
-	}
-}

AobaServer/Proto/Auth.proto

@@ -1,33 +1,12 @@
 syntax = "proto3";
 
 option csharp_namespace = "Aoba.RPC.Auth";
-package aoba.Auth;
+package aoba;
+
+import "Proto/Types.proto";
 
 service AuthRpc {
 	rpc Login(Credentials) 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;
-}

AobaServer/Proto/Metrics.proto

@@ -1,12 +1,12 @@
 syntax = "proto3";
 
 option csharp_namespace = "Aoba.RPC.Metrics";
-package aoba.Metrics;
+package aoba;
 
-import "Proto/Auth.proto";
 import "google/protobuf/empty.proto";
+import "Proto/Types.proto";
 
 
-service Metrics {
+service MetricsRpc {
-	rpc GetToken(google.protobuf.Empty) returns (Auth.Jwt);
+	rpc GetToken(google.protobuf.Empty) returns (Jwt);
 }

AobaServer/Proto/Types.proto

@@ -0,0 +1,101 @@
+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;
+}
+
+enum MediaType {
+	Image = 0;
+	Audio = 1;
+	Video = 2;
+	Text = 3;
+	Code = 4;
+	Raw = 5;
+}
+
+message ShareXResponse {
+	oneof dstResult {
+		string destination = 1;
+		string error = 2;
+	}
+}

AobaServer/Services/AobaAuthService.cs

@@ -9,15 +9,13 @@ using AobaServer.Utils;
 using Grpc.Core;
 
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.IdentityModel.Tokens;
+using Aoba.RPC;
 
-using System.IdentityModel.Tokens.Jwt;
 
 namespace AobaServer.Services;
 
-public class AobaAuthService(AccountsService accountsService, AuthInfo authInfo) : Aoba.RPC.Auth.AuthRpc.AuthRpcBase
+public class AobaAuthService(AccountsService accountsService, AuthInfo authInfo) : AuthRpc.AuthRpcBase
 {
-	[AllowAnonymous]
 	public override async Task<LoginResponse> Login(Credentials request, ServerCallContext context)
 	{
 		var user = await accountsService.VerifyLoginAsync(request.User, request.Password, context.CancellationToken);
@@ -32,7 +30,7 @@ public class AobaAuthService(AccountsService accountsService, AuthInfo authInfo)
 		var token = user.GetToken(authInfo);
 		return new LoginResponse
 		{
-			Jwt = new Jwt
+			Jwt = new ()
 			{
 				Token = token
 			}

AobaServer/Services/MetricsRpcService.cs

@@ -12,7 +12,7 @@ using System.IdentityModel.Tokens.Jwt;
 
 namespace AobaServer.Services;
 
-public class MetricsRpcService(AuthConfigService authConfig): Aoba.RPC.Metrics.Metrics.MetricsBase
+public class MetricsRpcService(AuthConfigService authConfig): Aoba.RPC.Metrics.MetricsRpc.MetricsRpcBase
 {
 	[AllowAnonymous]
 	public override async Task<Jwt> GetToken(Empty request, ServerCallContext context)