fix

Author: sshterm

src/Channel.swift

@@ -228,9 +228,7 @@ public extension SSH {
         #if DEBUG
             print("取消所有定时器和socket源")
         #endif
-        if let socketSource = socketSource {
-            socketSource.cancel()
-            self.socketSource = nil
-        }
+        socketSource?.cancel()
+        socketSource = nil
     }
 }

src/SSH.swift

@@ -141,16 +141,16 @@ public class SSH {
             sockfd = LIBSSH2_INVALID_SOCKET
         case .session:
             if let rawSession {
-                job.cancelAllOperations()
-                cancelKeepalive()
-                cancelSources()
                 shutdown(SHUT_RD)
-                close(.channel)
-                close(.sftp)
+                job.cancelAllOperations()
                 lockRow.lock()
                 defer {
                     lockRow.unlock()
                 }
+                cancelKeepalive()
+                cancelSources()
+                close(.channel)
+                close(.sftp)
                 _ = callSSH2 {
                     libssh2_session_disconnect_ex(rawSession, SSH_DISCONNECT_BY_APPLICATION, "SSH Term: Disconnect", "")
                 }

src/Session.swift

@@ -326,10 +326,8 @@ public extension SSH {
 
     // 取消心跳包
     func cancelKeepalive() {
-        if let keepAliveSource = keepAliveSource {
-            keepAliveSource.cancel()
-            self.keepAliveSource = nil
-        }
+        keepAliveSource?.cancel()
+        keepAliveSource = nil
     }
 
     // 发送心跳包以保持连接活跃

src/String+.swift

@@ -32,6 +32,6 @@ extension String {
     }
 
     func trim() -> String {
-        trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
+        trimmingCharacters(in: .whitespacesAndNewlines)
     }
 }