Added serverPush broadcast to all browser clients

drasko · drasko · commit f941d046514d · 2015-02-03T21:56:50.000+01:00
diff --git a/examples/processes/sharedVariablesPython2/www b/examples/processes/sharedVariablesPython2/www
diff --git a/examples/pythonAndJS/serverPush/__init__.py b/examples/pythonAndJS/serverPush/__init__.py
diff --git a/examples/pythonAndJS/serverPush/index.html b/examples/pythonAndJS/serverPush/index.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en">
+    
+  <head >
+    <script data-main="www/libs/weioLibs" src="www/libs/require.js"></script>
+    <title>My first Web app</title>
+  </head>
+
+  <body>
+
+    <p>Hello world!</p>
+
+  <script> 
+
+    function onWeioReady() {
+       console.log("DOM is loaded, websocket is opened");
+       // Send event "colorled" with message 1
+       genericMessage("tst", 22);
+       
+        weioCallbacks["myJsCallback"] = myFunction;
+    }
+      
+    function myFunction(data) {
+            console.log(data);
+    }
+
+  </script>
+  </body>
+</html>
diff --git a/examples/pythonAndJS/serverPush/main.py b/examples/pythonAndJS/serverPush/main.py
@@ -0,0 +1,22 @@
+from weioLib.weio import *
+
+import time
+
+sharedVar[0] = 1
+def setup():
+    attach.process(myProcess)
+    attach.event("tst", myEvent)
+
+def myEvent(dataIn):
+    print "EVENT"
+    print dataIn
+    sharedVar[0] = dataIn
+    
+def myProcess():
+    print("Hello world")
+    while True:
+        if sharedVar[0] is not None:
+           print sharedVar[0]
+        time.sleep(1)
+        data = 55
+        serverPush("myJsCallback", data)
diff --git a/handlers/weioJSPYHandler.py b/handlers/weioJSPYHandler.py
@@ -1,18 +1,18 @@
-### 
+###
 #
 # WEIO Web Of Things Platform
 # Copyright (C) 2013 Nodesign.net, Uros PETREVSKI, Drasko DRASKOVIC
 # All rights reserved
 #
-#               ##      ## ######## ####  #######  
-#               ##  ##  ## ##        ##  ##     ## 
-#               ##  ##  ## ##        ##  ##     ## 
-#               ##  ##  ## ######    ##  ##     ## 
-#               ##  ##  ## ##        ##  ##     ## 
-#               ##  ##  ## ##        ##  ##     ## 
+#               ##      ## ######## ####  #######
+#               ##  ##  ## ##        ##  ##     ##
+#               ##  ##  ## ##        ##  ##     ##
+#               ##  ##  ## ######    ##  ##     ##
+#               ##  ##  ## ##        ##  ##     ##
+#               ##  ##  ## ##        ##  ##     ##
 #                ###  ###  ######## ####  #######
 #
-#                    Web Of Things Platform 
+#                    Web Of Things Platform
 #
 # This file is part of WEIO and is published under BSD license.
 #
@@ -41,7 +41,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# Authors : 
+# Authors :
 # Uros PETREVSKI <uros@nodesign.net>
 # Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 #
@@ -70,6 +70,7 @@ def on_open(self, request):
         # Add the connection to the connections dictionary
         connUuid = uuid.uuid4()
         weioRunnerGlobals.weioConnections[connUuid] = self
+        weioRunnerGlobals.weioConnUuids.append(connUuid)
 
         # collect client ip address and user machine info
         # print self.request to see all available info on user connection
@@ -129,8 +130,8 @@ def serve(self, data) :
                         elif key == "callback":
                             msg.callbackJS = data["callback"]
 
-            # Send message to launcher process
-            weioRunnerGlobals.QOUT.put(msg)
+                # Send message to launcher process
+                weioRunnerGlobals.QOUT.put(msg)
 
 
     def on_close(self):
@@ -141,11 +142,12 @@ def on_close(self):
         for connUuid, conn in weioRunnerGlobals.weioConnections.iteritems():
             if (conn == self):
                 weioRunnerGlobals.weioConnections.pop(connUuid)
+                weioRunnerGlobals.weioConnUuids.remove(connUuid)
 
 
 ###
 # This is used for remote apps - Tornado User opens __client__ socket
-# and puths everything that comes from this socket to WeioHandlerRemote() 
+# and puths everything that comes from this socket to WeioHandlerRemote()
 ###
 class WeioHandlerRemote():
     def __init__(self):
@@ -179,13 +181,12 @@ def serve(self, data) :
                 elif key == "callback":
                     msg.callbackJS = data["callback"]
 
-        # Send message to launcher process
-        weioRunnerGlobals.QOUT.put(msg)
+            # Send message to launcher process
+            weioRunnerGlobals.QOUT.put(msg)
 
     def on_close(self):
         self.remoteConn = None
 
         # Remove client from the clients list and broadcast leave message
         weioRunnerGlobals.weioConnections.pop(self.connUuid)
         self.connUuid = None
-
diff --git a/weioLib/weioRunnerGlobals.py b/weioLib/weioRunnerGlobals.py
@@ -1,18 +1,18 @@
-### 
+###
 #
 # WEIO Web Of Things Platform
 # Copyright (C) 2013 Nodesign.net, Uros PETREVSKI, Drasko DRASKOVIC
 # All rights reserved
 #
-#               ##      ## ######## ####  #######  
-#               ##  ##  ## ##        ##  ##     ## 
-#               ##  ##  ## ##        ##  ##     ## 
-#               ##  ##  ## ######    ##  ##     ## 
-#               ##  ##  ## ##        ##  ##     ## 
-#               ##  ##  ## ##        ##  ##     ## 
+#               ##      ## ######## ####  #######
+#               ##  ##  ## ##        ##  ##     ##
+#               ##  ##  ## ##        ##  ##     ##
+#               ##  ##  ## ######    ##  ##     ##
+#               ##  ##  ## ##        ##  ##     ##
+#               ##  ##  ## ##        ##  ##     ##
 #                ###  ###  ######## ####  #######
 #
-#                    Web Of Things Platform 
+#                    Web Of Things Platform
 #
 # This file is part of WEIO and is published under BSD license.
 #
@@ -41,7 +41,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# Authors : 
+# Authors :
 # Uros PETREVSKI <uros@nodesign.net>
 # Drasko DRASKOVIC <drasko.draskovic@gmail.com>
 #
@@ -50,17 +50,18 @@
 import multiprocessing
 import ctypes
 
-
 # Pins declared by the user program
 DECLARED_PINS = None
 
 # If serial connection is opened for coprocessor
 WEIO_SERIAL_LINKED = False
 
 # Connected clients
-weioConnectionSet = set()
 weioConnections = {}
 
+# Initialize with multiprocessing.Manager().list in weioRunner
+weioConnUuids = None
+
 # Running flag
 running = multiprocessing.Value(ctypes.c_bool, False)
 
diff --git a/weioLib/weioUserApi.py b/weioLib/weioUserApi.py
@@ -145,6 +145,34 @@ def __init__(self, info, connection):
         self.info = info
         self.connection = connection
 
+class WeioServerMsg():
+    def __init__(self, qout, msg):
+        # Create userAgentMessage and send it to the launcher process
+        self.qout = qout
+        self.msg = msg
+
+    def send(self, callback, data, connUuid):
+        self.msg.connUuid = connUuid
+        self.msg.req = "serverPush"
+        self.msg.res = data
+        self.msg.callbackJS = callback
+
+        # Send message to launcher process
+        self.qout.put(self.msg)
+
+    def broadcast(self, callback, data):
+        self.msg.connUuid = "all"
+        self.msg.req = "serverPush"
+        self.msg.res = data
+        self.msg.callbackJS = callback
+
+        # Send message to launcher process
+        self.qout.put(self.msg)
+
+def serverPush(callback, data):
+    weioServerMsg.broadcast(callback, data)
+
+
 ###
 # Global instances
 ###
@@ -154,5 +182,11 @@ def __init__(self, info, connection):
 # Global shared dict
 sharedVar = None
 
+# Global connections
+weioConns = None
+
 # Global WeIO gpio object
 gpio = None
+
+# serverPush variable
+weioServerMsg = None
diff --git a/weioRunner.py b/weioRunner.py
@@ -277,9 +277,7 @@ def launcher(self):
         while (True):
             # Get the command from userTornado (blocking)
             msg = self.qIn.get()
-
             #print "*** GOT THE COMMAND: ", msg.req
-
             # Execute the command
             msg.res = None
             if msg.req in weioParser.weioSpells or msg.req in weioParser.weioUserSpells:
@@ -315,17 +313,25 @@ def listenerThread():
         #print "GOT MSG: ", msg
         if (msg.res is not None):
             #print "MESSAGE", msg.req, msg.res, msg.data, msg.connUuid
-            if (msg.connUuid in weioRunnerGlobals.weioConnections):
+            if (msg.connUuid in weioRunnerGlobals.weioConnections or msg.connUuid == "all"):
                 result = {}
 
                 if (msg.callbackJS is not None):
                     result["serverPush"] = msg.callbackJS
                     result["data"] = msg.res
                     #print "RESULT",result
                     if (weioRunnerGlobals.remoteConnected.value == True):
-                        weioRunnerGlobals.weioConnections[msg.connUuid].write_message(json.dumps(result))
+                        if (msg.connUuid == "all"):
+                            for connUuid, conn in weioRunnerGlobals.weioConnections.iteritems():
+                                weioRunnerGlobals.weioConnections[connUuid].send(json.dumps(result))
+                        else:
+                            weioRunnerGlobals.weioConnections[msg.connUuid].write_message(json.dumps(result))
                     else:
-                        weioRunnerGlobals.weioConnections[msg.connUuid].send(json.dumps(result))
+                        if (msg.connUuid == "all"):
+                            for connUuid, conn in weioRunnerGlobals.weioConnections.iteritems():
+                                weioRunnerGlobals.weioConnections[connUuid].send(json.dumps(result))
+                        else:
+                            weioRunnerGlobals.weioConnections[msg.connUuid].send(json.dumps(result))
 
 class WeioRemote():
     conn = None
@@ -391,6 +397,13 @@ def close(self):
     manager = multiprocessing.Manager()
     weioUserApi.sharedVar = manager.dict()
 
+    # weioMsg
+    weioUserApi.weioServerMsg = weioUserApi.WeioServerMsg(weioRunnerGlobals.QIN, weioRunnerGlobals.userAgentMessage())
+
+    # weioConnUuids
+    weioRunnerGlobals.weioConnUuids = manager.list()
+    weioUserApi.weioConns = weioRunnerGlobals.weioConnUuids
+
     confFile = weioConfig.getConfiguration()
     # set python working directory
     #os.chdir("userFiles/"+sys.argv[1])
