bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Update dependencies with breaking changes

Browse Source
This commit is contained in:
NG (Graham)
2026-05-04 21:53:29 -04:00
parent 10fb01de58
commit a222745841
14 changed files with 822 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rc_core/Cargo.toml
View File

@@ -29,9 +29,9 @@ jsonwebtoken = { version = "10", features = [ "rust_crypto" ] }
argon2 = { version = "0.5", features = [ "std" ] }
# intercom
sha2 = "0.10"
reqwest = { version = "0.12", default-features = false, features = [ "rustls-tls", "charset" ] }
reqwest-websocket = { version = "0.5", default-features = false, features = [ "json" ] }
sha2 = "0.11"
reqwest = { version = "0.13", default-features = false, features = [ "rustls", "charset", "json" ] }
reqwest-websocket = { version = "0.6", default-features = false, features = [ "json" ] }
oj_serdes.workspace = true
oj_rc_database = { version = "*", path = "../rc_database" }

2
rc_core/src/cubes/locations_of.rs
View File

@@ -246,7 +246,7 @@ impl CubeLocationsParser {
// prioritize finding all target connections first
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()) {
use rand::Rng;
use rand::RngExt;
let random_face = random.random_range(0..calc_conns.len());
if cube_face_i >= random_face {
Some((cube_face_i, face_available_i))

2
rc_core/src/persist/user/intercom.rs
View File

@@ -2,7 +2,7 @@ use serde::{Serialize, Deserialize};
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> {
use reqwest_websocket::RequestBuilderExt;
use reqwest_websocket::Upgrade;
let token = generate_token(format!("{}/{}", server_name, self.account.public_id).as_bytes(), &self.secret);
let auth_header_val = format!("Internal {}", token);
let url = format!("{}/intercom/{}/{}", self.intercom, server_name, self.account.public_id);

4
rc_core/src/persist/user/userless.rs
View File

@@ -1,8 +1,8 @@
//use serde::{Serialize, Deserialize};
use reqwest_websocket::Upgrade;
impl super::AccountProvider {
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 auth_header_val = format!("Internal {}", token);
let url = format!("{}/intercom/userless/{}", self.intercom, server_name);