@danceiny/gotry 0.0.1-rc.18 → 0.0.1-rc.19

package/dist/capabilities/effect.js

@@ -1,9 +1,76 @@
 import { CircuitBreaker, withRetry } from './resilience.js';
 import { flyaiSearch } from './flyai.js';
 import { checkAvail, hotelRates, searchHotels } from './hbcli.js';
-import { sessionFlightSearch } from './session-search.js';
+import { sessionFlightSearch, sessionHotelSearch, sessionTrainSearch } from './session-search.js';
 import { geocodePlace, getClimate, getForecast } from './weather.js';
 import { verifyFlight } from './opensky.js';
+import { anythingSearch } from './anything.js';
+import { continentListUrl, countryPageUrl, extractVisaSection, fetchVisaPolicyPage, listCountryPaths, policyFactsFromMfa } from './visa-policy.js';
+import { readUrl, reach, reachStatus } from './agent-reach.js';
+import { githubSearch, videoSubtitle } from './agent-reach-deep.js';
+import { sessionLogin } from './session-login.js';
+async function fetchVisaPolicyEntries(p) {
+    const started = Date.now();
+    const fetchedAt = new Date().toISOString();
+    const countries = [];
+    const facts = [];
+    const targets = [];
+    if (p.country) {
+        targets.push({
+            continent: p.continent ?? 'yz_645708',
+            country: p.country
+        });
+    } else if (p.continent) {
+        const listUrl = continentListUrl(p.continent);
+        if (!listUrl) return {
+            ok: false,
+            via: 'visa-policy-error',
+            evidence: `[visa-policy@${fetchedAt}] 非法洲路径`,
+            latencyMs: 0,
+            facts: [],
+            countries: [],
+            error: 'invalid_continent'
+        };
+        const page = await fetchVisaPolicyPage(listUrl, p.timeoutMs);
+        if (!page.ok || !page.html) return {
+            ok: false,
+            via: 'visa-policy-error',
+            evidence: `[visa-policy@${fetchedAt}] 洲列表抓取失败: ${page.error ?? '?'}`,
+            latencyMs: 0,
+            facts: [],
+            countries: [],
+            error: page.error
+        };
+        for (const c of listCountryPaths(page.html, p.continent).slice(0, Math.max(1, Math.min(10, p.limit ?? 10))))targets.push({
+            continent: p.continent,
+            country: c
+        });
+    }
+    for (const t of targets){
+        const url = countryPageUrl(t.continent, t.country);
+        if (!url) continue;
+        const page = await fetchVisaPolicyPage(url, p.timeoutMs);
+        countries.push(t.country);
+        if (!page.ok || !page.html) continue;
+        const section = extractVisaSection(page.html);
+        if (!section) continue;
+        facts.push(...policyFactsFromMfa({
+            countryLabel: t.country,
+            countryPath: t.country,
+            section,
+            fetchedAt
+        }));
+    }
+    const evidence = facts.length > 0 ? `[visa-policy:cs-mfa@${fetchedAt}] ${facts.length} 条政策事实(抓取 ${countries.length} 国)` : `[visa-policy@${fetchedAt}] 0 条(页面缺「签证入境」章节或抓取失败;不落负事实)`;
+    return {
+        ok: true,
+        via: 'cs-mfa',
+        evidence,
+        latencyMs: Date.now() - started,
+        facts,
+        countries
+    };
+}
 const DEFAULT_HANDLERS = {
     FLYAI_SEARCH: (p)=>flyaiSearch(p),
     HBCLI_HOTEL_SEARCH: (p)=>searchHotels({
@@ -35,6 +102,8 @@ const DEFAULT_HANDLERS = {
             timeoutMs: p.timeoutMs
         }),
     SESSION_FLIGHT_SEARCH: (p)=>sessionFlightSearch(p),
+    SESSION_HOTEL_SEARCH: (p)=>sessionHotelSearch(p),
+    SESSION_TRAIN_SEARCH: (p)=>sessionTrainSearch(p),
     WEATHER_GEOCODE: (p)=>geocodePlace(p.name, {
             count: p.count,
             timeoutMs: p.timeoutMs
@@ -52,7 +121,24 @@ const DEFAULT_HANDLERS = {
         }, p.month, {
             timeoutMs: p.timeoutMs
         }),
-    OPENSKY_FLIGHT_VERIFY: (p)=>verifyFlight(p)
+    OPENSKY_FLIGHT_VERIFY: (p)=>verifyFlight(p),
+    ANYTHING_SEARCH: (p)=>anythingSearch(p),
+    WEB_READ: (p)=>readUrl({
+            url: p.url,
+            timeoutMs: p.timeoutMs
+        }),
+    GITHUB_SEARCH: (p)=>githubSearch(p),
+    VIDEO_SUBTITLE: (p)=>videoSubtitle(p),
+    AGENT_REACH: (p)=>p.action === 'status' || !p.action && !p.channel ? reachStatus(p.timeoutMs) : reach({
+            channel: p.channel ?? '',
+            method: p.method ?? '',
+            args: p.args,
+            timeoutMs: p.timeoutMs
+        }),
+    SESSION_LOGIN: (p)=>sessionLogin({
+            waitMs: typeof p.waitSeconds === 'number' ? p.waitSeconds * 1000 : undefined
+        }),
+    VISA_POLICY_FETCH: (p)=>fetchVisaPolicyEntries(p)
 };
 const defaultIsFailure = (r)=>r?.ok === false;
 const flyaiTransient = (msg)=>msg.length > 0 && !/Sentinel/i.test(msg) && /timeout|timed out|ECONNRESET|ECONNREFUSED|ETIMEDOUT|socket|HTTP 5/i.test(msg);
@@ -65,6 +151,15 @@ const API_BREAKER = {
     failureThreshold: 3,
     openMs: 30_000
 };
+const hbcliTimeout = (r)=>{
+    const msg = String((r ?? {}).error ?? '');
+    return msg.length > 0 && /timeout/i.test(msg);
+};
+const HBCLI_RETRY = {
+    maxAttempts: 2,
+    baseDelayMs: 300,
+    maxDelayMs: 1_000
+};
 const SPECS = {
     FLYAI_SEARCH: {
         channel: 'cli',
@@ -85,7 +180,8 @@ const SPECS = {
     },
     HBCLI_HOTEL_SEARCH: {
         channel: 'cli',
-        retry: null,
+        retry: HBCLI_RETRY,
+        isRetryable: (r)=>hbcliTimeout(r),
         breaker: {
             failureThreshold: 3,
             openMs: 60_000
@@ -94,7 +190,8 @@ const SPECS = {
     },
     HBCLI_HOTEL_RATES: {
         channel: 'cli',
-        retry: null,
+        retry: HBCLI_RETRY,
+        isRetryable: (r)=>hbcliTimeout(r),
         breaker: {
             failureThreshold: 3,
             openMs: 60_000
@@ -103,7 +200,8 @@ const SPECS = {
     },
     HBCLI_CHECK_AVAIL: {
         channel: 'cli',
-        retry: null,
+        retry: HBCLI_RETRY,
+        isRetryable: (r)=>hbcliTimeout(r),
         breaker: {
             failureThreshold: 3,
             openMs: 60_000
@@ -116,6 +214,18 @@ const SPECS = {
         breaker: null,
         isFailure: defaultIsFailure
     },
+    SESSION_HOTEL_SEARCH: {
+        channel: 'browser',
+        retry: null,
+        breaker: null,
+        isFailure: defaultIsFailure
+    },
+    SESSION_TRAIN_SEARCH: {
+        channel: 'browser',
+        retry: null,
+        breaker: null,
+        isFailure: defaultIsFailure
+    },
     WEATHER_GEOCODE: {
         channel: 'api',
         retry: API_RETRY,
@@ -140,6 +250,69 @@ const SPECS = {
         breaker: API_BREAKER,
         isRetryable: (_r, e)=>e != null || (_r ?? {}).verdict === 'unavailable',
         isFailure: (r)=>r.via === 'opensky-error'
+    },
+    ANYTHING_SEARCH: {
+        channel: 'cli',
+        retry: HBCLI_RETRY,
+        isRetryable: (r)=>hbcliTimeout(r),
+        breaker: {
+            failureThreshold: 3,
+            openMs: 60_000
+        },
+        isFailure: (r)=>r.via === 'hbcli-anything-error'
+    },
+    WEB_READ: {
+        channel: 'api',
+        retry: API_RETRY,
+        breaker: API_BREAKER,
+        isFailure: (r)=>r.via === 'r.jina.ai-error'
+    },
+    GITHUB_SEARCH: {
+        channel: 'cli',
+        retry: HBCLI_RETRY,
+        isRetryable: (r)=>r.verdict === 'timeout',
+        breaker: {
+            failureThreshold: 3,
+            openMs: 60_000
+        },
+        isFailure: (r)=>{
+            const v = r.verdict;
+            return v === 'error' || v === 'timeout';
+        }
+    },
+    VIDEO_SUBTITLE: {
+        channel: 'cli',
+        retry: HBCLI_RETRY,
+        isRetryable: (r)=>r.verdict === 'timeout',
+        breaker: {
+            failureThreshold: 3,
+            openMs: 60_000
+        },
+        isFailure: (r)=>{
+            const v = r.verdict;
+            return v === 'error' || v === 'timeout';
+        }
+    },
+    AGENT_REACH: {
+        channel: 'cli',
+        retry: null,
+        breaker: null,
+        isFailure: (r)=>r.verdict === 'error'
+    },
+    SESSION_LOGIN: {
+        channel: 'browser',
+        retry: null,
+        breaker: null,
+        isFailure: defaultIsFailure
+    },
+    VISA_POLICY_FETCH: {
+        channel: 'api',
+        retry: null,
+        breaker: {
+            failureThreshold: 2,
+            openMs: 300_000
+        },
+        isFailure: defaultIsFailure
     }
 };
 export function declinedObservation(effect, trace) {

package/dist/capabilities/flyai.js

@@ -150,6 +150,19 @@ export async function flyaiSearch(q) {
     });
     const latencyMs = Date.now() - started;
     if (r.error || r.code !== 0) {
+        const upstream = `${r.stderr}\n${r.stdout}`;
+        if (/Trial limit reached|HTTP\s*429|\b429\b/.test(upstream)) {
+            return {
+                ...base,
+                latencyMs,
+                ok: false,
+                via: 'flyai-error',
+                verdict: 'needs-setup',
+                evidence: `[实时API:flyai@error@${ts}] trial quota exhausted`,
+                error: `FlyAI 匿名试用额度已用尽(上游 429):${upstream.replace(/\s+/g, ' ').slice(0, 160)}`,
+                setup: 'FlyAI 试用额度达限——到 flyai.open.fliggy.com 控制台申请正式 API Key,配入环境变量 FLYAI_API_KEY 即恢复;本会话请勿重试 gotry_flyai_search,机/火/酒改走 gotry_session_search(账号会话)或 web 检索推进。'
+            };
+        }
         return {
             ...base,
             latencyMs,

package/dist/capabilities/session/adapters/ctrip-hotel.js

@@ -0,0 +1,207 @@
+const HOTEL_CITY_CODES = {
+    上海: '2',
+    北京: '1',
+    广州: '32',
+    深圳: '30',
+    成都: '28',
+    杭州: '17',
+    南京: '12',
+    苏州: '14',
+    无锡: '13',
+    扬州: '15',
+    镇江: '16',
+    青岛: '7',
+    厦门: '25',
+    珠海: '31',
+    三亚: '43',
+    海口: '42',
+    桂林: '33',
+    昆明: '34',
+    大理: '36',
+    丽江: '37',
+    西双版纳: '35',
+    贵阳: '38',
+    拉萨: '41',
+    乌鲁木齐: '39',
+    太原: '105',
+    长春: '158',
+    南通: '82',
+    敦煌: '11',
+    舟山: '19',
+    张家界: '27',
+    黄山市: '23',
+    九江: '24',
+    武夷山: '26',
+    迪拜: '220'
+};
+export function buildHotelEntryUrl(q) {
+    const unresolved = [];
+    const cityId = String(q.cityId ?? '').trim() || HOTEL_CITY_CODES[q.to.trim()];
+    if (!cityId) unresolved.push(q.to);
+    if (unresolved.length > 0) {
+        return {
+            ok: false,
+            unresolved
+        };
+    }
+    const params = new URLSearchParams({
+        city: cityId
+    });
+    if (q.checkIn) params.set('checkin', q.checkIn);
+    if (q.checkOut) params.set('checkout', q.checkOut);
+    if (q.adults && q.adults > 0) params.set('adult', String(q.adults));
+    return {
+        ok: true,
+        url: `https://hotels.ctrip.com/hotels/list?${params.toString()}`
+    };
+}
+export const HOTEL_NETWORK_HINTS = [
+    /hotels\.ctrip\.com\/(hotels\/api|domestic\/pc\/api)/i,
+    /GetHotelListBySOA|GetHotelListByCity|HotelSearch|hotelsearch/i,
+    /restapi\/soa2\/\d+\/fetchHotelList/i
+];
+export function looksLikeHotelListBody(body) {
+    if (!body || body.length > 2_000_000) return false;
+    return /"hotelList"|"hotelMatchInfos"|"hotelName"/.test(body);
+}
+export const HOTEL_SITE_HOST = 'hotels.ctrip.com';
+function hotelSignature(o) {
+    const name = o.hotelName ?? o.name ?? o.hotelNameEn;
+    if (typeof name !== 'string' || !name.trim()) return null;
+    let price;
+    let priceRaw;
+    if (typeof o.price === 'number' && o.price > 0) price = o.price;
+    else if (typeof o.price === 'string' && o.price.trim()) priceRaw = o.price.trim();
+    const probe = (v, seen = new Set())=>{
+        if (v == null || typeof v !== 'object') return;
+        if (seen.has(v)) return;
+        seen.add(v);
+        for (const [k, child] of Object.entries(v)){
+            if (/^(avgPrice|totalPrice|price|amount|total|startPrice)$/i.test(k) && typeof child === 'number' && child > 0 && price === undefined) price = child;
+            else if (/^(price|priceDisplay|amountText)$/i.test(k) && typeof child === 'string' && child.trim() && priceRaw === undefined) priceRaw = child.trim();
+            else probe(child, seen);
+        }
+    };
+    probe(o.priceInfo);
+    const flatPrice = o.totalPrice ?? o.avgPrice ?? o.minPrice;
+    if (typeof flatPrice === 'number' && flatPrice > 0 && price === undefined) price = flatPrice;
+    const flatRaw = o.priceText ?? o.priceDisplay;
+    if (typeof flatRaw === 'string' && flatRaw.trim() && priceRaw === undefined) priceRaw = flatRaw.trim();
+    if (price === undefined && priceRaw === undefined) return null;
+    const starRaw = o.star ?? o.level ?? o.hotelStar;
+    const star = typeof starRaw === 'number' && starRaw > 0 ? starRaw : Number.isFinite(Number(starRaw)) && Number(starRaw) > 0 ? Number(starRaw) : undefined;
+    const scoreRaw = o.score ?? o.commentScore ?? o.reviewScore;
+    const score = scoreRaw == null ? undefined : String(scoreRaw);
+    const pos = o.position;
+    const address = (typeof pos?.address === 'string' ? pos.address : undefined) ?? (typeof o.address === 'string' ? o.address : undefined);
+    const hotelId = (typeof o.hotelId === 'number' || typeof o.hotelId === 'string' ? String(o.hotelId) : undefined) ?? (typeof o.hotelIdStr === 'string' ? o.hotelIdStr : undefined);
+    return {
+        name: name.trim(),
+        price,
+        priceRaw,
+        star,
+        score,
+        address,
+        hotelId
+    };
+}
+function ctripStructuredCandidate(item) {
+    const info = item.hotelInfo;
+    const summary = info?.summary ?? item;
+    const nameInfo = summary.nameInfo;
+    const names = nameInfo?.names;
+    const nameRaw = nameInfo?.name ?? (Array.isArray(names) && names.length > 0 ? names[0] : undefined) ?? summary.hotelName ?? summary.name;
+    if (typeof nameRaw !== 'string' || !nameRaw.trim()) return null;
+    let price;
+    let priceRaw;
+    let encrypted = false;
+    const rooms = info?.roomInfo ?? item.roomInfo;
+    if (Array.isArray(rooms)) {
+        for (const room of rooms){
+            if (room == null || typeof room !== 'object') continue;
+            const pi = room.priceInfo;
+            if (!pi) continue;
+            if (typeof pi.price === 'number' && pi.price > 0) price = price === undefined ? pi.price : Math.min(price, pi.price);
+            if (typeof pi.price === 'string' && pi.price.trim() && !priceRaw) priceRaw = pi.price.trim();
+            if (typeof pi.displayPrice === 'string' && pi.displayPrice.trim() && !priceRaw) priceRaw = pi.displayPrice.trim();
+            if (pi.priceToken != null && pi.price === undefined) encrypted = true;
+        }
+    }
+    if (price === undefined && !priceRaw) {
+        const priceProbe = (v, depth, seen)=>{
+            if (price !== undefined || depth > 6 || v == null || typeof v !== 'object' || seen.has(v)) return;
+            seen.add(v);
+            for (const [k, child] of Object.entries(v)){
+                if (/^(price|avgPrice|totalPrice|minPrice|amount)$/i.test(k) && typeof child === 'number' && child > 0) {
+                    price = child;
+                    return;
+                }
+                if (/^(price|displayPrice|amountText)$/i.test(k) && typeof child === 'string' && child.trim()) {
+                    priceRaw = priceRaw ?? child.trim();
+                    continue;
+                }
+                priceProbe(child, depth + 1, seen);
+            }
+        };
+        priceProbe(item, 0, new Set());
+    }
+    if (price === undefined && !priceRaw && !encrypted) return null;
+    const starOf = summary.hotelStar;
+    const starRaw = starOf?.star ?? summary.star;
+    const star = typeof starRaw === 'number' && starRaw > 0 ? starRaw : undefined;
+    const scoreRaw = (info?.commentInfo ?? summary.commentInfo)?.commentScore;
+    const pos = summary.positionInfo;
+    const address = (typeof pos?.address === 'string' ? pos.address : undefined) ?? (typeof summary.address === 'string' ? summary.address : undefined);
+    const hotelId = summary.hotelId != null ? String(summary.hotelId) : undefined;
+    return {
+        name: nameRaw.trim(),
+        price,
+        priceRaw,
+        star,
+        score: scoreRaw == null ? undefined : String(scoreRaw),
+        address,
+        hotelId
+    };
+}
+export function parseCtripHotelList(body, opts = {}) {
+    let raw;
+    try {
+        raw = JSON.parse(body);
+    } catch  {
+        return [];
+    }
+    const out = [];
+    const maxItems = opts.maxItems ?? 20;
+    const walk = (node, depth, seen)=>{
+        if (out.length >= maxItems || depth > 12 || node == null || typeof node !== 'object' || seen.has(node)) return;
+        if (Array.isArray(node)) {
+            for (const item of node){
+                if (out.length >= maxItems) return;
+                if (item == null || typeof item !== 'object' || Array.isArray(item)) continue;
+                const cand = hotelSignature(item) ?? ctripStructuredCandidate(item);
+                if (!cand) continue;
+                out.push({
+                    name: cand.name,
+                    price: cand.price ?? 0,
+                    priceRaw: cand.priceRaw,
+                    star: cand.star,
+                    score: cand.score,
+                    address: cand.address,
+                    hotelId: cand.hotelId,
+                    jumpUrl: cand.hotelId ? `https://hotels.ctrip.com/hotel/${cand.hotelId}` : undefined
+                });
+            }
+            return;
+        }
+        seen.add(node);
+        for (const child of Object.values(node)){
+            walk(child, depth + 1, seen);
+            if (out.length >= maxItems) return;
+        }
+    };
+    walk(raw, 0, new Set());
+    return out;
+}
+
+
+//# sourceURL=ts/capabilities/session/adapters/ctrip-hotel.ts