From fb0a659c9ca3479fd6799325498b11f074689936 Mon Sep 17 00:00:00 2001 From: John Mayhew Date: Mon, 2 Apr 2012 14:57:31 -0700 Subject: -Namespaced all RDGE javascript. -Removed the following unused files from the build script /core/script/fx/blur.js /core/script/fx/ssao.js /core/script/animation.js - Fully removed the following from the build and from source control as they are unused or no longer needed /core/script/util/dbgpanel.js /core/script/util/fpsTracker.js /core/script/util/statTracker.js /core/script/input.js /core/script/TextureManager.js /core/script/ubershader.js --- js/helper-classes/RDGE/src/core/script/sockets.js | 243 +++++++++++----------- 1 file changed, 117 insertions(+), 126 deletions(-) (limited to 'js/helper-classes/RDGE/src/core/script/sockets.js') diff --git a/js/helper-classes/RDGE/src/core/script/sockets.js b/js/helper-classes/RDGE/src/core/script/sockets.js index 28c43387..0a4e9364 100755 --- a/js/helper-classes/RDGE/src/core/script/sockets.js +++ b/js/helper-classes/RDGE/src/core/script/sockets.js @@ -4,78 +4,81 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. */ +// RDGE namespaces +var RDGE = RDGE || {}; + /* * Simple socket connection discovery and management */ -g_connectionManager = null; +RDGE.CreateSocket = function (url, listenList, connectedList, messageHandler, socketID, openHandler, closeHandler) { + var ws = new WebSocket(url); -function CreateSocket(url, listenList, connectedList, messageHandler, socketID, openHandler, closeHandler) -{ - var ws = new WebSocket(url); + ws.listenIndex = socketID; - ws.listenIndex = socketID; + ws.onmessage = messageHandler; - ws.onmessage = messageHandler; + ws.connectedList = connectedList; + ws.listenList = listenList; - ws.connectedList = connectedList; - ws.listenList = listenList; + // make up a flag + ws.rdge_isConnected = false; + ws.rdge_tryDisconnect = false; - // make up a flag - ws.rdge_isConnected = false; - ws.rdge_tryDisconnect = false; - - if (openHandler) - { - ws.addEventListener("open", openHandler); - } - if (closeHandler) - { - ws.addEventListener("close", closeHandler); - ws.addEventListener("error", closeHandler); - } - - ws.onopen = function(evt) - { - var websocket = evt.srcElement; - document.getElementById("socketConnection").innerHTML += "connected: " + websocket.URL +"
"; - - websocket.rdge_isConnected = true; - - websocket.connectedList.push(ws); - - // save the connected array index of this item - ws.connectedIndex = websocket.connectedList.length - 1; - } - - ws.onerror = function(event) - { - window.console.log("error: " + event); - } - - ws.onclose = function(evt) - { - var websocket = evt.srcElement; - - websocket.rdge_isConnected = false; - - // send disconnect message - websocket.send("type=srv\nmsg=2\n"); - - // remove from connected sockets - websocket.connectedList[websocket.connectedIndex, 1]; - - // re-open port for listening - //websocket.listenList[websocket.listenIndex] = new WebSocket(websocket.URL.toString()); - - //document.getElementById("socketConnection").innerHTML += "disconnected: " + websocket.URL +"
"; - } - - return ws; -} + if (openHandler) { + ws.addEventListener("open", openHandler); + } + if (closeHandler) { + ws.addEventListener("close", closeHandler); + ws.addEventListener("error", closeHandler); + } + + ws.onopen = function (evt) { + var websocket = evt.srcElement; + document.getElementById("socketConnection").innerHTML += "connected: " + websocket.URL + "
"; + + websocket.rdge_isConnected = true; + + websocket.connectedList.push(ws); + + // save the connected array index of this item + ws.connectedIndex = websocket.connectedList.length - 1; + }; + + ws.onerror = function (event) { + window.console.log("error: " + event); + } + + ws.onclose = function (evt) { + var websocket = evt.srcElement; + + websocket.rdge_isConnected = false; + + // send disconnect message + websocket.send("type=srv\nmsg=2\n"); + + // remove from connected sockets + websocket.connectedList[websocket.connectedIndex, 1]; + + // re-open port for listening + //websocket.listenList[websocket.listenIndex] = new WebSocket(websocket.URL.toString()); + + //document.getElementById("socketConnection").innerHTML += "disconnected: " + websocket.URL +"
"; + }; + + return ws; +}; // The DCHP range on Whitney 10.0.0.1 - 10.0.0.254 +// add the connection Pool's to this list for auto polling +RDGE.ConnPoll = function() { + var len = RDGE.globals.poolList.length; + for (var i = 0; i < len; ++i) { + RDGE.globals.poolList[i].Poll(); + } +}; + /* * manages a connection * @param base: base url minus the last octet (ie "ws://192.168.1.") @@ -83,7 +86,7 @@ function CreateSocket(url, listenList, connectedList, messageHandler, socketID, * @param endAddr: the last octect of the end address range (ie 10.0.0.x where x is the value passed in for endAddr) * @param messageHandlerFunc: handle to onMessage function */ -function ConnectionPool(base, startAddr, endAddr, messageHandlerFunc) +RDGE.ConnectionPool = funciton(base, startAddr, endAddr, messageHandlerFunc) { this.start = startAddr; this.end = endAddr; @@ -98,69 +101,57 @@ function ConnectionPool(base, startAddr, endAddr, messageHandlerFunc) this.interval = null; - this.Init = function(openHandler, closeHandler) - { - // emtpy out lists - this.listenSockets = []; - this.connectedSockets = []; - - this.openHandler = openHandler; - this.closeHandler = closeHandler; - - var len = this.end - this.start; - for (var i = 0; i < len; ++i) - { - var url = base + (this.start + i) + ":" + this.port + "/resourcePath"; - var ws = CreateSocket(url, this.listenSockets, this.connectedSockets, this.messageHandler, i, this.openHandler, this.closeHandler); - - this.listenSockets.push(ws); - } - - this.interval = setInterval(ConnPoll, 200); - } - - this.Shutdown = function() - { - if(this.interval != null) - { - clearInterval(this.interval); - this.interval = null; - } - var len = this.connectedSockets.length; - for (var i = 0; i < len; ++i) - { - // send disconnect message - this.connectedSockets[i].send("type=srv\nmsg=2\n");; - } - } - - this.Close = function(socket) - { - socket.rdge_tryDisconnect = true; - } - - this.Poll = function() - { - var len =this. end - this.start; - for (var i = 0; i < len; ++i) - { - // re init the sockets to simulate broadcast - if(this.listenSockets[i].readyState == 3/*CLOSING*/ || this.listenSockets[i].readyState == 2/*CLOSING*/ || this.listenSockets[i].rdge_tryDisconnect == true) - { - if(this.listenSockets[i].rdge_tryDisconnect) - { - document.getElementById("socketConnection").innerHTML += "graceful discon: " + this.listenSockets[i].URL +"
"; - } - - this.listenSockets[i].rdge_tryDisconnect = false; - - var url = base + (this.start + i) + ":" + this.port + "/resourcePath"; - this.listenSockets[i].close(); - this.listenSockets[i] = CreateSocket(url, this.listenSockets, this.connectedSockets, this.messageHandler, i, this.openHandler, this.closeHandler); - } - } - - } - -} + this.Init = function (openHandler, closeHandler) { + // empty out lists + this.listenSockets = []; + this.connectedSockets = []; + + this.openHandler = openHandler; + this.closeHandler = closeHandler; + + var len = this.end - this.start; + for (var i = 0; i < len; ++i) { + var url = base + (this.start + i) + ":" + this.port + "/resourcePath"; + var ws = CreateSocket(url, this.listenSockets, this.connectedSockets, this.messageHandler, i, this.openHandler, this.closeHandler); + + this.listenSockets.push(ws); + } + + this.interval = setInterval(ConnPoll, 200); + }; + + this.Shutdown = function () { + if (this.interval != null) { + clearInterval(this.interval); + this.interval = null; + } + var len = this.connectedSockets.length; + for (var i = 0; i < len; ++i) { + // send disconnect message + this.connectedSockets[i].send("type=srv\nmsg=2\n"); ; + } + }; + + this.Close = function (socket) { + socket.rdge_tryDisconnect = true; + }; + + this.Poll = function () { + var len = this.end - this.start; + for (var i = 0; i < len; ++i) { + // re init the sockets to simulate broadcast + if (this.listenSockets[i].readyState == 3/*CLOSING*/ || this.listenSockets[i].readyState == 2/*CLOSING*/ || this.listenSockets[i].rdge_tryDisconnect == true) { + if (this.listenSockets[i].rdge_tryDisconnect) { + document.getElementById("socketConnection").innerHTML += "graceful discon: " + this.listenSockets[i].URL + "
"; + } + + this.listenSockets[i].rdge_tryDisconnect = false; + + var url = base + (this.start + i) + ":" + this.port + "/resourcePath"; + this.listenSockets[i].close(); + this.listenSockets[i] = CreateSocket(url, this.listenSockets, this.connectedSockets, this.messageHandler, i, this.openHandler, this.closeHandler); + } + } + }; +}; -- cgit v1.2.3