Skip to content
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

Jump to bottom

Serve from multiple roots #75

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Serve from multiple roots #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ed7f33
Allowing multiple roots (#74)
NemoStein Sep 6, 2021
5dfcd8c
Added --extern argument to CLI (#74)
NemoStein Sep 6, 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
15 changes: 15 additions & 0 deletions cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ const open =
: 'xdg-open';

(async () => {
// Merging --extern arguments with it's next value to avoid messing with positional values

for (let i = 0; i < process.argv.length; i++) {
const arg = process.argv[i]
if (arg === '--extern') {
process.argv[i] = arg + '=' + process.argv[i + 1]
process.argv.splice(i + 1, 1)
}
}

const args = process.argv.slice(2).filter((x) => !~x.indexOf('--'));
const admin = process.getuid && process.getuid() === 0;
let credentials;
Expand Down Expand Up @@ -74,13 +84,18 @@ const open =

// Parse arguments from the command line

const extern = process.argv
.filter((x) => x.indexOf('--extern') === 0)
.map((x) => x.split('=', 2)[1])

const { root, protocol, port, ips, url } = await servor({
root: args[0],
fallback: args[1],
port: args[2],
reload: !!~process.argv.indexOf('--reload'),
module: !!~process.argv.indexOf('--module'),
static: !!~process.argv.indexOf('--static'),
extern,
credentials,
});

Expand Down
40 changes: 26 additions & 14 deletions servor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ module.exports = async ({
fallback = module ? 'index.js' : 'index.html',
reload = true,
static = false,
extern = [],
inject = '',
credentials,
port,
Expand All @@ -35,16 +36,20 @@ module.exports = async ({

// Configure globals

root = root.startsWith('/') ? root : path.join(process.cwd(), root);
const entrypoints = [root, ...extern];

if (!fs.existsSync(root)) {
console.log(`[ERR] Root directory ${root} does not exist!`);
process.exit();
}
for (const entrypoint of entrypoints) {
const root = entrypoint.startsWith('/') ? entrypoint : path.join(process.cwd(), entrypoint);

if (!fs.statSync(root).isDirectory()) {
console.log(`[ERR] Root directory "${root}" is not directory!`);
process.exit();
if (!fs.existsSync(root)) {
console.log(`[ERR] Root directory ${root} does not exist!`);
process.exit();
}

if (!fs.statSync(root).isDirectory()) {
console.log(`[ERR] Root directory "${root}" is not directory!`);
process.exit();
}
}

const reloadClients = [];
Expand Down Expand Up @@ -113,9 +118,9 @@ module.exports = async ({
// Respond to requests with a file extension

const serveStaticFile = (res, pathname) => {
const uri = path.join(root, pathname);
let uri = searchPath(pathname);
if (!uri) return sendError(res, 404);
let ext = uri.replace(/^.*[\.\/\\]/, '').toLowerCase();
if (!fs.existsSync(uri)) return sendError(res, 404);
fs.readFile(uri, 'binary', (err, file) =>
err ? sendError(res, 500) : sendFile(res, 200, file, ext)
);
Expand All @@ -125,9 +130,9 @@ module.exports = async ({

const serveRoute = (res, pathname) => {
const index = static
? path.join(root, pathname, fallback)
: path.join(root, fallback);
if (!fs.existsSync(index) || (pathname.endsWith('/') && pathname !== '/'))
? searchPath(pathname, fallback)
: searchPath(fallback);
if (!index || (pathname.endsWith('/') && pathname !== '/'))
return serveDirectoryListing(res, pathname);
fs.readFile(index, 'binary', (err, file) => {
if (err) return sendError(res, 500);
Expand All @@ -142,13 +147,20 @@ module.exports = async ({
// Respond to requests with a trailing slash

const serveDirectoryListing = (res, pathname) => {
const uri = path.join(root, pathname);
const uri = searchPath(pathname);
if (!fs.existsSync(uri)) return sendError(res, 404);
res.writeHead(200, { 'Content-Type': 'text/html' });
res.write(baseDoc(pathname) + directoryListing(uri) + livereload);
res.end();
};

const searchPath = (pathname, fallback = '') => {
for (const entrypoint of entrypoints) {
const uri = path.join(entrypoint, pathname, fallback);
if (fs.existsSync(uri)) return uri
}
}

// Start the server and route requests

server((req, res) => {
Expand Down