jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

volumes: async'ify

Browse Source
This commit is contained in:
Girish Ramakrishnan
2021-05-11 17:50:48 -07:00
parent 3a252fe10e
commit fc52cd7e0c
10 changed files with 200 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/volumes.js
+21 -29
View File
@@ -13,54 +13,46 @@ const assert = require('assert'),
BoxError = require('../boxerror.js'),
volumes = require('../volumes.js'),
HttpError = require('connect-lastmile').HttpError,
HttpSuccess = require('connect-lastmile').HttpSuccess;
HttpSuccess = require('connect-lastmile').HttpSuccess,
safe = require('safetydance');
function load(req, res, next) {
async function load(req, res, next) {
assert.strictEqual(typeof req.params.id, 'string');
volumes.get(req.params.id, function (error, result) {
if (error) return next(BoxError.toHttpError(error));
req.resource = result;
next();
});
const [error, result] = safe(await volumes.get(req.params.id));
if (error) return next(BoxError.toHttpError(error));
if (!result) return next(new HttpError(404, 'Volume not found'));
req.resource = result;
next();
}
function add(req, res, next) {
async function add(req, res, next) {
assert.strictEqual(typeof req.body, 'object');
if (typeof req.body.name !== 'string') return next(new HttpError(400, 'name must be a string'));
if (typeof req.body.hostPath !== 'string') return next(new HttpError(400, 'hostPath must be a string'));
volumes.add(req.body.name, req.body.hostPath, auditSource.fromRequest(req), function (error, id) {
if (error) return next(BoxError.toHttpError(error));
next(new HttpSuccess(201, { id }));
});
const [error, id] = await safe(volumes.add(req.body.name, req.body.hostPath, auditSource.fromRequest(req)));
if (error) return next(BoxError.toHttpError(error));
next(new HttpSuccess(201, { id }));
}
function get(req, res, next) {
async function get(req, res, next) {
assert.strictEqual(typeof req.params.id, 'string');
next(new HttpSuccess(200, req.resource));
}
function del(req, res, next) {
async function del(req, res, next) {
assert.strictEqual(typeof req.params.id, 'string');
volumes.del(req.resource, auditSource.fromRequest(req), function (error) {
if (error) return next(BoxError.toHttpError(error));
next(new HttpSuccess(204));
});
const [error] = await safe(volumes.del(req.resource, auditSource.fromRequest(req)));
if (error) return next(BoxError.toHttpError(error));
next(new HttpSuccess(204));
}
function list(req, res, next) {
volumes.list(function (error, result) {
if (error) return next(new HttpError(500, error));
next(new HttpSuccess(200, { volumes: result }));
});
async function list(req, res, next) {
const [error, result] = await safe(volumes.list());
if (error) return next(BoxError.toHttpError(error));
next(new HttpSuccess(200, { volumes: result }));
}