The declared interface for WVJB expected data to be an id. However, the implementation assumed NSDictionary in a bunch of places. Furthermore, messages received from JS by ObjC were previously always forced into an NSDictionary but javascript did not replace null data packets with {}. This patch introduces consistency in all of these cases, assuming data to be id everywhere, and never changing the value of data.

marcuswestin · marcuswestin · commit c4cb6ab13c18 · 2013-10-25T16:56:32.000-07:00
Drop JSONKit. It's 2013!
diff --git a/Changelog b/Changelog
@@ -1,3 +1,7 @@
+v4.1.0
++ Allow for sending null/nil data packets
++ Drop support for JSONKit
+
 v4.0.2
 + Fix NSInvalidArgumentException: "attempt to insert nil object" when using shorthand -callHandler:
 + Fix sending messages including __WVJB_MESSAGE_SEPERATOR__ string
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridge.m b/WebViewJavascriptBridge/WebViewJavascriptBridge.m
@@ -47,11 +47,11 @@ + (instancetype)bridgeForWebView:(WVJB_WEBVIEW_TYPE*)webView webViewDelegate:(WV
     return bridge;
 }
 
-- (void)send:(NSDictionary *)data {
+- (void)send:(id)data {
     [self send:data responseCallback:nil];
 }
 
-- (void)send:(NSDictionary *)data responseCallback:(WVJBResponseCallback)responseCallback {
+- (void)send:(id)data responseCallback:(WVJBResponseCallback)responseCallback {
     [self _sendData:data responseCallback:responseCallback handlerName:nil];
 }
 
@@ -91,10 +91,7 @@ - (void)dealloc {
     _messageHandler = nil;
 }
 
-- (void)_sendData:(NSDictionary *)data responseCallback:(WVJBResponseCallback)responseCallback handlerName:(NSString*)handlerName {
-    if (!data) {
-        data = (NSDictionary *)[NSNull null];
-    }
+- (void)_sendData:(id)data responseCallback:(WVJBResponseCallback)responseCallback handlerName:(NSString*)handlerName {
     NSMutableDictionary* message = [NSMutableDictionary dictionary];
     
     if (data) {
@@ -188,8 +185,7 @@ - (void)_flushMessageQueue {
             }
             
             @try {
-                NSDictionary* data = message[@"data"];
-                if (!data || ((id)data) == [NSNull null]) { data = [NSDictionary dictionary]; }
+                id data = message[@"data"];
                 handler(data, responseCallback);
             }
             @catch (NSException *exception) {
@@ -199,20 +195,12 @@ - (void)_flushMessageQueue {
     }
 }
 
-- (NSString *)_serializeMessage:(NSDictionary *)message {
-#if defined _JSONKIT_H_
-    return [message JSONString];
-#else
+- (NSString *)_serializeMessage:(id)message {
     return [[NSString alloc] initWithData:[NSJSONSerialization dataWithJSONObject:message options:0 error:nil] encoding:NSUTF8StringEncoding];
-#endif
 }
 
 - (NSDictionary *)_deserializeMessageJSON:(NSString *)messageJSON {
-#if defined _JSONKIT_H_
-    return [messageJSON objectFromJSONString];
-#else
-    return [NSJSONSerialization JSONObjectWithData:[messageJSON dataUsingEncoding:NSUTF8StringEncoding] options:0 error:nil];
-#endif
+    return [NSJSONSerialization JSONObjectWithData:[messageJSON dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingAllowFragments error:nil];
 }
 
 - (void)_log:(NSString *)action json:(id)json {

Original file line number	Diff line number	Diff line change
`@@ -47,11 +47,11 @@ + (instancetype)bridgeForWebView:(WVJB_WEBVIEW_TYPE*)webView webViewDelegate:(WV`
`47`	`47`	`return bridge;`
`48`	`48`	`}`
`49`	`49`
`50`		`-- (void)send:(NSDictionary *)data {`
	`50`	`+- (void)send:(id)data {`
`51`	`51`	`[self send:data responseCallback:nil];`
`52`	`52`	`}`
`53`	`53`
`54`		`-- (void)send:(NSDictionary *)data responseCallback:(WVJBResponseCallback)responseCallback {`
	`54`	`+- (void)send:(id)data responseCallback:(WVJBResponseCallback)responseCallback {`
`55`	`55`	`[self _sendData:data responseCallback:responseCallback handlerName:nil];`
`56`	`56`	`}`
`57`	`57`
`@@ -91,10 +91,7 @@ - (void)dealloc {`
`91`	`91`	`_messageHandler = nil;`
`92`	`92`	`}`
`93`	`93`
`94`		`-- (void)_sendData:(NSDictionary )data responseCallback:(WVJBResponseCallback)responseCallback handlerName:(NSString)handlerName {`
`95`		`- if (!data) {`
`96`		`- data = (NSDictionary *)[NSNull null];`
`97`		`- }`
	`94`	`+- (void)_sendData:(id)data responseCallback:(WVJBResponseCallback)responseCallback handlerName:(NSString*)handlerName {`
`98`	`95`	`NSMutableDictionary* message = [NSMutableDictionary dictionary];`
`99`	`96`
`100`	`97`	`if (data) {`
`@@ -188,8 +185,7 @@ - (void)_flushMessageQueue {`
`188`	`185`	`}`
`189`	`186`
`190`	`187`	`@try {`
`191`		`- NSDictionary* data = message[@"data"];`
`192`		`- if (!data \|\| ((id)data) == [NSNull null]) { data = [NSDictionary dictionary]; }`
	`188`	`+ id data = message[@"data"];`
`193`	`189`	`handler(data, responseCallback);`
`194`	`190`	`}`
`195`	`191`	`@catch (NSException *exception) {`
`@@ -199,20 +195,12 @@ - (void)_flushMessageQueue {`
`199`	`195`	`}`
`200`	`196`	`}`
`201`	`197`
`202`		`-- (NSString )_serializeMessage:(NSDictionary )message {`
`203`		`-#if defined _JSONKIT_H_`
`204`		`- return [message JSONString];`
`205`		`-#else`
	`198`	`+- (NSString *)_serializeMessage:(id)message {`
`206`	`199`	`return [[NSString alloc] initWithData:[NSJSONSerialization dataWithJSONObject:message options:0 error:nil] encoding:NSUTF8StringEncoding];`
`207`		`-#endif`
`208`	`200`	`}`
`209`	`201`
`210`	`202`	`- (NSDictionary )_deserializeMessageJSON:(NSString )messageJSON {`
`211`		`-#if defined _JSONKIT_H_`
`212`		`- return [messageJSON objectFromJSONString];`
`213`		`-#else`
`214`		`- return [NSJSONSerialization JSONObjectWithData:[messageJSON dataUsingEncoding:NSUTF8StringEncoding] options:0 error:nil];`
`215`		`-#endif`
	`203`	`+ return [NSJSONSerialization JSONObjectWithData:[messageJSON dataUsingEncoding:NSUTF8StringEncoding] options:NSJSONReadingAllowFragments error:nil];`
`216`	`204`	`}`
`217`	`205`
`218`	`206`	`- (void)_log:(NSString *)action json:(id)json {`