Commit 37a50b94 authored by James Hughes's avatar James Hughes
Browse files

Change to socket-swift

parent 5e8eb250

Kinetic/NetworkChannel.swift

+66 −75
Original line number Diff line number Diff line
@@ -20,115 +20,106 @@ 


// @author: Ignacio Corderi



import BrightFutures

//import BrightFutures



public let connect = NetworkChannel.connect

public func connect(host: String, port: Int = NetworkChannel.DEFAULT_PORT) throws ->  KineticSession {

    return try NetworkChannel.connect(host, port: port, timeout: NetworkChannel.DEFAULT_CONNECT_TIMEOUT)

}



extension NSInputStream {

    

    func read(fully length: Int) -> Bytes {

        var buffer = Bytes(count:length, repeatedValue: 0)

        // TODO: loop until you read it all

        let _ = self.read(&buffer, maxLength: length)

        return buffer

    }

    

}



extension NSOutputStream {

    

    func write(bytes: Bytes) -> Int {

        return self.write(bytes, maxLength: bytes.count)

    }

    

}

public func connect(host: String, port: Int = NetworkChannel.DEFAULT_PORT, timeout: Double = 1.0) throws ->  KineticSession {

    print (1)

    return try NetworkChannel.connect(host, port: port, timeout: timeout)

}



//extension NSInputStream {

//    

//    func read(fully length: Int) -> Bytes {

//        var buffer = Bytes(count:length, repeatedValue: 0)

//        // TODO: loop until you read it all

//        let _ = self.read(&buffer, maxLength: length)

//        return buffer

//    }

//    

//}

//

//extension NSOutputStream {

//    

//    func write(bytes: Bytes) -> Int {

//        return self.write(bytes, maxLength: bytes.count)

//    }

//    

//}

//

//extension NSStream {

//    public var isOpen : Bool {

//        return self.streamStatus == .Open ||

//            self.streamStatus == .Writing ||

//            self.streamStatus == .Reading

//    }

//}



import Socket



extension NSStream {

    public var isOpen : Bool {

        return self.streamStatus == .Open ||

            self.streamStatus == .Writing ||

            self.streamStatus == .Reading

    }

}



public class NetworkChannel: CustomStringConvertible, KineticChannel {



    public static let DEFAULT_CONNECT_TIMEOUT = TimeInterval.In(1.0)

    public static let DEFAULT_CONNECT_TIMEOUT = 1.0

    public static let DEFAULT_PORT = 8123

    

    public let host: String

    public let port: Int

    

    // StreamChannel

    var inp: NSInputStream?

    var out: NSOutputStream?

    var stream:Stream? = nil

    

    // CustomStringConvertible (a.k.a toString)

    public var description: String { return "Channel \(self.host):\(self.port)" }

    public var description: String {

        return "Channel \(self.host):\(self.port)"

    }

    

    // KineticChannel

    weak public private(set) var session: KineticSession? = nil

    public var connected: Bool {

        guard let inputStream = self.inp else { return false }

        guard let outputStream = self.out else { return false }

        return inputStream.isOpen && outputStream.isOpen

        return !stream!.eof

    }

    

    internal init(host:String, port:Int) {

        self.host = host

    internal init(host:String, port:Int, timeout: Double = NetworkChannel.DEFAULT_CONNECT_TIMEOUT) throws {

        self.port = port

        self.host = host

        print(3)

        stream = try Stream(connectTo: host, port: in_port_t(port), timeout: timeout)

    }

    

    public static func connect(host: String, port: Int, timeout: TimeInterval) throws -> KineticSession {

        return try timeout.wait {

            let c = NetworkChannel(host: host, port: port)

            NSStream.getStreamsToHostWithName(host, port: port, inputStream: &c.inp, outputStream: &c.out)

            

            c.inp!.open()

            c.out!.open()

    public static func connect(host: String, port: Int, timeout: Double = NetworkChannel.DEFAULT_CONNECT_TIMEOUT) throws -> KineticSession {

        print(2)

        let c = try NetworkChannel(host: host, port: port, timeout: timeout)



        let s = KineticSession(channel: c)

        c.session = s

            

        return s

    }

    }

    

    public func clone() throws -> KineticSession {

        return try NetworkChannel.connect(self.host, port: self.port,

            timeout: NetworkChannel.DEFAULT_CONNECT_TIMEOUT)

        return try NetworkChannel.connect(host, port: port)

    }

    

    public func close() {

        self.inp?.close()

        self.out?.close()

        self.inp = nil

        self.out = nil

        stream!.releaseSock()

    }

    

    public func send(builder: Builder) throws {

        let outputStream = self.out!

        

        let encoded = try builder.encode()

        

        outputStream.write(encoded.header.bytes)

        outputStream.write(encoded.proto)

        try stream!.writeBytes(encoded.header.bytes, cork: true)

        try stream!.writeBytes(encoded.proto)

        if encoded.value.count > 0 {

            outputStream.write(encoded.value)

            try stream!.writeBytes(encoded.value)

        }

    }

    

    public func receive() throws -> RawResponse {

        let inputStream = self.inp!

        

        let header = KineticEncoding.Header(bytes: inputStream.read(fully: 9))

        let proto = inputStream.read(fully: header.protoLength)

        let header = try KineticEncoding.Header(bytes: stream!.readBytes(9))

        let proto = try stream!.readBytes(header.protoLength)

        var value: Bytes = []

        if header.valueLength > 0 {

            value = inputStream.read(fully: header.valueLength)

            value = try stream!.readBytes(header.valueLength)

        }

        

        let encoding = KineticEncoding(header, proto, value)
@@ -137,12 +128,12 @@ public class NetworkChannel: CustomStringConvertible, KineticChannel { 
    }

}



extension NetworkChannel: CustomReflectable {

    public func customMirror() -> Mirror {

        return Mirror(self, children: [

            "host" : self.host,

            "port" : self.port,

            "connected" : self.connected,

            ])

    }

}
 
 No newline at end of file
 
//extension NetworkChannel: CustomReflectable {

//    public func customMirror() -> Mirror {

//        return Mirror(self, children: [

//            "host" : self.host,

//            "port" : self.port,

//            "connected" : self.connected,

//            ])

//    }

//}
 
 No newline at end of file

Podfile.lock

+6 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ DEPENDENCIES: 
  - BrightFutures (from `https://github.com/Thomvis/BrightFutures`)

  - CryptoSwift (from `https://github.com/krzyzanowskim/CryptoSwift`, branch `swift20`)

  - ProtocolBuffers-Swift

  - Socket

  - Socket (from `https://github.com/jphughes/socket-swift`)



EXTERNAL SOURCES:

  BrightFutures:
@@ -18,6 +18,8 @@ EXTERNAL SOURCES: 
  CryptoSwift:

    :branch: swift20

    :git: https://github.com/krzyzanowskim/CryptoSwift

  Socket:

    :git: https://github.com/jphughes/socket-swift



CHECKOUT OPTIONS:

  BrightFutures:
@@ -26,6 +28,9 @@ CHECKOUT OPTIONS: 
  CryptoSwift:

    :commit: ad4db3095a9ccc034c1eb65934a89c670012e6a0

    :git: https://github.com/krzyzanowskim/CryptoSwift

  Socket:

    :commit: b63d23e3f8dd8353c8d8514fb8e6d859c79dce17

    :git: https://github.com/jphughes/socket-swift



SPEC CHECKSUMS:

  BrightFutures: 1f99ca607fd2880a606257c57eb3ebd45299443d

Pods/Manifest.lock

+6 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ DEPENDENCIES: 
  - BrightFutures (from `https://github.com/Thomvis/BrightFutures`)

  - CryptoSwift (from `https://github.com/krzyzanowskim/CryptoSwift`, branch `swift20`)

  - ProtocolBuffers-Swift

  - Socket

  - Socket (from `https://github.com/jphughes/socket-swift`)



EXTERNAL SOURCES:

  BrightFutures:
@@ -18,6 +18,8 @@ EXTERNAL SOURCES: 
  CryptoSwift:

    :branch: swift20

    :git: https://github.com/krzyzanowskim/CryptoSwift

  Socket:

    :git: https://github.com/jphughes/socket-swift



CHECKOUT OPTIONS:

  BrightFutures:
@@ -26,6 +28,9 @@ CHECKOUT OPTIONS: 
  CryptoSwift:

    :commit: ad4db3095a9ccc034c1eb65934a89c670012e6a0

    :git: https://github.com/krzyzanowskim/CryptoSwift

  Socket:

    :commit: b63d23e3f8dd8353c8d8514fb8e6d859c79dce17

    :git: https://github.com/jphughes/socket-swift



SPEC CHECKSUMS:

  BrightFutures: 1f99ca607fd2880a606257c57eb3ebd45299443d

Pods/Pods.xcodeproj/project.pbxproj

+387 −387

File changed.

Preview size limit exceeded, changes collapsed.

Pods/Socket/Socket/Stream.swift

+8 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ protocol StreamProtocol { 
    //    Writes data to a connect or accpeted session. Cork is an optional parameter

    //    that defalts to false. cork = true delays the write until the stream is written to

    //    again with cork = false.

    func writeBytes(inout bytes: Bytes, cork: Bool) throws

    func writeBytes(bytes: Bytes, cork: Bool) throws

    

    //    Reads data until the size is satisfied, EoF or there is more than timeout

    //    witout reading additional bytes. If timeout is not specified it is "forever".
@@ -142,11 +142,16 @@ public class Stream: Socket, StreamProtocol { 
    //     writeBytes(data1, cork: true)

    //     writeBytes(data2)

    //

    public func writeBytes(inout bytes: Bytes, cork: Bool = false) throws {

    public func writeBytes(bytes: Bytes, cork: Bool = false) throws {

        if cork {

            try setCork(true)

        }

        switch write(s, &bytes, bytes.count) {

//        var dd = NSData(bytesNoCopy: <#T##UnsafeMutablePointer<Void>#>, length: <#T##Int#>)

        

//        let foo = Bytes([3,4,5,])

//        switch write(s, foo, 32) {

        

        switch write(s, bytes, bytes.count) {

        case let x where x < 0:

            throw PosixError(comment: "write(...) failed.")

        case bytes.count: