tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: add ios websocket didReceiveMessage

Browse Source
This commit is contained in:
Insomnia 2019-11-04 20:29:56 +08:00
parent af3590b0ba
commit 70a6c9193a
1 changed files with 75 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
iOS/Pod/Classes/Engine/DoricJSRemoteExecutor.m
View File

@ -25,18 +25,24 @@
static NSString * const kUrlStr = @"ws://192.168.24.240:2080"; static NSString * const kUrlStr = @"ws://192.168.24.240:2080";
typedef id (^Block0)(void);
typedef id (^Block1)(id arg0);
typedef id (^Block2)(id arg0, id arg1);
typedef id (^Block3)(id arg0, id arg1, id arg2);
typedef id (^Block4)(id arg0, id arg1, id arg2, id arg3);
typedef id (^Block5)(id arg0, id arg1, id arg2, id arg3, id arg4);
@interface DoricJSRemoteExecutor () <SRWebSocketDelegate> @interface DoricJSRemoteExecutor () <SRWebSocketDelegate>
@property(nonatomic, strong) SRWebSocket *websocket; @property(nonatomic, strong) SRWebSocket *srWebSocket;
@property(nonatomic, strong) NSMapTable *mapTable; @property(nonatomic, strong) NSMutableDictionary <NSString *, id> *blockMDic;
@property(nonatomic, strong) dispatch_semaphore_t mapTableLock; @property(nonatomic, strong) JSValue *temp;
@end @end
@implementation DoricJSRemoteExecutor @implementation DoricJSRemoteExecutor
- (instancetype)init { - (instancetype)init {
if (self = [super init]) { if (self = [super init]) {
[self websocket]; [self srWebSocket];
_semaphore = dispatch_semaphore_create(0); _semaphore = dispatch_semaphore_create(0);
_mapTableLock = dispatch_semaphore_create(1);
DC_LOCK(self.semaphore); DC_LOCK(self.semaphore);
} }
return self; return self;
@ -58,10 +64,44 @@ - (void)webSocket:(SRWebSocket *)webSocket didReceiveMessage:(id)message {
options:NSJSONReadingMutableContainers options:NSJSONReadingMutableContainers
error:&err]; error:&err];
if (err) { if (err) {
DoricLog(@"webSocketdidReceiveMessage parse error：%@", err); DoricLog(@"debugger webSocketdidReceiveMessage parse error：%@", err);
return; return;
} }
NSString *source = [[dic valueForKey:@"source"] mutableCopy]; NSString *cmd = [[dic valueForKey:@"cmd"] copy];
if ([cmd isEqualToString:@"injectGlobalJSFunction"]) {
NSString *name = [dic valueForKey:@"name"];
NSArray *argsArr = [dic valueForKey:@"arguments"];
NSMutableArray *argsMarr = [NSMutableArray new];
for (NSUInteger i = 0; i < argsArr.count; i++) {
[argsMarr addObject:argsArr[i]];
}
id result;
id tmpBlk = self.blockMDic[name];
if (argsArr.count == 0) {
result = ((Block0) tmpBlk)();
} else if (argsArr.count == 1) {
result = ((Block1) tmpBlk)(argsArr[0]);
} else if (argsArr.count == 2) {
result = ((Block2)tmpBlk)(argsArr[0], argsArr[1]);
} else if (argsArr.count == 3) {
result = ((Block3)tmpBlk)(argsArr[0], argsArr[1], argsArr[2]);
} else if (argsArr.count == 4) {
result = ((Block4)tmpBlk)(argsArr[0], argsArr[1], argsArr[2], argsArr[3]);
} else if (argsArr.count == 5) {
result = ((Block5)tmpBlk)(argsArr[0], argsArr[1], argsArr[2], argsArr[3], argsArr[4]);
}
} else if ([cmd isEqualToString:@"invokeMethod"]) {
@try {
self.temp = [JSValue valueWithObject:[dic valueForKey:@"result"] inContext:nil];
} @catch (NSException *exception) {
DoricLog(@"debugger ", NSStringFromSelector(_cmd), exception.reason);
} @finally {
DC_UNLOCK(self.semaphore);
}
}
} }
- (void)webSocket:(SRWebSocket *)webSocket didFailWithError:(NSError *)error { - (void)webSocket:(SRWebSocket *)webSocket didFailWithError:(NSError *)error {
@ -79,20 +119,21 @@ - (NSString *)loadJSScript:(NSString *)script source:(NSString *)source {
} }
- (void)injectGlobalJSObject:(NSString *)name obj:(id)obj { - (void)injectGlobalJSObject:(NSString *)name obj:(id)obj {
DC_LOCK(self.mapTableLock); if ([obj isKindOfClass:NSClassFromString(@"NSBlock")]) {
[self.mapTable setObject:obj forKey:name]; self.blockMDic[name] = obj;
DC_UNLOCK(self.mapTableLock); } else {
NSDictionary *jsonDic = @{
NSDictionary *jsonDic =@{
@"cmd": @"injectGlobalJSFunction", @"cmd": @"injectGlobalJSFunction",
@"name": name @"name": name
}; };
NSError * err; NSError *err;
NSData * jsonData = [NSJSONSerialization dataWithJSONObject:jsonDic options:0 error:&err]; NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsonDic options:0 error:&err];
if (err) { if (err) {
DoricLog(@"debugger ", NSStringFromSelector(_cmd), @" failed"); DoricLog(@"debugger ", NSStringFromSelector(_cmd), @" failed");
return;
}
[self.srWebSocket send:jsonData];
} }
[self.websocket send:jsonData];
} }
- (JSValue *)invokeObject:(NSString *)objName method:(NSString *)funcName args:(NSArray *)args { - (JSValue *)invokeObject:(NSString *)objName method:(NSString *)funcName args:(NSArray *)args {
@ -117,34 +158,35 @@ - (JSValue *)invokeObject:(NSString *)objName method:(NSString *)funcName args:(
NSData * jsonData = [NSJSONSerialization dataWithJSONObject:jsonDic options:0 error:&err]; NSData * jsonData = [NSJSONSerialization dataWithJSONObject:jsonDic options:0 error:&err];
if (err) { if (err) {
DoricLog(@"debugger ", NSStringFromSelector(_cmd), @" failed"); DoricLog(@"debugger ", NSStringFromSelector(_cmd), @" failed");
return nil;
} }
[self.websocket send:jsonData]; [self.srWebSocket send:jsonData];
DC_LOCK(self.semaphore); DC_LOCK(self.semaphore);
return nil; return self.temp;
} }
- (void)close { - (void)close {
[self.websocket close]; [self.srWebSocket close];
} }
#pragma mark - Properties #pragma mark - Properties
- (SRWebSocket *)websocket { - (SRWebSocket *)srWebSocket {
if (!_websocket) { if (!_srWebSocket) {
NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:kUrlStr] cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData timeoutInterval:10]; NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:kUrlStr] cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData timeoutInterval:10];
_websocket = [[SRWebSocket alloc] initWithURLRequest:request]; _srWebSocket = [[SRWebSocket alloc] initWithURLRequest:request];
_websocket.delegate = self; _srWebSocket.delegate = self;
[_websocket open]; [_srWebSocket open];
} }
return _websocket; return _srWebSocket;
} }
- (NSMapTable *)mapTable { - (NSMutableDictionary *)blockMDic {
if (!_mapTable) { if (!_blockMDic) {
_mapTable = [[NSMapTable alloc] initWithKeyOptions:NSPointerFunctionsStrongMemory valueOptions:NSPointerFunctionsWeakMemory capacity:0]; _blockMDic = [NSMutableDictionary new];
} }
return _mapTable; return _blockMDic;
} }
@end @end