termux-connecting 1.1.16 → 1.1.20

package/bin/termux-connect-pc

@@ -17,11 +17,26 @@ title() { echo -e "\n${CYAN}━━━ $1 ━━━${NC}\n"; }
 
 prompt() {
     local val default="$2"
-    echo -n "$1${default:+ [$default]}: "
+    echo -n "$1${default:+ [$default]}: " >&2
     read -r val
     echo "${val:-$default}"
 }
 
+has_timeout() {
+    command -v timeout >/dev/null 2>&1 || command -v gtimeout >/dev/null 2>&1
+}
+
+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
+}
+
 load_active() {
     if [ -f "$CONFIG_FILE" ]; then
         ACTIVE_DEVICE=$(cat "$CONFIG_FILE")
@@ -149,7 +164,7 @@ cmd_connection() {
     local connected=false
 
     # Key-based
-    if timeout 10 ssh -o ConnectTimeout=5 -o BatchMode=yes -p "$SSH_PORT" "${SSH_USER}@${SSH_HOST}" "echo connected"; then
+    if run_timeout 10 ssh -o ConnectTimeout=5 -o BatchMode=yes -p "$SSH_PORT" "${SSH_USER}@${SSH_HOST}" "echo connected"; then
         info "Koneksi berhasil (key-based)"
         connected=true
     # Password via sshpass
@@ -157,7 +172,7 @@ cmd_connection() {
         echo "  SSH key tidak dikenali. Coba dengan password..."
         local pass
         pass=$(prompt "  ➤  Password SSH" "")
-        if timeout 10 sshpass -p "$pass" ssh -o StrictHostKeyChecking=no -o ConnectTimeout=5 -p "$SSH_PORT" "${SSH_USER}@${SSH_HOST}" "echo connected"; then
+        if run_timeout 10 sshpass -p "$pass" ssh -o StrictHostKeyChecking=no -o ConnectTimeout=5 -p "$SSH_PORT" "${SSH_USER}@${SSH_HOST}" "echo connected"; then
             info "Koneksi berhasil (password)"
             connected=true
         fi
@@ -169,7 +184,7 @@ cmd_connection() {
         echo "  ssh -p ${SSH_PORT} ${SSH_USER}@${SSH_HOST}"
         echo ""
         echo -n "  ➤  Setelah berhasil, tekan enter untuk lanjut..."; read -r
-        if timeout 10 ssh -o ConnectTimeout=5 -o BatchMode=yes -p "$SSH_PORT" "${SSH_USER}@${SSH_HOST}" "echo connected"; then
+        if run_timeout 10 ssh -o ConnectTimeout=5 -o BatchMode=yes -p "$SSH_PORT" "${SSH_USER}@${SSH_HOST}" "echo connected"; then
             connected=true
         fi
     fi
@@ -207,7 +222,7 @@ cmd_connection() {
     if [ -f "$SSH_KEY" ]; then
         echo ""
         echo "  Meng-copy public key ke HP..."
-        if timeout 15 ssh-copy-id -o StrictHostKeyChecking=no -o ConnectTimeout=10 -p "$SSH_PORT" "${SSH_USER}@${SSH_HOST}"; then
+        if run_timeout 15 ssh-copy-id -o StrictHostKeyChecking=no -o ConnectTimeout=10 -p "$SSH_PORT" "${SSH_USER}@${SSH_HOST}"; then
             info "Public key berhasil di-copy ke HP"
         else
             warn "Gagal copy otomatis. Copy manual:"
@@ -333,7 +348,7 @@ cmd_check() {
     echo "Device: ${ACTIVE_DEVICE} (${SSH_USER}@${SSH_HOST}:${SSH_PORT})"
     echo ""
 
-    if timeout 10 ssh -o ConnectTimeout=5 -o BatchMode=yes "$ACTIVE_DEVICE" "echo connected"; then
+    if run_timeout 10 ssh -o ConnectTimeout=5 -o BatchMode=yes "$ACTIVE_DEVICE" "echo connected"; then
         info "Koneksi OK"
         echo ""
         info "Gunakan ssh $ACTIVE_DEVICE untuk koneksi"

package/bin/termux-connecting

@@ -124,8 +124,22 @@ else
     fi
 fi
 
-# ─── 5. Informasi Koneksi ───
-title "4. Informasi Koneksi"
+# ─── 5. SSH Server ───
+title "4. Cek SSH Server (sshd)"
+if pgrep -x sshd >/dev/null; then
+    info "sshd sudah berjalan"
+else
+    echo "  sshd belum jalan. Menjalankan..."
+    if sshd; then
+        info "sshd berhasil dijalankan"
+    else
+        error "Gagal menjalankan sshd"
+        echo "  Coba manual: sshd"
+    fi
+fi
+
+# ─── 6. Informasi Koneksi ───
+title "5. Informasi Koneksi"
 USERNAME=$(whoami)
 
 IP=""
@@ -142,31 +156,63 @@ if [ -z "$IP" ] && [ -d /data/data/com.termux ]; then
     IP=$(ip route get 1.1.1.1 | awk '{print $7}' | head -1)
 fi
 if [ -z "$IP" ]; then
-    IP="(tidak terdeteksi — pastikan WiFi/data aktif)"
+    IP=""
 fi
 
+is_cgnat() {
+    [[ "$1" =~ ^10\. ]] || [[ "$1" =~ ^100\.(6[4-9]|[7-9][0-9]|1[0-1][0-9]|12[0-7])\. ]]
+}
+
+is_wifi() {
+    [[ "$1" =~ ^192\.168\. ]] || [[ "$1" =~ ^172\.(1[6-9]|2[0-9]|3[01])\. ]]
+}
+
 echo "  Username : $USERNAME"
-echo "  IP       : $IP"
+echo "  IP       : ${IP:-tidak terdeteksi}"
 echo "  Port     : 8022"
 echo ""
-echo "  Di PC/Mac, jalankan perintah berikut:"
-echo "  npm i -g termux-connecting"
-echo "  termux-connect-pc"
-echo ""
-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"
-echo ""
-echo "  Jika SSH server belum jalan:"
-echo "  sshd"
-echo ""
-echo "  Data koneksi — simpan untuk setup PC:"
-echo "  ┌─────────────────────────────┐"
-echo "  │ Username : $USERNAME         │"
-echo "  │ IP       : $IP               │"
-echo "  │ Port     : 8022              │"
-echo "  └─────────────────────────────┘"
+
+if [ -z "$IP" ]; then
+    warn "IP tidak terdeteksi"
+    echo "  Pastikan HP terhubung ke WiFi, bukan data seluler."
+    echo ""
+    echo "  Langkah:"
+    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"
+    echo "  PC dan HP harus dalam jaringan WiFi yang SAMA."
+    echo ""
+    echo "  Langkah:"
+    echo "  1. Matikan data seluler dan VPN di HP"
+    echo "  2. Buka Pengaturan → WiFi, hubungkan ke jaringan yang sama dengan PC"
+    echo "  3. Catat IP yang muncul (biasanya 192.168.x.x)"
+    echo "  4. Jalankan ulang: termux-connecting -y"
+    echo "  5. Atau cek IP manual: ip a | grep wlan"
+elif is_wifi "$IP"; then
+    echo "  Di PC/Mac, jalankan perintah berikut:"
+    echo "  npm i -g termux-connecting"
+    echo "  termux-connect-pc"
+    echo ""
+    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"
+    echo ""
+    echo "  Data koneksi — simpan untuk setup PC:"
+    echo "  ┌─────────────────────────────┐"
+    echo "  │ Username : $USERNAME         │"
+    echo "  │ IP       : $IP               │"
+    echo "  │ Port     : 8022              │"
+    echo "  └─────────────────────────────┘"
+else
+    warn "IP ${IP} tidak dikenal — mungkin bukan jaringan lokal"
+    echo "  Pastikan HP terhubung ke WiFi, bukan data seluler."
+    echo ""
+    echo "  Cek koneksi WiFi: ip a | grep wlan"
+    echo "  Jika IP masih ${IP}, mungkin HP menggunakan VPN/proxy."
+    echo "  Matikan VPN dan coba lagi: termux-connecting -y"
+fi
 echo ""
 
 echo "----------------------------------------"

package/package.json

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