depository-deploy 1.0.11 → 1.0.12

package/install/install-unix.sh

@@ -92,6 +92,11 @@ eval "$(parse_conf)"
 [ ${#JWT_SECRET} -ge 32 ] || error "JWT_SECRET must be at least 32 characters long"
 [ -n "$DATA_DIR" ]        || error "DATA_DIR is not set in depository.conf"
 [ -n "$INSTALL_DIR" ]     || error "INSTALL_DIR is not set in depository.conf"
+[ -n "$API_PORT" ]        || error "API_PORT is not set in depository.conf"
+[ -n "$AUTH_PORT" ]       || error "AUTH_PORT is not set in depository.conf"
+[ -n "$GATHERER_PORT" ]   || error "GATHERER_PORT is not set in depository.conf"
+[ -n "$UI_PORT" ]         || error "UI_PORT is not set in depository.conf"
+[ -n "$SITE_URL" ]        || error "SITE_URL is not set in depository.conf"
 
 # ---- Build connection strings ----
 if [ "$DB_PROVIDER" = "SqlServer" ]; then
@@ -186,10 +191,31 @@ fi
 
 # ---- Create directories ----
 info "Creating directories..."
-mkdir -p "$INSTALL_DIR"/{api,auth,worker,gatherer,digestor,ui}
+mkdir -p "$INSTALL_DIR"/{api,auth,worker,gatherer,digestor,ui,logs}
 mkdir -p "$DATA_DIR"
 chown -R depository:depository "$INSTALL_DIR" "$DATA_DIR"
 
+# ---- Stop old services and kill remaining processes ----
+info "Stopping existing services (if any)..."
+for svc in depository-auth depository-api depository-worker depository-gatherer depository-digestor; do
+    if systemctl is-active --quiet "$svc" 2>/dev/null; then
+        systemctl stop "$svc" 2>/dev/null || true
+        info "  Stopped: $svc"
+    fi
+done
+
+info "Killing any remaining Depository processes..."
+for proc_name in DEPOSITORY.API.REST DEPOSITORY.API.OATH DEPOSITORY.CORE.WORKER DEPOSITORY.CORE.GATHERER DEPOSITORY.CORE.DIGESTOR; do
+    pids=$(pgrep -f "$proc_name" 2>/dev/null || true)
+    if [ -n "$pids" ]; then
+        echo "$pids" | while read -r pid; do
+            warn "  Killing $proc_name (PID $pid)..."
+            kill -9 "$pid" 2>/dev/null || true
+        done
+    fi
+done
+sleep 2
+
 # ---- Copy binaries ----
 info "Copying service binaries..."
 cp -r "$RELEASE_DIR/api/"*     "$INSTALL_DIR/api/"
@@ -247,23 +273,77 @@ if command -v nginx &> /dev/null; then
     nginx -t && systemctl reload nginx || warn "nginx config test failed — check /etc/nginx/sites-available/depository"
 fi
 
+# ---- Kill processes occupying service ports ----
+kill_port_holder() {
+    local port="$1"
+    [ -z "$port" ] && return
+    local pids=""
+    if command -v fuser &>/dev/null; then
+        pids=$(fuser "$port/tcp" 2>/dev/null | xargs)
+    elif command -v lsof &>/dev/null; then
+        pids=$(lsof -ti "tcp:$port" 2>/dev/null | xargs)
+    fi
+    if [ -n "$pids" ]; then
+        warn "Port $port in use by PID(s): $pids -- killing..."
+        kill -9 $pids 2>/dev/null || true
+        sleep 1
+    fi
+}
+
+info "Checking for port conflicts..."
+kill_port_holder "$API_PORT"
+kill_port_holder "$AUTH_PORT"
+kill_port_holder "$GATHERER_PORT"
+
 # ---- Enable and start services ----
 info "Enabling and starting services..."
 systemctl daemon-reload
 
 SERVICES="depository-auth depository-gatherer depository-api depository-worker depository-digestor"
+START_FAILED=""
 for svc in $SERVICES; do
-    systemctl enable "$svc"
-    systemctl restart "$svc"
-    sleep 1
+    systemctl enable "$svc" 2>/dev/null || true
+    if systemctl restart "$svc" 2>/dev/null; then
+        sleep 2
+        if systemctl is-active --quiet "$svc" 2>/dev/null; then
+            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
+            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
+        START_FAILED="$START_FAILED $svc"
+    fi
 done
 
+if [ -n "$START_FAILED" ]; then
+    warn ""
+    warn "  Service(s) failed to start:$START_FAILED"
+    warn "  Common causes:"
+    warn "    - .NET 9 ASP.NET Core Runtime not installed (run: dotnet --list-runtimes)"
+    warn "    - Invalid connection string in depository.conf"
+    warn "    - Executable not found or not executable"
+    warn "  The installer will continue -- fix the issue then run:"
+    warn "    systemctl restart depository-auth depository-api depository-worker depository-gatherer depository-digestor"
+    warn ""
+fi
+
 # ---- Firewall rules (ufw) ----
 if command -v ufw &> /dev/null && ufw status | grep -q "Status: active"; then
     info "Opening firewall ports..."
     ufw allow "$UI_PORT/tcp" comment "Depository UI"
     ufw allow "$API_PORT/tcp" comment "Depository API"
     ufw allow "$AUTH_PORT/tcp" comment "Depository Auth"
+    ufw allow "$GATHERER_PORT/tcp" comment "Depository Gatherer"
 fi
 
 # ---- Status check ----
@@ -294,6 +374,6 @@ fi
 echo ""
 echo "  Useful commands:"
 echo "    View logs:      journalctl -u depository-api -f"
-echo "    Restart all:    systemctl restart depository-api depository-auth depository-worker"
-echo "    Status:         systemctl status depository-api"
+echo "    Restart all:    systemctl restart depository-auth depository-api depository-worker depository-gatherer depository-digestor"
+echo "    Status:         systemctl status depository-auth depository-api depository-worker depository-gatherer depository-digestor"
 echo ""

package/install/install-windows.ps1

@@ -176,6 +176,23 @@ foreach ($svc in $services) {
     }
 }
 
+# ---- Kill any remaining Depository processes ----
+Write-Info "Killing any remaining Depository processes..."
+$depositoryExes = @(
+    "DEPOSITORY.API.REST", "DEPOSITORY.API.OATH",
+    "DEPOSITORY.CORE.WORKER", "DEPOSITORY.CORE.GATHERER", "DEPOSITORY.CORE.DIGESTOR"
+)
+foreach ($exeName in $depositoryExes) {
+    $procs = Get-Process -Name $exeName -ErrorAction SilentlyContinue
+    if ($procs) {
+        $procs | ForEach-Object {
+            Write-Warn "  Killing $($_.ProcessName) (PID $($_.Id))..."
+            Stop-Process -Id $_.Id -Force -ErrorAction SilentlyContinue
+        }
+    }
+}
+Start-Sleep -Seconds 2
+
 # ---- Create directories ----
 Write-Info "Creating directories..."
 foreach ($sub in @("api","auth","worker","gatherer","digestor","ui","logs")) {
@@ -263,6 +280,33 @@ foreach ($name in $portMap.Keys) {
     New-NetFirewallRule -DisplayName $name -Direction Inbound -Protocol TCP -LocalPort $port -Action Allow | Out-Null
 }
 
+# ---- Kill processes occupying service ports ----
+function Kill-PortHolder {
+    param([int]$Port)
+    if ($Port -le 0) { return }
+    try {
+        $lines = netstat -ano | Select-String "LISTENING" | Select-String ":$Port\b"
+        foreach ($line in $lines) {
+            if ($line -match '\s+(\d+)\s*$') {
+                $pid = [int]$Matches[1]
+                if ($pid -gt 0) {
+                    $proc = Get-Process -Id $pid -ErrorAction SilentlyContinue
+                    if ($proc) {
+                        Write-Warn "  Port $Port in use by PID $pid ($($proc.ProcessName)) -- killing..."
+                        Stop-Process -Id $pid -Force -ErrorAction SilentlyContinue
+                        Start-Sleep -Seconds 1
+                    }
+                }
+            }
+        }
+    } catch {}
+}
+
+Write-Info "Checking for port conflicts..."
+Kill-PortHolder ([int]$API_PORT)
+Kill-PortHolder ([int]$AUTH_PORT)
+Kill-PortHolder ([int]$GATHERER_PORT)
+
 # ---- Start services ----
 Write-Info "Starting services..."
 $startFailed = @()
@@ -342,19 +386,58 @@ if ($WEBSERVER_TYPE -eq "iis") {
     }
     Write-OK "IIS features enabled"
 
-    # Warn about optional modules
+    # Auto-install IIS URL Rewrite module if missing
     if (-not (Test-Path "$env:SystemRoot\System32\inetsrv\rewrite.dll")) {
-        Write-Warn "IIS URL Rewrite module not found -- API proxying will not work."
-        Write-Warn "Download: https://www.iis.net/downloads/microsoft/url-rewrite"
-        Write-Warn "Install it, then re-run this script or run: iisreset"
+        Write-Info "IIS URL Rewrite module not found -- downloading and installing..."
+        $rewriteMsi = Join-Path $env:TEMP "urlrewrite2.msi"
+        try {
+            [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+            Invoke-WebRequest -Uri "https://download.microsoft.com/download/1/2/8/128E2E22-C1B9-44A4-BE2A-5859ED1D4592/rewrite_amd64_en-US.msi" `
+                -OutFile $rewriteMsi -UseBasicParsing -ErrorAction Stop
+            $proc = Start-Process msiexec.exe -ArgumentList "/i `"$rewriteMsi`" /quiet /norestart" -Wait -PassThru -NoNewWindow
+            if ($proc.ExitCode -eq 0 -and (Test-Path "$env:SystemRoot\System32\inetsrv\rewrite.dll")) {
+                Write-OK "IIS URL Rewrite module installed"
+            } else {
+                Write-Warn "URL Rewrite installer exited with code $($proc.ExitCode)"
+                Write-Warn "Manual download: https://www.iis.net/downloads/microsoft/url-rewrite"
+            }
+        } catch {
+            Write-Warn "Failed to download URL Rewrite module: $_"
+            Write-Warn "Manual download: https://www.iis.net/downloads/microsoft/url-rewrite"
+        } finally {
+            Remove-Item $rewriteMsi -Force -ErrorAction SilentlyContinue
+        }
+    } else {
+        Write-OK "IIS URL Rewrite module present"
     }
+
+    # Auto-install IIS Application Request Routing (ARR) if missing
     $arrDll = Get-Item "$env:SystemRoot\System32\inetsrv\arr*.dll" -ErrorAction SilentlyContinue
     if (-not $arrDll) {
-        Write-Warn "IIS Application Request Routing (ARR) not found."
-        Write-Warn "Download: https://www.iis.net/downloads/microsoft/application-request-routing"
+        Write-Info "IIS ARR module not found -- downloading and installing..."
+        $arrMsi = Join-Path $env:TEMP "arr3.msi"
+        try {
+            [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+            Invoke-WebRequest -Uri "https://download.microsoft.com/download/E/9/8/E9849D6A-020E-47E4-9FD0-A023E99B54EB/requestRouter_amd64.msi" `
+                -OutFile $arrMsi -UseBasicParsing -ErrorAction Stop
+            $proc = Start-Process msiexec.exe -ArgumentList "/i `"$arrMsi`" /quiet /norestart" -Wait -PassThru -NoNewWindow
+            if ($proc.ExitCode -eq 0) {
+                Write-OK "IIS ARR module installed"
+            } else {
+                Write-Warn "ARR installer exited with code $($proc.ExitCode)"
+                Write-Warn "Manual download: https://www.iis.net/downloads/microsoft/application-request-routing"
+            }
+        } catch {
+            Write-Warn "Failed to download ARR module: $_"
+            Write-Warn "Manual download: https://www.iis.net/downloads/microsoft/application-request-routing"
+        } finally {
+            Remove-Item $arrMsi -Force -ErrorAction SilentlyContinue
+        }
+    } else {
+        Write-OK "IIS ARR module present"
     }
 
-    # Enable ARR proxy if DLL is present
+    # Enable ARR proxy
     try {
         Set-WebConfigurationProperty -pspath "MACHINE/WEBROOT/APPHOST" `
             -filter "system.webServer/proxy" -name "enabled" -value $true -ErrorAction SilentlyContinue

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "depository-deploy",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "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.10",
-    "depository-deploy-macos": "1.0.10",
-    "depository-deploy-windows": "1.0.10"
+    "depository-deploy-linux": "1.0.12",
+    "depository-deploy-macos": "1.0.12",
+    "depository-deploy-windows": "1.0.12"
   },
   "scripts": {
     "start": "node wizard-server.mjs"

package/wizard-server.mjs

@@ -157,7 +157,7 @@ const server = createServer((req, res) => {
         const confLines = Object.entries(conf)
           .map(([k, v]) => `${k}=${v}`)
           .join('\n');
-        const confPath = join(INSTALL_DIR, 'depository.conf');
+        const confPath = join(__dirname, 'depository.conf');
         writeFileSync(confPath, confLines, 'utf8');
 
         // Determine install script