From 2b5f6749fbb1b00b7e03d834c2665e5ff23d2075 Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Wed, 16 Apr 2025 10:45:17 +0100 Subject: [PATCH 1/2] Fix some Embedded Swift issues in JavaScriptEventLoop This change fixes some of the issues that appear when building this library with Embedded Swift. It adds missing concurrency imports and avoids use of throwing tasks that are not supported in Embedded Swift. Standard Swift's `Result` type is used instead to express error throwing. --- Sources/JavaScriptEventLoop/JSSending.swift | 1 + .../JavaScriptEventLoop.swift | 21 ++++++++++--------- Sources/JavaScriptEventLoop/JobQueue.swift | 1 + .../WebWorkerDedicatedExecutor.swift | 3 +++ .../WebWorkerTaskExecutor.swift | 2 +- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Sources/JavaScriptEventLoop/JSSending.swift b/Sources/JavaScriptEventLoop/JSSending.swift index e0e28a2f..3408b232 100644 --- a/Sources/JavaScriptEventLoop/JSSending.swift +++ b/Sources/JavaScriptEventLoop/JSSending.swift @@ -1,3 +1,4 @@ +import _Concurrency @_spi(JSObject_id) import JavaScriptKit import _CJavaScriptKit diff --git a/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift b/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift index 6cd8de17..8948723d 100644 --- a/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift +++ b/Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift @@ -1,4 +1,5 @@ import JavaScriptKit +import _Concurrency import _CJavaScriptEventLoop import _CJavaScriptKit @@ -259,38 +260,38 @@ extension JavaScriptEventLoop { extension JSPromise { /// Wait for the promise to complete, returning (or throwing) its result. public var value: JSValue { - get async throws { - try await withUnsafeThrowingContinuation { [self] continuation in + get async throws(JSException) { + try await withUnsafeContinuation { [self] continuation in self.then( success: { - continuation.resume(returning: $0) + continuation.resume(returning: Swift.Result.success($0)) return JSValue.undefined }, failure: { - continuation.resume(throwing: JSException($0)) + continuation.resume(returning: Swift.Result.failure(.init($0))) return JSValue.undefined } ) - } + }.get() } } /// Wait for the promise to complete, returning its result or exception as a Result. /// /// - Note: Calling this function does not switch from the caller's isolation domain. - public func value(isolation: isolated (any Actor)? = #isolation) async throws -> JSValue { - try await withUnsafeThrowingContinuation(isolation: isolation) { [self] continuation in + public func value(isolation: isolated (any Actor)? = #isolation) async throws(JSException) -> JSValue { + try await withUnsafeContinuation(isolation: isolation) { [self] continuation in self.then( success: { - continuation.resume(returning: $0) + continuation.resume(returning: Swift.Result.success($0)) return JSValue.undefined }, failure: { - continuation.resume(throwing: JSException($0)) + continuation.resume(returning: Swift.Result.failure(.init($0))) return JSValue.undefined } ) - } + }.get() } /// Wait for the promise to complete, returning its result or exception as a Result. diff --git a/Sources/JavaScriptEventLoop/JobQueue.swift b/Sources/JavaScriptEventLoop/JobQueue.swift index cb583dae..a0f2c4bb 100644 --- a/Sources/JavaScriptEventLoop/JobQueue.swift +++ b/Sources/JavaScriptEventLoop/JobQueue.swift @@ -2,6 +2,7 @@ // The current implementation is much simple to be easily debugged, but should be re-implemented // using priority queue ideally. +import _Concurrency import _CJavaScriptEventLoop #if compiler(>=5.5) diff --git a/Sources/JavaScriptEventLoop/WebWorkerDedicatedExecutor.swift b/Sources/JavaScriptEventLoop/WebWorkerDedicatedExecutor.swift index eecaf93c..d42c5add 100644 --- a/Sources/JavaScriptEventLoop/WebWorkerDedicatedExecutor.swift +++ b/Sources/JavaScriptEventLoop/WebWorkerDedicatedExecutor.swift @@ -1,5 +1,7 @@ +#if !hasFeature(Embedded) import JavaScriptKit import _CJavaScriptEventLoop +import _Concurrency #if canImport(Synchronization) import Synchronization @@ -60,3 +62,4 @@ public final class WebWorkerDedicatedExecutor: SerialExecutor { self.underlying.enqueue(job) } } +#endif diff --git a/Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift b/Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift index a1962eb7..9fa7b881 100644 --- a/Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift +++ b/Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift @@ -1,4 +1,4 @@ -#if compiler(>=6.0) // `TaskExecutor` is available since Swift 6.0 +#if compiler(>=6.0) && !hasFeature(Embedded) // `TaskExecutor` is available since Swift 6.0, no multi-threading for embedded Wasm yet. import JavaScriptKit import _CJavaScriptKit From 86e2095e3024c57a927b1975ac39cc254517602a Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Wed, 16 Apr 2025 10:48:03 +0100 Subject: [PATCH 2/2] Fix formatting --- Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift b/Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift index 9fa7b881..651e7be2 100644 --- a/Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift +++ b/Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift @@ -1,4 +1,4 @@ -#if compiler(>=6.0) && !hasFeature(Embedded) // `TaskExecutor` is available since Swift 6.0, no multi-threading for embedded Wasm yet. +#if compiler(>=6.0) && !hasFeature(Embedded) // `TaskExecutor` is available since Swift 6.0, no multi-threading for embedded Wasm yet. import JavaScriptKit import _CJavaScriptKit