@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,377 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 会话扩展桥(extension-bridge,RFC user-session-data-rfc.md §2.2 通道 C——2026-08-29 founder 定案为 PRIMARY 传输)。
|
|
3
|
+
*
|
|
4
|
+
* 形态:Node http 服务,懒启动单例,只绑 127.0.0.1,端口池 8791-8795(与 extension/manifest.json
|
|
5
|
+
* host_permissions 一一对应,防漂移测试守住);**零新依赖**(node:http 手写,对齐已退役 shell 薄壳
|
|
6
|
+
* 的回环纪律;不引 ws——MV3 Service Worker 靠 ≤20s 的长轮询节奏维持 30s 存活窗口,HTTP 够用)。
|
|
7
|
+
*
|
|
8
|
+
* 授权模型:扩展经「一次性安装」获得信任,每请求校验 Origin ∈ 双通道扩展源白名单
|
|
9
|
+
* (网页发起的跨域请求必带邪恶 Origin,直接 403;POST 端点强制;GET /health /status 是本机
|
|
10
|
+
* 诊断面放行)。不做 CORS——有 host_permissions 的扩展 fetch 天然免预检,网页过不来。
|
|
11
|
+
* 双通道 ID 实录(2026-09-02):unpacked 通道(bundled/GitHub Releases)由 manifest 固定 key
|
|
12
|
+
* 派生 EXTENSION_ID;Chrome Web Store 用商店自己的签名 key 重签(不认 manifest key),
|
|
13
|
+
* 商店版 ID = EXTENSION_ID_STORE。两个 ID 都是 founder 控制的同一扩展,白名单双收。
|
|
14
|
+
*
|
|
15
|
+
* 协议(长轮询):
|
|
16
|
+
* GET /health → lastSeen 刷新(扩展每 ≤30s 一次 + 每次断线重连)
|
|
17
|
+
* GET /status → 诊断面 {port, extensionConnected, lastSeenMsAgo, queued, inFlight, parked}
|
|
18
|
+
* POST /jobs → 长轮询取活(hold ≤20s 返 {job:null});扩展单客户端
|
|
19
|
+
* POST /results/:jobId → 善果/失败回传(≤8MB;batchSearch ~550KB)
|
|
20
|
+
* 语义:桥不存在即整个扩展车道不存在——fail-closed 不变量在调用方(session-search 的 needs-extension)。
|
|
21
|
+
* 审计:job 提交/回传写 GuardAuditEntry 同款 JSONL(kind:'extension-session-job',channel 层负责)。
|
|
22
|
+
*/
|
|
23
|
+
|
|
24
|
+
import { randomUUID } from 'node:crypto'
|
|
25
|
+
import { createServer, type IncomingMessage, type Server, type ServerResponse } from 'node:http'
|
|
26
|
+
|
|
27
|
+
/** 桥端口池(extension/manifest.json host_permissions 必须同面;§38 断言) */
|
|
28
|
+
export const BRIDGE_PORTS = [8791, 8792, 8793, 8794, 8795] as const
|
|
29
|
+
export const BRIDGE_PROTOCOL = 'session-bridge.v1'
|
|
30
|
+
/** 扩展固定 ID(unpacked 通道:manifest key 派生;bundled/GitHub Releases 均此 ID。变更即失配,Node 侧拒绝) */
|
|
31
|
+
export const EXTENSION_ID = 'olpgkofjhhiiiahdkkbcninhjmegghfe'
|
|
32
|
+
export const EXTENSION_ORIGIN = `chrome-extension://${EXTENSION_ID}`
|
|
33
|
+
/**
|
|
34
|
+
* Chrome Web Store 版扩展 ID(2026-09-02 上架):商店用自己生成的签名 key 重签,
|
|
35
|
+
* **不认 manifest 里的固定 key**——商店版 ID 与 unpacked 版不同(上架材料文档的
|
|
36
|
+
* 「若商店不认 key」预案坐实)。item ID 即商店详情页 URL 末段。
|
|
37
|
+
*/
|
|
38
|
+
export const EXTENSION_ID_STORE = 'oeajpiccmonococjcegddlooeeohlbgd'
|
|
39
|
+
export const EXTENSION_ORIGIN_STORE = `chrome-extension://${EXTENSION_ID_STORE}`
|
|
40
|
+
/** 商店详情页(一键安装 + 自动更新通道;推荐安装方式) */
|
|
41
|
+
export const EXTENSION_STORE_URL = `https://chromewebstore.google.com/detail/gotry-session-bridge/${EXTENSION_ID_STORE}`
|
|
42
|
+
/** 桥信任的扩展 Origin 白名单:unpacked(固定 key)+ 商店版,双通道同一扩展同源信任 */
|
|
43
|
+
export const EXTENSION_ORIGINS: readonly string[] = [EXTENSION_ORIGIN, EXTENSION_ORIGIN_STORE]
|
|
44
|
+
/** 扩展在线判定:/health 心跳 ≤30s 一次 + 轮询重连,1.5 倍容差 */
|
|
45
|
+
export const EXTENSION_CONNECTED_WINDOW_MS = 45_000
|
|
46
|
+
/** /jobs 长轮询 hold 上限(必须 < MV3 SW 30s 存活窗口) */
|
|
47
|
+
export const JOBS_LONG_POLL_MS = 20_000
|
|
48
|
+
/** 提交 job 时扩展尚未上线,等它连上桥的宽限(首次调用后桥才拉起,扩展 5s 内即回连) */
|
|
49
|
+
export const DEFAULT_EXTENSION_WAIT_MS = 6_000
|
|
50
|
+
/** /results 回包上限(batchSearch ~550KB,余量给未来酒店/多航段) */
|
|
51
|
+
export const MAX_RESULT_BODY_BYTES = 8 * 1024 * 1024
|
|
52
|
+
|
|
53
|
+
export type ExtensionJobKind = 'search' | 'open-login' | 'cookie-names'
|
|
54
|
+
|
|
55
|
+
export interface ExtensionJob {
|
|
56
|
+
jobId: string
|
|
57
|
+
kind: ExtensionJobKind
|
|
58
|
+
site: string
|
|
59
|
+
/** search / open-login:置顶导航地址(白名单域在扩展侧再校验一道) */
|
|
60
|
+
url?: string
|
|
61
|
+
/** search:等嗅探回包上限 */
|
|
62
|
+
timeoutMs?: number
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
export interface ExtensionJobResult {
|
|
66
|
+
ok: boolean
|
|
67
|
+
kind?: ExtensionJobKind
|
|
68
|
+
/** cookie-names:命中票据名(名字级——协议面不存在 cookie 值字段) */
|
|
69
|
+
names?: string[]
|
|
70
|
+
/** search:NETWORK_HINTS 命中的响应原文 */
|
|
71
|
+
body?: string
|
|
72
|
+
title?: string
|
|
73
|
+
opened?: boolean
|
|
74
|
+
timeout?: boolean
|
|
75
|
+
error?: string
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
export type SubmitOutcome =
|
|
79
|
+
| { ok: true; result: ExtensionJobResult }
|
|
80
|
+
| { ok: false; reason: 'bridge-unavailable' | 'extension-not-connected' | 'timeout'; summary: string }
|
|
81
|
+
|
|
82
|
+
export interface SessionJobHandle {
|
|
83
|
+
submit(job: Omit<ExtensionJob, 'jobId'>, opts?: { timeoutMs?: number; extensionWaitMs?: number }): Promise<SubmitOutcome>
|
|
84
|
+
extensionConnected(): boolean
|
|
85
|
+
port: number
|
|
86
|
+
close(): Promise<void>
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
export interface SessionBridgeOptions {
|
|
90
|
+
/** 测试用 [0] 让 OS 分配;缺省 8791..8795 端口池 */
|
|
91
|
+
ports?: number[]
|
|
92
|
+
/** 测试覆盖信任的扩展 Origin 白名单;缺省 EXTENSION_ORIGINS(unpacked + 商店版双通道) */
|
|
93
|
+
extensionOrigins?: readonly string[]
|
|
94
|
+
now?: () => number
|
|
95
|
+
/**
|
|
96
|
+
* **保持桥进程钉住事件循环**(不 unref)。wizard 期间需要:扩展 SW 周期心跳
|
|
97
|
+
* ≤30s,unref 后 wizard main 一退桥就退,扩展再发心跳连不上 → 误判扩展未就绪。
|
|
98
|
+
* 真实 session 检索走单 job 流程,默认 unref=true(任何跑完主流程的宿主进程能退出)。
|
|
99
|
+
* run-all §40 onboarding-tests 用 keepBridge=true 验证 wizard 探活;
|
|
100
|
+
* §38 session 套件走默认 unref,语义不变。
|
|
101
|
+
*/
|
|
102
|
+
keepBridge?: boolean
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
interface QueuedJob {
|
|
106
|
+
job: ExtensionJob
|
|
107
|
+
resolve: (outcome: SubmitOutcome) => void
|
|
108
|
+
timer: ReturnType<typeof setTimeout> | null
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
function readBody(req: IncomingMessage, cap: number): Promise<string | { err: string }> {
|
|
112
|
+
return new Promise((resolve) => {
|
|
113
|
+
const chunks: Buffer[] = []
|
|
114
|
+
let size = 0
|
|
115
|
+
let done = false
|
|
116
|
+
req.on('data', (c: Buffer) => {
|
|
117
|
+
if (done) return
|
|
118
|
+
size += c.length
|
|
119
|
+
if (size > cap) {
|
|
120
|
+
done = true
|
|
121
|
+
req.removeAllListeners('data')
|
|
122
|
+
resolve({ err: `body 超 ${cap} 字节上限(防失控回包)` })
|
|
123
|
+
return
|
|
124
|
+
}
|
|
125
|
+
chunks.push(c)
|
|
126
|
+
})
|
|
127
|
+
req.on('end', () => { if (!done) { done = true; resolve(Buffer.concat(chunks).toString('utf8')) } })
|
|
128
|
+
req.on('error', () => { if (!done) { done = true; resolve({ err: 'body 读取失败' }) } })
|
|
129
|
+
})
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
/** 创 Bridge 服务(测试可直接调;生产走 getOrCreateSessionBridge 懒单例) */
|
|
133
|
+
export async function createSessionBridge(opts: SessionBridgeOptions = {}): Promise<{ ok: true; bridge: SessionJobHandle } | { ok: false; summary: string }> {
|
|
134
|
+
const ports = opts.ports ?? [...BRIDGE_PORTS]
|
|
135
|
+
const extensionOrigins = new Set(opts.extensionOrigins ?? EXTENSION_ORIGINS)
|
|
136
|
+
const now = opts.now ?? Date.now
|
|
137
|
+
const queue: QueuedJob[] = []
|
|
138
|
+
const inFlight = new Map<string, QueuedJob>()
|
|
139
|
+
const parked: Array<{ res: ServerResponse; timer: ReturnType<typeof setTimeout> }> = []
|
|
140
|
+
let lastSeenAt = 0
|
|
141
|
+
let closed = false
|
|
142
|
+
let port = 0
|
|
143
|
+
const extensionConnected = (): boolean => lastSeenAt > 0 && now() - lastSeenAt < EXTENSION_CONNECTED_WINDOW_MS
|
|
144
|
+
|
|
145
|
+
/** 领走队首 job(移入 inFlight——回包按 jobId 路由,queued 与 inFlight 两处都可找到) */
|
|
146
|
+
function takeQueued(): QueuedJob | null {
|
|
147
|
+
const next = queue.shift()
|
|
148
|
+
if (next) inFlight.set(next.job.jobId, next)
|
|
149
|
+
return next ?? null
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
const server = createServer((req, res) => {
|
|
153
|
+
if (closed) { res.statusCode = 503; res.end(); return }
|
|
154
|
+
const urlPath = (req.url ?? '').split('?')[0]
|
|
155
|
+
const origin = req.headers.origin
|
|
156
|
+
const isPost = req.method === 'POST'
|
|
157
|
+
const originTrusted = typeof origin === 'string' && extensionOrigins.has(origin)
|
|
158
|
+
// 网页侧请求必带 Origin;桥端点只信任白名单内的 chrome-extension:// 源(诊断 GET 面放行)
|
|
159
|
+
if (isPost && !originTrusted) {
|
|
160
|
+
res.statusCode = 403
|
|
161
|
+
res.setHeader('content-type', 'application/json')
|
|
162
|
+
res.end(JSON.stringify({ ok: false, error: 'origin 不在桥白名单' }))
|
|
163
|
+
return
|
|
164
|
+
}
|
|
165
|
+
// 心跳:扩展平时只走 /jobs 长轮询(健康只在启动探测时 ping 一次)——
|
|
166
|
+
// 一切携带白名单扩展 Origin 的请求都刷新 lastSeen,否则 45s 后误判扩展掉线;
|
|
167
|
+
// 无 Origin 的诊断 GET(/health /status)不记心跳,curl 探活不能伪造「扩展在线」
|
|
168
|
+
if (originTrusted) {
|
|
169
|
+
lastSeenAt = now()
|
|
170
|
+
}
|
|
171
|
+
const finish = (code: number, body: unknown): void => {
|
|
172
|
+
res.statusCode = code
|
|
173
|
+
res.setHeader('content-type', 'application/json')
|
|
174
|
+
res.end(JSON.stringify(body))
|
|
175
|
+
}
|
|
176
|
+
if (req.method === 'GET' && urlPath === '/health') {
|
|
177
|
+
finish(200, { ok: true, service: 'gotry-session-bridge', protocol: BRIDGE_PROTOCOL })
|
|
178
|
+
return
|
|
179
|
+
}
|
|
180
|
+
if (req.method === 'GET' && urlPath === '/status') {
|
|
181
|
+
finish(200, {
|
|
182
|
+
ok: true, port, protocol: BRIDGE_PROTOCOL,
|
|
183
|
+
extensionConnected: extensionConnected(),
|
|
184
|
+
lastSeenMsAgo: lastSeenAt > 0 ? now() - lastSeenAt : null,
|
|
185
|
+
queued: queue.length,
|
|
186
|
+
inFlight: inFlight.size,
|
|
187
|
+
parked: parked.length,
|
|
188
|
+
})
|
|
189
|
+
return
|
|
190
|
+
}
|
|
191
|
+
if (isPost && urlPath === '/jobs') {
|
|
192
|
+
const next = takeQueued()
|
|
193
|
+
if (next) { finish(200, { job: next.job }); return }
|
|
194
|
+
// 长轮询:hold ≤ JOBS_LONG_POLL_MS(必须 < MV3 SW 30s 存活窗口,每次响应都续命);
|
|
195
|
+
// 新 job 提交时即时唤醒 parked 取活者(见 submit→dispatchToParked)
|
|
196
|
+
const parkTimer = setTimeout(() => {
|
|
197
|
+
const i = parked.findIndex((p) => p.res === res)
|
|
198
|
+
if (i >= 0) parked.splice(i, 1)
|
|
199
|
+
finish(200, { job: null })
|
|
200
|
+
}, JOBS_LONG_POLL_MS)
|
|
201
|
+
// 默认桥是惰性能力:外部扩展的 parked 轮询不得在主流程结束后钉住 CLI。
|
|
202
|
+
// keepBridge wizard 反过来要靠它守住进程,因此只对默认形态 unref。
|
|
203
|
+
if (!opts.keepBridge) parkTimer.unref()
|
|
204
|
+
parked.push({ res, timer: parkTimer })
|
|
205
|
+
res.on('close', () => {
|
|
206
|
+
const i = parked.findIndex((p) => p.res === res)
|
|
207
|
+
if (i >= 0) parked.splice(i, 1)
|
|
208
|
+
clearTimeout(parkTimer)
|
|
209
|
+
})
|
|
210
|
+
return
|
|
211
|
+
}
|
|
212
|
+
if (isPost && urlPath.startsWith('/results/')) {
|
|
213
|
+
const jobId = decodeURIComponent(urlPath.slice('/results/'.length))
|
|
214
|
+
void readBody(req, MAX_RESULT_BODY_BYTES).then((body) => {
|
|
215
|
+
if (typeof body !== 'string') { finish(400, { ok: false, error: body.err }); return }
|
|
216
|
+
let parsed: ExtensionJobResult
|
|
217
|
+
try {
|
|
218
|
+
parsed = JSON.parse(body) as ExtensionJobResult
|
|
219
|
+
} catch {
|
|
220
|
+
finish(400, { ok: false, error: '回包不是 JSON' })
|
|
221
|
+
return
|
|
222
|
+
}
|
|
223
|
+
finish(200, { ok: true })
|
|
224
|
+
resolveJob(jobId, parsed)
|
|
225
|
+
})
|
|
226
|
+
return
|
|
227
|
+
}
|
|
228
|
+
finish(404, { ok: false, error: 'unknown endpoint' })
|
|
229
|
+
})
|
|
230
|
+
server.on('connection', (socket) => {
|
|
231
|
+
// server.unref() 只解开监听器;已接受的扩展长轮询 socket 仍会引用事件循环。
|
|
232
|
+
if (!opts.keepBridge) socket.unref()
|
|
233
|
+
})
|
|
234
|
+
|
|
235
|
+
/** 扩展回包:queued 与 inFlight 两处都可寻址(job 执行失败 = result.ok:false,桥自身不吞) */
|
|
236
|
+
function resolveJob(jobId: string, parsed: ExtensionJobResult): void {
|
|
237
|
+
const inFlightHit = inFlight.get(jobId)
|
|
238
|
+
if (inFlightHit) {
|
|
239
|
+
inFlight.delete(jobId)
|
|
240
|
+
if (inFlightHit.timer) clearTimeout(inFlightHit.timer)
|
|
241
|
+
inFlightHit.resolve({ ok: true, result: parsed })
|
|
242
|
+
return
|
|
243
|
+
}
|
|
244
|
+
const idx = queue.findIndex((q) => q.job.jobId === jobId)
|
|
245
|
+
if (idx < 0) return
|
|
246
|
+
const [entry] = queue.splice(idx, 1)
|
|
247
|
+
if (entry.timer) clearTimeout(entry.timer)
|
|
248
|
+
entry.resolve({ ok: true, result: parsed })
|
|
249
|
+
}
|
|
250
|
+
|
|
251
|
+
/** 新 job 入队时即时派发给 parked 取活者(否则要白等一个 20s 长轮询周期) */
|
|
252
|
+
function dispatchToParked(entry: QueuedJob): boolean {
|
|
253
|
+
const p = parked.shift()
|
|
254
|
+
if (!p) return false
|
|
255
|
+
clearTimeout(p.timer)
|
|
256
|
+
inFlight.set(entry.job.jobId, entry)
|
|
257
|
+
p.res.statusCode = 200
|
|
258
|
+
p.res.setHeader('content-type', 'application/json')
|
|
259
|
+
p.res.end(JSON.stringify({ job: entry.job }))
|
|
260
|
+
return true
|
|
261
|
+
}
|
|
262
|
+
|
|
263
|
+
const bridge: SessionJobHandle = {
|
|
264
|
+
port: 0,
|
|
265
|
+
extensionConnected,
|
|
266
|
+
submit(job, submitOpts = {}) {
|
|
267
|
+
const extensionWaitMs = submitOpts.extensionWaitMs ?? DEFAULT_EXTENSION_WAIT_MS
|
|
268
|
+
const timeoutMs = submitOpts.timeoutMs ?? job.timeoutMs ?? 30_000
|
|
269
|
+
const full: ExtensionJob = { jobId: randomUUID(), ...job }
|
|
270
|
+
return new Promise<SubmitOutcome>((resolve) => {
|
|
271
|
+
if (closed) { resolve({ ok: false, reason: 'bridge-unavailable', summary: '扩展桥已关闭' }); return }
|
|
272
|
+
const entry = { job: full, resolve: null as unknown as (o: SubmitOutcome) => void, timer: null as ReturnType<typeof setTimeout> | null }
|
|
273
|
+
const settle = (outcome: SubmitOutcome): void => {
|
|
274
|
+
if (entry.timer) clearTimeout(entry.timer)
|
|
275
|
+
const i = queue.findIndex((q) => q.job.jobId === full.jobId)
|
|
276
|
+
if (i >= 0) queue.splice(i, 1)
|
|
277
|
+
inFlight.delete(full.jobId)
|
|
278
|
+
resolve(outcome)
|
|
279
|
+
}
|
|
280
|
+
entry.resolve = settle
|
|
281
|
+
entry.timer = setTimeout(() => {
|
|
282
|
+
settle({ ok: false, reason: 'timeout', summary: `扩展未在 ${timeoutMs}ms 内回包(标签页无嗅探命中或扩展已停用)` })
|
|
283
|
+
}, timeoutMs)
|
|
284
|
+
if (!dispatchToParked(entry)) queue.push(entry)
|
|
285
|
+
// 扩展未上线:有界等待(桥刚拉起时扩展 ≤5s 即连上);宽限过仍无 → 立即 no-spend 失败,不空耗
|
|
286
|
+
let waited = 0
|
|
287
|
+
const waitTimer = setInterval(() => {
|
|
288
|
+
waited += 250
|
|
289
|
+
if (bridge.extensionConnected()) { clearInterval(waitTimer); return }
|
|
290
|
+
if (waited >= extensionWaitMs) {
|
|
291
|
+
clearInterval(waitTimer)
|
|
292
|
+
settle({
|
|
293
|
+
ok: false,
|
|
294
|
+
reason: 'extension-not-connected',
|
|
295
|
+
summary: `GoTry Session Bridge 扩展未连接(未安装或已停用)。一次性安装(装完零弹窗):推荐 Chrome 应用商店一键装(自动更新) ${EXTENSION_STORE_URL} ;或 npx gotry setup 落位后 chrome://extensions 开发者模式「加载已解压的扩展程序」指向 ~/.gotry/extension`,
|
|
296
|
+
})
|
|
297
|
+
}
|
|
298
|
+
}, 250)
|
|
299
|
+
})
|
|
300
|
+
},
|
|
301
|
+
close: () =>
|
|
302
|
+
new Promise<void>((resolve) => {
|
|
303
|
+
closed = true
|
|
304
|
+
const voided: SubmitOutcome = { ok: false, reason: 'bridge-unavailable', summary: '扩展桥关闭,任务作废(零花费)' }
|
|
305
|
+
for (const q of queue.splice(0)) {
|
|
306
|
+
if (q.timer) clearTimeout(q.timer)
|
|
307
|
+
q.resolve(voided)
|
|
308
|
+
}
|
|
309
|
+
for (const [, q] of inFlight) {
|
|
310
|
+
if (q.timer) clearTimeout(q.timer)
|
|
311
|
+
q.resolve(voided)
|
|
312
|
+
}
|
|
313
|
+
inFlight.clear()
|
|
314
|
+
for (const p of parked.splice(0)) {
|
|
315
|
+
clearTimeout(p.timer)
|
|
316
|
+
p.res.destroy()
|
|
317
|
+
}
|
|
318
|
+
server.close(() => resolve())
|
|
319
|
+
server.closeAllConnections?.()
|
|
320
|
+
}),
|
|
321
|
+
}
|
|
322
|
+
|
|
323
|
+
const listenAt = (p: number): Promise<void> =>
|
|
324
|
+
new Promise((resolve, reject) => {
|
|
325
|
+
const onError = (e: Error): void => { server.off('listening', onListening); reject(e) }
|
|
326
|
+
const onListening = (): void => { server.off('error', onError); resolve() }
|
|
327
|
+
server.once('error', onError)
|
|
328
|
+
server.once('listening', onListening)
|
|
329
|
+
server.listen(p, '127.0.0.1')
|
|
330
|
+
})
|
|
331
|
+
|
|
332
|
+
for (const p of ports) {
|
|
333
|
+
try {
|
|
334
|
+
await listenAt(p)
|
|
335
|
+
if (!opts.keepBridge) {
|
|
336
|
+
// 桥是后台服务:不得钉住事件循环——否则任何跑完主流程的宿主进程(如 smoke/CI)无法退出
|
|
337
|
+
server.unref()
|
|
338
|
+
}
|
|
339
|
+
// keepBridge 模式下:wizard 期间要持续监听扩展心跳(30s 周期),
|
|
340
|
+
// 不 unref 让 server 钉事件循环,wizard main 退时再显式 close 释放。
|
|
341
|
+
port = (server.address() as { port: number }).port
|
|
342
|
+
bridge.port = port
|
|
343
|
+
return { ok: true, bridge }
|
|
344
|
+
} catch {
|
|
345
|
+
// 端口被占(如另一个 gotry 实例)——试端口池下一个
|
|
346
|
+
}
|
|
347
|
+
}
|
|
348
|
+
return {
|
|
349
|
+
ok: false,
|
|
350
|
+
summary: `扩展桥端口池 ${ports.join('/')} 全部被占(多为并行 gotry 实例);不影响官方通道 gotry_flyai_search。关闭多余实例后重试。`,
|
|
351
|
+
}
|
|
352
|
+
}
|
|
353
|
+
|
|
354
|
+
/* ---------- 生产懒单例(进程内随 dsh 存活;失败可重试) ---------- */
|
|
355
|
+
|
|
356
|
+
let singleton: { ok: true; bridge: SessionJobHandle } | { ok: false; summary: string } | null = null
|
|
357
|
+
|
|
358
|
+
export async function getOrCreateSessionBridge(opts: SessionBridgeOptions = {}): Promise<{ ok: true; bridge: SessionJobHandle } | { ok: false; summary: string }> {
|
|
359
|
+
if (singleton) return singleton
|
|
360
|
+
const created = await createSessionBridge(opts)
|
|
361
|
+
const result = created.ok
|
|
362
|
+
? ({ ok: true, bridge: created.bridge } as { ok: true; bridge: SessionJobHandle })
|
|
363
|
+
: ({ ok: false, summary: created.summary } as { ok: false; summary: string })
|
|
364
|
+
singleton = result
|
|
365
|
+
return result
|
|
366
|
+
}
|
|
367
|
+
|
|
368
|
+
/** 测试隔离:丢弃单例(端口是进程内资源,close 后端口池立即可复用) */
|
|
369
|
+
export async function __resetSessionBridgeForTest(): Promise<void> {
|
|
370
|
+
if (singleton?.ok) await singleton.bridge.close().catch(() => { /* ignore */ })
|
|
371
|
+
singleton = null
|
|
372
|
+
}
|
|
373
|
+
|
|
374
|
+
/** 测试注入:以临时端口的桥替换单例(channel 层测试不碰真实端口池) */
|
|
375
|
+
export function __setSessionBridgeForTest(bridge: SessionJobHandle | null): void {
|
|
376
|
+
singleton = bridge ? { ok: true, bridge } : null
|
|
377
|
+
}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 扩展车道客户端(RFC §2.2 通道 C,2026-08-29 PRIMARY;issue #21 传输层方案 B)。
|
|
3
|
+
*
|
|
4
|
+
* 三种 job 封装:search(被动嗅探 batchSearch)/ open-login(登录入口置前台)/
|
|
5
|
+
* cookie-names(票据 cookie **名字**,协议面不存在值字段)。verdict 映射纯函数
|
|
6
|
+
* `classifyBridgeFailure` 供回归覆盖:
|
|
7
|
+
* - extension-not-connected → 'needs-extension'(waiting no-spend,一次性安装指引;
|
|
8
|
+
* **不静默回退 CDP**——回退即重新引入逐连接权限框,正是本通道要消灭的摩擦);
|
|
9
|
+
* - bridge-unavailable(端口池全占等环境故障)→ 'error'(非用户门)。
|
|
10
|
+
* 检索页无回包不是车道失败:与 CDP 车道同语义(到点无 hints 命中 ⇒ miss,页标题命挑战 ⇒ challenged)。
|
|
11
|
+
*/
|
|
12
|
+
|
|
13
|
+
import { getOrCreateSessionBridge, EXTENSION_STORE_URL, type SessionJobHandle } from './extension-bridge.ts'
|
|
14
|
+
|
|
15
|
+
/** 一次性用户门文案(needs-extension 统一指引,与 bootstrap setupExtension 输出同口径) */
|
|
16
|
+
export const NEEDS_EXTENSION_HINT =
|
|
17
|
+
'需要一次性安装 GoTry Session Bridge 浏览器扩展(装完零弹窗):'
|
|
18
|
+
+ `推荐 Chrome 应用商店一键安装(自动更新) ${EXTENSION_STORE_URL} ;`
|
|
19
|
+
+ '免审核、版本更新更快的 GitHub 通道:npx gotry setup --extension-from=github(自动下载落位 ~/.gotry/extension;'
|
|
20
|
+
+ '手动下载 github.com/Danceiny/gotry/releases 标签 ext-* 的 gotry-session-bridge.tar.gz),'
|
|
21
|
+
+ '再在 chrome://extensions 开发者模式「加载已解压的扩展程序」指向解压目录'
|
|
22
|
+
|
|
23
|
+
export type BridgeFailureKind = 'bridge-unavailable' | 'extension-not-connected' | 'timeout' | 'job-error'
|
|
24
|
+
|
|
25
|
+
export interface BridgeFailure {
|
|
26
|
+
ok: false
|
|
27
|
+
kind: BridgeFailureKind
|
|
28
|
+
summary: string
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/** 桥故障 → 用户门 verdict 纯函数(测试锚点):只有「扩展未连接」是用户门(waiting),其余降级 error */
|
|
32
|
+
export function classifyBridgeFailure(kind: BridgeFailureKind): 'needs-extension' | 'error' {
|
|
33
|
+
return kind === 'extension-not-connected' ? 'needs-extension' : 'error'
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
export interface SessionJobHandleRef {
|
|
37
|
+
ok: true
|
|
38
|
+
bridge: SessionJobHandle
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
function bridgeReady(b: { ok: true; bridge: SessionJobHandle } | { ok: false; summary: string }): b is SessionJobHandleRef {
|
|
42
|
+
return b.ok === true
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/** cookie-names job:票据 cookie 名存在性(名字级;协议不含值) */
|
|
46
|
+
export async function extensionCookieNames(q: { site: string; domain: string; ticketNames: string[]; timeoutMs?: number }): Promise<{ ok: true; tickets: string[] } | BridgeFailure> {
|
|
47
|
+
const bridge = await getOrCreateSessionBridge()
|
|
48
|
+
if (!bridgeReady(bridge)) return { ok: false, kind: 'bridge-unavailable', summary: bridge.summary }
|
|
49
|
+
const outcome = await bridge.bridge.submit(
|
|
50
|
+
{ kind: 'cookie-names', site: q.site, timeoutMs: q.timeoutMs ?? 8_000 },
|
|
51
|
+
{ timeoutMs: q.timeoutMs ?? 8_000 },
|
|
52
|
+
)
|
|
53
|
+
if (!outcome.ok) return { ok: false, kind: outcome.reason, summary: outcome.summary }
|
|
54
|
+
const names = Array.isArray(outcome.result.names) ? outcome.result.names.filter((n): n is string => typeof n === 'string') : []
|
|
55
|
+
// 红线自证:隧道面只有名字(extension-tests §红线断言协议面无值字段)
|
|
56
|
+
return { ok: true, tickets: names }
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/** 登录入口置前台打开(#34 纪律:标签留给用户,扩展侧不 close) */
|
|
60
|
+
export async function extensionOpenLogin(q: { site: string; url: string; timeoutMs?: number }): Promise<{ ok: true; opened: boolean } | BridgeFailure> {
|
|
61
|
+
const bridge = await getOrCreateSessionBridge()
|
|
62
|
+
if (!bridgeReady(bridge)) return { ok: false, kind: 'bridge-unavailable', summary: bridge.summary }
|
|
63
|
+
const outcome = await bridge.bridge.submit({ kind: 'open-login', site: q.site, url: q.url }, { timeoutMs: q.timeoutMs ?? 15_000 })
|
|
64
|
+
if (!outcome.ok) return { ok: false, kind: outcome.reason, summary: outcome.summary }
|
|
65
|
+
if (!outcome.result.opened) return { ok: false, kind: 'job-error', summary: outcome.result.error ?? '登录入口打开失败' }
|
|
66
|
+
return { ok: true, opened: true }
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
export interface ExtensionSearchOutcome {
|
|
70
|
+
ok: true
|
|
71
|
+
/** NETWORK_HINTS 命中的响应原文;未命中/超时为空 */
|
|
72
|
+
body: string
|
|
73
|
+
/** 页标题(challenged 判定素材) */
|
|
74
|
+
title: string
|
|
75
|
+
/** 到点未见 hints 命中(站点无回包/风控拦截页) */
|
|
76
|
+
timedOut: boolean
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/** 检索 job:后台标签打开 entry,等 content hook 的嗅探回包;页无响应=timedOut(非车道失败) */
|
|
80
|
+
export async function extensionSearchJob(q: { site: string; url: string; timeoutMs?: number }): Promise<ExtensionSearchOutcome | BridgeFailure> {
|
|
81
|
+
const bridge = await getOrCreateSessionBridge()
|
|
82
|
+
if (!bridgeReady(bridge)) return { ok: false, kind: 'bridge-unavailable', summary: bridge.summary }
|
|
83
|
+
const timeoutMs = q.timeoutMs ?? 30_000
|
|
84
|
+
const outcome = await bridge.bridge.submit(
|
|
85
|
+
{ kind: 'search', site: q.site, url: q.url, timeoutMs },
|
|
86
|
+
{ timeoutMs: timeoutMs + 10_000 },
|
|
87
|
+
)
|
|
88
|
+
if (!outcome.ok) return { ok: false, kind: outcome.reason, summary: outcome.summary }
|
|
89
|
+
return {
|
|
90
|
+
ok: true,
|
|
91
|
+
body: typeof outcome.result.body === 'string' ? outcome.result.body : '',
|
|
92
|
+
title: typeof outcome.result.title === 'string' ? outcome.result.title : '',
|
|
93
|
+
timedOut: outcome.result.timeout === true,
|
|
94
|
+
}
|
|
95
|
+
}
|