Error if no describe_module

Author: coolreader18

crates/core/src/host/v8/mod.rs

@@ -659,9 +659,8 @@ fn extract_description<'scope>(
         |a, b, c| log_traceback(replica_ctx, a, b, c),
         || {
             catch_exception(scope, |scope| {
-                let Some(describe_module) = get_hook(scope, ModuleHookKey::DescribeModule) else {
-                    return Ok(RawModuleDef::V9(Default::default()));
-                };
+                let describe_module = get_hook(scope, ModuleHookKey::DescribeModule)
+                    .context("The `spacetimedb/server` package was never imported into the module")?;
                 let def = call_describe_module(scope, describe_module)?;
                 Ok(def)
             })
@@ -675,14 +674,15 @@ fn extract_description<'scope>(
 mod test {
     use super::to_value::test::with_scope;
     use super::*;
+    use crate::host::v8::error::{ErrorOrException, ExceptionThrown};
     use crate::host::wasm_common::module_host_actor::ReducerOp;
     use crate::host::ArgsTuple;
     use spacetimedb_lib::{ConnectionId, Identity};
     use spacetimedb_primitives::ReducerId;
 
     fn with_module_catch<T>(
         code: &str,
-        logic: impl for<'scope> FnOnce(&mut PinScope<'scope, '_>) -> ExcResult<T>,
+        logic: impl for<'scope> FnOnce(&mut PinScope<'scope, '_>) -> Result<T, ErrorOrException<ExceptionThrown>>,
     ) -> anyhow::Result<T> {
         with_scope(|scope| {
             eval_user_module_catch(scope, code).unwrap();
@@ -708,7 +708,7 @@ mod test {
                     timestamp: Timestamp::from_micros_since_unix_epoch(24),
                     args: &ArgsTuple::nullary(),
                 };
-                call_call_reducer(scope, fun, op)
+                Ok(call_call_reducer(scope, fun, op)?)
             })
         };
 

crates/core/src/host/v8/syscall/mod.rs

@@ -1,11 +1,8 @@
-use spacetimedb_lib::RawModuleDef;
-use spacetimedb_lib::VersionTuple;
+use spacetimedb_lib::{RawModuleDef, VersionTuple};
 use v8::{callback_scope, Context, FixedArray, Local, Module, PinScope};
 
 use crate::host::v8::de::scratch_buf;
-use crate::host::v8::error::ExcResult;
-use crate::host::v8::error::Throwable;
-use crate::host::v8::error::TypeError;
+use crate::host::v8::error::{ErrorOrException, ExcResult, ExceptionThrown, Throwable, TypeError};
 use crate::host::wasm_common::abi::parse_abi_version;
 use crate::host::wasm_common::module_host_actor::{ReducerOp, ReducerResult};
 
@@ -85,7 +82,7 @@ pub(super) fn call_call_reducer(
 pub(super) fn call_describe_module<'scope>(
     scope: &mut PinScope<'scope, '_>,
     fun: HookFunction<'_>,
-) -> ExcResult<RawModuleDef> {
+) -> Result<RawModuleDef, ErrorOrException<ExceptionThrown>> {
     let HookFunction(ver, fun) = fun;
     match ver {
         AbiVersion::V1 => v1::call_describe_module(scope, fun),

crates/core/src/host/v8/syscall/v1.rs

@@ -4,7 +4,7 @@ use crate::database_logger::{LogLevel, Record};
 use crate::error::NodesError;
 use crate::host::instance_env::InstanceEnv;
 use crate::host::v8::de::{deserialize_js, scratch_buf};
-use crate::host::v8::error::{ExcResult, ExceptionThrown, TypeError};
+use crate::host::v8::error::{ErrorOrException, ExcResult, ExceptionThrown};
 use crate::host::v8::from_value::cast;
 use crate::host::v8::ser::serialize_to_js;
 use crate::host::v8::string::{str_from_ident, StringConst};
@@ -16,6 +16,7 @@ use crate::host::wasm_common::instrumentation::span;
 use crate::host::wasm_common::module_host_actor::{ReducerOp, ReducerResult};
 use crate::host::wasm_common::{err_to_errno_and_log, RowIterIdx, TimingSpan, TimingSpanIdx};
 use crate::host::AbiCall;
+use anyhow::Context;
 use spacetimedb_lib::{bsatn, ConnectionId, Identity, RawModuleDef};
 use spacetimedb_primitives::{errno, ColId, IndexId, ReducerId, TableId};
 use spacetimedb_sats::Serialize;
@@ -363,7 +364,10 @@ pub(super) fn call_call_reducer(
 }
 
 /// Calls the registered `__describe_module__` function hook.
-pub(super) fn call_describe_module(scope: &mut PinScope<'_, '_>, fun: Local<'_, Function>) -> ExcResult<RawModuleDef> {
+pub(super) fn call_describe_module(
+    scope: &mut PinScope<'_, '_>,
+    fun: Local<'_, Function>,
+) -> Result<RawModuleDef, ErrorOrException<ExceptionThrown>> {
     // Call the function.
     let raw_mod_js = call_free_fun(scope, fun, &[])?;
 
@@ -377,8 +381,7 @@ pub(super) fn call_describe_module(scope: &mut PinScope<'_, '_>, fun: Local<'_,
     .map_err(|e| e.throw(scope))?;
 
     let bytes = raw_mod.get_contents(&mut []);
-    let module =
-        bsatn::from_slice::<RawModuleDef>(bytes).map_err(|_e| TypeError("invalid bsatn module def").throw(scope))?;
+    let module = bsatn::from_slice::<RawModuleDef>(bytes).context("invalid bsatn module def")?;
     Ok(module)
 }