concurrent-c-node 0.23.2__tar.gz → 0.23.4__tar.gz

{concurrent_c_node-0.23.2 → concurrent_c_node-0.23.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: concurrent-c-node
-Version: 0.23.2
+Version: 0.23.4
 Summary: JavaScript and npm packages from Python over the Concurrent-C bridge: one spawned Node child per domain, host-controlled lifetime.
 License: MIT
 Project-URL: Repository, https://github.com/sreekotay/concurrent-c
@@ -288,8 +288,8 @@ domains here).
 
 Packages: cwd `node_modules`, same as Node itself.
 
-From Concurrent-C (not Python): `cc_js_new(false, &a)` hosted
-(libnode), or `cc_js_new(true, &a)` for this wire —
+From Concurrent-C (not Python): `cc_js_new(false, a)` hosted
+(libnode), or `cc_js_new(true, a)` for this wire —
 [`jsdemo.shcc`](https://github.com/sreekotay/concurrent-c/blob/main/examples/js/jsdemo.shcc).
 
 ## Publishing

{concurrent_c_node-0.23.2 → concurrent_c_node-0.23.4}/README.md

@@ -273,8 +273,8 @@ domains here).
 
 Packages: cwd `node_modules`, same as Node itself.
 
-From Concurrent-C (not Python): `cc_js_new(false, &a)` hosted
-(libnode), or `cc_js_new(true, &a)` for this wire —
+From Concurrent-C (not Python): `cc_js_new(false, a)` hosted
+(libnode), or `cc_js_new(true, a)` for this wire —
 [`jsdemo.shcc`](https://github.com/sreekotay/concurrent-c/blob/main/examples/js/jsdemo.shcc).
 
 ## Publishing

{concurrent_c_node-0.23.2 → concurrent_c_node-0.23.4}/cc_node/__init__.py

@@ -36,6 +36,7 @@ import shutil
 import subprocess
 import sys
 import tempfile
+import time
 
 __all__ = [
     "create", "get", "reset", "kernel", "reset_kernel",
@@ -43,7 +44,7 @@ __all__ = [
     "JsError", "JsHandle",
     "load_ipython_extension", "unload_ipython_extension", "__version__",
 ]
-__version__ = "0.23.2"
+__version__ = "0.23.4"
 
 _NO_NODE = (
     "cc-node: no node executable (install Node, or set CC_NODE_BIN). "
@@ -136,8 +137,9 @@ class JsHandle:
         p.text(repr(self))
 
     def __del__(self):
-        # Never nest a sync wire op from GC into an in-flight _req — that
-        # steals the outer reply (e.g. returning a callback arg handle).
+        # Queue only — never flush from GC.  Pass-through handles (returned
+        # from a callback back to JS) defer release until the outer wire
+        # op completes; see Bridge._passthrough_h.
         try:
             if not self._d.closed:
                 self._d._queue_release(self._h)
@@ -197,6 +199,7 @@ class Bridge:
         self._depth = 0
         self._parked = {}
         self._pending_release = []
+        self._passthrough_h = set()
         self._close_pending = False
         self._destroy_done = False
         self._cell_require_ready = False
@@ -217,18 +220,51 @@ class Bridge:
             raise JsError("cc-node: the node child exited") from None
 
     def _queue_release(self, hid):
+        if hid in self._passthrough_h:
+            return
         self._pending_release.append(hid)
-        if self._depth == 0:
-            self._flush_releases()
 
-    def _flush_releases(self):
+    def _drain_pending_releases(self):
+        """Send queued releases (must run with depth==0, not from __del__)."""
         while self._pending_release and not self.closed:
             hid = self._pending_release.pop(0)
             try:
-                self._req("release", h=hid)
+                self._wire_call("release", h=hid)
             except Exception:
                 pass
 
+    def _on_depth_zero(self):
+        if self._passthrough_h:
+            self._pending_release.extend(self._passthrough_h)
+            self._passthrough_h.clear()
+        # One proxy drop can queue the same id more than once; the child
+        # deletes on first release — dedupe before draining.
+        seen = set()
+        uniq = []
+        for hid in self._pending_release:
+            if hid not in seen:
+                seen.add(hid)
+                uniq.append(hid)
+        self._pending_release = uniq
+        self._flush_shm()
+        if self._close_pending:
+            self._finish_destroy()
+        else:
+            self._drain_pending_releases()
+
+    def _wire_call(self, op, **kw):
+        """One wire round-trip without depth / release side effects."""
+        rid = self._nid
+        self._nid += 1
+        kw["id"] = rid
+        kw["op"] = op
+        try:
+            self._send(kw)
+        except (BrokenPipeError, ValueError):
+            self.closed = True
+            raise JsError("cc-node: the node child exited") from None
+        return self._wait_reply(rid)
+
     def _shm_write(self, raw):
         _shm_seq[0] += 1
         path = os.path.join(self._shm_dir, "s%d" % _shm_seq[0])
@@ -349,6 +385,10 @@ class Bridge:
     def _req(self, op, **kw):
         if self.closed:
             raise JsError("cc-node: bridge is closed")
+        # Drop-driven releases queue outside wire ops; drain before the
+        # next op so stats()/teardown see a settled ledger.
+        if self._depth == 0:
+            self._drain_pending_releases()
         rid = self._nid
         self._nid += 1
         kw["id"] = rid
@@ -364,11 +404,7 @@ class Bridge:
         finally:
             self._depth -= 1
             if self._depth == 0:
-                self._flush_shm()
-                if self._close_pending:
-                    self._finish_destroy()
-                else:
-                    self._flush_releases()
+                self._on_depth_zero()
 
     def _serve_callback(self, msg):
         fn = self._cbs.get(msg["cb"])
@@ -376,7 +412,12 @@ class Bridge:
             if fn is None:
                 raise JsError("cc-node: unknown callback")
             args = [self._decode_result(a) for a in msg["args"]]
-            self._send({"cbr": msg["cbid"], "v": self._encode(fn(*args))})
+            ret = fn(*args)
+            if isinstance(ret, JsHandle):
+                # Python was a pass-through; JS re-owns the handle for the
+                # rest of this wire op — do not release from __del__ mid-flight.
+                self._passthrough_h.add(ret._h)
+            self._send({"cbr": msg["cbid"], "v": self._encode(ret)})
         except Exception as e:  # crosses back as a JS error, message intact
             try:
                 self._send({"cbr": msg["cbid"], "e": str(e)})
@@ -600,6 +641,10 @@ class Bridge:
         self._destroy_done = True
         self._close_pending = False
         self.closed = True
+        try:
+            self._drain_pending_releases()
+        except Exception:
+            pass
         try:
             if self._p.poll() is None and not self._wire_w.closed:
                 rid = self._nid
@@ -611,12 +656,19 @@ class Bridge:
             self._wire_w.close()
         except Exception:
             pass
-        # Drain to EOF so the broker's farewell reply has somewhere to
-        # land — closing the reply fd under its write is an EPIPE crash
-        # in the child.
+        # Drain the farewell reply (bounded — an idle child must not
+        # block teardown forever).
         try:
-            while self._read_line():
-                pass
+            deadline = time.monotonic() + 2.0
+            fd = self._resp_fd
+            while fd is not None and time.monotonic() < deadline:
+                if self._p.poll() is not None:
+                    break
+                ready, _, _ = select.select([fd], [], [], 0.1)
+                if not ready:
+                    continue
+                if not self._read_line():
+                    break
         except Exception:
             pass
         try:

{concurrent_c_node-0.23.2 → concurrent_c_node-0.23.4}/concurrent_c_node.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: concurrent-c-node
-Version: 0.23.2
+Version: 0.23.4
 Summary: JavaScript and npm packages from Python over the Concurrent-C bridge: one spawned Node child per domain, host-controlled lifetime.
 License: MIT
 Project-URL: Repository, https://github.com/sreekotay/concurrent-c
@@ -288,8 +288,8 @@ domains here).
 
 Packages: cwd `node_modules`, same as Node itself.
 
-From Concurrent-C (not Python): `cc_js_new(false, &a)` hosted
-(libnode), or `cc_js_new(true, &a)` for this wire —
+From Concurrent-C (not Python): `cc_js_new(false, a)` hosted
+(libnode), or `cc_js_new(true, a)` for this wire —
 [`jsdemo.shcc`](https://github.com/sreekotay/concurrent-c/blob/main/examples/js/jsdemo.shcc).
 
 ## Publishing

{concurrent_c_node-0.23.2 → concurrent_c_node-0.23.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "concurrent-c-node"
-version = "0.23.2"
+version = "0.23.4"
 description = "JavaScript and npm packages from Python over the Concurrent-C bridge: one spawned Node child per domain, host-controlled lifetime."
 readme = "README.md"
 requires-python = ">=3.8"