TonBERRY/micropython
3
0
Fork 0
Code Pull Requests Activity

webassembly/proxy_c: Fix proxy then reject handling.

Browse Source 
An exception on the Python side should be passed to the Promise reject
callback on the JavaScript side.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George
2024-04-18 17:20:28 +10:00
parent 4c3f5f552b
commit 92b3b69648
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ports/webassembly/proxy_c.c
View File

@@ -296,10 +296,11 @@ EM_JS(void, js_then_resolve, (uint32_t * ret_value, uint32_t * resolve, uint32_t
resolve_js(ret_value_js); resolve_js(ret_value_js);
}); });
EM_JS(void, js_then_reject, (uint32_t * resolve, uint32_t * reject), { EM_JS(void, js_then_reject, (uint32_t * ret_value, uint32_t * resolve, uint32_t * reject), {
const ret_value_js = proxy_convert_mp_to_js_obj_jsside(ret_value);
const resolve_js = proxy_convert_mp_to_js_obj_jsside(resolve); const resolve_js = proxy_convert_mp_to_js_obj_jsside(resolve);
const reject_js = proxy_convert_mp_to_js_obj_jsside(reject); const reject_js = proxy_convert_mp_to_js_obj_jsside(reject);
reject_js(null); reject_js(ret_value_js);
}); });
// *FORMAT-OFF* // *FORMAT-OFF*
@@ -335,10 +336,12 @@ static mp_obj_t proxy_resume_execute(mp_obj_t self_in, mp_obj_t value, mp_obj_t
uint32_t out[PVN]; uint32_t out[PVN];
js_then_continue(ref, out_py_resume, out_resolve, out_reject, out); js_then_continue(ref, out_py_resume, out_resolve, out_reject, out);
return proxy_convert_js_to_mp_obj_cside(out); return proxy_convert_js_to_mp_obj_cside(out);
} else { } else { // ret_kind == MP_VM_RETURN_EXCEPTION;
// MP_VM_RETURN_EXCEPTION; // Pass the exception through as an object to reject the promise (don't raise/throw it).
js_then_reject(out_resolve, out_reject); uint32_t out_ret_value[PVN];
nlr_raise(ret_value); proxy_convert_mp_to_js_obj_cside(ret_value, out_ret_value);
js_then_reject(out_ret_value, out_resolve, out_reject);
return mp_const_none;
} }
} }