WebSockets!

author: Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> 2013-11-16 00:44:33 (GMT)
committer: Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> 2013-11-16 00:44:33 (GMT)
commit: 69d34f5598974dddeab14e0fe9169108362622ec (patch)
tree: 17fbdbfc28dd11bc8852b697a262d63b9c76df38 /apps
parent: f33e8148fc6e214886a8b24fc9d743ee25da7d61 (diff)
download: uscxml-69d34f5598974dddeab14e0fe9169108362622ec.zip
uscxml-69d34f5598974dddeab14e0fe9169108362622ec.tar.gz
uscxml-69d34f5598974dddeab14e0fe9169108362622ec.tar.bz2
3 files changed, 105 insertions, 80 deletions
diff --git a/apps/samples/websockets/websockets.html b/apps/samples/websockets/websockets.html
index 9a21f46..c90f728 100644
--- a/apps/samples/websockets/websockets.html
+++ b/apps/samples/websockets/websockets.html
@@ -1,77 +1,79 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+  <head>
+    <meta charset="utf-8">
+    <title>
+      WebSocket Test
+    </title>
+    <script language="javascript" type="text/javascript">
+    var wsUri = "ws://localhost:8082/websockets";
+//    var wsUri = "ws://echo.websocket.org";
 
-		<style type="text/css">
-		</style>
+    var output;
 
-		<script type="text/javascript">
-		</script>
+    var littlePacket = "0123456789ABCDEF";
+    var mediumPacket = "";
+    var hugePacket   = "";
+    for (var i = 0; i < 16; i++) {
+      mediumPacket += littlePacket;
+    }
+    for (var i = 0; i < 16; i++) {
+      hugePacket += mediumPacket;
+    }
 
-		<script src="http://ajax.googleapis.com/ajax/libs/dojo/1.9.1/dojo/dojo.js"></script>
-    
-    <script type="text/javascript">
-			require([
-				"dojo/domReady!",
-				"dojox/socket",
-      ], function(
-				dom,
-				Socket
-			) {
-				var socket = new Socket("ws://localhost:8080/websockets");
-
-				function send(data){
-					return socket.send(json.stringify(data));
-				}
-
-				socket.on("connect", function(){
-					// send a handshake
-					send([
-						{
-							"channel": "/meta/handshake",
-							"version": "1.0",
-							"minimumVersion": "1.0beta",
-							"supportedConnectionTypes": ["long-polling"] // or ["callback-polling"] for x-domain
-						}
-					])
-					socket.on("message", function(data){
-						// wait for the response so we can connect with the provided client id
-						data = json.parse(data);
-						if(data.error){
-							throw new Error(error);
-						}
-						// get the client id for all future messages
-						clientId = data.clientId;
-						// send a connect message
-						send([
-							{
-								"channel": "/meta/connect",
-								"clientId": clientId,
-								"connectionType": "long-polling"
-							},
-							{ // also send a subscription message
-								"channel": "/meta/subscribe",
-								"clientId": clientId,
-								"subscription": "/foo/**"
-							}
-						]);
-						socket.on("message", function(data){
-							console.log(data);
-						});
-					});
-				});
-			});		  
-		</script>
-	</head>
-	<body class="tundra">
-		<table>
-			<tr>
-				<td>
-					<div id="websockets"></div>
-				</td>
-				<td>
-			</tr>
-		</table>
-	</body>
+    function init() {
+      output = document.getElementById("output");
+      testWebSocket();
+    }
+    function testWebSocket() {
+      websocket = new WebSocket(wsUri);
+      websocket.onopen = function(evt) {
+        onOpen(evt)
+      };
+      websocket.onclose = function(evt) {
+        onClose(evt)
+      };
+      websocket.onmessage = function(evt) {
+        onMessage(evt)
+      };
+      websocket.onerror = function(evt) {
+        onError(evt)
+      };
+    }
+    function onOpen(evt) {
+      writeToScreen("CONNECTED");
+      doSend(littlePacket);
+      // doSend(mediumPacket);
+      // doSend(hugePacket);
+    }
+    function onClose(evt) {
+      writeToScreen("DISCONNECTED");
+    }
+    function onMessage(evt) {
+      var value = evt.data.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+      writeToScreen('<span style="color: blue;">RESPONSE: <pre>' + value + '</pre><\/span>');
+//      websocket.close();
+    }
+    function onError(evt) {
+      writeToScreen('<span style="color: red;">ERROR:<\/span> ' + evt.data);
+    }
+    function doSend(message) {
+      writeToScreen("SENT: " + message);
+      websocket.send(message);
+    }
+    function writeToScreen(message) {
+      var pre = document.createElement("p");
+      pre.style.wordWrap = "break-word";
+      pre.innerHTML = message;
+      output.appendChild(pre);
+    }
+    window.addEventListener("load", init, false);
+    </script>
+  </head>
+  <body>
+    <h2>
+      WebSocket Test
+    </h2>
+    <div id="output"></div>
+  </body>
 </html>
diff --git a/apps/samples/websockets/websockets.scxml b/apps/samples/websockets/websockets.scxml
index 0050091..25fdb7a 100644
--- a/apps/samples/websockets/websockets.scxml
+++ b/apps/samples/websockets/websockets.scxml
@@ -1,16 +1,39 @@
 <scxml datamodel="ecmascript" name="websockets">
 	<script src="http://uscxml.tk.informatik.tu-darmstadt.de/scripts/dump.js" />
+  <datamodel>
+    <data id="test">
+      {
+        foo1: "bar1",
+        foo2: "bar2",
+        foo3: "bar3",        
+      }
+    </data>
+  </datamodel>
 	<state id="main">
-		<transition target="main" event="http.get" cond="_event.data.header['Upgrade'] === 'websocket'">
-			<respond status="101">
-				
-			</respond>
-		</transition>
-
-		<transition target="main" event="*">
+		<transition target="main" event="ws.*">
 			<script>
 				dump(_event);
 			</script>
+			<if cond="_event.data.type === 'text'">
+			  <send targetexpr="_event.origin" type="websocket">
+          <content expr="_event.data.content" />
+			  </send>
+			  <send targetexpr="_event.origin" type="websocket">
+          <content expr="test" />
+			  </send>
+			  <send targetexpr="_event.origin" type="websocket">
+          <content expr="document.evaluate('//scxml').asNodeSet()[0]" />
+			  </send>
+			  <send target="/websockets" type="websocket">
+          <content expr="_event.data.content" />
+			  </send>
+			  <send target="/websockets" type="websocket">
+          <content expr="test" />
+			  </send>
+			  <send target="/websockets" type="websocket">
+          <content expr="document.evaluate('//scxml').asNodeSet()[0]" />
+			  </send>
+			</if>
 		</transition>
 	</state>
 </scxml>
 \ No newline at end of file
diff --git a/apps/uscxml-browser.cpp b/apps/uscxml-browser.cpp
index 8708e09..4188132 100644
--- a/apps/uscxml-browser.cpp
+++ b/apps/uscxml-browser.cpp
@@ -140,7 +140,7 @@ int main(int argc, char** argv) {
 		sslConf->port = options.httpsPort;
 
 	}
-	HTTPServer::getInstance(options.httpPort, sslConf);
+	HTTPServer::getInstance(options.httpPort, options.wsPort, sslConf);
 
 	// instantiate and configure interpreters
 	std::list<Interpreter> interpreters;
author	Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de>	2013-11-16 00:44:33 (GMT)
committer	Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de>	2013-11-16 00:44:33 (GMT)
commit	69d34f5598974dddeab14e0fe9169108362622ec (patch)
tree	17fbdbfc28dd11bc8852b697a262d63b9c76df38 /apps
parent	f33e8148fc6e214886a8b24fc9d743ee25da7d61 (diff)
download	uscxml-69d34f5598974dddeab14e0fe9169108362622ec.zip uscxml-69d34f5598974dddeab14e0fe9169108362622ec.tar.gz uscxml-69d34f5598974dddeab14e0fe9169108362622ec.tar.bz2