cloudron 4.15.1 → 5.0.0

package/README.md

@@ -1,10 +1,10 @@
 # The Cloudron CLI tool
 
-The [Cloudron](https://cloudron.io) CLI tool allows you to install, configure and test apps on your Cloudron.
+The [Cloudron](https://cloudron.io) [CLI tool](https://docs.cloudron.io/packaging/cli/) allows you to install, configure and test apps on your Cloudron.
 It is also used to submit your app to the Cloudron Store. The `machine` subcommand can be used for
 various maintenance tasks on a selfhosted Cloudron.
 
-Read the Cloudron.io [documentation](https://cloudron.io/documentation.html) for in-depth information.
+Read the Cloudron.io [documentation](https://docs.cloudron.io/) for in-depth information.
 
 ## Installation
 

package/bin/cloudron

@@ -257,7 +257,7 @@ program.command('update')
 
     const knownCommand = program.commands.some(function (command) { return command._name === process.argv[2] || command._alias === process.argv[2]; });
     if (!knownCommand) {
-        console.log('Unknown command: ' + process.argv[2].bold + '.\nTry ' + 'cloudron help'.yellow);
+        console.log('Unknown command: ' + process.argv[2] + '.\nTry ' + 'cloudron help');
         process.exit(1);
     }
 })();

package/bin/cloudron-appstore

@@ -71,7 +71,7 @@ if (!process.argv.slice(2).length) {
 
     var knownCommand = program.commands.some(function (command) { return command._name === process.argv[2] || command._alias === process.argv[2]; });
     if (!knownCommand) {
-        console.log('Unknown command: ' + process.argv[2].bold + '.\nTry ' + 'cloudron appstore help'.yellow);
+        console.log('Unknown command: ' + process.argv[2] + '.\nTry ' + 'cloudron appstore help');
         process.exit(1);
     }
     return;

package/bin/cloudron-backup

@@ -20,12 +20,12 @@ program.command('list')
     .action(actions.backupList);
 
 program.command('decrypt <file>')
-    .description('Decrypt a directory')
+    .description('Decrypt an encrypted file')
     .option('--password <password>', 'password')
     .action(backupTools.decrypt);
 
 program.command('decrypt-dir <indir> <outdir>')
-    .description('Decrypt a directory')
+    .description('Decrypt an encrypted directory')
     .option('--password <password>', 'password')
     .action(backupTools.decryptDir);
 
@@ -56,7 +56,7 @@ if (!process.argv.slice(2).length) {
 
     var knownCommand = program.commands.some(function (command) { return command._name === process.argv[2] || command._alias === process.argv[2]; });
     if (!knownCommand) {
-        console.log('Unknown command: ' + process.argv[2].bold + '.\nTry ' + 'cloudron backup help'.yellow);
+        console.log('Unknown command: ' + process.argv[2] + '.\nTry ' + 'cloudron backup help');
         process.exit(1);
     }
     return;

package/bin/cloudron-env

@@ -39,7 +39,7 @@ if (!process.argv.slice(2).length) {
 
     var knownCommand = program.commands.some(function (command) { return command._name === process.argv[2] || command._alias === process.argv[2]; });
     if (!knownCommand) {
-        console.log('Unknown command: ' + process.argv[2].bold + '.\nTry ' + 'cloudron env help'.yellow);
+        console.log('Unknown command: ' + process.argv[2] + '.\nTry ' + 'cloudron env help');
         process.exit(1);
     }
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "4.15.1",
+  "version": "5.0.0",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -20,12 +20,12 @@
     "async": "^3.2.3",
     "cloudron-manifestformat": "^5.15.2",
     "commander": "^6.1.0",
-    "debug": "^4.3.3",
+    "debug": "^4.3.4",
     "delay": "^5.0.0",
     "easy-table": "^1.2.0",
-    "ejs": "^3.1.6",
-    "eventsource": "^1.1.0",
-    "micromatch": "^4.0.4",
+    "ejs": "^3.1.8",
+    "eventsource": "^2.0.2",
+    "micromatch": "^4.0.5",
     "once": "^1.4.0",
     "open": "^8.4.0",
     "progress": "^2.0.3",
@@ -33,9 +33,9 @@
     "readline-sync": "^1.4.10",
     "safetydance": "^2.2.0",
     "split": "^1.0.1",
-    "superagent": "^7.0.2",
+    "superagent": "^7.1.3",
     "tar-fs": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.12.0.tgz",
-    "underscore": "^1.13.2"
+    "underscore": "^1.13.3"
   },
   "engines": {
     "node": ">= 14.x.x"
@@ -43,7 +43,7 @@
   "devDependencies": {
     "expect.js": "^0.3.1",
     "memorystream": "^0.3.1",
-    "mocha": "^9.1.3",
+    "mocha": "^10.0.0",
     "rimraf": "^3.0.2"
   }
 }

package/src/actions.js

@@ -14,7 +14,6 @@ const assert = require('assert'),
     path = require('path'),
     ProgressBar = require('progress'),
     ProgressStream = require('progress-stream'),
-    querystring = require('querystring'),
     readlineSync = require('readline-sync'),
     safe = require('safetydance'),
     spawn = require('child_process').spawn,
@@ -1309,19 +1308,30 @@ async function exec(cmd, options) {
 
     if (tty && !stdin.isTTY) exit('stdin is not tty');
 
+    const request = createRequest('POST', `/api/v1/apps/${app.id}/exec`, options);
+    const response = await request.send({ cmd, tty });
+    if (response.statusCode !== 200) return exit(`Failed to create exec: ${requestError(response)}`);
+    const execId = response.body.id;
+
+    async function exitWithCode() {
+        const response2 = await createRequest('GET', `/api/v1/apps/${app.id}/exec/${execId}`, options);
+        if (response2.statusCode !== 200) return exit(`Failed to get exec code: ${requestError(response2)}`);
+
+        process.exit(response2.body.exitCode);
+    }
+
     const { adminFqdn, token, rejectUnauthorized } = requestOptions(options);
 
-    const query = {
-        rows: stdout.rows,
-        columns: stdout.columns,
+    const searchParams = new URLSearchParams({
+        rows: stdout.rows || 24,
+        columns: stdout.columns || 80,
         access_token: token,
-        cmd: JSON.stringify(cmd),
-        tty: tty
-    };
+        tty
+    });
 
     const req = https.request({
         hostname: adminFqdn,
-        path: `/api/v1/apps/${app.id}/exec?` + querystring.stringify(query),
+        path: `/api/v1/apps/${app.id}/exec/${execId}/start?${searchParams.toString()}`,
         method: 'GET',
         headers: {
             'Connection': 'Upgrade',
@@ -1345,8 +1355,8 @@ async function exec(cmd, options) {
             stdin.setRawMode(true);
             stdin.pipe(socket, { end: false }); // the remote will close the connection
             socket.pipe(stdout); // in tty mode, stdout/stderr is merged
-            socket.on('end', exit); // server closed the socket
-        } else {// create stdin process on demand
+            socket.on('end', exitWithCode); // server closed the socket
+        } else { // create stdin process on demand
             if (typeof stdin === 'function') stdin = stdin();
 
             stdin.on('data', function (d) {
@@ -1361,7 +1371,7 @@ async function exec(cmd, options) {
                 socket.write(buf);
             });
 
-            stdout.on('close', () => process.exit()); // this is only emitted when stdout is a file and not the terminal
+            stdout.on('close', exitWithCode); // this is only emitted when stdout is a file and not the terminal
 
             demuxStream(socket, stdout, process.stderr); // can get separate streams in non-tty mode
             socket.on('end', function () {  // server closed the socket
@@ -1371,7 +1381,7 @@ async function exec(cmd, options) {
                 socket.end();
 
                 // process._getActiveHandles(); process._getActiveRequests();
-                if (stdout === process.stdout) setImmediate(() => process.exit()); // otherwise, we rely on the 'close' event above
+                if (stdout === process.stdout) setImmediate(exitWithCode); // otherwise, we rely on the 'close' event above
             });
         }
     });
@@ -1457,6 +1467,7 @@ function init() {
     const manifestTemplate = fs.readFileSync(path.join(__dirname, 'templates/', 'CloudronManifest.json.ejs'), 'utf8');
     const dockerfileTemplate = fs.readFileSync(path.join(__dirname, 'templates/', 'Dockerfile.ejs'), 'utf8');
     const dockerignoreTemplate = fs.readFileSync(path.join(__dirname, 'templates/', 'dockerignore.ejs'), 'utf8');
+    const startShTemplate = fs.readFileSync(path.join(__dirname, 'templates/', 'start.sh.ejs'), 'utf8');
 
     const data = {
         version: '0.1.0',
@@ -1481,6 +1492,15 @@ function init() {
         fs.writeFileSync('.dockerignore', dockerignore, 'utf8');
     }
 
+    if (fs.existsSync('start.sh')) {
+        console.log('start.sh already exists, skipping');
+    } else {
+        const dockerignore = ejs.render(startShTemplate, {});
+        fs.writeFileSync('start.sh', dockerignore, 'utf8');
+        fs.chmodSync('start.sh', 0o0775);
+    }
+
+
     console.log();
     console.log('Now edit the CloudronManifest.json');
     console.log();

package/src/backup-tools.js

@@ -23,7 +23,7 @@ function encryptFilePath(filePath, encryption) {
     assert.strictEqual(typeof filePath, 'string');
     assert.strictEqual(typeof encryption, 'object');
 
-    var encryptedParts = filePath.split('/').map(function (part) {
+    const encryptedParts = filePath.split('/').map(function (part) {
         let hmac = crypto.createHmac('sha256', Buffer.from(encryption.filenameHmacKey, 'hex'));
         const iv = hmac.update(part).digest().slice(0, 16); // iv has to be deterministic, for our sync (copy) logic to work
         const cipher = crypto.createCipheriv('aes-256-cbc', Buffer.from(encryption.filenameKey, 'hex'), iv);
@@ -42,7 +42,7 @@ function decryptFilePath(filePath, encryption) {
     assert.strictEqual(typeof filePath, 'string');
     assert.strictEqual(typeof encryption, 'object');
 
-    let decryptedParts = [];
+    const decryptedParts = [];
     for (let part of filePath.split('/')) {
         part = part + Array(part.length % 4).join('='); // add back = padding
         part = part.replace(/-/g, '/');                 // replace with '/'
@@ -197,9 +197,9 @@ function encrypt(input, options) {
 
     const encryption = aesKeysFromPassword(options.password);
 
-    let inStream = fs.createReadStream(input);
-    let outStream = process.stdout;
-    let encryptStream = new EncryptStream(encryption);
+    const inStream = fs.createReadStream(input);
+    const outStream = process.stdout;
+    const encryptStream = new EncryptStream(encryption);
 
     inStream.on('error', exit);
     encryptStream.on('error', exit);
@@ -227,9 +227,9 @@ function decrypt(input, options) {
 
     const encryption = aesKeysFromPassword(options.password);
 
-    let inStream = fs.createReadStream(input);
-    let outStream = process.stdout;
-    let decryptStream = new DecryptStream(encryption);
+    const inStream = fs.createReadStream(input);
+    const outStream = process.stdout;
+    const decryptStream = new DecryptStream(encryption);
 
     inStream.on('error', exit);
     decryptStream.on('error', exit);

package/src/templates/Dockerfile.ejs

@@ -1,3 +1,9 @@
-FROM cloudron/base:3.1.0@sha256:eb2ab9c7d361acda2f3ef2d8388154bc48f1651b5013fe6de4beea003018e427
+FROM cloudron/base:3.2.0@sha256:ba1d566164a67c266782545ea9809dc611c4152e27686fd14060332dd88263ea
+
+RUN mkdir -p /app/code
+WORKDIR /app/code
+
+COPY start.sh /app/pkg/
+
+CMD [ "/app/pkg/start.sh" ]
 
-EXPOSE <%- httpPort %>

package/src/templates/start.sh.ejs

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+