pytwojs 1.1.0__tar.gz → 1.2.0__tar.gz

{pytwojs-1.1.0 → pytwojs-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytwojs
-Version: 1.1.0
+Version: 1.2.0
 Summary: A high-performance Python library that relies on nodejs to execute JavaScript
 Author: Samwe
 Author-email: 1281722462@qq.com

{pytwojs-1.1.0 → pytwojs-1.2.0}/pytwojs/interpreter.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 __package__ = "pytwojs"
 
 import json
+import re
 import subprocess
 import typing
 import threading
@@ -52,7 +53,30 @@ class NodeInterpreter:
             self._flush()
             self._write(EXEC_END_FLAGS)
             self._flush()
+            _out = b''
+            is_err = False
             while out := self._readline():
+                if is_err:
+                    _out += out
+                    try:
+                        _match = self._extract_json(_out)
+                        if not _match:
+                            continue
+
+                        out_obj = json.loads(_match.group(), strict=False)
+                    except json.JSONDecodeError:
+                        continue
+                    else:
+                        try:
+                            raise JSException(out_obj['toString'])
+                        finally:
+                            self.close()
+
+                if out.strip()[:8] == b"Uncaught":
+                    _out += out.strip()[8:]
+                    is_err = True
+                    continue
+
                 try:
                     out_obj = json.loads(out)
                     if isinstance(out_obj, dict):
@@ -105,6 +129,10 @@ class NodeInterpreter:
     def close(self) -> None:
         self._finalizer()
 
+    @staticmethod
+    def _extract_json(out: bytes):
+        return re.search(rb'\{.*\}', out, re.S)
+
     def _write(self, code: bytes):
         self._node.stdin.write(code)
 
@@ -114,6 +142,9 @@ class NodeInterpreter:
     def _readline(self):
         return self._node.stdout.readline()
 
+    def _communicate(self):
+        return self._node.communicate()
+
     def __enter__(self) -> NodeInterpreter:
         return self
 

{pytwojs-1.1.0 → pytwojs-1.2.0}/pytwojs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytwojs
-Version: 1.1.0
+Version: 1.2.0
 Summary: A high-performance Python library that relies on nodejs to execute JavaScript
 Author: Samwe
 Author-email: 1281722462@qq.com

{pytwojs-1.1.0 → pytwojs-1.2.0}/setup.py

@@ -9,7 +9,7 @@ DESCRIPTION = 'A high-performance Python library that relies on nodejs to execut
 
 setup(
     name="pytwojs",
-    version="1.1.0",
+    version="1.2.0",
     packages=find_packages(),
     author=AUTHOR,
     author_email=EMAIL,