Handle failure conversion merge

Author: Sushisource

crates/common-wasm/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "temporalio-common-wasm"
-version = "0.2.0"
+version = "0.4.0"
 edition = "2024"
 authors = ["Temporal Technologies Inc. <sdk@temporal.io>"]
 license-file = { workspace = true }
@@ -58,5 +58,6 @@ workspace = true
 
 [dev-dependencies]
 futures-util = { version = "0.3", default-features = false }
+rstest = "0.26"
 tempfile = "3.21"
 tokio = { version = "1.47", features = ["macros", "rt"] }

crates/common-wasm/src/activity_definition.rs

@@ -3,9 +3,8 @@
 
 use crate::{
     data_converters::{TemporalDeserializable, TemporalSerializable},
-    protos::temporal::api::common::v1::Payload,
+    error::{ApplicationFailure, FailurePayloads},
 };
-use std::time::Duration;
 
 /// Implement on a marker struct to define an activity.
 ///
@@ -26,22 +25,13 @@ pub trait ActivityDefinition {
 /// Returned as errors from activity functions.
 #[derive(Debug)]
 pub enum ActivityError {
-    /// This error can be returned from activities to allow the explicit configuration of certain
-    /// error properties. It's also the default error type that arbitrary errors will be converted
-    /// into.
-    Retryable {
-        /// The underlying error
-        source: Box<dyn std::error::Error + Send + Sync + 'static>,
-        /// If specified, the next retry (if there is one) will occur after this delay
-        explicit_delay: Option<Duration>,
-    },
+    /// Return this error to attach application-failure metadata to an activity failure.
+    Application(Box<ApplicationFailure>),
     /// Return this error to indicate your activity is cancelling
     Cancelled {
-        /// Some data to save as the cancellation reason
-        details: Option<Payload>,
+        /// Optional cancellation details.
+        details: Option<FailurePayloads>,
     },
-    /// Return this error to indicate that the activity should not be retried.
-    NonRetryable(Box<dyn std::error::Error + Send + Sync + 'static>),
     /// Return this error to indicate that the activity will be completed outside of this activity
     /// definition, by an external client.
     WillCompleteAsync,
@@ -52,16 +42,32 @@ impl ActivityError {
     pub fn cancelled() -> Self {
         Self::Cancelled { details: None }
     }
+
+    /// Construct a cancelled error with details that will be converted using the active data
+    /// converter.
+    pub fn cancelled_with_details<T>(details: T) -> Self
+    where
+        T: Into<FailurePayloads>,
+    {
+        Self::Cancelled {
+            details: Some(details.into()),
+        }
+    }
+
+    /// Construct an application activity error.
+    pub fn application(err: ApplicationFailure) -> Self {
+        Self::Application(err.into())
+    }
 }
 
 impl<E> From<E> for ActivityError
 where
     E: Into<anyhow::Error>,
 {
     fn from(source: E) -> Self {
-        Self::Retryable {
-            source: source.into().into_boxed_dyn_error(),
-            explicit_delay: None,
+        match source.into().downcast::<ApplicationFailure>() {
+            Ok(application_failure) => Self::Application(Box::new(application_failure)),
+            Err(err) => Self::Application(ApplicationFailure::new(err).into()),
         }
     }
 }

…src/data_converters/failure_converter.rs …src/data_converters/failure_converter.rscrates/common/src/data_converters/failure_converter.rs renamed to crates/common-wasm/src/data_converters/failure_converter.rs crates/common/src/data_converters/failure_converter.rs renamed to crates/common-wasm/src/data_converters/failure_converter.rs

@@ -9,6 +9,7 @@ extern crate tracing;
 
 mod activity_definition;
 pub mod data_converters;
+pub mod error;
 mod priority;
 pub mod protos;
 pub mod worker;

crates/common/src/error.rs crates/common-wasm/src/error.rscrates/common/src/error.rs renamed to crates/common-wasm/src/error.rs

@@ -161,6 +161,14 @@ pub mod coresdk {
                 }
             }
 
+            pub fn cancel(fail: APIFailure) -> Self {
+                Self {
+                    status: Some(aer::Status::Cancelled(Cancellation {
+                        failure: Some(fail),
+                    })),
+                }
+            }
+
             pub fn cancel_from_details(payload: Option<Payload>) -> Self {
                 Self {
                     status: Some(aer::Status::Cancelled(Cancellation::from_details(payload))),

crates/common-wasm/src/lib.rs

@@ -98,7 +98,7 @@ pbjson = { workspace = true }
 
 [dependencies.temporalio-common-wasm]
 path = "../common-wasm"
-version = "0.2"
+version = "0.4"
 features = ["grpc-clients"]
 
 [build-dependencies]

crates/common-wasm/src/protos/mod.rs

@@ -9,7 +9,6 @@ extern crate tracing;
 
 #[cfg(feature = "envconfig")]
 pub mod envconfig;
-pub mod error;
 #[doc(hidden)]
 pub mod fsm_trait;
 pub mod payload_visitor;
@@ -19,7 +18,7 @@ pub mod worker;
 pub use temporalio_common_wasm::{
     ActivityDefinition, ActivityError, HasWorkflowDefinition, Priority, QueryDefinition,
     SignalDefinition, UntypedWorkflow, UpdateDefinition, WorkerDeploymentVersion,
-    WorkflowDefinition, data_converters,
+    WorkflowDefinition, data_converters, error,
 };
 
 macro_rules! dbg_panic {

crates/common/Cargo.toml

@@ -47,7 +47,7 @@ default-features = false
 
 [dependencies.temporalio-workflow]
 path = "../workflow"
-version = "0.2"
+version = "0.4"
 
 [dependencies.temporalio-common]
 path = "../common"

crates/common/src/lib.rs

@@ -61,7 +61,6 @@ use temporalio_common::{
     data_converters::{
         DataConverter, GenericPayloadConverter, SerializationContext, SerializationContextData,
     },
-    error::{ApplicationFailure, FailurePayloads},
     protos::{
         coresdk::{ActivityHeartbeat, activity_task},
         temporal::api::common::v1::{Payload, RetryPolicy, WorkflowExecution},
@@ -382,6 +381,7 @@ impl Debug for ActivityDefinitions {
 mod test {
     use super::*;
     use rstest::rstest;
+    use temporalio_common::error::ApplicationFailure;
 
     #[rstest]
     #[case(true)]