Make activity_definitions consistent

Author: Sushisource

crates/common-wasm/src/activity_definition.rs

@@ -1,7 +1,11 @@
 //! Contains types for activity definitions, used by the code generated by the macros for defining
 //! activities, or directly by users targeting activities in other languages.
 
-use crate::data_converters::{TemporalDeserializable, TemporalSerializable};
+use crate::{
+    data_converters::{TemporalDeserializable, TemporalSerializable},
+    protos::temporal::api::common::v1::Payload,
+};
+use std::time::Duration;
 
 /// Implement on a marker struct to define an activity.
 ///
@@ -18,3 +22,46 @@ pub trait ActivityDefinition {
     where
         Self: Sized;
 }
+
+/// 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 indicate your activity is cancelling
+    Cancelled {
+        /// Some data to save as the cancellation reason
+        details: Option<Payload>,
+    },
+    /// 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,
+}
+
+impl ActivityError {
+    /// Construct a cancelled error without details
+    pub fn cancelled() -> Self {
+        Self::Cancelled { details: None }
+    }
+}
+
+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,
+        }
+    }
+}

crates/common-wasm/src/lib.rs

@@ -14,7 +14,7 @@ pub mod protos;
 pub mod worker;
 mod workflow_definition;
 
-pub use activity_definition::ActivityDefinition;
+pub use activity_definition::{ActivityDefinition, ActivityError};
 pub use priority::Priority;
 pub use worker::WorkerDeploymentVersion;
 pub use workflow_definition::{

crates/common/src/lib.rs

@@ -16,9 +16,9 @@ pub mod protos;
 pub mod telemetry;
 pub mod worker;
 pub use temporalio_common_wasm::{
-    ActivityDefinition, HasWorkflowDefinition, Priority, QueryDefinition, SignalDefinition,
-    UntypedWorkflow, UpdateDefinition, WorkerDeploymentVersion, WorkflowDefinition,
-    data_converters,
+    ActivityDefinition, ActivityError, HasWorkflowDefinition, Priority, QueryDefinition,
+    SignalDefinition, UntypedWorkflow, UpdateDefinition, WorkerDeploymentVersion,
+    WorkflowDefinition, data_converters,
 };
 
 macro_rules! dbg_panic {