Rename textsecure.websocket and make it internal-only

js/key_worker.js

@@ -38415,91 +38415,89 @@ window.axolotl.sessions = {
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-;(function(){
-    'use strict';
-
-    /*
-     * var socket = textsecure.websocket(url);
-     *
-     * Returns an adamantium-reinforced super socket, capable of sending
-     * app-level keep alives and automatically reconnecting.
-     *
-     */
-
-    window.textsecure.websocket = function (url) {
-        var keepAliveTimer;
-        var reconnectSemaphore = 0;
-        var reconnectTimeout = 1000;
-        var socket;
-        var socketWrapper = {
-            onmessage : function() {},
-            onclose   : function() {},
-            onerror   : function() {},
-            getStatus : function() { return socket.readyState; }
-        };
-        var error;
-
-        function resetKeepAliveTimer() {
-            clearTimeout(keepAliveTimer);
-            keepAliveTimer = setTimeout(function() {
-                if (socket.readyState === WebSocket.OPEN) {
-                    socket.send(
-                        new textsecure.protobuf.WebSocketMessage({
-                            type: textsecure.protobuf.WebSocketMessage.Type.REQUEST,
-                            request: { verb: 'GET', path: '/v1/keepalive' }
-                        }).encode().toArrayBuffer()
-                    );
-                }
 
-                resetKeepAliveTimer();
+/*
-            }, 55000);
+ * var socket = TextSecureWebSocket(url);
-        };
+ *
+ * Returns an adamantium-reinforced super socket, capable of sending
+ * app-level keep alives and automatically reconnecting.
+ *
+ */
 
-        function onclose(e) {
+TextSecureWebSocket = function (url) {
-            if (!error) {
+    'use strict';
-                reconnectSemaphore--;
+    var keepAliveTimer;
-                setTimeout(connect, reconnectTimeout);
+    var reconnectSemaphore = 0;
-            }
+    var reconnectTimeout = 1000;
-            if (e !== 1000 ) { // CLOSE_NORMAL
+    var socket;
-                console.log('websocket closed', e.code);
+    var socketWrapper = {
+        onmessage : function() {},
+        onclose   : function() {},
+        onerror   : function() {},
+        getStatus : function() { return socket.readyState; }
+    };
+    var error;
+
+    function resetKeepAliveTimer() {
+        clearTimeout(keepAliveTimer);
+        keepAliveTimer = setTimeout(function() {
+            if (socket.readyState === WebSocket.OPEN) {
+                socket.send(
+                    new textsecure.protobuf.WebSocketMessage({
+                        type: textsecure.protobuf.WebSocketMessage.Type.REQUEST,
+                        request: { verb: 'GET', path: '/v1/keepalive' }
+                    }).encode().toArrayBuffer()
+                );
             }
-            socketWrapper.onclose(e);
-        };
-
-        function onerror(e) {
-            error = e;
-            console.log('websocket error');
-            socketWrapper.onerror(e);
-        };
 
-        function onmessage(response) {
-            socketWrapper.onmessage(response);
             resetKeepAliveTimer();
-        };
+        }, 55000);
+    };
 
-        function send(msg) {
+    function onclose(e) {
-            resetKeepAliveTimer();
+        if (!error) {
-            socket.send(msg);
+            reconnectSemaphore--;
-        };
+            setTimeout(connect, reconnectTimeout);
+        }
+        if (e !== 1000 ) { // CLOSE_NORMAL
+            console.log('websocket closed', e.code);
+        }
+        socketWrapper.onclose(e);
+    };
 
-        function connect() {
+    function onerror(e) {
-            clearTimeout(keepAliveTimer);
+        error = e;
-            if (++reconnectSemaphore <= 0) { return; }
+        console.log('websocket error');
+        socketWrapper.onerror(e);
+    };
 
-            if (socket) { socket.close(); }
+    function onmessage(response) {
-            socket = new WebSocket(url);
+        socketWrapper.onmessage(response);
+        resetKeepAliveTimer();
+    };
 
-            socket.onopen      = resetKeepAliveTimer;
+    function send(msg) {
-            socket.onerror     = onerror
+        resetKeepAliveTimer();
-            socket.onclose     = onclose;
+        socket.send(msg);
-            socket.onmessage   = onmessage;
+    };
-            socketWrapper.send = send;
+
-        };
+    function connect() {
+        clearTimeout(keepAliveTimer);
+        if (++reconnectSemaphore <= 0) { return; }
 
-        connect();
+        if (socket) { socket.close(); }
-        return socketWrapper;
+        socket = new WebSocket(url);
+
+        socket.onopen      = resetKeepAliveTimer;
+        socket.onerror     = onerror
+        socket.onclose     = onclose;
+        socket.onmessage   = onmessage;
+        socketWrapper.send = send;
     };
-})();
+
+    connect();
+    return socketWrapper;
+};
 
 /* vim: ts=4:sw=4:expandtab
  *
@@ -39361,7 +39359,7 @@ window.textsecure.api = function () {
             var password = textsecure.storage.get("password");
             var params = 'login=%2B' + encodeURIComponent(user.substring(1)) + '&password=' + encodeURIComponent(password);
         }
-        return window.textsecure.websocket(URL+params)
+        return TextSecureWebSocket(URL+params)
     }
 
     self.getMessageWebsocket = function() {

js/libtextsecure.js

@@ -38414,91 +38414,89 @@ window.axolotl.sessions = {
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-;(function(){
-    'use strict';
-
-    /*
-     * var socket = textsecure.websocket(url);
-     *
-     * Returns an adamantium-reinforced super socket, capable of sending
-     * app-level keep alives and automatically reconnecting.
-     *
-     */
-
-    window.textsecure.websocket = function (url) {
-        var keepAliveTimer;
-        var reconnectSemaphore = 0;
-        var reconnectTimeout = 1000;
-        var socket;
-        var socketWrapper = {
-            onmessage : function() {},
-            onclose   : function() {},
-            onerror   : function() {},
-            getStatus : function() { return socket.readyState; }
-        };
-        var error;
-
-        function resetKeepAliveTimer() {
-            clearTimeout(keepAliveTimer);
-            keepAliveTimer = setTimeout(function() {
-                if (socket.readyState === WebSocket.OPEN) {
-                    socket.send(
-                        new textsecure.protobuf.WebSocketMessage({
-                            type: textsecure.protobuf.WebSocketMessage.Type.REQUEST,
-                            request: { verb: 'GET', path: '/v1/keepalive' }
-                        }).encode().toArrayBuffer()
-                    );
-                }
 
-                resetKeepAliveTimer();
+/*
-            }, 55000);
+ * var socket = TextSecureWebSocket(url);
-        };
+ *
+ * Returns an adamantium-reinforced super socket, capable of sending
+ * app-level keep alives and automatically reconnecting.
+ *
+ */
 
-        function onclose(e) {
+TextSecureWebSocket = function (url) {
-            if (!error) {
+    'use strict';
-                reconnectSemaphore--;
+    var keepAliveTimer;
-                setTimeout(connect, reconnectTimeout);
+    var reconnectSemaphore = 0;
-            }
+    var reconnectTimeout = 1000;
-            if (e !== 1000 ) { // CLOSE_NORMAL
+    var socket;
-                console.log('websocket closed', e.code);
+    var socketWrapper = {
+        onmessage : function() {},
+        onclose   : function() {},
+        onerror   : function() {},
+        getStatus : function() { return socket.readyState; }
+    };
+    var error;
+
+    function resetKeepAliveTimer() {
+        clearTimeout(keepAliveTimer);
+        keepAliveTimer = setTimeout(function() {
+            if (socket.readyState === WebSocket.OPEN) {
+                socket.send(
+                    new textsecure.protobuf.WebSocketMessage({
+                        type: textsecure.protobuf.WebSocketMessage.Type.REQUEST,
+                        request: { verb: 'GET', path: '/v1/keepalive' }
+                    }).encode().toArrayBuffer()
+                );
             }
-            socketWrapper.onclose(e);
-        };
-
-        function onerror(e) {
-            error = e;
-            console.log('websocket error');
-            socketWrapper.onerror(e);
-        };
 
-        function onmessage(response) {
-            socketWrapper.onmessage(response);
             resetKeepAliveTimer();
-        };
+        }, 55000);
+    };
 
-        function send(msg) {
+    function onclose(e) {
-            resetKeepAliveTimer();
+        if (!error) {
-            socket.send(msg);
+            reconnectSemaphore--;
-        };
+            setTimeout(connect, reconnectTimeout);
+        }
+        if (e !== 1000 ) { // CLOSE_NORMAL
+            console.log('websocket closed', e.code);
+        }
+        socketWrapper.onclose(e);
+    };
 
-        function connect() {
+    function onerror(e) {
-            clearTimeout(keepAliveTimer);
+        error = e;
-            if (++reconnectSemaphore <= 0) { return; }
+        console.log('websocket error');
+        socketWrapper.onerror(e);
+    };
 
-            if (socket) { socket.close(); }
+    function onmessage(response) {
-            socket = new WebSocket(url);
+        socketWrapper.onmessage(response);
+        resetKeepAliveTimer();
+    };
 
-            socket.onopen      = resetKeepAliveTimer;
+    function send(msg) {
-            socket.onerror     = onerror
+        resetKeepAliveTimer();
-            socket.onclose     = onclose;
+        socket.send(msg);
-            socket.onmessage   = onmessage;
+    };
-            socketWrapper.send = send;
+
-        };
+    function connect() {
+        clearTimeout(keepAliveTimer);
+        if (++reconnectSemaphore <= 0) { return; }
 
-        connect();
+        if (socket) { socket.close(); }
-        return socketWrapper;
+        socket = new WebSocket(url);
+
+        socket.onopen      = resetKeepAliveTimer;
+        socket.onerror     = onerror
+        socket.onclose     = onclose;
+        socket.onmessage   = onmessage;
+        socketWrapper.send = send;
     };
-})();
+
+    connect();
+    return socketWrapper;
+};
 
 /* vim: ts=4:sw=4:expandtab
  *
@@ -39360,7 +39358,7 @@ window.textsecure.api = function () {
             var password = textsecure.storage.get("password");
             var params = 'login=%2B' + encodeURIComponent(user.substring(1)) + '&password=' + encodeURIComponent(password);
         }
-        return window.textsecure.websocket(URL+params)
+        return TextSecureWebSocket(URL+params)
     }
 
     self.getMessageWebsocket = function() {

libtextsecure/api.js

@@ -333,7 +333,7 @@ window.textsecure.api = function () {
             var password = textsecure.storage.get("password");
             var params = 'login=%2B' + encodeURIComponent(user.substring(1)) + '&password=' + encodeURIComponent(password);
         }
-        return window.textsecure.websocket(URL+params)
+        return TextSecureWebSocket(URL+params)
     }
 
     self.getMessageWebsocket = function() {

libtextsecure/websocket.js

@@ -13,88 +13,86 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-;(function(){
-    'use strict';
-
-    /*
-     * var socket = textsecure.websocket(url);
-     *
-     * Returns an adamantium-reinforced super socket, capable of sending
-     * app-level keep alives and automatically reconnecting.
-     *
-     */
-
-    window.textsecure.websocket = function (url) {
-        var keepAliveTimer;
-        var reconnectSemaphore = 0;
-        var reconnectTimeout = 1000;
-        var socket;
-        var socketWrapper = {
-            onmessage : function() {},
-            onclose   : function() {},
-            onerror   : function() {},
-            getStatus : function() { return socket.readyState; }
-        };
-        var error;
 
-        function resetKeepAliveTimer() {
+/*
-            clearTimeout(keepAliveTimer);
+ * var socket = TextSecureWebSocket(url);
-            keepAliveTimer = setTimeout(function() {
+ *
-                if (socket.readyState === WebSocket.OPEN) {
+ * Returns an adamantium-reinforced super socket, capable of sending
-                    socket.send(
+ * app-level keep alives and automatically reconnecting.
-                        new textsecure.protobuf.WebSocketMessage({
+ *
-                            type: textsecure.protobuf.WebSocketMessage.Type.REQUEST,
+ */
-                            request: { verb: 'GET', path: '/v1/keepalive' }
-                        }).encode().toArrayBuffer()
-                    );
-                }
 
-                resetKeepAliveTimer();
+TextSecureWebSocket = function (url) {
-            }, 55000);
+    'use strict';
-        };
+    var keepAliveTimer;
+    var reconnectSemaphore = 0;
+    var reconnectTimeout = 1000;
+    var socket;
+    var socketWrapper = {
+        onmessage : function() {},
+        onclose   : function() {},
+        onerror   : function() {},
+        getStatus : function() { return socket.readyState; }
+    };
+    var error;
 
-        function onclose(e) {
+    function resetKeepAliveTimer() {
-            if (!error) {
+        clearTimeout(keepAliveTimer);
-                reconnectSemaphore--;
+        keepAliveTimer = setTimeout(function() {
-                setTimeout(connect, reconnectTimeout);
+            if (socket.readyState === WebSocket.OPEN) {
+                socket.send(
+                    new textsecure.protobuf.WebSocketMessage({
+                        type: textsecure.protobuf.WebSocketMessage.Type.REQUEST,
+                        request: { verb: 'GET', path: '/v1/keepalive' }
+                    }).encode().toArrayBuffer()
+                );
             }
-            if (e !== 1000 ) { // CLOSE_NORMAL
-                console.log('websocket closed', e.code);
-            }
-            socketWrapper.onclose(e);
-        };
-
-        function onerror(e) {
-            error = e;
-            console.log('websocket error');
-            socketWrapper.onerror(e);
-        };
 
-        function onmessage(response) {
-            socketWrapper.onmessage(response);
             resetKeepAliveTimer();
-        };
+        }, 55000);
+    };
 
-        function send(msg) {
+    function onclose(e) {
-            resetKeepAliveTimer();
+        if (!error) {
-            socket.send(msg);
+            reconnectSemaphore--;
-        };
+            setTimeout(connect, reconnectTimeout);
+        }
+        if (e !== 1000 ) { // CLOSE_NORMAL
+            console.log('websocket closed', e.code);
+        }
+        socketWrapper.onclose(e);
+    };
 
-        function connect() {
+    function onerror(e) {
-            clearTimeout(keepAliveTimer);
+        error = e;
-            if (++reconnectSemaphore <= 0) { return; }
+        console.log('websocket error');
+        socketWrapper.onerror(e);
+    };
 
-            if (socket) { socket.close(); }
+    function onmessage(response) {
-            socket = new WebSocket(url);
+        socketWrapper.onmessage(response);
+        resetKeepAliveTimer();
+    };
 
-            socket.onopen      = resetKeepAliveTimer;
+    function send(msg) {
-            socket.onerror     = onerror
+        resetKeepAliveTimer();
-            socket.onclose     = onclose;
+        socket.send(msg);
-            socket.onmessage   = onmessage;
+    };
-            socketWrapper.send = send;
+
-        };
+    function connect() {
+        clearTimeout(keepAliveTimer);
+        if (++reconnectSemaphore <= 0) { return; }
 
-        connect();
+        if (socket) { socket.close(); }
-        return socketWrapper;
+        socket = new WebSocket(url);
+
+        socket.onopen      = resetKeepAliveTimer;
+        socket.onerror     = onerror
+        socket.onclose     = onclose;
+        socket.onmessage   = onmessage;
+        socketWrapper.send = send;
     };
-})();
+
+    connect();
+    return socketWrapper;
+};