Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ea0fff5662 | ||
|
|
70f4d666e3 | ||
|
|
dc76f1b732 | ||
|
|
f374cb7e46 |
@@ -1,6 +1,6 @@
|
|||||||
from os.path import dirname, realpath, join
|
from os.path import dirname, realpath, join
|
||||||
|
|
||||||
from setuptools import setup
|
from setuptools import setup, find_packages
|
||||||
|
|
||||||
here = dirname(realpath(__file__))
|
here = dirname(realpath(__file__))
|
||||||
|
|
||||||
@@ -17,7 +17,7 @@ setup(
|
|||||||
author='Avatao.com Innovative Learning Kft.',
|
author='Avatao.com Innovative Learning Kft.',
|
||||||
author_email='support@avatao.com',
|
author_email='support@avatao.com',
|
||||||
license='custom',
|
license='custom',
|
||||||
packages=['tfw'],
|
packages=find_packages(),
|
||||||
package_dir={'tfw': 'tfw'},
|
package_dir={'tfw': 'tfw'},
|
||||||
install_requires=requirements,
|
install_requires=requirements,
|
||||||
extras_require={
|
extras_require={
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ class TerminadoMiniServer:
|
|||||||
url,
|
url,
|
||||||
TerminadoMiniServer.ResetterTermSocket,
|
TerminadoMiniServer.ResetterTermSocket,
|
||||||
{'term_manager': self._term_manager}
|
{'term_manager': self._term_manager}
|
||||||
)])
|
)], websocket_ping_interval=30)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def term_manager(self):
|
def term_manager(self):
|
||||||
@@ -33,10 +33,6 @@ class TerminadoMiniServer:
|
|||||||
def check_origin(self, origin):
|
def check_origin(self, origin):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def on_close(self):
|
|
||||||
self.term_manager.terminal = None
|
|
||||||
self.term_manager.get_terminal()
|
|
||||||
|
|
||||||
def listen(self):
|
def listen(self):
|
||||||
self.application.listen(self.port)
|
self.application.listen(self.port)
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,8 @@ def deserialize_tfw_msg(*args):
|
|||||||
"""
|
"""
|
||||||
Return message from TFW multipart data
|
Return message from TFW multipart data
|
||||||
"""
|
"""
|
||||||
return _deserialize_all(*args)[1]
|
envelope = _deserialize_all(*args)
|
||||||
|
return _repair_if_needed(envelope)
|
||||||
|
|
||||||
|
|
||||||
def _serialize_all(*args):
|
def _serialize_all(*args):
|
||||||
@@ -84,6 +85,18 @@ def _deserialize_single(data):
|
|||||||
return _decode_if_needed(data)
|
return _decode_if_needed(data)
|
||||||
|
|
||||||
|
|
||||||
|
def _repair_if_needed(envelope):
|
||||||
|
"""
|
||||||
|
Quick fix for broken messages received from separate processes.
|
||||||
|
"""
|
||||||
|
if len(envelope) == 2:
|
||||||
|
return envelope[1]
|
||||||
|
for part in envelope:
|
||||||
|
if isinstance(part, dict):
|
||||||
|
return part
|
||||||
|
return {}
|
||||||
|
|
||||||
|
|
||||||
def _encode_if_needed(value):
|
def _encode_if_needed(value):
|
||||||
"""
|
"""
|
||||||
Return input as bytes
|
Return input as bytes
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ class TFWServer:
|
|||||||
r'/ws', ZMQWebSocketRouter, {
|
r'/ws', ZMQWebSocketRouter, {
|
||||||
'listener': self._listener,
|
'listener': self._listener,
|
||||||
}
|
}
|
||||||
)])
|
)], websocket_ping_interval=30)
|
||||||
|
|
||||||
def listen(self):
|
def listen(self):
|
||||||
self.application.listen(TFWENV.WEB_PORT)
|
self.application.listen(TFWENV.WEB_PORT)
|
||||||
|
|||||||
Reference in New Issue
Block a user