fix(tor): make the toggle find + start the auto-installed Tor (v3.2.3)

Real-device test surfaced "Tor couldn't start" even though Tor installed and
ran. Three bugs, all fixed:

- Layout: ensure_tor put Tor in $APP_DIR/tor-bin, but the launcher/helper live
  in a tronbrowser/ subdir, so the helper's $DIR/tor-bin missed it. Now install
  Tor next to the launcher, AND the helper also searches the parent's tor-bin/.
- Lib path: the Expert Bundle tor needs LD_LIBRARY_PATH; the old condition only
  matched when tor was under $DIR. Now detect a bundle by a sibling libevent and
  set LD_LIBRARY_PATH/DYLD_LIBRARY_PATH wherever tor was found (else it exits
  instantly → "tor-exited").
- Double-start: if Tor is already serving SOCKS (e.g. `tron tor` or a system
  service), reuse it instead of spawning a second tor that fails to bind 9050.

Validated end-to-end against real Tor (in the misplaced-dir scenario): helper
finds Tor, sets the lib path, bootstraps to 100%, and curl --socks5-hostname
returns IsTor:true; reuse path confirmed ("reusing it"). `tron tor` resolver +
LD path updated to match.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: ralyodio

apps/desktop/extensions/ai-sidebar/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "TronBrowser",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "TronBrowser — privacy-first, AI-native. Branded new tab, private search, CoinPay login, and a bring-your-own-keys AI sidebar.",
   "icons": {
     "16": "icons/icon-16.png",

apps/desktop/launcher/__pycache__/tron-tor-helpercpython-312.pyc

@@ -18,6 +18,7 @@ Endpoints (POST/GET on 127.0.0.1):
 Single-instance: binds a fixed loopback port; a second copy exits cleanly when
 the port is taken, so the launcher can fire-and-forget it every launch.
 """
+import glob
 import json
 import os
 import shutil
@@ -46,21 +47,46 @@ def log(msg):
 
 def tor_binary():
     """Bundled `tor` next to the helper or under tor-bin/ (the auto-installed
-    Tor Expert Bundle), else one on PATH (or None)."""
+    Tor Expert Bundle), else one on PATH (or None). Checks the launcher dir, its
+    tor-bin/, and the parent's tor-bin/ (the release extracts the shim into a
+    subdir, so tor-bin can live a level up)."""
+    cands = []
     if BUNDLED_DIR:
-        for cand in (os.path.join(BUNDLED_DIR, "tor"),
-                     os.path.join(BUNDLED_DIR, "tor-bin", "tor")):
-            if os.access(cand, os.X_OK):
-                return cand
+        parent = os.path.dirname(BUNDLED_DIR.rstrip("/"))
+        cands += [os.path.join(BUNDLED_DIR, "tor"),
+                  os.path.join(BUNDLED_DIR, "tor-bin", "tor"),
+                  os.path.join(parent, "tor-bin", "tor")]
+    for cand in cands:
+        if os.access(cand, os.X_OK):
+            return cand
     return shutil.which("tor")
 
 
+def socks_port_open():
+    """True if something already accepts connections on the SOCKS port — e.g.
+    Tor started by `tron tor` or a system service. Then we reuse it instead of
+    spawning a duplicate (a second tor would fail to bind the port)."""
+    import socket
+    try:
+        with socket.create_connection((HOST, SOCKS_PORT), timeout=1.5):
+            return True
+    except OSError:
+        return False
+
+
 def start_tor():
     """Start tor and block until bootstrapped. Returns (ok, error)."""
     global _proc, _ready
     with _lock:
         if _proc is not None and _proc.poll() is None and _ready:
-            return True, None  # already up
+            return True, None  # already up (we started it)
+    # Something already serving SOCKS on the port (tron tor / system tor)? Reuse
+    # it — don't spawn a second tor that would fail to bind the port.
+    if socks_port_open():
+        _set_ready(True)
+        log("tor already running on %s:%d — reusing it" % (HOST, SOCKS_PORT))
+        return True, None
+    with _lock:
         binary = tor_binary()
         if not binary:
             log("start requested but no tor binary found (bundled or on PATH)")
@@ -74,11 +100,12 @@ def start_tor():
 
         _ready = False
         env = os.environ.copy()
-        # The Tor Expert Bundle ships its own libs next to the binary with no
-        # $ORIGIN rpath, so a bundled/auto-installed tor needs its dir on the
-        # library path. (Harmless for a system tor, which we don't touch here.)
-        if BUNDLED_DIR and os.path.dirname(binary).startswith(BUNDLED_DIR):
-            bindir = os.path.dirname(binary)
+        # The Tor Expert Bundle ships its own libs (libevent/libssl/…) next to
+        # the binary with no $ORIGIN rpath, so it needs its dir on the library
+        # path. Detect a bundle by a sibling libevent — works wherever tor was
+        # found; a system tor (no sibling libs) is left untouched.
+        bindir = os.path.dirname(binary)
+        if glob.glob(os.path.join(bindir, "libevent*")):
             for var in ("LD_LIBRARY_PATH", "DYLD_LIBRARY_PATH"):
                 env[var] = bindir + (os.pathsep + env[var] if env.get(var) else "")
         try:

apps/desktop/launcher/tron-tor-helper

@@ -1,6 +1,6 @@
 {
   "name": "@tronbrowser/desktop",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "private": true,
   "description": "Desktop shell for the TronBrowser Chromium fork",
   "type": "module",

apps/desktop/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tronbrowser/docs",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "private": true,
   "description": "Documentation site",
   "type": "module",

apps/docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tronbrowser/extensions",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "private": true,
   "description": "TronBrowser extension store — pay $1, list your MV3 extension (tronbrowser.dev/store)",
   "type": "module",

apps/extensions/package.json

@@ -4,7 +4,7 @@
     "slug": "tronbrowserdev",
     "owner": "profullstack",
     "scheme": "tronbrowser",
-    "version": "3.2.2",
+    "version": "3.2.3",
     "orientation": "portrait",
     "userInterfaceStyle": "dark",
     "platforms": [

apps/mobile/app.json

@@ -1,6 +1,6 @@
 {
   "name": "@tronbrowser/mobile",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "private": true,
   "description": "TronBrowser mobile (Expo / React Native) — Phase 2",
   "type": "module",

apps/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tronbrowser/web",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "private": true,
   "description": "TronBrowser marketing site + web dashboard",
   "type": "module",

apps/web/package.json

@@ -131,7 +131,9 @@ case "${1:-}" in
     # (any platform) if missing. (The `--tor` flag, handled by the launcher,
     # instead opens a dedicated Tor session.)
     resolve_tor() {
-      if [ -x "$APP_DIR/tor-bin/tor" ]; then echo "$APP_DIR/tor-bin/tor"
+      ldir="$(dirname "$(readlink -f "$CURRENT" 2>/dev/null || echo "$CURRENT")")"
+      if   [ -x "$ldir/tor-bin/tor" ];     then echo "$ldir/tor-bin/tor"
+      elif [ -x "$APP_DIR/tor-bin/tor" ];  then echo "$APP_DIR/tor-bin/tor"
       else command -v tor 2>/dev/null || true; fi
     }
     TORBIN="$(resolve_tor)"
@@ -321,7 +323,12 @@ download_tor_expert_bundle() { # dest_dir
 ensure_tor() {
   [ "${TB_NO_TOR_INSTALL:-0}" = "1" ] && return 0
   command -v tor >/dev/null 2>&1 && return 0
-  [ -x "$APP_DIR/tor-bin/tor" ] && return 0
+  # Install Tor right next to the launcher shim so its dir ($DIR/tor-bin) resolves
+  # it — the release tarball extracts the shim into a tronbrowser/ subdir.
+  tordest="$APP_DIR/tor-bin"
+  _ldir="$(find "$APP_DIR" -maxdepth 3 -type f -name tronbrowser 2>/dev/null | head -n1)"
+  [ -n "$_ldir" ] && tordest="$(dirname "$_ldir")/tor-bin"
+  [ -x "$tordest/tor" ] && return 0
 
   info "Setting up Tor (for the in-browser Tor toggle)…"
   # 1) Homebrew (macOS/Linux) — no sudo.