info/relaks-wordpress-example
1
0
Fork 0
mirror of https://github.com/trambarhq/relaks-wordpress-example.git synced 2025-09-03 05:02:34 +02:00
Code Issues Releases Wiki Activity

Reworked code to allow use of basePath other than / (issue #20).

Browse Source 
Throwing error properly in JSON retrieval code (issue #44).
This commit is contained in:
Chung Leong
2019-01-30 21:57:52 +01:00
parent 7e02514752
commit c5fd724e2f
12 changed files with 187 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
server/index.js
View File

@@ -24,16 +24,16 @@ const WORDPRESS_HOST = process.env.WORDPRESS_HOST;
// start up Express
let app = Express();
let root = PageRenderer.basePath;
app.set('json spaces', 2);
app.use(Compression())
app.use(SpiderDetector.middleware());
app.use(`/`, Express.static(`${__dirname}/www`));
app.get('/favicon.ico', handleFavIconRequest);
app.get('/.mtime', handleTimestampRequest);
app.get('/.cache', handleCacheStatusRequest);
app.get('/json/*', handleJSONRequest);
app.get(`/*`, handlePageRequest);
app.purge(`/*`, handlePurgeRequest);
app.use(root, Express.static(`${__dirname}/www`));
app.get(root + '.mtime', handleTimestampRequest);
app.get(root + '.cache', handleCacheStatusRequest);
app.get(root + 'json/*', handleJSONRequest);
app.get(root + '*', handlePageRequest);
app.purge('*', handlePurgeRequest);
app.use(handleError);
app.listen(SERVER_PORT);
@@ -50,12 +50,6 @@ async function handleTimestampRequest(req, res, next) {
}
}
async function handleFavIconRequest(req, res, next) {
let err = new Error('Not found');
err.status = 404;
next(err);
}
async function handleCacheStatusRequest(req, res, next) {
try {
res.set({ 'X-Accel-Expires': 0 });
@@ -86,7 +80,9 @@ async function handleCacheStatusRequest(req, res, next) {
async function handleJSONRequest(req, res, next) {
try {
let path = `/wp-json/${req.url.substr(6)}`;
// exclude asterisk
let root = req.route.path.substr(0, req.route.path.length - 1);
let path = `/wp-json/${req.url.substr(root.length)}`;
let json = await JSONRetriever.fetch(path);
if (json.total) {
res.set({ 'X-WP-Total': json.total });
@@ -102,6 +98,11 @@ let pageDependencies = {};
async function handlePageRequest(req, res, next) {
try {
let path = req.url;
if (path === '/favicon.ico') {
let err = new Error('File not found');
err.status = 404;
throw err;
}
let noJS = (req.query.js === '0');
let target = (req.isSpider() || noJS) ? 'seo' : 'hydrate';
let page = await PageRenderer.generate(path, target);