fixing wasm

Author: shashitnak

Cargo.lock

@@ -13,10 +13,8 @@ edition = "2021"
 resolver = "2"
 
 [features]
-default = ["tokio-comp", "compression"]
+default = ["compression"]
 compression = ["libflate"]
-tokio-comp = ["tokio"]
-async-std-comp = ["async-std"]
 
 [dependencies]
 anyhow = "1"
@@ -32,21 +30,25 @@ reqwest = { version = "0.11", default-features = false, features = ["json", "rus
 serde_json = "1"
 serde = { version = "1", features = ["derive"] }
 sha2 = "0.10"
-tonic = "0.10"
 tracing = "0.1"
 tracing-futures = { version = "0.2.5", default-features = false, features = ["futures-03", "std"] }
-uuid = { version = "1.7", features = ["v4"] }                  # A library to generate and parse UUIDs.
+uuid = { version = "1.7", features = ["v4", "js"] }                  # A library to generate and parse UUIDs.
+wasm-bindgen-futures = "0.4.18"
 
 # Non-feature optional dependencies
 libflate = { version = "2", optional = true }
-async-std = { version = "1", features = ["default"], optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-tokio = { version = "1", features = ["full"], optional = true }
+tonic = "0.10"
+tokio = { version = "1", features = ["full"] }
 
 [build-dependencies]
+async-std = { version = "1", default-features = false, features = ["default", "tokio1"] }
+cfg-if = "1.0.0"
 reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] }
+prost-build = "0.12.3"
+protox = "0.6.0"
 tonic-build = "0.10"
-cfg-if = "1.0.0"
-tokio = { version = "1", features = ["full"], optional = true }
-async-std = { version = "1", features = ["default", "tokio1"], optional = true }
+
+[target.'cfg(not(target_arch = "wasm32"))'.build-dependencies]
+tokio = { version = "1", features = ["full"] }

Cargo.toml

@@ -1,27 +1,30 @@
 // Derived from https://github.com/pellizzetti/router/blob/cc0ebcaf1d68184e1fe06f16534fddff76286b40/apollo-spaceport/build.rs
+use protox::prost::Message;
+use std::path::PathBuf;
 use std::{
+    env,
     error::Error,
+    fs,
     fs::File,
     io::{copy, Read},
 };
 
 fn main() -> Result<(), Box<dyn Error>> {
     // Skip building online from docs.rs
-    if std::env::var_os("DOCS_RS").is_some() {} else {
+    if std::env::var_os("DOCS_RS").is_some() {
+    } else {
         // Retrieve a live version of the reports.proto file
         let proto_url = "https://usage-reporting.api.apollographql.com/proto/reports.proto";
         let fut = reqwest::get(proto_url);
 
         cfg_if::cfg_if! {
-            if #[cfg(feature = "tokio-comp")] {
+            if #[cfg(not(target_arch = "wasm32"))] {
                 let rt = tokio::runtime::Runtime::new().unwrap();
                 let response = rt.block_on(fut)?;
                 let mut content = rt.block_on(response.text())?;
-            } else if #[cfg(feature = "async-std-comp")] {
+            } else {
                 let response = async_std::task::block_on(fut)?;
                 let mut content = async_std::task::block_on(response.text())?;
-            } else {
-                compile_error!("tokio-comp or async-std-comp features required");
             }
         }
 
@@ -58,6 +61,12 @@ fn main() -> Result<(), Box<dyn Error>> {
     // Process the proto files
     let proto_files = vec!["proto/agents.proto", "proto/reports.proto"];
 
+    let file_descriptors = protox::compile(&proto_files, ["."]).unwrap();
+
+    let file_descriptor_path =
+        PathBuf::from(env::var_os("OUT_DIR").unwrap()).join("file_descriptor_set.bin");
+    fs::write(&file_descriptor_path, file_descriptors.encode_to_vec())?;
+
     tonic_build::configure()
         .type_attribute("ContextualizedStats", "#[derive(serde::Serialize)]")
         .type_attribute("StatsContext", "#[derive(serde::Serialize)]")
@@ -68,6 +77,8 @@ fn main() -> Result<(), Box<dyn Error>> {
         .type_attribute("ReferencedFieldsForType", "#[derive(serde::Serialize)]")
         .type_attribute("StatsContext", "#[derive(Eq, Hash)]")
         .build_server(true)
+        .file_descriptor_set_path(&file_descriptor_path)
+        .skip_protoc_run()
         .compile(&proto_files, &["."])?;
 
     for file in proto_files {

build.rs

@@ -40,9 +40,9 @@ use runtime::spawn;
 #[macro_use]
 extern crate tracing;
 
-use std::sync::RwLock;
 use std::collections::HashMap;
 use std::sync::Arc;
+use std::sync::RwLock;
 
 use async_graphql::QueryPathSegment;
 use chrono::{DateTime, Utc};

src/lib.rs

@@ -1,10 +1,14 @@
 #![allow(rustdoc::all)]
 #![allow(clippy::all)]
 
-pub mod report {
-    tonic::include_proto!("report");
-}
-
-pub mod agent {
-    tonic::include_proto!("agent");
+cfg_if::cfg_if! {
+    if #[cfg(not(target_arch = "wasm32"))] {
+        pub mod report {
+            tonic::include_proto!("report");
+        }
+    } else {
+        pub mod report {
+            include!(concat!(env!("OUT_DIR"), "/report.rs"));
+        }
+    }
 }

src/proto.rs

@@ -8,7 +8,7 @@ use futures::{
 use crate::{
     packages::uname::Uname,
     proto::report::{Report, ReportHeader, Trace, TracesAndStats},
-    runtime::{spawn, JoinHandle, abort, Instant},
+    runtime::{abort, spawn, Instant, JoinHandle},
 };
 
 /// The [ReportAggregator] is the structure which control the background task spawned to aggregate