cloudron 5.14.8 → 5.14.10

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;
@@ -168,6 +168,7 @@ 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)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "5.14.8",
+  "version": "5.14.10",
   "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,8 @@ async function install(localOptions, cmd) {
 
         for (const port in ports) console.log(`Port ${port}: ${ports[port]}`);
 
+        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 +654,8 @@ async function install(localOptions, cmd) {
             secondaryDomains,
             aliasDomains,
             ports,
-            accessRestriction: null
+            accessRestriction: null,
+            memoryLimit
         };
 
         // 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 = {
@@ -295,6 +295,23 @@ async function verifyManifest(localOptions, cmd) {
     if (error) return exit(error);
 }
 
+async function checkDockerHub(dockerImage) {
+    // const [tagError, tagResponse] = await safe(superagent.get(`https://hub.docker.com/v2/repositories/${repo}/tags/${tag}`).ok(() => true));
+    // if (tagError || tagResponse.status !== 200) return exit(`Failed to find docker image in dockerhub. check https://hub.docker.com/r/${repo}/tags : ${tagError || requestError(tagResponse)}`);
+
+    const [repo, tag] = dockerImage.split(':');
+
+    const [error, response] = await safe(superagent.get(`https://auth.docker.io/token?service=registry.docker.io&scope=repository:${repo}:pull`).ok(() => true));
+    if (error || response.status !== 200) throw new Error(`Failed to get dockerhub token to validate image: ${error || requestError(response)}`);
+    const token = response.body.token;
+
+    const [error2, response2] = await safe(superagent.head(`https://registry-1.docker.io/v2/${repo}/manifests/${tag}`)
+        .set('Accept', 'application/vnd.docker.distribution.manifest.v2+json')
+        .set('Authorization', `Bearer ${token}`)
+        .ok(() => true));
+    if (error2 || response2.status !== 200) throw new Error(`Image not found on docker hub: ${error2 || requestError(response2)}`);
+}
+
 async function upload(localOptions, cmd) {
     const options = cmd.optsWithGlobals();
     // try to find the manifest of this project
@@ -332,9 +349,8 @@ async function upload(localOptions, cmd) {
     const error = manifestFormat.checkAppstoreRequirements(manifest);
     if (error) return exit(error);
 
-    const [repo, tag] = manifest.dockerImage.split(':');
-    const [tagError, tagResponse] = await safe(superagent.get(`https://hub.docker.com/v2/repositories/${repo}/tags/${tag}`).ok(() => true));
-    if (tagError || tagResponse.status !== 200) return exit(`Failed to find docker image in dockerhub. check https://hub.docker.com/r/${repo}/tags : ${tagError || requestError(tagResponse)}`);
+    const [imageError] = await safe(checkDockerHub(manifest.dockerImage));
+    if (imageError) return exit(error);
 
     // ensure the app is known on the appstore side
     const baseDir = path.dirname(manifestFilePath);

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');
 

package/src/superagent.js

@@ -1,6 +1,7 @@
 'use strict';
 
 exports = module.exports = {
+    head,
     get,
     put,
     post,
@@ -214,6 +215,7 @@ class Request {
     }
 }
 
+function head(url) { return new Request('HEAD', url); }
 function get(url) { return new Request('GET', url); }
 function put(url) { return new Request('PUT', url); }
 function post(url) { return new Request('POST', url); }