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

fix(vfs): defer stream creation in vfs requests #80

Merged
merged 2 commits into from
Jan 3, 2024
Merged

fix(vfs): defer stream creation in vfs requests #80

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa6edec
fix(vfs): defer stream creation in vfs requests
andersevenrud Jan 2, 2024
68a5cb9
fix(vfs): typo in attributes lookup
andersevenrud Jan 2, 2024
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
63 changes: 31 additions & 32 deletions src/vfs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ const {

const respondNumber = result => typeof result === 'number' ? result : -1;
const respondBoolean = result => typeof result === 'boolean' ? result : !!result;
const requestPath = req => ([sanitize(req.fields.path)]);
const requestSearch = req => ([sanitize(req.fields.root), req.fields.pattern]);
const requestCross = req => ([sanitize(req.fields.from), sanitize(req.fields.to)]);
const requestFile = req => ([sanitize(req.fields.path), streamFromRequest(req)]);
const requestPath = req => [sanitize(req.fields.path)];
const requestSearch = req => [sanitize(req.fields.root), req.fields.pattern];
const requestFile = req => [sanitize(req.fields.path), () => streamFromRequest(req)];
const requestCross = req => [sanitize(req.fields.from), sanitize(req.fields.to)];

/*
* Parses the range request headers
Expand All @@ -65,7 +65,10 @@ const onDone = (req, res) => {
if (req.files) {
for (let fieldname in req.files) {
try {
fs.removeSync(req.files[fieldname].path);
const n = req.files[fieldname].path;
if (fs.existsSync(n)) {
fs.removeSync(n);
}
} catch (e) {
console.warn('Failed to unlink temporary file', e);
}
Expand All @@ -77,26 +80,18 @@ const onDone = (req, res) => {
* Wraps a vfs adapter request
*/
const wrapper = fn => (req, res, next) => fn(req, res)
.then(result => {
.then(result => new Promise((resolve, reject) => {
if (result instanceof Stream) {
result.on('error', error => {
next(error);
});

result.on('end', () => {
onDone(req, res);
});

result.once('error', reject);
result.once('end', resolve);
result.pipe(res);
} else {
res.json(result);
onDone(req, res);
resolve();
}
})
.catch(error => {
next(error);
onDone(req, res);
});
}))
.catch(error => next(error))
.finally(() => onDone(req, res));

/**
* Creates the middleware
Expand Down Expand Up @@ -147,27 +142,31 @@ const createOptions = req => {
// Standard request with only a target
const createRequestFactory = findMountpoint => (getter, method, readOnly, respond) => async (req, res) => {
const options = createOptions(req);
const args = [...getter(req, res), options];
const [target, ...rest] = getter(req, res);

const found = await findMountpoint(target);
const attributes = found.mount.attributes || {};
const strict = attributes.strictGroups !== false;

const found = await findMountpoint(args[0]);
if (method === 'search') {
if (found.mount.attributes && found.mount.attributes.searchable === false) {
if (attributes.searchable === false) {
return [];
}
}

const {attributes} = found.mount;
const strict = attributes.strictGroups !== false;
const ranges = (!attributes.adapter || attributes.adapter === 'system') || attributes.ranges === true;
const vfsMethodWrapper = m => found.adapter[m]
? found.adapter[m](found)(...args)
: Promise.reject(new Error(`Adapter does not support ${m}`));
const readstat = () => vfsMethodWrapper('stat').catch(() => ({}));
await checkMountpointPermission(req, res, method, readOnly, strict)(found);

const vfsMethodWrapper = m => {
const args = [target, ...rest.map(r => typeof r === 'function' ? r() : r), options];
return found.adapter[m]
? found.adapter[m](found)(...args)
: Promise.reject(new Error(`Adapter does not support ${m}`));
};

const result = await vfsMethodWrapper(method);
if (method === 'readfile') {
const stat = await readstat();
const ranges = (!attributes.adapter || attributes.adapter === 'system') || attributes.ranges === true;
const stat = await vfsMethodWrapper('stat').catch(() => ({}));

if (ranges && options.range) {
try {
Expand All @@ -192,7 +191,7 @@ const createRequestFactory = findMountpoint => (getter, method, readOnly, respon
}

if (options.download) {
const filename = encodeURIComponent(path.basename(args[0]));
const filename = encodeURIComponent(path.basename(target));
res.append('Content-Disposition', `attachment; filename*=utf-8''${filename}`);
}
}
Expand Down
Loading