v1.0.35 Orchestrator server multythreading + try to fix hang bug

Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.35.dist-info/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyOpenRPA
-Version: 1.0.34
+Version: 1.0.35
 Summary: First open source RPA platform for business
 Home-page: https://gitlab.com/UnicodeLabs/OpenRPA
 Author: Ivan Maslov

Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA-1.0.35.dist-info/RECORD

@@ -1,15 +1,15 @@
-pyOpenRPA-1.0.34.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+pyOpenRPA-1.0.35.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pyOpenRPA-1.0.34.dist-info/METADATA,sha256=WakfkUg30wJGLxsmqvPERvkd2agMGOzXa84qcPG5f5Q,3510
+pyOpenRPA-1.0.35.dist-info/METADATA,sha256=Eaxc1HoYsQJpE4mC-fxUWwTQroJvDDXoEiPN-Eed6Sk,3510
-pyOpenRPA-1.0.34.dist-info/RECORD,,
+pyOpenRPA-1.0.35.dist-info/RECORD,,
-pyOpenRPA-1.0.34.dist-info/WHEEL,sha256=qB97nP5e4MrOsXW5bIU5cUn_KSVr10EV0l-GCHG9qNs,97
+pyOpenRPA-1.0.35.dist-info/WHEEL,sha256=qB97nP5e4MrOsXW5bIU5cUn_KSVr10EV0l-GCHG9qNs,97
-pyOpenRPA-1.0.34.dist-info/top_level.txt,sha256=RPzwQXgYBRo_m5L3ZLs6Voh8aEkMeT29Xsul1w1qE0g,10
+pyOpenRPA-1.0.35.dist-info/top_level.txt,sha256=RPzwQXgYBRo_m5L3ZLs6Voh8aEkMeT29Xsul1w1qE0g,10
 pyOpenRPA/Orchestrator/Orchestrator.py,sha256=UKp7eqvWDM91kYLwl2mo0UB8Pw-qu8eJCsR9NEXD1aU,6436
 pyOpenRPA/Orchestrator/Processor.py,sha256=HQQyOVX-d5vPO-YULyTxVOtXtUMfvpAaSVO4xXxaKVI,9107
-pyOpenRPA/Orchestrator/Server.py,sha256=5tjhfU0QVEfg4zjT2jWOuOADWeHXMBxX2Fe8lj1bnCA,20839
+pyOpenRPA/Orchestrator/Server.py,sha256=dqTCK9HPhNJNgHv931uohIlW48BUvDhWMVhXaDagM1w,22134
 pyOpenRPA/Orchestrator/ServerSettings.py,sha256=jOXJTLwg8cJx6D-rN8J4dn5RCb2nepAhCH4F9hYVUdM,4912
 pyOpenRPA/Orchestrator/Timer.py,sha256=FQZ3y6G9d47Ybx7RewzePKQV77H4gCkx5SaeFVlsuhc,2095
-pyOpenRPA/Orchestrator/Web/Index.xhtml,sha256=7wwEJ8lEI_2AElITUk9yyX91Sq6pNccqPsuAVlm7enQ,32322
+pyOpenRPA/Orchestrator/Web/Index.xhtml,sha256=su4tsDD_ZMbQz6Tbmqj55SM0ZZxuQw9tfPcytaB8wzs,32953
-pyOpenRPA/Orchestrator/Web/favicon.ico,sha256=jO3pjFWbmJEPQ2KroXSKYtXIesBq46PCBlKSouewODU,5430
+pyOpenRPA/Orchestrator/Web/favicon.ico,sha256=0vdsnwKGh6pgB0FDB5mOKO7RwbxQ9F13Zg16F1pkvXs,5430
 pyOpenRPA/Orchestrator/__init__.py,sha256=qVH8fEPgXk54rmy-ol0PnT8GF5OlGE0a8mExwJ4tFqY,124
 pyOpenRPA/Orchestrator/__main__.py,sha256=cOd8WU77VGgzTZUB0WmWpPmdYyMZY1zVyuU9yx26MKs,144
 pyOpenRPA/Orchestrator/__pycache__/Orchestrator.cpython-37.pyc,,
@@ -255,5 +255,5 @@ pyOpenRPA/Tools/RobotScreenActive/__pycache__/__init__.cpython-37.pyc,,
 pyOpenRPA/Tools/RobotScreenActive/__pycache__/__main__.cpython-37.pyc,,
 pyOpenRPA/Tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyOpenRPA/Tools/__pycache__/__init__.cpython-37.pyc,,
-pyOpenRPA/__init__.py,sha256=6g2t0dHUhbsJm87H07rs_6y5XDub0C_nWd2B-w-0XGg,175
+pyOpenRPA/__init__.py,sha256=l7mCNJli_G0e_-FKJ5hBRfMvtM12pfLexUeM7c1IuZw,175
 pyOpenRPA/__pycache__/__init__.cpython-37.pyc,,

Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA/Orchestrator/Server.py

@@ -1,4 +1,6 @@
 from http.server import BaseHTTPRequestHandler, HTTPServer
+from socketserver import ThreadingMixIn
+import threading
 import json
 from threading import Thread
 from . import Processor
@@ -11,27 +13,6 @@ import os #for path operations
 from http import cookies
 global mGlobalDict
 from . import ServerSettings
-#inGlobalDict
-# "JSONConfigurationDict":<JSON>
-class RobotDaemonServer(Thread):
-    def __init__(self,name,inGlobalDict):
-        Thread.__init__(self)
-        self.name = name
-        # Update the global dict
-        ServerSettings.SettingsUpdate(mGlobalDict)
-    def run(self):
-        inServerAddress="";
-        inPort = mGlobalDict["Server"]["ListenPort"];
-        # Server settings
-        # Choose port 8080, for port 80, which is normally used for a http server, you need root access
-        server_address = (inServerAddress, inPort)
-        httpd = HTTPServer(server_address, testHTTPServer_RequestHandler)
-        # Logging
-        mGlobalDict["Logger"].info(f"Server init. Listen URL: {inServerAddress}, Listen port: {inPort}")
-        # Запуск адреса в браузере
-        os.system("explorer http://127.0.0.1:8081")
-        httpd.serve_forever() 
-
 #Authenticate function ()
 # return dict
 # {
@@ -380,6 +361,17 @@ class testHTTPServer_RequestHandler(BaseHTTPRequestHandler):
                 lFlagUserAccess = UserAccessCheckBefore("POST", self)
             ######################################
             if lFlagUserAccess:
+                lOrchestratorFolder = "\\".join(__file__.split("\\")[:-1])
+                ############################
+                #New server engine (url from global dict (URLList))
+                ############################
+                for lURLItem in mGlobalDict["Server"]["URLList"]:
+                    #Check if all condition are applied
+                    lFlagURLIsApplied=False
+                    lFlagURLIsApplied=self.URLItemCheckDo(lURLItem, "POST")
+                    if lFlagURLIsApplied:
+                        self.ResponseDictSend()
+                        return
                 #Централизованная функция получения запросов/отправки
                 if self.path == '/Utils/Processor':
                     #ReadRequest
@@ -405,4 +397,37 @@ class testHTTPServer_RequestHandler(BaseHTTPRequestHandler):
                 self.send_response(403)
                 # Send headers
                 self.end_headers()
-                return
+                return
+    #Logging
+    #!Turn it on to stop print in console
+    #def log_message(self, format, *args):
+    #    return
+class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
+    """Handle requests in a separate thread."""
+    def finish_request(self, request, client_address):
+        request.settimeout(30)
+        # "super" can not be used because BaseServer is not created from object
+        HTTPServer.finish_request(self, request, client_address)
+#inGlobalDict
+# "JSONConfigurationDict":<JSON>
+class RobotDaemonServer(Thread):
+    def __init__(self,name,inGlobalDict):
+        Thread.__init__(self)
+        self.name = name
+        # Update the global dict
+        ServerSettings.SettingsUpdate(mGlobalDict)
+    def run(self):
+        inServerAddress="";
+        inPort = mGlobalDict["Server"]["ListenPort"];
+        # Server settings
+        # Choose port 8080, for port 80, which is normally used for a http server, you need root access
+        server_address = (inServerAddress, inPort)
+        #httpd = HTTPServer(server_address, testHTTPServer_RequestHandler)
+        # Logging
+        mGlobalDict["Logger"].info(f"Server init. Listen URL: {inServerAddress}, Listen port: {inPort}")
+        # Запуск адреса в браузере
+        os.system("explorer http://127.0.0.1:8081")
+        #httpd.serve_forever()
+        httpd = ThreadedHTTPServer(server_address, testHTTPServer_RequestHandler)
+        #print('Starting server, use <Ctrl-C> to stop')
+        httpd.serve_forever()

Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA/Orchestrator/Web/Index.xhtml

@@ -404,6 +404,22 @@
 						dataType: "text"
 					});
 				}
+				mGlobal.Server= {}
+				mGlobal.Server.JSONGet=function(inMethod, inURL, inDataJSON, inCallback)
+				{
+					$.ajax({
+						type: inMethod,
+						url: inURL,
+						data: JSON.stringify(inDataJSON),
+						success: 
+						function(lData,l2,l3)
+						{
+							var lResponseJSON=JSON.parse(lData)
+							inCallback(lResponseJSON)
+						},
+						dataType: "text"
+					});
+				}
 				
 				/////////////////
 				///Modal
@@ -427,6 +443,9 @@
 					///Установить HTML код
 					$('.ui.modal.basic .content').html(lHTMLCode);
 					$('.ui.modal.basic').modal('show');
+					//DO widest modal for table with scroll x
+					$("div.ui.basic.modal.transition.visible.active.scrolling")[0].style["width"]="1300px"
+					$("div.ui.basic.modal.transition.visible.active.scrolling")[0].style["overflow"]="scroll"
 				}
 				//Service function
 				mGlobal.Modal.TableFilter.FilterUpdate=function(inFilterValue) {
@@ -549,7 +568,7 @@
 						{"Header":"Head 09","Description":"Test 21.02.2019"}
 					]
 				}
-				mGlobal.Modal.ListFilter.Show(lTestData)
+				//	mGlobal.Modal.ListFilter.Show(lTestData)
 			})
 		  ;
 		  </script>

Resources/WPy32-3720/python-3.7.2/Lib/site-packages/pyOpenRPA/__init__.py

@@ -3,7 +3,7 @@ r"""
 The OpenRPA package (from UnicodeLabs)
 
 """
-__version__ = 'v1.0.34'
+__version__ = 'v1.0.35'
 __all__ = []
 __author__ = 'Ivan Maslov <ivan.maslov@unicodelabs.ru>'
 #from .Core import Robot

Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.35.dist-info/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyOpenRPA
-Version: 1.0.34
+Version: 1.0.35
 Summary: First open source RPA platform for business
 Home-page: https://gitlab.com/UnicodeLabs/OpenRPA
 Author: Ivan Maslov

Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA-1.0.35.dist-info/RECORD

@@ -1,15 +1,15 @@
-pyOpenRPA-1.0.34.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+pyOpenRPA-1.0.35.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pyOpenRPA-1.0.34.dist-info/METADATA,sha256=WakfkUg30wJGLxsmqvPERvkd2agMGOzXa84qcPG5f5Q,3510
+pyOpenRPA-1.0.35.dist-info/METADATA,sha256=Eaxc1HoYsQJpE4mC-fxUWwTQroJvDDXoEiPN-Eed6Sk,3510
-pyOpenRPA-1.0.34.dist-info/RECORD,,
+pyOpenRPA-1.0.35.dist-info/RECORD,,
-pyOpenRPA-1.0.34.dist-info/WHEEL,sha256=qB97nP5e4MrOsXW5bIU5cUn_KSVr10EV0l-GCHG9qNs,97
+pyOpenRPA-1.0.35.dist-info/WHEEL,sha256=qB97nP5e4MrOsXW5bIU5cUn_KSVr10EV0l-GCHG9qNs,97
-pyOpenRPA-1.0.34.dist-info/top_level.txt,sha256=RPzwQXgYBRo_m5L3ZLs6Voh8aEkMeT29Xsul1w1qE0g,10
+pyOpenRPA-1.0.35.dist-info/top_level.txt,sha256=RPzwQXgYBRo_m5L3ZLs6Voh8aEkMeT29Xsul1w1qE0g,10
 pyOpenRPA/Orchestrator/Orchestrator.py,sha256=UKp7eqvWDM91kYLwl2mo0UB8Pw-qu8eJCsR9NEXD1aU,6436
 pyOpenRPA/Orchestrator/Processor.py,sha256=HQQyOVX-d5vPO-YULyTxVOtXtUMfvpAaSVO4xXxaKVI,9107
-pyOpenRPA/Orchestrator/Server.py,sha256=5tjhfU0QVEfg4zjT2jWOuOADWeHXMBxX2Fe8lj1bnCA,20839
+pyOpenRPA/Orchestrator/Server.py,sha256=dqTCK9HPhNJNgHv931uohIlW48BUvDhWMVhXaDagM1w,22134
 pyOpenRPA/Orchestrator/ServerSettings.py,sha256=jOXJTLwg8cJx6D-rN8J4dn5RCb2nepAhCH4F9hYVUdM,4912
 pyOpenRPA/Orchestrator/Timer.py,sha256=FQZ3y6G9d47Ybx7RewzePKQV77H4gCkx5SaeFVlsuhc,2095
-pyOpenRPA/Orchestrator/Web/Index.xhtml,sha256=7wwEJ8lEI_2AElITUk9yyX91Sq6pNccqPsuAVlm7enQ,32322
+pyOpenRPA/Orchestrator/Web/Index.xhtml,sha256=su4tsDD_ZMbQz6Tbmqj55SM0ZZxuQw9tfPcytaB8wzs,32953
-pyOpenRPA/Orchestrator/Web/favicon.ico,sha256=jO3pjFWbmJEPQ2KroXSKYtXIesBq46PCBlKSouewODU,5430
+pyOpenRPA/Orchestrator/Web/favicon.ico,sha256=0vdsnwKGh6pgB0FDB5mOKO7RwbxQ9F13Zg16F1pkvXs,5430
 pyOpenRPA/Orchestrator/__init__.py,sha256=qVH8fEPgXk54rmy-ol0PnT8GF5OlGE0a8mExwJ4tFqY,124
 pyOpenRPA/Orchestrator/__main__.py,sha256=cOd8WU77VGgzTZUB0WmWpPmdYyMZY1zVyuU9yx26MKs,144
 pyOpenRPA/Orchestrator/__pycache__/Orchestrator.cpython-37.pyc,,
@@ -255,5 +255,5 @@ pyOpenRPA/Tools/RobotScreenActive/__pycache__/__init__.cpython-37.pyc,,
 pyOpenRPA/Tools/RobotScreenActive/__pycache__/__main__.cpython-37.pyc,,
 pyOpenRPA/Tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyOpenRPA/Tools/__pycache__/__init__.cpython-37.pyc,,
-pyOpenRPA/__init__.py,sha256=6g2t0dHUhbsJm87H07rs_6y5XDub0C_nWd2B-w-0XGg,175
+pyOpenRPA/__init__.py,sha256=l7mCNJli_G0e_-FKJ5hBRfMvtM12pfLexUeM7c1IuZw,175
 pyOpenRPA/__pycache__/__init__.cpython-37.pyc,,

Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA/Orchestrator/Server.py

@@ -1,4 +1,6 @@
 from http.server import BaseHTTPRequestHandler, HTTPServer
+from socketserver import ThreadingMixIn
+import threading
 import json
 from threading import Thread
 from . import Processor
@@ -11,27 +13,6 @@ import os #for path operations
 from http import cookies
 global mGlobalDict
 from . import ServerSettings
-#inGlobalDict
-# "JSONConfigurationDict":<JSON>
-class RobotDaemonServer(Thread):
-    def __init__(self,name,inGlobalDict):
-        Thread.__init__(self)
-        self.name = name
-        # Update the global dict
-        ServerSettings.SettingsUpdate(mGlobalDict)
-    def run(self):
-        inServerAddress="";
-        inPort = mGlobalDict["Server"]["ListenPort"];
-        # Server settings
-        # Choose port 8080, for port 80, which is normally used for a http server, you need root access
-        server_address = (inServerAddress, inPort)
-        httpd = HTTPServer(server_address, testHTTPServer_RequestHandler)
-        # Logging
-        mGlobalDict["Logger"].info(f"Server init. Listen URL: {inServerAddress}, Listen port: {inPort}")
-        # Запуск адреса в браузере
-        os.system("explorer http://127.0.0.1:8081")
-        httpd.serve_forever() 
-
 #Authenticate function ()
 # return dict
 # {
@@ -380,6 +361,17 @@ class testHTTPServer_RequestHandler(BaseHTTPRequestHandler):
                 lFlagUserAccess = UserAccessCheckBefore("POST", self)
             ######################################
             if lFlagUserAccess:
+                lOrchestratorFolder = "\\".join(__file__.split("\\")[:-1])
+                ############################
+                #New server engine (url from global dict (URLList))
+                ############################
+                for lURLItem in mGlobalDict["Server"]["URLList"]:
+                    #Check if all condition are applied
+                    lFlagURLIsApplied=False
+                    lFlagURLIsApplied=self.URLItemCheckDo(lURLItem, "POST")
+                    if lFlagURLIsApplied:
+                        self.ResponseDictSend()
+                        return
                 #Централизованная функция получения запросов/отправки
                 if self.path == '/Utils/Processor':
                     #ReadRequest
@@ -405,4 +397,37 @@ class testHTTPServer_RequestHandler(BaseHTTPRequestHandler):
                 self.send_response(403)
                 # Send headers
                 self.end_headers()
-                return
+                return
+    #Logging
+    #!Turn it on to stop print in console
+    #def log_message(self, format, *args):
+    #    return
+class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
+    """Handle requests in a separate thread."""
+    def finish_request(self, request, client_address):
+        request.settimeout(30)
+        # "super" can not be used because BaseServer is not created from object
+        HTTPServer.finish_request(self, request, client_address)
+#inGlobalDict
+# "JSONConfigurationDict":<JSON>
+class RobotDaemonServer(Thread):
+    def __init__(self,name,inGlobalDict):
+        Thread.__init__(self)
+        self.name = name
+        # Update the global dict
+        ServerSettings.SettingsUpdate(mGlobalDict)
+    def run(self):
+        inServerAddress="";
+        inPort = mGlobalDict["Server"]["ListenPort"];
+        # Server settings
+        # Choose port 8080, for port 80, which is normally used for a http server, you need root access
+        server_address = (inServerAddress, inPort)
+        #httpd = HTTPServer(server_address, testHTTPServer_RequestHandler)
+        # Logging
+        mGlobalDict["Logger"].info(f"Server init. Listen URL: {inServerAddress}, Listen port: {inPort}")
+        # Запуск адреса в браузере
+        os.system("explorer http://127.0.0.1:8081")
+        #httpd.serve_forever()
+        httpd = ThreadedHTTPServer(server_address, testHTTPServer_RequestHandler)
+        #print('Starting server, use <Ctrl-C> to stop')
+        httpd.serve_forever()

Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA/Orchestrator/Web/Index.xhtml

@@ -404,6 +404,22 @@
 						dataType: "text"
 					});
 				}
+				mGlobal.Server= {}
+				mGlobal.Server.JSONGet=function(inMethod, inURL, inDataJSON, inCallback)
+				{
+					$.ajax({
+						type: inMethod,
+						url: inURL,
+						data: JSON.stringify(inDataJSON),
+						success: 
+						function(lData,l2,l3)
+						{
+							var lResponseJSON=JSON.parse(lData)
+							inCallback(lResponseJSON)
+						},
+						dataType: "text"
+					});
+				}
 				
 				/////////////////
 				///Modal
@@ -427,6 +443,9 @@
 					///Установить HTML код
 					$('.ui.modal.basic .content').html(lHTMLCode);
 					$('.ui.modal.basic').modal('show');
+					//DO widest modal for table with scroll x
+					$("div.ui.basic.modal.transition.visible.active.scrolling")[0].style["width"]="1300px"
+					$("div.ui.basic.modal.transition.visible.active.scrolling")[0].style["overflow"]="scroll"
 				}
 				//Service function
 				mGlobal.Modal.TableFilter.FilterUpdate=function(inFilterValue) {
@@ -549,7 +568,7 @@
 						{"Header":"Head 09","Description":"Test 21.02.2019"}
 					]
 				}
-				mGlobal.Modal.ListFilter.Show(lTestData)
+				//	mGlobal.Modal.ListFilter.Show(lTestData)
 			})
 		  ;
 		  </script>

Resources/WPy64-3720/python-3.7.2.amd64/Lib/site-packages/pyOpenRPA/__init__.py

@@ -3,7 +3,7 @@ r"""
 The OpenRPA package (from UnicodeLabs)
 
 """
-__version__ = 'v1.0.34'
+__version__ = 'v1.0.35'
 __all__ = []
 __author__ = 'Ivan Maslov <ivan.maslov@unicodelabs.ru>'
 #from .Core import Robot

Sources/pyOpenRPA/__init__.py

@@ -3,7 +3,7 @@ r"""
 The OpenRPA package (from UnicodeLabs)
 
 """
-__version__ = 'v1.0.34'
+__version__ = 'v1.0.35'
 __all__ = []
 __author__ = 'Ivan Maslov <ivan.maslov@unicodelabs.ru>'
 #from .Core import Robot