exec: rework API to get exit code

src/routes/apps.js

@@ -41,8 +41,12 @@ exports = module.exports = {
     stop,
     start,
     restart,
-    exec,
-    execWebSocket,
+
+    createExec,
+    startExec,
+    startExecWebSocket,
+    getExec,
+
     checkForUpdates,
 
     clone,
@@ -697,14 +701,29 @@ function demuxStream(stream, stdin) {
     });
 }
 
-async function exec(req, res, next) {
+async function createExec(req, res, next) {
     assert.strictEqual(typeof req.app, 'object');
+    assert.strictEqual(typeof req.body, 'object');
 
-    let cmd = null;
-    if (req.query.cmd) {
-        cmd = safe.JSON.parse(req.query.cmd);
-        if (!Array.isArray(cmd) || cmd.length < 1) return next(new HttpError(400, 'cmd must be array with atleast size 1'));
+    if ('cmd' in req.body) {
+        if (!Array.isArray(req.body.cmd) || req.body.cmd.length < 1) return next(new HttpError(400, 'cmd must be array with atleast size 1'));
     }
+    const cmd = req.body.cmd || null;
+
+    if ('tty' in req.body && typeof req.body.tty !== 'boolean') return next(new HttpError(400, 'tty must be boolean'));
+    const tty = !!req.body.tty;
+
+    if (safe.query(req.app, 'manifest.addons.docker') && req.user.role !== users.ROLE_OWNER) return next(new HttpError(403, '"owner" role is requied to exec app with docker addon'));
+
+    const [error, id] = await safe(apps.createExec(req.app, { cmd, tty }));
+    if (error) return next(BoxError.toHttpError(error));
+
+    next(new HttpSuccess(200, { id }));
+}
+
+async function startExec(req, res, next) {
+    assert.strictEqual(typeof req.app, 'object');
+    assert.strictEqual(typeof req.params.execId, 'string');
 
     const columns = req.query.columns ? parseInt(req.query.columns, 10) : null;
     if (isNaN(columns)) return next(new HttpError(400, 'columns must be a number'));
@@ -719,7 +738,7 @@ async function exec(req, res, next) {
     // in a badly configured reverse proxy, we might be here without an upgrade
     if (req.headers['upgrade'] !== 'tcp') return next(new HttpError(404, 'exec requires TCP upgrade'));
 
-    const [error, duplexStream] = await safe(apps.exec(req.app, { cmd: cmd, rows: rows, columns: columns, tty: tty }));
+    const [error, duplexStream] = await safe(apps.startExec(req.app, req.params.execId, { rows, columns, tty }));
     if (error) return next(BoxError.toHttpError(error));
 
     req.clearTimeout();
@@ -737,8 +756,9 @@ async function exec(req, res, next) {
     }
 }
 
-async function execWebSocket(req, res, next) {
+async function startExecWebSocket(req, res, next) {
     assert.strictEqual(typeof req.app, 'object');
+    assert.strictEqual(typeof req.params.execId, 'string');
 
     let cmd = null;
     if (req.query.cmd) {
@@ -757,7 +777,7 @@ async function execWebSocket(req, res, next) {
     // in a badly configured reverse proxy, we might be here without an upgrade
     if (req.headers['upgrade'] !== 'websocket') return next(new HttpError(404, 'exec requires websocket'));
 
-    const [error, duplexStream] = await safe(apps.exec(req.app, { cmd: cmd, rows: rows, columns: columns, tty: tty }));
+    const [error, duplexStream] = await safe(apps.startExec(req.app, { cmd: cmd, rows: rows, columns: columns, tty: tty }));
     if (error) return next(BoxError.toHttpError(error));
 
     req.clearTimeout();
@@ -785,6 +805,15 @@ async function execWebSocket(req, res, next) {
     });
 }
 
+async function getExec(req, res, next) {
+    assert.strictEqual(typeof req.app, 'object');
+    assert.strictEqual(typeof req.params.execId, 'string');
+
+    const [error, result] = await safe(apps.getExec(req.app, req.params.execId));
+    if (error) return next(BoxError.toHttpError(error));
+    next(new HttpSuccess(200, result)); // { exitCode, running }
+}
+
 async function listBackups(req, res, next) {
     assert.strictEqual(typeof req.app, 'object');