Support for arbitrary Eclients

sigstop · May 17, 2013 · 8d5e931 · 8d5e931
1 parent 364024f
commit 8d5e931
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/econnect.erl b/src/econnect.erl
@@ -37,17 +37,23 @@ stop(_Servername,IPAddress,Port,Docroot) ->
 handle_message({text, <<"ES_ONLINE">>}) ->
     Pid = self(),
     register(eserver,self()),
-    error_logger:info_msg("EServer Registered as {eserver,~p}~n",[Pid]);
+    error_logger:info_msg("EServer Registered as {eserver,~p}~n",[Pid]),
+    noreply;
 handle_message({close,_Num,_Bin}) ->
     unregister(eserver),
-    error_logger:info_msg("EServer Disconnected and Unregistered~n");
+    error_logger:info_msg("EServer Disconnected and Unregistered~n"),
+    noreply;
+
 handle_message({text,B})->
     <<_H,T/binary>> = B,
     Term = binary_to_term(T),
     error_logger:info_msg("Binary Received:~n~p~n",[B]),
     error_logger:info_msg("Term Received:~n~p~n",[Term]),
     error_logger:info_msg("My Pid = ~p~n",[self()]),
-    spawn(eclient_stub,handle_message,[Term]);
+    spawn(eclient_stub,handle_message,[Term]),
+    noreply;
+
+
 handle_message(A)->
     error_logger:info_msg("Received:~n~p~n",[A]),
     error_logger:info_msg("My Pid = ~p~n",[self()]),

diff --git a/www/eport.yaws b/www/eport.yaws
@@ -2,7 +2,7 @@
 <erl>
 out(A) ->
     CallbackMod = econnect,
-    Opts = [{origin, "http://" ++ (A#arg.headers)#headers.host}],
+    Opts = [{origin, any}],
     {websocket, CallbackMod, Opts}.
 </erl>
 </html>
diff --git a/www/js/e.js b/www/js/e.js
@@ -26,8 +26,8 @@ function createUUID() {
 // connection.send('CONNECT'); // Send the message 'Ping' to the server
 connection.onopen = function () {
     var Value = 1;
-    connection.send(Bert.encode(Bert.tuple(Bert.atom("hello"),Value))); // Notification that th EServer is online
     connection.send('ES_ONLINE');
+    connection.send(Bert.encode(Bert.tuple(Bert.atom("hello"),Value))); // Notification that th EServer is online
 };
 
 var ProcCode; 
@@ -60,6 +60,9 @@ var emsg_handle = function(tuple) {
     case 'erl_form_result':
 	deliverResult(tuple);
 	break;
+    case 'flow_table_data':
+	deliverFlowTable(tuple);
+	break;
     default: 
 	alert("The EClient sent unknown command: " + command)
     }
@@ -297,9 +300,11 @@ connection.onmessage = function(msg) {
     var reader = new FileReader();
     reader.onloadend = function() {
         var string = reader.result;
+	console.log(string);
 	Message = Bert.decode(string);
 	console.log(Message.toString());
 	var tuple = Message.value;
+	console.log(tuple[2].toString());
 	emsg_handle(tuple);
     };
     reader.readAsBinaryString(blob );