create-entity-server 0.5.4 → 0.5.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-entity-server",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "Create a new entity-server project in one command — like create-react-app or create-vite.",
   "keywords": [
     "entity-server",

package/template/scripts/api-key.sh

@@ -18,6 +18,37 @@ if [ -f .env ]; then
 fi
 LANGUAGE=${LANGUAGE:-ko}
 
+# entity-cli api-key 서브커맨드를 공통 경로로 실행합니다.
+run_api_key_cli() {
+    ENTITY_CLI_NAME="api-key" "$BIN_PATH" api-key "$@"
+}
+
+# list 출력 테이블에서 seq 목록만 추출합니다.
+extract_api_key_seqs() {
+    run_api_key_cli list "$@" | awk '
+        /^[[:space:]]*[0-9]+[[:space:]]/ {
+            print $1
+        }
+    '
+}
+
+# list 결과를 show 상세 블록으로 다시 출력합니다.
+print_revealed_api_key_list() {
+    local -a seqs
+    mapfile -t seqs < <(extract_api_key_seqs "$@")
+
+    if [ ${#seqs[@]} -eq 0 ]; then
+        run_api_key_cli list "$@"
+        return
+    fi
+
+    local seq
+    for seq in "${seqs[@]}"; do
+        run_api_key_cli show --seq="$seq" --reveal-secret || return $?
+        echo ""
+    done
+}
+
 show_help() {
     if [ "$LANGUAGE" = "en" ]; then
         echo "API Key Management (CLI mode)"
@@ -36,6 +67,7 @@ show_help() {
         echo ""
         echo "list options:"
         echo "  --limit=<n>       Max rows to show (default: 20)"
+        echo "                    Each row is expanded with full key_value/hmac_secret"
         echo ""
         echo "add options:"
         echo "  --role=<name>     Role name (default: admin)"
@@ -72,6 +104,7 @@ show_help() {
         echo ""
         echo "list 옵션:"
         echo "  --limit=<n>       최대 출력 행 수 (기본: 20)"
+        echo "                    각 항목을 key_value, hmac_secret 전체 값으로 펼쳐서 출력"
         echo ""
         echo "add 옵션:"
         echo "  --role=<이름>     역할명 (기본: admin)"
@@ -114,8 +147,11 @@ SUBCOMMAND="$1"
 shift
 
 case "$SUBCOMMAND" in
-    list|show|add|delete)
-        ENTITY_CLI_NAME="api-key" "$BIN_PATH" api-key "$SUBCOMMAND" "$@"
+    list)
+        print_revealed_api_key_list "$@"
+        ;;
+    show|add|delete)
+        run_api_key_cli "$SUBCOMMAND" "$@"
         ;;
     help|-h|--help)
         show_help

package/template/scripts/run.sh

@@ -17,6 +17,7 @@ if [ ! -f "$SERVER_BIN" ] && [ -f "$PROJECT_ROOT/entity-server" ]; then
 fi
 
 mkdir -p "$RUN_DIR" "$PROJECT_ROOT/logs"
+SERVER_NAME="Entity Server"
 
 # Load language from .env
 if [ -f .env ]; then
@@ -24,6 +25,148 @@ if [ -f .env ]; then
 fi
 LANGUAGE=${LANGUAGE:-ko}
 
+has_command() {
+    command -v "$1" >/dev/null 2>&1
+}
+
+# PID 프로세스명을 읽습니다.
+get_pid_name() {
+    local pid="$1"
+    local result=""
+
+    result=$(ps -p "$pid" -o comm= 2>/dev/null | awk '{print $1}' || true)
+    if [ -n "$result" ]; then
+        echo "$result" | tr '[:upper:]' '[:lower:]'
+        return
+    fi
+
+    if has_command powershell.exe; then
+        powershell.exe -NoProfile -Command "(Get-Process -Id $pid -ErrorAction SilentlyContinue).ProcessName" \
+            2>/dev/null | tr -d '\r' | tr '[:upper:]' '[:lower:]' || true
+    fi
+}
+
+# PID 명령행을 읽습니다.
+get_pid_cmdline() {
+    local pid="$1"
+
+    if [ -r "/proc/$pid/cmdline" ]; then
+        tr '\0' ' ' < "/proc/$pid/cmdline" 2>/dev/null || true
+        return
+    fi
+
+    local result
+    result=$(ps -p "$pid" -o args= 2>/dev/null || true)
+    if [ -n "$result" ]; then
+        echo "$result"
+        return
+    fi
+
+    if has_command powershell.exe; then
+        powershell.exe -NoProfile -Command "(Get-WmiObject Win32_Process -Filter 'ProcessId = $pid').CommandLine" \
+            2>/dev/null | tr -d '\r' | tr '\\' '/' || true
+    fi
+}
+
+# PID 작업 디렉터리를 읽습니다.
+get_pid_cwd() {
+    local pid="$1"
+
+    readlink -f "/proc/$pid/cwd" 2>/dev/null || true
+}
+
+# PID가 실제 실행 중인지 Windows 폴백까지 포함해 확인합니다.
+is_pid_running() {
+    local pid="$1"
+
+    if [ -z "$pid" ]; then
+        return 1
+    fi
+
+    if kill -0 "$pid" 2>/dev/null; then
+        return 0
+    fi
+
+    if has_command powershell.exe; then
+        powershell.exe -NoProfile -Command "if (Get-Process -Id $pid -ErrorAction SilentlyContinue) { exit 0 } else { exit 1 }" \
+            >/dev/null 2>&1
+        return $?
+    fi
+
+    return 1
+}
+
+# PID를 종료하고 남아 있으면 강제 종료까지 진행합니다.
+force_stop_pid() {
+    local pid="$1"
+
+    if [ -z "$pid" ]; then
+        return 1
+    fi
+
+    kill "$pid" 2>/dev/null || true
+    if is_pid_running "$pid" && has_command powershell.exe; then
+        powershell.exe -NoProfile -Command "Stop-Process -Id $pid -ErrorAction SilentlyContinue" >/dev/null 2>&1 || true
+    fi
+
+    for _ in $(seq 1 30); do
+        if ! is_pid_running "$pid"; then
+            return 0
+        fi
+        sleep 0.1
+    done
+
+    kill -9 "$pid" 2>/dev/null || true
+    if is_pid_running "$pid" && has_command powershell.exe; then
+        powershell.exe -NoProfile -Command "Stop-Process -Id $pid -Force -ErrorAction SilentlyContinue" >/dev/null 2>&1 || true
+    fi
+
+    for _ in $(seq 1 20); do
+        if ! is_pid_running "$pid"; then
+            return 0
+        fi
+        sleep 0.1
+    done
+
+    return 1
+}
+
+# Windows PowerShell로 listen 중인 포트의 PID를 조회합니다.
+find_pid_by_port_powershell() {
+    local port="$1"
+    if ! has_command powershell.exe; then
+        return 0
+    fi
+
+    powershell.exe -NoProfile -Command "Get-NetTCPConnection -LocalPort ${port} -State Listen -ErrorAction SilentlyContinue | Select-Object -ExpandProperty OwningProcess" \
+        2>/dev/null | tr -d '\r' | awk '/^[0-9]+$/ { print }' | sort -u
+}
+
+# netstat 출력에서 포트 점유 PID를 조회합니다.
+find_pid_by_port_netstat() {
+    local port="$1"
+    if ! has_command netstat; then
+        return 0
+    fi
+
+    netstat -ano 2>/dev/null | awk -v target=":$port" '
+        $1 ~ /^TCP/ && index($2, target) && $NF ~ /^[0-9]+$/ { print $NF }
+    ' | sort -u
+}
+
+# PID가 현재 프로젝트의 Entity Server 프로세스인지 확인합니다.
+is_managed_server_pid() {
+    local pid="$1"
+    local process_name=""
+
+    if ! is_pid_running "$pid"; then
+        return 1
+    fi
+
+    process_name=$(get_pid_name "$pid")
+    [[ "$process_name" == "entity-server" || "$process_name" == "entity-server.exe" ]]
+}
+
 get_server_value() {
     local key="$1"
     local fallback="$2"
@@ -118,55 +261,77 @@ sync_database_default_for_environment() {
     return 0
 }
 
-is_running() {
-    local port_pid
-    port_pid=$(find_pid_by_port)
+find_server_pids() {
+    local port
+    port=$(get_server_value "port" "3400")
 
-    if [ ! -f "$PID_FILE" ]; then
-        if [ -n "$port_pid" ] && kill -0 "$port_pid" 2>/dev/null; then
-            return 0
-        fi
-        if is_port_in_use; then
-            return 0
-        fi
-        return 1
-    fi
-    local pid
-    pid=$(cat "$PID_FILE" 2>/dev/null)
-    if [ -z "$pid" ]; then
-        if [ -n "$port_pid" ] && kill -0 "$port_pid" 2>/dev/null; then
-            return 0
-        fi
-        if is_port_in_use; then
-            return 0
-        fi
-        return 1
+    if has_command ss; then
+        ss -ltnp 2>/dev/null | sed -n "s/.*:$port .*pid=\([0-9]\+\).*/\1/p" | sort -u
+        return
     fi
-    if kill -0 "$pid" 2>/dev/null; then
-        return 0
+
+    local detected_pid
+    detected_pid="$(find_pid_by_port_powershell "$port")"
+    if [ -n "$detected_pid" ]; then
+        echo "$detected_pid" | awk '/^[0-9]+$/ { print }' | sort -u
+        return
     fi
 
-    if [ -n "$port_pid" ] && kill -0 "$port_pid" 2>/dev/null; then
-        return 0
+    detected_pid="$(find_pid_by_port_netstat "$port")"
+    if [ -n "$detected_pid" ]; then
+        echo "$detected_pid" | awk '/^[0-9]+$/ { print }' | sort -u
     fi
+}
 
-    if is_port_in_use; then
-        return 0
+# pid 파일과 포트 기준으로 현재 서버 PID를 찾습니다.
+find_active_server_pid() {
+    local pid=""
+    local port_pid=""
+
+    if [ -f "$PID_FILE" ]; then
+        pid=$(tr -d '[:space:]' < "$PID_FILE" 2>/dev/null)
+        if [ -n "$pid" ] && is_managed_server_pid "$pid"; then
+            echo "$pid"
+            return
+        fi
     fi
 
-    return 1
+    while read -r port_pid; do
+        port_pid=$(echo "$port_pid" | tr -d '[:space:]')
+        [ -z "$port_pid" ] && continue
+        if is_managed_server_pid "$port_pid"; then
+            echo "$port_pid"
+            return
+        fi
+    done < <(find_server_pids)
 }
 
-find_pid_by_port() {
-    local port
-    port=$(get_server_value "port" "3400")
-    ss -ltnp 2>/dev/null | grep ":$port " | sed -n 's/.*pid=\([0-9]\+\).*/\1/p' | head -n 1
+is_running() {
+    [ -n "$(find_active_server_pid || true)" ]
 }
 
 is_port_in_use() {
     local port
     port=$(get_server_value "port" "3400")
-    ss -ltn 2>/dev/null | grep -q ":$port "
+
+    if [ -n "$(find_server_pids | head -n 1)" ]; then
+        return 0
+    fi
+
+    if has_command ss; then
+        ss -ltn 2>/dev/null | grep -q ":$port "
+        return
+    fi
+
+    if has_command netstat; then
+        netstat -ano 2>/dev/null | awk -v target=":$port" '
+            $1 ~ /^TCP/ && index($2, target) { found = 1; exit }
+            END { exit(found ? 0 : 1) }
+        '
+        return
+    fi
+
+    return 1
 }
 
 show_port_in_use_message() {
@@ -175,14 +340,28 @@ show_port_in_use_message() {
     if [ "$LANGUAGE" = "en" ]; then
         echo "❌ Port $port is already in use, but the owning PID could not be identified."
         echo "Check with: ss -ltnp | grep :$port"
+        echo "Or: powershell Get-NetTCPConnection -LocalPort $port -State Listen"
         echo "Or: lsof -iTCP:$port -sTCP:LISTEN -n -P"
     else
         echo "❌ 포트 $port 가 이미 사용 중이지만, 점유 PID를 식별할 수 없습니다."
         echo "확인: ss -ltnp | grep :$port"
+        echo "또는: powershell Get-NetTCPConnection -LocalPort $port -State Listen"
         echo "또는: lsof -iTCP:$port -sTCP:LISTEN -n -P"
     fi
 }
 
+# start/dev 용 포트 충돌 안내를 출력합니다.
+show_start_port_in_use_message() {
+    local port
+    port=$(get_server_value "port" "3400")
+
+    if [ "$LANGUAGE" = "en" ]; then
+        echo "❌ Port $port is already in use. Stop the existing process first: ./run.sh stop"
+    else
+        echo "❌ 포트 $port 가 이미 사용 중입니다. 먼저 중지하세요: ./run.sh stop"
+    fi
+}
+
 show_unmanaged_server_message() {
     local port
     port=$(get_server_value "port" "3400")
@@ -203,7 +382,7 @@ stop_pid_with_confirm() {
     if [ -z "$pid" ]; then
         return 1
     fi
-    if ! kill -0 "$pid" 2>/dev/null; then
+    if ! is_pid_running "$pid"; then
         return 1
     fi
 
@@ -219,118 +398,62 @@ stop_pid_with_confirm() {
         echo "  $proc_info"
     fi
 
-    kill "$pid" 2>/dev/null
-    for _ in $(seq 1 30); do
-        if ! kill -0 "$pid" 2>/dev/null; then
-            rm -f "$PID_FILE"
-            if [ "$LANGUAGE" = "en" ]; then
-                echo "✅ Server stopped (pid: $pid)"
-            else
-                echo "✅ 서버가 중지되었습니다 (pid: $pid)"
-            fi
-            return 0
+    if force_stop_pid "$pid"; then
+        rm -f "$PID_FILE"
+        if [ "$LANGUAGE" = "en" ]; then
+            echo "✅ ${SERVER_NAME} stopped (pid: $pid)"
+        else
+            echo "✅ ${SERVER_NAME} 종료 완료 (PID: $pid)"
         fi
-        sleep 0.1
-    done
-
-    kill -9 "$pid" 2>/dev/null
-    rm -f "$PID_FILE"
-    if [ "$LANGUAGE" = "en" ]; then
-        echo "⚠️  Server force-stopped (pid: $pid)"
-    else
-        echo "⚠️  서버를 강제 종료했습니다 (pid: $pid)"
+        return 0
     fi
-    return 0
+
+    return 1
 }
 
 stop_server() {
-    if [ ! -f "$PID_FILE" ]; then
-        local port_pid
-        port_pid=$(find_pid_by_port)
-        if [ -n "$port_pid" ] && kill -0 "$port_pid" 2>/dev/null; then
-            stop_pid_with_confirm "$port_pid" "port"
-            return $?
-        fi
-        if is_port_in_use; then
-            show_port_in_use_message
-            return 0
-        fi
-        if [ "$LANGUAGE" = "en" ]; then
-            echo "ℹ️  Server is not running (pid file not found)."
-        else
-            echo "ℹ️  서버가 실행 중이 아닙니다 (pid 파일 없음)."
-        fi
-        return 0
+    local pid=""
+
+    pid=$(find_active_server_pid)
+    rm -f "$PID_FILE"
+
+    if [ -n "$pid" ]; then
+        stop_pid_with_confirm "$pid" "active process"
+        return $?
     fi
 
-    local pid
-    pid=$(cat "$PID_FILE" 2>/dev/null)
-    if [ -z "$pid" ]; then
-        rm -f "$PID_FILE"
-        local port_pid
-        port_pid=$(find_pid_by_port)
-        if [ -n "$port_pid" ] && kill -0 "$port_pid" 2>/dev/null; then
-            stop_pid_with_confirm "$port_pid" "port"
-            return $?
-        fi
-        if is_port_in_use; then
-            show_port_in_use_message
-            return 0
-        fi
-        if [ "$LANGUAGE" = "en" ]; then
-            echo "ℹ️  Empty pid file removed."
-        else
-            echo "ℹ️  비어있는 pid 파일을 정리했습니다."
-        fi
-        return 0
+    if is_port_in_use; then
+        show_unmanaged_server_message
+        return 1
     fi
 
-    if ! kill -0 "$pid" 2>/dev/null; then
-        rm -f "$PID_FILE"
-        local port_pid
-        port_pid=$(find_pid_by_port)
-        if [ -n "$port_pid" ] && kill -0 "$port_pid" 2>/dev/null; then
-            stop_pid_with_confirm "$port_pid" "port"
-            return $?
-        fi
-        if is_port_in_use; then
-            show_port_in_use_message
-            return 0
-        fi
-        if [ "$LANGUAGE" = "en" ]; then
-            echo "ℹ️  Server process already exited (stale pid file removed)."
-            echo "   Last log ($STDOUT_LOG):"
-            tail -5 "$STDOUT_LOG" 2>/dev/null | sed 's/^/   /'
-        else
-            echo "ℹ️  서버 프로세스가 이미 종료되어 있습니다 (stale pid 파일 정리됨)."
-            echo "   최근 로그 ($STDOUT_LOG):"
-            tail -5 "$STDOUT_LOG" 2>/dev/null | sed 's/^/   /'
-        fi
-        return 0
+    if [ "$LANGUAGE" = "en" ]; then
+        echo "ℹ️  ${SERVER_NAME} is not running."
+    else
+        echo "ℹ️  ${SERVER_NAME}가 실행 중이 아닙니다."
     fi
 
-    stop_pid_with_confirm "$pid" "pid file"
-    return $?
+    return 0
 }
 
 show_status() {
-    if is_running; then
-		local status_pid
-		status_pid=$(find_pid_by_port)
+    local status_pid=""
+
+    status_pid=$(find_active_server_pid || true)
+    if [ -n "$status_pid" ]; then
         "$SERVER_BIN" banner-status RUNNING
         if [ "$LANGUAGE" = "en" ]; then
-			if [ -n "$status_pid" ]; then
-				echo "PID: $status_pid (detected by port)"
-			fi
+            echo "PID: $status_pid (managed process)"
             echo "Stop: ./run.sh stop"
         else
-			if [ -n "$status_pid" ]; then
-				echo "PID: $status_pid (포트 기준 감지)"
-			fi
+            echo "PID: $status_pid (관리 대상 프로세스)"
             echo "중지: ./run.sh stop"
         fi
     else
         "$SERVER_BIN" banner-status STOPPED
+        if is_port_in_use; then
+            show_unmanaged_server_message
+        fi
         if [ "$LANGUAGE" = "en" ]; then
             echo "Start: ./run.sh start"
         else
@@ -432,40 +555,42 @@ fi
 
 case "$MODE" in
     dev|development)
-        if is_running; then
-            running_pid=$(find_pid_by_port)
-            if [ -n "$running_pid" ]; then
-                if [ "$LANGUAGE" = "en" ]; then
-                    echo "❌ Server already running (pid: $running_pid). Stop first: ./run.sh stop"
-                else
-                    echo "❌ 이미 서버가 실행 중입니다 (pid: $running_pid). 먼저 중지하세요: ./run.sh stop"
-                fi
+        running_pid=$(find_active_server_pid || true)
+        if [ -n "$running_pid" ]; then
+            if [ "$LANGUAGE" = "en" ]; then
+                echo "❌ Server already running (pid: $running_pid). Stop first: ./run.sh stop"
             else
-                show_port_in_use_message
+                echo "❌ 이미 서버가 실행 중입니다 (pid: $running_pid). 먼저 중지하세요: ./run.sh stop"
             fi
             exit 1
         fi
 
+        if is_port_in_use; then
+            show_start_port_in_use_message
+            exit 1
+        fi
+
         sed -E -i 's/("environment"[[:space:]]*:[[:space:]]*")[^"]+(")/\1development\2/' "$SERVER_CONFIG"
         sync_database_default_for_environment "$LINENO" || exit 1
         "$SERVER_BIN"
         ;;
         
     start)
-        if is_running; then
-            running_pid=$(find_pid_by_port)
-            if [ -n "$running_pid" ]; then
-                if [ "$LANGUAGE" = "en" ]; then
-                    echo "❌ Server already running (pid: $running_pid). Stop first: ./run.sh stop"
-                else
-                    echo "❌ 이미 서버가 실행 중입니다 (pid: $running_pid). 먼저 중지하세요: ./run.sh stop"
-                fi
+        running_pid=$(find_active_server_pid || true)
+        if [ -n "$running_pid" ]; then
+            if [ "$LANGUAGE" = "en" ]; then
+                echo "❌ Server already running (pid: $running_pid). Stop first: ./run.sh stop"
             else
-                show_port_in_use_message
+                echo "❌ 이미 서버가 실행 중입니다 (pid: $running_pid). 먼저 중지하세요: ./run.sh stop"
             fi
             exit 1
         fi
 
+        if is_port_in_use; then
+            show_start_port_in_use_message
+            exit 1
+        fi
+
         "$SERVER_BIN" banner
         nohup "$SERVER_BIN" >> "$STDOUT_LOG" 2>&1 &
         SERVER_PID=$!