Replace NEKit dependency with reduced subset

GlassVPN/zhuhaow-NEKit/Socket/AdapterSocket/Factory/AdapterFactory.swift

@@ -0,0 +1,35 @@
+import Foundation
+
+/// The base class of adapter factory.
+open class AdapterFactory {
+    public init() {}
+    
+    /**
+     Build an adapter.
+
+     - parameter session: The connect session.
+
+     - returns: The built adapter.
+     */
+    open func getAdapterFor(session: ConnectSession) -> AdapterSocket {
+        return getDirectAdapter()
+    }
+
+    /**
+     Helper method to get a `DirectAdapter`.
+
+     - returns: A direct adapter.
+     */
+    public func getDirectAdapter() -> AdapterSocket {
+        let adapter = DirectAdapter()
+        adapter.socket = RawSocketFactory.getRawSocket()
+        return adapter
+    }
+}
+
+/// Factory building direct adapters.
+///
+/// - note: This is needed since we need to identify direct adapter factory.
+public class DirectAdapterFactory: AdapterFactory {
+    public override init() {}
+}

GlassVPN/zhuhaow-NEKit/Socket/AdapterSocket/Factory/AdapterFactoryManager.swift

@@ -0,0 +1,27 @@
+import Foundation
+
+/// This is a very simple wrapper of a dict of type `[String: AdapterFactory]`.
+///
+/// Use it as a normal dict.
+public class AdapterFactoryManager {
+    private var factoryDict: [String: AdapterFactory]
+
+    public subscript(index: String) -> AdapterFactory? {
+        get {
+            if index == "direct" {
+                return DirectAdapterFactory()
+            }
+            return factoryDict[index]
+        }
+        set { factoryDict[index] = newValue }
+    }
+
+    /**
+     Initialize a new factory manager.
+
+     - parameter factoryDict: The factory dict.
+     */
+    public init(factoryDict: [String: AdapterFactory]) {
+        self.factoryDict = factoryDict
+    }
+}

GlassVPN/zhuhaow-NEKit/Socket/AdapterSocket/Factory/AuthenticationServerAdapterFactory.swift

@@ -0,0 +1,11 @@
+import Foundation
+
+/// Factory building server adapter which requires authentication.
+open class HTTPAuthenticationAdapterFactory: ServerAdapterFactory {
+    let auth: HTTPAuthentication?
+
+    required public init(serverHost: String, serverPort: Int, auth: HTTPAuthentication?) {
+        self.auth = auth
+        super.init(serverHost: serverHost, serverPort: serverPort)
+    }
+}

GlassVPN/zhuhaow-NEKit/Socket/AdapterSocket/Factory/HTTPAdapterFactory.swift

@@ -0,0 +1,21 @@
+import Foundation
+
+/// Factory building HTTP adapter.
+open class HTTPAdapterFactory: HTTPAuthenticationAdapterFactory {
+    required public init(serverHost: String, serverPort: Int, auth: HTTPAuthentication?) {
+        super.init(serverHost: serverHost, serverPort: serverPort, auth: auth)
+    }
+
+    /**
+     Get a HTTP adapter.
+
+     - parameter session: The connect session.
+
+     - returns: The built adapter.
+     */
+    override open func getAdapterFor(session: ConnectSession) -> AdapterSocket {
+        let adapter = HTTPAdapter(serverHost: serverHost, serverPort: serverPort, auth: auth)
+        adapter.socket = RawSocketFactory.getRawSocket()
+        return adapter
+    }
+}

GlassVPN/zhuhaow-NEKit/Socket/AdapterSocket/Factory/RejectAdapterFactory.swift

@@ -0,0 +1,13 @@
+import Foundation
+
+open class RejectAdapterFactory: AdapterFactory {
+    public let delay: Int
+
+    public init(delay: Int = Opt.RejectAdapterDefaultDelay) {
+        self.delay = delay
+    }
+
+    override open func getAdapterFor(session: ConnectSession) -> AdapterSocket {
+        return RejectAdapter(delay: delay)
+    }
+}

GlassVPN/zhuhaow-NEKit/Socket/AdapterSocket/Factory/SOCKS5AdapterFactory.swift

@@ -0,0 +1,21 @@
+import Foundation
+
+/// Factory building SOCKS5 adapter.
+open class SOCKS5AdapterFactory: ServerAdapterFactory {
+    override public init(serverHost: String, serverPort: Int) {
+        super.init(serverHost: serverHost, serverPort: serverPort)
+    }
+
+    /**
+     Get a SOCKS5 adapter.
+
+     - parameter session: The connect session.
+
+     - returns: The built adapter.
+     */
+    override open func getAdapterFor(session: ConnectSession) -> AdapterSocket {
+        let adapter = SOCKS5Adapter(serverHost: serverHost, serverPort: serverPort)
+        adapter.socket = RawSocketFactory.getRawSocket()
+        return adapter
+    }
+}

GlassVPN/zhuhaow-NEKit/Socket/AdapterSocket/Factory/SecureHTTPAdapterFactory.swift

@@ -0,0 +1,21 @@
+import Foundation
+
+/// Factory building secured HTTP (HTTP with SSL) adapter.
+open class SecureHTTPAdapterFactory: HTTPAdapterFactory {
+    required public init(serverHost: String, serverPort: Int, auth: HTTPAuthentication?) {
+        super.init(serverHost: serverHost, serverPort: serverPort, auth: auth)
+    }
+
+    /**
+     Get a secured HTTP adapter.
+
+     - parameter session: The connect session.
+
+     - returns: The built adapter.
+     */
+    override open func getAdapterFor(session: ConnectSession) -> AdapterSocket {
+        let adapter = SecureHTTPAdapter(serverHost: serverHost, serverPort: serverPort, auth: auth)
+        adapter.socket = RawSocketFactory.getRawSocket()
+        return adapter
+    }
+}

GlassVPN/zhuhaow-NEKit/Socket/AdapterSocket/Factory/ServerAdapterFactory.swift

@@ -0,0 +1,12 @@
+import Foundation
+
+/// Factory building adapter with proxy server host and port.
+open class ServerAdapterFactory: AdapterFactory {
+    let serverHost: String
+    let serverPort: Int
+
+    public init(serverHost: String, serverPort: Int) {
+        self.serverHost = serverHost
+        self.serverPort = serverPort
+    }
+}

GlassVPN/zhuhaow-NEKit/Socket/AdapterSocket/Factory/ShadowsocksAdapterFactory.swift

@@ -0,0 +1,28 @@
+//import Foundation
+//
+///// Factory building Shadowsocks adapter.
+//open class ShadowsocksAdapterFactory: ServerAdapterFactory {
+//    let protocolObfuscaterFactory: ShadowsocksAdapter.ProtocolObfuscater.Factory
+//    let cryptorFactory: ShadowsocksAdapter.CryptoStreamProcessor.Factory
+//    let streamObfuscaterFactory: ShadowsocksAdapter.StreamObfuscater.Factory
+//
+//    public init(serverHost: String, serverPort: Int, protocolObfuscaterFactory: ShadowsocksAdapter.ProtocolObfuscater.Factory, cryptorFactory: ShadowsocksAdapter.CryptoStreamProcessor.Factory, streamObfuscaterFactory: ShadowsocksAdapter.StreamObfuscater.Factory) {
+//        self.protocolObfuscaterFactory = protocolObfuscaterFactory
+//        self.cryptorFactory = cryptorFactory
+//        self.streamObfuscaterFactory = streamObfuscaterFactory
+//        super.init(serverHost: serverHost, serverPort: serverPort)
+//    }
+//
+//    /**
+//     Get a Shadowsocks adapter.
+//
+//     - parameter session: The connect session.
+//
+//     - returns: The built adapter.
+//     */
+//    override open func getAdapterFor(session: ConnectSession) -> AdapterSocket {
+//        let adapter = ShadowsocksAdapter(host: serverHost, port: serverPort, protocolObfuscater: protocolObfuscaterFactory.build(), cryptor: cryptorFactory.build(), streamObfuscator: streamObfuscaterFactory.build(for: session))
+//        adapter.socket = RawSocketFactory.getRawSocket()
+//        return adapter
+//    }
+//}

GlassVPN/zhuhaow-NEKit/Socket/AdapterSocket/Factory/SpeedAdapterFactory.swift

@@ -0,0 +1,26 @@
+//import Foundation
+//
+///// Factory building speed adapter.
+//open class SpeedAdapterFactory: AdapterFactory {
+//    open var adapterFactories: [(AdapterFactory, Int)]!
+//
+//    public override init() {}
+//
+//    /**
+//     Get a speed adapter.
+//
+//     - parameter session: The connect session.
+//
+//     - returns: The built adapter.
+//     */
+//    override open func getAdapterFor(session: ConnectSession) -> AdapterSocket {
+//        let adapters = adapterFactories.map { adapterFactory, delay -> (AdapterSocket, Int) in
+//            let adapter = adapterFactory.getAdapterFor(session: session)
+//            adapter.socket = RawSocketFactory.getRawSocket()
+//            return (adapter, delay)
+//        }
+//        let speedAdapter = SpeedAdapter()
+//        speedAdapter.adapters = adapters
+//        return speedAdapter
+//    }
+//}