Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 08:21:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

makes connections!

Browse source
This commit is contained in:
Howard Stearns 2017-03-29 13:23:31 -07:00
parent b0c97d3a82
commit 53d484c318
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scripts/system/makeUserConnection.js
View file

@ -131,6 +131,7 @@ function request(options, callback) { // cb(error, responseOfCorrectContentType)
var error = (httpRequest.status !== HTTP_OK) && httpRequest.status.toString() + ':' + httpRequest.statusText, var error = (httpRequest.status !== HTTP_OK) && httpRequest.status.toString() + ':' + httpRequest.statusText,
response = !error && httpRequest.responseText, response = !error && httpRequest.responseText,
contentType = !error && httpRequest.getResponseHeader('content-type'); contentType = !error && httpRequest.getResponseHeader('content-type');
debug('FIXME REMOVE: server response', options, error, response, contentType);
if (!error && contentType.indexOf('application/json') === 0) { // ignoring charset, etc. if (!error && contentType.indexOf('application/json') === 0) { // ignoring charset, etc.
try { try {
response = JSON.parse(response); response = JSON.parse(response);
@ -163,7 +164,7 @@ function request(options, callback) { // cb(error, responseOfCorrectContentType)
options.headers["Content-type"] = "application/json"; options.headers["Content-type"] = "application/json";
options.body = JSON.stringify(options.body); options.body = JSON.stringify(options.body);
} }
debug("FIXME final options to send", options); debug("FIXME REMOVE: final options to send", options);
for (key in options.headers || {}) { for (key in options.headers || {}) {
httpRequest.setRequestHeader(key, options.headers[key]); httpRequest.setRequestHeader(key, options.headers[key]);
} }
@ -546,23 +547,24 @@ function connectionRequestCompleted() { // Final result is in. Do effects.
// IWBNI we also did some fail sound/visual effect. // IWBNI we also did some fail sound/visual effect.
Window.makeConnection(false, result.connection); Window.makeConnection(false, result.connection);
} }
var POLL_INTERVAL_MS = 200, POLL_LIMIT = 5;
function handleConnectionResponseAndMaybeRepeat(error, response) { function handleConnectionResponseAndMaybeRepeat(error, response) {
// If response is 'pending', set a short timeout to try again. // If response is 'pending', set a short timeout to try again.
// If we fail other than pending, set result and immediately call connectionRequestCompleted. // If we fail other than pending, set result and immediately call connectionRequestCompleted.
// If we succceed, set result and call connectionRequestCompleted immediately (if we've been polling), and otherwise on a timeout. // If we succceed, set result and call connectionRequestCompleted immediately (if we've been polling), and otherwise on a timeout.
if (response && (response.connection === 'pending')) { if (response && (response.connection === 'pending')) {
debug(response, 'pollLimit', pollLimit); debug(response, 'pollCount', pollCount);
if (pollCount++ >= 5) { // server will expire, but let's not wait that long. if (pollCount++ >= POLL_LIMIT) { // server will expire, but let's not wait that long.
result = {status: 'error', connection: 'expired'}; result = {status: 'error', connection: 'expired'};
connectionRequestCompleted(); connectionRequestCompleted();
} else { } else { // poll
Script.setTimeout(function () { Script.setTimeout(function () {
request({ request({
uri: requestUrl, uri: requestUrl,
json: true, // N.B.: server gives bad request if we specify json content type, so don't do that.
body: requestBody body: requestBody
}, handleConnectionResponseAndMaybeRepeat); }, handleConnectionResponseAndMaybeRepeat);
}, 200); }, POLL_INTERVAL_MS);
} }
} else if (error || (response.status !== 'success')) { } else if (error || (response.status !== 'success')) {
debug('server fail', error, response.status); debug('server fail', error, response.status);
@ -600,7 +602,7 @@ function makeConnection(id) {
uri: requestUrl, uri: requestUrl,
method: 'POST', method: 'POST',
json: true, json: true,
body: {user_connection_request: requestbody} body: {user_connection_request: requestBody}
}, handleConnectionResponseAndMaybeRepeat); }, handleConnectionResponseAndMaybeRepeat);
} }

2
scripts/system/notifications.js
View file

@ -542,7 +542,7 @@ function processingGif() {
} }
function connectionAdded(connectionName) { function connectionAdded(connectionName) {
createNotification(wordWrap("Successfully connected to " + connectionName), NotificationType.CONNECTION); createNotification(connectionName, NotificationType.CONNECTION);
} }
function connectionError(error) { function connectionError(error) {