mirror of
https://git.ngram.ca/OpenJam/rc-servers
synced 2026-08-23 23:08:52 +00:00
Update dependencies with breaking changes
This commit is contained in:
1026
Cargo.lock
generated
1026
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -43,7 +43,7 @@ async-trait = "0.1"
|
|||||||
futures = "0.3"
|
futures = "0.3"
|
||||||
chrono = "0.4"
|
chrono = "0.4"
|
||||||
git-version = "0.3"
|
git-version = "0.3"
|
||||||
rand = { version = "0.9", features = [ "thread_rng" ] }
|
rand = { version = "0.10", features = [ "thread_rng" ] }
|
||||||
num-quaternion = "1.0"
|
num-quaternion = "1.0"
|
||||||
hex = "0.4"
|
hex = "0.4"
|
||||||
base64 = "0.22"
|
base64 = "0.22"
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ clap.workspace = true
|
|||||||
log.workspace = true
|
log.workspace = true
|
||||||
env_logger.workspace = true
|
env_logger.workspace = true
|
||||||
tokio = { version = "1.43", features = [ "rt-multi-thread" ] }
|
tokio = { version = "1.43", features = [ "rt-multi-thread" ] }
|
||||||
zip = "7"
|
zip = "8"
|
||||||
git-version.workspace = true
|
git-version.workspace = true
|
||||||
|
|
||||||
oj_rc_core = { version = "*", path = "../rc_core" }
|
oj_rc_core = { version = "*", path = "../rc_core" }
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
use num::BigInt;
|
use num::BigInt;
|
||||||
use rand::Rng;
|
use rand::RngExt;
|
||||||
use simple_rijndael::impls::RijndaelCbc;
|
use simple_rijndael::impls::RijndaelCbc;
|
||||||
use simple_rijndael::paddings::Pkcs7Padding;
|
use simple_rijndael::paddings::Pkcs7Padding;
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ readme.workspace = true
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
actix-web.workspace = true
|
actix-web.workspace = true
|
||||||
actix-files.workspace = true
|
actix-files.workspace = true
|
||||||
actix-ws = "0.3"
|
actix-ws = "0.4"
|
||||||
log.workspace = true
|
log.workspace = true
|
||||||
env_logger.workspace = true
|
env_logger.workspace = true
|
||||||
tokio = { version = "1.43", features = [ "rt-multi-thread" ] }
|
tokio = { version = "1.43", features = [ "rt-multi-thread" ] }
|
||||||
|
|||||||
@@ -29,9 +29,9 @@ jsonwebtoken = { version = "10", features = [ "rust_crypto" ] }
|
|||||||
argon2 = { version = "0.5", features = [ "std" ] }
|
argon2 = { version = "0.5", features = [ "std" ] }
|
||||||
|
|
||||||
# intercom
|
# intercom
|
||||||
sha2 = "0.10"
|
sha2 = "0.11"
|
||||||
reqwest = { version = "0.12", default-features = false, features = [ "rustls-tls", "charset" ] }
|
reqwest = { version = "0.13", default-features = false, features = [ "rustls", "charset", "json" ] }
|
||||||
reqwest-websocket = { version = "0.5", default-features = false, features = [ "json" ] }
|
reqwest-websocket = { version = "0.6", default-features = false, features = [ "json" ] }
|
||||||
oj_serdes.workspace = true
|
oj_serdes.workspace = true
|
||||||
|
|
||||||
oj_rc_database = { version = "*", path = "../rc_database" }
|
oj_rc_database = { version = "*", path = "../rc_database" }
|
||||||
|
|||||||
@@ -246,7 +246,7 @@ impl CubeLocationsParser {
|
|||||||
// prioritize finding all target connections first
|
// prioritize finding all target connections first
|
||||||
Some((cube_face_i, face_available_i))
|
Some((cube_face_i, face_available_i))
|
||||||
} else if iteration < deterministic_after_iters || (face_available_i >= connected_to_connections.connections.len() && sorted.len() < connected_to_connections.connections.len()) {
|
} else if iteration < deterministic_after_iters || (face_available_i >= connected_to_connections.connections.len() && sorted.len() < connected_to_connections.connections.len()) {
|
||||||
use rand::Rng;
|
use rand::RngExt;
|
||||||
let random_face = random.random_range(0..calc_conns.len());
|
let random_face = random.random_range(0..calc_conns.len());
|
||||||
if cube_face_i >= random_face {
|
if cube_face_i >= random_face {
|
||||||
Some((cube_face_i, face_available_i))
|
Some((cube_face_i, face_available_i))
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ use serde::{Serialize, Deserialize};
|
|||||||
|
|
||||||
impl super::account_json::UserData {
|
impl super::account_json::UserData {
|
||||||
async fn listen_on_websocket<D: serde::de::DeserializeOwned>(&self, server_name: &str) -> Result<super::IntercomListener<D>, reqwest_websocket::Error> {
|
async fn listen_on_websocket<D: serde::de::DeserializeOwned>(&self, server_name: &str) -> Result<super::IntercomListener<D>, reqwest_websocket::Error> {
|
||||||
use reqwest_websocket::RequestBuilderExt;
|
use reqwest_websocket::Upgrade;
|
||||||
let token = generate_token(format!("{}/{}", server_name, self.account.public_id).as_bytes(), &self.secret);
|
let token = generate_token(format!("{}/{}", server_name, self.account.public_id).as_bytes(), &self.secret);
|
||||||
let auth_header_val = format!("Internal {}", token);
|
let auth_header_val = format!("Internal {}", token);
|
||||||
let url = format!("{}/intercom/{}/{}", self.intercom, server_name, self.account.public_id);
|
let url = format!("{}/intercom/{}/{}", self.intercom, server_name, self.account.public_id);
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
//use serde::{Serialize, Deserialize};
|
use reqwest_websocket::Upgrade;
|
||||||
|
|
||||||
impl super::AccountProvider {
|
impl super::AccountProvider {
|
||||||
async fn listen_on_websocket<D: serde::de::DeserializeOwned>(&self, server_name: &str) -> Result<super::IntercomListener<D>, reqwest_websocket::Error> {
|
async fn listen_on_websocket<D: serde::de::DeserializeOwned>(&self, server_name: &str) -> Result<super::IntercomListener<D>, reqwest_websocket::Error> {
|
||||||
use reqwest_websocket::RequestBuilderExt;
|
//use reqwest_websocket::RequestBuilderExt;
|
||||||
let token = super::generate_intercom_token(format!("state/{}", server_name).as_bytes(), &self.secret);
|
let token = super::generate_intercom_token(format!("state/{}", server_name).as_bytes(), &self.secret);
|
||||||
let auth_header_val = format!("Internal {}", token);
|
let auth_header_val = format!("Internal {}", token);
|
||||||
let url = format!("{}/intercom/userless/{}", self.intercom, server_name);
|
let url = format!("{}/intercom/userless/{}", self.intercom, server_name);
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
use rand::Rng;
|
use rand::RngExt;
|
||||||
use byteserde::ser_heap::ByteSerializeHeap;
|
use byteserde::ser_heap::ByteSerializeHeap;
|
||||||
|
|
||||||
pub struct ExperimentalPlayer {
|
pub struct ExperimentalPlayer {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
use rand::Rng;
|
use rand::RngExt;
|
||||||
|
|
||||||
use crate::matches::CustomGameLogic;
|
use crate::matches::CustomGameLogic;
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ impl ScoreTracker {
|
|||||||
} else if other_teams.len() == 1 {
|
} else if other_teams.len() == 1 {
|
||||||
other_teams[0]
|
other_teams[0]
|
||||||
} else {
|
} else {
|
||||||
use rand::Rng;
|
use rand::RngExt;
|
||||||
let index = rand::rng().random_range(0..other_teams.len());
|
let index = rand::rng().random_range(0..other_teams.len());
|
||||||
other_teams[index]
|
other_teams[index]
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
use polariton_server::operations::{Operation, OperationCode};
|
use polariton_server::operations::{Operation, OperationCode};
|
||||||
use rand::Rng;
|
use rand::RngExt;
|
||||||
use oj_rc_core::ConfigProvider;
|
use oj_rc_core::ConfigProvider;
|
||||||
|
|
||||||
const MAX_DELTA: u64 = 60 * 60 * 24; // 1 day
|
const MAX_DELTA: u64 = 60 * 60 * 24; // 1 day
|
||||||
|
|||||||
@@ -11,9 +11,9 @@ readme.workspace = true
|
|||||||
actix-web = { workspace = true, features = [ "secure-cookies" ] }
|
actix-web = { workspace = true, features = [ "secure-cookies" ] }
|
||||||
actix-session = { version = "0.11", features = [ "cookie-session" ], default-features = false }
|
actix-session = { version = "0.11", features = [ "cookie-session" ], default-features = false }
|
||||||
actix-identity = "0.9"
|
actix-identity = "0.9"
|
||||||
cookie = "0.16"
|
cookie = "0.18"
|
||||||
actix-files.workspace = true
|
actix-files.workspace = true
|
||||||
actix-ws = "0.3"
|
#actix-ws = "0.3"
|
||||||
log.workspace = true
|
log.workspace = true
|
||||||
env_logger.workspace = true
|
env_logger.workspace = true
|
||||||
tokio = { version = "1.43", features = [ "rt-multi-thread" ] }
|
tokio = { version = "1.43", features = [ "rt-multi-thread" ] }
|
||||||
|
|||||||
Reference in New Issue
Block a user