@danceiny/gotry 0.2.0-rc.31 → 0.2.0-rc.33

package/ts/capabilities/session-search.ts

@@ -17,11 +17,13 @@ import { extensionCookieNames, extensionSearchJob, classifyBridgeFailure, needsE
 import { appendFileSync, mkdirSync } from 'node:fs'
 import { dirname } from 'node:path'
 import { randomUUID } from 'node:crypto'
-import { buildEntryUrl, NETWORK_HINTS, parseBatchSearchResult, LOGIN_COOKIE_NAMES, SITE_DOMAIN, type BatchSearchShape, type SessionFlightOption } from './session/adapters/ctrip-flight.ts'
-import { buildHotelEntryUrl, parseCtripHotelList, HOTEL_SITE_HOST, type SessionHotelOption } from './session/adapters/ctrip-hotel.ts'
+import { resolveFlightEntryUrl, NETWORK_HINTS, parseBatchSearchResult, LOGIN_COOKIE_NAMES, SITE_DOMAIN, type BatchSearchShape, type SessionFlightOption } from './session/adapters/ctrip-flight.ts'
+import { resolveHotelEntryUrl, classifyCtripHotelList, HOTEL_SITE_HOST, type SessionHotelOption } from './session/adapters/ctrip-hotel.ts'
 import { buildTrainEntryUrl, parseLeftTicketQueryResult, resolveTrainQueryTelecodes, validateTrainQueryResponseUrl, TRAIN_SITE_HOST, type SessionTrainOption, type TrainQueryParseOutcome, type TrainResponseBinding } from './session/adapters/rail-12306.ts'
 import { buildDidaEntryUrl, parseDidaRates, parseDidaSearchCache, parseDidaRecommendHotels, parseDidaPrices, DIDA_NETWORK_HINTS, DIDA_SITE_HOST, DIDA_SITE_DOMAIN, DIDA_LOGIN_COOKIE_NAMES, type SessionDidaRateOption } from './session/adapters/dida-portal.ts'
 import { EXTENSION_STORE_URL, type SessionJobHandle, type SniffBodies } from './session/extension-bridge.ts'
+import { runFlightGuiSearch, type GuiCalendarDay } from './session/gui-flight.ts'
+import { runHotelGuiSearch } from './session/gui-hotel.ts'
 
 export type SessionVerdict = 'hit' | 'miss' | 'error' | 'challenged' | 'cooldown' | 'needs-login' | 'needs-attach' | 'needs-extension'
 export type SessionFlightTransportShape = BatchSearchShape | 'sniff_timeout' | 'challenge_page' | 'precheck_unavailable' | 'needs_login' | 'search_job_unavailable'
@@ -38,7 +40,7 @@ function flightBridgeFailureSummary(kind: BridgeFailureKind): string {
 
 export interface SessionSearchResult {
   ok: boolean
-  via: 'session-ctrip-flight' | 'session-ctrip-flight-error'
+  via: 'session-ctrip-flight' | 'session-ctrip-flight-error' | 'session-ctrip-flight-gui' | 'session-ctrip-flight-gui-error'
   evidence: string
   latencyMs: number
   verdict: SessionVerdict
@@ -49,13 +51,25 @@ export interface SessionSearchResult {
   /** needs-extension 时给出 Chrome Web Store URL —— dsh UI 应直接渲成可点链接(浏览器自己当安装器,gotry 不插手) */
   installUrl?: string
   installAction?: 'add-to-chrome'
+  /** 低价日历(GUI 车道匿名可用;#662:该航线哪些日期有票/低价) */
+  calendar?: GuiCalendarDay[]
+  /** GUI 检索后站点落到的 list 页真实 URL(#663 URL 教师) */
+  listUrl?: string
 }
 
 export interface SessionFlightQuery {
   from: string
   to: string
+  fromCityCode?: string
+  toCityCode?: string
   /** YYYY-MM-DD */
   date: string
+  /** 回程日期:存在即往返检索——bridge 车道不知往返 URL 形状(诚实边界,报错指路 GUI);GUI 车道原生支持 */
+  backDate?: string
+  /** 多程段(2–3 段;仅 ui=gui;存在时忽略顶层 from/to/date/backDate) */
+  legs?: Array<{ from: string; to: string; date: string }>
+  /** 登录态配对等待上限 ms(仅 ui=gui;needUserLogin/passport 命中时窗口停官方登录页等人) */
+  interactiveLoginMs?: number
   /** 隔离 profile 目录(测试必传;默认 /tmp 专用目录) */
   profileDir?: string
   headless?: boolean
@@ -139,10 +153,13 @@ export function appendExtensionAudit(auditPath: string | undefined, entry: { kin
 // ---------------------------------------------------------------------------
 
 export interface SessionHotelQuery {
+  /** 登录态配对等待上限 ms(仅 ui=gui;passport 命中时窗口停官方登录页等人) */
+  interactiveLoginMs?: number
   /** 目的地(中文);城市码表未收录时须带 cityId */
   to: string
   /** 显式城市 id(携程/trip.com 酒店 list 页 URL 的 city= 数字;覆盖码表) */
   cityId?: number | string
+  country?: string
   /** YYYY-MM-DD */
   checkIn?: string
   /** YYYY-MM-DD(与 checkIn 成对) */
@@ -161,11 +178,13 @@ export interface SessionHotelQuery {
 
 export interface SessionHotelResult {
   ok: boolean
-  via: 'session-ctrip-hotel' | 'session-ctrip-hotel-error'
+  via: 'session-ctrip-hotel' | 'session-ctrip-hotel-error' | 'session-ctrip-hotel-gui' | 'session-ctrip-hotel-gui-error'
   evidence: string
   latencyMs: number
   verdict: SessionVerdict
   hotels?: SessionHotelOption[]
+  /** GUI 检索后站点落到的 list 页真实 URL */
+  listUrl?: string
   error?: string
   /** needs-extension 时给出 Chrome Web Store URL(dsh UI 渲成可点链接) */
   installUrl?: string
@@ -177,6 +196,41 @@ export function hotelCityUnresolvedHint(cities: string[]): string {
   return `城市 ${cities.join('/')} 不在携程酒店城市码表——先 web 搜「hotels.ctrip.com ${cities[0] ?? ''} 酒店」拿到 list 页 URL 里的 city= 数字,带 cityId 重试`
 }
 
+/** 机票城市三字码未收录时的人话指引(纯函数,测试锚点;码表只是缓存,主链路=显式码逃生口) */
+export function flightCityUnresolvedHint(cities: string[]): string {
+  return `城市 ${cities.join('/')} 不在携程机票三字码表(缓存)——web 搜「flights.ctrip.com ${cities[0] ?? ''} 机票」从 list 页 URL 取三字码(形如 oneway-hkg-dxb),带 fromCityCode/toCityCode 重试;或改走 gotry_web_search`
+}
+
+/**
+ * 携程酒店 GUI 车道(2026-10-14,#664 首片):gotry 隔离匿名窗口驱动 hotels.ctrip.com
+ * 表单(目的地=站点自动补全,cityId 码表退出主链路),结果复用 ctrip-hotel 三态分类器。
+ * 节律闸与 bridge 酒店道同站同桶('ctrip-hotel');匿名公开价,恒标 anonymous。
+ */
+export async function sessionHotelGuiSearch(q: SessionHotelQuery): Promise<SessionHotelResult> {
+  const started = Date.now()
+  const ts = new Date().toISOString()
+  const err = (verdict: SessionVerdict, error: string): SessionHotelResult => ({
+    ok: false, via: 'session-ctrip-hotel-error', evidence: `[会话:ctrip-hotel-gui@error@${ts}] ${error}`, latencyMs: Date.now() - started, verdict, error,
+  })
+
+  const last = lastCallAt.get('ctrip-hotel') ?? 0
+  if (Date.now() - last < MIN_INTERVAL_MS) {
+    return err('cooldown', `rate limit: last call ${Date.now() - last}ms ago, min ${MIN_INTERVAL_MS}ms`)
+  }
+  lastCallAt.set('ctrip-hotel', Date.now())
+
+  if (!q.checkIn || !q.checkOut) {
+    return err('error', 'GUI 车道需要 checkIn/checkOut(YYYY-MM-DD,成对)')
+  }
+  const r = await runHotelGuiSearch({ to: q.to, checkIn: q.checkIn, checkOut: q.checkOut, ...(q.interactiveLoginMs ? { interactiveLoginMs: q.interactiveLoginMs } : {}), ...(q.timeoutMs ? { timeoutMs: Math.max(q.timeoutMs, q.interactiveLoginMs ? q.interactiveLoginMs + 120_000 : 0) } : {}) })
+  return {
+    ok: r.ok, via: r.via, evidence: r.evidence, latencyMs: r.latencyMs, verdict: r.verdict,
+    ...(r.hotels ? { hotels: r.hotels } : {}),
+    ...(r.listUrl ? { listUrl: r.listUrl } : {}),
+    ...(r.error ? { error: r.error } : {}),
+  }
+}
+
 export async function sessionHotelSearch(q: SessionHotelQuery): Promise<SessionHotelResult> {
   const started = Date.now()
   const ts = new Date().toISOString()
@@ -202,13 +256,14 @@ export async function sessionHotelSearch(q: SessionHotelQuery): Promise<SessionH
   if (Date.now() - last < MIN_INTERVAL_MS) {
     return err('cooldown', `rate limit: last call ${Date.now() - last}ms ago, min ${MIN_INTERVAL_MS}ms`)
   }
-  lastCallAt.set(site, Date.now())
-
-  const entry = buildHotelEntryUrl({ to: q.to, cityId: q.cityId, checkIn: q.checkIn, checkOut: q.checkOut, adults: q.adults })
+  const entry = await resolveHotelEntryUrl({ to: q.to, country: q.country, cityId: q.cityId, checkIn: q.checkIn, checkOut: q.checkOut, adults: q.adults })
   if (!entry.ok || !entry.url) {
-    return err('error', hotelCityUnresolvedHint(entry.unresolved ?? [q.to]))
+    return err('error', entry.error ?? hotelCityUnresolvedHint(entry.unresolved ?? [q.to]))
   }
 
+  const resolvedLast = lastCallAt.get(site) ?? 0
+  if (Date.now() - resolvedLast < MIN_INTERVAL_MS) return err('cooldown', `rate limit: min ${MIN_INTERVAL_MS}ms`)
+  lastCallAt.set(site, Date.now())
   const mode = resolveTransportMode(q.profileDir)
 
   if (mode === 'extension') {
@@ -239,10 +294,15 @@ export async function sessionHotelSearch(q: SessionHotelQuery): Promise<SessionH
     }
     const title = r.title
     const head = r.body.slice(0, 5000)
-    if (CHALLENGE_RE.test(title + head)) {
+    if (r.challenge === true || CHALLENGE_RE.test(title + head)) {
       return err('challenged', `风控/验证码命中(title=${title.slice(0, 60)});按红线不重试不绕过,交还用户`)
     }
-    const hotels = parseCtripHotelList(r.body)
+    if (r.timedOut || !r.body) return err('error', '酒店页嗅探超时，未取得报价；本次不能判断无房，请换用其他酒店通道')
+    const parsed = classifyCtripHotelList(r.body)
+    if (parsed.shape === 'malformed' || parsed.shape === 'unrecognized') {
+      return err('error', `酒店回包无法识别（${parsed.shape}），库存查询未完成；本次不能判断无房`)
+    }
+    const hotels = parsed.hotels
     const verdict: SessionVerdict = hotels.length > 0 ? 'hit' : 'miss'
     return {
       ok: true,
@@ -293,7 +353,12 @@ export async function sessionHotelSearch(q: SessionHotelQuery): Promise<SessionH
     if (CHALLENGE_RE.test(title + headHtml)) {
       return err('challenged', `风控/验证码命中(title=${title.slice(0, 60)});按红线不重试不绕过,交还用户`)
     }
-    const hotels = parseCtripHotelList(body)
+    if (!body) return err('error', '酒店页嗅探超时，未取得报价；本次不能判断无房，请换用其他酒店通道')
+    const parsed = classifyCtripHotelList(body)
+    if (parsed.shape === 'malformed' || parsed.shape === 'unrecognized') {
+      return err('error', `酒店回包无法识别（${parsed.shape}），库存查询未完成；本次不能判断无房`)
+    }
+    const hotels = parsed.hotels
     const verdict: SessionVerdict = hotels.length > 0 ? 'hit' : 'miss'
     return {
       ok: true,
@@ -351,6 +416,11 @@ export interface SessionDidaQuery {
    * 远程扩展经鉴权面连入;缺省走 loopback 懒单例(桌面形态)
    */
   bridge?: SessionJobHandle
+  /**
+   * 进程内节律闸的键(AaaS A2):缺省 = 站点,单车道行为不变。多组织形态的挂载模块传 `<组织>/<站点>`,
+   * 一个组织的检索不给另一个组织定节律,另一个组织也读不到「上一次是多久前」。
+   */
+  pacingKey?: string
 }
 
 export interface SessionDidaResult {
@@ -406,12 +476,13 @@ export async function sessionDidaSearch(q: SessionDidaQuery): Promise<SessionDid
     ok: false, via: 'session-dida-portal-error', evidence: `[会话:${site}@error@${ts}] ${error}`, latencyMs: Date.now() - started, verdict, error,
   })
 
-  // 节律闸:超间隔即拒,不发起导航
-  const last = lastCallAt.get(site) ?? 0
+  // 节律闸:超间隔即拒,不发起导航。键缺省是站点;多组织形态按组织分键(见 SessionDidaQuery.pacingKey)
+  const paceKey = q.pacingKey ?? site
+  const last = lastCallAt.get(paceKey) ?? 0
   if (Date.now() - last < MIN_INTERVAL_MS) {
     return err('cooldown', `rate limit: last call ${Date.now() - last}ms ago, min ${MIN_INTERVAL_MS}ms`)
   }
-  lastCallAt.set(site, Date.now())
+  lastCallAt.set(paceKey, Date.now())
 
   const entry = buildDidaEntryUrl({ entryUrl: q.entryUrl })
   if (!entry.ok || !entry.url) {
@@ -757,13 +828,20 @@ export async function sessionFlightSearch(q: SessionFlightQuery): Promise<Sessio
   if (Date.now() - last < MIN_INTERVAL_MS) {
     return err('cooldown', `rate limit: last call ${Date.now() - last}ms ago, min ${MIN_INTERVAL_MS}ms`)
   }
-  lastCallAt.set(site, Date.now())
-
-  const entry = buildEntryUrl(q.from, q.to, q.date)
+  // 往返(2026-10-14 解锁,#663):URL 形状由 GUI 车道教师实测定稿——
+  // round-{code}0-{code}0?depdate=去_回&cabin=y_s(curl 200+往返 title 实证)。
+  if (q.backDate && !(q.date < q.backDate)) {
+    return err('error', `回程日期(${q.backDate})须晚于去程(${q.date})`)
+  }
+  const entry = await resolveFlightEntryUrl(q.from, q.to, q.date, { fromCode: q.fromCityCode, toCode: q.toCityCode }, undefined, q.backDate)
   if (!entry.ok || !entry.url) {
-    return err('error', `unresolved entry: ${(entry.unresolved ?? []).join('/')} 不在城市码表`)
+    return err('error', entry.error ?? '城市解析失败，请确认城市或机场码；不能据此判断航线覆盖')
   }
 
+  // Resolution never consumes inventory pacing; recheck after asynchronous lookup.
+  const resolvedLast = lastCallAt.get(site) ?? 0
+  if (Date.now() - resolvedLast < MIN_INTERVAL_MS) return err('cooldown', `rate limit: min ${MIN_INTERVAL_MS}ms`)
+  lastCallAt.set(site, Date.now())
   const mode = resolveTransportMode(q.profileDir)
 
   if (mode === 'extension') {
@@ -891,3 +969,37 @@ export async function sessionFlightSearch(q: SessionFlightQuery): Promise<Sessio
     await t.close()
   }
 }
+
+/**
+ * 携程机票 GUI 车道(2026-10-14,创始人指示):gotry 自己的隔离匿名 headful 窗口,
+ * 驱动 PC 检索表单(往返/任意城市原生支持——城市解析=站点自动补全,码表退居缓存),
+ * 结果从站点自己的 batchSearch 回包解析。节律闸与 bridge 同站同桶('ctrip-flight')。
+ * 写面红线:动作白名单+提交件黑名单+readback 硬闸(gui-flight.ts 契约)。
+ */
+export async function sessionFlightGuiSearch(q: SessionFlightQuery): Promise<SessionSearchResult> {
+  const started = Date.now()
+  const ts = new Date().toISOString()
+  const err = (verdict: SessionVerdict, error: string): SessionSearchResult => ({
+    ok: false, via: 'session-ctrip-flight-error', evidence: `[会话:ctrip-flight-gui@error@${ts}] ${error}`, latencyMs: Date.now() - started, verdict, error,
+  })
+
+  const last = lastCallAt.get('ctrip-flight') ?? 0
+  if (Date.now() - last < MIN_INTERVAL_MS) {
+    return err('cooldown', `rate limit: last call ${Date.now() - last}ms ago, min ${MIN_INTERVAL_MS}ms`)
+  }
+  lastCallAt.set('ctrip-flight', Date.now())
+
+  if (q.backDate && !(q.date < q.backDate)) {
+    return err('error', `回程日期(${q.backDate})须晚于去程(${q.date})`)
+  }
+
+  const r = await runFlightGuiSearch({ from: q.from, to: q.to, date: q.date, ...(q.backDate ? { backDate: q.backDate } : {}), ...(q.legs ? { legs: q.legs } : {}), ...(q.interactiveLoginMs ? { interactiveLoginMs: q.interactiveLoginMs } : {}), ...(q.timeoutMs ? { timeoutMs: Math.max(q.timeoutMs, q.interactiveLoginMs ? q.interactiveLoginMs + 120_000 : 0) } : {}) })
+  return {
+    ok: r.ok, via: r.via, evidence: r.evidence, latencyMs: r.latencyMs,
+    verdict: r.verdict,
+    ...(r.options ? { options: r.options } : {}),
+    ...(r.calendar && r.calendar.length > 0 ? { calendar: r.calendar } : {}),
+    ...(r.listUrl ? { listUrl: r.listUrl } : {}),
+    ...(r.error ? { error: r.error } : {}),
+  }
+}