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

Added modified console polyfills to Workers

Browse Source
This commit is contained in:
Igor Zhukov 2014-01-24 23:29:32 +04:00
parent 70cdf39378
commit 877b445c39
6 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/index.html
View File

@ -31,7 +31,7 @@
ga('send', 'pageview');
</script>
<script type="text/javascript" src="vendor/console-polyfill/console-polyfill.js"></script>
<script type="text/javascript" src="vendor/console-polyfill/console-polyfill.js?1"></script>
<script type="text/javascript" src="vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="vendor/jquery.nanoscroller/nanoscroller.js"></script>
<script type="text/javascript" src="vendor/jquery.emojiarea/jquery.emojiarea.js"></script>
@ -48,7 +48,7 @@
<script type="text/javascript" src="js/lib/config.js"></script>
<script type="text/javascript" src="js/lib/mtproto.js?12"></script>
<script type="text/javascript" src="js/lib/mtproto.js?13"></script>
<script type="text/javascript" src="js/util.js"></script>
<script type="text/javascript" src="js/app.js?5"></script>

7
app/js/lib/aes_worker.js
View File

@ -5,7 +5,12 @@
* https://github.com/zhukov/webogram/blob/master/LICENSE
*/
importScripts('mtproto.js', '../../vendor/jsbn/jsbn_combined.js', '../../vendor/cryptoJS/crypto.js');
importScripts(
'../../vendor/console-polyfill/console-polyfill.js?1',
'mtproto.js',
'../../vendor/jsbn/jsbn_combined.js',
'../../vendor/cryptoJS/crypto.js'
);
onmessage = function (e) {
// console.log('AES worker in', e.data);

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

@ -1113,7 +1113,7 @@ factory('MtpAuthorizer', function (MtpDcConfigurator, MtpRsaKeysManager, MtpSecu
console.log('PQ factorization start');
if (!!window.Worker) {
var worker = new Worker('js/lib/pq_worker.js');
var worker = new Worker('js/lib/pq_worker.js?1');
worker.onmessage = function (e) {
auth.p = e.data[0];
@ -1407,7 +1407,7 @@ factory('MtpAesService', function ($q) {
};
}
var worker = new Worker('js/lib/aes_worker.js'),
var worker = new Worker('js/lib/aes_worker.js?1'),
taskID = 0,
awaiting = {};
@ -1459,7 +1459,7 @@ factory('MtpSha1Service', function ($q) {
};
}
var worker = new Worker('js/lib/sha1_worker.js'),
var worker = new Worker('js/lib/sha1_worker.js?1'),
taskID = 0,
awaiting = {};
@ -1511,13 +1511,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
// })();
// }
this.sessionID = new Array(8);
MtpSecureRandom.nextBytes(this.sessionID);
if (false) {
this.sessionID[0] = 0xAB;
this.sessionID[1] = 0xCD;
}
this.updateSession();
this.seqNo = 0;
this.currentRequests = 0;
@ -1537,6 +1531,15 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
this.checkLongPoll();
};
MtpNetworker.prototype.updateSession = function () {
this.sessionID = new Array(8);
MtpSecureRandom.nextBytes(this.sessionID);
if (false) {
this.sessionID[0] = 0xAB;
this.sessionID[1] = 0xCD;
}
}
MtpNetworker.prototype.generateSeqNo = function (notContentRelated) {
var seqNo = this.seqNo * 2;
@ -2046,6 +2049,7 @@ factory('MtpNetworkerFactory', function (MtpDcConfigurator, MtpMessageIdGenerato
if (message.error_code == 16 || message.error_code == 17) {
MtpMessageIdGenerator.applyServerTime((new BigInteger(messageID, 10)).shiftRight(32).toString(10));
this.updateSession();
this.pushResend(message.bad_msg_id);
this.ackMessage(messageID);
}
@ -2229,7 +2233,7 @@ factory('MtpApiManager', function (AppConfigManager, MtpAuthorizer, MtpNetworker
},
function (error) {
console.log('error', error.code, error.type, baseDcID, dcID);
if (error.code == 401 && error.type == 'AUTH_KEY_UNREGISTERED' && baseDcID && dcID != baseDcID) {
if (error.code == 401 && baseDcID && dcID != baseDcID) {
if (cachedExportPromise[dcID] === undefined) {
var exportDeferred = $q.defer();

6
app/js/lib/pq_worker.js
View File

@ -5,7 +5,11 @@
* https://github.com/zhukov/webogram/blob/master/LICENSE
*/
importScripts('mtproto.js', '../../vendor/jsbn/jsbn_combined.js');
importScripts(
'../../vendor/console-polyfill/console-polyfill.js?1',
'mtproto.js',
'../../vendor/jsbn/jsbn_combined.js'
);
onmessage = function (e) {
postMessage(pqPrimeFactorization(e.data));

6
app/js/lib/sha1_worker.js
View File

@ -5,7 +5,11 @@
* https://github.com/zhukov/webogram/blob/master/LICENSE
*/
importScripts('mtproto.js', '../../vendor/cryptoJS/crypto.js');
importScripts(
'../../vendor/console-polyfill/console-polyfill.js?1',
'mtproto.js',
'../../vendor/cryptoJS/crypto.js'
);
onmessage = function (e) {
var taskID = e.data.taskID;

4
app/vendor/console-polyfill/console-polyfill.js vendored
View File

@ -12,4 +12,6 @@
'time,timeEnd,trace,warn').split(',');
while (prop = properties.pop()) con[prop] = con[prop] || empty;
while (method = methods.pop()) con[method] = con[method] || dummy;
})(window.console = window.console || {});
})(this.console = this.console || {});
// For Workers compatibility `window` object is replaced with `this` keyword