update latest MQTT-Client-Framework

Author: naviocean

ios/RCTMqtt/Mqtt.m

@@ -4,6 +4,7 @@
 //
 //  Created by Tuan PM on 2/13/16.
 //  Copyright © 2016 Tuan PM. All rights reserved.
+//  Updated by NaviOcean on 01/04/18
 //
 
 #import "Mqtt.h"
@@ -45,6 +46,8 @@ - (id)init {
 
     }
 
+    
+    
     return self;
 }
 
@@ -58,13 +61,15 @@ - (instancetype) initWithEmitter:(RCTEventEmitter *) emitter
     for (NSString *key in options.keyEnumerator) { // Replace default options
         [self.options setValue:options[key] forKey:key];
     }
-    self.manager = [[MQTTSessionManager alloc] init];
-    self.manager.delegate = self;
+
+   
+    
 
     return self;
 }
 
 - (void) connect {
+    
     MQTTSSLSecurityPolicy *securityPolicy = nil;
     if(self.options[@"tls"]) {
         securityPolicy = [MQTTSSLSecurityPolicy policyWithPinningMode:MQTTSSLPinningModeNone];
@@ -75,7 +80,11 @@ - (void) connect {
     if(self.options[@"willMsg"] != [NSNull null]) {
         willMsg = [self.options[@"willMsg"] dataUsingEncoding:NSUTF8StringEncoding];
     }
-    [[NSOperationQueue mainQueue] addOperationWithBlock:^{
+    if (!self.manager) {
+        dispatch_queue_t queue1 = dispatch_queue_create("com.hawking.app.anchor.mqtt", NULL);
+        self.manager = [[MQTTSessionManager alloc] initWithPersistence:NO maxWindowSize:MQTT_MAX_WINDOW_SIZE maxMessages:MQTT_MAX_MESSAGES maxSize:MQTT_MAX_SIZE maxConnectionRetryInterval:60.0 connectInForeground:NO streamSSLLevel:nil queue: queue1];
+        self.manager.delegate = self;
+        
         [self.manager connectTo:[self.options valueForKey:@"host"]
                            port:[self.options[@"port"] intValue]
                             tls:[self.options[@"tls"] boolValue]
@@ -92,8 +101,15 @@ - (void) connect {
                    withClientId:[self.options valueForKey:@"clientId"]
                  securityPolicy:securityPolicy
                    certificates:nil
-         ];
-    }];
+                  protocolLevel:MQTTProtocolVersion311
+                 connectHandler:^(NSError *error) {
+         }];
+
+    } else {
+        [self.manager connectToLast:^(NSError *error) {
+        }];
+    }
+   
 }
 
 - (void)sessionManager:(MQTTSessionManager *)sessonManager didChangeState:(MQTTSessionManagerState)newState {
@@ -153,7 +169,8 @@ - (void)messageDelivered:(UInt16)msgID {
 - (void) disconnect {
     // [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1.0]];
     [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1.0]];
-    [self.manager disconnect];
+    [self.manager disconnectWithDisconnectHandler:^(NSError *error) {
+    }];
 
 }
 
@@ -194,4 +211,4 @@ - (void)dealloc
     [self disconnect];
 }
 
-@end
+@end

ios/RCTMqtt/Podfile

@@ -2,9 +2,7 @@ platform :ios, '8.0'
 
 inhibit_all_warnings!
 
-pod 'MQTTClient/Min', '0.10.2'
-pod 'MQTTClient/Manager', '0.10.2'
-pod 'MQTTClient/Websocket', '0.10.2'
+pod 'MQTTClient'
 
 target "RCTMqtt" do
 end

ios/RCTMqtt/Podfile.lock

@@ -1,26 +1,23 @@
 PODS:
-  - MQTTClient/Manager (0.10.2):
+  - MQTTClient (0.15.2):
+    - MQTTClient/Core (= 0.15.2)
+  - MQTTClient/Core (0.15.2):
+    - MQTTClient/Manager
     - MQTTClient/Min
-  - MQTTClient/Min (0.10.2)
-  - MQTTClient/Websocket (0.10.2):
+  - MQTTClient/Manager (0.15.2):
     - MQTTClient/Min
-    - SocketRocket
-  - SocketRocket (0.5.1)
+  - MQTTClient/Min (0.15.2)
 
 DEPENDENCIES:
-  - MQTTClient/Manager (= 0.10.2)
-  - MQTTClient/Min (= 0.10.2)
-  - MQTTClient/Websocket (= 0.10.2)
+  - MQTTClient
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - MQTTClient
-    - SocketRocket
 
 SPEC CHECKSUMS:
-  MQTTClient: e8d3d642f28548296511b3af4e2cef12874071ce
-  SocketRocket: d57c7159b83c3c6655745cd15302aa24b6bae531
+  MQTTClient: 902c7bcac1501595f3d0b15178c7205b40331fb0
 
-PODFILE CHECKSUM: 8a78d953ebebde4bab733da71043c420ecbd75cd
+PODFILE CHECKSUM: e61f0901f7eb0b464089f1f9f5d404df37195e34
 
 COCOAPODS: 1.5.3