termux-connecting 1.1.15 → 1.1.19

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"
@@ -414,11 +429,26 @@ main() {
         *)
             load_active
             if [ -z "$ACTIVE_DEVICE" ]; then
-                echo "Belum ada device. Setup koneksi pertama."
+                echo ""
+                echo "  Ini pertama kali kamu jalankan termux-connect-pc."
+                echo "  Kita akan setup koneksi ke Termux di HP kamu."
                 echo ""
                 cmd_connection
             else
-                cmd_help
+                echo ""
+                echo "  Device aktif saat ini: ${ACTIVE_DEVICE}"
+                echo ""
+                echo "  1) Konek ke ${ACTIVE_DEVICE}"
+                echo "  2) Tambah device baru"
+                echo "  3) Lihat daftar device"
+                echo ""
+                echo -n "  Pilih [1]: "
+                read -r choice
+                case "$choice" in
+                    2) cmd_connection ;;
+                    3) cmd_list ;;
+                    *) cmd_check ;;
+                esac
             fi
             ;;
     esac

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=""
@@ -158,9 +172,6 @@ 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         │"

package/package.json

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