Support Bluetooth communcation JerryScript debugger

Documentation can be found in 07.DEBUGGER.md

JerryScript-DCO-1.0-Signed-off-by: Bence Gabor Kis kisbg@inf.u-szeged.hu

Author: Bence Gabor Kis

.travis.yml

@@ -17,7 +17,7 @@ matrix:
       install: pip install --user pylint==1.6.5
       addons:
         apt:
-          packages: [doxygen, cppcheck, vera++]
+          packages: [doxygen, cppcheck, vera++, pybluez]
 
     - name: "Linux/x86-64 Build & Correctness Tests"
       env:
@@ -65,7 +65,9 @@ matrix:
     - name: "Debugger Tests"
       env:
         - OPTS="--jerry-debugger"
-
+      addons:
+        apt:
+          packages: [pybluez]
     - name: "Conformance Tests"
       env:
         - OPTS="--test262"

docs/07.DEBUGGER.md

@@ -9,7 +9,7 @@ This simple application demonstrates the communication protocol
 between the client and server, and can be reused by integrated
 development environments.
 
-## Setting up the debugger server
+## Setting up TCP/IP debugger server
 
 The following arguments must be passed to `tools/build.py`:
 
@@ -21,7 +21,25 @@ JerryScript extension, which transmits messages over TCP/IP networks.
 If necessary/implemented, any reliable stream or datagram based
 protocol can be used for transmitting debugger messages.
 
-## Debugging JavaScript applications
+## Setting up Bluetooth debugger server
+
+The following arguments must be passed to `tools/build.py`:
+
+`--jerry-bt-debugger=on`
+
+The transport layer of the communication protocol is pluggable.
+At the moment, a WebSocket-based implementation is provided as a
+JerryScript extension, which transmits messages over Bluetooth network.
+
+The following library is needed to build JerryScript
+- libbluetooth-dev
+
+The following python commands needed to run jerry-client.py
+- sudo apt-get install -q python-dev
+- pip install --user pylint==1.6.5
+- pip install --user pybluez
+
+
 
 The debugger client must be connected to the server before the
 JavaScript application runs. On-the-fly attachment is supported
@@ -43,6 +61,12 @@ source code:
 
 `--debugger-wait-source`
 
+The following argument makes JerryScript create a server with
+the given type. There are two choices, tcp or bluetooth.
+(default: tcp)
+
+`--server-type bluetooth`
+
 It is also recommended to increase the log level to see
 the *Waiting for client connection* message:
 

jerry-core/CMakeLists.txt

@@ -22,6 +22,7 @@ set(ENABLE_ALL_IN_ONE          OFF     CACHE BOOL   "Enable all-in-one build?")
 # Optional features
 set(FEATURE_CPOINTER_32_BIT    OFF     CACHE BOOL   "Enable 32 bit compressed pointers?")
 set(FEATURE_DEBUGGER           OFF     CACHE BOOL   "Enable JerryScript debugger?")
+set(FEATURE_BT_DEBUGGER        OFF     CACHE BOOL   "Enable JerryScript bluetooth?")
 set(FEATURE_ERROR_MESSAGES     OFF     CACHE BOOL   "Enable error messages?")
 set(FEATURE_EXTERNAL_CONTEXT   OFF     CACHE BOOL   "Enable external context?")
 set(FEATURE_JS_PARSER          ON      CACHE BOOL   "Enable js-parser?")
@@ -73,9 +74,14 @@ if(FEATURE_MEM_STATS OR FEATURE_PARSER_DUMP OR FEATURE_REGEXP_DUMP)
   set(FEATURE_LOGGING_MESSAGE " (FORCED BY STATS OR DUMP)")
 endif()
 
+if(FEATURE_BL_DEBUGGER)
+  set(FEATURE_DEBUGGER ON)
+endif()
+
 # Status messages
 message(STATUS "ENABLE_ALL_IN_ONE           " ${ENABLE_ALL_IN_ONE} ${ENABLE_ALL_IN_ONE_MESSAGE})
 message(STATUS "FEATURE_CPOINTER_32_BIT     " ${FEATURE_CPOINTER_32_BIT} ${FEATURE_CPOINTER_32_BIT_MESSAGE})
+message(STATUS "FEATURE_BL_DEBUGGER         " ${FEATURE_BL_DEBUGGER})
 message(STATUS "FEATURE_DEBUGGER            " ${FEATURE_DEBUGGER})
 message(STATUS "FEATURE_ERROR_MESSAGES      " ${FEATURE_ERROR_MESSAGES})
 message(STATUS "FEATURE_EXTERNAL_CONTEXT    " ${FEATURE_EXTERNAL_CONTEXT})
@@ -194,6 +200,11 @@ if(FEATURE_MEM_STATS)
   set(DEFINES_JERRY ${DEFINES_JERRY} JMEM_STATS)
 endif()
 
+# Enable bluetooth_debugger
+if(FEATURE_BL_DEBUGGER)
+  set(DEFINES_JERRY ${DEFINES_JERRY} JERRY_BL_DEBUGGER)
+endif()
+
 # Enable debugger
 if(FEATURE_DEBUGGER)
   set(DEFINES_JERRY ${DEFINES_JERRY} JERRY_DEBUGGER)

jerry-debugger/jerry_client.py

@@ -22,6 +22,7 @@
 import sys
 import logging
 import time
+import bluetooth
 import jerry_client_ws
 
 def write(string):
@@ -291,7 +292,7 @@ def main():
 if __name__ == "__main__":
     try:
         main()
-    except socket.error as error_msg:
+    except IOError as error_msg:
         ERRNO = error_msg.errno
         MSG = str(error_msg)
         if ERRNO == 111:

jerry-debugger/jerry_client_ws.py

@@ -22,6 +22,7 @@
 import socket
 import struct
 import sys
+import bluetooth
 
 # Expected debugger protocol version.
 JERRY_DEBUGGER_VERSION = 8
@@ -266,17 +267,24 @@ def get_text(self):
 
 
 class JerryDebugger(object):
-    # pylint: disable=too-many-instance-attributes,too-many-statements,too-many-public-methods,no-self-use
+    # pylint: disable=too-many-instance-attributes,too-many-statements,too-many-public-methods,no-self-use,too-many-branches
     def __init__(self, address):
-
+        temp = address.split(":")
         if ":" not in address:
             self.host = address
             self.port = 5001  # use default port
+            self.client_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        elif len(temp) == 2:
+            self.host = temp[0]
+            self.port = int(temp[1])
+            self.client_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        elif len(temp) == 6:
+            self.host = address
+            self.port = 1 # use default port
+            self.client_socket = bluetooth.BluetoothSocket(bluetooth.RFCOMM)
         else:
-            self.host, self.port = address.split(":")
-            self.port = int(self.port)
+            raise Exception("Wrong address type")
 
-        print("Connecting to: %s:%s" % (self.host, self.port))
 
         self.message_data = b""
         self.prompt = False
@@ -303,7 +311,6 @@ def __init__(self, address):
         self.nocolor = ''
         self.src_offset = 0
         self.src_offset_diff = 0
-        self.client_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.client_socket.connect((self.host, self.port))
         self.non_interactive = False
         self.current_out = b""
@@ -385,7 +392,11 @@ def __init__(self, address):
             self.message_data = result[len_expected:]
 
     def __del__(self):
-        self.client_socket.close()
+        try:
+            self.client_socket.close()
+        except AttributeError:
+            pass
+
 
     def _exec_command(self, command_id):
         self.send_command(command_id)

jerry-ext/CMakeLists.txt

@@ -47,5 +47,9 @@ target_include_directories(${JERRY_EXT_NAME} PRIVATE ${INCLUDE_EXT_PRIVATE})
 target_compile_definitions(${JERRY_EXT_NAME} PUBLIC ${DEFINES_EXT})
 target_link_libraries(${JERRY_EXT_NAME} jerry-core)
 
+if(FEATURE_BT_DEBUGGER)
+  target_link_libraries(${JERRY_EXT_NAME} -lbluetooth)
+endif()
+
 install(TARGETS ${JERRY_EXT_NAME} DESTINATION lib)
 install(DIRECTORY ${INCLUDE_EXT_PUBLIC}/ DESTINATION include)