about summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tvix/Cargo.lock16
-rw-r--r--tvix/Cargo.nix62
-rw-r--r--tvix/store/Cargo.toml12
-rw-r--r--tvix/store/build.rs46
-rw-r--r--tvix/store/default.nix4
-rw-r--r--tvix/store/src/main.rs25
-rw-r--r--tvix/store/src/proto.rs6
7 files changed, 144 insertions, 27 deletions
diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock
index ec6668a2d627..8b6647f29938 100644
--- a/tvix/Cargo.lock
+++ b/tvix/Cargo.lock
@@ -1988,6 +1988,21 @@ dependencies = [
 ]
 
 [[package]]
+name = "tonic-reflection"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0455f730d540a1484bffc3c55c94100b18a662597b982c2e9073f2c55c602616"
+dependencies = [
+ "bytes",
+ "prost",
+ "prost-types",
+ "tokio",
+ "tokio-stream",
+ "tonic",
+ "tonic-build",
+]
+
+[[package]]
 name = "tower"
 version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2156,6 +2171,7 @@ dependencies = [
  "tokio-stream",
  "tonic",
  "tonic-build",
+ "tonic-reflection",
 ]
 
 [[package]]
diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index 2487f8abff6c..225f0f04ad23 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -3792,6 +3792,7 @@ rec {
           "default" = [ "std" ];
           "std" = [ "prost/std" ];
         };
+        resolvedDefaultFeatures = [ "default" "std" ];
       };
       "quick-error" = rec {
         crateName = "quick-error";
@@ -5501,7 +5502,7 @@ rec {
           "time" = [ "tokio/time" ];
           "tokio-util" = [ "dep:tokio-util" ];
         };
-        resolvedDefaultFeatures = [ "default" "time" ];
+        resolvedDefaultFeatures = [ "default" "net" "time" ];
       };
       "tokio-util" = rec {
         crateName = "tokio-util";
@@ -5770,6 +5771,53 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "prost" "prost-build" "transport" ];
       };
+      "tonic-reflection" = rec {
+        crateName = "tonic-reflection";
+        version = "0.5.0";
+        edition = "2018";
+        sha256 = "05i6c1fcbwkkj0p2r63vb5iac60b22a5rif3zx5li8a0slqgfm84";
+        authors = [
+          "James Nugent <james@jen20.com>"
+          "Samani G. Gikandi <samani@gojulas.com>"
+        ];
+        dependencies = [
+          {
+            name = "bytes";
+            packageId = "bytes";
+          }
+          {
+            name = "prost";
+            packageId = "prost";
+          }
+          {
+            name = "prost-types";
+            packageId = "prost-types";
+          }
+          {
+            name = "tokio";
+            packageId = "tokio";
+            features = [ "sync" ];
+          }
+          {
+            name = "tokio-stream";
+            packageId = "tokio-stream";
+            features = [ "net" ];
+          }
+          {
+            name = "tonic";
+            packageId = "tonic";
+            features = [ "codegen" "prost" ];
+          }
+        ];
+        buildDependencies = [
+          {
+            name = "tonic-build";
+            packageId = "tonic-build";
+            features = [ "transport" "prost" ];
+          }
+        ];
+
+      };
       "tower" = rec {
         crateName = "tower";
         version = "0.4.13";
@@ -6429,6 +6477,11 @@ rec {
             name = "tonic";
             packageId = "tonic";
           }
+          {
+            name = "tonic-reflection";
+            packageId = "tonic-reflection";
+            optional = true;
+          }
         ];
         buildDependencies = [
           {
@@ -6446,7 +6499,12 @@ rec {
             packageId = "test-case";
           }
         ];
-
+        features = {
+          "default" = [ "reflection" ];
+          "reflection" = [ "tonic-reflection" ];
+          "tonic-reflection" = [ "dep:tonic-reflection" ];
+        };
+        resolvedDefaultFeatures = [ "default" "reflection" "tonic-reflection" ];
       };
       "typenum" = rec {
         crateName = "typenum";
diff --git a/tvix/store/Cargo.toml b/tvix/store/Cargo.toml
index 5cae4e0dfcd7..90672b6d037f 100644
--- a/tvix/store/Cargo.toml
+++ b/tvix/store/Cargo.toml
@@ -15,9 +15,21 @@ tokio = { version = "1.23.0", features = ["rt-multi-thread"] }
 tokio-stream = "0.1.11"
 tonic = "0.8.2"
 
+[dependencies.tonic-reflection]
+optional = true
+version = "0.5.0"
+
 [build-dependencies]
 prost-build = "0.11.2"
 tonic-build = "0.8.2"
 
 [dev-dependencies]
 test-case = "2.2.2"
+
+[features]
+default = [
+  "reflection"
+]
+reflection = [
+  "tonic-reflection"
+]
diff --git a/tvix/store/build.rs b/tvix/store/build.rs
index 3fdc7418c1c5..ef1674cfbd0b 100644
--- a/tvix/store/build.rs
+++ b/tvix/store/build.rs
@@ -1,24 +1,32 @@
 use std::io::Result;
 
 fn main() -> Result<()> {
-    tonic_build::configure()
-        .build_server(true)
-        .build_client(true)
-        .compile(
-            &[
-                "tvix/store/protos/castore.proto",
-                "tvix/store/protos/pathinfo.proto",
-                "tvix/store/protos/rpc_blobstore.proto",
-                "tvix/store/protos/rpc_directory.proto",
-                "tvix/store/protos/rpc_pathinfo.proto",
-            ],
-            // If we are in running `cargo build` manually, using `../..` works fine,
-            // but in case we run inside a nix build, we need to instead point PROTO_ROOT
-            // to a sparseTree containing that structure.
-            &[match std::env::var_os("PROTO_ROOT") {
-                Some(proto_root) => proto_root.to_str().unwrap().to_owned(),
-                None => "../..".to_string(),
-            }],
-        )?;
+    #[allow(unused_mut)]
+    let mut builder = tonic_build::configure();
+
+    #[cfg(feature = "reflection")]
+    {
+        let out_dir = std::path::PathBuf::from(std::env::var("OUT_DIR").unwrap());
+        let descriptor_path = out_dir.join("tvix.store.v1.bin");
+
+        builder = builder.file_descriptor_set_path(&descriptor_path);
+    };
+
+    builder.build_server(true).build_client(true).compile(
+        &[
+            "tvix/store/protos/castore.proto",
+            "tvix/store/protos/pathinfo.proto",
+            "tvix/store/protos/rpc_blobstore.proto",
+            "tvix/store/protos/rpc_directory.proto",
+            "tvix/store/protos/rpc_pathinfo.proto",
+        ],
+        // If we are in running `cargo build` manually, using `../..` works fine,
+        // but in case we run inside a nix build, we need to instead point PROTO_ROOT
+        // to a sparseTree containing that structure.
+        &[match std::env::var_os("PROTO_ROOT") {
+            Some(proto_root) => proto_root.to_str().unwrap().to_owned(),
+            None => "../..".to_string(),
+        }],
+    )?;
     Ok(())
 }
diff --git a/tvix/store/default.nix b/tvix/store/default.nix
index 1dbf01923545..68b529e723b1 100644
--- a/tvix/store/default.nix
+++ b/tvix/store/default.nix
@@ -20,6 +20,10 @@ depot.tvix.crates.workspaceMembers.tvix-store.build.override {
       nativeBuildInputs = protobufDep prev;
     };
 
+    tonic-reflection = prev: {
+      nativeBuildInputs = protobufDep prev;
+    };
+
     tvix-store = prev: {
       PROTO_ROOT = protoRoot;
       nativeBuildInputs = protobufDep prev;
diff --git a/tvix/store/src/main.rs b/tvix/store/src/main.rs
index cc9002438bce..b28c3fdeefe8 100644
--- a/tvix/store/src/main.rs
+++ b/tvix/store/src/main.rs
@@ -2,6 +2,9 @@ use crate::proto::blob_service_server::BlobServiceServer;
 use crate::proto::directory_service_server::DirectoryServiceServer;
 use crate::proto::path_info_service_server::PathInfoServiceServer;
 
+#[cfg(feature = "reflection")]
+use crate::proto::FILE_DESCRIPTOR_SET;
+
 use clap::Parser;
 use tonic::{transport::Server, Result};
 
@@ -31,18 +34,28 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .parse()
         .unwrap();
 
+    let mut server = Server::builder();
+
     let blob_service = dummy_blob_service::DummyBlobService {};
     let directory_service = dummy_directory_service::DummyDirectoryService {};
     let path_info_service = dummy_path_info_service::DummyPathInfoService {};
 
-    println!("tvix-store listening on {}", listen_address);
-
-    Server::builder()
+    let mut router = server
         .add_service(BlobServiceServer::new(blob_service))
         .add_service(DirectoryServiceServer::new(directory_service))
-        .add_service(PathInfoServiceServer::new(path_info_service))
-        .serve(listen_address)
-        .await?;
+        .add_service(PathInfoServiceServer::new(path_info_service));
+
+    #[cfg(feature = "reflection")]
+    {
+        let reflection_svc = tonic_reflection::server::Builder::configure()
+            .register_encoded_file_descriptor_set(FILE_DESCRIPTOR_SET)
+            .build()?;
+        router = router.add_service(reflection_svc);
+    }
+
+    println!("tvix-store listening on {}", listen_address);
+
+    router.serve(listen_address).await?;
 
     Ok(())
 }
diff --git a/tvix/store/src/proto.rs b/tvix/store/src/proto.rs
index eac37820658e..75e5c34ab137 100644
--- a/tvix/store/src/proto.rs
+++ b/tvix/store/src/proto.rs
@@ -7,6 +7,12 @@ use prost::Message;
 
 tonic::include_proto!("tvix.store.v1");
 
+#[cfg(feature = "reflection")]
+/// Compiled file descriptors for implementing [gRPC
+/// reflection](https://github.com/grpc/grpc/blob/master/doc/server-reflection.md) with e.g.
+/// [`tonic_reflection`](https://docs.rs/tonic-reflection).
+pub const FILE_DESCRIPTOR_SET: &[u8] = tonic::include_file_descriptor_set!("tvix.store.v1");
+
 /// Errors that can occur during the validation of Directory messages.
 #[derive(Debug, PartialEq, Eq, Error)]
 pub enum ValidateDirectoryError {
generated by cgit-pink 1.4.1 (git 2.44.2) at 2024-11-01T17ยท06+0000