r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Added test dc HTTPS support

Browse Source
This commit is contained in:
Igor Zhukov 2014-10-31 18:16:40 +03:00
parent eb45bfae75
commit 4e08814d10
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
app/js/lib/mtproto.js
View File

@ -9,25 +9,31 @@ angular.module('izhukov.mtproto', ['izhukov.utils'])
.factory('MtpDcConfigurator', function () { .factory('MtpDcConfigurator', function () {
var dcOptions = Config.Modes.test var dcOptions = Config.Modes.test
? (location.protocol == 'https:'
? [ ? [
{id: 1, url: 'http://173.240.5.253'}, {id: 1, url: 'https://pluto.web.telegram.org/apiw_test1'},
{id: 2, url: 'http://149.154.167.40'}, {id: 2, url: 'https://venus.web.telegram.org/apiw_test1'},
{id: 3, url: 'http://174.140.142.5'} {id: 3, url: 'https://aurora.web.telegram.org/apiw_test1'}
]
: (location.protocol == 'https:'
? [
{id: 1, url: 'https://pluto.web.telegram.org'},
{id: 2, url: 'https://venus.web.telegram.org'},
{id: 3, url: 'https://aurora.web.telegram.org'},
{id: 4, url: 'https://vesta.web.telegram.org'},
{id: 5, url: 'https://flora.web.telegram.org'}
] ]
: [ : [
{id: 1, url: 'http://173.240.5.1'}, {id: 1, url: 'http://173.240.5.253/apiw1'},
{id: 2, url: 'http://149.154.167.51'}, {id: 2, url: 'http://149.154.167.40/apiw1'},
{id: 3, url: 'http://174.140.142.6'}, {id: 3, url: 'http://174.140.142.5/apiw1'}
{id: 4, url: 'http://149.154.167.91'}, ])
{id: 5, url: 'http://149.154.171.5'} : (location.protocol == 'https:'
? [
{id: 1, url: 'https://pluto.web.telegram.org/apiw1'},
{id: 2, url: 'https://venus.web.telegram.org/apiw1'},
{id: 3, url: 'https://aurora.web.telegram.org/apiw1'},
{id: 4, url: 'https://vesta.web.telegram.org/apiw1'},
{id: 5, url: 'https://flora.web.telegram.org/apiw1'}
]
: [
{id: 1, url: 'http://173.240.5.1/apiw1'},
{id: 2, url: 'http://149.154.167.51/apiw1'},
{id: 3, url: 'http://174.140.142.6/apiw1'},
{id: 4, url: 'http://149.154.167.91/apiw1'},
{id: 5, url: 'http://149.154.171.5/apiw1'}
]); ]);
var chosenServers = {}; var chosenServers = {};
@ -205,7 +211,7 @@ angular.module('izhukov.mtproto', ['izhukov.utils'])
var requestData = xhrSendBuffer ? resultBuffer : resultArray, var requestData = xhrSendBuffer ? resultBuffer : resultArray,
requestPromise; requestPromise;
try { try {
requestPromise = $http.post(MtpDcConfigurator.chooseServer(dcID) + '/apiw1', requestData, { requestPromise = $http.post(MtpDcConfigurator.chooseServer(dcID), requestData, {
responseType: 'arraybuffer', responseType: 'arraybuffer',
transformRequest: null transformRequest: null
}); });
@ -1195,7 +1201,7 @@ angular.module('izhukov.mtproto', ['izhukov.utils'])
responseType: 'arraybuffer', responseType: 'arraybuffer',
transformRequest: null transformRequest: null
}); });
requestPromise = $http.post(MtpDcConfigurator.chooseServer(self.dcID) + '/apiw1', requestData, options); requestPromise = $http.post(MtpDcConfigurator.chooseServer(self.dcID), requestData, options);
} catch (e) { } catch (e) {
requestPromise = $q.reject(e); requestPromise = $q.reject(e);
} }