projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "BUG-410 -- update RIFT platform"
[osm/UI.git]
/
skyquake
/
framework
/
core
/
api_utils
/
sockets.js
diff --git
a/skyquake/framework/core/api_utils/sockets.js
b/skyquake/framework/core/api_utils/sockets.js
index
6076594
..
a86f5ed
100644
(file)
--- a/
skyquake/framework/core/api_utils/sockets.js
+++ b/
skyquake/framework/core/api_utils/sockets.js
@@
-1,5
+1,5
@@
/*
/*
- *
+ *
* Copyright 2016 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* Copyright 2016 RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-32,17
+32,10
@@
var Promise = require('promise');
var url = require('url');
var sockjs = require('sockjs');
var websocket_multiplex = require('websocket-multiplex');
var url = require('url');
var sockjs = require('sockjs');
var websocket_multiplex = require('websocket-multiplex');
+var utils = require('./utils.js');
+var configurationAPI = require('../modules/api/configuration.js');
-function getPortForProtocol (protocol) {
- switch (protocol) {
- case 'http':
- return 8000;
- case 'https':
- return 8443;
- }
-}
-
var Subscriptions = function() {
this.ID = 0;
this.socketServers = {};
var Subscriptions = function() {
this.ID = 0;
this.socketServers = {};
@@
-85,7
+78,7
@@
Subscriptions.prototype.subscribe = function(req, callback) {
var origin = '';
if (req.query['api_server']) {
var api_server_protocol = req.query['api_server'].match(protocolTest)[1];
var origin = '';
if (req.query['api_server']) {
var api_server_protocol = req.query['api_server'].match(protocolTest)[1];
- var api_server_origin = req.query['api_server'] + ':' + getPortForProtocol(api_server_protocol);
+ var api_server_origin = req.query['api_server'] + ':' +
utils.
getPortForProtocol(api_server_protocol);
origin = api_server_origin;
protocol = api_server_protocol;
} else {
origin = api_server_origin;
protocol = api_server_protocol;
} else {
@@
-190,7
+183,7
@@
Subscriptions.prototype.socketInstance = function(url, req, wss, Type, channelId
if (Type == PollingSocket) {
Socket = new Type(url, req, 1000, req.body);
} else {
if (Type == PollingSocket) {
Socket = new Type(url, req, 1000, req.body);
} else {
- Socket = new Type(url);
+ Socket = new Type(url
, ['Bearer', req.session.passport.user.user['access_token']]
);
}
console.log('Socket assigned for url', url);
}
}
console.log('Socket assigned for url', url);
}
@@
-286,12
+279,12
@@
function PollingSocket(url, req, interval, config) {
self.isClosed = false;
var requestHeaders = {};
_.extend(requestHeaders, {
self.isClosed = false;
var requestHeaders = {};
_.extend(requestHeaders, {
-
'Authorization': req.get('Authorization
')
+
Cookie: req.get('Cookie
')
});
var pollServer = function() {
Request({
});
var pollServer = function() {
Request({
- url: u
rl
,
+ url: u
tils.projectContextUrl(req, url)
,
method: config.method || 'GET',
headers: requestHeaders,
json: config.payload,
method: config.method || 'GET',
headers: requestHeaders,
json: config.payload,
@@
-302,7
+295,11
@@
function PollingSocket(url, req, interval, config) {
console.log('Error polling: ' + url);
} else {
if (!self.isClosed) {
console.log('Error polling: ' + url);
} else {
if (!self.isClosed) {
- self.poll = setTimeout(pollServer, 1000 || interval);
+ if(process.env.DISABLE_POLLING != "TRUE") {
+ self.poll = setTimeout(pollServer, 1000 || interval);
+ } else {
+ console.log('Polling is disabled. Finishing request.')
+ }
var data = response.body;
if (self.onmessage) {
self.onmessage(data);
var data = response.body;
if (self.onmessage) {
self.onmessage(data);