fix(socket): change writeJavascript to commandDelegate evalJs

Author: diogoqueiros

src/ios/CDVSocketPlugin.m

@@ -8,7 +8,7 @@ @implementation CDVSocketPlugin : CDVPlugin
 - (NSString*)buildKey :(NSString*)host :(int)port {
     NSString* tempHost = [host lowercaseString];
     NSString* tempPort = [NSString stringWithFormat:@"%d", port];
-    
+
     return  [[tempHost stringByAppendingString:@":"] stringByAppendingString:tempPort];
 }
 
@@ -18,50 +18,50 @@ - (void)connect:(CDVInvokedUrlCommand*)command
 {
     // validating parameters
     if ([command.arguments count] < 2) {
-        
+
         // triggering parameter error
         CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Missing arguments when calling 'connect' action."];
         [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
-        
+
     } else {
-        
+
         // checking connection pool
         if (!pool) {
             self->pool = [[NSMutableDictionary alloc] init];
         }
-        
-        
+
+
         // running in background to avoid thread locks
         [self.commandDelegate runInBackground:^{
-            
+
             CDVPluginResult* result= nil;
             Connection* socket = nil;
             NSString* key = nil;
             NSString* host = nil;
             int port = 0;
-            
+
             // opening connection and adding into pool
             @try {
-                
+
                 // preparing parameters
                 host = [command.arguments objectAtIndex:0];
                 port = [[command.arguments objectAtIndex:1] integerValue];
                 key = [self buildKey:host :port];
-                
+
                 // checking existing connections
                 if ([pool objectForKey:key]) {
                     result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:key];
                     NSLog(@"Recovered connection with %@", key);
                 } else {
-                    
+
                     // creating connection
                     socket = [[Connection alloc] initWithNetworkAddress:host :port];
                     [socket setDelegate:self];
                     [socket open];
-                    
+
                     // adding to pool
                     [self->pool setObject:socket forKey:key];
-                    
+
                     //formatting success response
                     result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:key];
                     NSLog(@"Established connection with %@", key);
@@ -71,42 +71,42 @@ - (void)connect:(CDVInvokedUrlCommand*)command
                 NSLog(@"Exception: %@", exception);
                 result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Unexpected exception when executing 'connect' action."];
             }
-            
+
             //returning callback resolution
             [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
-            
+
         }];
-        
+
     }
-    
+
 }
 
 
 
 -(BOOL) disposeConnection :(NSString *)key {
-    
+
     Connection* socket = nil;
     BOOL result = NO;
-    
-    
+
+
     @try {
         // getting connection from pool
         socket = [pool objectForKey:key];
-        
+
         // closing connection
         if (socket) {
             [pool removeObjectForKey:key];
-            
+
             if ([socket isConnected]) {
                 [socket close];
             }
             socket = nil;
-            
+
             NSLog(@"Closed connection with %@", key);
         } else {
             NSLog(@"Connection %@ already closed!", key);
         }
-        
+
         // setting success
         result = YES;
     }
@@ -128,15 +128,15 @@ - (void)disconnect:(CDVInvokedUrlCommand*)command
         // triggering parameter error
         CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Missing arguments when calling 'disconnect' action."];
         [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
-        
+
     } else {
-        
+
         // running in background to avoid thread locks
         [self.commandDelegate runInBackground:^{
-            
+
             CDVPluginResult* result= nil;
             NSString *key = nil;
-            
+
             @try {
                 // preparing parameters
                 key = [command.arguments objectAtIndex:0];
@@ -152,45 +152,45 @@ - (void)disconnect:(CDVInvokedUrlCommand*)command
                 NSLog(@"Exception: %@", exception);
                 result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Unexpected exception when executing 'disconnect' action."];
             }
-            
+
             //returning callback resolution
             [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
         }];
-        
+
     }
-    
+
 }
 
 -(void) disconnectAll: (CDVInvokedUrlCommand *) command {
 
     // running in background to avoid thread locks
     [self.commandDelegate runInBackground:^{
-       
+
         CDVPluginResult* result = nil;
         Connection * socket = nil;
         BOOL partial = NO;
-        
+
         @try {
-            
+
             // iterating connection pool
             for (id key in pool) {
                 socket = [pool objectForKey:key];
-                
+
                 // try close it
                 if (![self disposeConnection:key]) {
                     // if no success, need to set as partial disconnection
                     partial = YES;
                 }
             }
-            
+
             //formatting result
             if (partial) {
                 result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Some connections could not be closed."];
-                
+
             } else {
                 result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
             }
-            
+
         }
         @catch (NSException *exception) {
             NSLog(@"Exception: %@", exception);
@@ -200,51 +200,51 @@ -(void) disconnectAll: (CDVInvokedUrlCommand *) command {
             //returning callback resolution
             [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
         }
-        
+
     }];
-    
+
 }
 
 
 -(void)send: (CDVInvokedUrlCommand *) command {
-    
+
     // validating parameters
     if ([command.arguments count] < 2) {
         // triggering parameter error
         CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Missing arguments when calling 'send' action."];
         [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
-        
+
     } else {
-        
+
         // running in background to avoid thread locks
         [self.commandDelegate runInBackground:^{
-            
+
             CDVPluginResult* result= nil;
             Connection* socket = nil;
             NSString* data = nil;
             NSString* key = nil;
-            
+
             @try {
                 // preparing parameters
                 key = [command.arguments objectAtIndex:0];
-                
+
                 // getting connection from pool
                 socket = [pool objectForKey:key];
-                
+
                 // checking if socket was not found and his conenctivity
                 if (socket == nil) {
                     NSLog(@"Connection not found");
                     result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"No connection found with host."];
-                    
+
                 } else if (![socket isConnected]) {
                     NSLog(@"Socket is not connected.");
                     result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Invalid connection with host."];
-                    
+
                 } else {
                     // writting on output stream
                     data = [command.arguments objectAtIndex:1];
                     [socket write:data];
-                
+
                     //formatting success response
                     result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:key];
                     NSLog(@"Sending data to %@ - %@", key, data);
@@ -254,27 +254,27 @@ -(void)send: (CDVInvokedUrlCommand *) command {
                 NSLog(@"Exception: %@", exception);
                 result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Unexpected exception when executon 'send' action."];
             }
-            
+
             //returning callback resolution
             [self.commandDelegate sendPluginResult:result callbackId:command.callbackId];
         }];
-        
-        
+
+
     }
 }
 
 
 
 
 -(void) sendMessage :(NSString *)host :(int)port :(NSString *)chunk {
-    
+
     // handling escape chars
     NSMutableString *data = [NSMutableString stringWithString:chunk];
     [data replaceOccurrencesOfString:@"\n" withString:@"\\n" options:NSCaseInsensitiveSearch range:NSMakeRange(0, [data length])];
-    
+
     // relay to webview
     NSString *receiveHook= [NSString stringWithFormat:@"window.tlantic.plugins.socket.receive('%@', %d, '%@', '%@' );", host, port, [self buildKey:host :port], [NSString stringWithString:data]];
-    [self writeJavascript:receiveHook];
-    
+    [self.commandDelegate evalJs:receiveHook];
+
 }
 @end