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

fix:iOS Runloop cannot exit and other issues

Browse Source
This commit is contained in:
pengfei.zhou
2021-03-04 12:53:42 +08:00
committed by osborn
parent 627f323ae3
commit e78625281f
6 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
doric-iOS/Devkit/Classes/DoricRemoteJSExecutor.m
View File

@@ -52,6 +52,7 @@ @interface DoricRemoteJSExecutor () <DoricWSClientInterceptor>
@property(nonatomic) NSInteger counter;
@property(nonatomic, strong) NSMutableDictionary <NSNumber *, dispatch_semaphore_t> *semaphores;
@property(nonatomic, strong) NSMutableDictionary <NSNumber *, JSValue *> *results;
@property(nonatomic, strong) JSContext *jsContext;
@end
@implementation DoricRemoteJSExecutor
@@ -63,6 +64,7 @@ - (instancetype)initWithWSClient:(DoricWSClient *)wsClient {
_semaphores = [NSMutableDictionary new];
_results = [NSMutableDictionary new];
_counter = 0;
_jsContext = [[JSContext alloc] init];
}
return self;
}
@@ -128,7 +130,7 @@ - (JSValue *)invokeObject:(NSString *)objName method:(NSString *)funcName args:(
dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
self.semaphores[@(callId)] = semaphore;
self.invokingMethod = YES;
DoricLog(@"Lock %@",@(callId));
DoricLog(@"Lock %@", @(callId));
DC_LOCK(semaphore);
JSValue *result = self.results[@(callId)];
[self.results removeObjectForKey:@(callId)];
@@ -169,7 +171,9 @@ - (BOOL)interceptType:(NSString *)type command:(NSString *)cmd payload:(NSDictio
NSString *name = payload[@"name"];
NSArray *argsArr = payload[@"arguments"];
id tmpBlk = self.blockMDic[name];
if (argsArr.count == 0) {
if (!tmpBlk) {
DoricLog(@"Cannot find inject function:%@", name);
} else if (argsArr.count == 0) {
((Block0) tmpBlk)();
} else if (argsArr.count == 1) {
((Block1) tmpBlk)(argsArr[0]);
@@ -187,12 +191,12 @@ - (BOOL)interceptType:(NSString *)type command:(NSString *)cmd payload:(NSDictio
} else if ([cmd isEqualToString:@"invokeMethod"]) {
NSNumber *callId = payload[@"callId"];
@try {
JSValue *value = [JSValue valueWithObject:payload[@"result"] inContext:nil];
JSValue *value = [JSValue valueWithObject:payload[@"result"] inContext:self.jsContext];
self.results[callId] = value;
} @catch (NSException *exception) {
DoricLog(@"debugger ", NSStringFromSelector(_cmd), exception.reason);
} @finally {
DoricLog(@"Unlock:%@",payload);
DoricLog(@"Unlock:%@", payload);
dispatch_semaphore_t semaphore = self.semaphores[callId];
[self.semaphores removeObjectForKey:callId];
DC_UNLOCK(semaphore);