@danceiny/gotry 0.0.1-rc.15 → 0.0.1-rc.17

package/dist/capabilities/session/transport.js

@@ -113,4 +113,4 @@ export async function openSession(opts = {}) {
 }
 
 
-//# sourceURL=/Users/bytedance/work/gotry/ts/capabilities/session/transport.ts
+//# sourceURL=ts/capabilities/session/transport.ts

package/dist/capabilities/session/wizard.js

@@ -0,0 +1,147 @@
+import { copyFileSync, existsSync, mkdirSync, readdirSync, statSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { join } from 'node:path';
+const DEFAULT_SOURCE_DIR_CANDIDATES = [
+    join(process.cwd(), 'extension'),
+    join(process.cwd(), 'dist', 'extension'),
+    join(process.cwd(), 'ts', '..', 'extension')
+];
+function resolveExtensionSourceDir() {
+    for (const candidate of DEFAULT_SOURCE_DIR_CANDIDATES){
+        if (existsSync(join(candidate, 'manifest.json'))) return candidate;
+    }
+    return DEFAULT_SOURCE_DIR_CANDIDATES[0];
+}
+export function defaultExtensionDir() {
+    return join(homedir(), '.gotry', 'extension');
+}
+function ensureExtensionFiles(source, target, dryRun) {
+    if (dryRun) return {
+        step: 'ensure-extension-files',
+        status: 'skip',
+        summary: '[dry-run] skip 扩展落位'
+    };
+    try {
+        if (!existsSync(source) || !existsSync(join(source, 'manifest.json'))) {
+            return {
+                step: 'ensure-extension-files',
+                status: 'fail',
+                summary: `源扩展目录缺失 manifest.json: ${source}(先跑 npx gotry setup 落位)`
+            };
+        }
+        mkdirSync(target, {
+            recursive: true
+        });
+        const required = [
+            'manifest.json',
+            'background.js',
+            'content-main.js',
+            'content-bridge.js'
+        ];
+        for (const f of required){
+            const src = join(source, f);
+            if (!existsSync(src)) return {
+                step: 'ensure-extension-files',
+                status: 'fail',
+                summary: `源扩展缺 ${f}(重新 npm install 或 gotry setup)`
+            };
+            copyFileSync(src, join(target, f));
+        }
+        return {
+            step: 'ensure-extension-files',
+            status: 'ok',
+            summary: `扩展已落位 ${target}(manifest+3 文件)`
+        };
+    } catch (e) {
+        return {
+            step: 'ensure-extension-files',
+            status: 'fail',
+            summary: `扩展落位失败: ${e instanceof Error ? e.message.slice(0, 120) : String(e)}`
+        };
+    }
+}
+async function watchExtensionReady(dryRun, sourceDir, extensionDir) {
+    if (dryRun) return {
+        step: 'watch-extension-ready',
+        status: 'skip',
+        summary: '[dry-run] skip health-watch precheck'
+    };
+    if (!existsSync(extensionDir) || !existsSync(join(extensionDir, 'manifest.json'))) {
+        return {
+            step: 'watch-extension-ready',
+            status: 'fail',
+            summary: `落位缺失 manifest.json:${extensionDir}`
+        };
+    }
+    try {
+        const srcStat = statSync(sourceDir);
+        const dstStat = statSync(extensionDir);
+        if (srcStat.mtimeMs > dstStat.mtimeMs) {
+            return {
+                step: 'watch-extension-ready',
+                status: 'fail',
+                summary: `扩展文件可能过期(源比落位新);重跑 npx gotry setup`
+            };
+        }
+        const manifest = JSON.parse(await (await import('node:fs/promises')).readFile(join(extensionDir, 'manifest.json'), 'utf8'));
+        if (typeof manifest.key !== 'string' || manifest.key.length < 100) {
+            return {
+                step: 'watch-extension-ready',
+                status: 'fail',
+                summary: 'manifest.key 缺失或过短,扩展 ID 不能稳定'
+            };
+        }
+    } catch (e) {
+        return {
+            step: 'watch-extension-ready',
+            status: 'fail',
+            summary: `静态预检失败: ${e instanceof Error ? e.message.slice(0, 120) : String(e)}`
+        };
+    }
+    return {
+        step: 'watch-extension-ready',
+        status: 'ok',
+        summary: '扩展文件就绪(manifest.key 校验通过,后台轮询就绪态由 health-watch 接管)'
+    };
+}
+export async function runOnboardingWizard(opts = {}) {
+    const dryRun = opts.dryRun ?? false;
+    const extensionDir = opts.extensionDir ?? defaultExtensionDir();
+    const sourceDir = opts.sourceDir ?? resolveExtensionSourceDir();
+    const steps = [];
+    steps.push(ensureExtensionFiles(sourceDir, extensionDir, dryRun));
+    steps.push(await watchExtensionReady(dryRun, sourceDir, extensionDir));
+    const ok = steps.every((s)=>s.status !== 'fail');
+    return {
+        ok,
+        steps,
+        extensionDir
+    };
+}
+export function printWizardResult(result, destination = process.stdout) {
+    const tag = (s)=>{
+        if (s.status === 'ok') return '✅';
+        if (s.status === 'skip') return '⏭ ';
+        return '❌';
+    };
+    for (const s of result.steps){
+        destination.write(`${tag(s)} ${s.step}: ${s.summary}\n`);
+    }
+    destination.write(`extensionDir=${result.extensionDir}; overall=${result.ok ? 'ok' : 'has-failures'}\n`);
+}
+export function describeExtensionDir(extensionDir) {
+    if (!existsSync(extensionDir)) return {
+        exists: false,
+        fileCount: 0,
+        hasManifest: false
+    };
+    const files = readdirSync(extensionDir);
+    return {
+        exists: true,
+        fileCount: files.length,
+        hasManifest: files.includes('manifest.json')
+    };
+}
+
+
+//# sourceURL=ts/capabilities/session/wizard.ts

package/dist/capabilities/session-consent.js

@@ -79,4 +79,4 @@ export function approvalFromContext(ctx) {
 }
 
 
-//# sourceURL=/Users/bytedance/work/gotry/ts/capabilities/session-consent.ts
+//# sourceURL=ts/capabilities/session-consent.ts

package/dist/capabilities/session-login.js

@@ -1,4 +1,7 @@
 import { openSession } from './session/transport.js';
+import { extensionCookieNames, extensionOpenLogin, classifyBridgeFailure } from './session/extension-channel.js';
+import { EXTENSION_STORE_URL } from './session/extension-bridge.js';
+import { resolveTransportMode } from './session-search.js';
 export const LOGIN_TARGETS = {
     'ctrip-flight': {
         domain: 'ctrip.com',
@@ -47,6 +50,9 @@ export async function sessionLogin(q = {}) {
     if (!target) {
         return err(site, 'error', `未知站点 ${site}(可选 ${Object.keys(LOGIN_TARGETS).join('/')})`, started, ts);
     }
+    if (resolveTransportMode() === 'extension') {
+        return sessionLoginViaExtension(site, target, q, started, ts);
+    }
     const t = await openSession({
         mode: 'cdp',
         guard: false
@@ -114,6 +120,82 @@ export async function sessionLogin(q = {}) {
         return err(site, 'error', e instanceof Error ? e.message : String(e), started, ts);
     }
 }
+async function sessionLoginViaExtension(site, target, q, started, ts) {
+    const evidenceTag = `[会话:${site}-login@${ts}]`;
+    const quick = (verdict, error)=>{
+        const base = {
+            ok: false,
+            via: 'session-login-error',
+            evidence: `[会话:login-error@${ts}] ${error.slice(0, 200)}`,
+            latencyMs: Date.now() - started,
+            verdict,
+            site,
+            error: error.slice(0, 400)
+        };
+        if (verdict === 'needs-extension') base.installUrl = EXTENSION_STORE_URL;
+        if (verdict === 'needs-extension') base.installAction = 'add-to-chrome';
+        return base;
+    };
+    const pre = await extensionCookieNames({
+        site,
+        domain: target.domain,
+        ticketNames: target.names,
+        timeoutMs: 8_000
+    });
+    if (!pre.ok) return quick(classifyBridgeFailure(pre.kind) === 'needs-extension' ? 'needs-extension' : 'error', pre.summary);
+    if (pre.tickets.length > 0) {
+        return {
+            ok: true,
+            via: 'session-login',
+            latencyMs: Date.now() - started,
+            verdict: 'logged-in',
+            site,
+            tickets: pre.tickets,
+            evidence: `${evidenceTag} 自动检测:票据 cookie 已在(先前登录已生效)——[${pre.tickets.join(', ')}](只读名字,0 网页交互,零弹窗)`
+        };
+    }
+    const opened = await extensionOpenLogin({
+        site,
+        url: target.entryUrl,
+        timeoutMs: 15_000
+    });
+    if (!opened.ok) return quick(classifyBridgeFailure(opened.kind) === 'needs-extension' ? 'needs-extension' : 'error', opened.summary);
+    const waitMs = Math.min(Math.max(q.waitMs ?? 90_000, 0), 300_000);
+    const pollMs = Math.min(Math.max(q.pollMs ?? 3_000, 500), 10_000);
+    const deadline = Date.now() + waitMs;
+    let tickets = [];
+    while(Date.now() < deadline){
+        await new Promise((resolve)=>setTimeout(resolve, pollMs));
+        const poll = await extensionCookieNames({
+            site,
+            domain: target.domain,
+            ticketNames: target.names,
+            timeoutMs: 8_000
+        });
+        if (poll.ok) tickets = poll.tickets;
+        if (tickets.length > 0) break;
+    }
+    if (tickets.length > 0) {
+        return {
+            ok: true,
+            via: 'session-login',
+            latencyMs: Date.now() - started,
+            verdict: 'logged-in',
+            site,
+            tickets,
+            evidence: `${evidenceTag} 票据 cookie 已检出 [${tickets.join(', ')}](只读名字;登录在你自己的浏览器里完成,gotry 全程未接触任何密码/验证码/cookie 值)`
+        };
+    }
+    return {
+        ok: true,
+        via: 'session-login',
+        latencyMs: Date.now() - started,
+        verdict: 'pending',
+        site,
+        tickets: [],
+        evidence: `${evidenceTag} 登录入口已在你的 Chrome 置前打开(${target.label});在标签页里正常登录完成后再说一声「继续查」即可——gotry 只检查"是否已登录",永不收集你的账号信息`
+    };
+}
 
 
-//# sourceURL=/Users/bytedance/work/gotry/ts/capabilities/session-login.ts
+//# sourceURL=ts/capabilities/session-login.ts

package/dist/capabilities/session-search.js

@@ -1,5 +1,9 @@
 import { openSession } from './session/transport.js';
+import { extensionCookieNames, extensionSearchJob, classifyBridgeFailure } from './session/extension-channel.js';
+import { appendFileSync, mkdirSync } from 'node:fs';
+import { dirname } from 'node:path';
 import { buildEntryUrl, NETWORK_HINTS, parseBatchSearch, LOGIN_COOKIE_NAMES, SITE_DOMAIN } from './session/adapters/ctrip-flight.js';
+import { EXTENSION_STORE_URL } from './session/extension-bridge.js';
 const MIN_INTERVAL_MS = 30_000;
 const lastCallAt = new Map();
 export function __resetRateLimiterForTest() {
@@ -9,6 +13,41 @@ const CHALLENGE_RE = /验证|滑块|captcha|verify/i;
 export function classifyTransportFailure(summary, cdpMode) {
     return cdpMode && /日常 Chrome 未开调试端口|cdp attach 失败/.test(summary) ? 'needs-attach' : 'error';
 }
+export function resolveTransportMode(profileDir) {
+    if (profileDir !== undefined) return 'persistent';
+    return (process.env.GOTRY_SESSION_TRANSPORT ?? '').trim().toLowerCase() === 'cdp' ? 'cdp' : 'extension';
+}
+export function sessionLiveEnabled(env = process.env) {
+    return env.GOTRY_SESSION_LIVE === '1';
+}
+export function offlineSessionFlightResult() {
+    return {
+        ok: false,
+        via: 'session-ctrip-flight-error',
+        evidence: '[会话:ctrip-flight@offline] GOTRY_SESSION_LIVE!=1; live transport not invoked',
+        latencyMs: 0,
+        verdict: 'error',
+        error: 'GOTRY_SESSION_LIVE=1 required for live session transport'
+    };
+}
+export async function gatedSessionFlightSearch(q, search = sessionFlightSearch, env = process.env) {
+    if (!sessionLiveEnabled(env)) return offlineSessionFlightResult();
+    return search(q);
+}
+export function appendExtensionAudit(auditPath, entry) {
+    if (!auditPath) return;
+    try {
+        const record = {
+            ts: new Date().toISOString(),
+            ...entry,
+            url: entry.url.slice(0, 400)
+        };
+        mkdirSync(dirname(auditPath), {
+            recursive: true
+        });
+        appendFileSync(auditPath, JSON.stringify(record) + '\n');
+    } catch  {}
+}
 export async function sessionFlightSearch(q) {
     const started = Date.now();
     const ts = new Date().toISOString();
@@ -30,11 +69,81 @@ export async function sessionFlightSearch(q) {
     if (!entry.ok || !entry.url) {
         return err('error', `unresolved entry: ${(entry.unresolved ?? []).join('/')} 不在城市码表`);
     }
+    const mode = resolveTransportMode(q.profileDir);
+    if (mode === 'extension') {
+        const login = await extensionCookieNames({
+            site,
+            domain: SITE_DOMAIN.replace(/^\./, ''),
+            ticketNames: LOGIN_COOKIE_NAMES
+        });
+        if (!login.ok) {
+            const verdict = classifyBridgeFailure(login.kind);
+            if (verdict === 'needs-extension') {
+                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'
+                };
+            }
+            return err(verdict, login.summary);
+        }
+        if (login.tickets.length === 0 && !q.allowAnonymous) {
+            return err('needs-login', '未检出你本人登录态——调用 gotry_session_login 为用户打开携程登录入口(登录在携程官网完成;gotry 永不经手密码/验证码/cookie 值)');
+        }
+        const r = await extensionSearchJob({
+            site,
+            url: entry.url,
+            timeoutMs: q.timeoutMs
+        });
+        appendExtensionAudit(q.auditPath, {
+            kind: 'extension-session-job',
+            site,
+            url: entry.url,
+            jobId: 'search',
+            result: r.ok ? r.timedOut ? 'timeout' : `body ${r.body.length}B title="${r.title.slice(0, 60)}"` : `${r.kind}:${r.summary.slice(0, 120)}`
+        });
+        if (!r.ok) {
+            const verdict = classifyBridgeFailure(r.kind);
+            if (verdict === 'needs-extension') {
+                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'
+                };
+            }
+            return err(verdict, r.summary);
+        }
+        const title = r.title;
+        const head = r.body.slice(0, 5000);
+        if (CHALLENGE_RE.test(title + head)) {
+            return err('challenged', `风控/验证码命中(title=${title.slice(0, 60)});按红线不重试不绕过,交还用户`);
+        }
+        const options = parseBatchSearch(r.body);
+        const verdict = options.length > 0 ? 'hit' : 'miss';
+        return {
+            ok: true,
+            via: 'session-ctrip-flight',
+            evidence: `[会话:${site}@${ts}] ${options.length} options;transport=extension(被动嗅探,零系统弹窗;扩展零写行为=物理只读)${q.allowAnonymous ? ';anonymous=自检态' : ''}`,
+            latencyMs: Date.now() - started,
+            verdict,
+            options
+        };
+    }
     const t = await openSession({
         profileDir: q.profileDir,
         headless: q.headless,
         auditPath: q.auditPath,
-        mode: q.profileDir ? 'persistent' : 'cdp',
+        mode: mode === 'persistent' ? 'persistent' : 'cdp',
         newPage: true
     });
     if (!t.ok) {
@@ -93,4 +202,4 @@ export async function sessionFlightSearch(q) {
 }
 
 
-//# sourceURL=/Users/bytedance/work/gotry/ts/capabilities/session-search.ts
+//# sourceURL=ts/capabilities/session-search.ts