archives/kirbe
1
0
Fork 0
mirror of https://github.com/Wessel/kirbe.git synced 2026-07-18 06:13:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

general code improvements part 4

Browse Source
This commit is contained in:
David Ralph
2019-02-18 12:04:14 +00:00
committed by GitHub
parent 4f3c8d43ed
commit 782c809857
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
model/middleware/static.js
View File

@@ -1,45 +1,45 @@
const { createReadStream, readFileSync, readFile, stat } = require( 'fs' );
const { join, extname } = require( 'path' );
const { join, extname } = require('path');
const { createReadStream, readFileSync, readFile, stat } = require('fs');
const mimes = JSON.parse( readFileSync( join( __dirname, 'mimes.json' ) ) );
const mimes = JSON.parse(readFileSync(join(__dirname, 'mimes.json')));
module.exports = ( baseDir, indexFile ) => {
module.exports = (baseDir, indexFile) => {
if (!baseDir) throw new Error('The argument "baseDir" is required for the extension "kirbe:static"');
indexFile = typeof indexFile === 'string' ? indexFile : 'index.html';
return( req, res, next ) => {
if( req.method !== 'GET' ) { next(); return; }
return(req, res, next) => {
if (req.method !== 'GET') { next(); return; }
let requestedPath = req.parsedUrl.pathname.replace( /\/.\.\//g, '' );
let requestedExt = extname( requestedPath );
let requestedExt = extname(requestedPath);
const filePath = join( baseDir, requestedPath );
const filePath = join(baseDir, requestedPath ;
stat( filePath, ( err, stats ) => {
if( err ) { next(); return; }
stat(filePath, (err, stats) => {
if (err ) { next(); return; }
if( stats.isFile() ) {
stats.mtime.setMilliseconds( 0 );
if ( stats.mtime <= new Date( req.headers[ 'if-modified-since' ] ) ) res.status( 304 ).end();
else createReadStream( filePath ).pipe( res.status( 200 ).coreRes );
if (stats.isFile()) {
stats.mtime.setMilliseconds(0);
if (stats.mtime <= new Date(req.headers['if-modified-since'])) res.status(304).end();
else createReadStream(filePath).pipe(res.status(200).coreRes);
} else {
if ( req.parsedUrl.pathname.charAt( req.parsedUrl.pathname.length -1 ) !== '/' ) {
res.status(302).header({ 'Location': `${req.parsedUrl.pathname}/` }).end();
return;
if (req.parsedUrl.pathname.charAt(req.parsedUrl.pathname.length -1 ) !== '/') {
res.status(302).header({'Location': `${req.parsedUrl.pathname}/`}).end();
return;
}
requestedPath = join( filePath, indexFile );
requestedExt = extname( requestedPath );
requestedPath = join(filePath, indexFile);
requestedExt = extname(requestedPath);
readFile( requestedPath, ( err, data ) => {
if (err) next();
else {
res.body( data ).status(200).header({
'Content-Type': ( mimes.hasOwnProperty( requestedExt ) ? mimes[ requestedExt ] : 'application/octet-stream' ),
'Last-Modified': stats.mtime.toString()
}).end();
}
});
readFile(requestedPath, (err, data) => {
if (err) next();
else {
res.body(data).status(200).header({
'Content-Type': ( mimes.hasOwnProperty(requestedExt) ? mimes[requestedExt] : 'application/octet-stream' ),
'Last-Modified': stats.mtime.toString()
}).end();
}
});
}
});
};