pytwojs 1.0.0__tar.gz → 1.2.0__tar.gz

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

@@ -1,11 +1,8 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: pytwojs
-Version: 1.0.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
 Requires-Python: >=3.8.0
-Dynamic: author
-Dynamic: author-email
-Dynamic: requires-python
-Dynamic: summary
+Requires-Dist: pyminifyjs

{pytwojs-1.0.0 → pytwojs-1.2.0}/pytwojs/exceptions.py

@@ -4,3 +4,7 @@ class JSError(Exception):
 
 class JSException(JSError):
     pass
+
+
+class NodeRunTimeNotFoundError(JSError):
+    pass

{pytwojs-1.0.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
@@ -9,8 +10,10 @@ import time
 import uuid
 import weakref
 
-from .utils import make_cmd
-from .exceptions import JSException
+import pyminifyjs
+
+from .utils import make_cmd, remove_prefix
+from .exceptions import JSException, NodeRunTimeNotFoundError
 from ._program import EXEC_END_FLAGS, EXEC_DONE_FLAGS
 
 
@@ -30,7 +33,10 @@ class NodeInterpreter:
 
     def __init__(self) -> None:
         cmd = make_cmd()
-        self._node = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        try:
+            self._node = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        except Exception:
+            raise NodeRunTimeNotFoundError('Could not found runtime(nodejs)')
         self._global_interpreter_lock = threading.Lock()
         self._finalizer = weakref.finalize(self, _close, self._node)
 
@@ -41,11 +47,36 @@ class NodeInterpreter:
         :return: None
         """
         with self._global_interpreter_lock:
-            self._write(code + b"\n")
+            code += b"\n"
+            code = pyminifyjs.minify_js(code.decode("utf-8"))
+            self._write(code.encode("utf-8"))
             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):
@@ -66,8 +97,8 @@ class NodeInterpreter:
             result = self._reach_result_line()
 
         if result[:8] == b"Uncaught":
-            py_obj = json.loads(result.removeprefix(b"Uncaught").strip())
-            raise JSException(py_obj['toString'])
+            pyobj = json.loads(remove_prefix(result, b"Uncaught").strip())
+            raise JSException(pyobj['toString'])
 
         return JSProxyWrapper(self, result, code.strip())
 
@@ -98,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)
 
@@ -107,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
 
@@ -136,7 +174,7 @@ class JSProxyWrapper:
             result = self._node_repl._reach_result_line()
 
         if result[:8] == b"Uncaught":
-            pyobj = json.loads(result.removeprefix(b"Uncaught").strip())
+            pyobj = json.loads(remove_prefix(result, b"Uncaught").strip())
             raise JSException(pyobj['toString'])
 
         if not is_obj:

pytwojs-1.2.0/pytwojs/utils.py

@@ -0,0 +1,29 @@
+import os
+import platform
+import typing
+from ._program import PROGRAM, FLAGS
+
+
+_version = platform.python_version_tuple()
+_IS_LESS_THAN_PY39 = float(f"{_version[0]}.{_version[1]}") < 3.9
+
+
+def get_node_env():
+    node = os.environ.get('NODE_PATH') if os.environ.get('NODE_PATH') else os.environ.get('NODE')
+    if not node:
+        return "node"
+    return node
+
+
+def make_cmd():
+    node = get_node_env()
+    return [node, FLAGS, PROGRAM]
+
+
+def remove_prefix(s: typing.Union[str, bytes], prefix: typing.Union[str, bytes]):
+    if not _IS_LESS_THAN_PY39:
+        return s.removeprefix(prefix)
+    length = len(prefix)
+    if s[:length] == prefix:
+        return s[length:]
+    return s

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

@@ -1,11 +1,8 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: pytwojs
-Version: 1.0.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
 Requires-Python: >=3.8.0
-Dynamic: author
-Dynamic: author-email
-Dynamic: requires-python
-Dynamic: summary
+Requires-Dist: pyminifyjs

{pytwojs-1.0.0 → pytwojs-1.2.0}/pytwojs.egg-info/SOURCES.txt

@@ -7,4 +7,5 @@ pytwojs/utils.py
 pytwojs.egg-info/PKG-INFO
 pytwojs.egg-info/SOURCES.txt
 pytwojs.egg-info/dependency_links.txt
+pytwojs.egg-info/requires.txt
 pytwojs.egg-info/top_level.txt

pytwojs-1.2.0/pytwojs.egg-info/requires.txt

@@ -0,0 +1 @@
+pyminifyjs

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

@@ -9,11 +9,14 @@ DESCRIPTION = 'A high-performance Python library that relies on nodejs to execut
 
 setup(
     name="pytwojs",
-    version="1.0.0",
+    version="1.2.0",
     packages=find_packages(),
     author=AUTHOR,
     author_email=EMAIL,
     python_requires=REQUIRES_PYTHON,
-    description=DESCRIPTION
+    description=DESCRIPTION,
+    install_requires=[
+        "pyminifyjs"
+    ]
 )
 

pytwojs-1.0.0/pytwojs/utils.py

@@ -1,14 +0,0 @@
-import os
-from ._program import PROGRAM, FLAGS
-
-
-def get_node_env():
-    node = os.environ.get('NODE_PATH') if os.environ.get('NODE_PATH') else os.environ.get('NODE')
-    if not node:
-        return "node"
-    return node
-
-
-def make_cmd():
-    node = get_node_env()
-    return [node, FLAGS, PROGRAM]