From 15dd196e79fc0db6499dec63b0c94a1a68a7c319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=8A=B2=E9=B9=8F?= <jingpeng.wang@outlook.com>
Date: Thu, 31 Oct 2019 16:22:30 +0800
Subject: [PATCH] add dispatch_semaphore to control serial logic

---
 .../Classes/Engine/DoricJSRemoteExecutor.h    |  2 +
 .../Classes/Engine/DoricJSRemoteExecutor.m    | 55 +++++++++++++------
 2 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/iOS/Pod/Classes/Engine/DoricJSRemoteExecutor.h b/iOS/Pod/Classes/Engine/DoricJSRemoteExecutor.h
index f41bd5df..e626791e 100644
--- a/iOS/Pod/Classes/Engine/DoricJSRemoteExecutor.h
+++ b/iOS/Pod/Classes/Engine/DoricJSRemoteExecutor.h
@@ -27,6 +27,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface DoricJSRemoteExecutor : NSObject <DoricJSExecutorProtocal>
 
+@property(nonatomic, strong) dispatch_semaphore_t semaphore;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/iOS/Pod/Classes/Engine/DoricJSRemoteExecutor.m b/iOS/Pod/Classes/Engine/DoricJSRemoteExecutor.m
index 8ecc1f83..93393cc1 100644
--- a/iOS/Pod/Classes/Engine/DoricJSRemoteExecutor.m
+++ b/iOS/Pod/Classes/Engine/DoricJSRemoteExecutor.m
@@ -20,44 +20,67 @@
 //  Created by 王劲鹏 on 2019/10/31.
 //
 #import "DoricJSRemoteExecutor.h"
+#import <SocketRocket/SRWebSocket.h>
+#import "DoricUtil.h"
 
-@interface DoricJSRemoteExecutor ()
+@interface DoricJSRemoteExecutor () <SRWebSocketDelegate>
 
-@property(nonatomic, strong) JSContext *jsContext;
+@property(nonatomic, strong) SRWebSocket *websocket;
 
 @end
 
 @implementation DoricJSRemoteExecutor
 - (instancetype)init {
     if (self = [super init]) {
-        _jsContext = [[JSContext alloc] init];
+        _websocket = [[SRWebSocket alloc] initWithURL:[NSURL URLWithString:@"ws://192.168.24.166:2080"]];
+        _websocket.delegate = self;
+        [_websocket open];
+        _semaphore = dispatch_semaphore_create(0);
+        dispatch_semaphore_wait(_semaphore, DISPATCH_TIME_FOREVER);
     }
     return self;
 }
 
-- (void)checkJSException {
-    if (self.jsContext.exception) {
-        NSString *errMsg = [NSString stringWithFormat:@"%@ (line %@ in the generated bundle)\n/***StackTrace***/\n%@/***StackTrace***/", self.jsContext.exception, self.jsContext.exception[@"line"], self.jsContext.exception[@"stack"]];
-        @throw [[NSException alloc] initWithName:@"DoricJS" reason:errMsg userInfo:nil];
+- (void)webSocketDidOpen:(SRWebSocket *)webSocket {
+    DoricLog(@"debugger webSocketDidOpen");
+    dispatch_semaphore_signal(_semaphore);
+}
+
+- (void)webSocket:(SRWebSocket *)webSocket didReceivePong:(NSData *)pongPayload {
+    DoricLog(@"debugger webSocketdidReceivePong");
+}
+
+- (void)webSocket:(SRWebSocket *)webSocket didReceiveMessage:(id)message {
+    NSData *jsonData = [message dataUsingEncoding:NSUTF8StringEncoding];
+    NSError *err;
+    NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:jsonData
+                                                        options:NSJSONReadingMutableContainers
+                                                          error:&err];
+    if (err) {
+        DoricLog(@"webSocketdidReceiveMessage parse error：%@", err);
+        return;
     }
+    NSString *source = [[dic valueForKey:@"source"] mutableCopy];
+}
+
+- (void)webSocket:(SRWebSocket *)webSocket didFailWithError:(NSError *)error {
+    DoricLog(@"debugger webSocketdidFailWithError");
+    dispatch_semaphore_signal(_semaphore);
+}
+
+- (void)webSocket:(SRWebSocket *)webSocket didCloseWithCode:(NSInteger)code reason:(NSString *)reason wasClean:(BOOL)wasClean {
+    DoricLog(@"debugger webSocketdidCloseWithCode");
 }
 
 - (NSString *)loadJSScript:(NSString *)script source:(NSString *)source {
-    NSString *ret = [[self.jsContext evaluateScript:script withSourceURL:[NSURL URLWithString:source]] toString];
-    [self checkJSException];
-    return ret;
+    return nil;
 }
 
 - (void)injectGlobalJSObject:(NSString *)name obj:(id)obj {
-    self.jsContext[name] = obj;
-    [self checkJSException];
 }
 
 - (JSValue *)invokeObject:(NSString *)objName method:(NSString *)funcName args:(NSArray *)args {
-    JSValue *obj = [self.jsContext objectForKeyedSubscript:objName];
-    JSValue *ret = [obj invokeMethod:funcName withArguments:args];
-    [self checkJSException];
-    return ret;
+    return nil;
 }
 
 @end