@danceiny/gotry 0.0.1-rc.15 → 0.0.1-rc.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +51 -13
- package/README.zh-CN.md +26 -12
- package/bin/gotry-booking-copilot.js +53 -0
- package/bin/gotry-bootstrap.js +357 -8
- package/bin/gotry-inner.js +442 -60
- package/bin/gotry-runtime-resolution.d.ts +27 -0
- package/bin/gotry-runtime-resolution.js +50 -0
- package/bin/gotry.js +1 -1
- package/cordis.gotry-patch.yml +15 -1
- package/data/airline-airports.json +39 -0
- package/dist/capabilities/agent-reach-deep.js +1 -1
- package/dist/capabilities/agent-reach.js +1 -1
- package/dist/capabilities/anything.js +1 -1
- package/dist/capabilities/artifacts.js +1 -1
- package/dist/capabilities/effect.js +293 -0
- package/dist/capabilities/fact-log.js +41 -0
- package/dist/capabilities/flyai.js +20 -6
- package/dist/capabilities/hbcli.js +43 -1
- package/dist/capabilities/incident-log.js +1 -1
- package/dist/capabilities/model-override.js +18 -0
- package/dist/capabilities/opensky.js +1 -1
- package/dist/capabilities/resilience.js +90 -0
- package/dist/capabilities/session/action-cache.js +1 -1
- package/dist/capabilities/session/adapters/ctrip-flight.js +1 -1
- package/dist/capabilities/session/adapters/meituan-local.js +1 -1
- package/dist/capabilities/session/benchmark.js +2 -1
- package/dist/capabilities/session/extension-bridge.js +358 -0
- package/dist/capabilities/session/extension-channel.js +93 -0
- package/dist/capabilities/session/extension-distribution.js +234 -0
- package/dist/capabilities/session/extract.js +1 -1
- package/dist/capabilities/session/golden-score.js +92 -0
- package/dist/capabilities/session/health-watch.js +216 -0
- package/dist/capabilities/session/read-guard.js +1 -1
- package/dist/capabilities/session/static-flight-golden.js +137 -0
- package/dist/capabilities/session/transport.js +1 -1
- package/dist/capabilities/session/wizard.js +147 -0
- package/dist/capabilities/session-consent.js +1 -1
- package/dist/capabilities/session-login.js +83 -1
- package/dist/capabilities/session-search.js +111 -2
- package/dist/capabilities/weather.js +168 -46
- package/dist/data/session-golden-20.json +25 -0
- package/dist/data/sf-golden-manifest.json +102 -0
- package/dist/data/sf-static-routes.json +91 -0
- package/dist/scripts/action-cache-tests.js +1 -1
- package/dist/scripts/agent-planning-budget-e2e.js +227 -0
- package/dist/scripts/agent-planning-budget-tests.js +173 -0
- package/dist/scripts/agent-reach-deep-tests.js +1 -1
- package/dist/scripts/agent-reach-tests.js +1 -1
- package/dist/scripts/agent-reach-wrapper-tests.js +1 -1
- package/dist/scripts/anything-tests.js +1 -1
- package/dist/scripts/async-collect.js +1 -1
- package/dist/scripts/benchmark-environment-bridge-e2e.js +981 -0
- package/dist/scripts/benchmark-environment-bridge-tests.js +2544 -0
- package/dist/scripts/booking-copilot-availability-ledger-binding-tests.js +335 -0
- package/dist/scripts/booking-copilot-availability-policy-v2-tests.js +1355 -0
- package/dist/scripts/booking-copilot-bin-proof-tests.js +89 -0
- package/dist/scripts/booking-copilot-crossrepo-fixture-server.js +113 -0
- package/dist/scripts/booking-copilot-dsh-core-proof-tests.js +356 -0
- package/dist/scripts/booking-copilot-dsh-planner-proof-tests.js +557 -0
- package/dist/scripts/booking-copilot-dsh-plugin-proof-tests.js +140 -0
- package/dist/scripts/booking-copilot-event-sequence-concurrency-proof-tests.js +202 -0
- package/dist/scripts/booking-copilot-gap-code-contract-proof-tests.js +102 -0
- package/dist/scripts/booking-copilot-operation-ledger-concurrency-proof-tests.js +374 -0
- package/dist/scripts/booking-copilot-receipt-ledger-concurrency-proof-tests.js +447 -0
- package/dist/scripts/booking-copilot-runtime-proof-tests.js +205 -0
- package/dist/scripts/booking-copilot-server-proof-tests.js +317 -0
- package/dist/scripts/booking-copilot-startup-proof-tests.js +283 -0
- package/dist/scripts/booking-copilot-v2-runtime-proof-tests.js +3935 -0
- package/dist/scripts/booking-saga-tests.js +1 -1
- package/dist/scripts/booking-surface-contract-proof-tests.js +393 -0
- package/dist/scripts/booking-surface-v2-contract-proof-tests.js +1174 -0
- package/dist/scripts/bootstrap-tests.js +59 -3
- package/dist/scripts/build-changelog.js +279 -0
- package/dist/scripts/changelog-tests.js +165 -0
- package/dist/scripts/companion-tests.js +1 -1
- package/dist/scripts/diff-test.js +1 -1
- package/dist/scripts/dsh-runtime-closure-tests.js +225 -0
- package/dist/scripts/dsh-runtime-closure.js +150 -0
- package/dist/scripts/effect-tests.js +474 -0
- package/dist/scripts/engine-run.js +1 -1
- package/dist/scripts/engine-tests.js +1 -1
- package/dist/scripts/evaluation-cadence-tests.js +347 -0
- package/dist/scripts/evaluation-contract-tests.js +574 -0
- package/dist/scripts/extension-distribution-cli.js +35 -0
- package/dist/scripts/extension-distribution-tests.js +341 -0
- package/dist/scripts/extension-tests.js +573 -0
- package/dist/scripts/fact-gate-tests.js +318 -0
- package/dist/scripts/flyai-tests.js +1 -1
- package/dist/scripts/hbcli-e2e-tests.js +180 -0
- package/dist/scripts/hbcli-tests.js +1 -1
- package/dist/scripts/health-watch-cli.js +51 -0
- package/dist/scripts/i18n-tests.js +1 -1
- package/dist/scripts/incident-tests.js +1 -1
- package/dist/scripts/journey-tests.js +1 -1
- package/dist/scripts/ledger-tests.js +1 -1
- package/dist/scripts/ledger-workflow-crash.js +1 -1
- package/dist/scripts/memory-capture-tests.js +1 -1
- package/dist/scripts/memory-decay-tests.js +1 -1
- package/dist/scripts/memory-metrics.js +1 -1
- package/dist/scripts/memory-value-report.js +1 -1
- package/dist/scripts/model-override-e2e.js +176 -0
- package/dist/scripts/nightly-evidence-tests.js +67 -4
- package/dist/scripts/nightly-evidence.js +59 -3
- package/dist/scripts/nudge-digest.js +1 -1
- package/dist/scripts/onboarding-tests.js +186 -0
- package/dist/scripts/opensky-check.js +1 -1
- package/dist/scripts/opensky-tests.js +1 -1
- package/dist/scripts/pnpm-dsh-closure-proof.js +20 -0
- package/dist/scripts/price-drift-tests.js +441 -0
- package/dist/scripts/price-drift-watch.js +491 -0
- package/dist/scripts/probe-poi-tests.js +1 -1
- package/dist/scripts/product-metrics.js +1 -1
- package/dist/scripts/publish-preverify.js +40 -4
- package/dist/scripts/realtime-pricing-tests.js +1 -1
- package/dist/scripts/replay-async.js +1 -1
- package/dist/scripts/replay-real.js +1 -1
- package/dist/scripts/replay.js +1 -1
- package/dist/scripts/session-attach-diagnose.js +1 -1
- package/dist/scripts/session-attach-poc.js +1 -1
- package/dist/scripts/session-benchmark.js +1 -1
- package/dist/scripts/session-extract-tests.js +1 -1
- package/dist/scripts/session-login.js +1 -1
- package/dist/scripts/session-tests.js +70 -20
- package/dist/scripts/sf-live-benchmark.js +338 -0
- package/dist/scripts/sf-live-cli-tests.js +21 -0
- package/dist/scripts/sf-soft-score-tests.js +108 -0
- package/dist/scripts/sf-summary.js +93 -0
- package/dist/scripts/skeleton-check.js +1 -1
- package/dist/scripts/skeleton-integration-test.js +1 -1
- package/dist/scripts/skills-contract-tests.js +1 -1
- package/dist/scripts/smoke-session-gate-tests.js +29 -0
- package/dist/scripts/smoke.js +154 -33
- package/dist/scripts/state-cli-tests.js +1 -1
- package/dist/scripts/state-cli.js +1 -1
- package/dist/scripts/static-golden-tests.js +299 -0
- package/dist/scripts/time-eval-tests.js +1 -1
- package/dist/scripts/travel-timeline-tests.js +1 -1
- package/dist/scripts/unified-tests.js +1 -1
- package/dist/scripts/weather-tests.js +694 -44
- package/dist/scripts/z3-race-tests.js +1 -1
- package/dist/src/artifact-gate.js +310 -0
- package/dist/src/benchmark-agent-conformance.js +370 -0
- package/dist/src/benchmark-environment-bridge.js +384 -0
- package/dist/src/benchmark-headless-child-diagnostics.js +173 -0
- package/dist/src/benchmark-tool-isolation.js +124 -0
- package/dist/src/bookable-facts.js +349 -0
- package/dist/src/booking-saga.js +1 -1
- package/dist/src/booking-surface/availability-policy-v2.js +830 -0
- package/dist/src/booking-surface/canonical-schema.js +113 -0
- package/dist/src/booking-surface/contracts-v2.js +89 -0
- package/dist/src/booking-surface/contracts.js +46 -0
- package/dist/src/booking-surface/dsh-planner.js +453 -0
- package/dist/src/booking-surface/dsh-plugin.js +93 -0
- package/dist/src/booking-surface/error-codes.js +94 -0
- package/dist/src/booking-surface/index.js +15 -0
- package/dist/src/booking-surface/profile.js +68 -0
- package/dist/src/booking-surface/runtime-v2.js +1771 -0
- package/dist/src/booking-surface/runtime.js +351 -0
- package/dist/src/booking-surface/server-v2.js +334 -0
- package/dist/src/booking-surface/server.js +302 -0
- package/dist/src/booking-surface/startup.js +159 -0
- package/dist/src/booking-surface/validation-v2.js +319 -0
- package/dist/src/booking-surface/validation.js +809 -0
- package/dist/src/bridge.js +1 -1
- package/dist/src/companions.js +1 -1
- package/dist/src/contracts.js +1 -1
- package/dist/src/dsh-llm.js +1 -1
- package/dist/src/engine.js +1 -1
- package/dist/src/evaluation-cadence.js +234 -0
- package/dist/src/evaluation-contracts.js +906 -0
- package/dist/src/i18n.js +1 -1
- package/dist/src/index.js +234 -60
- package/dist/src/journey.js +1 -1
- package/dist/src/loop.js +1 -1
- package/dist/src/memory-capture.js +1 -1
- package/dist/src/memory-decay.js +1 -1
- package/dist/src/memory-utility.js +1 -1
- package/dist/src/mock-llm.js +1 -1
- package/dist/src/model.js +1 -1
- package/dist/src/realtime-pricing.js +14 -7
- package/dist/src/slot-spec.js +1 -1
- package/dist/src/state-ledger.js +2 -1
- package/dist/src/time-anchor.js +1 -1
- package/dist/src/tool-budget.js +136 -0
- package/dist/src/tool-packet.js +1 -1
- package/dist/src/travel-slots.js +1 -1
- package/dist/src/travel-timeline.js +1 -1
- package/dist/src/unified.js +1 -1
- package/dist/src/wish-pool.js +1 -1
- package/dist/src/z3-shared.js +1 -1
- package/extension/README.md +50 -0
- package/extension/background.js +160 -0
- package/extension/content-bridge.js +41 -0
- package/extension/content-main.js +62 -0
- package/extension/manifest.json +32 -0
- package/package.json +291 -12
- package/schemas/booking.surface.v1.schema.json +927 -0
- package/schemas/booking.surface.v2.schema.json +61 -0
- package/ts/capabilities/fact-log.ts +54 -0
- package/ts/capabilities/flyai.ts +16 -3
- package/ts/capabilities/hbcli.ts +46 -0
- package/ts/capabilities/session/benchmark.ts +4 -1
- package/ts/capabilities/session/extension-bridge.ts +377 -0
- package/ts/capabilities/session/extension-channel.ts +95 -0
- package/ts/capabilities/session/extension-distribution.ts +264 -0
- package/ts/capabilities/session/golden-score.ts +139 -0
- package/ts/capabilities/session/health-watch.ts +257 -0
- package/ts/capabilities/session/static-flight-golden.ts +209 -0
- package/ts/capabilities/session/wizard.ts +140 -0
- package/ts/capabilities/session-login.ts +63 -2
- package/ts/capabilities/session-search.ts +105 -3
- package/ts/capabilities/weather.ts +141 -52
- package/ts/package.json +3 -3
- package/ts/src/artifact-gate.ts +365 -0
- package/ts/src/benchmark-agent-conformance.ts +448 -0
- package/ts/src/benchmark-environment-bridge.ts +348 -0
- package/ts/src/benchmark-headless-child-diagnostics.ts +184 -0
- package/ts/src/benchmark-tool-isolation.ts +166 -0
- package/ts/src/bookable-facts.ts +557 -0
- package/ts/src/booking-surface/availability-policy-v2.ts +523 -0
- package/ts/src/booking-surface/canonical-schema.js +113 -0
- package/ts/src/booking-surface/contracts-v2.ts +118 -0
- package/ts/src/booking-surface/contracts.ts +380 -0
- package/ts/src/booking-surface/dsh-planner.ts +452 -0
- package/ts/src/booking-surface/dsh-plugin.js +93 -0
- package/ts/src/booking-surface/error-codes.ts +101 -0
- package/ts/src/booking-surface/index.ts +12 -0
- package/ts/src/booking-surface/profile.ts +42 -0
- package/ts/src/booking-surface/runtime-v2.ts +1466 -0
- package/ts/src/booking-surface/runtime.ts +483 -0
- package/ts/src/booking-surface/server-v2.ts +247 -0
- package/ts/src/booking-surface/server.ts +324 -0
- package/ts/src/booking-surface/startup.ts +196 -0
- package/ts/src/booking-surface/validation-v2.ts +205 -0
- package/ts/src/booking-surface/validation.ts +453 -0
- package/ts/src/index.ts +161 -14
- package/ts/src/state-ledger.ts +1 -0
- package/ts/src/tool-budget.ts +165 -0
|
@@ -0,0 +1,209 @@
|
|
|
1
|
+
import { readFileSync } from 'node:fs'
|
|
2
|
+
import { join } from 'node:path'
|
|
3
|
+
|
|
4
|
+
import type { SessionComparableRecord, SessionComparableSegment } from './benchmark.ts'
|
|
5
|
+
|
|
6
|
+
export type GoldenSource = 'manual' | 'flyai' | 'static'
|
|
7
|
+
|
|
8
|
+
export interface StaticFlightRouteLeg {
|
|
9
|
+
from_iata: string
|
|
10
|
+
to_iata: string
|
|
11
|
+
carrier_codes: string[]
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export interface StaticFlightRoute {
|
|
15
|
+
query_id: string
|
|
16
|
+
from_city: string
|
|
17
|
+
to_city: string
|
|
18
|
+
route_kind: 'direct' | 'transfer'
|
|
19
|
+
legs: StaticFlightRouteLeg[]
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
export interface StaticFlightSnapshot {
|
|
23
|
+
schema_version: 'sf-static-routes.v1'
|
|
24
|
+
source: {
|
|
25
|
+
name: string
|
|
26
|
+
url: string
|
|
27
|
+
revision: string
|
|
28
|
+
license: string
|
|
29
|
+
retrieved_at: string
|
|
30
|
+
limitations: string[]
|
|
31
|
+
}
|
|
32
|
+
routes: StaticFlightRoute[]
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
export interface StaticGoldenResolution {
|
|
36
|
+
requested_source: 'static'
|
|
37
|
+
effective_source: 'static-openflights+manual-band' | 'manual-golden'
|
|
38
|
+
record: SessionComparableRecord
|
|
39
|
+
fallback_reason?: string
|
|
40
|
+
estimated_fields: string[]
|
|
41
|
+
provenance: {
|
|
42
|
+
route_source: string
|
|
43
|
+
route_revision: string
|
|
44
|
+
route_license: string
|
|
45
|
+
band_source: 'sf-golden-manifest.json'
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
export function parseGoldenSource(args: string[]): GoldenSource {
|
|
50
|
+
const raw = args.find((arg) => arg.startsWith('--golden='))?.slice('--golden='.length) ?? 'manual'
|
|
51
|
+
if (raw === 'manual' || raw === 'flyai' || raw === 'static') return raw
|
|
52
|
+
throw new Error(`不支持的 golden vendor: ${raw}`)
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
export function loadStaticFlightSnapshot(
|
|
56
|
+
path = join(import.meta.dirname, '..', '..', 'data', 'sf-static-routes.json'),
|
|
57
|
+
): StaticFlightSnapshot {
|
|
58
|
+
const parsed = JSON.parse(readFileSync(path, 'utf8')) as unknown
|
|
59
|
+
if (!isRecord(parsed) || parsed.schema_version !== 'sf-static-routes.v1') {
|
|
60
|
+
throw new Error(`invalid static snapshot schema_version: ${String(isRecord(parsed) ? parsed.schema_version : undefined)}`)
|
|
61
|
+
}
|
|
62
|
+
const source = parsed.source
|
|
63
|
+
if (!isRecord(source)
|
|
64
|
+
|| !['name', 'url', 'revision', 'license', 'retrieved_at'].every((key) => typeof source[key] === 'string')
|
|
65
|
+
|| !Array.isArray(source.limitations)
|
|
66
|
+
|| !source.limitations.every((item) => typeof item === 'string')) {
|
|
67
|
+
throw new Error('invalid static snapshot source')
|
|
68
|
+
}
|
|
69
|
+
if (!Array.isArray(parsed.routes) || !parsed.routes.every(isStaticFlightRoute)) {
|
|
70
|
+
throw new Error('invalid static snapshot routes')
|
|
71
|
+
}
|
|
72
|
+
return parsed as unknown as StaticFlightSnapshot
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
76
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value)
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
function isStaticFlightRoute(value: unknown): boolean {
|
|
80
|
+
if (!isRecord(value)
|
|
81
|
+
|| typeof value.query_id !== 'string'
|
|
82
|
+
|| typeof value.from_city !== 'string'
|
|
83
|
+
|| typeof value.to_city !== 'string'
|
|
84
|
+
|| (value.route_kind !== 'direct' && value.route_kind !== 'transfer')
|
|
85
|
+
|| !Array.isArray(value.legs)
|
|
86
|
+
|| value.legs.length === 0) return false
|
|
87
|
+
return value.legs.every((leg) => isRecord(leg)
|
|
88
|
+
&& typeof leg.from_iata === 'string'
|
|
89
|
+
&& typeof leg.to_iata === 'string'
|
|
90
|
+
&& Array.isArray(leg.carrier_codes)
|
|
91
|
+
&& leg.carrier_codes.every((carrier) => typeof carrier === 'string'))
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
function provenance(snapshot?: StaticFlightSnapshot): StaticGoldenResolution['provenance'] {
|
|
95
|
+
return {
|
|
96
|
+
route_source: snapshot?.source.url ?? '',
|
|
97
|
+
route_revision: snapshot?.source.revision ?? '',
|
|
98
|
+
route_license: snapshot?.source.license ?? '',
|
|
99
|
+
band_source: 'sf-golden-manifest.json',
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
function formatWithOffset(timestampMs: number, offset: string): string {
|
|
104
|
+
const sign = offset.startsWith('-') ? -1 : 1
|
|
105
|
+
const [hours, minutes] = offset.slice(1).split(':').map(Number)
|
|
106
|
+
const offsetMinutes = sign * ((hours ?? 0) * 60 + (minutes ?? 0))
|
|
107
|
+
const local = new Date(timestampMs + offsetMinutes * 60_000).toISOString().slice(0, 19)
|
|
108
|
+
return `${local}${offset}`
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
function buildSegments(
|
|
112
|
+
query: { from: string; to: string },
|
|
113
|
+
route: StaticFlightRoute,
|
|
114
|
+
manualSegment: SessionComparableSegment,
|
|
115
|
+
): SessionComparableSegment[] | null {
|
|
116
|
+
if (route.route_kind === 'direct' && route.legs.length === 1) {
|
|
117
|
+
return [{
|
|
118
|
+
from: query.from,
|
|
119
|
+
to: query.to,
|
|
120
|
+
departure_at: manualSegment.departure_at,
|
|
121
|
+
arrival_at: manualSegment.arrival_at,
|
|
122
|
+
transport_number: `${route.legs[0]!.carrier_codes[0]}-STATIC`,
|
|
123
|
+
}]
|
|
124
|
+
}
|
|
125
|
+
if (route.route_kind !== 'transfer' || route.legs.length !== 2) return null
|
|
126
|
+
const departureMs = Date.parse(manualSegment.departure_at)
|
|
127
|
+
const arrivalMs = Date.parse(manualSegment.arrival_at)
|
|
128
|
+
if (!Number.isFinite(departureMs) || !Number.isFinite(arrivalMs) || arrivalMs <= departureMs) return null
|
|
129
|
+
const offset = manualSegment.departure_at.match(/([+-]\d{2}:\d{2})$/)?.[1] ?? '+08:00'
|
|
130
|
+
const totalMinutes = Math.floor((arrivalMs - departureMs) / 60_000)
|
|
131
|
+
if (totalMinutes < 90) return null
|
|
132
|
+
const layoverMinutes = Math.min(60, Math.floor(totalMinutes / 3))
|
|
133
|
+
const travelMinutes = totalMinutes - layoverMinutes
|
|
134
|
+
const firstTravelMinutes = Math.floor(travelMinutes / 2)
|
|
135
|
+
const secondDepartureMs = arrivalMs - (travelMinutes - firstTravelMinutes) * 60_000
|
|
136
|
+
const middle = route.legs[0]!.to_iata
|
|
137
|
+
return [
|
|
138
|
+
{
|
|
139
|
+
from: query.from,
|
|
140
|
+
to: middle,
|
|
141
|
+
departure_at: manualSegment.departure_at,
|
|
142
|
+
arrival_at: formatWithOffset(departureMs + firstTravelMinutes * 60_000, offset),
|
|
143
|
+
transport_number: `${route.legs[0]!.carrier_codes[0]}-STATIC`,
|
|
144
|
+
},
|
|
145
|
+
{
|
|
146
|
+
from: middle,
|
|
147
|
+
to: query.to,
|
|
148
|
+
departure_at: formatWithOffset(secondDepartureMs, offset),
|
|
149
|
+
arrival_at: manualSegment.arrival_at,
|
|
150
|
+
transport_number: `${route.legs[1]!.carrier_codes[0]}-STATIC`,
|
|
151
|
+
},
|
|
152
|
+
]
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
export function resolveStaticGolden(input: {
|
|
156
|
+
query: { id: string; from: string; to: string; date: string }
|
|
157
|
+
manualRecord: SessionComparableRecord
|
|
158
|
+
snapshot?: StaticFlightSnapshot
|
|
159
|
+
snapshotError?: string
|
|
160
|
+
warn?: (message: string) => void
|
|
161
|
+
}): StaticGoldenResolution {
|
|
162
|
+
const route = input.snapshot?.routes.find((candidate) => candidate.query_id === input.query.id)
|
|
163
|
+
let fallbackReason: string | undefined
|
|
164
|
+
if (input.snapshotError) {
|
|
165
|
+
fallbackReason = `static snapshot unavailable: ${input.snapshotError}`
|
|
166
|
+
} else if (!route) {
|
|
167
|
+
fallbackReason = `static route missing for ${input.query.id}`
|
|
168
|
+
} else if (route.from_city !== input.query.from || route.to_city !== input.query.to) {
|
|
169
|
+
fallbackReason = `static route mismatch for ${input.query.id}`
|
|
170
|
+
} else if (route.legs.some((leg) => leg.carrier_codes.length === 0)) {
|
|
171
|
+
fallbackReason = `static carrier coverage missing for ${input.query.id}`
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
const manualSegment = input.manualRecord.route_segments[0]
|
|
175
|
+
const segments = !fallbackReason && route && manualSegment
|
|
176
|
+
? buildSegments(input.query, route, manualSegment)
|
|
177
|
+
: null
|
|
178
|
+
if (!fallbackReason && !segments) fallbackReason = `static route cannot form comparable record for ${input.query.id}`
|
|
179
|
+
|
|
180
|
+
if (fallbackReason) {
|
|
181
|
+
input.warn?.(`[sf-live-benchmark] static vendor failed for ${input.query.id}: ${fallbackReason}; fallback=manual-golden`)
|
|
182
|
+
return {
|
|
183
|
+
requested_source: 'static',
|
|
184
|
+
effective_source: 'manual-golden',
|
|
185
|
+
record: input.manualRecord,
|
|
186
|
+
fallback_reason: fallbackReason,
|
|
187
|
+
estimated_fields: [],
|
|
188
|
+
provenance: provenance(input.snapshot),
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
return {
|
|
193
|
+
requested_source: 'static',
|
|
194
|
+
effective_source: 'static-openflights+manual-band',
|
|
195
|
+
record: {
|
|
196
|
+
...input.manualRecord,
|
|
197
|
+
route_segments: segments!,
|
|
198
|
+
journey_type: route!.route_kind,
|
|
199
|
+
source: 'static-openflights+manual-band',
|
|
200
|
+
},
|
|
201
|
+
estimated_fields: [
|
|
202
|
+
'route_segments[].departure_at',
|
|
203
|
+
'route_segments[].arrival_at',
|
|
204
|
+
'route_segments[].transport_number',
|
|
205
|
+
'price',
|
|
206
|
+
],
|
|
207
|
+
provenance: provenance(input.snapshot),
|
|
208
|
+
}
|
|
209
|
+
}
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 会话扩展 onboarding wizard(RFC user-session-data-rfc.md §3.3,ADR-21 上架后重设)。
|
|
3
|
+
*
|
|
4
|
+
* 单一职责(2026-09-02 重设):**只做 Node 端两件事**——
|
|
5
|
+
* ① 扩展文件从源落位到 `~/.gotry/extension`(幂等)
|
|
6
|
+
* ② source/dest 静态预检 + manifest.key 校验(给 health-watch 前的快照)
|
|
7
|
+
*
|
|
8
|
+
* 浏览器商店安装是浏览器的事,dsh 渲染 verdict.installUrl 是 dsh UI 的事;
|
|
9
|
+
* gotry **不再**弹 GUI 面板(pbcopy/osascript/zenity/msg)、不再 open 浏览器、
|
|
10
|
+
* 不再写一墙文字 CLI 指引。任何"装到能用"的 UX 都由浏览器商店 + dsh UI 分担。
|
|
11
|
+
*
|
|
12
|
+
* 历史形态回顾:
|
|
13
|
+
* - 2026-08-30 初版:5 步编排 + 剪贴板 + GUI 面板 + 健康探活(全栈闭环初衷好,但越界管了浏览器)
|
|
14
|
+
* - 2026-09-02 上架后:缩为 2 步(ensure + watch precheck),纯 Node 职责
|
|
15
|
+
*
|
|
16
|
+
* 接口契约:
|
|
17
|
+
* - `runOnboardingWizard({ dryRun, extensionDir?, sourceDir? })` 返回 2 步 OnboardingResult
|
|
18
|
+
* - `defaultExtensionDir()` / `describeExtensionDir()` 留作公开工具
|
|
19
|
+
*/
|
|
20
|
+
|
|
21
|
+
import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from 'node:fs'
|
|
22
|
+
import { homedir } from 'node:os'
|
|
23
|
+
import { join } from 'node:path'
|
|
24
|
+
|
|
25
|
+
export interface OnboardingStep {
|
|
26
|
+
step: 'ensure-extension-files' | 'watch-extension-ready'
|
|
27
|
+
status: 'ok' | 'skip' | 'fail'
|
|
28
|
+
summary: string
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
export interface OnboardingOptions {
|
|
32
|
+
/** 零网络零浏览器;只校验命令编排与输出形态;run-all §40 必走 */
|
|
33
|
+
dryRun?: boolean
|
|
34
|
+
/** 扩展落位目录(默认 ~/.gotry/extension) */
|
|
35
|
+
extensionDir?: string
|
|
36
|
+
/** 源扩展目录(默认仓库 ./extension/,随 npm 装入 dist/extension) */
|
|
37
|
+
sourceDir?: string
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
export interface OnboardingResult {
|
|
41
|
+
ok: boolean
|
|
42
|
+
steps: OnboardingStep[]
|
|
43
|
+
extensionDir: string
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
const DEFAULT_SOURCE_DIR_CANDIDATES = [
|
|
47
|
+
join(process.cwd(), 'extension'),
|
|
48
|
+
join(process.cwd(), 'dist', 'extension'),
|
|
49
|
+
join(process.cwd(), 'ts', '..', 'extension'),
|
|
50
|
+
]
|
|
51
|
+
|
|
52
|
+
function resolveExtensionSourceDir(): string {
|
|
53
|
+
for (const candidate of DEFAULT_SOURCE_DIR_CANDIDATES) {
|
|
54
|
+
if (existsSync(join(candidate, 'manifest.json'))) return candidate
|
|
55
|
+
}
|
|
56
|
+
return DEFAULT_SOURCE_DIR_CANDIDATES[0]!
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
export function defaultExtensionDir(): string {
|
|
60
|
+
return join(homedir(), '.gotry', 'extension')
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
/** 落位扩展文件(幂等);缺源/源不全会 fail-soft,提示用户重跑 `gotry setup` */
|
|
64
|
+
function ensureExtensionFiles(source: string, target: string, dryRun: boolean): OnboardingStep {
|
|
65
|
+
if (dryRun) return { step: 'ensure-extension-files', status: 'skip', summary: '[dry-run] skip 扩展落位' }
|
|
66
|
+
try {
|
|
67
|
+
if (!existsSync(source) || !existsSync(join(source, 'manifest.json'))) {
|
|
68
|
+
return { step: 'ensure-extension-files', status: 'fail', summary: `源扩展目录缺失 manifest.json: ${source}(先跑 npx gotry setup 落位)` }
|
|
69
|
+
}
|
|
70
|
+
mkdirSync(target, { recursive: true })
|
|
71
|
+
const required = ['manifest.json', 'background.js', 'content-main.js', 'content-bridge.js']
|
|
72
|
+
for (const f of required) {
|
|
73
|
+
const src = join(source, f)
|
|
74
|
+
if (!existsSync(src)) return { step: 'ensure-extension-files', status: 'fail', summary: `源扩展缺 ${f}(重新 npm install 或 gotry setup)` }
|
|
75
|
+
copyFileSync(src, join(target, f))
|
|
76
|
+
}
|
|
77
|
+
return { step: 'ensure-extension-files', status: 'ok', summary: `扩展已落位 ${target}(manifest+3 文件)` }
|
|
78
|
+
} catch (e) {
|
|
79
|
+
return { step: 'ensure-extension-files', status: 'fail', summary: `扩展落位失败: ${e instanceof Error ? e.message.slice(0, 120) : String(e)}` }
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
/** 静态预检:落位目录可见 + manifest.key 存在(扩展 ID 稳定)+ 源未新于 dest */
|
|
84
|
+
async function watchExtensionReady(dryRun: boolean, sourceDir: string, extensionDir: string): Promise<OnboardingStep> {
|
|
85
|
+
if (dryRun) return { step: 'watch-extension-ready', status: 'skip', summary: '[dry-run] skip health-watch precheck' }
|
|
86
|
+
if (!existsSync(extensionDir) || !existsSync(join(extensionDir, 'manifest.json'))) {
|
|
87
|
+
return { step: 'watch-extension-ready', status: 'fail', summary: `落位缺失 manifest.json:${extensionDir}` }
|
|
88
|
+
}
|
|
89
|
+
try {
|
|
90
|
+
const srcStat = statSync(sourceDir)
|
|
91
|
+
const dstStat = statSync(extensionDir)
|
|
92
|
+
if (srcStat.mtimeMs > dstStat.mtimeMs) {
|
|
93
|
+
return { step: 'watch-extension-ready', status: 'fail', summary: `扩展文件可能过期(源比落位新);重跑 npx gotry setup` }
|
|
94
|
+
}
|
|
95
|
+
const manifest = JSON.parse(await (await import('node:fs/promises')).readFile(join(extensionDir, 'manifest.json'), 'utf8'))
|
|
96
|
+
if (typeof manifest.key !== 'string' || manifest.key.length < 100) {
|
|
97
|
+
return { step: 'watch-extension-ready', status: 'fail', summary: 'manifest.key 缺失或过短,扩展 ID 不能稳定' }
|
|
98
|
+
}
|
|
99
|
+
} catch (e) {
|
|
100
|
+
return { step: 'watch-extension-ready', status: 'fail', summary: `静态预检失败: ${e instanceof Error ? e.message.slice(0, 120) : String(e)}` }
|
|
101
|
+
}
|
|
102
|
+
return { step: 'watch-extension-ready', status: 'ok', summary: '扩展文件就绪(manifest.key 校验通过,后台轮询就绪态由 health-watch 接管)' }
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
/**
|
|
106
|
+
* 主入口(2 步):①扩展落位 ②watch precheck 静态预检。
|
|
107
|
+
* 真 health-watch 由 health-watch.ts 单独负责,不并入 wizard。
|
|
108
|
+
*/
|
|
109
|
+
export async function runOnboardingWizard(opts: OnboardingOptions = {}): Promise<OnboardingResult> {
|
|
110
|
+
const dryRun = opts.dryRun ?? false
|
|
111
|
+
const extensionDir = opts.extensionDir ?? defaultExtensionDir()
|
|
112
|
+
const sourceDir = opts.sourceDir ?? resolveExtensionSourceDir()
|
|
113
|
+
|
|
114
|
+
const steps: OnboardingStep[] = []
|
|
115
|
+
steps.push(ensureExtensionFiles(sourceDir, extensionDir, dryRun))
|
|
116
|
+
steps.push(await watchExtensionReady(dryRun, sourceDir, extensionDir))
|
|
117
|
+
|
|
118
|
+
const ok = steps.every((s) => s.status !== 'fail')
|
|
119
|
+
return { ok, steps, extensionDir }
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
/** stdout 人话化打印(给 bootstrap 子进程单行 JSON 输出之外的兜底形态) */
|
|
123
|
+
export function printWizardResult(result: OnboardingResult, destination: NodeJS.WritableStream = process.stdout): void {
|
|
124
|
+
const tag = (s: OnboardingStep): string => {
|
|
125
|
+
if (s.status === 'ok') return '✅'
|
|
126
|
+
if (s.status === 'skip') return '⏭ '
|
|
127
|
+
return '❌'
|
|
128
|
+
}
|
|
129
|
+
for (const s of result.steps) {
|
|
130
|
+
destination.write(`${tag(s)} ${s.step}: ${s.summary}\n`)
|
|
131
|
+
}
|
|
132
|
+
destination.write(`extensionDir=${result.extensionDir}; overall=${result.ok ? 'ok' : 'has-failures'}\n`)
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
/** 公开诊断探针(bootstrap 报告用) */
|
|
136
|
+
export function describeExtensionDir(extensionDir: string): { exists: boolean; fileCount: number; hasManifest: boolean } {
|
|
137
|
+
if (!existsSync(extensionDir)) return { exists: false, fileCount: 0, hasManifest: false }
|
|
138
|
+
const files = readdirSync(extensionDir)
|
|
139
|
+
return { exists: true, fileCount: files.length, hasManifest: files.includes('manifest.json') }
|
|
140
|
+
}
|
|
@@ -14,6 +14,9 @@
|
|
|
14
14
|
*/
|
|
15
15
|
|
|
16
16
|
import { openSession } from './session/transport.ts'
|
|
17
|
+
import { extensionCookieNames, extensionOpenLogin, classifyBridgeFailure } from './session/extension-channel.ts'
|
|
18
|
+
import { EXTENSION_STORE_URL } from './session/extension-bridge.ts'
|
|
19
|
+
import { resolveTransportMode } from './session-search.ts'
|
|
17
20
|
|
|
18
21
|
export interface LoginTarget {
|
|
19
22
|
domain: string
|
|
@@ -48,11 +51,14 @@ export interface SessionLoginResult {
|
|
|
48
51
|
via: 'session-login' | 'session-login-error'
|
|
49
52
|
evidence: string
|
|
50
53
|
latencyMs: number
|
|
51
|
-
verdict: 'logged-in' | 'pending' | 'needs-attach' | 'error'
|
|
54
|
+
verdict: 'logged-in' | 'pending' | 'needs-attach' | 'needs-extension' | 'error'
|
|
52
55
|
site: string
|
|
53
56
|
/** 已检出的登录票据 cookie 名(名字,非值——本模块永不读取/存储/回传任何 cookie 值) */
|
|
54
57
|
tickets?: string[]
|
|
55
58
|
error?: string
|
|
59
|
+
/** needs-extension 时给出 Chrome Web Store URL —— dsh UI 应直接渲成可点链接(浏览器自己当安装器,gotry 不插手) */
|
|
60
|
+
installUrl?: string
|
|
61
|
+
installAction?: 'add-to-chrome'
|
|
56
62
|
}
|
|
57
63
|
|
|
58
64
|
function err(site: string, verdict: SessionLoginResult['verdict'], error: string, started: number, ts: string): SessionLoginResult {
|
|
@@ -74,7 +80,7 @@ export async function pollTicketNames(browser: { cookies(): Promise<CookieLike[]
|
|
|
74
80
|
/**
|
|
75
81
|
* 产品化登录引导(永不抛错;登录由用户在携程官网完成,gotry 只做名称级存在性检查)。
|
|
76
82
|
* verdict:logged-in=已检出票据;pending=登录入口已打开、用户尚未完成(不阻塞,可稍后再查);
|
|
77
|
-
* needs-attach
|
|
83
|
+
* needs-extension=扩展桥未连接(一次性安装指引,默认车道);needs-attach=cdp 车道下用户 Chrome 未开调试端口;error=其余降级。
|
|
78
84
|
*/
|
|
79
85
|
export async function sessionLogin(q: SessionLoginQuery = {}): Promise<SessionLoginResult> {
|
|
80
86
|
const started = Date.now()
|
|
@@ -84,6 +90,10 @@ export async function sessionLogin(q: SessionLoginQuery = {}): Promise<SessionLo
|
|
|
84
90
|
if (!target) {
|
|
85
91
|
return err(site, 'error', `未知站点 ${site}(可选 ${Object.keys(LOGIN_TARGETS).join('/')})`, started, ts)
|
|
86
92
|
}
|
|
93
|
+
// 扩展车道(默认):零 CDP、零系统弹窗——cookie 名快查 + 登录入口 job
|
|
94
|
+
if (resolveTransportMode() === 'extension') {
|
|
95
|
+
return sessionLoginViaExtension(site, target, q, started, ts)
|
|
96
|
+
}
|
|
87
97
|
// 人机共治纪律:开自己的新标签页并置前台——用户必须看见登录页(2026-08-29 founder:
|
|
88
98
|
// 「我根本就看不到登录页面」,此前误劫持用户既有标签页);closeOwnPage=false 把登录页留给用户
|
|
89
99
|
const t = await openSession({ mode: 'cdp', guard: false })
|
|
@@ -143,4 +153,55 @@ export async function sessionLogin(q: SessionLoginQuery = {}): Promise<SessionLo
|
|
|
143
153
|
await t.close().catch(() => { /* ignore */ })
|
|
144
154
|
return err(site, 'error', e instanceof Error ? e.message : String(e), started, ts)
|
|
145
155
|
}
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
/**
|
|
159
|
+
* 扩展车道登录引导(2026-08-29 传输层方案 C):语义与 cdp 车道一致——
|
|
160
|
+
* 自动检测优先(票据名在 = 零弹窗直接确认);未检出才开登录入口 job(置前台,标签留给用户);
|
|
161
|
+
* 只读轮询票据名,永不接触 cookie 值。verdict:logged-in | pending | needs-extension | error。
|
|
162
|
+
*/
|
|
163
|
+
async function sessionLoginViaExtension(site: string, target: LoginTarget, q: SessionLoginQuery, started: number, ts: string): Promise<SessionLoginResult> {
|
|
164
|
+
const evidenceTag = `[会话:${site}-login@${ts}]`
|
|
165
|
+
const quick = (verdict: SessionLoginResult['verdict'], error: string): SessionLoginResult => {
|
|
166
|
+
const base: SessionLoginResult = {
|
|
167
|
+
ok: false, via: 'session-login-error', evidence: `[会话:login-error@${ts}] ${error.slice(0, 200)}`,
|
|
168
|
+
latencyMs: Date.now() - started, verdict, site, error: error.slice(0, 400),
|
|
169
|
+
}
|
|
170
|
+
// needs-extension:浏览器自己当安装器,gotry 不弹面板不开剪贴板——只把商店 URL 给 dsh UI
|
|
171
|
+
if (verdict === 'needs-extension') base.installUrl = EXTENSION_STORE_URL
|
|
172
|
+
if (verdict === 'needs-extension') base.installAction = 'add-to-chrome'
|
|
173
|
+
return base
|
|
174
|
+
}
|
|
175
|
+
// 自动检测优先:先只读票据名——已登录则零交互直接确认(与 cdp 车道同一语义,founder「UI 里有自动检测吗」)
|
|
176
|
+
const pre = await extensionCookieNames({ site, domain: target.domain, ticketNames: target.names, timeoutMs: 8_000 })
|
|
177
|
+
if (!pre.ok) return quick(classifyBridgeFailure(pre.kind) === 'needs-extension' ? 'needs-extension' : 'error', pre.summary)
|
|
178
|
+
if (pre.tickets.length > 0) {
|
|
179
|
+
return {
|
|
180
|
+
ok: true, via: 'session-login', latencyMs: Date.now() - started, verdict: 'logged-in', site, tickets: pre.tickets,
|
|
181
|
+
evidence: `${evidenceTag} 自动检测:票据 cookie 已在(先前登录已生效)——[${pre.tickets.join(', ')}](只读名字,0 网页交互,零弹窗)`,
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
// 未检出 → 开登录入口标签(置前台,绝不劫持用户已有页面;登录在携程官网完成)
|
|
185
|
+
const opened = await extensionOpenLogin({ site, url: target.entryUrl, timeoutMs: 15_000 })
|
|
186
|
+
if (!opened.ok) return quick(classifyBridgeFailure(opened.kind) === 'needs-extension' ? 'needs-extension' : 'error', opened.summary)
|
|
187
|
+
const waitMs = Math.min(Math.max(q.waitMs ?? 90_000, 0), 300_000)
|
|
188
|
+
const pollMs = Math.min(Math.max(q.pollMs ?? 3_000, 500), 10_000)
|
|
189
|
+
const deadline = Date.now() + waitMs
|
|
190
|
+
let tickets: string[] = []
|
|
191
|
+
while (Date.now() < deadline) {
|
|
192
|
+
await new Promise<void>((resolve) => setTimeout(resolve, pollMs))
|
|
193
|
+
const poll = await extensionCookieNames({ site, domain: target.domain, ticketNames: target.names, timeoutMs: 8_000 })
|
|
194
|
+
if (poll.ok) tickets = poll.tickets
|
|
195
|
+
if (tickets.length > 0) break
|
|
196
|
+
}
|
|
197
|
+
if (tickets.length > 0) {
|
|
198
|
+
return {
|
|
199
|
+
ok: true, via: 'session-login', latencyMs: Date.now() - started, verdict: 'logged-in', site, tickets,
|
|
200
|
+
evidence: `${evidenceTag} 票据 cookie 已检出 [${tickets.join(', ')}](只读名字;登录在你自己的浏览器里完成,gotry 全程未接触任何密码/验证码/cookie 值)`,
|
|
201
|
+
}
|
|
202
|
+
}
|
|
203
|
+
return {
|
|
204
|
+
ok: true, via: 'session-login', latencyMs: Date.now() - started, verdict: 'pending', site, tickets: [],
|
|
205
|
+
evidence: `${evidenceTag} 登录入口已在你的 Chrome 置前打开(${target.label});在标签页里正常登录完成后再说一声「继续查」即可——gotry 只检查"是否已登录",永不收集你的账号信息`,
|
|
206
|
+
}
|
|
146
207
|
}
|
|
@@ -1,16 +1,25 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* 会话检索编排层(RFC §3.2):transport → adapter entry → networkHint 嗅探 → 解析 → ReadGuard → 证据链。
|
|
3
3
|
*
|
|
4
|
+
* 传输车道(2026-08-29 定案,RFC §2.2):**扩展桥为默认**——一次性安装的 MV3 扩展
|
|
5
|
+
* (GoTry Session Bridge)在自己标签页被动嗅探 batchSearch,零 Chrome 系统弹窗;
|
|
6
|
+
* cdp(attach 日常 Chrome,Chrome 144+ 每连接弹权限框)降为显式后备
|
|
7
|
+
* (`GOTRY_SESSION_TRANSPORT=cdp` opt-in,诊断/测试用);persistent 仅测试。
|
|
8
|
+
*
|
|
4
9
|
* 证据链(L4 增补):[会话:ctrip-flight@ts] = 用户本人会话内实时检索,非官方 API;
|
|
5
10
|
* 风控命中(verdict='challenged')= degraded,绝不重试、绝不绕过(合规支柱②)。
|
|
6
11
|
* 节律(§3.4):同站点 ≥30s 间隔 + 单调冷却;超间隔返回 verdict='cooldown'。
|
|
7
|
-
*
|
|
12
|
+
* 永不抛错;扩展车道 fail-closed(桥/扩展不可用即 verdict,零花费);测试/巡检用隔离 profile 与 stateRoot。
|
|
8
13
|
*/
|
|
9
14
|
|
|
10
15
|
import { openSession } from './session/transport.ts'
|
|
16
|
+
import { extensionCookieNames, extensionSearchJob, classifyBridgeFailure } from './session/extension-channel.ts'
|
|
17
|
+
import { appendFileSync, mkdirSync } from 'node:fs'
|
|
18
|
+
import { dirname } from 'node:path'
|
|
11
19
|
import { buildEntryUrl, NETWORK_HINTS, parseBatchSearch, LOGIN_COOKIE_NAMES, SITE_DOMAIN, type SessionFlightOption } from './session/adapters/ctrip-flight.ts'
|
|
20
|
+
import { EXTENSION_STORE_URL } from './session/extension-bridge.ts'
|
|
12
21
|
|
|
13
|
-
export type SessionVerdict = 'hit' | 'miss' | 'error' | 'challenged' | 'cooldown' | 'needs-login' | 'needs-attach'
|
|
22
|
+
export type SessionVerdict = 'hit' | 'miss' | 'error' | 'challenged' | 'cooldown' | 'needs-login' | 'needs-attach' | 'needs-extension'
|
|
14
23
|
|
|
15
24
|
export interface SessionSearchResult {
|
|
16
25
|
ok: boolean
|
|
@@ -20,6 +29,9 @@ export interface SessionSearchResult {
|
|
|
20
29
|
verdict: SessionVerdict
|
|
21
30
|
options?: SessionFlightOption[]
|
|
22
31
|
error?: string
|
|
32
|
+
/** needs-extension 时给出 Chrome Web Store URL —— dsh UI 应直接渲成可点链接(浏览器自己当安装器,gotry 不插手) */
|
|
33
|
+
installUrl?: string
|
|
34
|
+
installAction?: 'add-to-chrome'
|
|
23
35
|
}
|
|
24
36
|
|
|
25
37
|
export interface SessionFlightQuery {
|
|
@@ -54,6 +66,49 @@ export function classifyTransportFailure(summary: string, cdpMode: boolean): Ext
|
|
|
54
66
|
: 'error'
|
|
55
67
|
}
|
|
56
68
|
|
|
69
|
+
/** 传输车道解析(纯函数,测试锚点):persistent=隔离 profile(测试自检);cdp=显式 opt-in;扩展=默认 */
|
|
70
|
+
export function resolveTransportMode(profileDir?: string): 'cdp' | 'persistent' | 'extension' {
|
|
71
|
+
if (profileDir !== undefined) return 'persistent'
|
|
72
|
+
return (process.env.GOTRY_SESSION_TRANSPORT ?? '').trim().toLowerCase() === 'cdp' ? 'cdp' : 'extension'
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
/** Live browser transport is an explicit opt-in for smoke/full-suite callers. */
|
|
76
|
+
export function sessionLiveEnabled(env: Partial<Pick<NodeJS.ProcessEnv, 'GOTRY_SESSION_LIVE'>> = process.env): boolean {
|
|
77
|
+
return env.GOTRY_SESSION_LIVE === '1'
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
/** Deterministic offline observation used when the live session gate is closed. */
|
|
81
|
+
export function offlineSessionFlightResult(): SessionSearchResult {
|
|
82
|
+
return {
|
|
83
|
+
ok: false,
|
|
84
|
+
via: 'session-ctrip-flight-error',
|
|
85
|
+
evidence: '[会话:ctrip-flight@offline] GOTRY_SESSION_LIVE!=1; live transport not invoked',
|
|
86
|
+
latencyMs: 0,
|
|
87
|
+
verdict: 'error',
|
|
88
|
+
error: 'GOTRY_SESSION_LIVE=1 required for live session transport',
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
/** Gate a caller before it can invoke the browser/session transport. */
|
|
93
|
+
export async function gatedSessionFlightSearch(
|
|
94
|
+
q: SessionFlightQuery,
|
|
95
|
+
search: (query: SessionFlightQuery) => Promise<SessionSearchResult> = sessionFlightSearch,
|
|
96
|
+
env: Partial<Pick<NodeJS.ProcessEnv, 'GOTRY_SESSION_LIVE'>> = process.env,
|
|
97
|
+
): Promise<SessionSearchResult> {
|
|
98
|
+
if (!sessionLiveEnabled(env)) return offlineSessionFlightResult()
|
|
99
|
+
return search(q)
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
/** 扩展车道 job 审计(ReadGuard 审计同款 JSONL,kind 区分;auditPath 缺省不落盘) */
|
|
103
|
+
export function appendExtensionAudit(auditPath: string | undefined, entry: { kind: 'extension-session-job'; site: string; url: string; jobId: string; result: string }): void {
|
|
104
|
+
if (!auditPath) return
|
|
105
|
+
try {
|
|
106
|
+
const record = { ts: new Date().toISOString(), ...entry, url: entry.url.slice(0, 400) }
|
|
107
|
+
mkdirSync(dirname(auditPath), { recursive: true })
|
|
108
|
+
appendFileSync(auditPath, JSON.stringify(record) + '\n')
|
|
109
|
+
} catch { /* 审计失败不阻塞检索 */ }
|
|
110
|
+
}
|
|
111
|
+
|
|
57
112
|
export async function sessionFlightSearch(q: SessionFlightQuery): Promise<SessionSearchResult> {
|
|
58
113
|
const started = Date.now()
|
|
59
114
|
const ts = new Date().toISOString()
|
|
@@ -74,8 +129,55 @@ export async function sessionFlightSearch(q: SessionFlightQuery): Promise<Sessio
|
|
|
74
129
|
return err('error', `unresolved entry: ${(entry.unresolved ?? []).join('/')} 不在城市码表`)
|
|
75
130
|
}
|
|
76
131
|
|
|
132
|
+
const mode = resolveTransportMode(q.profileDir)
|
|
133
|
+
|
|
134
|
+
if (mode === 'extension') {
|
|
135
|
+
// ① 登录态快查:票据 cookie 名存在性(免标签页,秒回;needs-login 不再先付一次导航成本)
|
|
136
|
+
const login = await extensionCookieNames({ site, domain: SITE_DOMAIN.replace(/^\./, ''), ticketNames: LOGIN_COOKIE_NAMES })
|
|
137
|
+
if (!login.ok) {
|
|
138
|
+
const verdict = classifyBridgeFailure(login.kind)
|
|
139
|
+
if (verdict === 'needs-extension') {
|
|
140
|
+
return { ok: false, via: 'session-ctrip-flight-error', evidence: '[会话:ctrip-flight-needs-extension@ts]', latencyMs: Date.now() - started, verdict, error: login.summary, installUrl: EXTENSION_STORE_URL, installAction: 'add-to-chrome' as const }
|
|
141
|
+
}
|
|
142
|
+
return err(verdict, login.summary)
|
|
143
|
+
}
|
|
144
|
+
// 登录态闸:用户自己的账号;匿名默认拒(allowAnonymous 仅链路自检且证据标自检态)
|
|
145
|
+
if (login.tickets.length === 0 && !q.allowAnonymous) {
|
|
146
|
+
return err('needs-login', '未检出你本人登录态——调用 gotry_session_login 为用户打开携程登录入口(登录在携程官网完成;gotry 永不经手密码/验证码/cookie 值)')
|
|
147
|
+
}
|
|
148
|
+
// ② 检索 job:后台标签 + MAIN-world 被动嗅探(检索请求由站点自己发出,扩展零写行为)
|
|
149
|
+
const r = await extensionSearchJob({ site, url: entry.url, timeoutMs: q.timeoutMs })
|
|
150
|
+
appendExtensionAudit(q.auditPath, {
|
|
151
|
+
kind: 'extension-session-job', site, url: entry.url, jobId: 'search',
|
|
152
|
+
result: r.ok ? (r.timedOut ? 'timeout' : `body ${r.body.length}B title="${r.title.slice(0, 60)}"`) : `${r.kind}:${r.summary.slice(0, 120)}`,
|
|
153
|
+
})
|
|
154
|
+
if (!r.ok) {
|
|
155
|
+
const verdict = classifyBridgeFailure(r.kind)
|
|
156
|
+
if (verdict === 'needs-extension') {
|
|
157
|
+
return { ok: false, via: 'session-ctrip-flight-error', evidence: '[会话:ctrip-flight-needs-extension@ts]', latencyMs: Date.now() - started, verdict, error: r.summary, installUrl: EXTENSION_STORE_URL, installAction: 'add-to-chrome' as const }
|
|
158
|
+
}
|
|
159
|
+
return err(verdict, r.summary)
|
|
160
|
+
}
|
|
161
|
+
const title = r.title
|
|
162
|
+
const head = r.body.slice(0, 5000)
|
|
163
|
+
if (CHALLENGE_RE.test(title + head)) {
|
|
164
|
+
return err('challenged', `风控/验证码命中(title=${title.slice(0, 60)});按红线不重试不绕过,交还用户`)
|
|
165
|
+
}
|
|
166
|
+
const options = parseBatchSearch(r.body)
|
|
167
|
+
const verdict: SessionVerdict = options.length > 0 ? 'hit' : 'miss'
|
|
168
|
+
return {
|
|
169
|
+
ok: true,
|
|
170
|
+
via: 'session-ctrip-flight',
|
|
171
|
+
evidence: `[会话:${site}@${ts}] ${options.length} options;transport=extension(被动嗅探,零系统弹窗;扩展零写行为=物理只读)${q.allowAnonymous ? ';anonymous=自检态' : ''}`,
|
|
172
|
+
latencyMs: Date.now() - started,
|
|
173
|
+
verdict,
|
|
174
|
+
options,
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
|
|
77
178
|
// 人机共治纪律:检索一律开自己的新标签页(绝不劫持用户已有页面),用完关自己的页
|
|
78
|
-
|
|
179
|
+
// cdp 车道(显式 GOTRY_SESSION_TRANSPORT=cdp opt-in)与 persistent(测试隔离 profile)
|
|
180
|
+
const t = await openSession({ profileDir: q.profileDir, headless: q.headless, auditPath: q.auditPath, mode: mode === 'persistent' ? 'persistent' : 'cdp', newPage: true })
|
|
79
181
|
if (!t.ok) {
|
|
80
182
|
// cdp 未开端口或握手失败 → needs-attach(一次性用户动作);persistent 启动失败仍走 error。
|
|
81
183
|
// transport 的“端口未开”在连接前返回,文案不含 `cdp attach 失败`,两种形态都要归入同一用户门禁。
|