Update custom-entrypoint.sh

custom-entrypoint.sh

@@ -7,24 +7,35 @@ set -e
 echo "Starting ngrok in background..."
 ngrok start turn_tls --config /ngrok2/ngrok.yml --log=stdout --log-level=debug &
 NGROK_PID=$!
-echo "Waiting for ngrok tunnel..."
-for i in $(seq 1 20); do
-    if curl -s --max-time 1 http://127.0.0.1:7860/api/tunnels >/dev/null 2>&1; then
+echo "Waiting for ngrok TCP tunnel..."
+
+# Retry loop until public TCP address is available
+PUBLIC_TCP=""
+while [[ -z "$PUBLIC_TCP" ]]; do
+    sleep 2
+    PUBLIC_TCP=$(curl -s http://127.0.0.1:4040/api/tunnels \
+        | python3 -c "
+import sys, json
+tunnels=json.load(sys.stdin).get('tunnels', [])
+for t in tunnels:
+    if t.get('proto')=='tcp':
+        print(t.get('public_url','').replace('tcp://',''))
+        break
+" || echo "")
+
+    if [[ -n "$PUBLIC_TCP" ]]; then
+        echo "Ngrok public TCP address: $PUBLIC_TCP"
         break
     fi
-    sleep 1
 done
 
-# Fetch public TCP address
-PUBLIC_TCP=$(curl -s http://127.0.0.1:4040/api/tunnels \
-    | python3 -c "import sys, json; t=json.load(sys.stdin); print(t['tunnels'][0]['public_url'].replace('tcp://',''))")
-
-echo "Ngrok public TCP address: $PUBLIC_TCP"
-
-# Export it as environment variable if needed
-export TURN_PUBLIC_ADDR="$PUBLIC_TCP"
+# Extract host and host:port
+TURN_HOST="${PUBLIC_TCP%%:*}"
+TURN_HOST_PORT="$PUBLIC_TCP"
 
-sleep 1
+export TURN_PUBLIC_ADDR="$TURN_HOST_PORT"
+export TURN_HOST="$TURN_HOST"
+export TURN_HOST_PORT="$TURN_HOST_PORT"
 
 
 echo "Starting turnserver..."
@@ -36,7 +47,7 @@ exec turnserver \
 #     --cert=/etc/turn/certs/turn_server_cert.pem \
 #     --pkey=/etc/turn/certs/turn_server_pkey.pem \
      --user=myuser:mypassword \
-     --realm="$PUBLIC_TCP" \
+     --realm="$TURN_PUBLIC_ADDR" \
      --log-file=stdout \
      --simple-log \
      --no-cli &