fix

Signed-off-by: Shikugawa <Shikugawa@gmail.com>

src/dispatcher.rs

@@ -15,6 +15,7 @@
 use crate::hostcalls;
 use crate::traits::*;
 use crate::types::*;
+use core::panic;
 use hashbrown::HashMap;
 use std::cell::{Cell, RefCell};
 
@@ -416,6 +417,7 @@ impl Dispatcher {
             }
         } else {
             // TODO(shikugawa): Try to check grpc stream tokens here
+            panic!("invalid token_id")
         }
     }
 
@@ -436,6 +438,7 @@ impl Dispatcher {
             }
         } else {
             // TODO(shikugawa): Try to check grpc stream tokens here
+            panic!("invalid token_id")
         }
     }
 }

src/hostcalls.rs

@@ -654,7 +654,7 @@ pub fn dispatch_http_call(
 extern "C" {
     fn proxy_grpc_call(
         upstream_data: *const u8,
-        upstream_size: usize, // TODO(shikugawa): remove grpc_service after next ABI released.
+        upstream_size: usize,
         service_name_data: *const u8,
         service_name_size: usize,
         method_name_data: *const u8,
@@ -663,7 +663,7 @@ extern "C" {
         initial_metadata_size: usize,
         message_data_data: *const u8,
         message_data_size: usize,
-        timeout_milliseconds: u32,
+        timeout: u32,
         return_callout_id: *mut u32,
     ) -> Status;
 }
@@ -672,12 +672,12 @@ pub fn dispatch_grpc_call(
     upstream_name: &str,
     service_name: &str,
     method_name: &str,
-    initial_metadata: Vec<(&str, &str)>,
+    initial_metadata: Vec<(&str, &[u8])>,
     message: Option<&[u8]>,
     timeout: Duration,
 ) -> Result<u32, Status> {
     let mut return_callout_id = 0;
-    let serialized_initial_metadata = utils::serialize_map(initial_metadata);
+    let serialized_initial_metadata = utils::serialize_bytes_value_map(initial_metadata);
     unsafe {
         match proxy_grpc_call(
             upstream_name.as_ptr(),
@@ -836,6 +836,26 @@ mod utils {
         bytes
     }
 
+    pub(super) fn serialize_bytes_value_map(map: Vec<(&str, &[u8])>) -> Bytes {
+        let mut size: usize = 4;
+        for (name, value) in &map {
+            size += name.len() + value.len() + 10;
+        }
+        let mut bytes: Bytes = Vec::with_capacity(size);
+        bytes.extend_from_slice(&map.len().to_le_bytes());
+        for (name, value) in &map {
+            bytes.extend_from_slice(&name.len().to_le_bytes());
+            bytes.extend_from_slice(&value.len().to_le_bytes());
+        }
+        for (name, value) in &map {
+            bytes.extend_from_slice(&name.as_bytes());
+            bytes.push(0);
+            bytes.extend_from_slice(&value);
+            bytes.push(0);
+        }
+        bytes
+    }
+
     pub(super) fn deserialize_map(bytes: &[u8]) -> Vec<(String, String)> {
         let mut map = Vec::new();
         if bytes.is_empty() {

src/traits.rs

@@ -95,7 +95,7 @@ pub trait Context {
         upstream_name: &str,
         service_name: &str,
         method_name: &str,
-        initial_metadata: Vec<(&str, &str)>,
+        initial_metadata: Vec<(&str, &[u8])>,
         message: Option<&[u8]>,
         timeout: Duration,
     ) -> Result<u32, Status> {