cloudron 8.1.2 → 8.2.1

package/CHANGELOG.md

@@ -94,3 +94,34 @@
 * Add `cloudron sync push` and `cloudron sync pull` subcommands
 * Merge all binaries into single `cloudron` command
 
+[7.1.1]
+* Prettier login success page
+* oidc: explicitly listen on ipv4 which is always available
+
+[7.1.2]
+* versions: implement revoke --version
+* Make the login page slightly more like the dashboard style and add dark mode
+
+[8.0.0]
+* Implement device authorization grant flow
+
+[8.0.1]
+* device codes only needs to be confirmed not entered
+* Add fallback in case the overloaded cloudron build --help is called
+
+[8.0.2]
+* install/update: -f and --build-arg
+* wait even in debug mode, but just not for healthy
+* add cloudron init --template <template>
+* Fix cloudron pull as newer nodejs versions do not have resume() on stdout anymore
+
+[8.1.0]
+* Continue cloudron build even if run outside a git repository
+* Remove old legacy appstore login/logout
+
+[8.1.1]
+* token is not required. verify-manifest does not need it
+
+[8.1.2]
+* add appstore login/logout and also forum post logs
+

package/bin/cloudron

@@ -437,4 +437,8 @@ versionsCommand.command('update')
     .option('--state <state>', 'Publish state (published or testing)')
     .action(versionsActions.addOrUpdate);
 
+versionsCommand.command('verify')
+    .description('Verify if versions file is valid for publishing')
+    .action(versionsActions.verify);
+
 program.parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "8.1.2",
+  "version": "8.2.1",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "type": "module",

package/src/actions.js

@@ -102,6 +102,11 @@ async function stopActiveTask(app, options) {
     const request = createRequest('POST', `/api/v1/tasks/${app.taskId}/stop`, options);
     const response = await request.send({});
     if (response.status !== 204) throw `Failed to stop active task: ${requestError(response)}`;
+
+    if (!options.wait) return;
+
+    const result  = await waitForTask(app.taskId, options);
+    if (result.error) throw new Error(`Stop active task failed: ${result.error.message}`);
 }
 
 function saveCwdAppId(appId, manifestFilePath) {

package/src/versions-actions.js

@@ -31,51 +31,6 @@ async function writeVersions(versionsFilePath, versionsRoot) {
     if (error) return exit(`Unable to write to ${path.relative(process.cwd(), versionsFilePath)}: ${error.message}`);
 }
 
-async function init(/*localOptions, cmd*/) {
-    const manifestFilePath = locateManifest();
-    if (!manifestFilePath) return exit(`${NO_MANIFEST_FOUND_ERROR_STRING}. You must run this command in the package dir.`);
-
-    const baseDir = path.dirname(manifestFilePath);
-    const versionsFilePath = `${baseDir}/CloudronVersions.json`;
-
-    if (fs.existsSync(versionsFilePath)) return exit(`${path.relative(process.cwd(), versionsFilePath)} already exists.`);
-
-    await writeVersions(versionsFilePath, { stable: true, versions: {} });
-    console.log(`Created ${path.relative(process.cwd(), versionsFilePath)}.`);
-
-    const result = manifestFormat.parseFile(manifestFilePath);
-    if (!result.error) {
-        ensurePublishFields(result.manifest, manifestFilePath);
-    }
-
-    console.log('\nUse "cloudron versions add" to add a version.');
-}
-
-async function resolveManifest(manifest, baseDir) {
-    if (manifest.description.slice(0, 7) === 'file://') {
-        let descriptionFilePath = manifest.description.slice(7);
-        descriptionFilePath = path.isAbsolute(descriptionFilePath) ? descriptionFilePath : path.join(baseDir, descriptionFilePath);
-        manifest.description = safe.fs.readFileSync(descriptionFilePath, 'utf8');
-        if (!manifest.description && safe.error) throw(new Error('Could not read/parse description ' + safe.error.message));
-        if (!manifest.description) throw new Error('Description cannot be empty');
-    }
-
-    if (manifest.postInstallMessage && manifest.postInstallMessage.slice(0, 7) === 'file://') {
-        let postInstallFilePath = manifest.postInstallMessage.slice(7);
-        postInstallFilePath = path.isAbsolute(postInstallFilePath) ? postInstallFilePath : path.join(baseDir, postInstallFilePath);
-        manifest.postInstallMessage = safe.fs.readFileSync(postInstallFilePath, 'utf8');
-        if (!manifest.postInstallMessage && safe.error) throw(new Error('Could not read/parse postInstall ' + safe.error.message));
-        if (!manifest.postInstallMessage) throw new Error('PostInstall file specified but it is empty');
-    }
-
-    if (manifest.changelog.slice(0, 7) === 'file://') {
-        let changelogPath = manifest.changelog.slice(7);
-        changelogPath = path.isAbsolute(changelogPath) ? changelogPath : path.join(baseDir, changelogPath);
-        manifest.changelog = parseChangelog(changelogPath, manifest.version);
-        if (!manifest.changelog) throw new Error('Bad changelog format or missing changelog for this version');
-    }
-}
-
 function createStubFile(filePath, content) {
     if (fs.existsSync(filePath)) return false;
     fs.writeFileSync(filePath, content, 'utf8');
@@ -162,6 +117,55 @@ function ensurePublishFields(manifest, manifestFilePath) {
     console.log('  tags, mediaLinks, DESCRIPTION.md, CHANGELOG, POSTINSTALL.md');
 }
 
+async function init(/*localOptions, cmd*/) {
+    const manifestFilePath = locateManifest();
+    if (!manifestFilePath) return exit(`${NO_MANIFEST_FOUND_ERROR_STRING}. You must run this command in the package dir.`);
+
+    const baseDir = path.dirname(manifestFilePath);
+    const versionsFilePath = `${baseDir}/CloudronVersions.json`;
+
+    if (fs.existsSync(versionsFilePath)) return exit(`${path.relative(process.cwd(), versionsFilePath)} already exists.`);
+
+    await writeVersions(versionsFilePath, { stable: true, versions: {} });
+    console.log(`Created ${path.relative(process.cwd(), versionsFilePath)}.`);
+
+    const result = manifestFormat.parseFile(manifestFilePath);
+    if (!result.error) {
+        ensurePublishFields(result.manifest, manifestFilePath);
+    }
+
+    console.log('\nUse "cloudron versions add" to add a version.');
+}
+
+async function resolveManifest(manifest, baseDir) {
+    const resolved = structuredClone(manifest);
+
+    if (resolved.description.slice(0, 7) === 'file://') {
+        let descriptionFilePath = resolved.description.slice(7);
+        descriptionFilePath = path.isAbsolute(descriptionFilePath) ? descriptionFilePath : path.join(baseDir, descriptionFilePath);
+        resolved.description = safe.fs.readFileSync(descriptionFilePath, 'utf8');
+        if (!resolved.description && safe.error) throw(new Error('Could not read/parse description ' + safe.error.message));
+        if (!resolved.description) throw new Error('Description cannot be empty');
+    }
+
+    if (resolved.postInstallMessage && resolved.postInstallMessage.slice(0, 7) === 'file://') {
+        let postInstallFilePath = resolved.postInstallMessage.slice(7);
+        postInstallFilePath = path.isAbsolute(postInstallFilePath) ? postInstallFilePath : path.join(baseDir, postInstallFilePath);
+        resolved.postInstallMessage = safe.fs.readFileSync(postInstallFilePath, 'utf8');
+        if (!resolved.postInstallMessage && safe.error) throw(new Error('Could not read/parse postInstall ' + safe.error.message));
+        if (!resolved.postInstallMessage) throw new Error('PostInstall file specified but it is empty');
+    }
+
+    if (resolved.changelog.slice(0, 7) === 'file://') {
+        let changelogPath = resolved.changelog.slice(7);
+        changelogPath = path.isAbsolute(changelogPath) ? changelogPath : path.join(baseDir, changelogPath);
+        resolved.changelog = parseChangelog(changelogPath, resolved.version);
+        if (!resolved.changelog) throw new Error('Bad changelog format or missing changelog for this version');
+    }
+
+    return resolved;
+}
+
 async function addOrUpdate(localOptions, cmd) {
     const isUpdate = cmd.parent.args[0] === 'update';
     const versionsFilePath = await locateVersions();
@@ -194,7 +198,7 @@ async function addOrUpdate(localOptions, cmd) {
     const versionsRoot = await readVersions(versionsFilePath);
     const versions = versionsRoot.versions;
 
-    await resolveManifest(manifest, path.dirname(manifestFilePath));
+    const resolved = await resolveManifest(manifest, path.dirname(manifestFilePath));
 
     if (options.state && options.state !== PUBLISH_STATE_PUBLISHED && options.state !== PUBLISH_STATE_TESTING) {
         return exit(`Invalid state "${options.state}". Must be "published" or "testing".`);
@@ -204,13 +208,13 @@ async function addOrUpdate(localOptions, cmd) {
         const targetVersion = options.version || manifest.version;
         if (!(targetVersion in versions)) exit(`${targetVersion} does not exist in ${path.relative(process.cwd(), versionsFilePath)}.`);
 
-        versions[targetVersion].manifest = manifest;
+        versions[targetVersion].manifest = resolved;
         versions[targetVersion].ts = (new Date()).toUTCString();
         if (options.state) versions[targetVersion].publishState = options.state;
     } else {
         if (manifest.version in versions) exit(`${manifest.version} already exists in ${path.relative(process.cwd(), versionsFilePath)}.`);
         versions[manifest.version] = {
-            manifest,
+            manifest: resolved,
             creationDate: (new Date()).toUTCString(),
             ts: (new Date()).toUTCString(),
             publishState: options.state || PUBLISH_STATE_PUBLISHED
@@ -278,9 +282,38 @@ async function revoke(localOptions, cmd) {
     console.log(`Marked ${targetVersion} as revoked in ${path.relative(process.cwd(), versionsFilePath)}`);
 }
 
+async function verify(/* localOptions, cmd */) {
+    const versionsFilePath = await locateVersions();
+    if (!versionsFilePath) return exit(NO_VERSIONS_FOUND_ERROR_STRING);
+
+    const versionsRoot = await readVersions(versionsFilePath);
+    const versions = versionsRoot.versions;
+
+    const sortedVersions = Object.keys(versions).sort(manifestFormat.packageVersionCompare);
+    if (sortedVersions.length === 0) return exit('No versions found in versions file');
+
+    for (const version of sortedVersions) {
+        const manifest = versions[version].manifest;
+
+        if (!manifest.dockerImage) return exit(`Version ${version}: missing dockerImage`);
+
+        const error = manifestFormat.checkVersionsRequirements(manifest);
+        if (error) return exit(`Version ${version}: ${error}`);
+
+        try {
+            await resolveManifest(manifest, path.dirname(versionsFilePath));
+        } catch (e) {
+            return exit(`Version ${version}: ${e.message}`);
+        }
+    }
+
+    console.log(`${path.relative(process.cwd(), versionsFilePath)} is valid (${sortedVersions.length} version(s))`);
+}
+
 export default {
     init,
     addOrUpdate,
     list,
     revoke,
+    verify,
 };