Skip to content

Convert from Express to tinyhttp #200

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

Merged
groenroos merged 11 commits into from
Oct 24, 2021
Merged

Convert from Express to tinyhttp #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d9d6f67
#97: Replace express with tinyhttp
groenroos May 9, 2021
c4f2c72
#97: Fix tests
groenroos May 9, 2021
25871f9
Merge branch 'master' into spike/tinyhttp
groenroos Jun 5, 2021
2a58f79
Fix CORS error handling
groenroos Jun 5, 2021
db66317
lockfileVersion@1
groenroos Jun 5, 2021
c1bd823
Fix lockfile
groenroos Jun 5, 2021
d926fd3
Regenerate lockfile
groenroos Jun 5, 2021
bdbf85c
Fix lint issues
groenroos Jun 5, 2021
c7f2d20
Merge branch 'master' into spike/tinyhttp
groenroos Oct 24, 2021
bb71ae7
Use lockfile v1
groenroos Oct 24, 2021
cb5c484
Re-generate lockfile
groenroos Oct 24, 2021
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
11 changes: 6 additions & 5 deletions core/loadServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
/* Dependencies */
import path from 'node:path';

import express from 'express';
import { App as TinyHTTP } from '@tinyhttp/app';
import sirv from 'sirv';
import session from 'express-session';
import cookieParser from 'cookie-parser';
import bodyParser from 'body-parser';
Expand All @@ -31,7 +32,7 @@ export default function loadServer({ reload, listen }, next) {
// This.server.routes = server._router.map;
// this.server.stack.length = 2;
} else {
server = express();
server = new TinyHTTP();
this.routeStack = { get: [], post: [], delete: [] };
}

Expand Down Expand Up @@ -79,7 +80,7 @@ export default function loadServer({ reload, listen }, next) {
/* Loop through it */
for (const publicDir of this.config.publicDir) {
const publicDirPath = path.join(this.dir, publicDir);
server.use(`/${publicDir}`, express.static(publicDirPath, { maxAge: 1 }));
server.use(`/${publicDir}`, sirv(publicDirPath, { maxAge: 1 }));
}
}

Expand All @@ -93,13 +94,13 @@ export default function loadServer({ reload, listen }, next) {
if (this.config.csrf || this.config.strict) {
server.use(csrf({ cookie: false }));

server.use((error, request, response, next) => {
server.onError = (error, request, response, next) => {
if (error.code !== 'EBADCSRFTOKEN') {
return next(error);
}

new Response(this, request, response, new SaplingError('Invalid CSRF token'));
});
};
}

/* Enable the /data data interface */
Expand Down
Loading