fix(inspector): ensure socket message is copied and stored (#155)

NativeScript · Mar 18, 2022 · 3098976 · 3098976
1 parent f46c425
commit 3098976
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/NativeScript/inspector/InspectorServer.mm b/NativeScript/inspector/InspectorServer.mm
@@ -78,7 +78,10 @@
                         if (size) {
                             NSString* payload = [[NSString alloc] initWithData:(NSData*)data encoding:NSUTF16LittleEndianStringEncoding];
 
-                            onMessage([payload UTF8String]);
+                            if (payload) {
+                                std::string result = [payload UTF8String];
+                                onMessage(result);
+                            }
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Warc-retain-cycles"

diff --git a/NativeScript/inspector/JsV8InspectorClient.h b/NativeScript/inspector/JsV8InspectorClient.h
@@ -44,13 +44,14 @@ class JsV8InspectorClient : V8InspectorClient, V8Inspector::Channel {
     std::vector<std::string> messages_;
     bool runningNestedLoops_;
     dispatch_queue_t messagesQueue_;
+    dispatch_semaphore_t messageArrived_;
     std::function<void (std::string)> sender_;
     bool isWaitingForDebugger_;
 
     void enableInspector(int argc, char** argv);
     void notify(std::unique_ptr<StringBuffer> message);
     void onFrontendConnected(std::function<void (std::string)> sender);
-    void onFrontendMessageReceived(std::string message);
+    void onFrontendMessageReceived(std::string &message);
     template <class TypeName>
     static v8::Local<TypeName> PersistentToLocal(v8::Isolate* isolate, const v8::Persistent<TypeName>& persistent);
     std::string PumpMessage();

diff --git a/NativeScript/inspector/JsV8InspectorClient.mm b/NativeScript/inspector/JsV8InspectorClient.mm
@@ -83,6 +83,7 @@
       messages_(),
       runningNestedLoops_(false) {
      this->messagesQueue_ = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
+     this->messageArrived_ = dispatch_semaphore_create(0);
 }
 
 void JsV8InspectorClient::onFrontendConnected(std::function<void (std::string)> sender) {
@@ -100,9 +101,11 @@
     this->disconnect();
 }
 
-void JsV8InspectorClient::onFrontendMessageReceived(std::string message) {
+void JsV8InspectorClient::onFrontendMessageReceived(std::string &message) {
+    __block std::string strCopy = message;
     dispatch_sync(this->messagesQueue_, ^{
-        this->messages_.push_back(message);
+        this->messages_.push_back(strCopy);
+        dispatch_semaphore_signal(messageArrived_);
     });
 
     tns::ExecuteOnMainThread([this, message]() {
@@ -166,15 +169,22 @@
 
     terminated_ = false;
     this->runningNestedLoops_ = true;
+    bool shouldWait = false;
     while (!terminated_) {
         std::string message = this->PumpMessage();
         if (!message.empty()) {
             this->dispatchMessage(message);
+            shouldWait = false;
+        } else {
+            shouldWait = true;
         }
 
         std::shared_ptr<Platform> platform = tns::Runtime::GetPlatform();
         Isolate* isolate = runtime_->GetIsolate();
         platform::PumpMessageLoop(platform.get(), isolate, platform::MessageLoopBehavior::kDoNotWait);
+        if(shouldWait && !terminated_) {
+            dispatch_semaphore_wait(messageArrived_, dispatch_time(DISPATCH_TIME_NOW, 1000000)); // 1ms in ns
+        }
     }
 
     terminated_ = false;