dev

Author: sshterm

Sources/SSH/Channel.swift

@@ -53,10 +53,10 @@ public extension SSH {
                 closed(channel: rawChannel)
                 return -1
             }
+            let rc = io.Copy(output, ChannelInputStream(rawChannel: rawChannel, ssh: self, wait: true), bufferSize)
             if let stderr {
                 io.Copy(stderr, ChannelInputStream(rawChannel: rawChannel, ssh: self, err: true, wait: true), bufferSize)
             }
-            let rc = io.Copy(output, ChannelInputStream(rawChannel: rawChannel, ssh: self, wait: true), bufferSize)
             closed(channel: rawChannel)
             return rc
         }

Sources/SSH/Machine/Container.swift

@@ -1,4 +1,4 @@
-// Docker.swift
+// Container.swift
 // Copyright (c) 2025 ssh2.app
 // Created by [email protected] 2025/2/3.
 

Sources/SSH/Machine/Process.swift

@@ -8,7 +8,7 @@ import Foundation
 public extension SSH {
     func getSystemProcess(bootTime: Double, clkTck: Double = 0x64) async -> [SystemProcess] {
         let ret1: [SystemProcess] = await findSystemProcess(bootTime: bootTime, clkTck: clkTck)
-//        try? await Task.sleep(for: .seconds(1))
+//        await Task.sleep(seconds: 1)
 //        var ret2: [SystemProcess] = await findSystemProcess(bootTime: bootTime,clkTck: clkTck)
 //        let cout = ret2.count - 1
 //        guard cout > 0 else {

Sources/SSH/SSH.swift

@@ -15,7 +15,7 @@ public class SSH {
     ///
     /// This constant holds the version number of the SSH library as a string.
     /// It can be used to check the version of the library being used in the project.
-    public static let version = "0.0.2"
+    public static let version = "0.0.3"
 
     /// A constant representing the version of the libssh2 library being used.
     /// This value is defined by the `LIBSSH2_VERSION` macro.
@@ -96,6 +96,8 @@ public class SSH {
 
     public var encoding: String.Encoding = .utf8
 
+    public var container: ContainerType = .docker
+
     var flowSource: DispatchSourceTimer?
 
     /// Initializes a new SSH connection with the specified parameters.

Sources/SSH/Shell.swift

@@ -13,14 +13,14 @@ public extension SSH {
             guard rawChannel != nil else {
                 return false
             }
+            pollShell()
             var code = callSSH2 {
                 libssh2_channel_request_pty_ex(rawChannel, type.name, type.name.count.load(), nil, 0, width, height, LIBSSH2_TERM_WIDTH_PX, LIBSSH2_TERM_HEIGHT_PX)
             }
             guard code == LIBSSH2_ERROR_NONE else {
                 closeShell()
                 return false
             }
-            pollShell()
             code = callSSH2 {
                 libssh2_channel_process_startup(rawChannel, "shell", 5, nil, 0)
             }

Sources/SSH/Types.swift

@@ -226,3 +226,11 @@ public struct Connect: Identifiable, Equatable, Hashable, Codable {
         case user, host, port, password
     }
 }
+
+public enum ContainerType: String, CaseIterable {
+    case docker, podman
+
+    var command: String {
+        rawValue
+    }
+}