cloudron 8.1.0 → 8.1.2

package/bin/cloudron

@@ -27,7 +27,15 @@ program.option('--server <server>', 'Cloudron domain')
     .option('--no-wait', 'Do not wait for the operation to finish');
 
 const appstoreCommand = program.command('appstore').description('Commands for publishing to the Appstore')
-    .requiredOption('--appstore-token <token>', 'AppStore token');
+    .option('--appstore-token <token>', 'AppStore token');
+
+appstoreCommand.command('login')
+    .description('Login to the appstore')
+    .action(appstoreActions.login);
+
+appstoreCommand.command('logout')
+    .description('Logout from the appstore')
+    .action(appstoreActions.logout);
 
 appstoreCommand.command('info')
     .description('List info of published app')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "8.1.0",
+  "version": "8.1.2",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "type": "module",
@@ -23,7 +23,7 @@
     "commander": "^14.0.3",
     "debug": "^4.4.3",
     "easy-table": "^1.2.0",
-    "ejs": "^5.0.1",
+    "ejs": "^5.0.2",
     "eventsource": "^4.1.0",
     "micromatch": "^4.0.8",
     "open": "^11.0.0",
@@ -35,8 +35,8 @@
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "eslint": "^10.0.3",
-    "globals": "^17.4.0",
+    "eslint": "^10.2.0",
+    "globals": "^17.5.0",
     "mocha": "^11.7.5"
   }
 }

package/src/appstore-actions.js

@@ -2,10 +2,9 @@ import assert from 'assert';
 import * as config from './config.js';
 import { execSync } from 'child_process';
 import fs from 'fs';
-import { exit, locateManifest, parseChangelog } from './helper.js';
+import { exit, locateManifest, parseChangelog, performOidcLogin } from './helper.js';
 import manifestFormat from '@cloudron/manifest-format';
 import path from 'path';
-import * as readline from './readline.js';
 import safe from '@cloudron/safetydance';
 import superagent from '@cloudron/superagent';
 import Table from 'easy-table';
@@ -15,7 +14,7 @@ const NO_MANIFEST_FOUND_ERROR_STRING = 'No CloudronManifest.json found';
 function requestError(response) {
     if (response.status === 401) return 'Invalid token.';
 
-    return `${response.status} message: ${response.body?.message || response.text || JSON.stringify(response.body)}`; // body is sometimes just a string like in 401
+    return `${response.status} message: ${response.body?.message || JSON.stringify(response.body)}`;
 }
 
 function createRequest(method, apiPath, options) {
@@ -393,38 +392,67 @@ async function notify() {
 
     if (!manifest.forumUrl) return exit(new Error('CloudronManifest.json does not have a forumUrl'));
     const categoryMatch = manifest.forumUrl.match(/category\/(.*)\//);
-    if (!categoryMatch) return exit('Unable to detect category id');
+    if (!categoryMatch) return exit(`Unable to detect category id from forumUrl: ${manifest.forumUrl}`);
     const categoryId = categoryMatch[1];
 
+    console.log(`[notify] appId: ${manifest.id} version: ${manifest.version} forumUrl: ${manifest.forumUrl} categoryId: ${categoryId}`);
+
     const categoryResponse = await superagent.get(`https://forum.cloudron.io/api/v3/categories/${categoryId}/topics`).set('Authorization', `Bearer ${apiToken}`).ok(() => true);
-    if (categoryResponse.status !== 200) return exit(`Unable to get topics of category: ${requestError(categoryResponse)}`);
-    const topic = categoryResponse.body.response.topics.find(t => t.title.toLowerCase().includes('Package Updates'.toLowerCase()));
+    if (categoryResponse.status !== 200) return exit(`Unable to get topics of category (status ${categoryResponse.status}): ${requestError(categoryResponse)}`);
+
+    const allTopics = categoryResponse.body.response.topics;
+    console.log(`[notify] Got ${allTopics.length} topics in category. Titles: ${allTopics.map(t => t.title).join(', ')}`);
+
+    const topic = allTopics.find(t => t.title.toLowerCase().includes('package updates'));
     if (!topic) return exit('Could not find the Package Update topic');
     const topicId = topic.tid;
+    console.log(`[notify] Found "Package Updates" topic tid: ${topicId}`);
 
     const pageCountResponse = await superagent.get(`https://forum.cloudron.io/api/topic/pagination/${topicId}`).set('Authorization', `Bearer ${apiToken}`).ok(() => true);
-    if (pageCountResponse.status !== 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 (status ${pageCountResponse.status}): ${requestError(pageCountResponse)}`);
     const pageCount = pageCountResponse.body.pagination.pageCount;
+    console.log(`[notify] Topic has ${pageCount} pages to scan for duplicates`);
 
     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.status !== 200) return exit(`Unable to get topics of category: ${requestError(pageResponse)}`);
-        for (const post of pageResponse.body.posts) { // post.content is html!
+        if (pageResponse.status !== 200) return exit(`Unable to get posts of topic page ${page} (status ${pageResponse.status}): ${requestError(pageResponse)}`);
+        console.log(`[notify] Page ${page}/${pageCount}: ${pageResponse.body.posts.length} posts`);
+        for (const post of pageResponse.body.posts) {
             if (post.content.includes(`[${manifest.version}]`)) return exit(`Version ${manifest.version} is already on the forum.\n${post.content}`);
         }
     }
 
+    console.log(`[notify] No duplicate found, posting version ${manifest.version}`);
+
     // https://docs.nodebb.org/api/write/#tag/topics/paths/~1topics~1%7Btid%7D/post
     const postData = {
         content: postContent,
         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.status !== 200) return exit(`Unable to create changelog post: ${requestError(postResponse)}`);
+    if (postResponse.status !== 200) return exit(`Unable to create changelog post (status ${postResponse.status}): ${requestError(postResponse)}`);
     console.log('Posted to forum');
 }
 
+async function login() {
+    const origin = config.appStoreOrigin();
+    const consoleFqdn = origin.replace('https://', '').replace('api.', 'console.') + '/openid';
+
+    const token = await performOidcLogin(consoleFqdn);
+    if (!token) process.exit(1);
+
+    config.setAppStoreToken(token);
+    console.log('Login successful.');
+}
+
+function logout() {
+    config.setAppStoreToken(null);
+    console.log('Logged out.');
+}
+
 export default {
+    login,
+    logout,
     info,
     listVersions,
     submit,