Skip to content

Implemented timeouts. #106

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
niothiel wants to merge 1 commit into from
Closed

Implemented timeouts. #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions WebViewJavascriptBridge/WebViewJavascriptBridge.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@ typedef void (^WVJBHandler)(id data, WVJBResponseCallback responseCallback);

- (void)send:(id)message;
- (void)send:(id)message responseCallback:(WVJBResponseCallback)responseCallback;
- (void)send:(id)message timeoutInMillis:(NSUInteger)timeout responseCallback:(WVJBResponseCallback)responseCallback;
- (void)registerHandler:(NSString*)handlerName handler:(WVJBHandler)handler;
- (void)callHandler:(NSString*)handlerName;
- (void)callHandler:(NSString*)handlerName data:(id)data;
- (void)callHandler:(NSString*)handlerName data:(id)data responseCallback:(WVJBResponseCallback)responseCallback;
- (void)callHandler:(NSString*)handlerName data:(id)data timeoutInMillis:(NSUInteger)timeout responseCallback:(WVJBResponseCallback)responseCallback;

@end
48 changes: 40 additions & 8 deletions WebViewJavascriptBridge/WebViewJavascriptBridge.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,16 @@ + (instancetype)bridgeForWebView:(WVJB_WEBVIEW_TYPE*)webView webViewDelegate:(WV
return bridge;
}

- (void)send:(id)data {
[self send:data responseCallback:nil];
- (void)send:(id)message {
[self send:message responseCallback:nil];
}

- (void)send:(id)data responseCallback:(WVJBResponseCallback)responseCallback {
[self _sendData:data responseCallback:responseCallback handlerName:nil];
- (void)send:(id)message responseCallback:(WVJBResponseCallback)responseCallback {
[self send:message timeoutInMillis:0 responseCallback:responseCallback];
}

- (void)send:(id)message timeoutInMillis:(NSUInteger)timeout responseCallback:(WVJBResponseCallback)responseCallback {
[self _sendData:message responseCallback:responseCallback handlerName:nil timeoutInMillis:timeout];
}

- (void)callHandler:(NSString *)handlerName {
Expand All @@ -71,7 +75,11 @@ - (void)callHandler:(NSString *)handlerName data:(id)data {
}

- (void)callHandler:(NSString *)handlerName data:(id)data responseCallback:(WVJBResponseCallback)responseCallback {
[self _sendData:data responseCallback:responseCallback handlerName:handlerName];
[self callHandler:handlerName data:data timeoutInMillis:0 responseCallback:responseCallback];
}

- (void)callHandler:(NSString*)handlerName data:(id)data timeoutInMillis:(NSUInteger)timeout responseCallback:(WVJBResponseCallback)responseCallback {
[self _sendData:data responseCallback:responseCallback handlerName:handlerName timeoutInMillis:timeout];
}

- (void)registerHandler:(NSString *)handlerName handler:(WVJBHandler)handler {
Expand Down Expand Up @@ -101,7 +109,7 @@ - (void)dealloc {
_messageHandler = nil;
}

- (void)_sendData:(id)data responseCallback:(WVJBResponseCallback)responseCallback handlerName:(NSString*)handlerName {
- (void)_sendData:(id)data responseCallback:(WVJBResponseCallback)responseCallback handlerName:(NSString*)handlerName timeoutInMillis:(NSUInteger)timeout {
NSMutableDictionary* message = [NSMutableDictionary dictionary];

if (data) {
Expand All @@ -112,6 +120,7 @@ - (void)_sendData:(id)data responseCallback:(WVJBResponseCallback)responseCallba
NSString* callbackId = [NSString stringWithFormat:@"objc_cb_%ld", ++_uniqueId];
_responseCallbacks[callbackId] = [responseCallback copy];
message[@"callbackId"] = callbackId;
message[@"timeout"] = [NSNumber numberWithUnsignedInteger:timeout];
}

if (handlerName) {
Expand Down Expand Up @@ -149,6 +158,26 @@ - (void)_dispatchMessage:(WVJBMessage*)message {
[strongWebView stringByEvaluatingJavaScriptFromString:javascriptCommand];
});
}

[self _startTimeoutOnMessage:message];
}

- (void)_startTimeoutOnMessage:(WVJBMessage*)message {
NSString *callbackId = message[@"callbackId"];
NSNumber *timeout = message[@"timeout"];
if (callbackId && timeout && [timeout intValue] > 0) {
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)([timeout unsignedIntegerValue] * NSEC_PER_MSEC)), dispatch_get_main_queue(), ^{
NSLog(@"Encountered timeout! The message is: %@", message);

WVJBResponseCallback responseCallback = _responseCallbacks[callbackId];

if (responseCallback) {
NSError *timeoutError = [NSError errorWithDomain:@"WVJBTimeoutError" code:408 userInfo:nil];
responseCallback(timeoutError);
[_responseCallbacks removeObjectForKey:callbackId];
}
});
}
}

- (void)_flushMessageQueue {
Expand All @@ -169,8 +198,11 @@ - (void)_flushMessageQueue {
NSString* responseId = message[@"responseId"];
if (responseId) {
WVJBResponseCallback responseCallback = _responseCallbacks[responseId];
responseCallback(message[@"responseData"]);
[_responseCallbacks removeObjectForKey:responseId];

if (responseCallback != nil) {
responseCallback(message[@"responseData"]);
[_responseCallbacks removeObjectForKey:responseId];
}
} else {
WVJBResponseCallback responseCallback = NULL;
NSString* callbackId = message[@"callbackId"];
Expand Down