@kmlckj/licos-ai-cli 0.0.22 → 0.0.24

package/lib/__templates__/expo/.licosproj/scripts/dev_run.sh

@@ -7,18 +7,14 @@ mkdir -p "$LOG_DIR"
 # ==================== 配置项 ====================
 # Server 服务配置
 SERVER_HOST="0.0.0.0"
-SERVER_PORT="9091"
+SERVER_PORT="${LICOS_BACKEND_PORT:-${SERVER_PORT:-5001}}"
 # Expo 项目配置
 EXPO_HOST="0.0.0.0"
 EXPO_DIR="expo"
-EXPO_PORT="5000"
-WEB_URL="${LICOS_PROJECT_DOMAIN_DEFAULT:-http://127.0.0.1:${SERVER_PORT}}"
+EXPO_PORT="${LICOS_RUN_PORT:-${PORT:-5000}}"
 ASSUME_YES="1"
-EXPO_PUBLIC_BACKEND_BASE_URL="${EXPO_PUBLIC_BACKEND_BASE_URL:-$WEB_URL}"
-EXPO_PUBLIC_LICOS_PROJECT_ID="${LICOS_PROJECT_ID:-}"
+PROTECTED_PORTS="${LICOS_DEV_PROTECTED_PORTS:-8080 8081 9091}"
 
-EXPO_PACKAGER_PROXY_URL="${EXPO_PUBLIC_BACKEND_BASE_URL}"
-export EXPO_PUBLIC_BACKEND_BASE_URL EXPO_PACKAGER_PROXY_URL EXPO_PUBLIC_LICOS_PROJECT_ID
 # 运行时变量（为避免 set -u 的未绑定错误，预置为空）
 SERVER_PID=""
 EXPO_PID=""
@@ -41,7 +37,7 @@ while [ $# -gt 0 ]; do
   esac
 done
 is_port_free() {
-  ! lsof -iTCP:"$1" -sTCP:LISTEN >/dev/null 2>&1
+  ! nc -z -w 1 127.0.0.1 "$1" >/dev/null 2>&1
 }
 choose_next_free_port() {
   local start=$1
@@ -51,6 +47,15 @@ choose_next_free_port() {
   done
   echo "$p"
 }
+is_protected_port() {
+  local port_val=$1
+  for protected in $PROTECTED_PORTS; do
+    if [ "$protected" = "$port_val" ]; then
+      return 0
+    fi
+  done
+  return 1
+}
 ensure_port() {
   local var_name=$1
   local port_val=$2
@@ -59,32 +64,37 @@ ensure_port() {
     eval "$var_name=$port_val"
   else
     echo "端口已占用：$port_val"
+    if is_protected_port "$port_val"; then
+      local new_port
+      new_port=$(choose_next_free_port "$((port_val+1))")
+      echo "端口 $port_val 是平台保护端口，改用新的端口：$new_port"
+      eval "$var_name=$new_port"
+      return 0
+    fi
     local choice
-    if [ "$ASSUME_YES" = "1" ]; then choice="Y"; else read -r -p "是否关闭该端口的进程？[Y/n] " choice || choice="Y"; fi
+    if [ "${LICOS_DEV_KILL_PORTS:-0}" = "1" ]; then
+      if [ "$ASSUME_YES" = "1" ]; then choice="Y"; else read -r -p "是否关闭该端口的进程？[Y/n] " choice || choice="Y"; fi
+    else
+      choice="n"
+    fi
     if [ -z "$choice" ] || [ "$choice" = "y" ] || [ "$choice" = "Y" ]; then
-      if command -v lsof &> /dev/null; then
-        local pids
-        pids=$(lsof -t -i tcp:"$port_val" -sTCP:LISTEN 2>/dev/null || true)
-        if [ -n "$pids" ]; then
-          echo "正在关闭进程：$pids"
-          kill -9 $pids 2>/dev/null || echo "关闭进程失败：$pids"
-          eval "$var_name=$port_val"
-        else
-          echo "未获取到占用该端口的进程"
-          eval "$var_name=$port_val"
-        fi
-      else
-        echo "缺少 lsof，无法自动关闭进程"
-        eval "$var_name=$port_val"
-      fi
+      fuser -k "${port_val}/tcp" 2>/dev/null || echo "关闭端口进程失败或端口未找到：$port_val"
+      eval "$var_name=$port_val"
     else
       local new_port
-      new_port=$(choose_next_free_port "$port_val")
-      info "使用新的端口：$new_port"
+      new_port=$(choose_next_free_port "$((port_val+1))")
+      echo "使用新的端口：$new_port"
       eval "$var_name=$new_port"
     fi
   fi
 }
+configure_expo_env() {
+  local web_url="${LICOS_PROJECT_DOMAIN_DEFAULT:-http://127.0.0.1:${SERVER_PORT}}"
+  EXPO_PUBLIC_BACKEND_BASE_URL="${EXPO_PUBLIC_BACKEND_BASE_URL:-$web_url}"
+  EXPO_PUBLIC_LICOS_PROJECT_ID="${LICOS_PROJECT_ID:-}"
+  EXPO_PACKAGER_PROXY_URL="${EXPO_PACKAGER_PROXY_URL:-$EXPO_PUBLIC_BACKEND_BASE_URL}"
+  export EXPO_PUBLIC_BACKEND_BASE_URL EXPO_PACKAGER_PROXY_URL EXPO_PUBLIC_LICOS_PROJECT_ID
+}
 
 pipe_to_log() {
   local source="${1:-CLIENT}"
@@ -166,12 +176,13 @@ echo "正在检查依赖命令和目录是否存在..."
 # 检查核心命令
 check_command "npm"
 check_command "pnpm"
-check_command "lsof"
+check_command "nc"
 check_command "bash"
 
 # 端口占用预检查与处理
 ensure_port SERVER_PORT "$SERVER_PORT"
 ensure_port EXPO_PORT "$EXPO_PORT"
+configure_expo_env
 
 echo "==================== 启动 server 服务 ===================="
 echo "正在执行：pnpm run dev (server)"

package/lib/__templates__/expo/.licosproj/scripts/server_dev_run.sh

@@ -4,7 +4,8 @@ ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
 SERVER_DIR="$ROOT_DIR/server"
 LOG_DIR="${LICOS_LOG_DIR:-$ROOT_DIR/logs}"
 LOG_SERVER_FILE="$LOG_DIR/server.log"
-SERVER_PORT="${SERVER_PORT:-9091}"
+SERVER_PORT="${LICOS_BACKEND_PORT:-${SERVER_PORT:-5001}}"
+PROTECTED_PORTS="${LICOS_DEV_PROTECTED_PORTS:-8080 8081 9091}"
 
 mkdir -p "$LOG_DIR"
 
@@ -23,14 +24,21 @@ pipe_to_log() {
 }
 
 kill_old_server() {
-  if command -v lsof &> /dev/null; then
-    local pids
-    pids=$(lsof -t -i tcp:"$SERVER_PORT" -sTCP:LISTEN 2>/dev/null || true)
-    if [ -n "$pids" ]; then
-      echo "正在关闭旧的 server 进程：$pids"
-      kill -9 $pids 2>/dev/null || echo "关闭进程失败：$pids"
-      sleep 1
+  if ! nc -z -w 1 127.0.0.1 "$SERVER_PORT" >/dev/null 2>&1; then
+    return 0
+  fi
+  for protected in $PROTECTED_PORTS; do
+    if [ "$protected" = "$SERVER_PORT" ]; then
+      echo "端口 $SERVER_PORT 是平台保护端口，不会关闭占用进程"
+      return 0
     fi
+  done
+  if [ "${LICOS_DEV_KILL_PORTS:-0}" = "1" ]; then
+    echo "正在关闭旧的 server 端口：$SERVER_PORT"
+    fuser -k "${SERVER_PORT}/tcp" 2>/dev/null || echo "关闭端口进程失败或端口未找到：$SERVER_PORT"
+    sleep 1
+  else
+    echo "端口 $SERVER_PORT 已占用，未启用 LICOS_DEV_KILL_PORTS，跳过自动关闭"
   fi
 }
 

package/lib/__templates__/expo/client/metro.config.js

@@ -32,7 +32,7 @@ config.resolver.blockList = [
   /.*node_modules\/\.pnpm\/.*_tmp_\d+.*/,
 ];
 
-const BACKEND_TARGET = 'http://localhost:9091';
+const BACKEND_TARGET = process.env.EXPO_PUBLIC_BACKEND_BASE_URL || 'http://localhost:5001';
 
 const apiProxy = createProxyMiddleware({
   target: BACKEND_TARGET,

package/lib/__templates__/expo/server/src/index.ts

@@ -2,7 +2,7 @@ import express from "express";
 import cors from "cors";
 
 const app = express();
-const port = process.env.PORT || 9091;
+const port = process.env.PORT || 5001;
 
 // Middleware
 app.use(cors());

package/lib/cli.js

@@ -2107,7 +2107,7 @@ const EventBuilder = {
 };
 
 var name = "@kmlckj/licos-ai-cli";
-var version = "0.0.22";
+var version = "0.0.24";
 var description = "LICOS AI coding workspace CLI - project template engine and dev tools";
 var license = "MIT";
 var author = "kmlckj";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmlckj/licos-ai-cli",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "LICOS AI coding workspace CLI - project template engine and dev tools",
   "license": "MIT",
   "author": "kmlckj",