github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

DRY up a bit

Browse source
This commit is contained in:
Alasdair Smith 2017-09-21 15:07:15 +01:00
parent b796879c9f
commit 55c880e1dd
1 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
services/real-time/app/coffee/WebsocketController.coffee
View file

@ -91,38 +91,28 @@ module.exports = WebsocketController =
return callback(error) if error? return callback(error) if error?
DocumentUpdaterManager.getDocument project_id, doc_id, fromVersion, (error, lines, version, ranges, ops) -> DocumentUpdaterManager.getDocument project_id, doc_id, fromVersion, (error, lines, version, ranges, ops) ->
return callback(error) if error? return callback(error) if error?
# Encode any binary bits of data so it can go via WebSockets # Encode any binary bits of data so it can go via WebSockets
# See http://ecmanaut.blogspot.co.uk/2006/07/encoding-decoding-utf8-in-javascript.html # See http://ecmanaut.blogspot.co.uk/2006/07/encoding-decoding-utf8-in-javascript.html
encodeForWebsockets = (text) -> unescape(encodeURIComponent(text))
escapedLines = [] escapedLines = []
for line in lines for line in lines
try try
line = unescape(encodeURIComponent(line)) line = encodeForWebsockets(line)
catch err catch err
logger.err {err, project_id, doc_id, fromVersion, line, client_id: client.id}, "error encoding line uri component" logger.err {err, project_id, doc_id, fromVersion, line, client_id: client.id}, "error encoding line uri component"
return callback(err) return callback(err)
escapedLines.push line escapedLines.push line
if options.encodeRanges if options.encodeRanges
if ranges.comments
escapedComments = []
for comment in ranges.comments
try try
comment.op.c = unescape(encodeURIComponent(comment.op.c)) for comment in ranges?.comments or []
comment.op.c = encodeForWebsockets(comment.op.c)
for change in ranges?.changes or []
change.op.i = encodeForWebsockets(comment.op.i) if change.op.i
change.op.d = encodeForWebsockets(comment.op.d) if change.op.d
catch err catch err
logger.err {err, project_id, doc_id, fromVersion, comment, client_id: client.id}, "error encoding comment uri component" logger.err {err, project_id, doc_id, fromVersion, ranges, client_id: client.id}, "error encoding range uri component"
return callback(err) return callback(err)
escapedComments.push comment
ranges.comments = escapedComments
if ranges.changes
escapedChanges = []
for change in ranges.changes
try
change.op.i = unescape(encodeURIComponent(change.op.i)) if change.op.i
change.op.d = unescape(encodeURIComponent(change.op.d)) if change.op.d
catch err
logger.err {err, project_id, doc_id, fromVersion, change, client_id: client.id}, "error encoding change uri component"
return callback(err)
escapedChanges.push change
ranges.changes = escapedChanges
AuthorizationManager.addAccessToDoc client, doc_id AuthorizationManager.addAccessToDoc client, doc_id
client.join(doc_id) client.join(doc_id)