fix: 晚子时排盘错误 + async事件循环阻塞 + 输入校验

P0 晚子时bug: hour24ToTimeIndex把23点映射成0(早子时),iztro时辰索引
实为0~12(12=晚子时),导致23:00-23:59出生用户日柱错一天、整盘错误
(实测1990-06-15 23:30女: 错盘命宫破军 → 正确太阳)。改为23点返回12,
由iztro自行处理跨日。新增test_late_zi_hour.js回归测试。

P1: 四个排盘端点从async def改为def(FastAPI线程池),消除同步
subprocess.run阻塞uvicorn事件循环导致的全服务卡顿。

小项: 排盘subprocess调用抽成run_ziwei_calculation helper(消除×4重复);
gender用Literal['男','女']校验; target_year默认值改为动态当前年;
CORS allow_credentials关闭(与通配origins组合无效)。

🦊 Generated with Sisi

app.py

@@ -8,7 +8,7 @@ Updated: 2026-02-03 (🌟 v4.0 巴纳姆效果+六亲分析+10步批命流程！
 from fastapi import FastAPI, HTTPException
 from fastapi.middleware.cors import CORSMiddleware
 from pydantic import BaseModel, Field
-from typing import Optional, Dict, Any
+from typing import Literal, Optional, Dict, Any
 import subprocess
 import json
 from datetime import datetime
@@ -29,7 +29,7 @@ app = FastAPI(
 app.add_middleware(
     CORSMiddleware,
     allow_origins=["*"],
-    allow_credentials=True,
+    allow_credentials=False,
     allow_methods=["*"],
     allow_headers=["*"],
 )
@@ -39,11 +39,43 @@ class ZiweiRequest(BaseModel):
     """紫微斗数计算请求"""
     birth_date: str = Field(..., description="出生日期 YYYY-MM-DD", example="2000-01-01")
     birth_time: str = Field(..., description="出生时间 HH:MM", example="14:30")
-    gender: str = Field(..., description="性别: 男/女", example="男")
+    gender: Literal['男', '女'] = Field(..., description="性别: 男/女", example="男")
     is_leap_month: bool = Field(default=False, description="是否闰月")
     fix_leap: bool = Field(default=True, description="是否修正闰月")
 
 
+def run_ziwei_calculation(request: BaseModel) -> Dict[str, Any]:
+    """调用Node.js iztro服务进行基础排盘,返回命盘dict
+
+    接受ZiweiRequest或MonthlyFortuneRequest(共享排盘字段)。
+    统一处理subprocess调用、returncode检查和JSON解析,
+    失败时直接抛出HTTPException。
+    """
+    input_data = {
+        "birth_date": request.birth_date,
+        "birth_time": request.birth_time,
+        "gender": request.gender,
+        "is_leap_month": request.is_leap_month,
+        "fix_leap": request.fix_leap
+    }
+
+    result = subprocess.run(
+        ['node', 'ziwei_service.js'],
+        input=json.dumps(input_data),
+        capture_output=True,
+        text=True,
+        timeout=10
+    )
+
+    if result.returncode != 0:
+        raise HTTPException(
+            status_code=500,
+            detail=f"Ziwei calculation error: {result.stderr}"
+        )
+
+    return json.loads(result.stdout)
+
+
 class ZiweiResponse(BaseModel):
     """紫微斗数计算响应"""
     status: str
@@ -155,7 +187,7 @@ def root():
 
 
 @app.post("/calculate-ziwei", response_model=ZiweiResponse)
-async def calculate_ziwei(request: ZiweiRequest):
+def calculate_ziwei(request: ZiweiRequest):
     """
     计算紫微斗数命盘
 
@@ -163,32 +195,7 @@ async def calculate_ziwei(request: ZiweiRequest):
     完整的紫微斗数排盘与AI智能分析
     """
     try:
-        # 将请求数据传递给Node.js服务
-        input_data = {
-            "birth_date": request.birth_date,
-            "birth_time": request.birth_time,
-            "gender": request.gender,
-            "is_leap_month": request.is_leap_month,
-            "fix_leap": request.fix_leap
-        }
-
-        # 调用Node.js脚本
-        result = subprocess.run(
-            ['node', 'ziwei_service.js'],
-            input=json.dumps(input_data),
-            capture_output=True,
-            text=True,
-            timeout=10
-        )
-
-        if result.returncode != 0:
-            raise HTTPException(
-                status_code=500,
-                detail=f"Ziwei calculation error: {result.stderr}"
-            )
-
-        # 解析结果
-        ziwei_data = json.loads(result.stdout)
+        ziwei_data = run_ziwei_calculation(request)
 
         return ZiweiResponse(
             status="success",
@@ -204,7 +211,7 @@ async def calculate_ziwei(request: ZiweiRequest):
 
 
 @app.post("/analyze-ziwei-enhanced", response_model=ZiweiResponse)
-async def analyze_ziwei_enhanced(request: ZiweiRequest):
+def analyze_ziwei_enhanced(request: ZiweiRequest):
     """
     增强版紫微斗数分析 - 包含四化飞星和AI解读
 
@@ -213,31 +220,7 @@ async def analyze_ziwei_enhanced(request: ZiweiRequest):
     """
     try:
         # 1. 首先调用基础排盘功能
-        input_data = {
-            "birth_date": request.birth_date,
-            "birth_time": request.birth_time,
-            "gender": request.gender,
-            "is_leap_month": request.is_leap_month,
-            "fix_leap": request.fix_leap
-        }
-
-        # 调用Node.js脚本获取基础命盘
-        result = subprocess.run(
-            ['node', 'ziwei_service.js'],
-            input=json.dumps(input_data),
-            capture_output=True,
-            text=True,
-            timeout=10
-        )
-
-        if result.returncode != 0:
-            raise HTTPException(
-                status_code=500,
-                detail=f"Ziwei calculation error: {result.stderr}"
-            )
-
-        # 解析基础命盘数据
-        ziwei_chart = json.loads(result.stdout)
+        ziwei_chart = run_ziwei_calculation(request)
 
         # 2. 四化飞星分析
         sihua_analyzer = SihuaAnalyzer(ziwei_chart)
@@ -276,7 +259,7 @@ async def analyze_ziwei_enhanced(request: ZiweiRequest):
 
 
 @app.post("/analyze-ziwei-knowledge-enhanced", response_model=ZiweiResponse)
-async def analyze_ziwei_knowledge_enhanced(request: ZiweiRequest):
+def analyze_ziwei_knowledge_enhanced(request: ZiweiRequest):
     """
     知识库增强版紫微斗数分析 v4.0 🔮✨💕
 
@@ -299,29 +282,7 @@ async def analyze_ziwei_knowledge_enhanced(request: ZiweiRequest):
     """
     try:
         # 1. 基础排盘
-        input_data = {
-            "birth_date": request.birth_date,
-            "birth_time": request.birth_time,
-            "gender": request.gender,
-            "is_leap_month": request.is_leap_month,
-            "fix_leap": request.fix_leap
-        }
-
-        result = subprocess.run(
-            ['node', 'ziwei_service.js'],
-            input=json.dumps(input_data),
-            capture_output=True,
-            text=True,
-            timeout=10
-        )
-
-        if result.returncode != 0:
-            raise HTTPException(
-                status_code=500,
-                detail=f"Ziwei calculation error: {result.stderr}"
-            )
-
-        ziwei_chart = json.loads(result.stdout)
+        ziwei_chart = run_ziwei_calculation(request)
 
         # 2. 四化飞星分析
         sihua_analyzer = SihuaAnalyzer(ziwei_chart)
@@ -400,14 +361,14 @@ async def analyze_ziwei_knowledge_enhanced(request: ZiweiRequest):
 
 
 @app.post("/analyze-ziwei-v4", response_model=ZiweiResponse)
-async def analyze_ziwei_v4(request: ZiweiRequest):
+def analyze_ziwei_v4(request: ZiweiRequest):
     """
     v4.0 巴纳姆温暖版 - 别名端点
 
     等同于 /analyze-ziwei-knowledge-enhanced (已升级到v4.0)
     保留此端点是为了向后兼容
     """
-    return await analyze_ziwei_knowledge_enhanced(request)
+    return analyze_ziwei_knowledge_enhanced(request)
 
 
 @app.get("/debug/modules")
@@ -459,14 +420,14 @@ class MonthlyFortuneRequest(BaseModel):
     """流月运势请求"""
     birth_date: str = Field(..., description="出生日期 YYYY-MM-DD", example="2000-01-01")
     birth_time: str = Field(..., description="出生时间 HH:MM", example="14:30")
-    gender: str = Field(..., description="性别: 男/女", example="男")
+    gender: Literal['男', '女'] = Field(..., description="性别: 男/女", example="男")
     is_leap_month: bool = Field(default=False, description="是否闰月")
     fix_leap: bool = Field(default=True, description="是否修正闰月")
-    target_year: int = Field(default=2026, description="目标年份", example=2026)
+    target_year: int = Field(default_factory=lambda: datetime.now().year, description="目标年份(默认当前年)", example=2026)
 
 
 @app.post("/analyze-monthly-fortune", response_model=ZiweiResponse)
-async def analyze_monthly_fortune(request: MonthlyFortuneRequest):
+def analyze_monthly_fortune(request: MonthlyFortuneRequest):
     """
     流月运势预测 v1.0 🌟✨ (NEW!)
 
@@ -482,29 +443,7 @@ async def analyze_monthly_fortune(request: MonthlyFortuneRequest):
     """
     try:
         # 1. 基础排盘
-        input_data = {
-            "birth_date": request.birth_date,
-            "birth_time": request.birth_time,
-            "gender": request.gender,
-            "is_leap_month": request.is_leap_month,
-            "fix_leap": request.fix_leap
-        }
-
-        result = subprocess.run(
-            ['node', 'ziwei_service.js'],
-            input=json.dumps(input_data),
-            capture_output=True,
-            text=True,
-            timeout=10
-        )
-
-        if result.returncode != 0:
-            raise HTTPException(
-                status_code=500,
-                detail=f"Ziwei calculation error: {result.stderr}"
-            )
-
-        ziwei_chart = json.loads(result.stdout)
+        ziwei_chart = run_ziwei_calculation(request)
 
         # 2. 流月分析
         liuyue_analyzer = LiuyueAnalyzer(ziwei_chart)

test_late_zi_hour.js

@@ -0,0 +1,71 @@
+/**
+ * 晚子时(23:00-23:59)排盘回归测试
+ *
+ * iztro 时辰索引为 0~12,其中 12 = 晚子时(23:00-00:00)。
+ * bug: hour24ToTimeIndex 曾把 23 点映射成 0(早子时),
+ * 导致 23:00-23:59 出生的用户日柱/命盘全部错误。
+ *
+ * 用例(1990-06-15 女):
+ *   23:30 出生 → 晚子时 index 12 → 日柱 壬子,命宫主星 太阳
+ *   00:30 出生 → 早子时 index 0  → 日柱 辛亥,命宫主星 破军
+ *
+ * 运行: node test_late_zi_hour.js
+ */
+
+const { spawnSync } = require('child_process');
+
+function runService(birthTime) {
+  const input = JSON.stringify({
+    birth_date: '1990-06-15',
+    birth_time: birthTime,
+    gender: '女',
+    is_leap_month: false,
+    fix_leap: true,
+  });
+  const result = spawnSync('node', ['ziwei_service.js'], {
+    input,
+    encoding: 'utf-8',
+    cwd: __dirname,
+    timeout: 15000,
+  });
+  if (result.status !== 0) {
+    throw new Error(`ziwei_service.js failed: ${result.stderr}`);
+  }
+  return JSON.parse(result.stdout);
+}
+
+function pick(data) {
+  const mingGong = data.palaces.find((p) => p.name === '命宫');
+  return {
+    day_pillar: data.chart.chinese_date.split(' ')[2],
+    ming_gong_stars: mingGong.major_stars.map((s) => s.name),
+  };
+}
+
+let failures = 0;
+
+function check(label, actual, expected) {
+  const ok = JSON.stringify(actual) === JSON.stringify(expected);
+  console.log(`${ok ? '✅ PASS' : '❌ FAIL'} ${label}: expected ${JSON.stringify(expected)}, got ${JSON.stringify(actual)}`);
+  if (!ok) failures++;
+}
+
+// 用例1: 23:30 出生 → 晚子时(index 12),日柱应为次日壬子,命宫主星太阳
+const lateZi = pick(runService('23:30'));
+check('23:30 日柱(晚子时)', lateZi.day_pillar, '壬子');
+check('23:30 命宫主星', lateZi.ming_gong_stars, ['太阳']);
+
+// 用例2: 00:30 出生 → 早子时(index 0),日柱辛亥,命宫主星破军(保持不变)
+const earlyZi = pick(runService('00:30'));
+check('00:30 日柱(早子时)', earlyZi.day_pillar, '辛亥');
+check('00:30 命宫主星', earlyZi.ming_gong_stars, ['破军']);
+
+// 用例3: 非子时时辰不受影响 — 14:30 未时
+const weiShi = runService('14:30');
+check('14:30 时辰索引(未时)', weiShi.chart.earthly_branch_index, 7);
+
+if (failures > 0) {
+  console.error(`\n${failures} test(s) failed`);
+  process.exit(1);
+}
+console.log('\nAll tests passed 🦊');

ziwei_service.js

@@ -7,13 +7,15 @@ const iztro = require('iztro');
 const astro = iztro.astro;
 
 /**
- * 将24小时制转换为12时辰索引 (0-11)
- * 子(0): 23-01, 丑(1): 01-03, 寅(2): 03-05, 卯(3): 05-07
+ * 将24小时制转换为iztro时辰索引 (0-12)
+ * 早子(0): 00-01, 丑(1): 01-03, 寅(2): 03-05, 卯(3): 05-07
  * 辰(4): 07-09, 巳(5): 09-11, 午(6): 11-13, 未(7): 13-15
  * 申(8): 15-17, 酉(9): 17-19, 戌(10): 19-21, 亥(11): 21-23
+ * 晚子(12): 23-00 — iztro用12区分晚子时并自行处理跨日日柱
  */
 function hour24ToTimeIndex(hour24) {
-  if (hour24 >= 23 || hour24 < 1) return 0;  // 子时
+  if (hour24 >= 23) return 12;               // 晚子时
+  if (hour24 < 1) return 0;                  // 早子时
   if (hour24 >= 1 && hour24 < 3) return 1;   // 丑时
   if (hour24 >= 3 && hour24 < 5) return 2;   // 寅时
   if (hour24 >= 5 && hour24 < 7) return 3;   // 卯时