create-entity-server 0.9.16 → 0.9.21

package/package.json

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

package/template/scripts/run.sh

@@ -799,7 +799,11 @@ if [ ! -f "$DATABASE_CONFIG" ]; then
     exit 1
 fi
 
-if [ ! -f "$SERVER_BIN" ]; then
+# stop 은 바이너리가 없어도 동작해야 한다(포트/PID 기준으로 종료하므로).
+# update-server.sh 가 업데이트 중 바이너리를 지운 상태에서 run.sh stop 을 호출하는
+# 경우가 있어, 여기서 막으면 "바이너리 없음 → stop 실패 → 종료 못 함" 악순환이 된다.
+# 나머지 모드(dev/start/restart/status)는 바이너리가 반드시 필요하다.
+if [ "$MODE" != "stop" ] && [ ! -f "$SERVER_BIN" ]; then
     if [ "$LANGUAGE" = "en" ]; then
         echo "❌ entity-server binary not found (bin/entity-server or ./entity-server)"
         echo "   Run ./scripts/update-server.sh to download the latest binary."

package/template/scripts/update-server.sh

@@ -32,9 +32,43 @@ _find_running_pid() {
     pgrep -f "${PROJECT_ROOT}/(bin/)?entity-server( |$)" | head -n 1
 }
 
+_list_running_pids() {
+    local pid_file="$PROJECT_ROOT/.run/entity-server.pid"
+
+    {
+        if [ -f "$pid_file" ]; then
+            local pid
+            pid=$(cat "$pid_file" 2>/dev/null)
+            if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then
+                echo "$pid"
+            fi
+        fi
+
+        pgrep -f "${PROJECT_ROOT}/(bin/)?entity-server( |$)" 2>/dev/null || true
+    } | awk 'NF { print }' | sort -u
+}
+
+_kill_pid() {
+    local pid="$1"
+
+    [ -n "$pid" ] || return 0
+
+    kill "$pid" 2>/dev/null || sudo -n kill "$pid" 2>/dev/null || true
+
+    for _ in $(seq 1 10); do
+        if ! kill -0 "$pid" 2>/dev/null; then
+            return 0
+        fi
+        sleep 0.1
+    done
+
+    kill -9 "$pid" 2>/dev/null || sudo -n kill -9 "$pid" 2>/dev/null || true
+}
+
 _ensure_server_stopped() {
-    local pid
-    pid="$(_find_running_pid)"
+    local pid pids
+    pids="$(_list_running_pids)"
+    pid=$(echo "$pids" | head -n 1)
 
     if [ -z "$pid" ]; then
         return 0
@@ -55,7 +89,17 @@ _ensure_server_stopped() {
     if [ -x "$PROJECT_ROOT/scripts/run.sh" ]; then
         "$PROJECT_ROOT/scripts/run.sh" stop || true
     else
-        kill "$pid" 2>/dev/null || true
+        _kill_pid "$pid"
+    fi
+
+    pids="$(_list_running_pids)"
+    if [ -n "$pids" ]; then
+        while read -r pid; do
+            [ -n "$pid" ] || continue
+            _kill_pid "$pid"
+        done <<EOF
+$pids
+EOF
     fi
 
     sleep 0.2