finish up mirgation, build and check now successful save for clippy checks
Some checks failed
Build and Test / super-mario-maker (push) Failing after 3m52s
Build and Test / wii-sports-club (push) Successful in 5m22s
Build and Test / splatoon (push) Successful in 6m15s
Build and Test / sonic-transformed (push) Successful in 6m16s
Build and Test / splatoon-testfire (push) Successful in 6m36s
Build and Test / friends (push) Successful in 6m45s
Build and Test / wii-u-chat (push) Successful in 6m47s
Build and Test / fast-racing-neo (push) Successful in 11m25s
Build and Test / mario-tennis (push) Successful in 11m50s
Build and Test / puyopuyo (push) Successful in 12m41s
Build and Test / minecraft-wiiu (push) Successful in 12m55s
Some checks failed
Build and Test / super-mario-maker (push) Failing after 3m52s
Build and Test / wii-sports-club (push) Successful in 5m22s
Build and Test / splatoon (push) Successful in 6m15s
Build and Test / sonic-transformed (push) Successful in 6m16s
Build and Test / splatoon-testfire (push) Successful in 6m36s
Build and Test / friends (push) Successful in 6m45s
Build and Test / wii-u-chat (push) Successful in 6m47s
Build and Test / fast-racing-neo (push) Successful in 11m25s
Build and Test / mario-tennis (push) Successful in 11m50s
Build and Test / puyopuyo (push) Successful in 12m41s
Build and Test / minecraft-wiiu (push) Successful in 12m55s
This commit is contained in:
parent
aa25422d95
commit
e3e9edf5ba
36 changed files with 359 additions and 73 deletions
|
|
@ -35,5 +35,6 @@ splatoon = ["v3-5-0"]
|
|||
datastore = ["database-support", "v3-8-15"]
|
||||
database-support = []
|
||||
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
use std::{
|
||||
hash::{DefaultHasher, Hasher},
|
||||
net::SocketAddrV4,
|
||||
sync::{Arc, LazyLock},
|
||||
sync::{LazyLock},
|
||||
};
|
||||
|
||||
use cfg_if::cfg_if;
|
||||
use nex_account::{
|
||||
grpc::{self, nex_account_service_client},
|
||||
grpc,
|
||||
grpc_client,
|
||||
};
|
||||
use rnex_auth_protos::{
|
||||
|
|
@ -14,11 +14,9 @@ use rnex_auth_protos::{
|
|||
auth::{Auth, ConnectionData, ConnectionDataOld},
|
||||
};
|
||||
use rnex_prudp::kerberos::{Ticket, TicketInternalData};
|
||||
use rnex_reggie_protos::reggie::{RemoteEdgeNodeHolder, RemoteEdgeNodeManagement};
|
||||
use rnex_reggie_protos::reggie::{RemoteEdgeNodeManagement};
|
||||
use rnex_rmc::{
|
||||
OnlyRemote,
|
||||
any::Any,
|
||||
define_rmc_proto,
|
||||
qresult::QResult,
|
||||
rand,
|
||||
response::ErrorCode,
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#[allow(async_fn_in_trait)]
|
||||
pub mod auth_handler;
|
||||
|
||||
use std::{convert::Infallible, env, error::Error, net::SocketAddr, sync::Arc};
|
||||
use std::{env, net::SocketAddr, sync::Arc};
|
||||
use tokio::net::TcpStream;
|
||||
|
||||
use nex_account::{grpc::Pid, grpc_client};
|
||||
|
|
|
|||
|
|
@ -13,5 +13,22 @@ rand = "0.10.2"
|
|||
tracing = "0.1.44"
|
||||
cfg-if = "1.0.4"
|
||||
|
||||
[features]
|
||||
splatoon = ["v3-5-0"]
|
||||
datastore = ["database-support", "v3-8-15"]
|
||||
database-support = []
|
||||
nx = []
|
||||
third-notif-param = []
|
||||
v3-3-2 = []
|
||||
v3-4-0 = ["v3-3-2", "third-notif-param"]
|
||||
v3-5-0 = ["v3-4-0"]
|
||||
v3-8-15 = ["v3-5-0"]
|
||||
v3-10-22 = ["v3-8-15"]
|
||||
v4-3-11 = ["v3-8-15"]
|
||||
friends = []
|
||||
rmc_struct_header = []
|
||||
big_pid = []
|
||||
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
|
|
|||
|
|
@ -2,16 +2,13 @@ use std::net::SocketAddr;
|
|||
|
||||
use rnex_base_protos::{LocalBaseProtocol, secure::Secure, util::Utility};
|
||||
use rnex_rmc::{any::Any, qresult::QResult, response::ErrorCode, rmc_struct};
|
||||
use rnex_server::PassthroughInitModule;
|
||||
use rnex_util::{
|
||||
PID,
|
||||
station_url::{StationUrl, UrlOptions, nat_types::PUBLIC},
|
||||
};
|
||||
use tokio::sync::{Mutex, RwLock};
|
||||
use tokio::sync::RwLock;
|
||||
use tracing::info;
|
||||
|
||||
use crate::BaseManager;
|
||||
|
||||
pub async fn get_station_urls(
|
||||
station_urls: &[StationUrl],
|
||||
addr: SocketAddr,
|
||||
|
|
|
|||
|
|
@ -23,7 +23,21 @@ urlencoding = "2.1.3"
|
|||
futures = "0.3.32"
|
||||
|
||||
[features]
|
||||
datastore = []
|
||||
splatoon = ["v3-5-0"]
|
||||
datastore = ["database-support", "v3-8-15"]
|
||||
database-support = []
|
||||
nx = []
|
||||
third-notif-param = []
|
||||
v3-3-2 = []
|
||||
v3-4-0 = ["v3-3-2", "third-notif-param"]
|
||||
v3-5-0 = ["v3-4-0"]
|
||||
v3-8-15 = ["v3-5-0"]
|
||||
v3-10-22 = ["v3-8-15"]
|
||||
v4-3-11 = ["v3-8-15"]
|
||||
friends = []
|
||||
rmc_struct_header = []
|
||||
big_pid = []
|
||||
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
|
|
|||
|
|
@ -22,7 +22,21 @@ hex = "0.4.3"
|
|||
thiserror = "2.0.18"
|
||||
|
||||
[features]
|
||||
friends = []
|
||||
rmc_struct_header = []
|
||||
guest_login = []
|
||||
friends = ["guest_login", "database-support"]
|
||||
big_pid = []
|
||||
third-notif-param = []
|
||||
v3-3-2 = []
|
||||
v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
|
||||
v3-5-0 = ["v3-4-0"]
|
||||
v3-8-15 = ["v3-5-0"]
|
||||
v3-10-22 = ["v3-8-15"]
|
||||
v4-3-11 = ["v3-8-15"]
|
||||
nx = ["big_pid"]
|
||||
splatoon = ["v3-5-0"]
|
||||
datastore = ["database-support", "v3-8-15"]
|
||||
database-support = []
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
|
|
|||
|
|
@ -34,5 +34,6 @@ nx = ["big_pid"]
|
|||
splatoon = ["v3-5-0"]
|
||||
datastore = ["database-support", "v3-8-15"]
|
||||
database-support = []
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
use std::{env, sync::Arc};
|
||||
use std::sync::Arc;
|
||||
|
||||
use rnex_base::user::BaseUser;
|
||||
use rnex_base_protos::ResultsRange;
|
||||
|
|
@ -24,7 +24,7 @@ use rnex_util::{
|
|||
station_url::{StationUrl, UrlOptions},
|
||||
};
|
||||
use tokio::sync::Mutex;
|
||||
use tracing::{error, info};
|
||||
use tracing::info;
|
||||
|
||||
use crate::matchmake::{ExtendedMatchmakeSession, MatchmakeManager};
|
||||
|
||||
|
|
@ -666,8 +666,8 @@ impl NatTraversal for MatchmakeUser {
|
|||
|
||||
async fn report_nat_traversal_result(
|
||||
&self,
|
||||
cid: u32,
|
||||
result: bool,
|
||||
_cid: u32,
|
||||
_result: bool,
|
||||
_rtt: u32,
|
||||
) -> Result<(), ErrorCode> {
|
||||
Ok(())
|
||||
|
|
|
|||
|
|
@ -3,10 +3,28 @@ name = "rnex-msg"
|
|||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
[features]
|
||||
rmc_struct_header = []
|
||||
guest_login = []
|
||||
friends = ["guest_login", "database-support"]
|
||||
big_pid = []
|
||||
third-notif-param = []
|
||||
v3-3-2 = []
|
||||
v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
|
||||
v3-5-0 = ["v3-4-0"]
|
||||
v3-8-15 = ["v3-5-0"]
|
||||
v3-10-22 = ["v3-8-15"]
|
||||
v4-3-11 = ["v3-8-15"]
|
||||
nx = ["big_pid"]
|
||||
splatoon = ["v3-5-0"]
|
||||
datastore = ["database-support", "v3-8-15"]
|
||||
database-support = []
|
||||
|
||||
[dependencies]
|
||||
rnex-rmc = { path = "../../rnex-rmc" }
|
||||
rnex-msg-protos = { path = "../../rnex-protocols/msg-protos" }
|
||||
rnex-server = { path = "../../rnex-server" }
|
||||
tokio = { version = "1.52.3", features = ["sync"] }
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ impl RnexManager for MessagingManager {
|
|||
|
||||
async fn init_new_user(
|
||||
this: rnex_server::PassthroughInitModule<Self>,
|
||||
mod_holder: &rnex_server::ModuleHolder,
|
||||
_mod_holder: &rnex_server::ModuleHolder,
|
||||
remote: &rnex_rmc::RmcConnection,
|
||||
init_data: &Self::InitData,
|
||||
weak_user: rnex_server::WeakPassthroughInitModule<Self::User>,
|
||||
|
|
|
|||
|
|
@ -3,10 +3,28 @@ name = "rnex-node-holder"
|
|||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
[features]
|
||||
rmc_struct_header = []
|
||||
guest_login = []
|
||||
friends = ["guest_login", "database-support"]
|
||||
big_pid = []
|
||||
third-notif-param = []
|
||||
v3-3-2 = []
|
||||
v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
|
||||
v3-5-0 = ["v3-4-0"]
|
||||
v3-8-15 = ["v3-5-0"]
|
||||
v3-10-22 = ["v3-8-15"]
|
||||
v4-3-11 = ["v3-8-15"]
|
||||
nx = ["big_pid"]
|
||||
splatoon = ["v3-5-0"]
|
||||
datastore = ["database-support", "v3-8-15"]
|
||||
database-support = []
|
||||
|
||||
[dependencies]
|
||||
rnex-rmc = { path = "../../rnex-rmc" }
|
||||
rnex-reggie-protos = { path = "../../rnex-protocols/reggie-protos" }
|
||||
rnex-server = { path = "../../rnex-server" }
|
||||
tokio = { version = "1.52.3", features = ["sync"] }
|
||||
|
||||
[lints]
|
||||
workspace = true
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
use std::{
|
||||
convert::Infallible,
|
||||
net::{Ipv4Addr, SocketAddr, SocketAddrV4},
|
||||
net::{Ipv4Addr, SocketAddrV4},
|
||||
sync::{Arc, Weak},
|
||||
};
|
||||
|
||||
use rnex_reggie_protos::reggie::{
|
||||
EdgeNodeHolderConnectOption, EdgeNodeManagement, LocalEdgeNodeHolder, RemoteEdgeNodeHolder,
|
||||
EdgeNodeHolderConnectOption, EdgeNodeManagement, LocalEdgeNodeHolder,
|
||||
};
|
||||
use rnex_rmc::{response::ErrorCode, rmc_struct, tracing::info};
|
||||
use rnex_rmc::{response::ErrorCode, rmc_struct};
|
||||
use rnex_server::{
|
||||
ConnectionInitData, PassthroughInitModule, RnexManager, RnexModule, WeakPassthroughInitModule,
|
||||
PassthroughInitModule, RnexManager, RnexModule, WeakPassthroughInitModule,
|
||||
};
|
||||
use tokio::sync::RwLock;
|
||||
|
||||
|
|
@ -49,8 +49,8 @@ impl RnexManager for NodeHolderManager {
|
|||
type InitData = EdgeNodeHolderConnectOption;
|
||||
async fn init_new_user(
|
||||
this: PassthroughInitModule<Self>,
|
||||
mod_holder: &rnex_server::ModuleHolder,
|
||||
remote: &rnex_rmc::RmcConnection,
|
||||
_mod_holder: &rnex_server::ModuleHolder,
|
||||
_remote: &rnex_rmc::RmcConnection,
|
||||
init_data: &Self::InitData,
|
||||
_: WeakPassthroughInitModule<Self::User>,
|
||||
) -> Self::User {
|
||||
|
|
|
|||
|
|
@ -3,6 +3,23 @@ name = "rnex-rk"
|
|||
version = "0.1.0"
|
||||
edition = "2024"
|
||||
|
||||
[features]
|
||||
rmc_struct_header = []
|
||||
guest_login = []
|
||||
friends = ["guest_login", "database-support"]
|
||||
big_pid = []
|
||||
third-notif-param = []
|
||||
v3-3-2 = []
|
||||
v3-4-0 = ["v3-3-2", "third-notif-param", "rmc_struct_header"]
|
||||
v3-5-0 = ["v3-4-0"]
|
||||
v3-8-15 = ["v3-5-0"]
|
||||
v3-10-22 = ["v3-8-15"]
|
||||
v4-3-11 = ["v3-8-15"]
|
||||
nx = ["big_pid"]
|
||||
splatoon = ["v3-5-0"]
|
||||
datastore = ["database-support", "v3-8-15"]
|
||||
database-support = []
|
||||
|
||||
[dependencies]
|
||||
rnex-rmc = { path = "../../rnex-rmc" }
|
||||
rnex-util = { path = "../../rnex-util" }
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ use crate::user::RankingUser;
|
|||
|
||||
pub mod user;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct RankingManager {
|
||||
rnex_result_get: String,
|
||||
rnex_result_votes_get: String,
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ use rnex_rmc::{qbuffer::QBuffer, response::ErrorCode, rmc_struct};
|
|||
use rnex_server::PassthroughInitModule;
|
||||
use rnex_util::{PID, date_time::DateTime};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::{env, str::FromStr};
|
||||
use tracing::{error, info};
|
||||
|
||||
use crate::RankingManager;
|
||||
|
||||
#[derive(Debug)]
|
||||
#[rmc_struct(RankingProtocol)]
|
||||
pub struct RankingUser {
|
||||
pub rm: PassthroughInitModule<RankingManager>,
|
||||
|
|
|
|||
Loading…
Reference in a new issue