Upload app.py

app.py

@@ -131,9 +131,41 @@ _VPS_SSH_PORT = os.environ.get('VPS_SSH_PORT', '22').strip()
 _VPS_SSH_USER = os.environ.get('VPS_SSH_USER', '').strip()
 _VPS_SSH_PASS = os.environ.get('VPS_SSH_PASS', '').strip()
 _SSH_TUNNEL_LOCAL_PORT = 1080
+_SSH_TUNNEL_LOCK_FILE = '/tmp/ssh_tunnel.lock'
 _ssh_tunnel_proc = [None]  # mutable box so the watchdog thread can replace it
 
 
+def _port_is_listening(host, port, timeout=1.5):
+    """127.0.0.1:port ပေါ်မှာ တစ်ခုခု listen လုပ်နေပြီးလား စစ်သည် (process/worker မတူလည်း)."""
+    import socket as _socket
+    s = _socket.socket(_socket.AF_INET, _socket.SOCK_STREAM)
+    s.settimeout(timeout)
+    try:
+        s.connect((host, port))
+        return True
+    except Exception:
+        return False
+    finally:
+        s.close()
+
+
+def _acquire_ssh_tunnel_lock():
+    """
+    Gunicorn worker process များစွာ (သို့) restart အသစ်တစ်ခု တစ်ပြိုင်နက်တည်း
+    tunnel ကို ထပ်ဖွင့်ဖို့ ကြိုးစားလို့ port 1080 conflict မဖြစ်စေရန်,
+    file lock (flock) ဖြင့် worker တစ်ခုတည်းကိုသာ tunnel ဖွင့်ခွင့်ပေးသည်.
+    Lock ရအောင် ယူနိုင်ရင် file handle ကို ပြန်ပေးမည် (open ဖြစ်နေအောင် ကိုင်ထားရမည်) —
+    မရရင် None ပြန်မည် (တခြား worker/process က ကိုင်ထားပြီးသား).
+    """
+    import fcntl
+    try:
+        f = open(_SSH_TUNNEL_LOCK_FILE, 'w')
+        fcntl.flock(f.fileno(), fcntl.LOCK_EX | fcntl.LOCK_NB)
+        return f
+    except (IOError, OSError):
+        return None
+
+
 def _start_ssh_socks_tunnel():
     """
     VPS ကို SSH password login ဖြင့် dynamic port-forward (SOCKS5) tunnel ဖွင့်သည်.
@@ -143,7 +175,7 @@ def _start_ssh_socks_tunnel():
     cmd = [
         'sshpass', '-p', _VPS_SSH_PASS,
         'ssh',
-        '-D', str(_SSH_TUNNEL_LOCAL_PORT),
+        '-D', f'127.0.0.1:{_SSH_TUNNEL_LOCAL_PORT}',
         '-N',
         '-o', 'StrictHostKeyChecking=no',
         '-o', 'UserKnownHostsFile=/dev/null',
@@ -159,28 +191,42 @@ def _start_ssh_socks_tunnel():
 
 
 def _ssh_tunnel_watchdog():
-    """Background thread: SSH tunnel ပြတ်သွားရင် ပြန်ချိတ်ပေးသည်."""
+    """
+    Background thread: lock ရအောင်ယူနိုင်တဲ့ worker/process တစ်ခုတည်းကသာ
+    tunnel ကို ဖွင့်/ထိန်းသိမ်းမည်. ကျန် worker တွေက port ကို listen ဖြစ်နေမှန်း
+    check ပဲလုပ်ပြီး ဆက်စောင့်မည် (spawn ထပ်မလုပ်တော့ပါ).
+    """
     import threading as _th
+
+    lock_fh = _acquire_ssh_tunnel_lock()
+    if lock_fh is None:
+        print('[ssh_tunnel] Another worker already owns the tunnel — '
+              'this worker will just reuse 127.0.0.1:1080 without spawning.')
+        while True:
+            _th.Event().wait(15)
+        return
+
     while True:
+        if _port_is_listening('127.0.0.1', _SSH_TUNNEL_LOCAL_PORT):
+            _th.Event().wait(10)
+            continue
+
         proc = _ssh_tunnel_proc[0]
-        if proc is None or proc.poll() is not None:
-            if proc is not None:
-                err = ''
-                try:
-                    err = proc.stderr.read()[-300:] if proc.stderr else ''
-                except Exception:
-                    pass
-                print(f'[ssh_tunnel] Connection dropped (rc={proc.returncode}). '
-                      f'stderr: {err!r}. Reconnecting in 5s...')
-            else:
-                print('[ssh_tunnel] Starting SSH SOCKS tunnel to VPS...')
+        if proc is not None:
+            err = ''
             try:
-                _start_ssh_socks_tunnel()
-            except Exception as e:
-                print(f'[ssh_tunnel] Failed to start: {type(e).__name__}: {e}')
-            _th.Event().wait(5)
+                err = proc.stderr.read()[-300:] if proc.stderr else ''
+            except Exception:
+                pass
+            print(f'[ssh_tunnel] Connection dropped (rc={proc.returncode}). '
+                  f'stderr: {err!r}. Reconnecting in 5s...')
         else:
-            _th.Event().wait(10)
+            print('[ssh_tunnel] Starting SSH SOCKS tunnel to VPS...')
+        try:
+            _start_ssh_socks_tunnel()
+        except Exception as e:
+            print(f'[ssh_tunnel] Failed to start: {type(e).__name__}: {e}')
+        _th.Event().wait(5)
 
 
 if _VPS_SSH_HOST and _VPS_SSH_USER and _VPS_SSH_PASS and not YTDLP_PROXY: