Add release github action, and a few fixes to wait cmd

Author: firecow

.github/workflows/actions.yml

@@ -1,5 +1,5 @@
 ---
-name: Quality Assurance
+name: Actions
 
 on:
   push:
@@ -40,7 +40,7 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
-      - run: npm ci --no-audit --no-fund
+      - run: npm install --no-audit --no-fund --cache .npm
       - run: npx tsc
       - run: npm test
 
@@ -52,8 +52,7 @@ jobs:
         with:
           node-version: 22
           cache: 'npm'
+      - run: npm install --no-audit --no-fund --cache .npm
       - run: npx tsc
       - run: node src/index.js generate-schema > schema.json
-      - run: |
-         git diff --exit-code -- schema.json || (>&2 echo "schema.json is not up to date. Please run node src/index.js generate-schema > schema.json"; exit 1)
-
+      - run: git diff --exit-code -- schema.json || (>&2 echo "schema.json is not up to date. Please run node src/index.js generate-schema > schema.json"; exit 1)

.github/workflows/release.yml

@@ -0,0 +1,29 @@
+on:
+  release:
+    types: [ created ]
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  release-docker-image:
+    name: Release docker image
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        platform: [ amd64, arm64 ]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
+      - uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{github.actor}}
+          password: ${{secrets.GITHUB_TOKEN}}
+      - uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ghcr.io/firecow/swarm-app:latest

Dockerfile

@@ -0,0 +1,9 @@
+FROM node:22.15.1-alpine
+
+WORKDIR /app/
+COPY package*.json /app/
+RUN npm install
+
+COPY src /app/src
+
+ENTRYPOINT ["node", "src/index.js"]

Dockerfile.dockerignore

@@ -0,0 +1,3 @@
+*
+!*.json
+!src/

src/commands/deploy-cmd.ts

@@ -1,12 +1,15 @@
 import {ArgumentsCamelCase, Argv} from "yargs";
 import {createMissingConfigs, createMissingNetworks, removeUnusedConfigs, removeUnusedServices, upsertServices} from "../docker-api.js";
 import {initContext} from "../context.js";
+import timers from "timers/promises";
 
 export const command = "deploy <app-name>";
 export const description = "Deploys swarm app";
 
 export async function handler (args: ArgumentsCamelCase) {
     const ctx = await initContext(args);
+    const dockerode = ctx.dockerode;
+    const appName = ctx.appName;
 
     const addedNetworks = await createMissingNetworks(ctx);
     for (const n of addedNetworks) {
@@ -20,6 +23,30 @@ export async function handler (args: ArgumentsCamelCase) {
 
     await removeUnusedServices(ctx);
     await removeUnusedConfigs(ctx);
+
+    let services;
+    let updateStatusesDone = false;
+    do {
+        services = await dockerode.listServices({filters: {label: [`com.docker.stack.namespace=${appName}`]}});
+        updateStatusesDone = services.every(s => {
+            if (!s.UpdateStatus?.State) return true;
+            return ["completed", "rollback_completed", "paused", "rollback_paused"].includes(s.UpdateStatus?.State ?? "");
+        });
+
+        // To prevent high cpu usage
+        await timers.setTimeout(1000);
+    } while (!updateStatusesDone);
+    const failed = services.filter(s => {
+        return ["paused", "rollback_paused", "rollback_completed"].includes(s.UpdateStatus?.State ?? "");
+    });
+    if (failed.length > 0) {
+        for (const s of failed) {
+            console.error(`${s.Spec?.Name} ${s.UpdateStatus?.Message}`);
+        }
+        console.error("Deployment failed");
+        process.exit(1);
+    }
+    console.error("Deployment succeeded");
 }
 
 export function builder (yargs: Argv) {

src/commands/wait-cmd.ts

@@ -1,48 +1,84 @@
 import {ArgumentsCamelCase, Argv} from "yargs";
 import Docker from "dockerode";
 import timers from "timers/promises";
-import {assertString} from "../asserts.js";
+import {assertNumber, assertString} from "../asserts.js";
+
+interface Task {
+    DesiredState: string;
+    Status: {
+        State: string;
+        Err: string;
+    };
+}
 
 export const command = "wait <app-name>";
 export const description = "Wait for deployment to settle";
 
 export async function handler (args: ArgumentsCamelCase) {
     const appName = args["appName"];
     assertString(appName);
+    const timeout = args["timeout"];
+    assertNumber(timeout);
 
     const dockerode = new Docker();
 
-    console.log("Waiting for deployment reconciliation");
+    console.log(`Awaiting task reconciliation for a max of ${timeout}ms`);
 
     let services;
-    let reconciled = false;
+    let timedout = false;
+    let reconciled;
+    let latestTaskError = "";
+    const start = Date.now();
     do {
+        latestTaskError = "";
+        reconciled = true;
         services = await dockerode.listServices({filters: {label: [`com.docker.stack.namespace=${appName}`]}});
-        reconciled = services.every(s => {
-            if (!s.UpdateStatus?.State) return true;
-            return ["completed", "rollback_completed", "paused", "rollback_paused"].includes(s.UpdateStatus?.State ?? "");
-        });
-        await timers.setTimeout(1000);
-    } while (!reconciled);
-
-    const paused = services.filter(s => {
-        return ["paused", "rollback_paused"].includes(s.UpdateStatus?.State ?? "");
-    });
-    if (paused.length > 0) {
-        for (const s of paused) {
-            console.error(`${s.Spec?.Name} ${s.UpdateStatus?.Message}`);
+
+        // Check the tasks for failures.
+        for (const s of services) {
+            const tasks = await dockerode.listTasks({
+                Filter: `service=${s.Spec?.Name}`,
+            }) as Task[];
+            for (const t of tasks) {
+                if (t.DesiredState === "ready" && t.Status.State != "running") {
+                    reconciled = false;
+                }
+                if (t.Status.State === "rejected" && latestTaskError == "") {
+                    latestTaskError = t.Status.Err;
+                }
+            }
+        }
+
+        // To prevent high cpu usage
+        await timers.setTimeout(5000);
+        timedout = Date.now() - timeout > start;
+        if (!reconciled && latestTaskError != "") {
+            console.error(latestTaskError);
+        }
+    } while (!timedout && !reconciled);
+
+    if (!reconciled || timedout) {
+        if (timedout) {
+            console.error("Reconciliation timed out");
+        } else {
+            console.error("Reconciliation failed");
         }
-        console.error("Reconciliation failed");
-    } else {
-        console.log("Reconciliation succeeded");
+
+        process.exit(1);
     }
+    console.log("Reconciliation succeeded");
 }
 
 export function builder (yargs: Argv) {
     yargs.positional("app-name", {
         type: "string",
         description: "Application name",
     });
+    yargs.positional("timeout", {
+        type: "number",
+        description: "Time is ms to wait for reconciliation",
+        default: 120000,
+    });
     yargs.hide("help");
     yargs.hide("version");
     return yargs;

src/index.ts

@@ -9,7 +9,7 @@ import * as generateSchemaCommand from "./commands/generate-schema.js";
 
 process.on("uncaughtException", (err) => {
     if (err instanceof assert.AssertionError) {
-        console.error(`\x1b[31m${err.stack?.split("\n").slice(0, 6).join("\n")}\x1b[0m`);
+        console.error(err.message);
     } else {
         console.error(`\x1b[31m${err.stack?.split("\n").slice(0, 4).join("\n")}\x1b[0m`);
     }