From b313aaf3ef322e54c76bdf9ef6175ca583e36762 Mon Sep 17 00:00:00 2001
From: Masen Furer <m_github@0x26.net>
Date: Thu, 2 Nov 2023 14:37:02 -0700
Subject: [PATCH] rx.call_script callback needs to await promises (#2121)

---
 integration/test_call_script.py      | 19 ++++++++++++++++---
 reflex/.templates/web/utils/state.js |  6 +++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/integration/test_call_script.py b/integration/test_call_script.py
index d2162d34c..8b24ce19b 100644
--- a/integration/test_call_script.py
+++ b/integration/test_call_script.py
@@ -28,6 +28,10 @@ def CallScript():
         inline_counter += 1
         return {inline3: 42, a: [1, 2, 3], s: 'js', o: {a: 1, b: 2}}
     }
+    async function inline4() {
+        inline_counter += 1
+        return "async inline4"
+    }
     """
 
     external_scripts = inline_scripts.replace("inline", "external")
@@ -47,6 +51,7 @@ def CallScript():
             yield rx.call_script("inline1()")
             yield rx.call_script("inline2()")
             yield rx.call_script("inline3()")
+            yield rx.call_script("inline4()")
 
         def call_script_inline_return(self):
             return rx.call_script("inline2()")
@@ -61,6 +66,9 @@ def CallScript():
             yield rx.call_script(
                 "inline3()", callback=CallScriptState.call_script_callback
             )
+            yield rx.call_script(
+                "inline4()", callback=CallScriptState.call_script_callback
+            )
 
         def call_script_inline_return_callback(self):
             return rx.call_script(
@@ -85,6 +93,7 @@ def CallScript():
             yield rx.call_script("external1()")
             yield rx.call_script("external2()")
             yield rx.call_script("external3()")
+            yield rx.call_script("external4()")
 
         def call_script_external_return(self):
             return rx.call_script("external2()")
@@ -99,6 +108,9 @@ def CallScript():
             yield rx.call_script(
                 "external3()", callback=CallScriptState.call_script_callback
             )
+            yield rx.call_script(
+                "external4()", callback=CallScriptState.call_script_callback
+            )
 
         def call_script_external_return_callback(self):
             return rx.call_script(
@@ -300,7 +312,7 @@ def test_call_script(
 
     yield_button.click()
     update_counter_button.click()
-    assert call_script.poll_for_value(counter, exp_not_equal="0") == "3"
+    assert call_script.poll_for_value(counter, exp_not_equal="0") == "4"
     reset_button.click()
     assert call_script.poll_for_value(counter, exp_not_equal="3") == "0"
     return_button.click()
@@ -311,10 +323,11 @@ def test_call_script(
 
     yield_callback_button.click()
     update_counter_button.click()
-    assert call_script.poll_for_value(counter, exp_not_equal="0") == "3"
+    assert call_script.poll_for_value(counter, exp_not_equal="0") == "4"
     assert call_script.poll_for_value(
         results, exp_not_equal="[]"
-    ) == '["%s1",null,{"%s3":42,"a":[1,2,3],"s":"js","o":{"a":1,"b":2}}]' % (
+    ) == '["%s1",null,{"%s3":42,"a":[1,2,3],"s":"js","o":{"a":1,"b":2}},"async %s4"]' % (
+        script,
         script,
         script,
     )
diff --git a/reflex/.templates/web/utils/state.js b/reflex/.templates/web/utils/state.js
index 673e317d3..2a41bc319 100644
--- a/reflex/.templates/web/utils/state.js
+++ b/reflex/.templates/web/utils/state.js
@@ -201,7 +201,11 @@ export const applyEvent = async (event, socket) => {
     try {
       const eval_result = eval(event.payload.javascript_code);
       if (event.payload.callback) {
-        eval(event.payload.callback)(eval_result)
+        if (!!eval_result && typeof eval_result.then === 'function') {
+          eval(event.payload.callback)(await eval_result)
+        } else {
+          eval(event.payload.callback)(eval_result)
+        }
       }
     } catch (e) {
       console.log("_call_script", e);