cloudron 8.2.1 → 8.2.2

package/CHANGELOG.md

@@ -125,3 +125,10 @@
 [8.1.2]
 * add appstore login/logout and also forum post logs
 
+[8.2.0]
+* versions: add `verify` subcommand
+* Make `resolveManifest` return a modified copy
+
+[8.2.1]
+* cancel task: wait for cancellation
+

package/package.json

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

package/src/actions.js

@@ -101,12 +101,14 @@ async function stopActiveTask(app, options) {
 
     const request = createRequest('POST', `/api/v1/tasks/${app.taskId}/stop`, options);
     const response = await request.send({});
+    if (response.status === 409) return; // task already finished between getApp and now
     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}`);
+    // 'stopped' is the expected terminal state when we just asked the task to stop
+    if (result.error && result.error.code !== 'stopped') throw new Error(`Stop active task failed: ${result.error.message}`);
 }
 
 function saveCwdAppId(appId, manifestFilePath) {