langmart-gateway-type3 3.0.9 → 3.0.11

package/scripts/status.ps1

@@ -1,211 +1,114 @@
-# Check Gateway Type 3 status on Windows
-# This script is designed to work both interactively and via SSH
-# Output format is designed to be parseable for remote status checks
+# Gateway Type 3 Status Script for Windows
+# Features: Service mode detection, health check, RESULT output
 
-param(
-    [int]$Port = 8083,
-    [switch]$Json,
-    [switch]$Brief
-)
-
-# Get script/project directory
 $ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
 $ProjectDir = Split-Path -Parent $ScriptDir
+$InstallDir = if ($ProjectDir -like "*node_modules*") { (Get-Location).Path } else { $ProjectDir }
+
+$EnvFile = Join-Path $InstallDir ".env"
+$PidFile = Join-Path $InstallDir "gateway.pid"
+$LogFile = Join-Path $InstallDir "logs\gateway.log"
+$ServiceModeFile = Join-Path $InstallDir ".service-mode"
+$ServiceName = "LangMartGateway"
+
+function Write-Log { param([string]$Message, [string]$Type = "INFO"); Write-Output "[$Type] $(Get-Date -Format 'HH:mm:ss') - $Message" }
 
-# If running from node_modules, adjust path
-if ($ProjectDir -like "*node_modules*") {
-    $ProjectDir = (Get-Location).Path
+function Test-ServiceMode {
+    if (Test-Path $ServiceModeFile) {
+        $mode = Get-Content $ServiceModeFile -ErrorAction SilentlyContinue
+        if ($mode -eq "windows-service") {
+            if (Get-Service -Name $ServiceName -ErrorAction SilentlyContinue) { return $true }
+        }
+    }
+    return $false
 }
 
-# Load .env file to get port if not specified
-$EnvFile = Join-Path $ProjectDir ".env"
-$envVars = @{}
+# Load .env for GATEWAY_PORT
 if (Test-Path $EnvFile) {
     Get-Content $EnvFile | ForEach-Object {
-        if ($_ -match '^([^#][^=]+)=(.*)$') {
-            $key = $matches[1].Trim()
-            $value = $matches[2].Trim()
-            $envVars[$key] = $value
-            if ($key -eq "GATEWAY_PORT" -and $Port -eq 8083 -and $value) {
-                $Port = [int]$value
-            }
+        if ($_ -match '^([^#=]+)=(.*)$') {
+            [Environment]::SetEnvironmentVariable($matches[1].Trim(), $matches[2].Trim().Trim('"').Trim("'"), 'Process')
         }
     }
 }
 
-# Status object for JSON output
-$status = @{
-    running = $false
-    port = $Port
-    pid = $null
-    health = $false
-    version = $null
-    gateway_id = $null
-    gateway_name = $null
-    installed = $false
-    mode = "direct"
-    error = $null
-}
+$GatewayPort = if ($env:GATEWAY_PORT) { [int]$env:GATEWAY_PORT } else { 8083 }
 
-# Output helper
-function Write-Log {
-    param([string]$Message, [string]$Type = "INFO")
-    if (-not $Json) {
-        Write-Output "[$Type] $Message"
-    }
-}
+Write-Log "=== Gateway Type 3 Status ==="
+Write-Log "Install directory: $InstallDir"
+Write-Log "Port: $GatewayPort"
 
-# Check if gateway package is installed
-$EntryFile = $null
-if (Test-Path "$ProjectDir\node_modules\langmart-gateway-type3\dist\index-server.js") {
-    $EntryFile = "$ProjectDir\node_modules\langmart-gateway-type3\dist\index-server.js"
-    $status.installed = $true
-} elseif (Test-Path "$ProjectDir\dist\index-server.js") {
-    $EntryFile = "$ProjectDir\dist\index-server.js"
-    $status.installed = $true
+# CHECK SERVICE MODE
+$serviceMode = Test-ServiceMode
+if ($serviceMode) {
+    Write-Log "Mode: Service (Windows Service)"
+    $service = Get-Service -Name $ServiceName -ErrorAction SilentlyContinue
+    Write-Log "Service status: $($service.Status)"
+    Write-Log "Service startup: $($service.StartType)"
+} else {
+    Write-Log "Mode: Standalone"
 }
 
-# Get version from package.json
-$PackageJson = "$ProjectDir\node_modules\langmart-gateway-type3\package.json"
-if (Test-Path $PackageJson) {
-    try {
-        $pkg = Get-Content $PackageJson | ConvertFrom-Json
-        $status.version = $pkg.version
-    } catch {}
-}
+# Check if running on port
+try {
+    $existingPID = (Get-NetTCPConnection -LocalPort $GatewayPort -State Listen -ErrorAction SilentlyContinue).OwningProcess | Select-Object -First 1
+} catch { $existingPID = $null }
 
-# Get gateway config
-$ConfigFile = Join-Path $ProjectDir "gateway-config.json"
-if (Test-Path $ConfigFile) {
-    try {
-        $config = Get-Content $ConfigFile | ConvertFrom-Json
-        $status.gateway_id = $config.gatewayId
-        $status.gateway_name = $config.gatewayName
-    } catch {}
-}
+$modeStr = if ($serviceMode) { "service" } else { "standalone" }
 
-# Check if running
-try {
-    $existingPID = (Get-NetTCPConnection -LocalPort $Port -State Listen -ErrorAction SilentlyContinue).OwningProcess | Select-Object -First 1
-    if ($existingPID) {
-        $status.running = $true
-        $status.pid = $existingPID
-    }
-} catch {
-    $status.error = $_.Exception.Message
-}
+if ($existingPID) {
+    Write-Log "Status: RUNNING" "SUCCESS"
+    Write-Log "PID: $existingPID"
+    Write-Log "Port: $GatewayPort"
 
-# Check health if running
-if ($status.running) {
+    # Check health endpoint
     try {
-        $health = Invoke-RestMethod -Uri "http://localhost:$Port/health" -TimeoutSec 3 -ErrorAction Stop
-        $status.health = $true
-        if ($health.version) {
-            $status.version = $health.version
-        }
-        if ($health.gateway_id) {
-            $status.gateway_id = $health.gateway_id
-        }
+        Invoke-WebRequest -Uri "http://localhost:$GatewayPort/health" -TimeoutSec 5 -ErrorAction SilentlyContinue | Out-Null
+        Write-Log "Health: OK" "SUCCESS"
     } catch {
-        $status.health = $false
+        Write-Log "Health: Port open but API not responding" "WARN"
     }
-}
 
-# JSON output mode
-if ($Json) {
-    $status | ConvertTo-Json -Compress
-    exit $(if ($status.running) { 0 } else { 1 })
-}
-
-# Brief output mode (for SSH parsing)
-if ($Brief) {
-    if ($status.running) {
-        Write-Output "RUNNING:$($status.pid):$Port"
-        if ($status.health) {
-            Write-Output "HEALTH:OK"
+    # Show PID file status
+    if (Test-Path $PidFile) {
+        $savedPid = Get-Content $PidFile -ErrorAction SilentlyContinue
+        if ($savedPid -eq $existingPID) {
+            Write-Log "PID file: Match ($PidFile)"
         } else {
-            Write-Output "HEALTH:FAIL"
-        }
-        if ($status.version) {
-            Write-Output "VERSION:$($status.version)"
-        }
-        if ($status.gateway_id) {
-            Write-Output "GATEWAY_ID:$($status.gateway_id)"
+            Write-Log "PID file: Mismatch (saved: $savedPid, actual: $existingPID)" "WARN"
         }
     } else {
-        Write-Output "STOPPED"
-        if ($status.installed) {
-            Write-Output "INSTALLED:YES"
-            if ($status.version) {
-                Write-Output "VERSION:$($status.version)"
-            }
-        } else {
-            Write-Output "INSTALLED:NO"
-        }
-        if ($status.gateway_id) {
-            Write-Output "GATEWAY_ID:$($status.gateway_id)"
-        }
+        Write-Log "PID file: Not found" "WARN"
     }
-    exit $(if ($status.running) { 0 } else { 1 })
-}
-
-# Full status output
-Write-Output ""
-Write-Output "=========================================="
-Write-Output "  Gateway Type 3 Status (Windows)"
-Write-Output "=========================================="
 
-if ($status.running) {
-    Write-Log "Status: Running" "SUCCESS"
-    Write-Log "PID: $($status.pid)"
-    Write-Log "Port: $Port"
-
-    if ($status.health) {
-        Write-Log "Health: OK" "SUCCESS"
-    } else {
-        Write-Log "Health: Port open but API not responding" "WARN"
+    # Show log file info
+    if (Test-Path $LogFile) {
+        $logSize = (Get-Item $LogFile).Length / 1KB
+        Write-Log "Log file: $LogFile ($([math]::Round($logSize, 1)) KB)"
     }
 
-    if ($status.version) {
-        Write-Log "Version: $($status.version)"
-    }
-    if ($status.gateway_id) {
-        Write-Log "Gateway ID: $($status.gateway_id)"
-    }
-    if ($status.gateway_name) {
-        Write-Log "Gateway Name: $($status.gateway_name)"
+    if ($serviceMode) {
+        Write-Log ""
+        Write-Log "Service commands:"
+        Write-Log "  Get-Service $ServiceName"
+        Write-Log "  Get-Content $InstallDir\logs\service-stdout.log -Tail 50"
     }
+
+    Write-Output "RESULT:running=true,port=$GatewayPort,pid=$existingPID,mode=$modeStr"
+    exit 0
 } else {
-    Write-Log "Status: Not Running" "WARN"
-    Write-Log "Port: $Port (not in use)"
+    Write-Log "Status: NOT RUNNING" "WARN"
+    Write-Log "Port: $GatewayPort (not in use)"
 
-    if ($status.installed) {
-        Write-Log "Installed: Yes"
-        if ($status.version) {
-            Write-Log "Version: $($status.version)"
-        }
-    } else {
-        Write-Log "Installed: No" "WARN"
+    if (Test-Path $PidFile) {
+        Write-Log "PID file exists but process not running (stale)" "WARN"
     }
-    if ($status.gateway_id) {
-        Write-Log "Gateway ID: $($status.gateway_id) (from config)"
+
+    if ($serviceMode) {
+        $service = Get-Service -Name $ServiceName -ErrorAction SilentlyContinue
+        if ($service.Status -eq "Stopped") { Write-Log "Service is stopped" }
     }
-}
 
-# Show log files
-$LogDir = Join-Path $ProjectDir "logs"
-$LogFile = Join-Path $LogDir "gateway.log"
-if (Test-Path $LogFile) {
-    $logSize = (Get-Item $LogFile).Length
-    $logSizeStr = if ($logSize -gt 1MB) { "{0:N2} MB" -f ($logSize / 1MB) } else { "{0:N0} KB" -f ($logSize / 1KB) }
-    Write-Log "Log File: $LogFile ($logSizeStr)"
+    Write-Output "RESULT:running=false,port=$GatewayPort,pid=,mode=$modeStr"
+    exit 0
 }
-
-Write-Output ""
-Write-Output "Commands:"
-Write-Output "  npm start       - Start gateway"
-Write-Output "  npm stop        - Stop gateway"
-Write-Output "  npm run status  - Show this status"
-Write-Output ""
-
-exit $(if ($status.running) { 0 } else { 1 })

package/scripts/status.sh

@@ -1,79 +1,152 @@
 #!/bin/bash
-# Check Gateway Type 3 status
+# Gateway Type 3 Status Script
+# Check if gateway is running and report status
+# Handles both service mode and standalone mode
+#
+# Output: RESULT:running=true|false,port=PORT,pid=PID,mode=service|standalone
 
-# Colors
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-RED='\033[0;31m'
-CYAN='\033[0;36m'
-NC='\033[0m' # No Color
+set -e
+
+# Get script directory and project directory
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
+
+# If running from node_modules, find the actual install dir
+if [[ "$PROJECT_DIR" == *"node_modules"* ]]; then
+    INSTALL_DIR="$(cd "$PROJECT_DIR/../.." && pwd)"
+else
+    INSTALL_DIR="$PROJECT_DIR"
+fi
 
 # Configuration
-GATEWAY_PORT=8083
-PID_FILE="/tmp/gw3.pid"
-LOG_FILE="/tmp/gw3.log"
-
-# Detect host IP
-HOST_IP=$(hostname -I | awk '{print $1}')
-if [ -z "$HOST_IP" ]; then
-    HOST_IP="localhost"
+ENV_FILE="${INSTALL_DIR}/.env"
+PID_FILE="${INSTALL_DIR}/gateway.pid"
+LOG_FILE="${INSTALL_DIR}/logs/gateway.log"
+SERVICE_MODE_FILE="${INSTALL_DIR}/.service-mode"
+SERVICE_NAME="langmart-gateway"
+service_mode=false
+
+# Load .env for GATEWAY_PORT
+if [ -f "$ENV_FILE" ]; then
+    set -a
+    source "$ENV_FILE"
+    set +a
 fi
 
-echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
-echo -e "${CYAN}  Gateway Type 3 Status${NC}"
-echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
+GATEWAY_PORT="${GATEWAY_PORT:-8083}"
+
+# Log function
+log() {
+    local level="${2:-INFO}"
+    local timestamp=$(date +"%H:%M:%S")
+    echo "[$level] $timestamp - $1"
+}
+
+# Check if running in service mode
+check_service_mode() {
+    if [ -f "$SERVICE_MODE_FILE" ]; then
+        local mode=$(cat "$SERVICE_MODE_FILE" 2>/dev/null || echo "")
+        if [ "$mode" = "systemd" ]; then
+            if systemctl list-unit-files 2>/dev/null | grep -q "^${SERVICE_NAME}.service"; then
+                service_mode=true
+                return 0
+            fi
+        fi
+    fi
+    service_mode=false
+    return 1
+}
+
+log "=== Gateway Type 3 Status ==="
+log "Install directory: $INSTALL_DIR"
+log "Port: $GATEWAY_PORT"
+
+# ============================================
+# CHECK SERVICE MODE
+# ============================================
+check_service_mode
+if [ "$service_mode" = true ]; then
+    log "Mode: Service (systemd)"
 
-# Check if port is in use
-if lsof -i :$GATEWAY_PORT -sTCP:LISTEN -t >/dev/null 2>&1; then
-    PID=$(lsof -ti :$GATEWAY_PORT)
-    echo -e "Status: ${GREEN}● Running${NC}"
-    echo -e "PID: ${GREEN}$PID${NC}"
-    echo -e "Port: ${GREEN}$GATEWAY_PORT${NC}"
+    service_status=$(systemctl is-active "$SERVICE_NAME" 2>/dev/null || echo "inactive")
+    service_enabled=$(systemctl is-enabled "$SERVICE_NAME" 2>/dev/null || echo "disabled")
+
+    log "Service status: $service_status"
+    log "Service enabled: $service_enabled"
+else
+    log "Mode: Standalone"
+fi
+
+# Check if running on port
+existing_pid=$(lsof -ti:$GATEWAY_PORT 2>/dev/null || true)
+
+if [ -n "$existing_pid" ]; then
+    mode_str="standalone"
+    [ "$service_mode" = true ] && mode_str="service"
+
+    log "Status: RUNNING" "SUCCESS"
+    log "PID: $existing_pid"
+    log "Port: $GATEWAY_PORT"
 
     # Check health endpoint
+    HOST_IP=$(hostname -I 2>/dev/null | awk '{print $1}' || echo "localhost")
+    [ -z "$HOST_IP" ] && HOST_IP="localhost"
+
     if curl -s "http://$HOST_IP:$GATEWAY_PORT/health" > /dev/null 2>&1; then
-        echo -e "Health: ${GREEN}✓ Healthy${NC}"
-        echo -e "Management API: ${CYAN}http://$HOST_IP:$GATEWAY_PORT${NC}"
+        log "Health: OK" "SUCCESS"
     else
-        echo -e "Health: ${YELLOW}⚠ Port open but API not responding${NC}"
+        log "Health: Port open but API not responding" "WARN"
     fi
 
     # Show PID file status
     if [ -f "$PID_FILE" ]; then
-        SAVED_PID=$(cat "$PID_FILE")
-        if [ "$PID" = "$SAVED_PID" ]; then
-            echo -e "PID File: ${GREEN}✓ Match ($PID_FILE)${NC}"
+        saved_pid=$(cat "$PID_FILE")
+        if [ "$existing_pid" = "$saved_pid" ]; then
+            log "PID file: Match ($PID_FILE)"
         else
-            echo -e "PID File: ${YELLOW}⚠ Mismatch (saved: $SAVED_PID, actual: $PID)${NC}"
+            log "PID file: Mismatch (saved: $saved_pid, actual: $existing_pid)" "WARN"
         fi
     else
-        echo -e "PID File: ${YELLOW}⚠ Not found${NC}"
+        log "PID file: Not found" "WARN"
     fi
 
-    # Show log file
+    # Show log file info
     if [ -f "$LOG_FILE" ]; then
-        echo -e "Logs: ${CYAN}$LOG_FILE${NC}"
-        LOG_SIZE=$(du -h "$LOG_FILE" | cut -f1)
-        echo -e "Log Size: ${CYAN}$LOG_SIZE${NC}"
+        log_size=$(du -h "$LOG_FILE" 2>/dev/null | cut -f1 || echo "unknown")
+        log "Log file: $LOG_FILE ($log_size)"
     fi
+
+    # Show service-specific info
+    if [ "$service_mode" = true ]; then
+        log ""
+        log "Service commands:"
+        log "  sudo systemctl status $SERVICE_NAME"
+        log "  sudo journalctl -u $SERVICE_NAME -f"
+    fi
+
+    echo "RESULT:running=true,port=$GATEWAY_PORT,pid=$existing_pid,mode=$mode_str"
+    exit 0
 else
-    echo -e "Status: ${RED}● Not Running${NC}"
-    echo -e "Port: ${RED}$GATEWAY_PORT (not in use)${NC}"
+    mode_str="standalone"
+    [ "$service_mode" = true ] && mode_str="service"
 
-    # Check PID file
+    log "Status: NOT RUNNING" "WARN"
+    log "Port: $GATEWAY_PORT (not in use)"
+
+    # Check for stale PID file
     if [ -f "$PID_FILE" ]; then
-        echo -e "PID File: ${YELLOW}⚠ Exists but process not running (stale)${NC}"
-        echo -e "  ${CYAN}Run 'npm run stop' to clean up${NC}"
+        log "PID file exists but process not running (stale)" "WARN"
+    fi
+
+    # Service-specific info
+    if [ "$service_mode" = true ]; then
+        service_status=$(systemctl is-active "$SERVICE_NAME" 2>/dev/null || echo "inactive")
+        if [ "$service_status" = "failed" ]; then
+            log "Service is in failed state" "ERROR"
+            log "Check logs: sudo journalctl -u $SERVICE_NAME -n 50"
+        fi
     fi
-fi
 
-echo -e "${CYAN}━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━${NC}"
-echo -e ""
-echo -e "${CYAN}Commands:${NC}"
-echo -e "  npm start       - Start gateway in background"
-echo -e "  npm stop        - Stop gateway gracefully"
-echo -e "  npm restart     - Restart gateway"
-echo -e "  npm run status  - Show this status"
-echo -e "  npm run ui      - Start interactive UI"
-echo -e "  npm run self    - Start interactive UI (short form)"
-echo -e ""
+    echo "RESULT:running=false,port=$GATEWAY_PORT,pid=,mode=$mode_str"
+    exit 0
+fi