github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #127 from sharelatex/pdfng-server-fixes

Browse source 
pdfng server fixes
This commit is contained in:
James Allen 2014-12-16 10:30:22 +00:00
commit 2a2dc458e8
5 changed files with 172 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
services/web/app/coffee/Features/Compile/CompileController.coffee
View file

@ -25,12 +25,13 @@ module.exports = CompileController =
if req.body?.compiler
options.compiler = req.body.compiler
logger.log {options, project_id}, "got compile request"
CompileManager.compile project_id, user_id, options, (error, status, outputFiles) ->
CompileManager.compile project_id, user_id, options, (error, status, outputFiles, output, limits) ->
return next(error) if error?
res.contentType("application/json")
res.send 200, JSON.stringify {
status: status
outputFiles: outputFiles
compileGroup: limits?.compileGroup
}
downloadPdf: (req, res, next = (error) ->)->
@ -69,8 +70,14 @@ module.exports = CompileController =
CompileController.proxyToClsi(req.params.Project_id, req.url, req, res, next)
proxyToClsi: (project_id, url, req, res, next = (error) ->) ->
if req.query?.compileGroup
CompileController.proxyToClsiWithLimits(project_id, url, {compileGroup: req.query.compileGroup}, req, res, next)
else
CompileManager.getProjectCompileLimits project_id, (error, limits) ->
return next(error) if error?
CompileController.proxyToClsiWithLimits(project_id, url, limits, req, res, next)
proxyToClsiWithLimits: (project_id, url, limits, req, res, next = (error) ->) ->
if limits.compileGroup == "priority"
compilerUrl = Settings.apis.clsi_priority.url
else
@ -78,9 +85,15 @@ module.exports = CompileController =
url = "#{compilerUrl}#{url}"
logger.log url: url, "proxying to CLSI"
oneMinute = 60 * 1000
# pass through If-* and Range headers for byte serving pdfs
# do not send any others, potential proxying loop if Host: is passed!
if req.query?.pdfng
newHeaders = {}
for h, v of req.headers
newHeaders[h] = req.headers[h] if h.match /^(If-|Range)/i
proxy = request(url: url, method: req.method, timeout: oneMinute, headers: newHeaders)
else
proxy = request(url: url, method: req.method, timeout: oneMinute)
proxy.pipe(res)
proxy.on "error", (error) ->
logger.warn err: error, url: url, "CLSI proxy error"

2
services/web/app/coffee/Features/Compile/CompileManager.coffee
View file

@ -39,7 +39,7 @@ module.exports = CompileManager =
ClsiManager.sendRequest project_id, options, (error, status, outputFiles, output) ->
return callback(error) if error?
logger.log files: outputFiles, "output files"
callback(null, status, outputFiles, output)
callback(null, status, outputFiles, output, limits)
deleteAuxFiles: (project_id, callback = (error) ->) ->
CompileManager.getProjectCompileLimits project_id, (error, limits) ->

5
services/web/public/coffee/ide/pdf/controllers/PdfController.coffee
View file

@ -38,6 +38,11 @@ define [
$scope.pdf.failure = true
fetchLogs()
else if response.status == "success"
if response.compileGroup?
$scope.pdf.compileGroup = response.compileGroup
$scope.pdf.url = "/project/#{$scope.project_id}/output/output.pdf?cache_bust=#{Date.now()}" +
"&compileGroup=#{$scope.pdf.compileGroup}"
else
$scope.pdf.url = "/project/#{$scope.project_id}/output/output.pdf?cache_bust=#{Date.now()}"
fetchLogs()

3
services/web/public/coffee/ide/pdfng/directives/pdfViewer.coffee
View file

@ -26,7 +26,8 @@ define [
$scope.document.destroy() if $scope.document?
$scope.document = new PDFRenderer($scope.pdfSrc, {
# TODO need a proper url manipulation library to add to query string
$scope.document = new PDFRenderer($scope.pdfSrc + '&pdfng=true' , {
scale: 1,
navigateFn: (ref) ->
# this function captures clicks on the annotation links

113
services/web/test/UnitTests/coffee/Compile/CompileControllerTests.coffee
View file

@ -137,15 +137,19 @@ describe "CompileController", ->
statusCode: 204
headers: { "mock": "header" }
@req.method = "mock-method"
@req.headers = {
'Mock': 'Headers',
'Range': '123-456'
'If-Range': 'abcdef'
'If-Modified-Since': 'Mon, 15 Dec 2014 15:23:56 GMT'
}
describe "old pdf viewer", ->
describe "user with standard priority", ->
beforeEach ->
@CompileManager.getProjectCompileLimits = sinon.stub().callsArgWith(1, null, {compileGroup: "standard"})
@CompileController.proxyToClsi(@project_id, @url = "/test", @req, @res, @next)
it "should open a request to the CLSI", ->
@request
.calledWith(
@ -164,12 +168,11 @@ describe "CompileController", ->
@proxy.on.calledWith("error").should.equal true
describe "user with priority compile", ->
beforeEach ->
@CompileManager.getProjectCompileLimits = sinon.stub().callsArgWith(1, null, {compileGroup: "priority"})
@CompileController.proxyToClsi(@project_id, @url = "/test", @req, @res, @next)
it "should proxy to the priorty url if the user has the feature", ()->
it "should proxy to the priority url if the user has the feature", ()->
@request
.calledWith(
method: @req.method
@ -178,6 +181,106 @@ describe "CompileController", ->
)
.should.equal true
describe "user with standard priority via query string", ->
beforeEach ->
@req.query = {compileGroup: 'standard'}
@CompileController.proxyToClsi(@project_id, @url = "/test", @req, @res, @next)
it "should open a request to the CLSI", ->
@request
.calledWith(
method: @req.method
url: "#{@settings.apis.clsi.url}#{@url}",
timeout: 60 * 1000
)
.should.equal true
it "should pass the request on to the client", ->
@proxy.pipe
.calledWith(@res)
.should.equal true
it "should bind an error handle to the request proxy", ->
@proxy.on.calledWith("error").should.equal true
describe "user with priority compile via query string", ->
beforeEach ->
@req.query = {compileGroup: 'priority'}
@CompileController.proxyToClsi(@project_id, @url = "/test", @req, @res, @next)
it "should proxy to the priority url if the user has the feature", ()->
@request
.calledWith(
method: @req.method
url: "#{@settings.apis.clsi_priority.url}#{@url}",
timeout: 60 * 1000
)
.should.equal true
describe "user with non-existent priority via query string", ->
beforeEach ->
@req.query = {compileGroup: 'foobar'}
@CompileController.proxyToClsi(@project_id, @url = "/test", @req, @res, @next)
it "should proxy to the standard url", ()->
@request
.calledWith(
method: @req.method
url: "#{@settings.apis.clsi.url}#{@url}",
timeout: 60 * 1000
)
.should.equal true
describe "new pdf viewer", ->
beforeEach ->
@req.query = {pdfng: true}
describe "user with standard priority", ->
beforeEach ->
@CompileManager.getProjectCompileLimits = sinon.stub().callsArgWith(1, null, {compileGroup: "standard"})
@CompileController.proxyToClsi(@project_id, @url = "/test", @req, @res, @next)
it "should open a request to the CLSI", ->
@request
.calledWith(
method: @req.method
url: "#{@settings.apis.clsi.url}#{@url}",
timeout: 60 * 1000
headers: {
'Range': '123-456'
'If-Range': 'abcdef'
'If-Modified-Since': 'Mon, 15 Dec 2014 15:23:56 GMT'
}
)
.should.equal true
it "should pass the request on to the client", ->
@proxy.pipe
.calledWith(@res)
.should.equal true
it "should bind an error handle to the request proxy", ->
@proxy.on.calledWith("error").should.equal true
describe "user with priority compile", ->
beforeEach ->
@CompileManager.getProjectCompileLimits = sinon.stub().callsArgWith(1, null, {compileGroup: "priority"})
@CompileController.proxyToClsi(@project_id, @url = "/test", @req, @res, @next)
it "should proxy to the priority url if the user has the feature", ()->
@request
.calledWith(
method: @req.method
url: "#{@settings.apis.clsi_priority.url}#{@url}",
timeout: 60 * 1000
headers: {
'Range': '123-456'
'If-Range': 'abcdef'
'If-Modified-Since': 'Mon, 15 Dec 2014 15:23:56 GMT'
}
)
.should.equal true
describe "deleteAuxFiles", ->
beforeEach ->