cloudron 5.14.9 → 5.15.0

package/bin/cloudron

@@ -10,7 +10,7 @@ const actions = require('../src/actions.js'),
     Command = require('commander').Command,
     safe = require('safetydance'),
     semver = require('semver'),
-    superagent = require('../src/superagent.js'),
+    superagent = require('@cloudron/superagent'),
     util = require('util');
 
 const version = require('../package.json').version;
@@ -56,6 +56,7 @@ backupCommand.command('decrypt <infile> <outfile>')
 backupCommand.command('decrypt-dir <indir> <outdir>')
     .description('Decrypt an encrypted directory')
     .option('--password <password>', 'password')
+    .option('--no-decrypt-filenames', 'Decrypt filenames [false]')
     .action(backupTools.decryptDir);
 
 backupCommand.command('decrypt-filename <path>')
@@ -111,7 +112,7 @@ envCommand.command('list')
     .action(actions.envList);
 
 envCommand.command('set <KEY=value...>')
-    .description('Set environment variables')
+    .description('Set environment variables. e.g X=1 Y=2')
     .option('--app <id>', 'App id')
     .action(actions.envSet);
 
@@ -168,10 +169,12 @@ program.command('install')
     .option('-l, --location <domain>', 'Subdomain or full domain')
     .option('-s, --secondary-domains [DOMAIN=domain,...]', 'Set secondary domains')
     .option('-a, --alias-domains [domain,...]', 'Alias domains')
+    .option('-m, --memory-limit [domain,...]', 'Memory Limit (e.g 1.5G, 512M)')
     .option('--appstore-id <appid[@version]>', 'Use app from the store')
     .option('--no-sso', 'Disable Cloudron SSO [false]')
     .option('--debug [cmd...]', 'Enable debug mode', false)
     .option('--readonly', 'Mount filesystem readonly. Default is read/write in debug mode.')
+    .option('--env <KEY=value...>', 'Set environment variables. e.g X=1 Y=2')
     .action(actions.install);
 
 program.command('list')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "5.14.9",
+  "version": "5.15.0",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -17,7 +17,8 @@
   },
   "author": "Cloudron Developers <support@cloudron.io>",
   "dependencies": {
-    "cloudron-manifestformat": "^5.27.0",
+    "@cloudron/manifest-format": "^5.27.0",
+    "@cloudron/superagent": "^1.0.0",
     "commander": "^13.1.0",
     "debug": "^4.4.0",
     "easy-table": "^1.2.0",

package/src/actions.js

@@ -7,14 +7,14 @@ const assert = require('assert'),
     { EventSource } = require('eventsource'),
     fs = require('fs'),
     https = require('https'),
-    manifestFormat = require('cloudron-manifestformat'),
+    manifestFormat = require('@cloudron/manifest-format'),
     os = require('os'),
     path = require('path'),
     readline = require('./readline.js'),
     safe = require('safetydance'),
     spawn = require('child_process').spawn,
     semver = require('semver'),
-    superagent = require('./superagent.js'),
+    superagent = require('@cloudron/superagent'),
     Table = require('easy-table'),
     tar = require('tar-fs'),
     timers = require('timers/promises'),
@@ -544,6 +544,33 @@ async function getManifest(appstoreId) {
     return { manifest: result.manifest, manifestFilePath };
 }
 
+function parseMemoryLimit(limit) {
+    assert.strictEqual(typeof limit, 'string');
+
+    const units = {
+        B: 1,
+        K: 1024,
+        KB: 1024,
+        M: 1024 ** 2,
+        MB: 1024 ** 2,
+        G: 1024 ** 3,
+        GB: 1024 ** 3,
+        T: 1024 ** 4,
+        TB: 1024 ** 4
+    };
+
+    const match = limit.trim().toUpperCase().match(/^([\d.]+)\s*([KMGT]?B?)$/);
+    if (!match) throw new Error(`Invalid size format: "${limit}"`);
+
+    const value = parseFloat(match[1]);
+    const unit = match[2] || 'B';
+
+    const multiplier = units[unit];
+    if (!multiplier) throw new Error(`Unknown unit: "${unit}"`);
+
+    return value * multiplier;
+}
+
 async function install(localOptions, cmd) {
     const options = cmd.optsWithGlobals();
 
@@ -616,6 +643,18 @@ async function install(localOptions, cmd) {
 
         for (const port in ports) console.log(`Port ${port}: ${ports[port]}`);
 
+        // environment variables
+        const env = {};
+        if (options.env) {
+            options.env.forEach(envVar => {
+                const m = envVar.match(/(.*?)=(.*)/);
+                if (!m) return exit(`Expecting KEY=VALUE pattern. Got ${envVar}`);
+                env[m[1]] = m[2];
+            });
+        }
+
+        const memoryLimit = options.memoryLimit ? parseMemoryLimit(options.memoryLimit) : 0;
+
         const data = {
             appStoreId: options.appstoreId || '', // note case change
             manifest: options.appstoreId ? null : manifest, // cloudron ignores manifest anyway if appStoreId is set
@@ -625,7 +664,9 @@ async function install(localOptions, cmd) {
             secondaryDomains,
             aliasDomains,
             ports,
-            accessRestriction: null
+            accessRestriction: null,
+            memoryLimit,
+            env
         };
 
         // the sso only applies for apps which allow optional sso

package/src/appstore-actions.js

@@ -7,11 +7,11 @@ const assert = require('assert'),
     execSync = require('child_process').execSync,
     fs = require('fs'),
     { exit, locateManifest } = require('./helper.js'),
-    manifestFormat = require('cloudron-manifestformat'),
+    manifestFormat = require('@cloudron/manifest-format'),
     path = require('path'),
     readline = require('./readline.js'),
     safe = require('safetydance'),
-    superagent = require('./superagent.js'),
+    superagent = require('@cloudron/superagent'),
     Table = require('easy-table');
 
 exports = module.exports = {

package/src/backup-tools.js

@@ -262,11 +262,13 @@ async function decryptDir(inDir, outDir, options) {
     }
 
     const encryption = aesKeysFromPassword(options.password);
+    const decryptFilenames = options.decryptFilenames;
 
     const inDirAbs = path.resolve(process.cwd(), inDir);
     const outDirAbs = path.resolve(process.cwd(), outDir);
 
     const tbd = [ '' ]; // only has paths relative to inDirAbs
+    let errorCount = 0;
     while (true) {
         const cur = tbd.pop();
         const entries = fs.readdirSync(path.join(inDirAbs, cur), { withFileTypes: true });
@@ -279,29 +281,41 @@ async function decryptDir(inDir, outDir, options) {
                 continue;
             }
 
-            const encryptedFilePath = path.join(cur, entry.name);
-
-            const { error, decryptedFilePath } = decryptFilePath(encryptedFilePath, encryption);
-            if (error) throw error;
+            const fullPath = path.join(cur, entry.name);
+
+            let destPath = fullPath;
+            if (decryptFilenames) {
+                const { error, decryptedFilePath } = decryptFilePath(fullPath, encryption);
+                if (error) {
+                    console.warn(`Could not decrypt filename: ${error.message}`);
+                    errorCount++;
+                    continue;
+                }
+                destPath = decryptedFilePath;
+            }
 
-            console.log(`Decrypting ${decryptedFilePath}`);
+            console.log(`Decrypting ${destPath}`);
 
             const infile = path.join(inDirAbs, cur, entry.name);
             const inStream = fs.createReadStream(infile);
-            fs.mkdirSync(path.dirname(path.join(outDirAbs, decryptedFilePath)), { recursive: true });
-            const outfile = path.join(outDirAbs, decryptedFilePath);
+            fs.mkdirSync(path.dirname(path.join(outDirAbs, destPath)), { recursive: true });
+            const outfile = path.join(outDirAbs, destPath);
             const outStream = fs.createWriteStream(outfile);
             const decryptStream = new DecryptStream(encryption);
 
             const [decryptError] = await safe(stream.pipeline(inStream, decryptStream, outStream));
             if (decryptError) {
                 safe.fs.rmSync(outfile);
-                throw new Error(`Could not decrypt ${infile}: ${decryptError.message}`);
+                console.warn(`Could not decrypt ${infile}: ${decryptError.message}`);
+                ++errorCount;
             }
         }
 
         if (tbd.length === 0) break;
     }
+
+
+    if (errorCount) exit(`Failed to decrypt ${errorCount} files`);
 }
 
 async function decryptFilename(filePath, options) {

package/src/build-actions.js

@@ -16,14 +16,14 @@ const assert = require('assert'),
     exit = require('./helper.js').exit,
     fs = require('fs'),
     helper = require('./helper.js'),
-    manifestFormat = require('cloudron-manifestformat'),
+    manifestFormat = require('@cloudron/manifest-format'),
     micromatch = require('micromatch'),
     os = require('os'),
     path = require('path'),
     readline = require('./readline.js'),
     safe = require('safetydance'),
     stream = require('stream/promises'),
-    superagent = require('./superagent.js'),
+    superagent = require('@cloudron/superagent'),
     tar = require('tar-fs'),
     url = require('url');