@temporalio/core-bridge 0.14.0 → 0.16.4

package/Cargo.lock

@@ -13,6 +13,15 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "aho-corasick"
+version = "0.7.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "ansi_term"
 version = "0.12.1"
@@ -30,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"
@@ -115,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"
@@ -334,6 +343,12 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
 
+[[package]]
+name = "fixedbitset"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e"
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -548,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",
@@ -650,9 +665,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.106"
+version = "0.2.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a60553f9a9e039a333b4e9b20573b9e9b9c0bb3a11e201ccc48ef4283456d673"
+checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219"
 
 [[package]]
 name = "libloading"
@@ -871,11 +886,11 @@ dependencies = [
  "futures",
  "http",
  "opentelemetry",
- "prost",
+ "prost 0.8.0",
  "thiserror",
  "tokio",
- "tonic",
- "tonic-build",
+ "tonic 0.5.2",
+ "tonic-build 0.5.2",
 ]
 
 [[package]]
@@ -935,7 +950,17 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7"
 dependencies = [
- "fixedbitset",
+ "fixedbitset 0.2.0",
+ "indexmap",
+]
+
+[[package]]
+name = "petgraph"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f"
+dependencies = [
+ "fixedbitset 0.4.0",
  "indexmap",
 ]
 
@@ -1020,7 +1045,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020"
 dependencies = [
  "bytes",
- "prost-derive",
+ "prost-derive 0.8.0",
+]
+
+[[package]]
+name = "prost"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001"
+dependencies = [
+ "bytes",
+ "prost-derive 0.9.0",
 ]
 
 [[package]]
@@ -1034,9 +1069,29 @@ dependencies = [
  "itertools",
  "log",
  "multimap",
- "petgraph",
- "prost",
- "prost-types",
+ "petgraph 0.5.1",
+ "prost 0.8.0",
+ "prost-types 0.8.0",
+ "tempfile",
+ "which",
+]
+
+[[package]]
+name = "prost-build"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5"
+dependencies = [
+ "bytes",
+ "heck",
+ "itertools",
+ "lazy_static",
+ "log",
+ "multimap",
+ "petgraph 0.6.0",
+ "prost 0.9.0",
+ "prost-types 0.9.0",
+ "regex",
  "tempfile",
  "which",
 ]
@@ -1054,6 +1109,19 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "prost-derive"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe"
+dependencies = [
+ "anyhow",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "prost-types"
 version = "0.8.0"
@@ -1061,7 +1129,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b"
 dependencies = [
  "bytes",
- "prost",
+ "prost 0.8.0",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a"
+dependencies = [
+ "bytes",
+ "prost 0.9.0",
 ]
 
 [[package]]
@@ -1134,6 +1212,8 @@ version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
 dependencies = [
+ "aho-corasick",
+ "memchr",
  "regex-syntax",
 ]
 
@@ -1338,9 +1418,9 @@ checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913"
 
 [[package]]
 name = "serde_json"
-version = "1.0.68"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f690853975602e1bfe1ccbf50504d67174e3bcf340f23b5ea9992e0587a52d8"
+checksum = "e277c495ac6cd1a01a58d0a0c574568b4d1ddf14f59965c6a58b8d96400b54f3"
 dependencies = [
  "itoa",
  "ryu",
@@ -1460,8 +1540,8 @@ dependencies = [
  "opentelemetry-prometheus",
  "parking_lot",
  "prometheus",
- "prost",
- "prost-types",
+ "prost 0.9.0",
+ "prost-types 0.9.0",
  "rand",
  "ringbuf",
  "rustfsm",
@@ -1470,8 +1550,9 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-stream",
- "tonic",
- "tonic-build",
+ "tokio-util",
+ "tonic 0.6.1",
+ "tonic-build 0.6.0",
  "tower",
  "tracing",
  "tracing-futures",
@@ -1486,10 +1567,10 @@ name = "temporal-sdk-core-protos"
 version = "0.1.0"
 dependencies = [
  "derive_more",
- "prost",
- "prost-types",
- "tonic",
- "tonic-build",
+ "prost 0.9.0",
+ "prost-types 0.9.0",
+ "tonic 0.6.1",
+ "tonic-build 0.5.2",
 ]
 
 [[package]]
@@ -1501,8 +1582,8 @@ dependencies = [
  "neon",
  "once_cell",
  "opentelemetry",
- "prost",
- "prost-types",
+ "prost 0.9.0",
+ "prost-types 0.9.0",
  "temporal-sdk-core",
  "temporal-sdk-core-protos",
  "tokio",
@@ -1539,9 +1620,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f83b2a3d4d9091d0abd7eba4dc2710b1718583bd4d8992e2190720ea38f391f7"
+checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -1554,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",
@@ -1584,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",
@@ -1648,8 +1729,39 @@ dependencies = [
  "hyper-timeout",
  "percent-encoding",
  "pin-project",
- "prost",
- "prost-derive",
+ "prost 0.8.0",
+ "prost-derive 0.8.0",
+ "tokio",
+ "tokio-stream",
+ "tokio-util",
+ "tower",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+ "tracing-futures",
+]
+
+[[package]]
+name = "tonic"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24203b79cf2d68909da91178db3026e77054effba0c5d93deb870d3ca7b35afa"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "base64",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-timeout",
+ "percent-encoding",
+ "pin-project",
+ "prost 0.9.0",
+ "prost-derive 0.9.0",
  "rustls-native-certs",
  "tokio",
  "tokio-rustls",
@@ -1669,7 +1781,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12b52d07035516c2b74337d2ac7746075e7dcae7643816c1b12c5ff8a7484c08"
 dependencies = [
  "proc-macro2",
- "prost-build",
+ "prost-build 0.8.0",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tonic-build"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88358bb1dcfeb62dcce85c63006cafb964b7be481d522b7e09589d4d1e718d2a"
+dependencies = [
+ "proc-macro2",
+ "prost-build 0.9.0",
  "quote",
  "syn",
 ]

package/Cargo.toml

@@ -15,9 +15,9 @@ futures = { version = "0.3", features = ["executor"] }
 log = "0.4"
 neon = { version = "0.8.0", default-features = false, features = ["napi-4", "event-queue-api"] }
 opentelemetry = "0.16"
-prost = "0.8"
-prost-types = "0.8"
-tokio = "1.4.0"
+prost = "0.9"
+prost-types = "0.9"
+tokio = "1.13"
 once_cell = "1.7.2"
 # TODO: revert back to version *, can't now because of this error: prerelease package needs to be specified explicitly
 temporal-sdk-core = { version = "0.1.0-alpha.1", path = "./sdk-core" }

package/index.d.ts

@@ -1,5 +1,4 @@
 import { TLSConfig } from '@temporalio/common';
-import { LogLevel } from '@temporalio/worker';
 import { SpanContext } from '@opentelemetry/api';
 
 export { TLSConfig };
@@ -126,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.14.0",
+  "version": "0.16.4",
   "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"
   },
@@ -18,8 +18,11 @@
   "author": "Roey Berman <roey@temporal.io>",
   "license": "MIT",
   "dependencies": {
-    "@temporalio/common": "^0.14.0",
-    "cargo-cp-artifact": "^0.1.4"
+    "@opentelemetry/api": "^1.0.3",
+    "@temporalio/common": "^0.16.4",
+    "arg": "^5.0.1",
+    "cargo-cp-artifact": "^0.1.4",
+    "which": "^2.0.2"
   },
   "bugs": {
     "url": "https://github.com/temporalio/sdk-typescript/issues"
@@ -37,5 +40,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fd09cf4d3c996c96bf604d2e318165cfbad18a4a"
+  "gitHead": "884a10970cdbc3e8d7991709e0fa3fe79fce71bd"
 }

package/scripts/build.js

@@ -1,27 +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, '..'));
 
-const targets = ['x86_64-apple-darwin', 'aarch64-apple-darwin', 'x86_64-unknown-linux-gnu', '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()
-);
+// 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 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 });
 
@@ -33,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 : ''}`);
   }
@@ -104,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/.buildkite/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.54
+FROM rust:1.56
 
 RUN rustup component add rustfmt && \
 	rustup component add clippy

package/sdk-core/Cargo.toml

@@ -2,7 +2,7 @@
 name = "temporal-sdk-core"
 version = "0.1.0-alpha.1"
 authors = ["Spencer Judge <spencer@temporal.io>", "Vitaly Arbuzov <vitaly@temporal.io>"]
-edition = "2018"
+edition = "2021"
 license-file = "LICENSE.txt"
 description = "Library for building new Temporal SDKs"
 homepage = "https://temporal.io/"
@@ -36,15 +36,16 @@ opentelemetry-otlp = { version = "0.9.0", features = ["tokio", "metrics"] }
 opentelemetry-prometheus = "0.9.0"
 parking_lot = { version = "0.11", features = ["send_guard"] }
 prometheus = "0.12"
-prost = "0.8"
-prost-types = "0.8"
+prost = "0.9"
+prost-types = "0.9"
 rand = "0.8.3"
 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.5", features = ["tls", "tls-roots"] }
+tonic = { version = "0.6", features = ["tls", "tls-roots"] }
 tower = "0.4"
 tracing = { version = "0.1", features = ["log-always"] }
 tracing-futures = "0.2"
@@ -70,7 +71,7 @@ rstest = "0.10"
 test_utils = { path = "test_utils" }
 
 [build-dependencies]
-tonic-build = "0.5"
+tonic-build = "0.6"
 
 [workspace]
 members = [".", "fsm", "test_utils", "sdk-core-protos"]

package/sdk-core/fsm/Cargo.toml

@@ -2,7 +2,7 @@
 name = "rustfsm"
 version = "0.1.0"
 authors = ["Spencer Judge <spencer@temporal.io>"]
-edition = "2018"
+edition = "2021"
 license-file = "LICENSE.txt"
 description = "Define state machines that can accept events and produce commands"
 homepage = "https://temporal.io/"

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

@@ -2,7 +2,7 @@
 name = "rustfsm_procmacro"
 version = "0.1.0"
 authors = ["Spencer Judge <spencer@temporal.io>"]
-edition = "2018"
+edition = "2021"
 license-file = "LICENSE.txt"
 description = "Procmacro sub-crate of the `rustfsm` crate"
 
@@ -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