Rust I Love u and Hate u

eigr · Feb 13, 2023 · 61e65b7 · 61e65b7
1 parent 6f3bbdc
commit 61e65b7
Show file tree

Hide file tree

Showing 19 changed files with 1,043 additions and 569 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/spawn-examples/Cargo.toml b/spawn-examples/Cargo.toml
@@ -4,6 +4,7 @@ name = "spawn-examples"
 version = "0.1.0"
 
 [dependencies]
+env_logger = "0.10.0"
 prost-types = "0.11"
 spawn-rs = {path = "../spawn-rs"}
 tokio = {version = "1.25.0", features = ["full"]}
diff --git a/spawn-examples/src/joe.rs b/spawn-examples/src/joe.rs
@@ -1,14 +1,26 @@
 use prost_types::Any;
 
 use spawn_rs::{
-    action::{Action, Message},
+    action::Action,
     actor::{Actor, ActorSettings, Kind},
     context::Context,
+    serializer::Serializer,
     value::Value,
+    Message,
 };
 
 pub struct Joe;
 
+impl Serializer for Joe {
+    fn decode(&mut self, _msg: prost_types::Any) -> Box<dyn std::any::Any> {
+        todo!()
+    }
+
+    fn encode(&mut self, _msg: Box<dyn std::any::Any>) -> prost_types::Any {
+        todo!()
+    }
+}
+
 impl Actor for Joe {
     fn settings(&mut self) -> ActorSettings {
         ActorSettings::new()

diff --git a/spawn-examples/src/main.rs b/spawn-examples/src/main.rs
@@ -1,3 +1,4 @@
+extern crate env_logger;
 extern crate prost_types;
 extern crate tokio;
 
@@ -7,6 +8,8 @@ use spawn_rs::spawn::Spawn;
 
 #[tokio::main]
 async fn main() {
+    env_logger::init_from_env(env_logger::Env::new().default_filter_or("debug"));
+
     Spawn::new()
         .system("spawn-system".to_string())
         .port(8091)

diff --git a/spawn-rs/Cargo.toml b/spawn-rs/Cargo.toml
@@ -14,8 +14,10 @@ name = "spawn-rs"
 version = "0.1.0"
 
 [dependencies]
+actix-protobuf = "0.9.0"
 actix-server = "2.2.0"
 actix-web = "4"
+env_logger = "0.10.0"
 prost = "0.11"
 prost-types = "0.11"
 

diff --git a/spawn-rs/build.rs b/spawn-rs/build.rs
@@ -1,7 +1,7 @@
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     tonic_build::configure()
         .build_server(false)
-        .out_dir("src/eigr/spawn")
+        .out_dir("src/eigr")
         .compile(
             &[
                 "proto/google/protobuf/any.proto",

diff --git a/spawn-rs/proto/actor.proto b/spawn-rs/proto/actor.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package eigr.functions.protocol.actors;
+package eigr.spawn;
 
 import "google/protobuf/any.proto";
 

diff --git a/spawn-rs/proto/protocol.proto b/spawn-rs/proto/protocol.proto
@@ -154,7 +154,7 @@
 //
 syntax = "proto3";
 
-package eigr.functions.protocol;
+package eigr.spawn;
 
 import "actor.proto";
 import "google/protobuf/any.proto";
@@ -180,10 +180,10 @@ message Context {
     map<string, string> tags = 5;
 
     // Who is calling target actor
-    eigr.functions.protocol.actors.ActorId caller = 2;
+    eigr.spawn.ActorId caller = 2;
 
     // The target actor itself
-    eigr.functions.protocol.actors.ActorId self = 3;
+    eigr.spawn.ActorId self = 3;
 }
 
 // Noop is used when the input or output value of a function or method 
@@ -196,7 +196,7 @@ message RegistrationRequest {
 
     ServiceInfo service_info = 1;
 
-    eigr.functions.protocol.actors.ActorSystem actor_system = 2;
+    eigr.spawn.ActorSystem actor_system = 2;
 }
 
 message RegistrationResponse {
@@ -233,7 +233,7 @@ message ServiceInfo {
 }
 
 message SpawnRequest {
-    repeated eigr.functions.protocol.actors.ActorId actors = 1;
+    repeated eigr.spawn.ActorId actors = 1;
 }
 
 message SpawnResponse {
@@ -330,9 +330,9 @@ message Workflow {
 //   * metadata: Meta information or headers
 message InvocationRequest {
 
-    eigr.functions.protocol.actors.ActorSystem system = 1;
+    eigr.spawn.ActorSystem system = 1;
 
-    eigr.functions.protocol.actors.Actor actor = 2;
+    eigr.spawn.Actor actor = 2;
 
     string command_name = 3;
 
@@ -343,7 +343,7 @@ message InvocationRequest {
 
     bool async = 5;
 
-    eigr.functions.protocol.actors.ActorId caller = 6;
+    eigr.spawn.ActorId caller = 6;
 
     map<string, string> metadata = 8;
 
@@ -365,7 +365,7 @@ message InvocationRequest {
 //   * payload: The value to be passed to the function or method corresponding to command_name.
 message ActorInvocation {
 
-    eigr.functions.protocol.actors.ActorId actor = 1;
+    eigr.spawn.ActorId actor = 1;
 
     string command_name = 2;
 
@@ -376,7 +376,7 @@ message ActorInvocation {
         Noop noop = 5;
     }
 
-    eigr.functions.protocol.actors.ActorId caller = 6;
+    eigr.spawn.ActorId caller = 6;
 }
 
 // The user function's response after executing the action originated by the local proxy request via ActorInvocation.
@@ -415,9 +415,9 @@ message InvocationResponse {
 
     RequestStatus status = 1;
 
-    eigr.functions.protocol.actors.ActorSystem system = 2;
+    eigr.spawn.ActorSystem system = 2;
 
-    eigr.functions.protocol.actors.Actor actor = 3;
+    eigr.spawn.Actor actor = 3;
 
     oneof payload {
         google.protobuf.Any value = 4;