depository-deploy 1.0.26 → 1.0.40

package/install/install-unix.sh

@@ -317,6 +317,58 @@ kill_port_holder "$API_PORT"
 kill_port_holder "$AUTH_PORT"
 kill_port_holder "$GATHERER_PORT"
 
+# ---- Map service name → executable path (for direct-run error capture) ----
+get_svc_exe() {
+    case "$1" in
+        depository-auth)     echo "$INSTALL_DIR/auth/DEPOSITORY.API.OATH" ;;
+        depository-api)      echo "$INSTALL_DIR/api/DEPOSITORY.API.REST" ;;
+        depository-worker)   echo "$INSTALL_DIR/worker/DEPOSITORY.CORE.WORKER" ;;
+        depository-gatherer) echo "$INSTALL_DIR/gatherer/DEPOSITORY.CORE.GATHERER" ;;
+        depository-digestor) echo "$INSTALL_DIR/digestor/DEPOSITORY.CORE.DIGESTOR" ;;
+    esac
+}
+
+# Capture and print detailed startup error for a failed service
+capture_svc_error() {
+    local svc="$1"
+    warn "  --- journalctl output (last 50 lines) ---"
+    journalctl -u "$svc" -n 50 --no-pager 2>/dev/null | while IFS= read -r line; do
+        warn "    $line"
+    done
+
+    # Also try running the executable directly for 5 seconds to surface startup exceptions
+    local svc_exe
+    svc_exe="$(get_svc_exe "$svc")"
+    if [ -n "$svc_exe" ] && [ -f "$svc_exe" ]; then
+        warn "  --- Running exe directly to capture startup error (5 s) ---"
+        local tmp_out="/tmp/${svc}-startup-$$.log"
+        local svc_dir
+        svc_dir="$(dirname "$svc_exe")"
+        # Run as depository user if available so appsettings.json is readable
+        if id -u depository &>/dev/null; then
+            timeout 5 sudo -u depository "$svc_exe" 2>&1 | head -60 > "$tmp_out" || true
+        else
+            timeout 5 "$svc_exe" 2>&1 | head -60 > "$tmp_out" || true
+        fi
+        if [ -s "$tmp_out" ]; then
+            while IFS= read -r line; do
+                warn "    $line"
+            done < "$tmp_out"
+        else
+            warn "    (no output captured from direct run)"
+        fi
+        rm -f "$tmp_out"
+        # Also show startup-error.log written by the .NET app itself
+        local err_log="$svc_dir/startup-error.log"
+        if [ -f "$err_log" ]; then
+            warn "  --- $err_log ---"
+            while IFS= read -r line; do
+                warn "    $line"
+            done < "$err_log"
+        fi
+    fi
+}
+
 # ---- Enable and start services ----
 info "Enabling and starting services..."
 systemctl daemon-reload
@@ -331,18 +383,12 @@ for svc in $SERVICES; do
             echo -e "  ${GREEN}[OK]${NC}   Started: $svc"
         else
             warn "  FAILED to start: $svc (did not reach active state)"
-            warn "  Run: journalctl -u $svc -n 30 --no-pager"
-            journalctl -u "$svc" -n 8 --no-pager 2>/dev/null | grep -iE 'error|fail|exception|unhandled|crit' | head -5 | while read -r line; do
-                warn "    $line"
-            done
+            capture_svc_error "$svc"
             START_FAILED="$START_FAILED $svc"
         fi
     else
         warn "  FAILED to start: $svc"
-        warn "  Run: journalctl -u $svc -n 30 --no-pager"
-        journalctl -u "$svc" -n 8 --no-pager 2>/dev/null | grep -iE 'error|fail|exception|unhandled|crit' | head -5 | while read -r line; do
-            warn "    $line"
-        done
+        capture_svc_error "$svc"
         START_FAILED="$START_FAILED $svc"
     fi
 done

package/install/install-windows.ps1

@@ -262,22 +262,13 @@ $svcDefs = @(
 )
 
 foreach ($def in $svcDefs) {
-    # Create a wrapper batch that sets the working directory (so appsettings.json is found)
-    # and optionally sets environment variables (e.g. ASPNETCORE_URLS for port binding).
-    $exeDir = Split-Path -Parent $def.Exe
-    $wrapperPath = Join-Path $exeDir "start-service.bat"
-    $batLines = "@echo off"
-    $batLines += "`r`ncd /d `"$exeDir`""
-    if ($def.Env -ne "") {
-        $batLines += "`r`nset $($def.Env)"
-    }
-    $batLines += "`r`n`"$($def.Exe)`""
-    Set-Content -Path $wrapperPath -Value $batLines -Encoding ASCII
-
-    & sc.exe create $def.Name binPath= "`"$wrapperPath`"" start= auto DisplayName= $def.Desc | Out-Null
+    # Register the exe directly as the Windows Service binary.
+    # UseWindowsService() in each app handles the SCM protocol and sets the content root
+    # to the exe's directory so appsettings.json is found automatically.
+    & sc.exe create $def.Name binPath= "`"$($def.Exe)`"" start= auto DisplayName= $def.Desc | Out-Null
     & sc.exe description $def.Name $def.Desc | Out-Null
 
-    # Also set environment via registry as a fallback
+    # Pass environment variables (e.g. ASPNETCORE_URLS) via the service registry entry
     if ($def.Env -ne "") {
         $regPath = "HKLM:\SYSTEM\CurrentControlSet\Services\$($def.Name)"
         Set-ItemProperty -Path $regPath -Name "Environment" -Value @($def.Env) -Type MultiString -ErrorAction SilentlyContinue
@@ -356,15 +347,22 @@ foreach ($def in $svcDefs) {
                     -RedirectStandardOutput "$env:TEMP\$($def.Name)-stdout.txt" `
                     -RedirectStandardError  "$env:TEMP\$($def.Name)-stderr.txt" `
                     -NoNewWindow -PassThru -ErrorAction SilentlyContinue
-                Start-Sleep -Seconds 3
+                Start-Sleep -Seconds 5
                 if (-not $proc.HasExited) { $proc.Kill() }
                 $stdout = Get-Content "$env:TEMP\$($def.Name)-stdout.txt" -ErrorAction SilentlyContinue
                 $stderr = Get-Content "$env:TEMP\$($def.Name)-stderr.txt" -ErrorAction SilentlyContinue
-                $combined = @($stdout; $stderr) | Where-Object { $_ -match 'error|fail|exception|unhandled|crit' -and $_ }
+                $combined = @($stdout; $stderr) | Where-Object { $_ -and $_.Trim() }
                 if ($combined) {
-                    $combined | Select-Object -First 8 | ForEach-Object { Write-Warn "    $_" }
+                    Write-Warn "  --- Startup output (stdout + stderr) ---"
+                    $combined | Select-Object -First 30 | ForEach-Object { Write-Warn "    $_" }
                 } else {
-                    Write-Warn "  (no error output captured -- check Event Viewer)"
+                    Write-Warn "  (no output captured -- check Event Viewer > Windows Logs > Application)"
+                }
+                # Also surface startup-error.log written by the .NET app itself
+                $errLog = Join-Path $exeDir "startup-error.log"
+                if (Test-Path $errLog) {
+                    Write-Warn "  --- $errLog ---"
+                    Get-Content $errLog -ErrorAction SilentlyContinue | Select-Object -First 50 | ForEach-Object { Write-Warn "    $_" }
                 }
             } catch {
                 Write-Warn "  Could not run exe directly: $_"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "depository-deploy",
-  "version": "1.0.26",
+  "version": "1.0.40",
   "description": "Depository document management system – deployment wizard and installers",
   "license": "UNLICENSED",
   "publishConfig": {
@@ -25,9 +25,9 @@
     "scripts/publish.mjs"
   ],
   "optionalDependencies": {
-    "depository-deploy-linux": "1.0.26",
-    "depository-deploy-macos": "1.0.26",
-    "depository-deploy-windows": "1.0.26"
+    "depository-deploy-linux": "1.0.40",
+    "depository-deploy-macos": "1.0.40",
+    "depository-deploy-windows": "1.0.40"
   },
   "scripts": {
     "start": "node wizard-server.mjs"