cloudron 5.13.0 → 5.14.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('superagent'),
+    superagent = require('../src/superagent.js'),
     util = require('util');
 
 const version = require('../package.json').version;
@@ -293,7 +293,7 @@ program.command('update')
         if (Date.now() - (config.get('lastCliUpdateCheck') || 0) > 24*60*60*1000) {
             // check if cli tool is up-to-date
             const [error, response] = await safe(superagent.get('https://registry.npmjs.org/cloudron').retry(0).ok(() => true));
-            if (!error && response.statusCode === 200 && response.body['dist-tags'].latest !== version) {
+            if (!error && response.status === 200 && response.body['dist-tags'].latest !== version) {
                 const updateCommand = 'npm install -g cloudron@' + response.body['dist-tags'].latest;
                 process.stderr.write(util.format('A new version of Cloudron CLI is available. Please update with: %s\n', updateCommand));
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "5.13.0",
+  "version": "5.14.0",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",
@@ -26,7 +26,6 @@
     "micromatch": "^4.0.8",
     "open": "^10.1.0",
     "safetydance": "^2.5.0",
-    "superagent": "^10.1.1",
     "tar-fs": "^3.0.8"
   },
   "engines": {

package/src/actions.js

@@ -15,7 +15,7 @@ const assert = require('assert'),
     safe = require('safetydance'),
     spawn = require('child_process').spawn,
     semver = require('semver'),
-    superagent = require('superagent'),
+    superagent = require('./superagent.js'),
     Table = require('easy-table'),
     tar = require('tar-fs'),
     timers = require('timers/promises'),
@@ -79,7 +79,7 @@ function createRequest(method, apiPath, options) {
     let url = `https://${adminFqdn}${apiPath}`;
     if (url.includes('?')) url += '&'; else url += '?';
     url += `access_token=${token}`;
-    const request = superagent(method, url);
+    const request = superagent.request(method, url);
     if (!rejectUnauthorized) request.disableTLSCerts();
     request.retry(3);
     request.ok(() => true);
@@ -88,9 +88,9 @@ function createRequest(method, apiPath, options) {
 
 // error for the request module
 function requestError(response) {
-    if (response.statusCode === 401) return 'Invalid token. Use cloudron login again.';
+    if (response.status === 401) return 'Invalid token. Use cloudron login again.';
 
-    return `${response.statusCode} message: ${response.body.message || JSON.stringify(response.body)}`; // body is sometimes just a string like in 401
+    return `${response.status} message: ${response.body.message || JSON.stringify(response.body)}`; // body is sometimes just a string like in 401
 }
 
 async function selectDomain(location, options) {
@@ -100,7 +100,7 @@ async function selectDomain(location, options) {
     const { adminFqdn } = requestOptions(options);
 
     const response = await createRequest('GET', '/api/v1/domains', options);
-    if (response.statusCode !== 200) throw new Error(`Failed to list domains: ${requestError(response)}`);
+    if (response.status !== 200) throw new Error(`Failed to list domains: ${requestError(response)}`);
 
     const domains = response.body.domains;
 
@@ -134,7 +134,7 @@ async function stopActiveTask(app, options) {
     console.log(`Stopping app's current active task ${app.taskId}`);
 
     const response = await createRequest('POST', `/api/v1/tasks/${app.taskId}/stop`, options);
-    if (response.statusCode !== 204) throw `Failed to stop active task: ${requestError(response)}`;
+    if (response.status !== 204) throw `Failed to stop active task: ${requestError(response)}`;
 }
 
 async function selectAppWithRepository(repository, options) {
@@ -142,7 +142,7 @@ async function selectAppWithRepository(repository, options) {
     assert.strictEqual(typeof options, 'object');
 
     const response = await createRequest('GET', '/api/v1/apps', options);
-    if (response.statusCode !== 200) throw new Error(`Failed to install app: ${requestError(response)}`);
+    if (response.status !== 200) throw new Error(`Failed to install app: ${requestError(response)}`);
 
     const matchingApps = response.body.apps.filter(function (app) {
         return !app.appStoreId && app.manifest.dockerImage.startsWith(repository); // never select apps from the store
@@ -190,12 +190,12 @@ async function getApp(options) {
         return result;
     } else if (app.match(/.{8}-.{4}-.{4}-.{4}-.{8}/)) {  // it is an id
         const response = await createRequest('GET', `/api/v1/apps/${app}`, options);
-        if (response.statusCode !== 200) throw new Error(`Failed to get app: ${requestError(response)}`);
+        if (response.status !== 200) throw new Error(`Failed to get app: ${requestError(response)}`);
 
         return response.body;
     } else { // it is a location
         const response = await createRequest('GET', '/api/v1/apps', options);
-        if (response.statusCode !== 200) throw new Error(`Failed to get apps: ${requestError(response)}`);
+        if (response.status !== 200) throw new Error(`Failed to get apps: ${requestError(response)}`);
 
         const match = response.body.apps.filter(function (m) { return m.subdomain === app || m.location === app || m.fqdn === app; });
         if (match.length == 0) throw new Error(`App at location ${app} not found`);
@@ -215,7 +215,7 @@ async function waitForHealthy(appId, options) {
     while (true) {
         await timers.setTimeout(1000);
         const response = await createRequest('GET', `/api/v1/apps/${appId}`, options);
-        if (response.statusCode !== 200) throw new Error(`Failed to get app: ${requestError(response)}`);
+        if (response.status !== 200) throw new Error(`Failed to get app: ${requestError(response)}`);
 
         // do not check installation state here. it can be pending_backup etc (this is a bug in box code)
         if (response.body.health === 'healthy') return;
@@ -238,7 +238,7 @@ async function waitForTask(taskId, options) {
 
     while (true) {
         const response = await createRequest('GET', `/api/v1/tasks/${taskId}`, options);
-        if (response.statusCode !== 200) throw new Error(`Failed to get task: ${requestError(response)}`);
+        if (response.status !== 200) throw new Error(`Failed to get task: ${requestError(response)}`);
 
         if (!response.body.active) return response.body;
 
@@ -272,7 +272,7 @@ async function waitForFinishInstallation(appId, taskId, options) {
     await waitForTask(taskId, options);
 
     const response = await createRequest('GET', `/api/v1/apps/${appId}`, options);
-    if (response.statusCode !== 200) throw new Error(`Failed to get app: ${requestError(response)}`);
+    if (response.status !== 200) throw new Error(`Failed to get app: ${requestError(response)}`);
 
     if (response.body.installationState !== 'installed') throw new Error(`Installation failed: ${response.body.error ? response.body.error.message : ''}`);
 
@@ -289,7 +289,7 @@ async function waitForFinishBackup(appId, taskId, options) {
     if (result.error) throw new Error(`Backup failed: ${result.error.message}`);
 
     const response = await createRequest('GET', `/api/v1/apps/${appId}`, options);
-    if (response.statusCode !== 200) throw new Error(`Failed to get app: ${requestError(response)}`);
+    if (response.status !== 200) throw new Error(`Failed to get app: ${requestError(response)}`);
 }
 
 async function stopApp(app, options) {
@@ -297,7 +297,7 @@ async function stopApp(app, options) {
     assert.strictEqual(typeof options, 'object');
 
     const response = await createRequest('POST', `/api/v1/apps/${app.id}/stop`, options);
-    if (response.statusCode !== 202) throw `Failed to stop app: ${requestError(response)}`;
+    if (response.status !== 202) throw `Failed to stop app: ${requestError(response)}`;
 
     await waitForTask(response.body.taskId, options);
 }
@@ -307,7 +307,7 @@ async function startApp(app, options) {
     assert.strictEqual(typeof options, 'object');
 
     const response = await createRequest('POST', `/api/v1/apps/${app.id}/start`, options);
-    if (response.statusCode !== 202) throw `Failed to start app: ${requestError(response)}`;
+    if (response.status !== 202) throw `Failed to start app: ${requestError(response)}`;
 
     await waitForTask(response.body.taskId, options);
 }
@@ -317,7 +317,7 @@ async function restartApp(app, options) {
     assert.strictEqual(typeof options, 'object');
 
     const response = await createRequest('POST', `/api/v1/apps/${app.id}/restart`, options);
-    if (response.statusCode !== 202) throw `Failed to restart app: ${requestError(response)}`;
+    if (response.status !== 202) throw `Failed to restart app: ${requestError(response)}`;
 
     await waitForTask(response.body.taskId, options);
 }
@@ -351,7 +351,7 @@ async function authenticate(adminFqdn, username, password, options) {
         }
     }
 
-    if (response.statusCode !== 200) throw new Error(`Login failed: Status code: ${requestError(response)}`);
+    if (response.status !== 200) throw new Error(`Login failed: Status code: ${requestError(response)}`);
 
     return response.body.accessToken;
 }
@@ -425,7 +425,7 @@ async function list(localOptions, cmd) {
     const options = cmd.optsWithGlobals();
     const [error, response] = await safe(createRequest('GET', '/api/v1/apps', options));
     if (error) return exit(error);
-    if (response.statusCode !== 200) return exit(`Failed to list apps: ${requestError(response)}`);
+    if (response.status !== 200) return exit(`Failed to list apps: ${requestError(response)}`);
 
     let apps = response.body.apps;
 
@@ -447,7 +447,7 @@ async function list(localOptions, cmd) {
 
         const response = result.value;
 
-        if (response.statusCode !== 200) return exit(`Failed to list app: ${requestError(response)}`);
+        if (response.status !== 200) return exit(`Failed to list app: ${requestError(response)}`);
         response.body.location = response.body.location || response.body.subdomain; // LEGACY support
 
         const detailedApp = response.body;
@@ -513,7 +513,7 @@ async function downloadManifest(appstoreId) {
 
     const [error, response] = await safe(superagent.get(url).ok(() => true));
     if (error) throw new Error(`Failed to list apps from appstore: ${error.message}`);
-    if (response.statusCode !== 200) throw new Error(`Failed to get app info from store: ${requestError(response)}`);
+    if (response.status !== 200) throw new Error(`Failed to get app info from store: ${requestError(response)}`);
 
     return { manifest: response.body.manifest, manifestFilePath: null /* manifest file path */ };
 }
@@ -647,7 +647,7 @@ async function install(localOptions, cmd) {
 
         const request = createRequest('POST', '/api/v1/apps/install', options);
         const response = await request.send(data);
-        if (response.statusCode !== 202) return exit(`Failed to install app: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to install app: ${requestError(response)}`);
 
         const appId = response.body.id;
 
@@ -744,7 +744,7 @@ async function setLocation(localOptions, cmd) {
 
         const request = createRequest('POST', `/api/v1/apps/${app.id}/configure/location`, options);
         const response = await request.send(data);
-        if (response.statusCode !== 202) return exit(`Failed to configure app: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to configure app: ${requestError(response)}`);
 
         await waitForTask(response.body.taskId, options);
         await waitForHealthy(app.id, options);
@@ -800,7 +800,7 @@ async function update(localOptions, cmd) {
 
         const request = createRequest('POST', apiPath, options);
         const response = await request.send(data);
-        if (response.statusCode !== 202) return exit(`Failed to update app: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to update app: ${requestError(response)}`);
 
         process.stdout.write('\n => ' + 'Waiting for app to be updated ');
 
@@ -829,7 +829,7 @@ async function debug(args, localOptions, cmd) {
 
         const request = createRequest('POST', `/api/v1/apps/${app.id}/configure/debug_mode`, options);
         const response = await request.send(data);
-        if (response.statusCode !== 202) return exit(`Failed to set debug mode: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to set debug mode: ${requestError(response)}`);
 
         await waitForTask(response.body.taskId, options);
 
@@ -843,7 +843,7 @@ async function debug(args, localOptions, cmd) {
 
         const request2 = createRequest('POST', `/api/v1/apps/${app.id}/configure/memory_limit`, options);
         const response2 = await request2.send({ memoryLimit });
-        if (response2.statusCode !== 202) return exit(`Failed to set memory limit: ${requestError(response2)}`);
+        if (response2.status !== 202) return exit(`Failed to set memory limit: ${requestError(response2)}`);
 
         await waitForTask(response2.body.taskId, options);
         console.log('\n\nDone');
@@ -863,7 +863,7 @@ async function repair(localOptions, cmd) {
 
         const request = createRequest('POST', `/api/v1/apps/${app.id}/repair`, options);
         const response = await request.send(data);
-        if (response.statusCode !== 202) return exit(`Failed to set repair mode: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to set repair mode: ${requestError(response)}`);
 
         process.stdout.write('\n => ' + 'Waiting for app to be repaired ');
 
@@ -896,13 +896,13 @@ async function uninstall(localOptions, cmd) {
         await stopActiveTask(app, options);
 
         const response = await createRequest('POST', `/api/v1/apps/${app.id}/uninstall`, options);
-        if (response.statusCode !== 202) return exit(`Failed to uninstall app: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to uninstall app: ${requestError(response)}`);
 
         process.stdout.write('\n => ' + 'Waiting for app to be uninstalled ');
 
         await waitForTask(response.body.taskId, options);
         const response2 = await createRequest('GET', `/api/v1/apps/${app.id}`, options);
-        if (response2.statusCode === 404) {
+        if (response2.status === 404) {
             console.log('\n\nApp %s successfully uninstalled.', app.fqdn);
         } else if (response2.body.installationState === 'error') {
             console.log('\n\nApp uninstallation failed.\n');
@@ -968,7 +968,7 @@ async function logs(localOptions, cmd) {
 
         const req = superagent.get(url, { rejectUnauthorized });
         req.on('response', function (response) {
-            if (response.statusCode !== 200) return exit(`Failed to get logs: ${requestError(response)}`);
+            if (response.status !== 200) return exit(`Failed to get logs: ${requestError(response)}`);
         });
         req.on('error', (error) => exit(`Pipe error: ${error.message}`));
 
@@ -1003,13 +1003,13 @@ async function inspect(localOptions, cmd) {
     try {
         const options = cmd.optsWithGlobals();
         const response = await createRequest('GET', '/api/v1/apps', options);
-        if (response.statusCode !== 200) return exit(`Failed to list apps: ${requestError(response)}`);
+        if (response.status !== 200) return exit(`Failed to list apps: ${requestError(response)}`);
 
         const apps = [];
 
         for (const app of response.body.apps) {
             const response2 = await createRequest('GET', `/api/v1/apps/${app.id}`, options);
-            if (response2.statusCode !== 200) return exit(`Failed to list app: ${requestError(response2)}`);
+            if (response2.status !== 200) return exit(`Failed to list app: ${requestError(response2)}`);
             response2.body.location = response2.body.location || response2.body.subdomain; // LEGACY support
             apps.push(response2.body);
         }
@@ -1070,7 +1070,7 @@ async function backupCreate(localOptions, cmd) {
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
         const response = await createRequest('POST', `/api/v1/apps/${app.id}/backup`, options);
-        if (response.statusCode !== 202) return exit(`Failed to start backup: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to start backup: ${requestError(response)}`);
 
         // FIXME: this should be waitForHealthCheck but the box code incorrectly modifies the installationState
         await waitForFinishBackup(app.id, response.body.taskId, options);
@@ -1087,7 +1087,7 @@ async function backupList(localOptions, cmd) {
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
         const response = await createRequest('GET', `/api/v1/apps/${app.id}/backups`, options);
-        if (response.statusCode !== 200) return exit(`Failed to list backups: ${requestError(response)}`);
+        if (response.status !== 200) return exit(`Failed to list backups: ${requestError(response)}`);
 
         if (options.raw) return console.log(JSON.stringify(response.body.backups, null, 4));
 
@@ -1117,7 +1117,7 @@ async function backupList(localOptions, cmd) {
 
 async function getLastBackup(app, options) {
     const response = await createRequest('GET', `/api/v1/apps/${app.id}/backups`, options);
-    if (response.statusCode !== 200) throw new Error(`Failed to list backups: ${requestError(response)}`);
+    if (response.status !== 200) throw new Error(`Failed to list backups: ${requestError(response)}`);
     if (response.body.backups.length === 0) throw new Error('No backups');
 
     response.body.backups = response.body.backups.map(function (backup) {
@@ -1143,7 +1143,7 @@ async function restore(localOptions, cmd) {
 
         const request = createRequest('POST', `/api/v1/apps/${app.id}/restore`, options);
         const response = await request.send({ backupId });
-        if (response.statusCode !== 202) return exit(`Failed to restore app: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to restore app: ${requestError(response)}`);
 
         // FIXME: this should be waitForHealthCheck but the box code incorrectly modifies the installationState
         await waitForFinishInstallation(app.id, response.body.taskId, options);
@@ -1202,7 +1202,7 @@ async function importApp(localOptions, cmd) {
         }
 
         const response = await createRequest('POST', `/api/v1/apps/${app.id}/import`, options);
-        if (response.statusCode !== 202) return exit(`Failed to import app: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to import app: ${requestError(response)}`);
 
         await waitForFinishInstallation(app.id, response.body.taskId, options);
         console.log('\n\nApp is restored');
@@ -1223,7 +1223,7 @@ async function exportApp(localOptions, cmd) {
 
         const request = createRequest('POST', `/api/v1/apps/${app.id}/export`, options);
         const response = await request.send(data);
-        if (response.statusCode !== 202) return exit(`Failed to export app: ${requestError(response)}`);
+        if (response.status !== 202) return exit(`Failed to export app: ${requestError(response)}`);
 
         await waitForFinishInstallation(app.id, response.body.taskId, options);
         console.log('\n\nApp is exported');
@@ -1256,7 +1256,7 @@ async function clone(localOptions, cmd) {
         };
         const request = createRequest('POST', `/api/v1/apps/${app.id}/clone`, options);
         const response = await request.send(data);
-        if (response.statusCode !== 201) return exit(`Failed to list apps: ${requestError(response)}`);
+        if (response.status !== 201) return exit(`Failed to list apps: ${requestError(response)}`);
 
         // FIXME: this should be waitForHealthCheck but the box code incorrectly modifies the installationState
         console.log('App cloned as id ' + response.body.id);
@@ -1317,12 +1317,12 @@ async function exec(args, localOptions, cmd) {
 
     const request = createRequest('POST', `/api/v1/apps/${app.id}/exec`, options);
     const response = await request.send({ cmd: args, tty, lang });
-    if (response.statusCode !== 200) return exit(`Failed to create exec: ${requestError(response)}`);
+    if (response.status !== 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)}`);
+        if (response2.status !== 200) return exit(`Failed to get exec code: ${requestError(response2)}`);
 
         process.exit(response2.body.exitCode);
     }
@@ -1519,7 +1519,7 @@ async function setEnv(app, env, options) {
 
     const request = createRequest('POST', `/api/v1/apps/${app.id}/configure/env`, options);
     const response = await request.send({ env });
-    if (response.statusCode !== 202) return exit(`Failed to set env: ${requestError(response)}`);
+    if (response.status !== 202) return exit(`Failed to set env: ${requestError(response)}`);
 
     await waitForTask(response.body.taskId, options);
     console.log('\n');
@@ -1532,7 +1532,7 @@ async function envSet(envVars, localOptions, cmd) {
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
         const response = await createRequest('GET', `/api/v1/apps/${app.id}`, options);
-        if (response.statusCode !== 200) return exit(`Failed to get app: ${requestError(response)}`);
+        if (response.status !== 200) return exit(`Failed to get app: ${requestError(response)}`);
 
         const env = response.body.env;
         envVars.forEach(envVar => {
@@ -1554,7 +1554,7 @@ async function envUnset(envNames, localOptions, cmd) {
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
         const response = await createRequest('GET', `/api/v1/apps/${app.id}`, options);
-        if (response.statusCode !== 200) return exit(`Failed to get app: ${requestError(response)}`);
+        if (response.status !== 200) return exit(`Failed to get app: ${requestError(response)}`);
 
         const env = response.body.env;
         envNames.forEach(name => delete env[name]);
@@ -1572,7 +1572,7 @@ async function envList(localOptions, cmd) {
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
         const response = await createRequest('GET', `/api/v1/apps/${app.id}`, options);
-        if (response.statusCode !== 200) return exit(`Failed to get app: ${requestError(response)}`);
+        if (response.status !== 200) return exit(`Failed to get app: ${requestError(response)}`);
 
         const t = new Table();
 
@@ -1600,7 +1600,7 @@ async function envGet(envName, localOptions, cmd) {
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
         const response = await createRequest('GET', `/api/v1/apps/${app.id}`, options);
-        if (response.statusCode !== 200) return exit(`Failed to get app: ${requestError(response)}`);
+        if (response.status !== 200) return exit(`Failed to get app: ${requestError(response)}`);
 
         console.log(response.body.env[envName]);
     } catch (error) {

package/src/appstore-actions.js

@@ -11,7 +11,7 @@ const assert = require('assert'),
     path = require('path'),
     readline = require('./readline.js'),
     safe = require('safetydance'),
-    superagent = require('superagent'),
+    superagent = require('./superagent.js'),
     Table = require('easy-table');
 
 exports = module.exports = {
@@ -31,9 +31,9 @@ exports = module.exports = {
 const NO_MANIFEST_FOUND_ERROR_STRING = 'No CloudronManifest.json found';
 
 function requestError(response) {
-    if (response.statusCode === 401) return 'Invalid token. Use cloudron appstore login again.';
+    if (response.status === 401) return 'Invalid token. Use cloudron appstore login again.';
 
-    return `${response.statusCode} message: ${response.body.message || JSON.stringify(response.body)}`; // body is sometimes just a string like in 401
+    return `${response.status} message: ${response.body?.message || response.text || JSON.stringify(response.body)}`; // body is sometimes just a string like in 401
 }
 
 function createRequest(method, apiPath, options) {
@@ -42,7 +42,7 @@ function createRequest(method, apiPath, options) {
     let url = `${config.appStoreOrigin()}${apiPath}`;
     if (url.includes('?')) url += '&'; else url += '?';
     url += `accessToken=${token}`;
-    const request = superagent(method, url);
+    const request = superagent.request(method, url);
     request.retry(3);
     request.ok(() => true);
     return request;
@@ -77,7 +77,7 @@ async function authenticate(options) { // maybe we can use options.token to vali
     config.setAppStoreToken(null);
 
     const response = await superagent.post(createUrl('/api/v1/login')).auth(email, password).send({ totpToken: options.totpToken }).ok(() => true);
-    if (response.statusCode === 401 && response.body.message.indexOf('TOTP') !== -1) {
+    if (response.status === 401 && response.body.message.indexOf('TOTP') !== -1) {
         if (response.body.message === 'TOTP token missing') console.log('A 2FA TOTP Token is required for this account.');
 
         options.totpToken = await readline.question('2FA token: ', {});
@@ -88,7 +88,7 @@ async function authenticate(options) { // maybe we can use options.token to vali
         return await authenticate(options); // try again with top set
     }
 
-    if (response.statusCode !== 200) {
+    if (response.status !== 200) {
         console.log('Login failed.');
 
         options.hideBanner = true;
@@ -118,7 +118,7 @@ async function info(localOptions, cmd) {
     const [id, version] = await getAppstoreId(options.appstoreId);
 
     const response = await createRequest('GET', `/api/v1/developers/apps/${id}/versions/${version}`, options);
-    if (response.statusCode !== 200) return exit(new Error(`Failed to list versions: ${requestError(response)}`));
+    if (response.status !== 200) return exit(new Error(`Failed to list versions: ${requestError(response)}`));
 
     const manifest = response.body.manifest;
     console.log('id: %s', manifest.id);
@@ -134,7 +134,7 @@ async function listVersions(localOptions, cmd) {
     const [id] = await getAppstoreId(options.appstoreId);
 
     const response = await createRequest('GET', `/api/v1/developers/apps/${id}/versions`, options);
-    if (response.statusCode !== 200) return exit(new Error(`Failed to list versions: ${requestError(response)}`));
+    if (response.status !== 200) return exit(new Error(`Failed to list versions: ${requestError(response)}`));
 
     if (response.body.versions.length === 0) return console.log('No versions found.');
 
@@ -219,8 +219,8 @@ async function addVersion(manifest, baseDir, options) {
     if (iconFilePath) request.attach('icon', iconFilePath);
     request.attach('manifest', Buffer.from(JSON.stringify(manifest)), 'manifest');
     const response = await request;
-    if (response.statusCode === 409) throw new Error('This version already exists. Use --force to overwrite.');
-    if (response.statusCode !== 204) throw new Error(`Failed to publish version: ${requestError(response)}`);
+    if (response.status === 409) throw new Error('This version already exists. Use --force to overwrite.');
+    if (response.status !== 204) throw new Error(`Failed to publish version: ${requestError(response)}`);
 }
 
 async function updateVersion(manifest, baseDir, options) {
@@ -262,7 +262,7 @@ async function updateVersion(manifest, baseDir, options) {
     if (iconFilePath) request.attach('icon', iconFilePath);
     request.attach('manifest', Buffer.from(JSON.stringify(manifest)), 'manifest');
     const response = await request;
-    if (response.statusCode !== 204) throw new Error(`Failed to publish version: ${requestError(response)}`);
+    if (response.status !== 204) throw new Error(`Failed to publish version: ${requestError(response)}`);
 }
 
 async function verifyManifest(localOptions, cmd) {
@@ -334,7 +334,7 @@ async function upload(localOptions, cmd) {
 
     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.statusCode !== 200) return exit(`Failed to find docker image in dockerhub. check https://hub.docker.com/r/${repo}/tags : ${tagError || requestError(tagResponse)}`);
+    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)}`);
 
     // ensure the app is known on the appstore side
     const baseDir = path.dirname(manifestFilePath);
@@ -342,7 +342,7 @@ async function upload(localOptions, cmd) {
     const request = createRequest('POST', '/api/v1/developers/apps', options);
     request.send({ id: manifest.id });
     const response = await request;
-    if (response.statusCode !== 409 && response.statusCode !== 201) return exit(`Failed to add app: ${requestError(response)}`); // 409 means already exists
+    if (response.status !== 409 && response.status !== 201) return exit(`Failed to add app: ${requestError(response)}`); // 409 means already exists
     console.log(`Uploading ${manifest.id}@${manifest.version} (dockerImage: ${manifest.dockerImage}) for testing`);
 
     const [error2] = await safe(options.force ? updateVersion(manifest, baseDir, options) : addVersion(manifest, baseDir, options));
@@ -362,12 +362,12 @@ async function submit(localOptions, cmd) {
     const manifest = result.manifest;
 
     const response = await createRequest('POST', `/api/v1/developers/apps/${manifest.id}/versions/${manifest.version}/submit`, options);
-    if (response.statusCode === 404) {
+    if (response.status === 404) {
         console.log(`No version ${manifest.version} found. Please use 'cloudron apsptore upload' first`);
         return exit('Failed to submit app for review.');
     }
 
-    if (response.statusCode !== 200) return exit(`Failed to submit app: ${requestError(response)}`);
+    if (response.status !== 200) return exit(`Failed to submit app: ${requestError(response)}`);
 
     console.log('App submitted for review.');
     console.log('You will receive an email when approved.');
@@ -381,7 +381,7 @@ async function revoke(localOptions, cmd) {
     console.log(`Revoking ${id}@${version}`);
 
     const response = await createRequest('POST', `/api/v1/developers/apps/${id}/versions/${version}/revoke`, options);
-    if (response.statusCode !== 200) return exit(`Failed to revoke version: ${requestError(response)}`);
+    if (response.status !== 200) return exit(`Failed to revoke version: ${requestError(response)}`);
 
     console.log('version revoked.');
 }
@@ -418,7 +418,7 @@ async function approve(localOptions, cmd) {
     }
 
     const response = await createRequest('POST', `/api/v1/developers/apps/${appstoreId}/versions/${version}/approve`, options);
-    if (response.statusCode !== 200) return exit(`Failed to approve version: ${requestError(response)}`);
+    if (response.status !== 200) return exit(`Failed to approve version: ${requestError(response)}`);
 
     if (options.gitPush) {
         safe.child_process.execSync(`git push --atomic origin ${defaultBranch} ${latestTag}`, { encoding: 'utf8' });
@@ -429,7 +429,7 @@ async function approve(localOptions, cmd) {
     console.log('');
 
     const response2 = await createRequest('GET', `/api/v1/developers/apps/${appstoreId}/versions/${version}`, options);
-    if (response2.statusCode !== 200) return exit(`Failed to list apps: ${requestError(response)}`);
+    if (response2.status !== 200) return exit(`Failed to list apps: ${requestError(response)}`);
 
     console.log('Changelog for forum update: ' + response2.body.manifest.forumUrl);
     console.log('');
@@ -469,18 +469,18 @@ async function notify() {
     const categoryId = categoryMatch[1];
 
     const categoryResponse = await superagent.get(`https://forum.cloudron.io/api/v3/categories/${categoryId}/topics`).set('Authorization', `Bearer ${apiToken}`).ok(() => true);
-    if (categoryResponse.statusCode !== 200) return exit(`Unable to get topics of category: ${requestError(categoryResponse)}`);
+    if (categoryResponse.status !== 200) return exit(`Unable to get topics of category: ${requestError(categoryResponse)}`);
     const topic = categoryResponse.body.response.topics.find(t => t.title.includes('Package Updates'));
     if (!topic) return exit('Could not find the Package Update topic');
     const topicId = topic.tid;
 
     const pageCountResponse = await superagent.get(`https://forum.cloudron.io/api/topic/pagination/${topicId}`).set('Authorization', `Bearer ${apiToken}`).ok(() => true);
-    if (pageCountResponse.statusCode !== 200) return exit(`Unable to get page count of topic: ${requestError(pageCountResponse)}`);
+    if (pageCountResponse.status !== 200) return exit(`Unable to get page count of topic: ${requestError(pageCountResponse)}`);
     const pageCount = pageCountResponse.body.pagination.pageCount;
 
     for (let page = 1; page <= pageCount; page++) {
         const pageResponse = await superagent.get(`https://forum.cloudron.io/api/topic/${topicId}?page=${page}`).set('Authorization', `Bearer ${apiToken}`).ok(() => true);
-        if (pageResponse.statusCode !== 200) return exit(`Unable to get topics of category: ${requestError(pageResponse)}`);
+        if (pageResponse.status !== 200) return exit(`Unable to get topics of category: ${requestError(pageResponse)}`);
         for (const post of pageResponse.body.posts) { // post.content is html!
             if (post.content.includes(`[${manifest.version}]`)) return exit(`Version ${manifest.version} is already on the forum.\n${post.content}`);
         }
@@ -492,6 +492,6 @@ async function notify() {
         toPid: 0 // which post is this post a reply to
     };
     const postResponse = await superagent.post(`https://forum.cloudron.io/api/v3/topics/${topicId}`).set('Authorization', `Bearer ${apiToken}`).send(postData).ok(() => true);
-    if (postResponse.statusCode !== 200) return exit(`Unable to create changelog post: ${requestError(postResponse)}`);
+    if (postResponse.status !== 200) return exit(`Unable to create changelog post: ${requestError(postResponse)}`);
     console.log('Posted to forum');
 }

package/src/build-actions.js

@@ -18,19 +18,19 @@ const assert = require('assert'),
     helper = require('./helper.js'),
     manifestFormat = require('cloudron-manifestformat'),
     micromatch = require('micromatch'),
-    readline = require('./readline.js'),
-    superagent = require('superagent'),
     os = require('os'),
     path = require('path'),
+    readline = require('./readline.js'),
     safe = require('safetydance'),
     stream = require('stream/promises'),
+    superagent = require('./superagent.js'),
     tar = require('tar-fs'),
     url = require('url');
 
 function requestError(response) {
-    if (response.statusCode === 401 || response.statusCode === 403) return 'Invalid token. Use cloudron build login again.';
+    if (response.status === 401 || response.status === 403) return 'Invalid token. Use cloudron build login again.';
 
-    return `${response.statusCode} message: ${response.body?.message || null}`;
+    return `${response.status} message: ${response.body?.message || response.text || null}`;
 }
 
 // analyzes options and merges with any existing build service config
@@ -73,8 +73,8 @@ async function login(localOptions, cmd) {
     const token = options.buildServiceToken || await readline.question('Token: ', {});
 
     const response = await superagent.get(`${buildServiceConfig.url}/api/v1/profile`).query({ accessToken: token }).ok(() => true);
-    if (response.statusCode === 401 || response.statusCode === 403) return exit(`Authentication error: ${requestError(response)}`);
-    if (response.statusCode !== 200) return exit(`Unexpected response: ${requestError(response)}`);
+    if (response.status === 401 || response.status === 403) return exit(`Authentication error: ${requestError(response)}`);
+    if (response.status !== 200) return exit(`Unexpected response: ${requestError(response)}`);
 
     buildServiceConfig.token = token;
     config.setBuildServiceConfig(buildServiceConfig);
@@ -156,7 +156,7 @@ async function getStatus(buildId) {
     const response2 = await superagent.get(`${buildServiceConfig.url}/api/v1/builds/${buildId}`)
         .query({ accessToken: buildServiceConfig.token })
         .ok(() => true);
-    if (response2.statusCode !== 200) throw new Error(`Failed to get status: ${requestError(response2)}`);
+    if (response2.status !== 200) throw new Error(`Failed to get status: ${requestError(response2)}`);
     return response2.body.status;
 }
 
@@ -278,8 +278,8 @@ async function buildRemote(manifest, sourceDir, appConfig, options) {
         .field('buildArgs', JSON.stringify(buildArgsObject))
         .attach('sourceArchive', sourceArchiveFilePath)
         .ok(() => true);
-    if (response.statusCode === 413) return exit('Failed to build app. The app source is too large.\nPlease adjust your .dockerignore file to only include neccessary files.');
-    if (response.statusCode !== 201) return exit(`Failed to upload app for building: ${requestError(response)}`);
+    if (response.status === 413) return exit('Failed to build app. The app source is too large.\nPlease adjust your .dockerignore file to only include neccessary files.');
+    if (response.status !== 201) return exit(`Failed to upload app for building: ${requestError(response)}`);
 
     const buildId = response.body.id;
     console.log(`BuildId: ${buildId}`);
@@ -380,7 +380,7 @@ async function push(localOptions, cmd) {
         .query({ accessToken: buildServiceConfig.token })
         .send({ dockerImageRepo: repository, dockerImageTag: tag })
         .ok(() => true);
-    if (response.statusCode !== 201) return exit(`Failed to push: ${requestError(response)}`);
+    if (response.status !== 201) return exit(`Failed to push: ${requestError(response)}`);
 
     const [logsError] = await safe(followBuildLog(options.id, !!options.raw));
     if (logsError) console.log(`Failed to get logs: ${logsError.message}`);

package/src/superagent.js

@@ -21,20 +21,30 @@ const assert = require('assert'),
     safe = require('safetydance');
 
 class Request {
+    #boundary;
+    #redirectCount;
+    #retryCount;
+    #timer;
+    #body;
+    #okFunc;
+    #options;
+    #url;
+
     constructor(method, url) {
         assert.strictEqual(typeof url, 'string');
 
-        this.url = new URL(url);
-        this.options = {
+        this.#url = new URL(url);
+        this.#options = {
             method,
             headers: {},
             signal: null // set for timeouts
         };
-        this.okFunc = ({ status }) => status >=200 && status <= 299;
-        this.timer = { timeout: 0, id: null, controller: null };
-        this.retryCount = 0;
-        this.body = null;
-        this.redirectCount = 5;
+        this.#okFunc = ({ status }) => status >=200 && status <= 299;
+        this.#timer = { timeout: 0, id: null, controller: null };
+        this.#retryCount = 0;
+        this.#body = Buffer.alloc(0);
+        this.#redirectCount = 5;
+        this.#boundary = null; // multipart only
     }
 
     async _handleResponse(url, response) {
@@ -74,7 +84,7 @@ class Request {
     async _makeRequest(url) {
         return new Promise((resolve, reject) => {
             const proto = url.protocol === 'https:' ? https : http;
-            const request = proto.request(url, this.options); // ClientRequest
+            const request = proto.request(url, this.#options); // ClientRequest
 
             request.on('error', reject); // network error, dns error
             request.on('response', async (response) => {
@@ -82,7 +92,7 @@ class Request {
                 if (error) reject(error); else resolve(result);
             });
 
-            if (this.body) request.write(this.body);
+            request.write(this.#body);
 
             request.end();
         });
@@ -91,24 +101,24 @@ class Request {
     async _start() {
         let error;
 
-        for (let i = 0; i < this.retryCount+1; i++) {
-            if (this.timer.timeout) this.timer.id = setTimeout(() => this.timer.controller.abort(), this.timer.timeout);
-            debug(`${this.options.method} ${this.url.toString()}` + (i ? ` try ${i+1}` : ''));
+        for (let i = 0; i < this.#retryCount+1; i++) {
+            if (this.#timer.timeout) this.#timer.id = setTimeout(() => this.#timer.controller.abort(), this.#timer.timeout);
+            debug(`${this.#options.method} ${this.#url.toString()}` + (i ? ` try ${i+1}` : ''));
 
-            let response, url = this.url;
-            for (let redirects = 0; redirects < this.redirectCount+1; redirects++) {
+            let response, url = this.#url;
+            for (let redirects = 0; redirects < this.#redirectCount+1; redirects++) {
                 [error, response] = await safe(this._makeRequest(url));
-                if (error || (response.status < 300 || response.status > 399) || (this.options.method !== 'GET')) break;
+                if (error || (response.status < 300 || response.status > 399) || (this.#options.method !== 'GET')) break;
                 url = response.url; // follow
             }
 
-            if (!error && !this.okFunc({ status: response.status })) {
+            if (!error && !this.#okFunc({ status: response.status })) {
                 error = new Error(`${response.status} ${http.STATUS_CODES[response.status]}`);
                 Object.assign(error, response);
             }
 
-            if (error) debug(`${this.options.method} ${this.url.toString()} ${error.message}`);
-            if (this.timer.timeout) clearTimeout(this.timer.id);
+            if (error) debug(`${this.#options.method} ${this.#url.toString()} ${error.message}`);
+            if (this.#timer.timeout) clearTimeout(this.#timer.id);
             if (!error) return response;
         }
 
@@ -116,52 +126,52 @@ class Request {
     }
 
     set(name, value) {
-        this.options.headers[name.toLowerCase()] = value;
+        this.#options.headers[name.toLowerCase()] = value;
         return this;
     }
 
     query(data) {
-        Object.entries(data).forEach(([key, value]) => this.url.searchParams.append(key, value));
+        Object.entries(data).forEach(([key, value]) => this.#url.searchParams.append(key, value));
         return this;
     }
 
     redirects(count) {
-        this.redirectCount = count;
+        this.#redirectCount = count;
         return this;
     }
 
     send(data) {
-        const contentType = this.options.headers['content-type'];
+        const contentType = this.#options.headers['content-type'];
         if (!contentType || contentType === 'application/json') {
-            this.options.headers['content-type'] = 'application/json';
-            this.body = Buffer.from(JSON.stringify(data), 'utf8');
-            this.options.headers['content-length'] = this.body.byteLength;
+            this.#options.headers['content-type'] = 'application/json';
+            this.#body = Buffer.from(JSON.stringify(data), 'utf8');
+            this.#options.headers['content-length'] = this.#body.byteLength;
         } else if (contentType === 'application/x-www-form-urlencoded') {
-            this.body = Buffer.from((new URLSearchParams(data)).toString(), 'utf8');
-            this.options.headers['content-length'] = this.body.byteLength;
+            this.#body = Buffer.from((new URLSearchParams(data)).toString(), 'utf8');
+            this.#options.headers['content-length'] = this.#body.byteLength;
         }
         return this;
     }
 
     timeout(msecs) {
-        this.timer.controller = new AbortController();
-        this.timer.timeout = msecs;
-        this.options.signal = this.timer.controller.signal;
+        this.#timer.controller = new AbortController();
+        this.#timer.timeout = msecs;
+        this.#options.signal = this.#timer.controller.signal;
         return this;
     }
 
     retry(count) {
-        this.retryCount = Math.max(0, count);
+        this.#retryCount = Math.max(0, count);
         return this;
     }
 
     ok(func) {
-        this.okFunc = func;
+        this.#okFunc = func;
         return this;
     }
 
     disableTLSCerts() {
-        this.options.rejectUnauthorized = true;
+        this.#options.rejectUnauthorized = true;
         return this;
     }
 
@@ -170,21 +180,35 @@ class Request {
         return this;
     }
 
+    field(name, value) {
+        if (!this.#boundary) this.#boundary = '----WebKitFormBoundary' + Math.random().toString(36).substring(2);
+
+        const partHeader = Buffer.from(`--${this.#boundary}\r\nContent-Disposition: form-data; name="${name}"\r\n\r\n`, 'utf8');
+        const partData = Buffer.from(value, 'utf8');
+        this.#body = Buffer.concat([this.#body, partHeader, partData, Buffer.from('\r\n', 'utf8')]);
+
+        return this;
+    }
+
     attach(name, filepath) { // this is only used in tests and thus simplistic
-        const boundary = '----WebKitFormBoundary' + Math.random().toString(36).substring(2);
+        if (!this.#boundary) this.#boundary = '----WebKitFormBoundary' + Math.random().toString(36).substring(2);
 
-        const partHeader = Buffer.from(`--${boundary}\r\nContent-Disposition: form-data; name="${name}" filename="${path.basename(filepath)}"\r\n\r\n`, 'utf8');
+        const partHeader = Buffer.from(`--${this.#boundary}\r\nContent-Disposition: form-data; name="${name}" filename="${path.basename(filepath)}"\r\n\r\n`, 'utf8');
         const partData = fs.readFileSync(filepath);
-        const partTrailer = Buffer.from(`\r\n--${boundary}--\r\n`, 'utf8');
-        this.body = Buffer.concat([partHeader, partData, partTrailer]);
-
-        this.options.headers['content-type'] = `multipart/form-data; boundary=${boundary}`;
-        this.options.headers['content-length'] = this.body.byteLength;
+        this.#body = Buffer.concat([this.#body, partHeader, partData, Buffer.from('\r\n', 'utf8')]);
 
         return this;
     }
 
     then(onFulfilled, onRejected) {
+        if (this.#boundary) {
+            const partTrailer = Buffer.from(`--${this.#boundary}--\r\n`, 'utf8');
+            this.#body = Buffer.concat([this.#body, partTrailer]);
+
+            this.#options.headers['content-type'] = `multipart/form-data; boundary=${this.#boundary}`;
+            this.#options.headers['content-length'] = this.#body.byteLength;
+        }
+
         this._start().then(onFulfilled, onRejected);
     }
 }