Refactor TextSecureServer for storage

Following the pattern from previous commit, let the server class accept
a url and login credentials from the caller. Then integrate into
MessageReceiver and AccountManager.

// FREEBIE

js/background.js

@@ -74,6 +74,8 @@
             init(true);
         });
 
+        window.TEXT_SECURE_SERVER_URL = 'https://textsecure-service-staging.whispersystems.org';
+
         if (open) {
             openInbox();
         }

js/libtextsecure.js

@@ -38314,79 +38314,6 @@ axolotlInternal.RecipientRecord = function() {
     loadProtoBufs('DeviceMessages.proto');
 })();
 
-/*
- * vim: ts=4:sw=4:expandtab
- *
- * var socket = TextSecureWebSocket(url);
- *
- * Returns an adamantium-reinforced super socket, capable of
- * automatically reconnecting.
- *
- */
-
-TextSecureWebSocket = function (url, opts) {
-    'use strict';
-    opts = opts || {};
-    var reconnectTimeout = 1000;
-    if (opts && opts.reconnectTimeout !== undefined) {
-        reconnectTimeout = opts.reconnectTimeout;
-    }
-    var reconnectSemaphore = 0;
-    var socket;
-    var calledClose = false;
-    var socketWrapper = {
-        onmessage : function() {},
-        onclose   : function() {},
-        onerror   : function() {},
-        getStatus : function() { return socket.readyState; },
-        close     : function(code, reason) {
-            calledClose = true;
-            socket.close(code, reason);
-        }
-    };
-    var error;
-
-    function onclose(e) {
-        if (!error && !calledClose && reconnectTimeout) {
-            reconnectSemaphore--;
-            setTimeout(connect, reconnectTimeout);
-        }
-        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);
-    };
-
-    function send(msg) {
-        socket.send(msg);
-    };
-
-    function connect() {
-        if (++reconnectSemaphore <= 0) { return; }
-
-        if (socket) { socket.close(); }
-        socket = new WebSocket(url);
-
-        socket.onerror     = onerror
-        socket.onclose     = onclose;
-        socket.onmessage   = onmessage;
-        socketWrapper.send = send;
-    };
-
-    connect();
-    return socketWrapper;
-};
-
 /*
  * vim: ts=4:sw=4:expandtab
  */
@@ -38899,42 +38826,10 @@ function processDecrypted(decrypted, source) {
  * vim: ts=4:sw=4:expandtab
  */
 
-TextSecureServer = function () {
+var TextSecureServer = (function() {
     'use strict';
 
-    var self = {};
+    // Promise-based async xhr routine
-
-    /************************************************
-     *** Utilities to communicate with the server ***
-     ************************************************/
-    // Staging server
-    var URL_BASE    = "https://textsecure-service-staging.whispersystems.org";
-
-    // This is the real server
-    //var URL_BASE  = "https://textsecure-service.whispersystems.org";
-
-    var URL_CALLS = {};
-    URL_CALLS.accounts   = "/v1/accounts";
-    URL_CALLS.devices    = "/v1/devices";
-    URL_CALLS.keys       = "/v2/keys";
-    URL_CALLS.push       = "/v1/websocket";
-    URL_CALLS.temp_push  = "/v1/websocket/provisioning";
-    URL_CALLS.messages   = "/v1/messages";
-    URL_CALLS.attachment = "/v1/attachments";
-
-    /**
-        * REQUIRED PARAMS:
-        *   call:               URL_CALLS entry
-        *   httpType:           POST/GET/PUT/etc
-        * OPTIONAL PARAMS:
-        *   success_callback:   function(response object) called on success
-        *   error_callback:     function(http status code = -1 or != 200) called on failure
-        *   urlParameters:      crap appended to the url (probably including a leading /)
-        *   user:               user name to be sent in a basic auth header
-        *   password:           password to be sent in a basic auth header
-        *   do_auth:            alternative to user/password where user/password are figured out automagically
-        *   jsonData:           JSON data sent in the request body
-        */
     function ajax(url, options) {
         return new Promise(function (resolve, reject) {
             console.log(options.type, url);
@@ -38991,84 +38886,86 @@ TextSecureServer = function () {
         return e;
     }
 
-    var doAjax = function (param) {
+    var URL_CALLS = {
-        if (param.urlParameters === undefined) {
+        accounts   : "/v1/accounts",
-            param.urlParameters = "";
+        devices    : "/v1/devices",
-        }
+        keys       : "/v2/keys",
+        messages   : "/v1/messages",
+        attachment : "/v1/attachments"
+    };
 
-        if (param.do_auth) {
+    var attachment_id_regex = RegExp( "^https:\/\/.*\/(\\d+)\?");
-            param.user      = textsecure.storage.user.getNumber() + "." + textsecure.storage.user.getDeviceId();
-            param.password  = textsecure.storage.get("password");
-        }
 
-        return ajax(URL_BASE + URL_CALLS[param.call] + param.urlParameters, {
+    function TextSecureServer(url, username, password) {
-                type        : param.httpType,
+        this.url = url;
-                data        : param.jsonData && textsecure.utils.jsonThing(param.jsonData),
+        this.username = username;
-                contentType : 'application/json; charset=utf-8',
+        this.password = password;
-                dataType    : 'json',
+    }
-                user        : param.user,
+
-                password    : param.password
+    TextSecureServer.prototype = {
-        }).catch(function(e) {
+        constructor: TextSecureServer,
-            var code = e.code;
+        ajax: function(param) {
-            if (code === 200) {
+            if (!param.urlParameters) {
-                // happens sometimes when we get no response
+                param.urlParameters = '';
-                // (TODO: Fix server to return 204? instead)
-                return null;
             }
-            var message;
+            return ajax(this.url + URL_CALLS[param.call] + param.urlParameters, {
-            switch (code) {
+                    type        : param.httpType,
-            case -1:
+                    data        : param.jsonData && textsecure.utils.jsonThing(param.jsonData),
-                message = "Failed to connect to the server, please check your network connection.";
+                    contentType : 'application/json; charset=utf-8',
-                break;
+                    dataType    : 'json',
-            case 413:
+                    user        : this.username,
-                message = "Rate limit exceeded, please try again later.";
+                    password    : this.password
-                break;
+            }).catch(function(e) {
-            case 403:
+                var code = e.code;
-                message = "Invalid code, please try again.";
+                if (code === 200) {
-                break;
+                    // happens sometimes when we get no response
-            case 417:
+                    // (TODO: Fix server to return 204? instead)
-                // TODO: This shouldn't be a thing?, but its in the API doc?
+                    return null;
-                message = "Number already registered.";
+                }
-                break;
+                var message;
-            case 401:
+                switch (code) {
-            case 403:
+                case -1:
-                message = "Invalid authentication, most likely someone re-registered and invalidated our registration.";
+                    message = "Failed to connect to the server, please check your network connection.";
-                break;
+                    break;
-            case 404:
+                case 413:
-                message = "Number is not registered with TextSecure.";
+                    message = "Rate limit exceeded, please try again later.";
-                break;
+                    break;
-            default:
+                case 403:
-                message = "The server rejected our query, please file a bug report.";
+                    message = "Invalid code, please try again.";
-            }
+                    break;
-            e.message = message
+                case 417:
-            throw e;
+                    // TODO: This shouldn't be a thing?, but its in the API doc?
-        });
+                    message = "Number already registered.";
-    };
+                    break;
-
+                case 401:
-    function requestVerificationCode(number, transport) {
+                case 403:
-        return doAjax({
+                    message = "Invalid authentication, most likely someone re-registered and invalidated our registration.";
-            call                : 'accounts',
+                    break;
-            httpType            : 'GET',
+                case 404:
-            urlParameters       : '/' + transport + '/code/' + number,
+                    message = "Number is not registered with TextSecure.";
-        });
+                    break;
-    };
+                default:
-    self.requestVerificationSMS = function(number) {
+                    message = "The server rejected our query, please file a bug report.";
-        return requestVerificationCode(number, 'sms');
+                }
-    };
+                e.message = message
-    self.requestVerificationVoice = function(number) {
+                throw e;
-        return requestVerificationCode(number, 'voice');
+            });
-    };
+        },
-
+        requestVerificationSMS: function(number) {
-    self.getDevices = function(number) {
+            return this.ajax({
-        return doAjax({
+                call                : 'accounts',
-            call     : 'devices',
+                httpType            : 'GET',
-            httpType : 'GET',
+                urlParameters       : '/sms/code/' + number,
-            do_auth  : true
+            });
-        });
+        },
-    };
+        requestVerificationVoice: function(number) {
-
+            return this.ajax({
-    self.confirmCode = function(number, code, password,
+                call                : 'accounts',
-                                signaling_key, registrationId, deviceName) {
+                httpType            : 'GET',
+                urlParameters       : '/voice/code/' + number,
+            });
+        },
+        confirmCode: function(number, code, password, signaling_key, registrationId, deviceName) {
             var call = deviceName ? 'devices' : 'accounts';
             var urlPrefix = deviceName ? '/' : '/code/';
 
@@ -39081,144 +38978,140 @@ TextSecureServer = function () {
             if (deviceName) {
                 jsonData.name = deviceName;
             }
-            return doAjax({
+            this.username = number;
+            this.password = password;
+            return this.ajax({
                 call                : call,
                 httpType            : 'PUT',
                 urlParameters       : urlPrefix + code,
-                user                : number,
-                password            : password,
                 jsonData            : jsonData
             });
-    };
+        },
+        getDevices: function(number) {
+            return this.ajax({
+                call     : 'devices',
+                httpType : 'GET',
+            });
+        },
+        registerKeys: function(genKeys) {
+            var keys = {};
+            keys.identityKey = btoa(getString(genKeys.identityKey));
+            keys.signedPreKey = {keyId: genKeys.signedPreKey.keyId, publicKey: btoa(getString(genKeys.signedPreKey.publicKey)),
+                                signature: btoa(getString(genKeys.signedPreKey.signature))};
 
-    self.registerKeys = function(genKeys) {
+            keys.preKeys = [];
-        var keys = {};
+            var j = 0;
-        keys.identityKey = btoa(getString(genKeys.identityKey));
+            for (var i in genKeys.preKeys)
-        keys.signedPreKey = {keyId: genKeys.signedPreKey.keyId, publicKey: btoa(getString(genKeys.signedPreKey.publicKey)),
+                keys.preKeys[j++] = {keyId: genKeys.preKeys[i].keyId, publicKey: btoa(getString(genKeys.preKeys[i].publicKey))};
-                            signature: btoa(getString(genKeys.signedPreKey.signature))};
 
-        keys.preKeys = [];
+            //TODO: This is just to make the server happy (v2 clients should choke on publicKey),
-        var j = 0;
+            // it needs removed before release
-        for (var i in genKeys.preKeys)
+            keys.lastResortKey = {keyId: 0x7fffFFFF, publicKey: btoa("42")};
-            keys.preKeys[j++] = {keyId: genKeys.preKeys[i].keyId, publicKey: btoa(getString(genKeys.preKeys[i].publicKey))};
 
-        //TODO: This is just to make the server happy (v2 clients should choke on publicKey),
+            return this.ajax({
-        // it needs removed before release
+                call                : 'keys',
-        keys.lastResortKey = {keyId: 0x7fffFFFF, publicKey: btoa("42")};
+                httpType            : 'PUT',
+                jsonData            : keys,
+            });
+        },
+        getMyKeys: function(number, deviceId) {
+            return this.ajax({
+                call                : 'keys',
+                httpType            : 'GET',
+            }).then(function(res) {
+                return parseInt(res.count);
+            });
+        },
+        getKeysForNumber: function(number, deviceId) {
+            if (deviceId === undefined)
+                deviceId = "*";
 
-        return doAjax({
+            return this.ajax({
-            call                : 'keys',
+                call                : 'keys',
-            httpType            : 'PUT',
+                httpType            : 'GET',
-            do_auth             : true,
+                urlParameters       : "/" + number + "/" + deviceId,
-            jsonData            : keys,
+            }).then(function(res) {
-        });
+                var promises = [];
-    };
+                res.identityKey = StringView.base64ToBytes(res.identityKey);
-
+                for (var i = 0; i < res.devices.length; i++) {
-    self.getMyKeys = function(number, deviceId) {
+                    res.devices[i].signedPreKey.publicKey = StringView.base64ToBytes(res.devices[i].signedPreKey.publicKey);
-        return doAjax({
+                    res.devices[i].signedPreKey.signature = StringView.base64ToBytes(res.devices[i].signedPreKey.signature);
-            call                : 'keys',
+                    res.devices[i].preKey.publicKey = StringView.base64ToBytes(res.devices[i].preKey.publicKey);
-            httpType            : 'GET',
+                    //TODO: Is this still needed?
-            do_auth             : true,
+                    //if (res.devices[i].keyId === undefined)
-        }).then(function(res) {
+                    //  res.devices[i].keyId = 0;
-            return parseInt(res.count);
+                }
-        });
+                return res;
-    };
+            });
-
+        },
-    self.getKeysForNumber = function(number, deviceId) {
+        sendMessages: function(destination, messageArray, legacy) {
-        if (deviceId === undefined)
+            //TODO: Do this conversion somewhere else?
-            deviceId = "*";
+            for (var i = 0; i < messageArray.length; i++) {
-
+                messageArray[i].content = btoa(messageArray[i].content);
-        return doAjax({
+                if (legacy) {
-            call                : 'keys',
+                    messageArray[i].body = messageArray[i].content;
-            httpType            : 'GET',
+                    delete messageArray[i].content;
-            do_auth             : true,
+                }
-            urlParameters       : "/" + number + "/" + deviceId,
-        }).then(function(res) {
-            var promises = [];
-            res.identityKey = StringView.base64ToBytes(res.identityKey);
-            for (var i = 0; i < res.devices.length; i++) {
-                res.devices[i].signedPreKey.publicKey = StringView.base64ToBytes(res.devices[i].signedPreKey.publicKey);
-                res.devices[i].signedPreKey.signature = StringView.base64ToBytes(res.devices[i].signedPreKey.signature);
-                res.devices[i].preKey.publicKey = StringView.base64ToBytes(res.devices[i].preKey.publicKey);
-                //TODO: Is this still needed?
-                //if (res.devices[i].keyId === undefined)
-                //  res.devices[i].keyId = 0;
             }
-            return res;
+            var jsonData = { messages: messageArray };
-        });
+            jsonData.timestamp = messageArray[0].timestamp;
-    };
 
-    self.sendMessages = function(destination, messageArray, legacy) {
+            return this.ajax({
-        //TODO: Do this conversion somewhere else?
+                call                : 'messages',
-        for (var i = 0; i < messageArray.length; i++) {
+                httpType            : 'PUT',
-            messageArray[i].content = btoa(messageArray[i].content);
+                urlParameters       : '/' + destination,
-            if (legacy) {
+                jsonData            : jsonData,
-                messageArray[i].body = messageArray[i].content;
+            });
-                delete messageArray[i].content;
+        },
-            }
+        getAttachment: function(id) {
+            return this.ajax({
+                call                : 'attachment',
+                httpType            : 'GET',
+                urlParameters       : '/' + id,
+            }).then(function(response) {
+                return ajax(response.location, {
+                    type        : "GET",
+                    responseType: "arraybuffer",
+                    contentType : "application/octet-stream"
+                });
+            });
+        },
+        putAttachment: function(encryptedBin) {
+            return this.ajax({
+                call     : 'attachment',
+                httpType : 'GET',
+            }).then(function(response) {
+                return ajax(response.location, {
+                    type        : "PUT",
+                    contentType : "application/octet-stream",
+                    data        : encryptedBin,
+                    processData : false,
+                }).then(function() {
+                    // Parse the id as a string from the location url
+                    // (workaround for ids too large for Javascript numbers)
+                    return response.location.match(attachment_id_regex)[1];
+                });
+            });
+        },
+        getMessageSocket: function() {
+            return new WebSocket(
+                this.url.replace('https://', 'wss://')
+                    .replace('http://', 'ws://')
+                    + '/v1/websocket/?login=' + encodeURIComponent(this.username)
+                    + '&password=' + encodeURIComponent(this.password)
+            );
+        },
+        getProvisioningSocket: function () {
+            return new WebSocket(
+                this.url.replace('https://', 'wss://')
+                    .replace('http://', 'ws://')
+                    + '/v1/websocket/provisioning/'
+            );
         }
-        var jsonData = { messages: messageArray };
-        jsonData.timestamp = messageArray[0].timestamp;
-
-        return doAjax({
-            call                : 'messages',
-            httpType            : 'PUT',
-            urlParameters       : '/' + destination,
-            do_auth             : true,
-            jsonData            : jsonData,
-        });
     };
 
-    self.getAttachment = function(id) {
+    return TextSecureServer;
-        return doAjax({
+})();
-            call                : 'attachment',
-            httpType            : 'GET',
-            urlParameters       : '/' + id,
-            do_auth             : true,
-        }).then(function(response) {
-            return ajax(response.location, {
-                type        : "GET",
-                responseType: "arraybuffer",
-                contentType : "application/octet-stream"
-            });
-        });
-    };
-
-    var id_regex = RegExp( "^https:\/\/.*\/(\\d+)\?");
-    self.putAttachment = function(encryptedBin) {
-        return doAjax({
-            call     : 'attachment',
-            httpType : 'GET',
-            do_auth  : true,
-        }).then(function(response) {
-            return ajax(response.location, {
-                type        : "PUT",
-                contentType : "application/octet-stream",
-                data        : encryptedBin,
-                processData : false,
-            }).then(function() {
-                // Parse the id as a string from the location url
-                // (workaround for ids too large for Javascript numbers)
-                return response.location.match(id_regex)[1];
-            });
-        });
-    };
-
-    self.getMessageWebsocket = function(url) {
-        var user = textsecure.storage.user.getNumber() + "." + textsecure.storage.user.getDeviceId();
-        var password = textsecure.storage.get("password");
-        var params = 'login=%2B' + encodeURIComponent(user.substring(1)) + '&password=' + encodeURIComponent(password);
-        var url = url + URL_CALLS['push'] + '/?' + params;
-        return TextSecureWebSocket(url, {reconnectTimeout: false});
-    }
-
-    self.getTempWebsocket = function() {
-        var url = URL_BASE.replace(/^http/g, 'ws') + URL_CALLS['temp_push'] + '/?';
-        return TextSecureWebSocket(url, {reconnectTimeout: false});
-    }
-
-    return self;
-}();
 
 /*
  * vim: ts=4:sw=4:expandtab
@@ -39229,46 +39122,53 @@ TextSecureServer = function () {
     'use strict';
     window.textsecure = window.textsecure || {};
 
-    function AccountManager() {
+    function AccountManager(url, username, password) {
+        this.server = new TextSecureServer(url, username, password);
     }
 
     AccountManager.prototype = {
         constructor: AccountManager,
         requestVoiceVerification: function(number) {
-            return TextSecureServer.requestVerificationVoice(number);
+            return this.server.requestVerificationVoice(number);
         },
         requestSMSVerification: function(number) {
-            return TextSecureServer.requestVerificationSMS(number);
+            return this.server.requestVerificationSMS(number);
         },
         registerSingleDevice: function(number, verificationCode) {
+            var registerKeys = this.server.registerKeys.bind(this.server);
+            var createAccount = this.createAccount.bind(this);
+            var generateKeys = this.generateKeys.bind(this, 100);
             return axolotl.util.generateIdentityKeyPair().then(function(identityKeyPair) {
                 return createAccount(number, verificationCode, identityKeyPair).
-                    then(function() { return generateKeys(100); }).
+                    then(generateKeys).
-                    then(TextSecureServer.registerKeys).
+                    then(registerKeys).
                     then(textsecure.registration.done);
-            });
+            }.bind(this));
         },
         registerSecondDevice: function(setProvisioningUrl, confirmNumber, progressCallback) {
+            var socket = this.server.getProvisioningSocket();
+            var createAccount = this.createAccount.bind(this);
+            var generateKeys = this.generateKeys.bind(this, 100, progressCallback);
+            var registerKeys = this.server.registerKeys.bind(this.server);
             return textsecure.protocol_wrapper.createIdentityKeyRecvSocket().then(function(cryptoInfo) {
                 return new Promise(function(resolve) {
-                    var socket = TextSecureServer.getTempWebsocket();
                     var wsr = new WebSocketResource(socket, {
                         keepalive: { path: '/v1/keepalive/provisioning' },
                         handleRequest: function(request) {
-                            if (request.path == "/v1/address" && request.verb == "PUT") {
+                            if (request.path === "/v1/address" && request.verb === "PUT") {
                                 var proto = textsecure.protobuf.ProvisioningUuid.decode(request.body);
                                 setProvisioningUrl([
                                     'tsdevice:/?uuid=', proto.uuid, '&pub_key=',
                                     encodeURIComponent(btoa(getString(cryptoInfo.pubKey)))
                                 ].join(''));
                                 request.respond(200, 'OK');
-                            } else if (request.path == "/v1/message" && request.verb == "PUT") {
+                            } else if (request.path === "/v1/message" && request.verb === "PUT") {
                                 var envelope = textsecure.protobuf.ProvisionEnvelope.decode(request.body, 'binary');
                                 request.respond(200, 'OK');
                                 wsr.close();
                                 resolve(cryptoInfo.decryptAndHandleDeviceInit(envelope).then(function(provisionMessage) {
                                     return confirmNumber(provisionMessage.number).then(function(deviceName) {
-                                        if (typeof deviceName !== 'string' || deviceName.length == 0) {
+                                        if (typeof deviceName !== 'string' || deviceName.length === 0) {
                                             throw new Error('Invalid device name');
                                         }
                                         return createAccount(
@@ -39285,101 +39185,101 @@ TextSecureServer = function () {
                         }
                     });
                 });
-            }).then(function() {
+            }).then(generateKeys).
-                return generateKeys(100, progressCallback);
+               then(registerKeys).
-            }).then(TextSecureServer.registerKeys).
                then(textsecure.registration.done);
         },
         refreshPreKeys: function() {
-            return TextSecureServer.getMyKeys().then(function(preKeyCount) {
+            var generateKeys = this.generateKeys.bind(this, 100);
+            var registerKeys = this.server.registerKeys.bind(this.server);
+            return this.server.getMyKeys().then(function(preKeyCount) {
                 if (preKeyCount < 10) {
-                    return generateKeys(100).then(TextSecureServer.registerKeys);
+                    return generateKeys().then(registerKeys);
                 }
+            }.bind(this));
+        },
+        createAccount: function(number, verificationCode, identityKeyPair, deviceName) {
+            var signalingKey = textsecure.crypto.getRandomBytes(32 + 20);
+            var password = btoa(getString(textsecure.crypto.getRandomBytes(16)));
+            password = password.substring(0, password.length - 2);
+            var registrationId = axolotl.util.generateRegistrationId();
+
+            return this.server.confirmCode(
+                number, verificationCode, password, signalingKey, registrationId, deviceName
+            ).then(function(response) {
+                textsecure.storage.remove('identityKey');
+                textsecure.storage.remove('signaling_key');
+                textsecure.storage.remove('password');
+                textsecure.storage.remove('registrationId');
+                textsecure.storage.remove('number_id');
+                textsecure.storage.remove('regionCode');
+
+                textsecure.storage.put('identityKey', identityKeyPair);
+                textsecure.storage.put('signaling_key', signalingKey);
+                textsecure.storage.put('password', password);
+                textsecure.storage.put('registrationId', registrationId);
+
+                textsecure.storage.user.setNumberAndDeviceId(number, response.deviceId || 1, deviceName);
+                textsecure.storage.put('regionCode', libphonenumber.util.getRegionCodeForNumber(number));
+            });
+        },
+        generateKeys: function (count, progressCallback) {
+            if (typeof progressCallback !== 'function') {
+                progressCallback = undefined;
+            }
+            var startId = textsecure.storage.get('maxPreKeyId', 1);
+            var signedKeyId = textsecure.storage.get('signedKeyId', 1);
+
+            if (typeof startId != 'number') {
+                throw new Error('Invalid maxPreKeyId');
+            }
+            if (typeof signedKeyId != 'number') {
+                throw new Error('Invalid signedKeyId');
+            }
+
+
+            var store = textsecure.storage.axolotl;
+            return store.getMyIdentityKey().then(function(identityKey) {
+                var result = { preKeys: [], identityKey: identityKey.pubKey };
+                var promises = [];
+
+                for (var keyId = startId; keyId < startId+count; ++keyId) {
+                    promises.push(
+                        axolotl.util.generatePreKey(keyId).then(function(res) {
+                            store.putPreKey(res.keyId, res.keyPair);
+                            result.preKeys.push({
+                                keyId     : res.keyId,
+                                publicKey : res.keyPair.pubKey
+                            });
+                            if (progressCallback) { progressCallback(); }
+                        })
+                    );
+                }
+
+                promises.push(
+                    axolotl.util.generateSignedPreKey(identityKey, signedKeyId).then(function(res) {
+                        store.putSignedPreKey(res.keyId, res.keyPair);
+                        result.signedPreKey = {
+                            keyId     : res.keyId,
+                            publicKey : res.keyPair.pubKey,
+                            signature : res.signature
+                        };
+                    })
+                );
+
+                store.removeSignedPreKey(signedKeyId - 2);
+                textsecure.storage.put('maxPreKeyId', startId + count);
+                textsecure.storage.put('signedKeyId', signedKeyId + 1);
+                return Promise.all(promises).then(function() {
+                    return result;
+                });
             });
         }
     };
-    function createAccount(number, verificationCode, identityKeyPair, deviceName) {
-        var signalingKey = textsecure.crypto.getRandomBytes(32 + 20);
-        var password = btoa(getString(textsecure.crypto.getRandomBytes(16)));
-        password = password.substring(0, password.length - 2);
-        var registrationId = axolotl.util.generateRegistrationId();
-
-        return TextSecureServer.confirmCode(
-            number, verificationCode, password, signalingKey, registrationId, deviceName
-        ).then(function(response) {
-            textsecure.storage.remove('identityKey');
-            textsecure.storage.remove('signaling_key');
-            textsecure.storage.remove('password');
-            textsecure.storage.remove('registrationId');
-            textsecure.storage.remove('number_id');
-            textsecure.storage.remove('regionCode');
-
-            textsecure.storage.put('identityKey', identityKeyPair);
-            textsecure.storage.put('signaling_key', signalingKey);
-            textsecure.storage.put('password', password);
-            textsecure.storage.put('registrationId', registrationId);
-
-            textsecure.storage.user.setNumberAndDeviceId(number, response.deviceId || 1, deviceName);
-            textsecure.storage.put('regionCode', libphonenumber.util.getRegionCodeForNumber(number));
-        });
-    }
-
     textsecure.AccountManager = AccountManager;
 
 }());
 
-function generateKeys(count, progressCallback) {
-    if (typeof progressCallback !== 'function') {
-        progressCallback = undefined;
-    }
-    var startId = textsecure.storage.get('maxPreKeyId', 1);
-    var signedKeyId = textsecure.storage.get('signedKeyId', 1);
-
-    if (typeof startId != 'number') {
-        throw new Error('Invalid maxPreKeyId');
-    }
-    if (typeof signedKeyId != 'number') {
-        throw new Error('Invalid signedKeyId');
-    }
-
-    var store = textsecure.storage.axolotl;
-    return store.getMyIdentityKey().then(function(identityKey) {
-        var result = { preKeys: [], identityKey: identityKey.pubKey };
-        var promises = [];
-
-        for (var keyId = startId; keyId < startId+count; ++keyId) {
-            promises.push(
-                axolotl.util.generatePreKey(keyId).then(function(res) {
-                    store.putPreKey(res.keyId, res.keyPair);
-                    result.preKeys.push({
-                        keyId     : res.keyId,
-                        publicKey : res.keyPair.pubKey
-                    });
-                    if (progressCallback) { progressCallback(); }
-                })
-            );
-        }
-
-        promises.push(
-            axolotl.util.generateSignedPreKey(identityKey, signedKeyId).then(function(res) {
-                store.putSignedPreKey(res.keyId, res.keyPair);
-                result.signedPreKey = {
-                    keyId     : res.keyId,
-                    publicKey : res.keyPair.pubKey,
-                    signature : res.signature
-                };
-            })
-        );
-
-        store.removeSignedPreKey(signedKeyId - 2);
-        textsecure.storage.put('maxPreKeyId', startId + count);
-        textsecure.storage.put('signedKeyId', signedKeyId + 1);
-        return Promise.all(promises).then(function() {
-            return result;
-        });
-    });
-}
-
 /*
  * vim: ts=4:sw=4:expandtab
  */
@@ -39393,6 +39293,7 @@ function generateKeys(count, progressCallback) {
         this.signalingKey = signalingKey;
         this.username = username;
         this.password = password;
+        this.server = new TextSecureServer(url, username, password);
 
         var unencoded = textsecure.utils.unencodeNumber(username);
         this.number = unencoded[0];
@@ -39403,17 +39304,12 @@ function generateKeys(count, progressCallback) {
     MessageReceiver.prototype = {
         constructor: MessageReceiver,
         connect: function() {
-            // initialize the socket and start listening for messages
             if (this.socket && this.socket.readyState !== WebSocket.CLOSED) {
                 this.socket.close();
             }
             console.log('opening websocket');
-            this.socket = new WebSocket(
+            // initialize the socket and start listening for messages
-                this.url.replace('https://', 'wss://').replace('http://', 'ws://')
+            this.socket = this.server.getMessageSocket();
-                    + '/v1/websocket/?login=' + encodeURIComponent(this.username)
-                    + '&password=' + encodeURIComponent(this.password)
-            );
-
             this.socket.onclose = this.onclose.bind(this);
             this.socket.onerror = this.onerror.bind(this);
             this.socket.onopen = this.onopen.bind(this);
@@ -39436,7 +39332,7 @@ function generateKeys(count, progressCallback) {
             var eventTarget = this;
             console.log('websocket closed', ev.code);
             // possible 403 or network issue. Make an request to confirm
-            TextSecureServer.getDevices(this.number).
+            this.server.getDevices(this.number).
                 then(this.connect.bind(this)). // No HTTP error? Reconnect
                 catch(function(e) {
                     var ev = new Event('error');

js/options.js

@@ -65,7 +65,7 @@
             $('#init-setup').show().addClass('in');
             $('#status').text("Connecting...");
 
-            var accountManager = new bg.textsecure.AccountManager();
+            var accountManager = new bg.textsecure.AccountManager(bg.TEXT_SECURE_SERVER_URL);
             accountManager.registerSecondDevice(setProvisioningUrl, confirmNumber, incrementCounter).then(function() {
                 var launch = function() {
                     bg.openInbox();

libtextsecure/account_manager.js

@@ -7,46 +7,53 @@
     'use strict';
     window.textsecure = window.textsecure || {};
 
-    function AccountManager() {
+    function AccountManager(url, username, password) {
+        this.server = new TextSecureServer(url, username, password);
     }
 
     AccountManager.prototype = {
         constructor: AccountManager,
         requestVoiceVerification: function(number) {
-            return TextSecureServer.requestVerificationVoice(number);
+            return this.server.requestVerificationVoice(number);
         },
         requestSMSVerification: function(number) {
-            return TextSecureServer.requestVerificationSMS(number);
+            return this.server.requestVerificationSMS(number);
         },
         registerSingleDevice: function(number, verificationCode) {
+            var registerKeys = this.server.registerKeys.bind(this.server);
+            var createAccount = this.createAccount.bind(this);
+            var generateKeys = this.generateKeys.bind(this, 100);
             return axolotl.util.generateIdentityKeyPair().then(function(identityKeyPair) {
                 return createAccount(number, verificationCode, identityKeyPair).
-                    then(function() { return generateKeys(100); }).
+                    then(generateKeys).
-                    then(TextSecureServer.registerKeys).
+                    then(registerKeys).
                     then(textsecure.registration.done);
-            });
+            }.bind(this));
         },
         registerSecondDevice: function(setProvisioningUrl, confirmNumber, progressCallback) {
+            var socket = this.server.getProvisioningSocket();
+            var createAccount = this.createAccount.bind(this);
+            var generateKeys = this.generateKeys.bind(this, 100, progressCallback);
+            var registerKeys = this.server.registerKeys.bind(this.server);
             return textsecure.protocol_wrapper.createIdentityKeyRecvSocket().then(function(cryptoInfo) {
                 return new Promise(function(resolve) {
-                    var socket = TextSecureServer.getTempWebsocket();
                     var wsr = new WebSocketResource(socket, {
                         keepalive: { path: '/v1/keepalive/provisioning' },
                         handleRequest: function(request) {
-                            if (request.path == "/v1/address" && request.verb == "PUT") {
+                            if (request.path === "/v1/address" && request.verb === "PUT") {
                                 var proto = textsecure.protobuf.ProvisioningUuid.decode(request.body);
                                 setProvisioningUrl([
                                     'tsdevice:/?uuid=', proto.uuid, '&pub_key=',
                                     encodeURIComponent(btoa(getString(cryptoInfo.pubKey)))
                                 ].join(''));
                                 request.respond(200, 'OK');
-                            } else if (request.path == "/v1/message" && request.verb == "PUT") {
+                            } else if (request.path === "/v1/message" && request.verb === "PUT") {
                                 var envelope = textsecure.protobuf.ProvisionEnvelope.decode(request.body, 'binary');
                                 request.respond(200, 'OK');
                                 wsr.close();
                                 resolve(cryptoInfo.decryptAndHandleDeviceInit(envelope).then(function(provisionMessage) {
                                     return confirmNumber(provisionMessage.number).then(function(deviceName) {
-                                        if (typeof deviceName !== 'string' || deviceName.length == 0) {
+                                        if (typeof deviceName !== 'string' || deviceName.length === 0) {
                                             throw new Error('Invalid device name');
                                         }
                                         return createAccount(
@@ -63,97 +70,97 @@
                         }
                     });
                 });
-            }).then(function() {
+            }).then(generateKeys).
-                return generateKeys(100, progressCallback);
+               then(registerKeys).
-            }).then(TextSecureServer.registerKeys).
                then(textsecure.registration.done);
         },
         refreshPreKeys: function() {
-            return TextSecureServer.getMyKeys().then(function(preKeyCount) {
+            var generateKeys = this.generateKeys.bind(this, 100);
+            var registerKeys = this.server.registerKeys.bind(this.server);
+            return this.server.getMyKeys().then(function(preKeyCount) {
                 if (preKeyCount < 10) {
-                    return generateKeys(100).then(TextSecureServer.registerKeys);
+                    return generateKeys().then(registerKeys);
                 }
+            }.bind(this));
+        },
+        createAccount: function(number, verificationCode, identityKeyPair, deviceName) {
+            var signalingKey = textsecure.crypto.getRandomBytes(32 + 20);
+            var password = btoa(getString(textsecure.crypto.getRandomBytes(16)));
+            password = password.substring(0, password.length - 2);
+            var registrationId = axolotl.util.generateRegistrationId();
+
+            return this.server.confirmCode(
+                number, verificationCode, password, signalingKey, registrationId, deviceName
+            ).then(function(response) {
+                textsecure.storage.remove('identityKey');
+                textsecure.storage.remove('signaling_key');
+                textsecure.storage.remove('password');
+                textsecure.storage.remove('registrationId');
+                textsecure.storage.remove('number_id');
+                textsecure.storage.remove('regionCode');
+
+                textsecure.storage.put('identityKey', identityKeyPair);
+                textsecure.storage.put('signaling_key', signalingKey);
+                textsecure.storage.put('password', password);
+                textsecure.storage.put('registrationId', registrationId);
+
+                textsecure.storage.user.setNumberAndDeviceId(number, response.deviceId || 1, deviceName);
+                textsecure.storage.put('regionCode', libphonenumber.util.getRegionCodeForNumber(number));
+            });
+        },
+        generateKeys: function (count, progressCallback) {
+            if (typeof progressCallback !== 'function') {
+                progressCallback = undefined;
+            }
+            var startId = textsecure.storage.get('maxPreKeyId', 1);
+            var signedKeyId = textsecure.storage.get('signedKeyId', 1);
+
+            if (typeof startId != 'number') {
+                throw new Error('Invalid maxPreKeyId');
+            }
+            if (typeof signedKeyId != 'number') {
+                throw new Error('Invalid signedKeyId');
+            }
+
+
+            var store = textsecure.storage.axolotl;
+            return store.getMyIdentityKey().then(function(identityKey) {
+                var result = { preKeys: [], identityKey: identityKey.pubKey };
+                var promises = [];
+
+                for (var keyId = startId; keyId < startId+count; ++keyId) {
+                    promises.push(
+                        axolotl.util.generatePreKey(keyId).then(function(res) {
+                            store.putPreKey(res.keyId, res.keyPair);
+                            result.preKeys.push({
+                                keyId     : res.keyId,
+                                publicKey : res.keyPair.pubKey
+                            });
+                            if (progressCallback) { progressCallback(); }
+                        })
+                    );
+                }
+
+                promises.push(
+                    axolotl.util.generateSignedPreKey(identityKey, signedKeyId).then(function(res) {
+                        store.putSignedPreKey(res.keyId, res.keyPair);
+                        result.signedPreKey = {
+                            keyId     : res.keyId,
+                            publicKey : res.keyPair.pubKey,
+                            signature : res.signature
+                        };
+                    })
+                );
+
+                store.removeSignedPreKey(signedKeyId - 2);
+                textsecure.storage.put('maxPreKeyId', startId + count);
+                textsecure.storage.put('signedKeyId', signedKeyId + 1);
+                return Promise.all(promises).then(function() {
+                    return result;
+                });
             });
         }
     };
-    function createAccount(number, verificationCode, identityKeyPair, deviceName) {
-        var signalingKey = textsecure.crypto.getRandomBytes(32 + 20);
-        var password = btoa(getString(textsecure.crypto.getRandomBytes(16)));
-        password = password.substring(0, password.length - 2);
-        var registrationId = axolotl.util.generateRegistrationId();
-
-        return TextSecureServer.confirmCode(
-            number, verificationCode, password, signalingKey, registrationId, deviceName
-        ).then(function(response) {
-            textsecure.storage.remove('identityKey');
-            textsecure.storage.remove('signaling_key');
-            textsecure.storage.remove('password');
-            textsecure.storage.remove('registrationId');
-            textsecure.storage.remove('number_id');
-            textsecure.storage.remove('regionCode');
-
-            textsecure.storage.put('identityKey', identityKeyPair);
-            textsecure.storage.put('signaling_key', signalingKey);
-            textsecure.storage.put('password', password);
-            textsecure.storage.put('registrationId', registrationId);
-
-            textsecure.storage.user.setNumberAndDeviceId(number, response.deviceId || 1, deviceName);
-            textsecure.storage.put('regionCode', libphonenumber.util.getRegionCodeForNumber(number));
-        });
-    }
-
     textsecure.AccountManager = AccountManager;
 
 }());
-
-function generateKeys(count, progressCallback) {
-    if (typeof progressCallback !== 'function') {
-        progressCallback = undefined;
-    }
-    var startId = textsecure.storage.get('maxPreKeyId', 1);
-    var signedKeyId = textsecure.storage.get('signedKeyId', 1);
-
-    if (typeof startId != 'number') {
-        throw new Error('Invalid maxPreKeyId');
-    }
-    if (typeof signedKeyId != 'number') {
-        throw new Error('Invalid signedKeyId');
-    }
-
-    var store = textsecure.storage.axolotl;
-    return store.getMyIdentityKey().then(function(identityKey) {
-        var result = { preKeys: [], identityKey: identityKey.pubKey };
-        var promises = [];
-
-        for (var keyId = startId; keyId < startId+count; ++keyId) {
-            promises.push(
-                axolotl.util.generatePreKey(keyId).then(function(res) {
-                    store.putPreKey(res.keyId, res.keyPair);
-                    result.preKeys.push({
-                        keyId     : res.keyId,
-                        publicKey : res.keyPair.pubKey
-                    });
-                    if (progressCallback) { progressCallback(); }
-                })
-            );
-        }
-
-        promises.push(
-            axolotl.util.generateSignedPreKey(identityKey, signedKeyId).then(function(res) {
-                store.putSignedPreKey(res.keyId, res.keyPair);
-                result.signedPreKey = {
-                    keyId     : res.keyId,
-                    publicKey : res.keyPair.pubKey,
-                    signature : res.signature
-                };
-            })
-        );
-
-        store.removeSignedPreKey(signedKeyId - 2);
-        textsecure.storage.put('maxPreKeyId', startId + count);
-        textsecure.storage.put('signedKeyId', signedKeyId + 1);
-        return Promise.all(promises).then(function() {
-            return result;
-        });
-    });
-}

libtextsecure/api.js

@@ -2,42 +2,10 @@
  * vim: ts=4:sw=4:expandtab
  */
 
-TextSecureServer = function () {
+var TextSecureServer = (function() {
     'use strict';
 
-    var self = {};
+    // Promise-based async xhr routine
-
-    /************************************************
-     *** Utilities to communicate with the server ***
-     ************************************************/
-    // Staging server
-    var URL_BASE    = "https://textsecure-service-staging.whispersystems.org";
-
-    // This is the real server
-    //var URL_BASE  = "https://textsecure-service.whispersystems.org";
-
-    var URL_CALLS = {};
-    URL_CALLS.accounts   = "/v1/accounts";
-    URL_CALLS.devices    = "/v1/devices";
-    URL_CALLS.keys       = "/v2/keys";
-    URL_CALLS.push       = "/v1/websocket";
-    URL_CALLS.temp_push  = "/v1/websocket/provisioning";
-    URL_CALLS.messages   = "/v1/messages";
-    URL_CALLS.attachment = "/v1/attachments";
-
-    /**
-        * REQUIRED PARAMS:
-        *   call:               URL_CALLS entry
-        *   httpType:           POST/GET/PUT/etc
-        * OPTIONAL PARAMS:
-        *   success_callback:   function(response object) called on success
-        *   error_callback:     function(http status code = -1 or != 200) called on failure
-        *   urlParameters:      crap appended to the url (probably including a leading /)
-        *   user:               user name to be sent in a basic auth header
-        *   password:           password to be sent in a basic auth header
-        *   do_auth:            alternative to user/password where user/password are figured out automagically
-        *   jsonData:           JSON data sent in the request body
-        */
     function ajax(url, options) {
         return new Promise(function (resolve, reject) {
             console.log(options.type, url);
@@ -94,84 +62,86 @@ TextSecureServer = function () {
         return e;
     }
 
-    var doAjax = function (param) {
+    var URL_CALLS = {
-        if (param.urlParameters === undefined) {
+        accounts   : "/v1/accounts",
-            param.urlParameters = "";
+        devices    : "/v1/devices",
-        }
+        keys       : "/v2/keys",
+        messages   : "/v1/messages",
+        attachment : "/v1/attachments"
+    };
 
-        if (param.do_auth) {
+    var attachment_id_regex = RegExp( "^https:\/\/.*\/(\\d+)\?");
-            param.user      = textsecure.storage.user.getNumber() + "." + textsecure.storage.user.getDeviceId();
-            param.password  = textsecure.storage.get("password");
-        }
 
-        return ajax(URL_BASE + URL_CALLS[param.call] + param.urlParameters, {
+    function TextSecureServer(url, username, password) {
-                type        : param.httpType,
+        this.url = url;
-                data        : param.jsonData && textsecure.utils.jsonThing(param.jsonData),
+        this.username = username;
-                contentType : 'application/json; charset=utf-8',
+        this.password = password;
-                dataType    : 'json',
+    }
-                user        : param.user,
+
-                password    : param.password
+    TextSecureServer.prototype = {
-        }).catch(function(e) {
+        constructor: TextSecureServer,
-            var code = e.code;
+        ajax: function(param) {
-            if (code === 200) {
+            if (!param.urlParameters) {
-                // happens sometimes when we get no response
+                param.urlParameters = '';
-                // (TODO: Fix server to return 204? instead)
-                return null;
             }
-            var message;
+            return ajax(this.url + URL_CALLS[param.call] + param.urlParameters, {
-            switch (code) {
+                    type        : param.httpType,
-            case -1:
+                    data        : param.jsonData && textsecure.utils.jsonThing(param.jsonData),
-                message = "Failed to connect to the server, please check your network connection.";
+                    contentType : 'application/json; charset=utf-8',
-                break;
+                    dataType    : 'json',
-            case 413:
+                    user        : this.username,
-                message = "Rate limit exceeded, please try again later.";
+                    password    : this.password
-                break;
+            }).catch(function(e) {
-            case 403:
+                var code = e.code;
-                message = "Invalid code, please try again.";
+                if (code === 200) {
-                break;
+                    // happens sometimes when we get no response
-            case 417:
+                    // (TODO: Fix server to return 204? instead)
-                // TODO: This shouldn't be a thing?, but its in the API doc?
+                    return null;
-                message = "Number already registered.";
+                }
-                break;
+                var message;
-            case 401:
+                switch (code) {
-            case 403:
+                case -1:
-                message = "Invalid authentication, most likely someone re-registered and invalidated our registration.";
+                    message = "Failed to connect to the server, please check your network connection.";
-                break;
+                    break;
-            case 404:
+                case 413:
-                message = "Number is not registered with TextSecure.";
+                    message = "Rate limit exceeded, please try again later.";
-                break;
+                    break;
-            default:
+                case 403:
-                message = "The server rejected our query, please file a bug report.";
+                    message = "Invalid code, please try again.";
-            }
+                    break;
-            e.message = message
+                case 417:
-            throw e;
+                    // TODO: This shouldn't be a thing?, but its in the API doc?
-        });
+                    message = "Number already registered.";
-    };
+                    break;
-
+                case 401:
-    function requestVerificationCode(number, transport) {
+                case 403:
-        return doAjax({
+                    message = "Invalid authentication, most likely someone re-registered and invalidated our registration.";
-            call                : 'accounts',
+                    break;
-            httpType            : 'GET',
+                case 404:
-            urlParameters       : '/' + transport + '/code/' + number,
+                    message = "Number is not registered with TextSecure.";
-        });
+                    break;
-    };
+                default:
-    self.requestVerificationSMS = function(number) {
+                    message = "The server rejected our query, please file a bug report.";
-        return requestVerificationCode(number, 'sms');
+                }
-    };
+                e.message = message
-    self.requestVerificationVoice = function(number) {
+                throw e;
-        return requestVerificationCode(number, 'voice');
+            });
-    };
+        },
-
+        requestVerificationSMS: function(number) {
-    self.getDevices = function(number) {
+            return this.ajax({
-        return doAjax({
+                call                : 'accounts',
-            call     : 'devices',
+                httpType            : 'GET',
-            httpType : 'GET',
+                urlParameters       : '/sms/code/' + number,
-            do_auth  : true
+            });
-        });
+        },
-    };
+        requestVerificationVoice: function(number) {
-
+            return this.ajax({
-    self.confirmCode = function(number, code, password,
+                call                : 'accounts',
-                                signaling_key, registrationId, deviceName) {
+                httpType            : 'GET',
+                urlParameters       : '/voice/code/' + number,
+            });
+        },
+        confirmCode: function(number, code, password, signaling_key, registrationId, deviceName) {
             var call = deviceName ? 'devices' : 'accounts';
             var urlPrefix = deviceName ? '/' : '/code/';
 
@@ -184,141 +154,137 @@ TextSecureServer = function () {
             if (deviceName) {
                 jsonData.name = deviceName;
             }
-            return doAjax({
+            this.username = number;
+            this.password = password;
+            return this.ajax({
                 call                : call,
                 httpType            : 'PUT',
                 urlParameters       : urlPrefix + code,
-                user                : number,
-                password            : password,
                 jsonData            : jsonData
             });
-    };
+        },
+        getDevices: function(number) {
+            return this.ajax({
+                call     : 'devices',
+                httpType : 'GET',
+            });
+        },
+        registerKeys: function(genKeys) {
+            var keys = {};
+            keys.identityKey = btoa(getString(genKeys.identityKey));
+            keys.signedPreKey = {keyId: genKeys.signedPreKey.keyId, publicKey: btoa(getString(genKeys.signedPreKey.publicKey)),
+                                signature: btoa(getString(genKeys.signedPreKey.signature))};
 
-    self.registerKeys = function(genKeys) {
+            keys.preKeys = [];
-        var keys = {};
+            var j = 0;
-        keys.identityKey = btoa(getString(genKeys.identityKey));
+            for (var i in genKeys.preKeys)
-        keys.signedPreKey = {keyId: genKeys.signedPreKey.keyId, publicKey: btoa(getString(genKeys.signedPreKey.publicKey)),
+                keys.preKeys[j++] = {keyId: genKeys.preKeys[i].keyId, publicKey: btoa(getString(genKeys.preKeys[i].publicKey))};
-                            signature: btoa(getString(genKeys.signedPreKey.signature))};
 
-        keys.preKeys = [];
+            //TODO: This is just to make the server happy (v2 clients should choke on publicKey),
-        var j = 0;
+            // it needs removed before release
-        for (var i in genKeys.preKeys)
+            keys.lastResortKey = {keyId: 0x7fffFFFF, publicKey: btoa("42")};
-            keys.preKeys[j++] = {keyId: genKeys.preKeys[i].keyId, publicKey: btoa(getString(genKeys.preKeys[i].publicKey))};
 
-        //TODO: This is just to make the server happy (v2 clients should choke on publicKey),
+            return this.ajax({
-        // it needs removed before release
+                call                : 'keys',
-        keys.lastResortKey = {keyId: 0x7fffFFFF, publicKey: btoa("42")};
+                httpType            : 'PUT',
+                jsonData            : keys,
+            });
+        },
+        getMyKeys: function(number, deviceId) {
+            return this.ajax({
+                call                : 'keys',
+                httpType            : 'GET',
+            }).then(function(res) {
+                return parseInt(res.count);
+            });
+        },
+        getKeysForNumber: function(number, deviceId) {
+            if (deviceId === undefined)
+                deviceId = "*";
 
-        return doAjax({
+            return this.ajax({
-            call                : 'keys',
+                call                : 'keys',
-            httpType            : 'PUT',
+                httpType            : 'GET',
-            do_auth             : true,
+                urlParameters       : "/" + number + "/" + deviceId,
-            jsonData            : keys,
+            }).then(function(res) {
-        });
+                var promises = [];
-    };
+                res.identityKey = StringView.base64ToBytes(res.identityKey);
-
+                for (var i = 0; i < res.devices.length; i++) {
-    self.getMyKeys = function(number, deviceId) {
+                    res.devices[i].signedPreKey.publicKey = StringView.base64ToBytes(res.devices[i].signedPreKey.publicKey);
-        return doAjax({
+                    res.devices[i].signedPreKey.signature = StringView.base64ToBytes(res.devices[i].signedPreKey.signature);
-            call                : 'keys',
+                    res.devices[i].preKey.publicKey = StringView.base64ToBytes(res.devices[i].preKey.publicKey);
-            httpType            : 'GET',
+                    //TODO: Is this still needed?
-            do_auth             : true,
+                    //if (res.devices[i].keyId === undefined)
-        }).then(function(res) {
+                    //  res.devices[i].keyId = 0;
-            return parseInt(res.count);
+                }
-        });
+                return res;
-    };
+            });
-
+        },
-    self.getKeysForNumber = function(number, deviceId) {
+        sendMessages: function(destination, messageArray, legacy) {
-        if (deviceId === undefined)
+            //TODO: Do this conversion somewhere else?
-            deviceId = "*";
+            for (var i = 0; i < messageArray.length; i++) {
-
+                messageArray[i].content = btoa(messageArray[i].content);
-        return doAjax({
+                if (legacy) {
-            call                : 'keys',
+                    messageArray[i].body = messageArray[i].content;
-            httpType            : 'GET',
+                    delete messageArray[i].content;
-            do_auth             : true,
+                }
-            urlParameters       : "/" + number + "/" + deviceId,
-        }).then(function(res) {
-            var promises = [];
-            res.identityKey = StringView.base64ToBytes(res.identityKey);
-            for (var i = 0; i < res.devices.length; i++) {
-                res.devices[i].signedPreKey.publicKey = StringView.base64ToBytes(res.devices[i].signedPreKey.publicKey);
-                res.devices[i].signedPreKey.signature = StringView.base64ToBytes(res.devices[i].signedPreKey.signature);
-                res.devices[i].preKey.publicKey = StringView.base64ToBytes(res.devices[i].preKey.publicKey);
-                //TODO: Is this still needed?
-                //if (res.devices[i].keyId === undefined)
-                //  res.devices[i].keyId = 0;
             }
-            return res;
+            var jsonData = { messages: messageArray };
-        });
+            jsonData.timestamp = messageArray[0].timestamp;
-    };
 
-    self.sendMessages = function(destination, messageArray, legacy) {
+            return this.ajax({
-        //TODO: Do this conversion somewhere else?
+                call                : 'messages',
-        for (var i = 0; i < messageArray.length; i++) {
+                httpType            : 'PUT',
-            messageArray[i].content = btoa(messageArray[i].content);
+                urlParameters       : '/' + destination,
-            if (legacy) {
+                jsonData            : jsonData,
-                messageArray[i].body = messageArray[i].content;
+            });
-                delete messageArray[i].content;
+        },
-            }
+        getAttachment: function(id) {
+            return this.ajax({
+                call                : 'attachment',
+                httpType            : 'GET',
+                urlParameters       : '/' + id,
+            }).then(function(response) {
+                return ajax(response.location, {
+                    type        : "GET",
+                    responseType: "arraybuffer",
+                    contentType : "application/octet-stream"
+                });
+            });
+        },
+        putAttachment: function(encryptedBin) {
+            return this.ajax({
+                call     : 'attachment',
+                httpType : 'GET',
+            }).then(function(response) {
+                return ajax(response.location, {
+                    type        : "PUT",
+                    contentType : "application/octet-stream",
+                    data        : encryptedBin,
+                    processData : false,
+                }).then(function() {
+                    // Parse the id as a string from the location url
+                    // (workaround for ids too large for Javascript numbers)
+                    return response.location.match(attachment_id_regex)[1];
+                });
+            });
+        },
+        getMessageSocket: function() {
+            return new WebSocket(
+                this.url.replace('https://', 'wss://')
+                    .replace('http://', 'ws://')
+                    + '/v1/websocket/?login=' + encodeURIComponent(this.username)
+                    + '&password=' + encodeURIComponent(this.password)
+            );
+        },
+        getProvisioningSocket: function () {
+            return new WebSocket(
+                this.url.replace('https://', 'wss://')
+                    .replace('http://', 'ws://')
+                    + '/v1/websocket/provisioning/'
+            );
         }
-        var jsonData = { messages: messageArray };
-        jsonData.timestamp = messageArray[0].timestamp;
-
-        return doAjax({
-            call                : 'messages',
-            httpType            : 'PUT',
-            urlParameters       : '/' + destination,
-            do_auth             : true,
-            jsonData            : jsonData,
-        });
     };
 
-    self.getAttachment = function(id) {
+    return TextSecureServer;
-        return doAjax({
+})();
-            call                : 'attachment',
-            httpType            : 'GET',
-            urlParameters       : '/' + id,
-            do_auth             : true,
-        }).then(function(response) {
-            return ajax(response.location, {
-                type        : "GET",
-                responseType: "arraybuffer",
-                contentType : "application/octet-stream"
-            });
-        });
-    };
-
-    var id_regex = RegExp( "^https:\/\/.*\/(\\d+)\?");
-    self.putAttachment = function(encryptedBin) {
-        return doAjax({
-            call     : 'attachment',
-            httpType : 'GET',
-            do_auth  : true,
-        }).then(function(response) {
-            return ajax(response.location, {
-                type        : "PUT",
-                contentType : "application/octet-stream",
-                data        : encryptedBin,
-                processData : false,
-            }).then(function() {
-                // Parse the id as a string from the location url
-                // (workaround for ids too large for Javascript numbers)
-                return response.location.match(id_regex)[1];
-            });
-        });
-    };
-
-    self.getMessageWebsocket = function(url) {
-        var user = textsecure.storage.user.getNumber() + "." + textsecure.storage.user.getDeviceId();
-        var password = textsecure.storage.get("password");
-        var params = 'login=%2B' + encodeURIComponent(user.substring(1)) + '&password=' + encodeURIComponent(password);
-        var url = url + URL_CALLS['push'] + '/?' + params;
-        return TextSecureWebSocket(url, {reconnectTimeout: false});
-    }
-
-    self.getTempWebsocket = function() {
-        var url = URL_BASE.replace(/^http/g, 'ws') + URL_CALLS['temp_push'] + '/?';
-        return TextSecureWebSocket(url, {reconnectTimeout: false});
-    }
-
-    return self;
-}();

libtextsecure/message_receiver.js

@@ -11,6 +11,7 @@
         this.signalingKey = signalingKey;
         this.username = username;
         this.password = password;
+        this.server = new TextSecureServer(url, username, password);
 
         var unencoded = textsecure.utils.unencodeNumber(username);
         this.number = unencoded[0];
@@ -21,17 +22,12 @@
     MessageReceiver.prototype = {
         constructor: MessageReceiver,
         connect: function() {
-            // initialize the socket and start listening for messages
             if (this.socket && this.socket.readyState !== WebSocket.CLOSED) {
                 this.socket.close();
             }
             console.log('opening websocket');
-            this.socket = new WebSocket(
+            // initialize the socket and start listening for messages
-                this.url.replace('https://', 'wss://').replace('http://', 'ws://')
+            this.socket = this.server.getMessageSocket();
-                    + '/v1/websocket/?login=' + encodeURIComponent(this.username)
-                    + '&password=' + encodeURIComponent(this.password)
-            );
-
             this.socket.onclose = this.onclose.bind(this);
             this.socket.onerror = this.onerror.bind(this);
             this.socket.onopen = this.onopen.bind(this);
@@ -54,7 +50,7 @@
             var eventTarget = this;
             console.log('websocket closed', ev.code);
             // possible 403 or network issue. Make an request to confirm
-            TextSecureServer.getDevices(this.number).
+            this.server.getDevices(this.number).
                 then(this.connect.bind(this)). // No HTTP error? Reconnect
                 catch(function(e) {
                     var ev = new Event('error');

libtextsecure/websocket.js

@@ -1,72 +0,0 @@
-/*
- * vim: ts=4:sw=4:expandtab
- *
- * var socket = TextSecureWebSocket(url);
- *
- * Returns an adamantium-reinforced super socket, capable of
- * automatically reconnecting.
- *
- */
-
-TextSecureWebSocket = function (url, opts) {
-    'use strict';
-    opts = opts || {};
-    var reconnectTimeout = 1000;
-    if (opts && opts.reconnectTimeout !== undefined) {
-        reconnectTimeout = opts.reconnectTimeout;
-    }
-    var reconnectSemaphore = 0;
-    var socket;
-    var calledClose = false;
-    var socketWrapper = {
-        onmessage : function() {},
-        onclose   : function() {},
-        onerror   : function() {},
-        getStatus : function() { return socket.readyState; },
-        close     : function(code, reason) {
-            calledClose = true;
-            socket.close(code, reason);
-        }
-    };
-    var error;
-
-    function onclose(e) {
-        if (!error && !calledClose && reconnectTimeout) {
-            reconnectSemaphore--;
-            setTimeout(connect, reconnectTimeout);
-        }
-        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);
-    };
-
-    function send(msg) {
-        socket.send(msg);
-    };
-
-    function connect() {
-        if (++reconnectSemaphore <= 0) { return; }
-
-        if (socket) { socket.close(); }
-        socket = new WebSocket(url);
-
-        socket.onerror     = onerror
-        socket.onclose     = onclose;
-        socket.onmessage   = onmessage;
-        socketWrapper.send = send;
-    };
-
-    connect();
-    return socketWrapper;
-};