Update custom-entrypoint.sh

custom-entrypoint.sh

@@ -5,10 +5,28 @@ set -e
 # Detect external/public IP dynamically (you can hardcode this if needed)
 # EXTERNAL_IP=$(curl -s https://ifconfig.me)
 echo "Starting ngrok in background..."
-ngrok start turn_tls --config /ngrok2/ngrok.yml --log=stdout --log-level=debug &
+NGROK_LOG=/tmp/ngrok.log
+ngrok start turn_tls --config /ngrok2/ngrok.yml --log=stdout --log-level=debug > "$NGROK_LOG" 2>&1 &
 NGROK_PID=$!
+
 echo "Waiting for ngrok TCP tunnel..."
-ngrok --help
+
+# Retry loop to wait until the TCP URL appears
+for i in $(seq 1 30); do
+    # Look for tcp:// in stdout
+    PUBLIC_TCP=$(grep -o 'tcp://[0-9a-zA-Z\.-]*:[0-9]*' "$NGROK_LOG" | head -n 1)
+    if [ -n "$PUBLIC_TCP" ]; then
+        break
+    fi
+    sleep 1
+done
+
+if [ -z "$PUBLIC_TCP" ]; then
+    echo "Error: Could not find ngrok TCP public URL."
+    exit 1
+fi
+
+echo "Ngrok public TCP URL: $PUBLIC_TCP"
 # Retry loop until public TCP address is available
 # PUBLIC_TCP=""
 # while [[ -z "$PUBLIC_TCP" ]]; do
@@ -34,12 +52,12 @@ ngrok --help
 # done 
 # echo "PUBLIC ip :$PUBLIC_TCP"
 # # Extract host and host:port
-# TURN_HOST="${PUBLIC_TCP%%:*}"
-# TURN_HOST_PORT="$PUBLIC_TCP"
+ TURN_HOST="${PUBLIC_TCP%%:*}"
+ TURN_HOST_PORT="$PUBLIC_TCP"
 
-# export TURN_PUBLIC_ADDR="$TURN_HOST_PORT"
-# export TURN_HOST="$TURN_HOST"
-# export TURN_HOST_PORT="$TURN_HOST_PORT"
+export TURN_PUBLIC_ADDR="$TURN_HOST_PORT"
+export TURN_HOST="$TURN_HOST"
+export TURN_HOST_PORT="$TURN_HOST_PORT"
 
 
 echo "Starting turnserver..."
@@ -48,7 +66,7 @@ exec turnserver \
 #     --listening-ip=0.0.0.0 \
      --listening-port=7860 \
      --tls-listening-port=5349 \
-     --external-ip=8.tcp.ngrok.io:15174 \
+     --external-ip="$TURN_PUBLIC_ADDR" \
 #     --cert=/etc/turn/certs/turn_server_cert.pem \
 #     --pkey=/etc/turn/certs/turn_server_pkey.pem \
      --user=myuser:mypassword \