Skip to content

fix for large payloads #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

fix for large payloads #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed68967
fix for large payloads
Nov 10, 2016
028d9d1
Update MQTTSessionStreamDelegate.swift
Nov 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 42 additions & 25 deletions SwiftMQTT/SwiftMQTT/MQTTSessionStreamDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class MQTTSessionStream: NSObject, StreamDelegate {
fileprivate var outputStream: OutputStream?

internal var delegate: MQTTSessionStreamDelegate?
let queue = DispatchQueue(label: "com.app.mqttSession", qos: .background, attributes: DispatchQueue.Attributes.concurrent, target: nil)

init(host: String, port: UInt16, ssl: Bool) {
self.host = host
Expand Down Expand Up @@ -82,33 +83,49 @@ class MQTTSessionStream: NSObject, StreamDelegate {
}

fileprivate func receiveDataOnStream(_ stream: Stream) {
var headerByte = [UInt8](repeating: 0, count: 1)
guard let len = inputStream?.read(&headerByte, maxLength: 1), len > 0 else { return }
let header = MQTTPacketFixedHeader(networkByte: headerByte[0])

// Max Length is 2^28 = 268,435,455 (256 MB)
var multiplier = 1
var value = 0
var encodedByte: UInt8 = 0
repeat {
var readByte = [UInt8](repeating: 0, count: 1)
inputStream?.read(&readByte, maxLength: 1)
encodedByte = readByte[0]
value += (Int(encodedByte) & 127) * multiplier
multiplier *= 128
if multiplier > 128*128*128 {
return
self.queue.sync {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I fail to understand why we need to dispatch the reading logic synchronously to a concurrent queue.


var headerByte = [UInt8](repeating: 0, count: 1)
guard let len = self.inputStream?.read(&headerByte, maxLength: 1), len > 0 else { return }
let header = MQTTPacketFixedHeader(networkByte: headerByte[0])

// Max Length is 2^28 = 268,435,455 (256 MB)
var multiplier = 1
var value = 0
var encodedByte: UInt8 = 0
repeat {
var readByte = [UInt8](repeating: 0, count: 1)
self.inputStream?.read(&readByte, maxLength: 1)
encodedByte = readByte[0]
value += (Int(encodedByte) & 127) * multiplier
multiplier *= 128
if multiplier > 128*128*128 {
return
}
} while ((Int(encodedByte) & 128) != 0)

let totalLength = value
var remainingLength = totalLength
var finalDataBuffer = Data()

var responseData = Data()
if totalLength > 0 {

while (remainingLength>0) {
var buffer = [UInt8](repeating: 0, count: remainingLength)
let readLength = self.inputStream?.read(&buffer, maxLength: buffer.count)
responseData = Data(bytes: UnsafePointer<UInt8>(buffer), count: readLength!)
if (readLength != nil) {
remainingLength = remainingLength - readLength!
finalDataBuffer.append(responseData)
} else {
remainingLength = 0
print("error cannot read mqtt payload")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think, instead of printing, we should call self.delegate?.mqttErrorOccurred(in: self) and let the delegate do the appropriate thing.

}
}
}
} while ((Int(encodedByte) & 128) != 0)

let totalLength = value

var responseData = Data()
if totalLength > 0 {
var buffer = [UInt8](repeating: 0, count: totalLength)
let readLength = inputStream?.read(&buffer, maxLength: buffer.count)
responseData = Data(bytes: UnsafePointer<UInt8>(buffer), count: readLength!)
self.delegate?.mqttReceived(finalDataBuffer, header: header, in: self)
}
delegate?.mqttReceived(responseData, header: header, in: self)
}
}