@coze-arch/cli 0.0.1-alpha.d85d9d → 0.0.1-alpha.dee5d9

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

@@ -1,7 +1,7 @@
 ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
 PREVIEW_DIR="${COZE_PREVIEW_DIR:-/source/preview}"
 LOG_DIR="${COZE_LOG_DIR:-$ROOT_DIR/logs}"
-LOG_FILE="$LOG_DIR/app.log"
+LOG_CLIENT_FILE="$LOG_DIR/client.log"
 mkdir -p "$LOG_DIR"
 
 # ==================== 配置项 ====================
@@ -89,14 +89,17 @@ ensure_port() {
 pipe_to_log() {
   local source="${1:-CLIENT}"
   local raw_log="${2:-}"
-  local line timestamp ts msg record
+  local line clean_line timestamp
   while IFS= read -r line || [ -n "$line" ]; do
+    clean_line=$(printf '%s' "$line" | sed 's/\x1b\[[0-9;]*[mA-Za-z]//g')
+    if echo "$clean_line" | grep -qE '(^(Web|iOS|Android) node_modules/.*expo-router.*entry\.js.*%|^(Web|iOS|Android) Bundled [0-9]+ms node_modules/.*expo-router.*entry\.js|Logs will appear in the browser)'; then
+      continue
+    fi
     if [ -n "$raw_log" ]; then
-      echo "$line" >> "$raw_log"
+      timestamp=$(date '+%Y-%m-%d %H:%M:%S')
+      echo "[$timestamp] $clean_line" >> "$raw_log"
     fi
-    line=$(echo "[$source] $line" | sed 's/\x1b\[[0-9;]*[a-zA-Z]//g; s/\x1b\[[0-9;]*m//g')
-    msg="${line}"
-    echo "$msg"
+    printf '[%s] %s\n' "$source" "$clean_line"
   done
 }
 
@@ -116,10 +119,10 @@ start_expo() {
 
   if [ "$offline" = "1" ]; then
     ( EXPO_OFFLINE=1 EXPO_NO_DEPENDENCY_VALIDATION=1 EXPO_PUBLIC_BACKEND_BASE_URL="$EXPO_PUBLIC_BACKEND_BASE_URL" EXPO_PACKAGER_PROXY_URL="$EXPO_PACKAGER_PROXY_URL" EXPO_PUBLIC_COZE_PROJECT_ID="$EXPO_PUBLIC_COZE_PROJECT_ID" \
-      nohup npx expo start --clear --port "$EXPO_PORT" 2>&1 | pipe_to_log "CLIENT" "$ROOT_DIR/logs/client.log" ) &
+      nohup npx expo start --clear --port "$EXPO_PORT" 2>&1 | pipe_to_log "CLIENT" "$LOG_CLIENT_FILE" ) &
   else
     ( EXPO_NO_DEPENDENCY_VALIDATION=1 EXPO_PUBLIC_BACKEND_BASE_URL="$EXPO_PUBLIC_BACKEND_BASE_URL" EXPO_PACKAGER_PROXY_URL="$EXPO_PACKAGER_PROXY_URL" EXPO_PUBLIC_COZE_PROJECT_ID="$EXPO_PUBLIC_COZE_PROJECT_ID" \
-      nohup npx expo start --clear --port "$EXPO_PORT" 2>&1 | pipe_to_log "CLIENT" "$ROOT_DIR/logs/client.log" ) &
+      nohup npx expo start --clear --port "$EXPO_PORT" 2>&1 | pipe_to_log "CLIENT" "$LOG_CLIENT_FILE" ) &
   fi
   EXPO_PID=$!
   disown $EXPO_PID 2>/dev/null || true
@@ -130,9 +133,9 @@ start_expo() {
 detect_expo_fetch_failed() {
   local timeout="${1:-8}"
   local waited=0
-  local log_file="$ROOT_DIR/logs/client.log"
+  local log_file="$LOG_CLIENT_FILE"
   while [ "$waited" -lt "$timeout" ]; do
-    if [ -f "$log_file" ] && grep -q "TypeError: fetch failed" "$log_file" 2>/dev/null; then
+    if [ -f "$log_file" ] && tail -n 100 "$log_file" 2>/dev/null | grep -q "TypeError: fetch failed"; then
       return 0
     fi
     sleep 1
@@ -166,8 +169,6 @@ check_command "pnpm"
 check_command "lsof"
 check_command "bash"
 
-echo "准备日志目录：$ROOT_DIR/logs"
-mkdir -p "$ROOT_DIR/logs"
 # 端口占用预检查与处理
 ensure_port SERVER_PORT "$SERVER_PORT"
 ensure_port EXPO_PORT "$EXPO_PORT"

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

@@ -2,8 +2,8 @@
 
 ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
 SERVER_DIR="$ROOT_DIR/server"
-LOG_DIR="$ROOT_DIR/logs"
-LOG_FILE="$LOG_DIR/server.log"
+LOG_DIR="${COZE_LOG_DIR:-$ROOT_DIR/logs}"
+LOG_SERVER_FILE="$LOG_DIR/server.log"
 SERVER_PORT="${SERVER_PORT:-9091}"
 
 mkdir -p "$LOG_DIR"
@@ -11,13 +11,14 @@ mkdir -p "$LOG_DIR"
 pipe_to_log() {
   local source="${1:-SERVER}"
   local raw_log="${2:-}"
-  local line
+  local line clean_line timestamp
   while IFS= read -r line || [ -n "$line" ]; do
+    clean_line=$(printf '%s' "$line" | sed 's/\x1b\[[0-9;]*[mA-Za-z]//g')
     if [ -n "$raw_log" ]; then
-      echo "$line" >> "$raw_log"
+      timestamp=$(date '+%Y-%m-%d %H:%M:%S')
+      echo "[$timestamp] $clean_line" >> "$raw_log"
     fi
-    line=$(echo "[$source] $line" | sed 's/\x1b\[[0-9;]*[a-zA-Z]//g; s/\x1b\[[0-9;]*m//g')
-    echo "$line"
+    printf '[%s] %s\n' "$source" "$clean_line"
   done
 }
 
@@ -36,10 +37,10 @@ kill_old_server() {
 echo "==================== Server Dev Run ===================="
 echo "Server 目录：$SERVER_DIR"
 echo "Server 端口：$SERVER_PORT"
-echo "日志文件：$LOG_FILE"
+echo "日志文件：$LOG_SERVER_FILE"
 
 kill_old_server
 
 echo "启动 server 服务..."
 cd "$SERVER_DIR"
-NODE_ENV=development PORT="$SERVER_PORT" npx tsx ./src/index.ts 2>&1 | pipe_to_log "SERVER" "$LOG_FILE"
+NODE_ENV=development PORT="$SERVER_PORT" npx tsx ./src/index.ts 2>&1 | pipe_to_log "SERVER" "$LOG_SERVER_FILE"

package/lib/__templates__/expo/patches/expo@54.0.32.patch

@@ -1,8 +1,8 @@
 diff --git a/src/async-require/hmr.ts b/src/async-require/hmr.ts
-index 33ce50ee2950c40d2b0553b148710f1e24e44f3d..a13d6f2da10dea858019cc991c21753f64f01fd0 100644
+index 33ce50ee2950c40d2b0553b148710f1e24e44f3d..3d78cb02dd7e96ac9727a2935d8178f2c7e95982 100644
 --- a/src/async-require/hmr.ts
 +++ b/src/async-require/hmr.ts
-@@ -216,6 +216,39 @@ const HMRClient: HMRClientNativeInterface = {
+@@ -216,6 +216,40 @@ const HMRClient: HMRClientNativeInterface = {
 
      client.on('update-done', () => {
        hideLoading();
@@ -39,6 +39,7 @@ index 33ce50ee2950c40d2b0553b148710f1e24e44f3d..a13d6f2da10dea858019cc991c21753f
 +          checkServerAndReload(6);
 +        }, 35_000);
 +      }
++      console.log('[HMR] Update done.');
      });
 
      client.on('error', (data: { type: string; message: string }) => {