runtimes/js: better handling of void returns (encoredev#1543)

runtimes/js/src/api.rs

@@ -93,8 +93,9 @@ impl PromiseHandler for APIPromiseHandler {
         let Some(val) = val else {
             return Ok(None);
         };
+
         match parse_pvalues(val) {
-            Ok(val) => Ok(Some(val)),
+            Ok(val) => Ok(val),
             Err(err) => self.error(env, err),
         }
     }

runtimes/js/src/gateway.rs

@@ -118,7 +118,7 @@ impl PromiseHandler for AuthPromiseHandler {
     fn resolve(&self, env: Env, val: Option<napi::JsUnknown>) -> Self::Output {
         let Some(val) = val else { return Ok(None) };
         match parse_pvalues(val) {
-            Ok(val) => Ok(Some(val)),
+            Ok(val) => Ok(val),
             Err(err) => self.error(env, err),
         }
     }

runtimes/js/src/pubsub.rs

@@ -33,7 +33,13 @@ impl PubSubTopic {
         body: JsUnknown,
         source: Option<&Request>,
     ) -> napi::Result<JsObject> {
-        let payload = parse_pvalues(body).context("failed to parse payload")?;
+        let Some(payload) = parse_pvalues(body).context("failed to parse payload")? else {
+            return Err(Error::new(
+                Status::InvalidArg,
+                "no message payload provided",
+            ));
+        };
+
         let source = source.map(|s| s.inner.clone());
         let fut = self.topic.publish(payload, source);
         let fut = async move {

runtimes/js/src/pvalue.rs

@@ -9,9 +9,16 @@ pub fn parse_pvalue(val: JsUnknown) -> Result<PValue> {
     Ok(val.0)
 }
 
-pub fn parse_pvalues(val: JsUnknown) -> Result<PValues> {
+pub fn parse_pvalues(val: JsUnknown) -> Result<Option<PValues>> {
+    if val
+        .get_type()
+        .is_ok_and(|t| t == napi::ValueType::Undefined || t == napi::ValueType::Null)
+    {
+        return Ok(None);
+    }
+
     let val = PVals::from_unknown(val)?;
-    Ok(val.0)
+    Ok(Some(val.0))
 }
 
 #[allow(dead_code)]

runtimes/js/src/runtime.rs

@@ -184,7 +184,10 @@ impl Runtime {
         payload: Option<JsUnknown>,
         source: Option<&Request>,
     ) -> napi::Result<JsObject> {
-        let payload = payload.map(parse_pvalues).transpose()?;
+        let payload = match payload {
+            Some(payload) => parse_pvalues(payload)?,
+            None => None,
+        };
         let endpoint = encore_runtime_core::EndpointName::new(service, endpoint);
 
         let fut = self.do_api_call(endpoint, payload, source);
@@ -237,7 +240,10 @@ impl Runtime {
         payload: Option<JsUnknown>,
         source: Option<&Request>,
     ) -> napi::Result<JsObject> {
-        let payload = payload.map(parse_pvalues).transpose()?;
+        let payload = match payload {
+            Some(payload) => parse_pvalues(payload)?,
+            None => None,
+        };
         let endpoint = encore_runtime_core::EndpointName::new(service, endpoint);
         let source = source.map(|s| s.inner.clone());
         let fut = self.runtime.api().stream(endpoint, payload, source);

runtimes/js/src/websocket_api.rs

@@ -165,7 +165,13 @@ impl WebSocketClient {
     #[napi]
     #[allow(dead_code)]
     pub fn send(&self, msg: JsUnknown) -> napi::Result<()> {
-        let msg = parse_pvalues(msg)?;
+        let Some(msg) = parse_pvalues(msg)? else {
+            return Err(napi::Error::new(
+                napi::Status::InvalidArg,
+                "no message data provided",
+            ));
+        };
+
         self.inner
             .send(msg)
             .map_err(|e| napi::Error::new(napi::Status::Unknown, e))?;