Mirror/filesafe
1
0
Fork 0
mirror of https://github.com/BobbyWibowo/lolisafe.git synced 2024-12-12 23:46:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: content-type breaking with hyper-express updates

Browse Source
This commit is contained in:
Bobby 2024-03-06 07:19:36 +07:00
parent 28a1e02330
commit 5d3fc64e3b
No known key found for this signature in database
GPG Key ID: B2F45B6A3C9A8FCA
2 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
controllers/handlers/ServeStatic.js
View File

@ -108,11 +108,13 @@ class ServeStatic {
// Can be programatically called from within in-progress Requests // Can be programatically called from within in-progress Requests
// Essentially stream-based alternative for Response.download() or Response.send() // Essentially stream-based alternative for Response.download() or Response.send()
async #handle (req, res, fullPath, stat, setHeaders) { async #handle (req, res, fullPath, stat, setHeaders) {
const extname = utils.extname(req.path).substring(1)
// Set Content-Type // Set Content-Type
res.type(fullPath) res.type(extname)
// Set header fields // Set header fields
await this.#setHeaders(req, res, stat) await this.#setHeaders(req, res, stat, extname)
// Per-request setHeaders, if required // Per-request setHeaders, if required
if (typeof setHeaders === 'function') { if (typeof setHeaders === 'function') {
@ -210,24 +212,16 @@ class ServeStatic {
} }
} }
async #setContentType (req, res) { async #setHeaders (req, res, stat, extname) {
// Do only if accessing files from uploads' root directory (i.e. not thumbs, etc.)
if (req.path.indexOf('/', 1) !== -1) return
const name = req.path.substring(1)
const extname = utils.extname(name).substring(1)
const contentType = this.contentTypesMaps.get(extname)
if (contentType) {
// NOTE: Use lowercase key because the header initially set
// with Response.type() is also lowercase
res.header('content-type', contentType)
}
}
async #setHeaders (req, res, stat) {
// Override Content-Type if required // Override Content-Type if required
if (this.contentTypesMaps) { if (this.contentTypesMaps && req.path.indexOf('/', 1) === -1) {
this.#setContentType(req, res) // Do only if accessing files from uploads' root directory (i.e. not thumbs, etc.)
const contentType = this.contentTypesMaps.get(extname)
if (contentType) {
// NOTE: Use lowercase key because the header initially set
// with Response.type() is also lowercase
res.header('content-type', contentType)
}
} }
// Always do external setHeaders function first, // Always do external setHeaders function first,

28
controllers/middlewares/ServeStaticQuick.js
View File

@ -22,6 +22,7 @@
const chokidar = require('chokidar') const chokidar = require('chokidar')
const etag = require('etag') const etag = require('etag')
const jetpack = require('fs-jetpack') const jetpack = require('fs-jetpack')
const nodePath = require('node:path')
const serveUtils = require('./../utils/serveUtils') const serveUtils = require('./../utils/serveUtils')
const logger = require('./../../logger') const logger = require('./../../logger')
@ -84,19 +85,19 @@ class ServeStaticQuick {
} }
get (path) { get (path) {
const stat = this.files.get(path) const data = this.files.get(path)
if (!stat || stat.isDirectory()) return if (!data?.stat || data?.stat?.isDirectory()) return
return stat return data
} }
handler (req, res, path, stat) { handler (req, res, path, data) {
// Set Content-Type // Set Content-Type
res.type(path) res.type(data.extname)
// Set header fields // Set header fields
this.#setHeaders(req, res, stat) this.#setHeaders(req, res, data.stat)
// Conditional GET support // Conditional GET support
if (serveUtils.assertConditionalGET(req, res)) { if (serveUtils.assertConditionalGET(req, res)) {
@ -104,7 +105,7 @@ class ServeStaticQuick {
} }
// ReadStream options with Content-Range support if required // ReadStream options with Content-Range support if required
const result = serveUtils.buildReadStreamOptions(req, res, stat, this.#options.acceptRanges) const result = serveUtils.buildReadStreamOptions(req, res, data.stat, this.#options.acceptRanges)
if (!result) { if (!result) {
return res.end() return res.end()
} }
@ -120,7 +121,7 @@ class ServeStaticQuick {
res.end() res.end()
} }
return this.#stream(req, res, path, stat, result) return this.#stream(req, res, path, data.stat, result)
} }
// Returns a promise which resolves to true once ServeStaticQuick is ready // Returns a promise which resolves to true once ServeStaticQuick is ready
@ -148,7 +149,10 @@ class ServeStaticQuick {
case 'change': case 'change':
// Ensure relative path does not pass ignore function if set // Ensure relative path does not pass ignore function if set
if (!this.#options.ignore || !this.#options.ignore(relPath, stat)) { if (!this.#options.ignore || !this.#options.ignore(relPath, stat)) {
this.files.set(relPath, stat) this.files.set(relPath, {
stat,
extname: nodePath.extname(relPath).substring(1)
})
} }
break break
case 'unlink': case 'unlink':
@ -189,12 +193,12 @@ class ServeStaticQuick {
} }
} }
const stat = this.get(path) const data = this.get(path)
if (stat === undefined) { if (data === undefined) {
return next() return next()
} }
return this.handler(req, res, path, stat) return this.handler(req, res, path, data)
} }
#setHeaders (req, res, stat) { #setHeaders (req, res, stat) {