Restructure to allow for wasm compatibility

Author: STBoyden

Cargo.lock

@@ -1,15 +1,13 @@
 [package]
 name = "codectrl-protobuf-bindings"
-version = "0.4.0"
+version = "0.5.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[dependencies]
-tonic = "0.7"
-futures-core = "0.3"
-prost = "0.10"
 
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+web = { path = "./web" }
 
-[build-dependencies]
-tonic-build = "0.7"
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+native = { path = "./native" }

Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "native"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+tonic = "0.7"
+prost = "0.10"
+
+[build-dependencies]
+tonic-build = "0.7"

native/Cargo.lock

@@ -2,11 +2,11 @@ fn main() {
     tonic_build::configure()
         .compile(
             &[
-                "proto/cc_service.proto",
-                "proto/backtrace_data.proto",
-                "proto/log.proto",
+                "../proto/cc_service.proto",
+                "../proto/backtrace_data.proto",
+                "../proto/log.proto",
             ],
-            &["proto"],
+            &["../proto"],
         )
         .unwrap_or_else(|e| panic!("Failed to compile protos {e:#?}"));
 }

native/Cargo.toml

@@ -0,0 +1,30 @@
+/// This is the module to emulate the structure of the protobuf file imports to
+/// prevent any build issues.
+
+pub mod data {
+    pub mod backtrace_data {
+        tonic::include_proto!("codectrl.data.backtrace_data");
+    }
+    pub mod log {
+        tonic::include_proto!("codectrl.data.log");
+    }
+
+    pub use backtrace_data::*;
+    pub use log::*;
+}
+
+pub mod logs_service {
+    tonic::include_proto!("codectrl.logs_service");
+
+    #[cfg(not(target_arch = "wasm32"))]
+    pub use log_server_server::{
+        LogServer as LogServerTrait, LogServerServer as LogServerService,
+    };
+
+    #[cfg(not(target_arch = "wasm32"))]
+    pub use log_client_server::{
+        LogClient as LogClientTrait, LogClientServer as LogClientService,
+    };
+
+    pub use log_client_client::LogClientClient as LoggerClient;
+}

build.rs renamed to native/build.rs

@@ -1,26 +1,5 @@
-/// This is the module to emulate the structure of the protobuf file imports to
-/// prevent any build issues.
+#[cfg(target_arch = "wasm32")]
+pub use web::*;
 
-pub mod data {
-    pub mod backtrace_data {
-        tonic::include_proto!("codectrl.data.backtrace_data");
-    }
-    pub mod log {
-        tonic::include_proto!("codectrl.data.log");
-    }
-
-    pub use backtrace_data::*;
-    pub use log::*;
-}
-
-pub mod logs_service {
-    tonic::include_proto!("codectrl.logs_service");
-
-    pub use log_server_server::{
-        LogServer as LogServerTrait, LogServerServer as LogServerService,
-    };
-
-    pub use log_client_server::{
-        LogClient as LogClientTrait, LogClientServer as LogClientService,
-    };
-}
+#[cfg(not(target_arch = "wasm32"))]
+pub use native::*;