Master (marcuswestin#193)

vontio · marcuswestin · commit 9c2bdd023985 · 2016-06-14T15:17:56.000-04:00
* show js error msg and line number

if use try catch, user will not know what cause error

* show js error msg and line number

* fix indent,alert to console.log

* notify which js handler response

easier for debug
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridgeBase.h b/WebViewJavascriptBridge/WebViewJavascriptBridgeBase.h
@@ -10,6 +10,7 @@
 #define kCustomProtocolScheme @"wvjbscheme"
 #define kQueueHasMessage      @"__WVJB_QUEUE_MESSAGE__"
 #define kBridgeLoaded         @"__BRIDGE_LOADED__"
+#define kJavascriptResponse   @"__JAVASCRIPT_RESPONSE__"
 
 typedef void (^WVJBResponseCallback)(id responseData);
 typedef void (^WVJBHandler)(id data, WVJBResponseCallback responseCallback);
@@ -41,4 +42,4 @@ typedef NSDictionary WVJBMessage;
 - (NSString *)webViewJavascriptCheckCommand;
 - (NSString *)webViewJavascriptFetchQueyCommand;
 
-@end
+@end
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridgeBase.m b/WebViewJavascriptBridge/WebViewJavascriptBridgeBase.m
@@ -76,6 +76,7 @@ - (void)flushMessageQueue:(NSString *)messageQueueString{
         
         NSString* responseId = message[@"responseId"];
         if (responseId) {
+            [[NSNotificationCenter defaultCenter] postNotificationName: kJavascriptResponse object: self userInfo:message];
             WVJBResponseCallback responseCallback = _responseCallbacks[responseId];
             responseCallback(message[@"responseData"]);
             [self.responseCallbacks removeObjectForKey:responseId];
@@ -211,4 +212,4 @@ - (void)_log:(NSString *)action json:(id)json {
     }
 }
 
-@end
+@end
diff --git a/WebViewJavascriptBridge/WebViewJavascriptBridge_JS.m b/WebViewJavascriptBridge/WebViewJavascriptBridge_JS.m
@@ -19,6 +19,12 @@
 	if (window.WebViewJavascriptBridge) {
 		return;
 	}
+
+	if (!window.onerror) {
+		window.onerror = function(msg, url, line) {
+			console.log("WebViewJavascriptBridge: ERROR:" + msg + "@" + url + ":" + line);
+		}
+	}
 	window.WebViewJavascriptBridge = {
 		registerHandler: registerHandler,
 		callHandler: callHandler,
@@ -81,25 +87,23 @@ function _dispatchMessageFromObjC(messageJSON) {
 				if (message.callbackId) {
 					var callbackResponseId = message.callbackId;
 					responseCallback = function(responseData) {
-						_doSend({ responseId:callbackResponseId, responseData:responseData });
+						_doSend({handlerName:message.handlerName, responseId:callbackResponseId, responseData:responseData });
 					};
 				}
 				
 				var handler = messageHandlers[message.handlerName];
-				try {
-					handler(message.data, responseCallback);
-				} catch(exception) {
-					console.log("WebViewJavascriptBridge: WARNING: javascript handler threw.", message, exception);
-				}
 				if (!handler) {
 					console.log("WebViewJavascriptBridge: WARNING: no handler for message from ObjC:", message);
+				}else
+				{
+					handler(message.data, responseCallback);
 				}
 			}
 		});
 	}
 	
 	function _handleMessageFromObjC(messageJSON) {
-        _dispatchMessageFromObjC(messageJSON);
+		_dispatchMessageFromObjC(messageJSON);
 	}
 
 	messagingIframe = document.createElement('iframe');
@@ -120,4 +124,4 @@ function _callWVJBCallbacks() {
 
 	#undef __wvjb_js_func__
 	return preprocessorJSCode;
-};
+};

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ - (void)flushMessageQueue:(NSString *)messageQueueString{`
`76`	`76`
`77`	`77`	`NSString* responseId = message[@"responseId"];`
`78`	`78`	`if (responseId) {`
	`79`	`+ [[NSNotificationCenter defaultCenter] postNotificationName: kJavascriptResponse object: self userInfo:message];`
`79`	`80`	`WVJBResponseCallback responseCallback = _responseCallbacks[responseId];`
`80`	`81`	`responseCallback(message[@"responseData"]);`
`81`	`82`	`[self.responseCallbacks removeObjectForKey:responseId];`
`@@ -211,4 +212,4 @@ - (void)_log:(NSString *)action json:(id)json {`
`211`	`212`	`}`
`212`	`213`	`}`
`213`	`214`
`214`		`-@end`
	`215`	`+@end`