Remove manual LZString compression for partial socket io event data

Author: jackycute

lib/ot/editor-socketio-server.js

@@ -7,7 +7,6 @@ var Server = require('./server');
 var Selection = require('./selection');
 var util = require('util');
 
-var LZString = require('lz-string');
 var logger = require('../logger');
 
 function EditorSocketIOServer(document, operations, docId, mayWrite, operationCallback) {
@@ -40,10 +39,8 @@ EditorSocketIOServer.prototype.addClient = function (socket) {
         revision: this.operations.length,
         clients: this.users
     };
-    socket.emit('doc', LZString.compressToUTF16(JSON.stringify(docOut)));
+    socket.emit('doc', docOut);
     socket.on('operation', function (revision, operation, selection) {
-        operation = LZString.decompressFromUTF16(operation);
-        operation = JSON.parse(operation);
         socket.origin = 'operation';
         self.mayWrite(socket, function (mayWrite) {
             if (!mayWrite) {
@@ -62,7 +59,7 @@ EditorSocketIOServer.prototype.addClient = function (socket) {
                         clients: self.users,
                         force: true
                     };
-                    socket.emit('doc', LZString.compressToUTF16(JSON.stringify(docOut)));
+                    socket.emit('doc', docOut);
                 }, 100);
             }
         });
@@ -129,7 +126,6 @@ EditorSocketIOServer.prototype.onGetOperations = function (socket, base, head) {
     var operations = this.operations.slice(base, head).map(function (op) {
         return op.wrapped.toJSON();
     });
-    operations = LZString.compressToUTF16(JSON.stringify(operations));
     socket.emit('operations', head, operations);
 };
 

lib/realtime.js

@@ -71,7 +71,6 @@ function emitCheck(note) {
         authors: note.authors,
         authorship: note.authorship
     };
-    out = LZString.compressToUTF16(JSON.stringify(out));
     realtime.io.to(note.id).emit('check', out);
 }
 
@@ -301,7 +300,6 @@ function emitOnlineUsers(socket) {
     var out = {
         users: users
     };
-    out = LZString.compressToUTF16(JSON.stringify(out));
     realtime.io.to(noteId).emit('online users', out);
 }
 
@@ -330,7 +328,6 @@ function emitRefresh(socket) {
         createtime: note.createtime,
         updatetime: note.updatetime
     };
-    out = LZString.compressToUTF16(JSON.stringify(out));
     socket.emit('refresh', out);
 }
 
@@ -863,7 +860,6 @@ function connection(socket) {
         var out = {
             users: users
         };
-        out = LZString.compressToUTF16(JSON.stringify(out));
         socket.emit('online users', out);
     });
 

public/js/index.js

@@ -2645,8 +2645,6 @@ editor.on('update', function () {
     });
 });
 socket.on('check', function (data) {
-    data = LZString.decompressFromUTF16(data);
-    data = JSON.parse(data);
     //console.log(data);
     updateInfo(data);
 });
@@ -2656,8 +2654,6 @@ socket.on('permission', function (data) {
 var docmaxlength = null;
 var permission = null;
 socket.on('refresh', function (data) {
-    data = LZString.decompressFromUTF16(data);
-    data = JSON.parse(data);
     //console.log(data);
     docmaxlength = data.docmaxlength;
     editor.setOption("maxLength", docmaxlength);
@@ -2704,8 +2700,6 @@ var CodeMirrorAdapter = ot.CodeMirrorAdapter;
 var cmClient = null;
 
 socket.on('doc', function (obj) {
-    obj = LZString.decompressFromUTF16(obj);
-    obj = JSON.parse(obj);
     var body = obj.str;
     var bodyMismatch = editor.getValue() !== body;
     var havePendingOperation = cmClient && Object.keys(cmClient.state).length > 0;
@@ -2766,8 +2760,6 @@ socket.on('operation', function () {
 });
 
 socket.on('online users', function (data) {
-    data = LZString.decompressFromUTF16(data);
-    data = JSON.parse(data);
     if (debug)
         console.debug(data);
     onlineUsers = data.users;

public/vendor/ot/ot.min.js

@@ -24,8 +24,6 @@ ot.SocketIOAdapter = (function () {
             self.trigger('selection', clientId, selection);
         });
         socket.on('operations', function (head, operations) {
-            operations = LZString.decompressFromUTF16(operations);
-            operations = JSON.parse(operations);
             self.trigger('operations', head, operations);
         });
         socket.on('selection', function (clientId, selection) {
@@ -37,7 +35,6 @@ ot.SocketIOAdapter = (function () {
     }
 
     SocketIOAdapter.prototype.sendOperation = function (revision, operation, selection) {
-        operation = LZString.compressToUTF16(JSON.stringify(operation));
         this.socket.emit('operation', revision, operation, selection);
     };