Debugger: add dedicated message for VSCode watch

Processing VSCode watches skips waitForResolvingPendingBreakpoints
(previously having multiple watches in VSC would call this when
processing the first watch, which would process pending messages while
trying to wait for break point changes while in eval mode (not in
waiting mode) and cause and Invalid message error and the closure of the
debgger connection when hitting the second watch message)

Allow '*.mjs' files in the python debugger

Signed-off-by: Máté Tokodi mate.tokodi@szteszoftver.hu

Author: matetokodi

src/debugger/Debugger.cpp

@@ -189,7 +189,7 @@ void DebuggerRemote::parseCompleted(String* source, String* srcName, size_t orig
 
     sendType(ESCARGOT_MESSAGE_PARSE_DONE);
 
-    if (enabled() && pendingWait()) {
+    if (enabled() && pendingWait() && !m_watchEval) {
         waitForResolvingPendingBreakpoints();
     }
 }
@@ -371,7 +371,7 @@ bool DebuggerRemote::doEval(ExecutionState* state, Optional<ByteCodeBlock*> byte
     }
 
     String* str;
-    if (type == ESCARGOT_MESSAGE_EVAL_8BIT || type == ESCARGOT_MESSAGE_EVAL_WITHOUT_STOP_8BIT) {
+    if (type == ESCARGOT_MESSAGE_EVAL_8BIT || type == ESCARGOT_MESSAGE_EVAL_WITHOUT_STOP_8BIT || type == ESCARGOT_MESSAGE_WATCH_8BIT) {
         str = new Latin1String(data, size);
     } else if (type == ESCARGOT_MESSAGE_EVAL_16BIT || type == ESCARGOT_MESSAGE_EVAL_WITHOUT_STOP_16BIT) {
         str = new UTF16String((char16_t*)data, size / 2);
@@ -923,6 +923,16 @@ bool DebuggerRemote::processEvents(ExecutionState* state, Optional<ByteCodeBlock
             m_stopState = stopState;
             return false;
         }
+        case ESCARGOT_MESSAGE_WATCH_8BIT_START: {
+            if ((length <= 1 + sizeof(uint32_t)) || m_stopState != ESCARGOT_DEBUGGER_IN_WAIT_MODE) {
+                break;
+            }
+            m_watchEval = true;
+            ASSERT(byteCodeBlock.hasValue());
+            const bool res = doEval(state, byteCodeBlock, buffer, length);
+            m_watchEval = false;
+            return res;
+        }
         case ESCARGOT_MESSAGE_EVAL_8BIT_START:
         case ESCARGOT_MESSAGE_EVAL_16BIT_START: {
             if ((length <= 1 + sizeof(uint32_t)) || m_stopState != ESCARGOT_DEBUGGER_IN_WAIT_MODE) {

src/debugger/Debugger.h

@@ -301,6 +301,9 @@ class DebuggerRemote : public Debugger {
         ESCARGOT_DEBUGGER_PENDING_CONFIG = 23,
         ESCARGOT_DEBUGGER_PENDING_RESUME = 24,
         ESCARGOT_DEBUGGER_WAIT_BEFORE_EXIT = 25,
+        ESCARGOT_DEBUGGER_STOP = 26,
+        ESCARGOT_MESSAGE_WATCH_8BIT_START = 27,
+        ESCARGOT_MESSAGE_WATCH_8BIT = 28,
     };
 
     // Environment record types
@@ -431,6 +434,7 @@ class DebuggerRemote : public Debugger {
     bool m_exitClient : 1;
     bool m_pendingWait : 1;
     bool m_waitForResume : 1;
+    bool m_watchEval : 1;
     String* m_clientSourceData;
     String* m_clientSourceName;
 

tools/debugger/debugger_core.py

@@ -101,6 +101,9 @@
 ESCARGOT_DEBUGGER_PENDING_CONFIG = 23
 ESCARGOT_DEBUGGER_PENDING_RESUME = 24
 ESCARGOT_DEBUGGER_WAIT_BEFORE_EXIT = 25
+ESCARGOT_DEBUGGER_STOP = 26
+ESCARGOT_MESSAGE_WATCH_8BIT_START = 27
+ESCARGOT_MESSAGE_WATCH_8BIT = 28
 
 
 # Environment record types
@@ -588,7 +591,7 @@ def send_client_source(self):
             self._exec_command(ESCARGOT_DEBUGGER_THERE_WAS_NO_SOURCE)
             return
         path = self.client_sources.pop(0)
-        if not path.endswith('.js'):
+        if not path.endswith('.js') and not path.endswith('.mjs'):
             sys.exit("Error: Javascript file expected!")
         with open(path, 'r') as src_file:
             content = path + '\0'+ src_file.read()