Add support for closing of connections in the ABI/SDK. (#29)

* Add support for closing of connections in the ABI/SDK.

Signed-off-by: John Plevyak <[email protected]>

Author: jplevyak

proxy_wasm_api.h

@@ -436,8 +436,8 @@ class Context : public ContextBase {
   virtual FilterStatus onNewConnection() { return FilterStatus::Continue; }
   virtual FilterStatus onDownstreamData(size_t, bool) { return FilterStatus::Continue; }
   virtual FilterStatus onUpstreamData(size_t, bool) { return FilterStatus::Continue; }
-  virtual void onDownstreamConnectionClose(PeerType) {}
-  virtual void onUpstreamConnectionClose(PeerType) {}
+  virtual void onDownstreamConnectionClose(CloseType) {}
+  virtual void onUpstreamConnectionClose(CloseType) {}
 
   virtual FilterHeadersStatus onRequestHeaders(uint32_t, bool) {
     return FilterHeadersStatus::Continue;
@@ -591,8 +591,12 @@ inline WasmResult setFilterStateStringValue(StringView key, StringView s) {
 }
 
 // Continue/Respond/Route
-inline WasmResult continueRequest() { return proxy_continue_request(); }
-inline WasmResult continueResponse() { return proxy_continue_response(); }
+inline WasmResult continueRequest() { return proxy_continue_stream(WasmStreamType::Request); }
+inline WasmResult continueResponse() { return proxy_continue_stream(WasmStreamType::Response); }
+
+inline WasmResult closeRequest() { return proxy_close_stream(WasmStreamType::Request); }
+inline WasmResult closeResponse() { return proxy_close_stream(WasmStreamType::Response); }
+
 inline WasmResult sendLocalResponse(uint32_t response_code, StringView response_code_details,
                                     StringView body,
                                     const HeaderStringPairs &additional_response_headers,

proxy_wasm_common.h

@@ -101,3 +101,10 @@ enum class WasmBufferFlags : int32_t {
   // These must be powers of 2.
   EndOfStream = 1,
 };
+enum class WasmStreamType : int32_t {
+  Request = 0,
+  Response = 1,
+  Downstream = 2,
+  Upstream = 3,
+  MAX = 3,
+};

proxy_wasm_enums.h

@@ -65,8 +65,8 @@ enum class MetricType : int32_t {
   Histogram = 2,
   Max = 2,
 };
-enum class PeerType : int32_t {
+enum class CloseType : int32_t {
   Unknown = 0,
-  Local = 1,
-  Remote = 2,
+  Local = 1,  // Close initiated by the proxy.
+  Remote = 2, // Close initiated by the peer.
 };

proxy_wasm_externs.h

@@ -50,9 +50,9 @@ extern "C" WasmResult proxy_get_property(const char *path_ptr, size_t path_size,
 extern "C" WasmResult proxy_set_property(const char *path_ptr, size_t path_size,
                                          const char *value_ptr, size_t value_size);
 
-// Continue/Reply/Route
-extern "C" WasmResult proxy_continue_request();
-extern "C" WasmResult proxy_continue_response();
+// Continue/Close/Reply/Route
+extern "C" WasmResult proxy_continue_stream(WasmStreamType stream_type);
+extern "C" WasmResult proxy_close_stream(WasmStreamType stream_type);
 extern "C" WasmResult
 proxy_send_local_response(uint32_t response_code, const char *response_code_details_ptr,
                           size_t response_code_details_size, const char *body_ptr, size_t body_size,

proxy_wasm_intrinsics.cc

@@ -169,13 +169,13 @@ extern "C" PROXY_WASM_KEEPALIVE FilterStatus proxy_on_upstream_data(uint32_t con
 }
 
 extern "C" PROXY_WASM_KEEPALIVE void proxy_on_downstream_connection_close(uint32_t context_id,
-                                                                          uint32_t peer_type) {
-  return getContext(context_id)->onDownstreamConnectionClose(static_cast<PeerType>(peer_type));
+                                                                          uint32_t close_type) {
+  return getContext(context_id)->onDownstreamConnectionClose(static_cast<CloseType>(close_type));
 }
 
 extern "C" PROXY_WASM_KEEPALIVE void proxy_on_upstream_connection_close(uint32_t context_id,
-                                                                        uint32_t peer_type) {
-  return getContext(context_id)->onUpstreamConnectionClose(static_cast<PeerType>(peer_type));
+                                                                        uint32_t close_type) {
+  return getContext(context_id)->onUpstreamConnectionClose(static_cast<CloseType>(close_type));
 }
 
 extern "C" PROXY_WASM_KEEPALIVE FilterHeadersStatus

proxy_wasm_intrinsics.js

@@ -16,43 +16,43 @@
  */
 
 mergeInto(LibraryManager.library, {
-    proxy_get_configuration: function () {},
-    proxy_log: function () {},
-    proxy_set_tick_period_milliseconds: function () {},
-    proxy_get_current_time_nanoseconds: function() {},
-    proxy_get_status: function () {},
-    proxy_get_property: function () {},
-    proxy_set_property: function () {},
-    proxy_continue_request: function () {},
-    proxy_continue_response: function () {},
-    proxy_clear_route_cache: function () {},
-    proxy_add_header_map_value: function () {},
-    proxy_get_header_map_value: function () {},
-    proxy_get_header_map_pairs: function () {},
-    proxy_get_header_map_size: function () {},
-    proxy_get_shared_data: function () {},
-    proxy_set_shared_data: function () {},
-    proxy_register_shared_queue: function () {},
-    proxy_resolve_shared_queue: function () {},
-    proxy_enqueue_shared_queue: function () {},
-    proxy_dequeue_shared_queue: function () {},
-    proxy_replace_header_map_value: function () {},
-    proxy_remove_header_map_value: function () {},
-    proxy_get_buffer_bytes: function () {},
-    proxy_get_buffer_status: function () {},
-    proxy_set_buffer_bytes: function () {},
-    proxy_http_call: function () {},
-    proxy_define_metric: function () {},
-    proxy_increment_metric: function () {},
-    proxy_record_metric: function () {},
-    proxy_get_metric: function () {},
-    proxy_grpc_call : function () {},
-    proxy_grpc_stream : function () {},
-    proxy_grpc_send : function () {},
-    proxy_grpc_close : function () {},
-    proxy_grpc_cancel : function () {},
-    proxy_send_local_response : function () {},
-    proxy_set_effective_context : function () {},
-    proxy_done: function () {},
-    proxy_call_foreign_function: function () {},
+  proxy_get_configuration: function() {},
+  proxy_log: function() {},
+  proxy_set_tick_period_milliseconds: function() {},
+  proxy_get_current_time_nanoseconds: function() {},
+  proxy_get_status: function() {},
+  proxy_get_property: function() {},
+  proxy_set_property: function() {},
+  proxy_continue_stream: function() {},
+  proxy_close_stream: function() {},
+  proxy_clear_route_cache: function() {},
+  proxy_add_header_map_value: function() {},
+  proxy_get_header_map_value: function() {},
+  proxy_get_header_map_pairs: function() {},
+  proxy_get_header_map_size: function() {},
+  proxy_get_shared_data: function() {},
+  proxy_set_shared_data: function() {},
+  proxy_register_shared_queue: function() {},
+  proxy_resolve_shared_queue: function() {},
+  proxy_enqueue_shared_queue: function() {},
+  proxy_dequeue_shared_queue: function() {},
+  proxy_replace_header_map_value: function() {},
+  proxy_remove_header_map_value: function() {},
+  proxy_get_buffer_bytes: function() {},
+  proxy_get_buffer_status: function() {},
+  proxy_set_buffer_bytes: function() {},
+  proxy_http_call: function() {},
+  proxy_define_metric: function() {},
+  proxy_increment_metric: function() {},
+  proxy_record_metric: function() {},
+  proxy_get_metric: function() {},
+  proxy_grpc_call: function() {},
+  proxy_grpc_stream: function() {},
+  proxy_grpc_send: function() {},
+  proxy_grpc_close: function() {},
+  proxy_grpc_cancel: function() {},
+  proxy_send_local_response: function() {},
+  proxy_set_effective_context: function() {},
+  proxy_done: function() {},
+  proxy_call_foreign_function: function() {},
 });