termux-connecting 1.1.20 → 1.1.22

package/bin/termux-connecting

@@ -144,21 +144,32 @@ USERNAME=$(whoami)
 
 IP=""
 if command -v ip >/dev/null; then
-    IP=$(ip -4 addr show | awk '/inet /{print $2}' | cut -d/ -f1 | grep -v 127.0.0.1 | head -1)
+    IP=$(ip -4 addr show 2>/dev/null | awk '/inet /{print $2}' | cut -d/ -f1 | grep -v 127.0.0.1 | head -1)
 fi
 if [ -z "$IP" ] && command -v ifconfig >/dev/null; then
-    IP=$(ifconfig | awk '/inet /{print $2}' | grep -v 127.0.0.1 | head -1)
+    IP=$(ifconfig 2>/dev/null | awk '/inet /{print $2}' | grep -v 127.0.0.1 | head -1)
 fi
 if [ -z "$IP" ] && command -v hostname >/dev/null; then
-    IP=$(hostname -I | awk '{print $1}')
+    IP=$(hostname -I 2>/dev/null | awk '{print $1}')
 fi
 if [ -z "$IP" ] && [ -d /data/data/com.termux ]; then
-    IP=$(ip route get 1.1.1.1 | awk '{print $7}' | head -1)
+    IP=$(ip route get 1.1.1.1 2>/dev/null | awk '{print $7}' | head -1)
 fi
 if [ -z "$IP" ]; then
     IP=""
 fi
 
+WIFI_SSID=""
+if command -v termux-wifi-connectioninfo >/dev/null; then
+    WIFI_SSID=$(termux-wifi-connectioninfo 2>/dev/null | grep -o '"ssid":"[^"]*"' | cut -d'"' -f4)
+fi
+if [ -z "$WIFI_SSID" ] && command -v iw >/dev/null; then
+    WIFI_SSID=$(iw dev wlan0 link 2>/dev/null | grep -i ssid | sed 's/.*SSID: //')
+fi
+if [ -z "$WIFI_SSID" ] && [ -r /proc/net/wireless ]; then
+    WIFI_SSID=$(awk 'NR==3{print $1}' /proc/net/wireless 2>/dev/null | tr -d ':')
+fi
+
 is_cgnat() {
     [[ "$1" =~ ^10\. ]] || [[ "$1" =~ ^100\.(6[4-9]|[7-9][0-9]|1[0-1][0-9]|12[0-7])\. ]]
 }
@@ -170,6 +181,9 @@ is_wifi() {
 echo "  Username : $USERNAME"
 echo "  IP       : ${IP:-tidak terdeteksi}"
 echo "  Port     : 8022"
+if [ -n "$WIFI_SSID" ]; then
+    echo "  WiFi     : $WIFI_SSID"
+fi
 echo ""
 
 if [ -z "$IP" ]; then
@@ -180,7 +194,7 @@ if [ -z "$IP" ]; then
     echo "  1. Buka Pengaturan → WiFi, hubungkan ke jaringan rumah/kantor"
     echo "  2. Setelah terhubung, jalankan ulang: termux-connecting -y"
 elif is_cgnat "$IP"; then
-    warn "IP ${IP} terdeteksi sebagai jaringan SELULER/VPN"
+    warn "IP ${IP} terdeteksi sebagai jaringan SELULER/VPN${WIFI_SSID:+ (WiFi terdeteksi: $WIFI_SSID)}"
     echo "  PC dan HP harus dalam jaringan WiFi yang SAMA."
     echo ""
     echo "  Langkah:"
@@ -197,14 +211,19 @@ elif is_wifi "$IP"; then
     echo "  Lalu isi data di atas saat diminta."
     echo "  Setelah setup, cukup: ssh ${HOST_ALIAS:-termux-a8star}"
     echo ""
-    warn "Pastikan HP dan PC terhubung ke jaringan WiFi YANG SAMA"
+    if [ -n "$WIFI_SSID" ]; then
+        echo "  PC harus terhubung ke WiFi: ${WIFI_SSID}"
+    else
+        warn "Pastikan HP dan PC terhubung ke jaringan WiFi YANG SAMA"
+    fi
     echo ""
     echo "  Data koneksi — simpan untuk setup PC:"
-    echo "  ┌─────────────────────────────┐"
-    echo "  │ Username : $USERNAME         │"
-    echo "  │ IP       : $IP               │"
-    echo "  │ Port     : 8022              │"
-    echo "  └─────────────────────────────┘"
+    echo "  ┌──────────────────────────────────┐"
+    printf "  │ %-32s │\n" "Username : $USERNAME"
+    printf "  │ %-32s │\n" "IP       : $IP"
+    printf "  │ %-32s │\n" "Port     : 8022"
+    [ -n "$WIFI_SSID" ] && printf "  │ %-32s │\n" "WiFi     : $WIFI_SSID"
+    echo "  └──────────────────────────────────┘"
 else
     warn "IP ${IP} tidak dikenal — mungkin bukan jaringan lokal"
     echo "  Pastikan HP terhubung ke WiFi, bukan data seluler."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termux-connecting",
-  "version": "1.1.20",
+  "version": "1.1.22",
   "description": "CLI setup Termux + koneksi SSH dari PC/Mac dengan Telegram alert",
   "bin": {
     "termux-connecting": "bin/termux-connecting",