feat:add monitor

Author: limuy2022

gdrust/proto/proto/connect.proto

@@ -16,3 +16,5 @@ message Response {
   Status status = 1;
   string message = 2;
 }
+
+message CreateObj { string path = 1; }

gdrust/proto/src/lib.rs

@@ -1,3 +1,9 @@
 pub mod proto;
 
 pub use proto::connect;
+use proto::connect::{CreateObj, Join};
+
+pub enum ProtoRequest {
+    Join(Join),
+    CreateObj(CreateObj),
+}

gdrust/server/src/lib.rs

@@ -5,7 +5,7 @@ use bytes::BytesMut;
 use cfg::{DEFAULT_IP, DEFAULT_PORT};
 use clap::Parser;
 use prost::Message;
-use proto::connect::Join;
+use proto::{connect::Join, ProtoRequest};
 use std::{
     error::Error,
     io::{Cursor, Write},
@@ -39,6 +39,10 @@ impl Connection {
                 log::info!("Exit");
                 return Err(anyhow!("Exit"));
             }
+            if let Some(request) = self.parse_join()? {
+                log::info!("Join exiting...");
+                return Ok(Some(request));
+            }
             let sz = self.stream.read_buf(&mut self.buffer).await?;
             log::info!("Received:{}", sz);
             if 0 == sz {
@@ -51,10 +55,6 @@ impl Connection {
                     return Err(anyhow!(msg));
                 }
             }
-            if let Some(request) = self.parse_join()? {
-                log::info!("Join exiting...");
-                return Ok(Some(request));
-            }
         }
     }
 
@@ -65,6 +65,33 @@ impl Connection {
             Err(_) => Err(anyhow!("Not a join message")),
         }
     }
+
+    pub async fn process_request(&mut self) -> anyhow::Result<()> {
+        loop {
+            if self.shutdown.try_recv().is_ok() {
+                return Err(anyhow!("Exit"));
+            }
+            if let Some(request) = self.parse_request()? {}
+            let sz = self.stream.read_buf(&mut self.buffer).await?;
+            if 0 == sz {
+                if self.buffer.is_empty() {
+                    return Ok(());
+                } else {
+                    let msg = "Connection reset by peer";
+                    log::info!("{}", msg);
+                    return Err(anyhow!(msg));
+                }
+            }
+        }
+    }
+
+    pub fn parse_request(&mut self) -> anyhow::Result<Option<ProtoRequest>> {
+        let buf = Cursor::new(&self.buffer[..]);
+        match proto::connect::CreateObj::decode(buf) {
+            Ok(data) => Ok(Some(ProtoRequest::CreateObj(data))),
+            Err(_) => Err(anyhow!("Not a message")),
+        }
+    }
 }
 
 #[derive(Debug, Parser)]
@@ -87,13 +114,7 @@ async fn process_request(mut connect: Connection) -> anyhow::Result<()> {
     log::info!("start joining");
     let join_data = connect.read_join().await?;
     log::info!("joined");
-    let request = async { loop {} };
-    select! {
-        _ = request => {},
-        _ = connect.shutdown.recv() => {
-            log::info!("Player exited")
-        }
-    }
+    connect.process_request().await?;
     Ok(())
 }
 

gdrust/src/multi.rs

@@ -1,3 +1,4 @@
+use ::proto::ProtoRequest;
 use anyhow::anyhow;
 use bytes::{Bytes, BytesMut};
 use godot::engine::{INode, Node};
@@ -18,7 +19,7 @@ pub struct MultiPlayerConnection {}
 impl MultiPlayerConnection {}
 
 enum Requests {
-    Join(Join),
+    Proto(ProtoRequest),
     Wrong(String),
     ExitSuccess,
 }
@@ -75,7 +76,7 @@ async fn read_loop(
 
 fn parse_request(buf: &BytesMut) -> Option<Requests> {
     match proto::connect::Join::decode(&buf[..]) {
-        Ok(v) => Some(Requests::Join(v)),
+        Ok(v) => Some(Requests::Proto(ProtoRequest::Join(v))),
         Err(_) => None,
     }
 }

gdrust/src/weapons.rs

@@ -1 +1,3 @@
+mod enchanted_sword;
 mod star_wrath;
+

gdrust/src/weapons/enchanted_sword.rs

@@ -0,0 +1,34 @@
+use godot::{
+    engine::{ISprite2D, Sprite2D},
+    prelude::*,
+};
+use std::collections::HashMap;
+
+#[derive(GodotClass)]
+#[class(init, base = Sprite2D)]
+struct EnchantedSword {
+    properties: HashMap<String, Callable>,
+    base: Base<Sprite2D>,
+}
+
+#[godot_api]
+impl ISprite2D for EnchantedSword {
+    fn get_property(&self, name: StringName) -> Option<Variant> {
+        match self.properties.get(&name.to_string()) {
+            None => {}
+            Some(val) => {
+                val.callv((&[self.base().to_variant()]).into());
+            }
+        }
+        None
+    }
+}
+
+#[godot_api]
+impl EnchantedSword {
+    #[func]
+    /// 设置要检测的属性
+    fn set_monitor(&mut self, property_name: String, func: Callable) {
+        self.properties.insert(property_name, func);
+    }
+}

scenes/weapons/enchanted_sword.tscn

@@ -4,7 +4,7 @@
 [ext_resource type="Script" path="res://scripts/weapons/enchanted_sword.gd" id="2_h56vq"]
 [ext_resource type="PackedScene" uid="uid://bi0hwjyalpjn6" path="res://scenes/bullets/enchanted_beam.tscn" id="3_ndj1h"]
 
-[node name="EnchantedSword" type="Sprite2D"]
+[node name="EnchantedSword" type="EnchantedSword"]
 z_index = 1
 position = Vector2(574, 291)
 rotation = -5.57284

scenes/weapons/star_wrath.tscn

@@ -116,21 +116,21 @@ libraries = {
 [node name="AnimationTree" type="AnimationTree" parent="."]
 tree_root = SubResource("AnimationNodeBlendTree_rpkys")
 anim_player = NodePath("../AnimationPlayer")
-parameters/current_length = null
-parameters/current_position = null
-parameters/current_delta = null
-parameters/Animation/current_length = null
-parameters/Animation/current_position = null
-parameters/Animation/current_delta = null
-"parameters/Animation 2/current_length" = null
-"parameters/Animation 2/current_position" = null
-"parameters/Animation 2/current_delta" = null
-parameters/Blend2/current_length = 0
-parameters/Blend2/current_position = 0
-parameters/Blend2/current_delta = 0
+parameters/current_length = 1.5
+parameters/current_position = 0.449277
+parameters/current_delta = 0.0166667
+parameters/Animation/current_length = 1.5
+parameters/Animation/current_position = 0.449277
+parameters/Animation/current_delta = 0.0166667
+"parameters/Animation 2/current_length" = 1.0
+"parameters/Animation 2/current_position" = 1.0
+"parameters/Animation 2/current_delta" = 0.0
+parameters/Blend2/current_length = 1.5
+parameters/Blend2/current_position = 0.449277
+parameters/Blend2/current_delta = 0.0166667
 parameters/Blend2/blend_amount = 0.5
-parameters/output/current_length = null
-parameters/output/current_position = null
-parameters/output/current_delta = null
+parameters/output/current_length = 1.5
+parameters/output/current_position = 0.449277
+parameters/output/current_delta = 0.0166667
 
 [connection signal="timeout" from="FightTimer" to="." method="on_fight_timer_timeout"]

scripts/global.gd

@@ -1,2 +1 @@
-#extends GlobalClass
-extends Node
+extends GlobalClass

scripts/weapons/enchanted_sword.gd

@@ -1,4 +1,4 @@
-extends Sprite2D
+extends EnchantedSword
 
 var finished: bool