termux-connecting 1.1.53 → 1.1.55

package/bin/termux-connect-pc

@@ -99,9 +99,10 @@ cmd_connection() {
 
     if [ -n "$new_name" ]; then
         HOST_ALIAS="$new_name"
+        load_config "$new_name" || true
     fi
 
-    title "TERMUX CONNECT — Connection Setup"
+    title "TERMUX CONNECTING v${VERSION} — Connection Setup"
     echo "Saya akan bantu kamu menghubungkan PC ini ke Termux di HP."
     echo ""
 
@@ -159,6 +160,24 @@ cmd_connection() {
         return
     fi
 
+    echo ""
+    echo "  ── Cek Ping ke $SSH_HOST ──"
+    echo "  Ping $SSH_HOST untuk verifikasi..."
+    if command -v ping >/dev/null; then
+        result=$(run_timeout 5 ping -c 2 -W 2 "$SSH_HOST" 2>&1)
+        loss=$(echo "$result" | awk '/loss/{print $6}' | tr -d '%')
+        if [ -n "$loss" ] && [ "$loss" -lt 1 ] 2>/dev/null; then
+            rtt=$(echo "$result" | awk -F'/' '/rtt/{print $5}')
+            info "HP reachable (RTT: ${rtt}ms)"
+        else
+            error "HP tidak reachable (packet loss: ${loss:-100}%)"
+            echo "  Pastikan HP dan PC di jaringan yang SAMA."
+            echo "  Cek IP dengan termux-connecting --check di HP."
+            return
+        fi
+    fi
+    echo ""
+
     # ── Cek Konektifitas ──
     title "1. Cek Konektifitas"
     echo "  Mencoba koneksi ke ${SSH_USER}@${SSH_HOST}:${SSH_PORT}..."
@@ -315,7 +334,7 @@ EOF
 # ─── COMMAND: list ────────────────────────────────────────────
 cmd_list() {
     load_active
-    title "TERMUX CONNECT — Devices"
+    title "TERMUX CONNECTING v${VERSION} — Devices"
     local devices=()
     while IFS= read -r d; do
         devices+=("$d")
@@ -365,7 +384,7 @@ cmd_check() {
         return
     fi
 
-    title "TERMUX CONNECT — Check"
+    title "TERMUX CONNECTING v${VERSION} — Check"
     echo "Device: ${ACTIVE_DEVICE} (${SSH_USER}@${SSH_HOST}:${SSH_PORT})"
     echo ""
 

package/bin/termux-connecting

@@ -1,7 +1,7 @@
 #!/data/data/com.termux/files/usr/bin/bash
 set -e
 
-VERSION="1.1.53"
+VERSION="1.1.55"
 
 GREEN='\033[0;32m'; YELLOW='\033[1;33m'; RED='\033[0;31m'; CYAN='\033[0;36m'; NC='\033[0m'
 info()  { echo -e "${GREEN}[✓]${NC} $1"; }
@@ -9,26 +9,38 @@ warn()  { echo -e "${YELLOW}[!]${NC} $1"; }
 error() { echo -e "${RED}[✗]${NC} $1"; }
 title() { echo -e "\n${CYAN}━━━ $1 ━━━${NC}\n"; }
 
+# ─── Helper: timeout lintas platform ───
+run_timeout() {
+    local sec="$1"; shift
+    if command -v timeout >/dev/null 2>&1; then
+        timeout "$sec" "$@"
+    elif command -v gtimeout >/dev/null 2>&1; then
+        gtimeout "$sec" "$@"
+    else
+        "$@"
+    fi
+}
+
 # ─── Helper: dapatkan IP dengan berbagai metode ───
 get_ip() {
     local ip=""
     if command -v ip >/dev/null; then
         for iface in wlan0 wlan1 eth0 eth1 wlp2s0 wlp3s0 en0 en1; do
-            ip=$(timeout 2 ip -4 addr show $iface 2>/dev/null | awk '/inet /{print $2}' | cut -d/ -f1)
+            ip=$(run_timeout 2 ip -4 addr show $iface 2>/dev/null | awk '/inet /{print $2}' | cut -d/ -f1)
             [ -n "$ip" ] && break
         done
         if [ -z "$ip" ]; then
-            ip=$(timeout 2 ip route get 1.1.1.1 2>/dev/null | awk '{print $7}')
+            ip=$(run_timeout 2 ip route get 1.1.1.1 2>/dev/null | awk '{print $7}')
         fi
         if [ -z "$ip" ]; then
-            ip=$(timeout 2 ip -4 addr show 2>/dev/null | awk '/inet /{print $2}' | cut -d/ -f1 | grep -v 127.0.0.1 | head -1)
+            ip=$(run_timeout 2 ip -4 addr show 2>/dev/null | awk '/inet /{print $2}' | cut -d/ -f1 | grep -v 127.0.0.1 | head -1)
         fi
     fi
     if [ -z "$ip" ] && command -v ifconfig >/dev/null; then
-        ip=$(timeout 2 ifconfig 2>/dev/null | awk '/inet /{print $2}' | grep -v 127.0.0.1 | head -1)
+        ip=$(run_timeout 2 ifconfig 2>/dev/null | awk '/inet /{print $2}' | grep -v 127.0.0.1 | head -1)
     fi
     if [ -z "$ip" ] && command -v getprop >/dev/null; then
-        local iface=$(getprop wifi.interface)
+        local iface=$(getprop wifi.interface 2>/dev/null)
         [ -n "$iface" ] && ip=$(getprop dhcp.${iface}.ipaddress 2>/dev/null)
         [ -z "$ip" ] && ip=$(getprop dhcp.wlan0.ipaddress 2>/dev/null)
         [ -z "$ip" ] && ip=$(getprop dhcp.wlan1.ipaddress 2>/dev/null)
@@ -72,7 +84,6 @@ if $HELP; then
     exit 0
 fi
 
-# ─── Mode: Check/Status ───
 if $CHECK; then
     echo ""
     title "TERMUX CONNECTING — Status v${VERSION}"
@@ -91,7 +102,7 @@ if $CHECK; then
     echo ""
     echo "  🌐 Network    :"
     for iface in wlan0 wlan1 eth0 eth1 wlp2s0 wlp3s0 en0 en1; do
-        addr=$(timeout 2 ip -4 addr show $iface 2>/dev/null | awk '/inet /{print $2}' | cut -d/ -f1)
+        addr=$(run_timeout 2 ip -4 addr show $iface 2>/dev/null | awk '/inet /{print $2}' | cut -d/ -f1)
         if [ -n "$addr" ]; then
             echo "     $iface : $addr"
         fi
@@ -235,6 +246,34 @@ fi
 
 title "TERMUX CONNECTING v${VERSION} — Setup"
 
+# ─── Cek Jaringan Diawal ───
+title "Cek Jaringan"
+ip=$(get_ip)
+if [ -z "$ip" ]; then
+    error "Tidak ada koneksi WiFi. Setup dibatalkan."
+    echo "  Hubungkan HP ke WiFi, lalu ulangi: termux-connecting -y"
+    exit 1
+fi
+gateway=$(run_timeout 3 ip route 2>/dev/null | awk '/default via/{print $3}' | head -1)
+if [ -z "$gateway" ] && command -v getprop >/dev/null; then
+    iface=$(getprop wifi.interface 2>/dev/null); [ -z "$iface" ] && iface="wlan0"
+    gateway=$(getprop dhcp.${iface}.gateway 2>/dev/null)
+fi
+if [ -n "$gateway" ]; then
+    result=$(run_timeout 5 ping -c 2 -W 2 "$gateway" 2>&1)
+    loss=$(echo "$result" | awk '/loss/{print $6}' | tr -d '%')
+    if [ -n "$loss" ] && [ "$loss" -lt 1 ] 2>/dev/null; then
+        info "Jaringan stabil (0% loss) — IP: $ip"
+    else
+        error "Jaringan tidak stabil (packet loss: ${loss:-100}%)"
+        echo "  Setup dibatalkan. Perbaiki jaringan lalu ulangi."
+        exit 1
+    fi
+else
+    info "Jaringan terdeteksi — IP: $ip"
+fi
+echo ""
+
 # ─── 1. coreutils & iproute2 ───
 if ! command -v timeout >/dev/null; then
     echo "  Dibutuhkan: coreutils (untuk timeout)"
@@ -366,7 +405,7 @@ title "6. Cek Stabilitas Jaringan"
 STABLE=false
 if [ -n "$IP" ]; then
     echo "  Ping gateway untuk verifikasi koneksi..."
-    gateway=$(timeout 3 ip route 2>/dev/null | awk '/default via/{print $3}' | head -1)
+gateway=$(run_timeout 3 ip route 2>/dev/null | awk '/default via/{print $3}' | head -1)
     if [ -z "$gateway" ] && command -v getprop >/dev/null; then
         iface=$(getprop wifi.interface 2>/dev/null)
         [ -z "$iface" ] && iface="wlan0"
@@ -374,7 +413,7 @@ if [ -n "$IP" ]; then
     fi
     if [ -n "$gateway" ]; then
         echo "  Gateway: $gateway"
-        result=$(timeout 5 ping -c 2 -W 2 "$gateway" 2>&1)
+    result=$(run_timeout 5 ping -c 2 -W 2 "$gateway" 2>&1)
         loss=$(echo "$result" | awk '/loss/{print $6}' | tr -d '%')
         if [ -n "$loss" ] && [ "$loss" -lt 1 ] 2>/dev/null; then
             STABLE=true

package/package.json

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