Browse Source

Remove compression and base64 encoding since we don't need them anymore

pull/551/head
Timothée Jaussoin 8 years ago
parent
commit
dfbf344682
  1. 53
      app/assets/js/movim_utils.js
  2. 3
      app/assets/js/movim_websocket.js
  3. 6
      linker.php

53
app/assets/js/movim_utils.js

@ -25,59 +25,6 @@ var MovimUtils = {
cleanupId: function(string) {
return "id-" + string.replace(/([^a-z0-9]+)/gi, '-').toLowerCase();
},
base64Decode: function(data) {
// discuss at: http://phpjs.org/functions/base64_decode/
// original by: Tyler Akins (http://rumkin.com)
// improved by: Thunder.m
// improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
// improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
// input by: Aman Gupta
// input by: Brett Zamir (http://brett-zamir.me)
// bugfixed by: Onno Marsman
// bugfixed by: Pellentesque Malesuada
// bugfixed by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
// example 1: base64_decode('S2V2aW4gdmFuIFpvbm5ldmVsZA==');
// returns 1: 'Kevin van Zonneveld'
// example 2: base64_decode('YQ===');
// returns 2: 'a'
var b64 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
var o1, o2, o3, h1, h2, h3, h4, bits, i = 0,
ac = 0,
dec = '',
tmp_arr = [];
if (!data) {
return data;
}
data += '';
do { // unpack four hexets into three octets using index points in b64
h1 = b64.indexOf(data.charAt(i++));
h2 = b64.indexOf(data.charAt(i++));
h3 = b64.indexOf(data.charAt(i++));
h4 = b64.indexOf(data.charAt(i++));
bits = h1 << 18 | h2 << 12 | h3 << 6 | h4;
o1 = bits >> 16 & 0xff;
o2 = bits >> 8 & 0xff;
o3 = bits & 0xff;
if (h3 == 64) {
tmp_arr[ac++] = String.fromCharCode(o1);
} else if (h4 == 64) {
tmp_arr[ac++] = String.fromCharCode(o1, o2);
} else {
tmp_arr[ac++] = String.fromCharCode(o1, o2, o3);
}
} while (i < data.length);
dec = tmp_arr.join('');
return dec.replace(/\0+$/, '');
},
checkString: function(str) {
if (typeof str == 'object') {
return str instanceof String;

3
app/assets/js/movim_websocket.js

@ -69,8 +69,7 @@ var MovimWebsocket = {
};
this.connection.onmessage = function(e) {
data = pako.ungzip(MovimUtils.base64Decode(e.data), { to: 'string' });
var obj = JSON.parse(data);
var obj = JSON.parse(e.data);
if(obj != null) {
if(obj.func == 'registered') {

6
linker.php

@ -63,7 +63,7 @@ function writeOut($msg = null)
global $pullSocket;
if(!empty($msg)) {
$pullSocket->send(base64_encode(gzcompress(json_encode($msg), 9)));
$pullSocket->send(json_encode($msg));
}
}
@ -96,7 +96,7 @@ $pushSocketBehaviour = function ($msg) use (&$conn, $loop, &$buffer, &$connector
// And we say that we are ready !
$obj = new \StdClass;
$obj->func = 'pong';
$pullSocket->send(base64_encode(gzcompress(json_encode($obj), 9)));
$pullSocket->send(json_encode($obj));
break;
case 'down':
@ -237,7 +237,7 @@ $xmppBehaviour = function (React\Socket\Connection $stream) use (&$conn, $loop,
fwrite(STDERR, 'registered');
$pullSocket->send(base64_encode(gzcompress(json_encode($obj), 9)));
$pullSocket->send(json_encode($obj));
};
$pushSocket->on('message', $pushSocketBehaviour);

Loading…
Cancel
Save