Merge branch 'main' into caleb/fix/this

Author: philippedistributive

python/pythonmonkey/cli/pmjs.py

@@ -145,7 +145,7 @@
 }
 """, evalOpts);
 
-def repl():
+async def repl():
     """
     Start a REPL to evaluate JavaScript code in the extra-module environment. Multi-line statements and
     readline history are supported. ^C support is sketchy. Exit the REPL with ^D or ".quit".
@@ -177,7 +177,7 @@ def quit():
         """
         Quit the REPL. Repl saved by atexit handler.
         """
-        sys.exit(0)
+        globalThis.python.exit(); # need for python.exit.code in require.py
 
     def sigint_handler(signum, frame):
         """
@@ -234,6 +234,7 @@ def sigint_handler(signum, frame):
     #
     while got_sigint < 2:
         try:
+            await asyncio.sleep(0)
             inner_loop = False
             if (statement == ""):
                 statement = input('> ')[readline_skip_chars:]
@@ -258,6 +259,7 @@ def sigint_handler(signum, frame):
                 # SIGINT is received, so we have to patch things up so that the next-entered line is
                 # treated as the input at the top of the loop.
                 while (got_sigint == 0):
+                    await asyncio.sleep(0)
                     inner_loop = True
                     lineBuffer = input('... ')
                     more = lineBuffer[readline_skip_chars:]
@@ -361,8 +363,13 @@ async def runJS():
             await pm.wait() # blocks until all asynchronous calls finish
         asyncio.run(runJS())
     elif (enterRepl or forceRepl):
-        globalInitModule.initReplLibs()
-        repl()
+        async def runREPL():
+            globalInitModule.initReplLibs()
+            await repl()
+            await pm.wait()
+        asyncio.run(runREPL())
+
+    globalThis.python.exit(); # need for python.exit.code in require.py
 
 if __name__ == "__main__":
     main()

python/pythonmonkey/require.py

@@ -70,8 +70,14 @@
 
 globalThis.python.exit = pm.eval("""'use strict';
 (exit) => function pythonExitWrapper(exitCode) {
+  if (typeof exitCode === 'undefined')
+    exitCode = pythonExitWrapper.code;
+  if (typeof exitCode == 'undefined')
+    exitCode = 0n;
   if (typeof exitCode === 'number')
     exitCode = BigInt(Math.floor(exitCode));
+  if (typeof exitCode !== 'bigint')
+    exitCode = 1n;
   exit(exitCode);
 }
 """, evalOpts)(sys.exit);

tests/js/set-timeout.simple

@@ -0,0 +1,32 @@
+/**
+ * @file        set-timeout.simple
+ *              Simple test which ensures that setTimeout() fires, and that it fires at about the right
+ *              time.
+ * @author      Wes Garland, [email protected]
+ * @date        March 2024
+ */
+
+const time = python.eval('__import__("time").time');
+const start = time();
+
+/**
+ * - must fire later than 100ms
+ * - must fire before 10s
+ * - 10s is well before 100s but very CI-load-tolerant; the idea is not to check for accurancy, but
+ *  rather ensure we haven't mixed up seconds and milliseconds somewhere.
+ */
+function check100ms()
+{
+  end = time();
+
+  if (end - start < 0.1)
+    throw new Error('timer fired too soon');
+  if (end - start > 10)
+    throw new Error('timer fired too late');
+
+  console.log('done - timer fired after ', (end-start) * 1000, 'ms');
+  python.exit.code = 0;
+}
+
+python.exit.code = 2;
+setTimeout(check100ms, 100);