Skip to content

Add Last-Modified header for GET and HEAD #1856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SarthakDudhe wants to merge 1 commit into
base: main
Choose a base branch
from
+70 −39
Open

Add Last-Modified header for GET and HEAD #1856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions lib/handlers/get.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,16 @@ export default async function handler (req, res, next) {
let contentRange
let chunksize

if (ret) {
stream = ret.stream
contentType = ret.contentType
container = ret.container
contentRange = ret.contentRange
chunksize = ret.chunksize
}
if (ret) {
stream = ret.stream
contentType = ret.contentType
container = ret.container
contentRange = ret.contentRange
chunksize = ret.chunksize
if (ret.modified) {
res.header('Last-Modified', ret.modified.toUTCString())
}
}

// Till here it must exist
if (!includeBody) {
Expand Down
6 changes: 3 additions & 3 deletions lib/ldp.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ class LDP {
}

if (!options.includeBody) {
return { stream: stats, contentType, container: stats.isDirectory() }
return { stream: stats, contentType, container: stats.isDirectory(), modified: stats.mtime }
}

if (stats.isDirectory()) {
Expand All @@ -465,7 +465,7 @@ class LDP {
throw err
}
const stream = stringToStream(data)
return { stream, contentType, container: true }
return { stream, contentType, container: true, modified: stats.mtime }
} else {
let chunksize, contentRange, start, end
if (options.range) {
Expand All @@ -487,7 +487,7 @@ class LDP {
})
.on('open', function () {
debug.handlers(`GET -- Reading ${pathLocal}`)
return resolve({ stream, contentType, container: false, contentRange, chunksize })
return resolve({ stream, contentType, container: false, contentRange, chunksize, modified: stats.mtime })
})
}))
}
Expand Down
86 changes: 57 additions & 29 deletions test/integration/http-test.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import { assert, expect } from 'chai'
const __filename = fileURLToPath(import.meta.url)
const __dirname = path.dirname(__filename)

const suffixAcl = '.acl'
const suffixMeta = '.meta'
const server = setupSupertestServer({
const suffixAcl = '.acl'
const suffixMeta = '.meta'
const server = setupSupertestServer({
live: true,
dataBrowserPath: 'default',
root: path.join(__dirname, '../resources'),
Expand Down Expand Up @@ -253,13 +253,20 @@ describe('HTTP APIs', function () {
.expect('content-type', /text\/turtle/)
.expect('Access-Control-Allow-Origin', 'http://example.com')
.expect(200, done)
})
it('should have set Link as resource', function (done) {
server.get('/sampleContainer2/example1.ttl')
.expect('content-type', /text\/turtle/)
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Resource>; rel="type"/)
.expect(200, done)
})
})
it('should have set Link as resource', function (done) {
server.get('/sampleContainer2/example1.ttl')
.expect('content-type', /text\/turtle/)
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Resource>; rel="type"/)
.expect(200, done)
})
it('should have set Last-Modified for resource', function (done) {
const modified = fs.statSync(path.join(__dirname,
'../resources/sampleContainer2/example1.ttl')).mtime.toUTCString()
server.get('/sampleContainer2/example1.ttl')
.expect('Last-Modified', modified)
.expect(200, done)
})
it('should have set Updates-Via to use WebSockets', function (done) {
server.get('/sampleContainer2/example1.ttl')
.expect('updates-via', /wss?:\/\//)
Expand All @@ -273,13 +280,20 @@ describe('HTTP APIs', function () {
.expect(hasHeader('describedBy', 'example1.ttl' + suffixMeta))
.end(done)
})
it('should have set Link as Container/BasicContainer', function (done) {
server.get('/sampleContainer2/')
.expect('content-type', /text\/turtle/)
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#BasicContainer>; rel="type"/)
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Container>; rel="type"/)
.expect(200, done)
})
it('should have set Link as Container/BasicContainer', function (done) {
server.get('/sampleContainer2/')
.expect('content-type', /text\/turtle/)
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#BasicContainer>; rel="type"/)
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Container>; rel="type"/)
.expect(200, done)
})
it('should have set Last-Modified for container', function (done) {
const modified = fs.statSync(path.join(__dirname,
'../resources/sampleContainer2')).mtime.toUTCString()
server.get('/sampleContainer2/')
.expect('Last-Modified', modified)
.expect(200, done)
})
it('should load skin (mashlib) if resource was requested as text/html', function (done) {
server.get('/sampleContainer2/example1.ttl')
.set('Accept', 'text/html')
Expand Down Expand Up @@ -505,11 +519,18 @@ describe('HTTP APIs', function () {
.expect('updates-via', /wss?:\/\//)
.expect(200, done)
})
it('should have set Link as Resource', function (done) {
server.head('/sampleContainer2/example1.ttl')
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Resource>; rel="type"/)
.expect(200, done)
})
it('should have set Link as Resource', function (done) {
server.head('/sampleContainer2/example1.ttl')
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Resource>; rel="type"/)
.expect(200, done)
})
it('should have set Last-Modified for resource', function (done) {
const modified = fs.statSync(path.join(__dirname,
'../resources/sampleContainer2/example1.ttl')).mtime.toUTCString()
server.head('/sampleContainer2/example1.ttl')
.expect('Last-Modified', modified)
.expect(200, done)
})
it('should have set acl and describedBy Links for resource',
function (done) {
server.head('/sampleContainer2/example1.ttl')
Expand All @@ -523,13 +544,20 @@ describe('HTTP APIs', function () {
.expect('Content-Type', /text\/turtle/)
.expect(200, done)
})
it('should have set Link as Container/BasicContainer',
function (done) {
server.head('/sampleContainer2/')
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#BasicContainer>; rel="type"/)
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Container>; rel="type"/)
.expect(200, done)
})
it('should have set Link as Container/BasicContainer',
function (done) {
server.head('/sampleContainer2/')
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#BasicContainer>; rel="type"/)
.expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Container>; rel="type"/)
.expect(200, done)
})
it('should have set Last-Modified for container', function (done) {
const modified = fs.statSync(path.join(__dirname,
'../resources/sampleContainer2')).mtime.toUTCString()
server.head('/sampleContainer2/')
.expect('Last-Modified', modified)
.expect(200, done)
})
it('should have set acl and describedBy Links for container',
function (done) {
server.head('/sampleContainer2/')
Expand Down