update #26

ptechen · 2023-08-27T06:24:31Z

No description provided.

CLAassistant · 2023-08-27T06:24:36Z

All committers have signed the CLA.

lugehorsam · 2023-08-27T20:09:04Z

Hey @ptechen thank you for your contribution. Could you give a few bullet points that outline your changes before we review?

ptechen · 2023-09-01T09:57:16Z

Compatible with new versions of Rust and related dependencies.

lugehorsam · 2023-09-01T13:16:09Z

src/web_socket_adapter.rs

-        socket_adapter.tick();
-    }
-}
+// #[cfg(test)]


Why was this code commented out?

lugehorsam · 2023-09-01T13:17:06Z

examples/async_single_threaded.rs

@@ -74,8 +74,12 @@ fn main() {
                            .await;
                        let session = session.unwrap();
                        let session2 = session2.unwrap();
-                        web_socket.connect(&session, true, -1).await;
-                        web_socket2.connect(&session2, true, -1).await;
+                        web_socket


Why does this accept a host/port string now? There shouldn't be cases where the socket connects to a host/port that is different from the client.

lugehorsam · 2023-09-01T13:19:03Z

Cargo.toml

 urlencoding = "2.0.0-alpha.1"
-async-trait = "0.1.50"
-oneshot = "0.1.2"


why was this dependency removed?

lugehorsam · 2023-09-01T13:19:25Z

Cargo.toml

+async-trait = "0.1.71"
+log = "0.4.19"
+isahc = "1.7.2"
+ws = { version = "0.9.2" }


why was this introduced instead of qws?

lugehorsam · 2023-09-01T13:19:52Z

Cargo.toml

+isahc = "1.7.2"
+ws = { version = "0.9.2" }
+chrono = { version = "0.4.26", features = ["serde"] }
+tokio = { version = "1", features = ["full"] }


why was this introduced?

lugehorsam · 2023-09-01T13:20:00Z

Cargo.toml

+ws = { version = "0.9.2" }
+chrono = { version = "0.4.26", features = ["serde"] }
+tokio = { version = "1", features = ["full"] }
+serde = { version = "1", features = ["derive", "rc"] }


why was this introduced?

lugehorsam · 2023-09-01T13:20:14Z

Cargo.toml

+chrono = { version = "0.4.26", features = ["serde"] }
+tokio = { version = "1", features = ["full"] }
+serde = { version = "1", features = ["derive", "rc"] }
+parking_lot = { version = "0.12.1", features = ["serde", "arc_lock"] }


why was this introduced?

lugehorsam · 2023-09-01T13:20:17Z

Cargo.toml

 futures = "0.3.15"
+hyper = "=0.13.10"


why was this introduced?

lugehorsam · 2023-09-01T13:20:20Z

Cargo.toml

 futures = "0.3.15"
+hyper = "=0.13.10"
+serde_json = "1.0.100"


why was this introduced?

lugehorsam · 2023-09-01T13:23:44Z

examples/join_party.rs

+    Ok(())
+}
+
+// "ws://127.0.0.1:7350/ws?lang=en&status=true&token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJmOTE5MGFlYy03NGI2LTQ0MDktOTBkYy1hNDBiNGRhZGQzMmYiLCJ1c24iOiJVYm1qd2tMWGpEIiwiZXhwIjoxNjg4OTc4MzQxfQ.-zNwQvuIcu8KphjckTmWg6d5aPMVcXsQV5KHMODYAH0"


Could you remove the commented out code here?

lugehorsam · 2023-09-01T13:24:11Z

examples/matchmaker.rs

+    Ok(())
+}
+
+// "ws://127.0.0.1:7350/ws?lang=en&status=true&token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJmOTE5MGFlYy03NGI2LTQ0MDktOTBkYy1hNDBiNGRhZGQzMmYiLCJ1c24iOiJVYm1qd2tMWGpEIiwiZXhwIjoxNjg4OTc4MzQxfQ.-zNwQvuIcu8KphjckTmWg6d5aPMVcXsQV5KHMODYAH0"


Could you remove the commented out code here?

lugehorsam · 2023-09-01T13:25:04Z

examples/party.rs

+    });
+    let data = r.recv().unwrap();
+    println!("{:#?}", data);
+    // kill_tick.send(1).await;


could you remove this commented out code?

lugehorsam · 2023-09-01T13:26:19Z

img.png

Could you remove this image?

lugehorsam · 2023-09-01T13:27:19Z

src/api_gen.rs

-    GOOGLE_PLAY_STORE = 1,
-    ///  - HUAWEI_APP_GALLERY: Huawei App Gallery
-    HUAWEI_APP_GALLERY = 2,
+    /// - AppleAppStore: Apple App Store


do you know why the casing changed here? It should be preserved

lugehorsam · 2023-09-01T13:27:51Z

src/api_gen.rs

-  pub body: String,
-  pub method: Method,
-  _marker: std::marker::PhantomData<Response>
+    pub authentication: Authentication,


Could you add an .editorconfig or whatever is the idiomatic way to format code in Rust and have it with the old formatting settings so this file is easier to review?

lugehorsam · 2023-09-01T13:30:50Z

src/client.rs

@@ -17,10 +17,11 @@ use crate::api::{
    ApiGroupUserList, ApiLeaderboardRecord, ApiLeaderboardRecordList, ApiMatchList,
    ApiNotificationList, ApiOverrideOperator, ApiReadStorageObjectId, ApiRpc, ApiStorageObjectAcks,
    ApiStorageObjectList, ApiStorageObjects, ApiTournamentList, ApiTournamentRecordList,
-    ApiUserGroupList, ApiUsers, ApiValidatePurchaseResponse, ApiWriteStorageObject,
+    ApiUserGroupList, ApiUsers, ApiValidatePurchaseResponse, ApiWriteStorageObject, Leaderboard,


Why isn't this ApiLeaderboard?

lugehorsam · 2023-09-01T13:36:01Z

src/session.rs

@@ -87,25 +91,27 @@ impl Session {
                    Some(refresh_token.to_owned())
                },
                refresh_expire_time,
-                expire_time: Utc.timestamp(auth_token_data.expire_time as i64, 0),
+                expire_time: Utc
+                    .timestamp_opt(auth_token_data.expire_time as i64, 0)


why was this change made

lugehorsam · 2023-09-01T13:36:08Z

src/session.rs

                username: auth_token_data.username,
                uid: auth_token_data.uid,
-                vars: Arc::new(auth_token_data.vars),
+                vars: auth_token_data.vars,


why was this change made

lugehorsam · 2023-09-01T13:37:46Z

src/socket.rs

 use nanoserde::{DeJson, DeJsonErr, DeJsonState, SerJson};
+use serde::{Deserialize, Serialize};


why have both serde and nanoserde

lugehorsam · 2023-09-01T13:39:18Z

src/web_socket.rs

-use oneshot::RecvError;
+use base64::engine::general_purpose;
+use base64::Engine;
+use parking_lot::Mutex;


Why was this changed

lugehorsam · 2023-09-01T13:40:32Z

src/web_socket.rs

    match result {
        Ok(event) => {
            if let Some(ref cid) = event.cid {
                trace!("handle_message: Received message with cid");
                let cid = cid.parse::<i64>().unwrap();
                if let Some(response_event) = shared_state.responses.remove(&cid) {
                    let result = response_event.send(Ok(event));
-                    if let Err(err) = result {
+                    if let Err(Err(err)) = result {


did you intend multiple calls to Err here?

lugehorsam · 2023-09-01T13:41:38Z

src/web_socket.rs

            adapter.on_closed({
                let shared_state = web_socket.shared_state.clone();
                move || {
-                    if let Some(ref cb) = shared_state.lock().unwrap().on_closed {
+                    if let Some(ref cb) = shared_state.lock().on_closed {


I'm going to stop the review here for now until there is more explanation of your overall PR, we appreciate your contribution but need much more detail other than "Compatible with new versions of Rust and related dependencies."

lugehorsam · 2023-09-01T13:44:48Z

I'd suggest breaking this PR up into chunks per dependency. If the dependency upgrade doesn't cause other code changes you can batch those together.

ptechen added 3 commits July 24, 2023 11:45

update

b6e8717

add:create_leaderboard_id

cd73bbd

update

60f313a