Add worker thread

Author: Zhengbo Li

typescript/libs/global_vars.py

@@ -37,7 +37,7 @@
 
 # set logging levels
 LOG_FILE_LEVEL = logging.WARN
-LOG_CONSOLE_LEVEL = logging.WARN
+LOG_CONSOLE_LEVEL = logging.DEBUG
 
 NON_BLANK_LINE_PATTERN = re.compile("[\S]+")
 VALID_COMPLETION_ID_PATTERN = re.compile("[a-zA-Z_$\.][\w$\.]*\Z")

typescript/libs/node_client.py

@@ -27,6 +27,8 @@ def sendCmdSync(self, cmd): pass
 
     def sendCmdAsync(self, cmd): pass
 
+    def postCmdToWorker(self, cmd): pass
+
 
 class NodeCommClient(CommClient):
     __CONTENT_LENGTH_HEADER = b"Content-Length: "
@@ -59,6 +61,7 @@ def __init__(self, scriptPath):
             print("Unable to find executable file for node on path list: " + path_list)
             print("To specify the node executable file name, use the 'node_path' setting")
             self.__serverProc = None
+            self.__workerProc = None
         else:
             print("Found node executable at " + node_path)
             try:
@@ -69,12 +72,17 @@ def __init__(self, scriptPath):
                     si.dwFlags |= subprocess.SW_HIDE | subprocess.STARTF_USESHOWWINDOW
                     self.__serverProc = subprocess.Popen([node_path, scriptPath],
                                                          stdin=subprocess.PIPE, stdout=subprocess.PIPE, startupinfo=si)
+                    self.__workerProc = subprocess.Popen([node_path, scriptPath],
+                                                         stdin=subprocess.PIPE, stdout=subprocess.PIPE, startupinfo=si)
                 else:
                     log.debug("opening " + node_path + " " + scriptPath)
                     self.__serverProc = subprocess.Popen([node_path, scriptPath],
                                                          stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+                    self.__workerProc = subprocess.Popen([node_path, scriptPath],
+                                                         stdin=subprocess.PIPE, stdout=subprocess.PIPE)
             except:
                 self.__serverProc = None
+                self.__workerProc = None
         # start reader thread
         if self.__serverProc and (not self.__serverProc.poll()):
             log.debug("server proc " + str(self.__serverProc))
@@ -83,12 +91,29 @@ def __init__(self, scriptPath):
                 self.__serverProc.stdout, self.__msgq, self.__eventq, self.asyncReq, self.__serverProc))
             readerThread.daemon = True
             readerThread.start()
+
+        # start the worker thread
+        if self.__workerProc and not self.__workerProc.poll():
+            log.debug("worker proc {0}".format(self.__workerProc))
+            log.debug("starting worker thread")
+            worker_thread = threading.Thread(
+                target = NodeCommClient.__reader,
+                args = (
+                    self.__workerProc.stdout, self.__msgq, self.__eventq, self.asyncReq, self.__workerProc
+                )
+            )
+            worker_thread.daemon = True
+            worker_thread.start()
+
         self.__debugProc = None
         self.__breakpoints = []
 
     def serverStarted(self):
         return self.__serverProc is not None
 
+    def workerStarted(self):
+        return self.__workerProc is not None
+
     # work in progress
     def addBreakpoint(self, file, line):
         self.__breakpoints.append((file, line))
@@ -172,6 +197,20 @@ def postCmd(self, cmd):
             self.__serverProc.stdin.flush()
             return True
 
+    def postCmdToWorker(self, cmd):
+        """
+        Post command to worker process; no response needed
+        """
+        log.debug('Posting command to worker: {0}'.format(cmd))
+        if not self.__workerProc:
+            log.error("can not send request; worker process not running")
+            return False
+        else:
+            cmd += "\n"
+            self.__workerProc.stdin.write(cmd.encode())
+            self.__workerProc.stdin.flush()
+            return True
+
     def getEvent(self):
         """
         Try to get event from event queue

typescript/libs/service_proxy.py

@@ -19,6 +19,7 @@ def exit(self):
         req_dict = self.create_req_dict("exit")
         json_str = json_helpers.encode(req_dict)
         self.__comm.postCmd(json_str)
+        self.__comm.postCmdToWorker(json_str)
 
     def configure(self, host_info="Sublime Text", file=None, format_options=None):
         args = {"hostInfo": host_info, "formatOptions": format_options, "file": file}
@@ -39,6 +40,7 @@ def change(self, path, begin_location=Location(1, 1), end_location=Location(1, 1
         req_dict = self.create_req_dict("change", args)
         json_str = json_helpers.encode(req_dict)
         self.__comm.postCmd(json_str)
+        self.__comm.postCmdToWorker(json_str)
 
     def completions(self, path, location=Location(1, 1), prefix="", on_completed=None):
         args = {"file": path, "line": location.line, "offset": location.offset, "prefix": prefix}
@@ -104,12 +106,14 @@ def open(self, path):
         req_dict = self.create_req_dict("open", args)
         json_str = json_helpers.encode(req_dict)
         self.__comm.postCmd(json_str)
+        self.__comm.postCmdToWorker(json_str)
 
     def close(self, path):
         args = {"file": path}
         req_dict = self.create_req_dict("close", args)
         json_str = json_helpers.encode(req_dict)
         self.__comm.postCmd(json_str)
+        self.__comm.postCmdToWorker(json_str)
 
     def references(self, path, location=Location(1, 1)):
         args = {"file": path, "line": location.line, "offset": location.offset}
@@ -122,14 +126,15 @@ def reload(self, path, alternate_path):
         args = {"file": path, "tmpfile": alternate_path}
         req_dict = self.create_req_dict("reload", args)
         json_str = json_helpers.encode(req_dict)
-        response_dict = self.__comm.sendCmdSync(json_str, req_dict["seq"])
-        return response_dict
+        self.__comm.postCmd(json_str)
+        self.__comm.postCmdToWorker(json_str)
 
     def reload_async(self, path, alternate_path, on_completed):
         args = {"file": path, "tmpfile": alternate_path}
         req_dict = self.create_req_dict("reload", args)
         json_str = json_helpers.encode(req_dict)
         self.__comm.sendCmdAsync(json_str, req_dict["seq"], on_completed)
+        self.__comm.postCmdToWorker(json_str)
 
     def rename(self, path, location=Location(1, 1)):
         args = {"file": path, "line": location.line, "offset": location.offset}
@@ -142,7 +147,7 @@ def request_get_err(self, delay=0, pathList=[]):
         args = {"files": pathList, "delay": delay}
         req_dict = self.create_req_dict("geterr", args)
         json_str = json_helpers.encode(req_dict)
-        self.__comm.postCmd(json_str)
+        self.__comm.postCmdToWorker(json_str)
 
     def type(self, path, location=Location(1, 1)):
         args = {"file": path, "line": location.line, "offset": location.offset}