Enhanced to deliver version as a string to communicate version as major.minor.patch to web client 0.99+.

Author: Developer

BlocklyPropClient.py

@@ -229,7 +229,7 @@ def handle_connect(self):
             # read entered values and start server
             self.server_process = multiprocessing.Process(
                 target=BlocklyServer.main,
-                args=(int(self.port.get()), self.version, self.q))
+                args=(int(self.port.get()), self.version, self.app_version, self.q))
 
             self.server_process.start()
 

BlocklyServer.py

@@ -21,11 +21,12 @@
 
 class BlocklyServer(object):
 
-    def __init__(self, version, queue):
+    def __init__(self, version, app_version, queue):
         self.logger = logging.getLogger('blockly.server')
         self.logger.info('Creating server logger.')
 
         self.version = version
+        self.app_version = app_version
         self.queue = queue
 
         # Find the path from which application was launched
@@ -47,9 +48,11 @@ def __init__(self, version, queue):
     def index(self):
         cherrypy.response.headers['Access-Control-Allow-Origin'] = '*'
 
+        # version supports pre-0.99 web clients, version_str supports v0.99+ web clients
         serverinfo = {
             "server": "BlocklyPropHTTP",
-            "version": self.version
+            "version": self.version,
+            "version_str": self.app_version
         }
         self.queue.put((1, 'TRACE', 'Server poll received'))
         self.logger.debug('Server poll received')
@@ -125,7 +128,7 @@ def serial_socket(self):
         handler = cherrypy.request.ws_handler
 
 
-def main(port, version, queue):
+def main(port, version, app_version, queue):
     module_logger.info("Server starting")
     queue.put((10, 'INFO', 'Server starting'))
 
@@ -137,7 +140,7 @@ def main(port, version, queue):
 
     queue.put((10, 'INFO', 'Websocket configured'))
 
-    cherrypy.quickstart(BlocklyServer(version, queue), '/', config={'/serial.connect': {
+    cherrypy.quickstart(BlocklyServer(version, app_version, queue), '/', config={'/serial.connect': {
         'tools.websocket.on': True,
         'tools.websocket.handler_cls': SerialSocket
     }})