Skip to content

Commit b81d832

Browse files
authored
bump core commit to latest (#2028)
1 parent 3f7885f commit b81d832

4 files changed

Lines changed: 27 additions & 99 deletions

File tree

packages/core-bridge/Cargo.lock

Lines changed: 11 additions & 97 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/core-bridge/sdk-core

Submodule sdk-core updated 76 files

packages/core-bridge/src/client.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,12 +627,20 @@ mod config {
627627
metrics_meter: Option<TemporalMeter>,
628628
) -> ConnectionOptions {
629629
let (ascii_headers, bin_headers) = partition_headers(self.headers);
630+
let http_connect_proxy = self.http_connect_proxy.map(Into::into);
630631

631632
ConnectionOptions::new(self.target_url)
632633
.client_name(self.client_name)
633634
.client_version(self.client_version)
634635
.maybe_tls_options(self.tls.map(Into::into))
635-
.maybe_http_connect_proxy(self.http_connect_proxy.map(Into::into))
636+
.maybe_http_connect_proxy(http_connect_proxy.clone())
637+
// DNS load balancing is mutually exclusive with HTTP CONNECT proxy in sdk-core.
638+
// Disable it when a proxy is configured; otherwise use the default.
639+
.dns_load_balancing(if http_connect_proxy.is_some() {
640+
None
641+
} else {
642+
Some(temporalio_client::DnsLoadBalancingOptions::default())
643+
})
636644
.maybe_headers(ascii_headers)
637645
.maybe_binary_headers(bin_headers)
638646
.maybe_api_key(self.api_key)

packages/core-bridge/src/worker.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,12 @@ pub fn worker_complete_nexus_task(
339339
#[js_function]
340340
pub fn worker_initiate_shutdown(worker: OpaqueInboundHandle<Worker>) -> BridgeResult<()> {
341341
let worker_ref = worker.borrow()?;
342+
343+
// Core worker shutdown now spawns a Tokio task, so this sync Neon binding must
344+
// enter Core's Tokio runtime before initiating shutdown.
345+
let runtime = worker_ref.core_runtime.clone();
346+
enter_sync!(runtime);
347+
342348
worker_ref.core_worker.initiate_shutdown();
343349
Ok(())
344350
}

0 commit comments

Comments
 (0)