[docs/release]: Revert "Implement HTTP handlers / webhooks in Rust modules (#4636)"

This reverts commit 5c04860.

Author: bfops

Cargo.lock

@@ -30,7 +30,6 @@ target_sources(spacetimedb_cpp_library PRIVATE ${LIBRARY_SOURCES})
 
 # Require C++20 for consumers of this library without forcing global flags
 target_compile_features(spacetimedb_cpp_library PUBLIC cxx_std_20)
-target_compile_definitions(spacetimedb_cpp_library PRIVATE SPACETIMEDB_UNSTABLE_FEATURES)
 
 # Set include directories
 target_include_directories(spacetimedb_cpp_library
@@ -61,5 +60,46 @@ if(PROJECT_IS_TOP_LEVEL)
     set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 endif()
 
-# Unit/compile/smoke test harnesses live under `tests/` as standalone runners
-# rather than being built through the top-level library CMake target.
+# ---- Tests ----
+# Default: ON only when building this project directly; OFF when used via FetchContent/add_subdirectory
+if(CMAKE_VERSION VERSION_LESS 3.21)
+    # Fallback heuristic for older CMake
+    set(_is_top_level FALSE)
+    if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
+        set(_is_top_level TRUE)
+    endif()
+else()
+    set(_is_top_level ${PROJECT_IS_TOP_LEVEL})
+endif()
+
+option(BUILD_TESTS "Build the test suite" ${_is_top_level})
+
+if(BUILD_TESTS AND NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
+    enable_testing()
+    
+    # Add test executable
+    add_executable(test_bsatn tests/main.cpp tests/module_library_unit_tests.cpp)
+    
+    # Link against the module library
+    target_link_libraries(test_bsatn PRIVATE spacetimedb_cpp_library)
+    
+    # Set C++20 standard for tests
+    target_compile_features(test_bsatn PRIVATE cxx_std_20)
+    
+    # Add test to CTest
+    add_test(NAME bsatn_tests COMMAND test_bsatn)
+    
+    # Add verbose test variant
+    add_test(NAME bsatn_tests_verbose COMMAND test_bsatn -v)
+    
+    # Set test properties
+    set_tests_properties(bsatn_tests PROPERTIES 
+        TIMEOUT 30
+        LABELS "unit"
+    )
+    
+    set_tests_properties(bsatn_tests_verbose PROPERTIES 
+        TIMEOUT 30
+        LABELS "unit;verbose"
+    )
+endif()

crates/bindings-cpp/CMakeLists.txt

@@ -126,11 +126,6 @@
 
 // Procedure context and macros
 #include "spacetimedb/procedure_macros.h"
-#ifdef SPACETIMEDB_UNSTABLE_FEATURES
-#include "spacetimedb/handler_context.h"
-#include "spacetimedb/router.h"
-#include "spacetimedb/http_handler_macros.h"
-#endif
 
 // =============================================================================
 // VIEW SYSTEM

crates/bindings-cpp/include/spacetimedb.h

@@ -216,37 +216,6 @@ int16_t __call_reducer__(
     BytesSource args,
     BytesSink error);
 
-STDB_EXPORT(__call_view__)
-int16_t __call_view__(
-    uint32_t id,
-    uint64_t sender_0, uint64_t sender_1, uint64_t sender_2, uint64_t sender_3,
-    BytesSource args,
-    BytesSink result);
-
-STDB_EXPORT(__call_view_anon__)
-int16_t __call_view_anon__(
-    uint32_t id,
-    BytesSource args,
-    BytesSink result);
-
-STDB_EXPORT(__call_procedure__)
-int16_t __call_procedure__(
-    uint32_t id,
-    uint64_t sender_0, uint64_t sender_1, uint64_t sender_2, uint64_t sender_3,
-    uint64_t conn_id_0, uint64_t conn_id_1,
-    uint64_t timestamp_microseconds,
-    BytesSource args_source,
-    BytesSink result_sink);
-
-STDB_EXPORT(__call_http_handler__)
-int16_t __call_http_handler__(
-    uint32_t id,
-    uint64_t timestamp_microseconds,
-    BytesSource request_source,
-    BytesSource request_body_source,
-    BytesSink response_sink,
-    BytesSink response_body_sink);
-
 // ========================================================================
 // WASI SHIMS
 // ========================================================================

crates/bindings-cpp/include/spacetimedb/abi/abi.h

@@ -3,10 +3,6 @@
 
 #pragma once
 
-#ifndef SPACETIMEDB_UNSTABLE_FEATURES
-#error "spacetimedb/http.h requires SPACETIMEDB_UNSTABLE_FEATURES to be enabled"
-#endif
-
 #include <string>
 #include <vector>
 #include <optional>
@@ -316,10 +312,8 @@ class HttpClient {
 
 } // namespace SpacetimeDB
 
-// Include implementation dependencies after class definition to avoid circular dependencies
-#if defined(SPACETIMEDB_UNSTABLE_FEATURES) && !defined(SPACETIMEDB_HTTP_CONVERT_H)
-#include "spacetimedb/logger.h"
-#include "spacetimedb/http_convert.h"
+// Include implementation after class definition to avoid circular dependencies
+#ifdef SPACETIMEDB_UNSTABLE_FEATURES
 #include "spacetimedb/http_client_impl.h"
 #endif
 

crates/bindings-cpp/include/spacetimedb/handler_context.h

@@ -7,7 +7,7 @@
 #include "spacetimedb/http_convert.h"
 #include "spacetimedb/abi/abi.h"
 #include "spacetimedb/bsatn/bsatn.h"
-#include "spacetimedb/internal/runtime_registration.h"
+#include "spacetimedb/internal/Module.h"
 
 namespace SpacetimeDB {
 
@@ -23,9 +23,9 @@ inline Outcome<HttpResponse> HttpClient::SendImpl(const HttpRequest& request) {
     // Prepare body bytes
     const std::vector<uint8_t>& body_bytes = request.body.bytes;
 
-    // The host ABI requires a non-null, in-bounds body pointer even when body_len == 0.
-    static const uint8_t empty_sentinel = 0;
-    const uint8_t* body_ptr = body_bytes.empty() ? &empty_sentinel : body_bytes.data();
+    // Call host function
+    // Note: For empty body, we need to pass a valid pointer, not null
+    const uint8_t* body_ptr = body_bytes.empty() ? reinterpret_cast<const uint8_t*>("") : body_bytes.data();
 
     BytesSource out[2] = {BytesSource{0}, BytesSource{0}};
     Status status = procedure_http_request(
@@ -40,11 +40,15 @@ inline Outcome<HttpResponse> HttpClient::SendImpl(const HttpRequest& request) {
         if (status.inner == 21) {
             // Read error message from out[0]
             std::vector<uint8_t> error_bytes = Internal::ConsumeBytes(out[0]);
-           
+            
+            LOG_INFO("HTTP: Error bytes: " + std::to_string(error_bytes.size()));
+            
             // Decode BSATN string
             bsatn::Reader reader(error_bytes.data(), error_bytes.size());
             std::string error_message = bsatn::deserialize<std::string>(reader);
 
+            LOG_INFO("HTTP: Error message: " + error_message);
+            
             return Err<HttpResponse>(std::move(error_message));
         }
 
@@ -53,6 +57,7 @@ inline Outcome<HttpResponse> HttpClient::SendImpl(const HttpRequest& request) {
             return Err<HttpResponse>("HTTP requests are blocked inside transactions. Call HTTP before with_tx() or try_with_tx().");
         }
 
+        LOG_INFO("HTTP: Unknown error code: " + std::to_string(status.inner));
         return Err<HttpResponse>("HTTP request failed with status code: " + std::to_string(status.inner));
     }
 

crates/bindings-cpp/include/spacetimedb/http.h

@@ -237,12 +237,6 @@ inline HttpRequest from_wire(const wire::HttpRequest& request) {
     return result;
 }
 
-inline HttpRequest from_wire(const wire::HttpRequest& request, std::vector<uint8_t> body) {
-    HttpRequest result = from_wire(request);
-    result.body.bytes = std::move(body);
-    return result;
-}
-
 // ==================== HttpResponse Conversions ====================
 
 /**
@@ -274,16 +268,7 @@ inline HttpResponse from_wire(const wire::HttpResponse& response) {
     return result;
 }
 
-inline std::pair<wire::HttpResponse, std::vector<uint8_t>> to_wire_split(const HttpResponse& response) {
-    return {to_wire(response), response.body.bytes};
-}
-
 } // namespace convert
 } // namespace SpacetimeDB
 
-#ifdef SPACETIMEDB_UNSTABLE_FEATURES
-#include "spacetimedb/logger.h"
-#include "spacetimedb/http_client_impl.h"
-#endif
-
 #endif // SPACETIMEDB_HTTP_CONVERT_H