improve multiprocessing, wait for complete and handle remtoe moregraceful

config/settings/espeak.settings.conf

@@ -195,7 +195,7 @@ driver=unixDriver
 # tcp port
 port=22447
 # socket filepath
-socketpath=/tmp/
+socketFile=
 # allow settings to overwrite
 enableSettingsRemote=True
 # allow commands to be executed

config/settings/settings-daemon.conf

@@ -205,7 +205,7 @@ driver=unixDriver
 # tcp port
 port=22447
 # socket filepath
-socketpath=/tmp/
+socketFile=
 # allow settings to overwrite
 enableSettingsRemote=True
 # allow commands to be executed

config/settings/settings-pty.conf

@@ -205,7 +205,7 @@ driver=unixDriver
 # tcp port
 port=22447
 # socket filepath
-socketpath=/tmp/
+socketFile=
 # allow settings to overwrite
 enableSettingsRemote=True
 # allow commands to be executed

config/settings/settings.conf

@@ -206,7 +206,7 @@ driver=unixDriver
 # tcp port
 port=22447
 # socket filepath
-socketpath=/tmp/
+socketFile=
 # allow settings to overwrite
 enableSettingsRemote=True
 # allow commands to be executed

config/settings/settings.conf.example

@@ -206,7 +206,7 @@ driver=unixDriver
 # tcp port
 port=22447
 # socket filepath
-socketpath=/tmp/
+socketFile=
 # allow settings to overwrite
 enableSettingsRemote=True
 # allow commands to be executed

config/settings/settings.conf.storm

@@ -151,7 +151,7 @@ driver=unixDriver
 # tcp port
 port=22447
 # socket filepath
-socketpath=/tmp/
+socketFile=
 # allow settings to overwrite
 enableSettingsRemote=True
 # allow commands to be executed

config/settings/speech-dispatcher.settings.conf

@@ -205,7 +205,7 @@ driver=unixDriver
 # tcp port
 port=22447
 # socket filepath
-socketpath=/tmp/
+socketFile=
 # allow settings to overwrite
 enableSettingsRemote=True
 # allow commands to be executed

src/fenrirscreenreader/core/processManager.py

@@ -23,15 +23,15 @@ class processManager():
         
     def terminateAllProcesses(self):
         for proc in self._Processes:
-            try:
+            #try:
-                proc.terminate()
+            #    proc.terminate()
-            except KeyboardInterrupt:
+            #except KeyboardInterrupt:
-                pass           
+            #    pass
-            except:
+            #except:
-                pass
+            #    pass
-            proc.join()                
+            proc.join()
         for t in self._Threads:
-            t.join()         
+            t.join()
     def heartBeatTimer(self, active):
         try:
             time.sleep(0.5)

src/fenrirscreenreader/core/settingsData.py

@@ -84,7 +84,7 @@ settingsData = {
   'enabled': True,
   'driver': 'unixDriver',
   'port': 22447,
-  'socketpath':'/tmp/',
+  'socketFile':'',
   'enableSettingsRemote': True,
   'enableCommandRemote': True,
 },

src/fenrirscreenreader/remoteDriver/tcpDriver.py

@@ -18,30 +18,36 @@ class driver(remoteDriver):
         self.env['runtime']['processManager'].addCustomEventThread(self.watchDog, multiprocess=True)
     def watchDog(self, active, eventQueue):
         # echo "command say this is a test" | nc localhost 22447
-        self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.fenrirSock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+        self.fenrirSock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         self.host = '127.0.0.1'
         self.port = self.env['runtime']['settingsManager'].getSettingAsInt('remote', 'port')
-        self.sock.bind((self.host, self.port))
+        self.fenrirSock.bind((self.host, self.port))
-        self.sock.listen(1)
+        self.fenrirSock.listen(1)
         while active.value == 1:
-            client_sock, client_addr = self.sock.accept()
+            try:
-            if client_sock:
+                r, _, _ = select.select([self.fenrirSock], [], [], 0.8)
-                # Check if the client is still connected and if data is available:
+            except select.error:
-                try:
+                break
-                    r, w, e = select.select([client_sock,], [], [])
+            if r == []:
-                except select.error:
+                continue
-                    return
+            if self.fenrirSock in r:
-                if len(r) > 0:
+                client_sock, client_addr = self.fenrirSock.accept()
-                    rawdata = client_sock.recv(8129)
+            try:
-                    try:
+                rawdata = client_sock.recv(8129)
-                        data = rawdata.decode("utf-8").rstrip().lstrip()
+            except:
-                        eventQueue.put({"Type":fenrirEventType.RemoteIncomming,
+                pass
-                            "Data": data
+            try:
-                        })
+                data = rawdata.decode("utf-8").rstrip().lstrip()
-                    except:
+                eventQueue.put({"Type":fenrirEventType.RemoteIncomming,
-                        pass
+                    "Data": data
+                })
+            except:
+                pass
+            try:
                 client_sock.close()
-        if self.sock:
+            except:
-            self.sock.close()
+                pass
-            self.sock = None
+        if self.fenrirSock:
+            self.fenrirSock.close()
+            self.fenrirSock = None

src/fenrirscreenreader/remoteDriver/unixDriver.py

@@ -19,39 +19,49 @@ class driver(remoteDriver):
         self.env['runtime']['processManager'].addCustomEventThread(self.watchDog, multiprocess=True)
     def watchDog(self, active, eventQueue):
         # echo "command say this is a test" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
-
+        socketFile = ''
-        if self.env['runtime']['settingsManager'].getSetting('screen', 'driver') =='vcsaDriver':
+        try:
-            socketpath = self.env['runtime']['settingsManager'].getSettingAsInt('remote', 'socketpath') + 'fenrirscreenreader-deamon.sock'
+            socketFile = self.env['runtime']['settingsManager'].getSetting('remote', 'socketFile')
-        else:
+        except:
-            socketpath = self.env['runtime']['settingsManager'].getSettingAsInt('remote', 'socketpath') + 'fenrirscreenreader-' + str(os.getpid()) + '.sock'
+            pass
-        if os.path.exists(socketpath):
+        if socketFile == '':
-            os.remove(socketpath)
+            if self.env['runtime']['settingsManager'].getSetting('screen', 'driver') =='vcsaDriver':
-        self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+                socketFile =  '/tmp/fenrirscreenreader-deamon.sock'
-        self.sock.bind(socketpath)
+            else:
-        self.sock.listen(1)
+                socketFile = '/tmp/fenrirscreenreader-' + str(os.getppid()) + '.sock'
-        if self.env['runtime']['settingsManager'].getSetting('screen', 'driver') =='vcsaDriver':
+        if os.path.exists(socketFile):
-            os.chmod(socketpath, 0o222)
+            os.unlink(socketFile)
-        while active.value == 1:
+        self.fenrirSock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-            client_sock, client_addr = self.sock.accept()
+        self.fenrirSock.bind(socketFile)
-            if client_sock:
+        os.chmod(socketFile, 0o222)
-                # Check if the client is still connected and if data is available:
+        self.fenrirSock.listen(1)
-                try:
+        while active.value:
-                    r, w, e = select.select([client_sock,], [], [])
+            # Check if the client is still connected and if data is available:
-                except select.error:
+            try:
-                    return
+                r, _, _ = select.select([self.fenrirSock], [], [], 0.8)
-                if len(r) > 0:
+            except select.error:
-                    rawdata = client_sock.recv(8129)
+                break
-                    try:
+            if r == []:
-                        data = rawdata.decode("utf-8").rstrip().lstrip()
+                continue
-                        eventQueue.put({"Type":fenrirEventType.RemoteIncomming,
+            if self.fenrirSock in r:
-                            "Data": data
+                client_sock, client_addr = self.fenrirSock.accept()
-                        })
+            try:
-                    except:
+                rawdata = client_sock.recv(8129)
-                        pass
+            except:
+                pass
+            try:
+                data = rawdata.decode("utf-8").rstrip().lstrip()
+                eventQueue.put({"Type":fenrirEventType.RemoteIncomming,
+                    "Data": data
+                })
+            except:
+                pass
+            try:
                 client_sock.close()
-
+            except:
-        if os.path.exists(socketpath):
+                pass
-            os.remove(socketpath)
+        if self.fenrirSock:
-        if self.sock:
+            self.fenrirSock.close()
-            self.sock.close()
+            self.fenrirSock = None
-            self.sock = None
+        if os.path.exists(socketFile):
+            os.unlink(socketFile)

src/fenrirscreenreader/screenDriver/ptyDriver.py

@@ -179,13 +179,13 @@ class driver(screenDriver):
                     try:
                         msgBytes = self.readAll(sys.stdin.fileno(), len=4096)
                     except (EOFError, OSError):
-                        active.value = False
+                        eventQueue.put({"Type":fenrirEventType.StopMainLoop,"Data":None}) 
                         break
                     if self.shortcutType == 'KEY':
                         try:
                             self.injectTextToScreen(msgBytes)
                         except:
-                            active.value = False
+                            eventQueue.put({"Type":fenrirEventType.StopMainLoop,"Data":None}) 
                             break
                     else:
                         eventQueue.put({"Type":fenrirEventType.ByteInput,
@@ -195,7 +195,7 @@ class driver(screenDriver):
                     try:
                         msgBytes = self.readAll(self.p_out.fileno(), interruptFd=sys.stdin.fileno())
                     except (EOFError, OSError):
-                        active.value = False
+                        eventQueue.put({"Type":fenrirEventType.StopMainLoop,"Data":None}) 
                         break
                     # feed and send event bevore write, the pyte already has the right state
                     # so fenrir already can progress bevore os.write what should give some better reaction time
@@ -206,7 +206,7 @@ class driver(screenDriver):
                     self.injectTextToScreen(msgBytes, screen=sys.stdout.fileno())
         except Exception as e:  # Process died?
             print(e)
-            active.value = False
+            eventQueue.put({"Type":fenrirEventType.StopMainLoop,"Data":None}) 
         finally:
             os.kill(self.p_pid, signal.SIGTERM)
             self.p_out.close()