@temporalio/core-bridge 0.15.0 → 0.17.0

package/Cargo.lock

@@ -39,9 +39,9 @@ checksum = "ee10e43ae4a853c0a3591d4e2ada1719e553be18199d9da9d4a83f5927c2f5c7"
 
 [[package]]
 name = "arc-swap"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6df5aef5c5830360ce5218cecb8f018af3438af5686ae945094affc86fdec63"
+checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f"
 
 [[package]]
 name = "async-stream"
@@ -124,9 +124,9 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
 
 [[package]]
 name = "cc"
-version = "1.0.71"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd"
+checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
 
 [[package]]
 name = "cfg-if"
@@ -563,9 +563,9 @@ checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440"
 
 [[package]]
 name = "hyper"
-version = "0.14.14"
+version = "0.14.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b91bb1f221b6ea1f1e4371216b70f40748774c2fb5971b450c07773fb92d26b"
+checksum = "436ec0091e4f20e655156a30a0df3770fe2900aa301e548e08446ec794b6953c"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1418,9 +1418,9 @@ checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
 
 [[package]]
 name = "serde_json"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e466864e431129c7e0d3476b92f20458e5879919a0596c6472738d9fa2d342f8"
+checksum = "e277c495ac6cd1a01a58d0a0c574568b4d1ddf14f59965c6a58b8d96400b54f3"
 dependencies = [
  "itoa",
  "ryu",
@@ -1550,6 +1550,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-stream",
+ "tokio-util",
  "tonic 0.6.1",
  "tonic-build 0.6.0",
  "tower",
@@ -1634,9 +1635,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.13.0"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "588b2d10a336da58d877567cd8fb8a14b463e2104910f8132cd054b4b96e29ee"
+checksum = "70e992e41e0d2fb9f755b37446f20900f64446ef54874f40a60c78f021ac6144"
 dependencies = [
  "autocfg",
  "bytes",
@@ -1664,9 +1665,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "1.5.1"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "114383b041aa6212c579467afa0075fbbdd0718de036100bc0ba7961d8cb9095"
+checksum = "c9efc1aba077437943f7515666aa2b882dfabfbfdf89c819ea75a8d6e9eaba5e"
 dependencies = [
  "proc-macro2",
  "quote",

package/index.d.ts

@@ -125,6 +125,20 @@ export interface WorkerOptions {
    * Maximum number of Workflow instances to cache before automatic eviction
    */
   maxCachedWorkflows: number;
+  /**
+   * Longest interval for throttling activity heartbeats
+   * @default 60 seconds
+   */
+  maxHeartbeatThrottleIntervalMs: number;
+
+  /**
+   * Default interval for throttling activity heartbeats in case
+   * `ActivityOptions.heartbeat_timeout` is unset.
+   * When the timeout *is* set in the `ActivityOptions`, throttling is set to
+   * `heartbeat_timeout * 0.8`.
+   * @default 30 seconds
+   */
+  defaultHeartbeatThrottleIntervalMs: number;
 }
 
 /** Log level - must match rust log level names */

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@temporalio/core-bridge",
-  "version": "0.15.0",
+  "version": "0.17.0",
   "description": "Temporal.io SDK Core<>Node bridge",
   "main": "index.node",
   "types": "index.d.ts",
   "scripts": {
-    "build-rust": "TEMPORAL_WORKER_FORCE_BUILD=true node ./scripts/build.js",
+    "build-rust": "node ./scripts/build.js --force",
     "build": "npm run build-rust",
     "install": "node ./scripts/build.js"
   },
@@ -19,8 +19,10 @@
   "license": "MIT",
   "dependencies": {
     "@opentelemetry/api": "^1.0.3",
-    "@temporalio/common": "^0.15.0",
-    "cargo-cp-artifact": "^0.1.4"
+    "@temporalio/common": "^0.17.0",
+    "arg": "^5.0.1",
+    "cargo-cp-artifact": "^0.1.4",
+    "which": "^2.0.2"
   },
   "bugs": {
     "url": "https://github.com/temporalio/sdk-typescript/issues"
@@ -38,5 +40,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "81960030b31d52200129d6ea9ebfaa12771dcc45"
+  "gitHead": "7706410cb67a1c92b9ae9eea1cac48e0dad4a8d1"
 }

package/scripts/build.js

@@ -1,33 +1,71 @@
 const path = require('path');
+const arg = require('arg');
 const os = require('os');
 const fs = require('fs');
+const which = require('which');
 const { spawnSync } = require('child_process');
+const { version } = require('../package.json');
 
 process.chdir(path.resolve(__dirname, '..'));
 
+// List of tested compile targets
 const targets = [
   'x86_64-apple-darwin',
   'aarch64-apple-darwin',
   'x86_64-unknown-linux-gnu',
   'aarch64-unknown-linux-gnu',
+  // TODO: this is not supported on macos
+  'x86_64-pc-windows-msvc',
   'x86_64-pc-windows-gnu',
 ];
 
-const requestedTargets =
-  process.env.TEMPORAL_WORKER_BUILD_TARGETS === 'all'
-    ? targets
-    : process.env.TEMPORAL_WORKER_BUILD_TARGETS
-    ? process.env.TEMPORAL_WORKER_BUILD_TARGETS.split(':')
-    : [];
-
-// Only applicable if TEMPORAL_WORKER_BUILD_TARGETS is not specified
-const forceBuild = new Set(['y', 't', '1', 'yes', 'true']).has(
-  (process.env.TEMPORAL_WORKER_FORCE_BUILD || '').toLowerCase()
-);
-
 const archAlias = { x64: 'x86_64', arm64: 'aarch64' };
 const platformMapping = { darwin: 'apple-darwin', linux: 'unknown-linux-gnu', win32: 'pc-windows-gnu' };
 
+const args = arg({
+  '--help': Boolean,
+  '-h': '--help',
+  '--version': Boolean,
+  '-v': '--version',
+  '--target': [String],
+  '--force': Boolean,
+  '-f': '--force',
+});
+
+const HELP_STRING = `${path.basename(
+  process.argv[1]
+)} compiles the Core SDK and temporal-sdk-typescript-bridge Rust libraries
+
+Options:
+
+-h, --help     Show this help message and exit
+-v, --version  Show program's version number and exit
+-f, --force    Forces a build instead of using a prebuilt binary
+-t, --target   Compilation targets, choose any of:
+  ${targets.concat('all').join('\n  ')}
+
+Happy compiling!`;
+
+if (args['--help']) {
+  console.log(HELP_STRING);
+  process.exit();
+}
+if (args['--version']) {
+  console.log(version);
+  process.exit();
+}
+// });
+
+// prepare recompile options
+const targetsArg = args['--target'] || [];
+const requestedTargets = targetsArg.includes('all') ? targets : targetsArg;
+const unsupportedTargets = requestedTargets.filter((t) => !targets.includes(t));
+if (unsupportedTargets.length) {
+  console.error(`Unsupported targets ${JSON.stringify(unsupportedTargets)}`);
+  process.exit(1);
+}
+const forceBuild = args['--force'];
+
 function compile(target) {
   console.log('Compiling bridge', { target });
 
@@ -39,26 +77,25 @@ function compile(target) {
       throw err;
     }
   }
-  const { status, error } = spawnSync(
-    'cargo-cp-artifact',
-    [
-      '--artifact',
-      'cdylib',
-      'temporal_sdk_typescript_bridge',
-      out,
-      '--',
-      'cargo',
-      'build',
-      '--message-format=json-render-diagnostics',
-      '--release',
-      ...(target ? ['--target', target] : []),
-    ],
-    { stdio: 'inherit' }
-  );
-  if (error !== undefined) {
-    console.error(`Failed to build${target ? ' for ' + target : ''}`);
-    throw error;
-  }
+
+  const argv = [
+    '--artifact',
+    'cdylib',
+    'temporal_sdk_typescript_bridge',
+    out,
+    '--',
+    'cargo',
+    'build',
+    '--message-format=json-render-diagnostics',
+    '--release',
+    ...(target ? ['--target', target] : []),
+  ];
+  const cmd = which.sync('cargo-cp-artifact');
+
+  console.log('Running', cmd, argv);
+  const { status } = spawnSync(cmd, argv, {
+    stdio: 'inherit',
+  });
   if (status !== 0) {
     throw new Error(`Failed to build${target ? ' for ' + target : ''}`);
   }
@@ -110,7 +147,7 @@ if (requestedTargets.length > 0) {
       }
     }
   } else {
-    console.log('Force build via TEMPORAL_WORKER_FORCE_BUILD env var');
+    console.log('Forced the build via --force');
     compile();
   }
 }

package/sdk-core/Cargo.toml

@@ -43,6 +43,7 @@ ringbuf = "0.2"
 slotmap = "1.0"
 thiserror = "1.0"
 tokio = { version = "1.1", features = ["rt", "rt-multi-thread", "parking_lot", "time", "fs"] }
+tokio-util = { version = "0.6.9" }
 tokio-stream = "0.1"
 tonic = { version = "0.6", features = ["tls", "tls-roots"] }
 tower = "0.4"

package/sdk-core/fsm/rustfsm_procmacro/Cargo.toml

@@ -24,4 +24,4 @@ rustfsm_trait = { version = "0.1", path = "../rustfsm_trait" }
 trybuild = { version = "1.0", features = ["diff"] }
 
 [package.metadata.workspaces]
-independent = true
+independent = true

package/sdk-core/fsm/rustfsm_procmacro/src/lib.rs

@@ -1,5 +1,3 @@
-extern crate proc_macro;
-
 use proc_macro::TokenStream;
 use quote::{quote, quote_spanned};
 use std::collections::{hash_map::Entry, HashMap, HashSet};
@@ -82,7 +80,7 @@ use syn::{
 ///                     ReadingCard { card_data: data.clone() }.into(),
 ///                     SharedState { last_id: Some(data) }
 ///                 )
-///             }   
+///             }
 ///         }
 ///     }
 /// }
@@ -200,7 +198,7 @@ impl Parse for StateMachineDefinition {
         // Parse visibility if present
         let visibility = input.parse()?;
         // parse the state machine name, command type, and error type
-        let (name, command_type, error_type, shared_state_type) = parse_machine_types(&input)
+        let (name, command_type, error_type, shared_state_type) = parse_machine_types(input)
             .map_err(|mut e| {
                 e.combine(Error::new(
                     e.span(),
@@ -235,7 +233,7 @@ impl Parse for StateMachineDefinition {
     }
 }
 
-fn parse_machine_types(input: &ParseStream) -> Result<(Ident, Ident, Ident, Option<Type>)> {
+fn parse_machine_types(input: ParseStream) -> Result<(Ident, Ident, Ident, Option<Type>)> {
     let _: kw::name = input.parse()?;
     let name: Ident = input.parse()?;
     input.parse::<Token![;]>()?;
@@ -443,7 +441,7 @@ impl StateMachineDefinition {
                                         },
                             multi_dests => {
                                 let string_dests: Vec<_> = multi_dests.iter()
-                                    .map(|i| i.to_string()).collect();
+                                    .map(ToString::to_string).collect();
                                 let enum_ident = Ident::new(&string_dests.join("Or"),
                                                             multi_dests[0].span());
                                 let multi_dest_enum = quote! {
@@ -558,6 +556,7 @@ impl StateMachineDefinition {
                 fn state(&self) -> &Self::State {
                     &self.state
                 }
+
                 fn set_state(&mut self, new: Self::State) {
                     self.state = new
                 }
@@ -590,7 +589,7 @@ impl StateMachineDefinition {
             #trait_impl
         };
 
-        output.into()
+        TokenStream::from(output)
     }
 
     fn all_states(&self) -> HashSet<Ident> {
@@ -628,7 +627,7 @@ impl StateMachineDefinition {
 /// Merge transition's dest state lists for those with the same from state & handler
 fn merge_transition_dests(transitions: Vec<Transition>) -> Vec<Transition> {
     let mut map = HashMap::<_, Transition>::new();
-    transitions.into_iter().for_each(|t| {
+    for t in transitions {
         // We want to use the transition sans-destinations as the key
         let without_dests = {
             let mut wd = t.clone();
@@ -643,6 +642,6 @@ fn merge_transition_dests(transitions: Vec<Transition>) -> Vec<Transition> {
                 v.insert(t);
             }
         }
-    });
+    }
     map.into_iter().map(|(_, v)| v).collect()
 }

package/sdk-core/fsm/rustfsm_trait/Cargo.toml

@@ -11,4 +11,4 @@ description = "Trait sub-crate of the `rustfsm` crate"
 [dependencies]
 
 [package.metadata.workspaces]
-independent = true
+independent = true

package/sdk-core/fsm/rustfsm_trait/src/lib.rs

@@ -112,7 +112,7 @@ where
     pub fn unwrap(self) -> Vec<M::Command> {
         match self {
             Self::Ok { commands } => commands,
-            _ => panic!("Transition was not successful!"),
+            Self::InvalidTransition => panic!("Transition was not successful!"),
         }
     }
 }

package/sdk-core/sdk-core-protos/src/lib.rs

@@ -38,7 +38,7 @@ pub mod coresdk {
                 activity_id: String,
                 reason: ActivityCancelReason,
             ) -> Self {
-                ActivityTask {
+                Self {
                     task_token,
                     activity_id,
                     variant: Some(activity_task::Variant::Cancel(Cancel {
@@ -75,7 +75,7 @@ pub mod coresdk {
                     })),
                 }
             }
-            pub fn will_complete_async() -> Self {
+            pub const fn will_complete_async() -> Self {
                 Self {
                     status: Some(activity_result::Status::WillCompleteAsync(
                         WillCompleteAsync {},
@@ -195,7 +195,7 @@ pub mod coresdk {
                     "jobs: {})",
                     self.jobs
                         .iter()
-                        .map(|j| j.to_string())
+                        .map(ToString::to_string)
                         .collect::<Vec<_>>()
                         .as_slice()
                         .join(", ")
@@ -264,18 +264,18 @@ pub mod coresdk {
     }
 
     pub mod workflow_completion {
-        use crate::coresdk::workflow_completion::wf_activation_completion::Status;
         tonic::include_proto!("coresdk.workflow_completion");
 
         impl wf_activation_completion::Status {
-            pub fn is_success(&self) -> bool {
+            pub const fn is_success(&self) -> bool {
                 match &self {
-                    Status::Successful(_) => true,
-                    Status::Failed(_) => false,
+                    Self::Successful(_) => true,
+                    Self::Failed(_) => false,
                 }
             }
         }
     }
+
     pub mod child_workflow {
         tonic::include_proto!("coresdk.child_workflow");
     }
@@ -370,7 +370,7 @@ pub mod coresdk {
 
     impl From<wf_activation_job::Variant> for WfActivationJob {
         fn from(a: wf_activation_job::Variant) -> Self {
-            WfActivationJob { variant: Some(a) }
+            Self { variant: Some(a) }
         }
     }
 
@@ -382,7 +382,7 @@ pub mod coresdk {
 
     impl From<workflow_command::Variant> for WorkflowCommand {
         fn from(v: workflow_command::Variant) -> Self {
-            WorkflowCommand { variant: Some(v) }
+            Self { variant: Some(v) }
         }
     }
 
@@ -591,7 +591,7 @@ pub mod coresdk {
     }
 
     impl ActivityResult {
-        pub fn ok(result: Payload) -> Self {
+        pub const fn ok(result: Payload) -> Self {
             Self {
                 status: Some(activity_result::activity_result::Status::Completed(
                     activity_result::Success {
@@ -615,24 +615,18 @@ pub mod coresdk {
                 .workflow_execution
                 .map(|we| (we.workflow_id, we.run_id))
                 .unwrap_or_default();
-            ActivityTask {
+            Self {
                 task_token: r.task_token,
                 activity_id: r.activity_id,
                 variant: Some(activity_task::activity_task::Variant::Start(
                     activity_task::Start {
                         workflow_namespace: r.workflow_namespace,
-                        workflow_type: r
-                            .workflow_type
-                            .map(|wt| wt.name)
-                            .unwrap_or_else(|| "".to_string()),
+                        workflow_type: r.workflow_type.map_or_else(|| "".to_string(), |wt| wt.name),
                         workflow_execution: Some(common::WorkflowExecution {
                             workflow_id,
                             run_id,
                         }),
-                        activity_type: r
-                            .activity_type
-                            .map(|at| at.name)
-                            .unwrap_or_else(|| "".to_string()),
+                        activity_type: r.activity_type.map_or_else(|| "".to_string(), |at| at.name),
                         header_fields: r.header.map(Into::into).unwrap_or_default(),
                         input: Vec::from_payloads(r.input),
                         heartbeat_details: Vec::from_payloads(r.heartbeat_details),
@@ -664,7 +658,7 @@ pub mod coresdk {
 
     impl From<common::WorkflowExecution> for WorkflowExecution {
         fn from(exc: common::WorkflowExecution) -> Self {
-            WorkflowExecution {
+            Self {
                 workflow_id: exc.workflow_id,
                 run_id: exc.run_id,
             }
@@ -767,7 +761,7 @@ pub mod coresdk {
         T: AsRef<[u8]>,
     {
         fn from(v: T) -> Self {
-            Payloads {
+            Self {
                 payloads: vec![v.into()],
             }
         }
@@ -786,10 +780,10 @@ pub mod coresdk {
             match v.payloads.pop() {
                 None => Err(PayloadsToPayloadError::NoPayload),
                 Some(p) => {
-                    if !v.payloads.is_empty() {
-                        Err(PayloadsToPayloadError::MoreThanOnePayload)
-                    } else {
+                    if v.payloads.is_empty() {
                         Ok(p.into())
+                    } else {
+                        Err(PayloadsToPayloadError::MoreThanOnePayload)
                     }
                 }
             }
@@ -1091,26 +1085,22 @@ pub mod temporal {
                 impl HistoryEvent {
                     /// Returns true if this is an event created to mirror a command
                     pub fn is_command_event(&self) -> bool {
-                        if let Some(et) = EventType::from_i32(self.event_type) {
-                            match et {
-                                EventType::ActivityTaskScheduled
-                                | EventType::ActivityTaskCancelRequested
-                                | EventType::MarkerRecorded
-                                | EventType::RequestCancelExternalWorkflowExecutionInitiated
-                                | EventType::SignalExternalWorkflowExecutionInitiated
-                                | EventType::StartChildWorkflowExecutionInitiated
-                                | EventType::TimerCanceled
-                                | EventType::TimerStarted
-                                | EventType::UpsertWorkflowSearchAttributes
-                                | EventType::WorkflowExecutionCanceled
-                                | EventType::WorkflowExecutionCompleted
-                                | EventType::WorkflowExecutionContinuedAsNew
-                                | EventType::WorkflowExecutionFailed => true,
-                                _ => false,
-                            }
-                        } else {
-                            false
-                        }
+                        EventType::from_i32(self.event_type).map_or(false, |et| match et {
+                            EventType::ActivityTaskScheduled
+                            | EventType::ActivityTaskCancelRequested
+                            | EventType::MarkerRecorded
+                            | EventType::RequestCancelExternalWorkflowExecutionInitiated
+                            | EventType::SignalExternalWorkflowExecutionInitiated
+                            | EventType::StartChildWorkflowExecutionInitiated
+                            | EventType::TimerCanceled
+                            | EventType::TimerStarted
+                            | EventType::UpsertWorkflowSearchAttributes
+                            | EventType::WorkflowExecutionCanceled
+                            | EventType::WorkflowExecutionCompleted
+                            | EventType::WorkflowExecutionContinuedAsNew
+                            | EventType::WorkflowExecutionFailed => true,
+                            _ => false,
+                        })
                     }
 
                     /// Returns the command's initiating event id, if present. This is the id of the
@@ -1262,16 +1252,14 @@ pub mod temporal {
                         let last_event = self
                             .history
                             .as_ref()
-                            .map(|h| h.events.last().map(|he| he.event_id))
-                            .flatten()
+                            .and_then(|h| h.events.last().map(|he| he.event_id))
                             .unwrap_or(0);
                         write!(
                             f,
                             "PollWFTQResp(run_id: {}, attempt: {}, last_event: {})",
                             self.workflow_execution
                                 .as_ref()
-                                .map(|we| we.run_id.as_str())
-                                .unwrap_or(""),
+                                .map_or("", |we| we.run_id.as_str()),
                             self.attempt,
                             last_event
                         )

package/sdk-core/src/core_tests/activity_tasks.rs

@@ -76,7 +76,7 @@ async fn max_activities_respected() {
     core.register_worker(
         WorkerConfigBuilder::default()
             .task_queue(TEST_Q)
-            .max_outstanding_activities(2usize)
+            .max_outstanding_activities(2_usize)
             .build()
             .unwrap(),
     )
@@ -163,7 +163,7 @@ async fn heartbeats_report_cancels_only_once() {
     core.record_activity_heartbeat(ActivityHeartbeat {
         task_token: act.task_token.clone(),
         task_queue: TEST_Q.to_string(),
-        details: vec![vec![1u8, 2, 3].into()],
+        details: vec![vec![1_u8, 2, 3].into()],
     });
     // We have to wait a beat for the heartbeat to be processed
     sleep(Duration::from_millis(10)).await;
@@ -183,7 +183,7 @@ async fn heartbeats_report_cancels_only_once() {
     core.record_activity_heartbeat(ActivityHeartbeat {
         task_token: act.task_token,
         task_queue: TEST_Q.to_string(),
-        details: vec![vec![1u8, 2, 3].into()],
+        details: vec![vec![1_u8, 2, 3].into()],
     });
     sleep(Duration::from_millis(10)).await;
     // Since cancels always come before new tasks, if we get a new non-cancel task, we did not
@@ -251,7 +251,7 @@ async fn activity_cancel_interrupts_poll() {
             core.record_activity_heartbeat(ActivityHeartbeat {
                 task_token: act.task_token,
                 task_queue: TEST_Q.to_string(),
-                details: vec![vec![1u8, 2, 3].into()],
+                details: vec![vec![1_u8, 2, 3].into()],
             });
             last_finisher.store(1, Ordering::SeqCst);
         },
@@ -358,7 +358,7 @@ async fn many_concurrent_heartbeat_cancels() {
             .task_queue(TEST_Q)
             .max_outstanding_activities(CONCURRENCY_NUM)
             // Only 1 poll at a time to avoid over-polling and running out of responses
-            .max_concurrent_at_polls(1usize)
+            .max_concurrent_at_polls(1_usize)
             .build()
             .unwrap(),
     )