Merge pull request #234 from GitGab19/fix-update-errors

make generated service configs update-safe

Author: GitGab19

.github/workflows/ci.yml

@@ -4,6 +4,9 @@ on:
   pull_request:
     branches:
       - main
+  push:
+    branches:
+      - 'release/v*'
 
 jobs:
   lint:
@@ -87,3 +90,22 @@ jobs:
 
       - name: Build Docker image
         run: docker build -f Dockerfile .
+
+  sv2-app-config:
+    name: SV2 Apps Config Compatibility
+    runs-on: ubuntu-latest
+    needs: test
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Smoke-test generated configs against selected sv2-apps images
+        run: npm run check:sv2-app-config

.github/workflows/docker-release.yaml

@@ -15,6 +15,22 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.ref }}
+
+      # On a release event this checks the tagged release commit, which comes
+      # from the release/vX branch and contains its pinned sv2-apps images.
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Smoke-test generated configs against selected sv2-apps images
+        run: npm run check:sv2-app-config
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3

Dockerfile

@@ -3,9 +3,10 @@ FROM node:24-alpine AS builder
 
 WORKDIR /app
 
-# Copy package files
+# Copy workspace package manifests so dependency installs are cached correctly
 COPY package.json package-lock.json ./
 COPY server/package.json server/
+COPY shared/package.json shared/
 
 # Install all dependencies
 RUN npm ci

package-lock.json

@@ -19,6 +19,7 @@
     "lint": "eslint . --max-warnings 0",
     "test": "node --test --import tsx src/**/*.test.ts",
     "test:server": "npm run test --prefix server",
+    "check:sv2-app-config": "node --import tsx server/src/sv2-app-config-compatibility.ts",
     "test:all": "npm run test && npm run test:server",
     "typecheck": "tsc --noEmit",
     "generate:types": "orval"
@@ -29,7 +30,6 @@
     "@radix-ui/react-tooltip": "^1.2.8",
     "@tanstack/react-query": "^5.62.0",
     "@sv2-ui/shared": "^0.1.0",
-    "bitcoinjs-lib": "^7.0.1",
     "bs58check": "^4.0.0",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -38,7 +38,6 @@
     "react-dom": "^18.3.1",
     "recharts": "^2.14.1",
     "tailwind-merge": "^2.6.0",
-    "tiny-secp256k1": "^2.2.4",
     "wouter": "^3.3.5"
   },
   "devDependencies": {

package.json

@@ -0,0 +1,29 @@
+import { randomUUID } from 'node:crypto';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+
+/**
+ * Write a file using a same-directory temporary file and rename. A reader
+ * therefore sees either the previous complete file or the new complete file,
+ * never a partially-written one.
+ */
+export async function writeFileAtomically(filePath: string, contents: string): Promise<void> {
+  const temporaryPath = path.join(
+    path.dirname(filePath),
+    `.${path.basename(filePath)}.${randomUUID()}.tmp`,
+  );
+
+  let handle: fs.FileHandle | null = null;
+  try {
+    handle = await fs.open(temporaryPath, 'w');
+    await handle.writeFile(contents, 'utf8');
+    await handle.sync();
+    await handle.close();
+    handle = null;
+
+    await fs.rename(temporaryPath, filePath);
+  } finally {
+    await handle?.close();
+    await fs.rm(temporaryPath, { force: true });
+  }
+}

server/src/atomic-write.ts

@@ -177,6 +177,13 @@ export function normalizeSetupData(data: SetupData): SetupData {
 export function generateTranslatorConfig(data: SetupData): string {
   const normalizedData = normalizeSetupData(data);
   const { pool, translator, mode, jdc } = normalizedData;
+  if (normalizedData.miningMode !== 'solo' && normalizedData.miningMode !== 'pool') {
+    throw new Error('Mining mode is required');
+  }
+  if (mode !== 'jd' && mode !== 'no-jd') {
+    throw new Error('Template mode is required');
+  }
+
   const isJdMode = mode === 'jd';
   const isSovereignSolo = normalizedData.miningMode === 'solo' && isJdMode;
   const isSoloPool = normalizedData.miningMode === 'solo' && mode === 'no-jd';

server/src/config-generator.ts

@@ -683,8 +683,8 @@ async function connectSv2UiToNetwork(): Promise<void> {
 }
 
 /**
- * Pull the latest version of an image from Docker Hub.
- * Only pulls if the image doesn't exist locally.
+ * Ensure the selected image exists locally. This avoids registry checks on
+ * every start/retry once the image has already been pulled.
  */
 async function pullImage(imageName: string): Promise<void> {
   try {
@@ -881,6 +881,11 @@ export async function startStack(
     await startJdc(`${configDir}/jdc.toml`, socketPath, data.bitcoin.network, imageSelection.jdc);
     console.log('Waiting for JDC to initialize...');
     await new Promise(resolve => setTimeout(resolve, 3000));
+
+    const jdcStatus = await getContainerStatus(JDC_CONTAINER);
+    if (!jdcStatus || jdcStatus.status === 'stopped') {
+      throw new Error('Mining could not start. Review your setup and try again; check the logs if the problem continues.');
+    }
   }
 
   // Start Translator