Merge branch 'dev' into 'test'

Dev

See merge request !31

TES/setup.py

-"""A setuptools based setup module.
-
-See:
-https://packaging.python.org/en/latest/distributing.html
-https://github.com/pypa/sampleproject
-"""
-
-# Always prefer setuptools over distutils
-from setuptools import setup, find_packages
-# To use a consistent encoding
-from codecs import open
-from os import path
-
-here = path.abspath(path.dirname(__file__))
-
-long_description = 'Tunnel and Execution service'
-
-setup(
-    name='strudelv2_tes',
-
-    version='0.0.1',
-
-    description=long_description,
-    long_description=long_description,
-
-    # The project's main homepage.
-    url='backend',
-
-    # Author details
-    author='Chris Hines',
-    author_email='help@massive.org.au',
-
-    # Choose your license
-    license='MIT',
-
-    # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
-    classifiers=[
-        # How mature is this project? Common values are
-        #   3 - Alpha
-        #   4 - Beta
-        #   5 - Production/Stable
-        'Development Status :: 3 - Alpha',
-
-        # Indicate who your project is intended for
-        'Intended Audience :: Office workers',
-        'Topic :: Software Development :: Build Tools',
-
-        # Pick your license as you wish (should match "license" above)
-        'License :: OSI Approved :: MIT License',
-
-        # Specify the Python versions you support here. In particular, ensure
-        # that you indicate whether you support Python 2, Python 3 or both.
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-    ],
-
-    # What does your project relate to?
-    keywords='',
-
-    # You can just specify the packages manually here if your project is
-    # simple. Or you can use find_packages().
-    packages=find_packages(exclude=['contrib', 'docs', 'tests']),
-
-    # Alternatively, if you want to distribute just a my_module.py, uncomment
-    # this:
-    #   py_modules=["my_module"],
-
-    # List run-time dependencies here.  These will be installed by pip when
-    # your project is installed. For an analysis of "install_requires" vs pip's
-    # requirements files see:
-    # https://packaging.python.org/en/latest/requirements.html
-    install_requires=[
-            'sqlalchemy',
-            'pyyaml',
-            'flask_restful',
-            'flask_cors',
-            'requests'
-            ],
-
-
-    data_files = [('',[])],
-
-    # To provide executable scripts, use entry points in preference to the
-    # "scripts" keyword. Entry points provide cross-platform support and allow
-    # pip to create the appropriate form of executable for the target platform.
-    entry_points={
-        'console_scripts': [ 'wsgi_app=tes:tes_wsgi', 'vnclaunch=vnclaunch.__main__:main','runserver=runserver.__main__:main'],
-        'gui_scripts': [  ]
-    },
-)

TES/vncviewer.py

-def vncclient(passwd,host,port):
-    import subprocess
-    p = subprocess.Popen(['/usr/bin/vncviewer','-autopass','{host}::{port}'.format(host=host,port=port)],stdin=subprocess.PIPE,stdout=None,stderr=None)
-    p.stdin.write(passwd.encode('utf-8'))
-    #(stdout,stderr) = p.communicate(passwd.encode('utf-8'))
-
-
-def main():
-    import argparse
-    parser = argparse.ArgumentParser()
-    parser.add_argument('--password', default=[""], nargs=1, help="password for the vncserver")
-    parser.add_argument('--host', default = [""], nargs = 1, help="host")
-    parser.add_argument('--port',default=["5901"], nargs=1)
-    args = parser.parse_args()
-    vncclient(args.password[0],args.host[0],args.port[0])
-
-if __name__ == "__main__":
-    main()

TWS/setup.py

-"""A setuptools based setup module.
-
-See:
-https://packaging.python.org/en/latest/distributing.html
-https://github.com/pypa/sampleproject
-"""
-
-# Always prefer setuptools over distutils
-from setuptools import setup, find_packages
-# To use a consistent encoding
-from codecs import open
-from os import path
-
-here = path.abspath(path.dirname(__file__))
-
-long_description = 'Transparent WebSocket Proxy'
-
-setup(
-    name='strudelv2_tws',
-
-    version='0.0.1',
-
-    description=long_description,
-    long_description=long_description,
-
-    # The project's main homepage.
-    url='backend',
-
-    # Author details
-    author='Chris Hines',
-    author_email='help@massive.org.au',
-
-    # Choose your license
-    license='MIT',
-
-    # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
-    classifiers=[
-        # How mature is this project? Common values are
-        #   3 - Alpha
-        #   4 - Beta
-        #   5 - Production/Stable
-        'Development Status :: 3 - Alpha',
-
-        # Indicate who your project is intended for
-        'Intended Audience :: Office workers',
-        'Topic :: Software Development :: Build Tools',
-
-        # Pick your license as you wish (should match "license" above)
-        'License :: OSI Approved :: MIT License',
-
-        # Specify the Python versions you support here. In particular, ensure
-        # that you indicate whether you support Python 2, Python 3 or both.
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-    ],
-
-    # What does your project relate to?
-    keywords='',
-
-    # You can just specify the packages manually here if your project is
-    # simple. Or you can use find_packages().
-    packages=find_packages(exclude=['contrib', 'docs', 'tests']),
-
-    # Alternatively, if you want to distribute just a my_module.py, uncomment
-    # this:
-    #   py_modules=["my_module"],
-
-    # List run-time dependencies here.  These will be installed by pip when
-    # your project is installed. For an analysis of "install_requires" vs pip's
-    # requirements files see:
-    # https://packaging.python.org/en/latest/requirements.html
-    install_requires=[
-            ],
-
-
-    data_files = [('',[])],
-
-    # To provide executable scripts, use entry points in preference to the
-    # "scripts" keyword. Entry points provide cross-platform support and allow
-    # pip to create the appropriate form of executable for the target platform.
-    entry_points={
-        'console_scripts': [ 'twsproxy=twsproxy:main'],
-        'gui_scripts': [  ]
-    },
-)

twsproxy/__init__.py

@@ -6,7 +6,7 @@ TES =  'http://localhost:8080/'
 failthresh = 10
 class TWSProxy(threading.Thread):
 
-    TIMEOUT = 10
+    TIMEOUT = 900
     AUTHTIMEOUT = 60
     MAXBUFF = 8192
     MAXHEADERS = 8192