Remove await with timeout to simplify runtime interface

Author: yonihemi

Runtime/src/index.ts

@@ -144,16 +144,6 @@ class SwiftRuntimeHeap {
 // Helper methods for asyncify
 const delay = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
 
-const promiseWithTimout = (promise: Promise<any>, timeout: number) => {
-    let timeoutPromise = new Promise((resolve, reject) => {
-        let timeoutID = setTimeout(() => {
-            clearTimeout(timeoutID);
-            reject(Error(`Promise timed out in ${timeout} ms`));
-        }, timeout);
-    });
-    return Promise.race([promise, timeoutPromise]);
-};
-
 export class SwiftRuntime {
     private instance: WebAssembly.Instance | null;
     private heap: SwiftRuntimeHeap;
@@ -658,16 +648,6 @@ export class SwiftRuntime {
                 const promise: Promise<any> = this.heap.referenceHeap(promiseRef);
                 syncAwait(promise, kind_ptr, payload1_ptr, payload2_ptr);
             },
-            swjs_sync_await_with_timeout: (
-                promiseRef: ref,
-                timeout: number,
-                kind_ptr: pointer,
-                payload1_ptr: pointer,
-                payload2_ptr: pointer
-            ) => {
-                const promise: Promise<any> = this.heap.referenceHeap(promiseRef);
-                syncAwait(promiseWithTimout(promise, timeout), kind_ptr, payload1_ptr, payload2_ptr);
-            },
         };
     }
 }

Sources/JavaScriptKit/PauseExecution.swift

@@ -18,16 +18,12 @@ extension JSPromise where Success == JSValue, Failure == JSError {
     ///
     /// **Important**: Wasm module must be [asyncified](https://emscripten.org/docs/porting/asyncify.html),
     /// otherwise JavaScriptKit's runtime will throw an exception.
-    public func syncAwait(timeout: Int32? = nil) -> Result<Success, Failure> {
+    public func syncAwait() -> Result<Success, Failure> {
         var kindAndFlags = JavaScriptValueKindAndFlags()
         var payload1 = JavaScriptPayload1()
         var payload2 = JavaScriptPayload2()
 
-        if let timout = timeout {
-            _syncAwaitWithTimout(jsObject.id, timout, &kindAndFlags, &payload1, &payload2)
-        } else {
-            _syncAwait(jsObject.id, &kindAndFlags, &payload1, &payload2)
-        }
+        _syncAwait(jsObject.id, &kindAndFlags, &payload1, &payload2)
         let result = RawJSValue(kind: kindAndFlags.kind, payload1: payload1, payload2: payload2).jsValue()
         if kindAndFlags.isException {
             if let error = JSError(from: result) {

Sources/_CJavaScriptKit/include/_CJavaScriptKit.h

@@ -283,24 +283,6 @@ extern void _syncAwait(const JavaScriptObjectRef promise,
                        JavaScriptPayload1 *result_payload1,
                        JavaScriptPayload2 *result_payload2);
 
-/// Unwind Wasm module execution stack and rewind it after promise is fulfilled or timeout is reached.
-/// **Important**: Wasm module must be [asyncified](https://emscripten.org/docs/porting/asyncify.html),
-/// otherwise JavaScriptKit's runtime will throw an exception.
-///
-/// @param promise target JavaScript promise.
-/// @param ms Length of timeout in milliseconds.
-/// @param result_kind A result pointer of JavaScript value kind of returned result or thrown exception.
-/// @param result_payload1 A result pointer of first payload of JavaScript value of returned result or thrown exception.
-/// @param result_payload2 A result pointer of second payload of JavaScript value of returned result or thrown exception.
-__attribute__((__import_module__("javascript_kit"),
-               __import_name__("swjs_sync_await_with_timeout")))
-extern void _syncAwaitWithTimout(const JavaScriptObjectRef promise,
-                                 const int ms,
-                                 JavaScriptValueKindAndFlags *result_kind,
-                                 JavaScriptPayload1 *result_payload1,
-                                 JavaScriptPayload2 *result_payload2);
-
-
 #endif
 
 #endif /* _CJavaScriptKit_h */