@trusty-squire/mcp 1.0.6 → 1.0.7-rc.1
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/dist/bot/captcha-solver-2captcha.d.ts +23 -0
- package/dist/bot/captcha-solver-2captcha.d.ts.map +1 -1
- package/dist/bot/captcha-solver-2captcha.js +62 -23
- package/dist/bot/captcha-solver-2captcha.js.map +1 -1
- package/dist/bot/provision-session.d.ts +4 -0
- package/dist/bot/provision-session.d.ts.map +1 -1
- package/dist/bot/provision-session.js +51 -4
- package/dist/bot/provision-session.js.map +1 -1
- package/dist/install/cli.d.ts +1 -0
- package/dist/install/cli.d.ts.map +1 -1
- package/dist/install/cli.js +54 -0
- package/dist/install/cli.js.map +1 -1
- package/dist/install/interactive.d.ts +1 -0
- package/dist/install/interactive.d.ts.map +1 -1
- package/dist/install/interactive.js +26 -1
- package/dist/install/interactive.js.map +1 -1
- package/dist/tools/provision-drive.d.ts.map +1 -1
- package/dist/tools/provision-drive.js +3 -1
- package/dist/tools/provision-drive.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,5 +1,26 @@
|
|
|
1
|
+
export interface TwoCaptchaVaultRequest {
|
|
2
|
+
url: string;
|
|
3
|
+
method: "GET" | "POST";
|
|
4
|
+
query?: Record<string, string>;
|
|
5
|
+
jsonBody?: Record<string, unknown>;
|
|
6
|
+
keyInjection: {
|
|
7
|
+
in: "query";
|
|
8
|
+
name: string;
|
|
9
|
+
} | {
|
|
10
|
+
in: "body";
|
|
11
|
+
name: string;
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
export interface TwoCaptchaVaultProxy {
|
|
15
|
+
request(req: TwoCaptchaVaultRequest): Promise<{
|
|
16
|
+
ok: boolean;
|
|
17
|
+
status: number;
|
|
18
|
+
json: () => Promise<unknown>;
|
|
19
|
+
}>;
|
|
20
|
+
}
|
|
1
21
|
export interface TwoCaptchaSolverOpts {
|
|
2
22
|
apiKey?: string;
|
|
23
|
+
vaultProxy?: TwoCaptchaVaultProxy;
|
|
3
24
|
fetchFn?: typeof globalThis.fetch;
|
|
4
25
|
sleepFn?: (ms: number) => Promise<void>;
|
|
5
26
|
resTimeoutMs?: number;
|
|
@@ -34,11 +55,13 @@ export type TwoCaptchaCoordinatesResult = {
|
|
|
34
55
|
}>;
|
|
35
56
|
export declare class TwoCaptchaSolver {
|
|
36
57
|
private readonly apiKey;
|
|
58
|
+
private readonly vaultProxy;
|
|
37
59
|
private readonly fetchFn;
|
|
38
60
|
private readonly sleepFn;
|
|
39
61
|
private readonly resTimeoutMs;
|
|
40
62
|
constructor(opts?: TwoCaptchaSolverOpts);
|
|
41
63
|
isAvailable(): boolean;
|
|
64
|
+
private dispatch;
|
|
42
65
|
/**
|
|
43
66
|
* Submit a reCAPTCHA v2 sitekey + page URL to 2Captcha, poll until
|
|
44
67
|
* a token is returned (or the deadline elapses). Fire-and-forget
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captcha-solver-2captcha.d.ts","sourceRoot":"","sources":["../../src/bot/captcha-solver-2captcha.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"captcha-solver-2captcha.d.ts","sourceRoot":"","sources":["../../src/bot/captcha-solver-2captcha.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,18 +33,56 @@ const RES_POLL_INTERVAL_MS = 5_000;
|
|
|
33
33
|
const RES_TIMEOUT_MS = 180_000;
|
|
34
34
|
export class TwoCaptchaSolver {
|
|
35
35
|
apiKey;
|
|
36
|
+
vaultProxy;
|
|
36
37
|
fetchFn;
|
|
37
38
|
sleepFn;
|
|
38
39
|
resTimeoutMs;
|
|
39
40
|
constructor(opts = {}) {
|
|
40
41
|
this.apiKey = opts.apiKey ?? process.env.TWOCAPTCHA_API_KEY;
|
|
42
|
+
this.vaultProxy = opts.vaultProxy;
|
|
41
43
|
this.fetchFn = opts.fetchFn ?? globalThis.fetch;
|
|
42
44
|
this.sleepFn = opts.sleepFn ?? ((ms) => new Promise((r) => setTimeout(r, ms)));
|
|
43
45
|
this.resTimeoutMs = opts.resTimeoutMs ?? RES_TIMEOUT_MS;
|
|
44
46
|
}
|
|
45
47
|
isAvailable() {
|
|
48
|
+
if (this.vaultProxy !== undefined)
|
|
49
|
+
return true;
|
|
46
50
|
return this.apiKey !== undefined && this.apiKey.length > 0;
|
|
47
51
|
}
|
|
52
|
+
// One authenticated 2Captcha request. Vault-proxy mode hands it to the proxy
|
|
53
|
+
// (key injected server-side); direct mode inlines the raw key into the query
|
|
54
|
+
// (`key`) or JSON body (`clientKey`) per `keyInjection`. Both return the same
|
|
55
|
+
// {ok,status,json} shape so the callers don't branch on transport.
|
|
56
|
+
async dispatch(req) {
|
|
57
|
+
const exec = async () => {
|
|
58
|
+
if (this.vaultProxy !== undefined) {
|
|
59
|
+
return this.vaultProxy.request({
|
|
60
|
+
url: req.url,
|
|
61
|
+
method: req.method,
|
|
62
|
+
...(req.query !== undefined ? { query: req.query } : {}),
|
|
63
|
+
...(req.jsonBody !== undefined ? { jsonBody: req.jsonBody } : {}),
|
|
64
|
+
keyInjection: req.keyInjection,
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
const apiKey = this.apiKey;
|
|
68
|
+
if (req.keyInjection.in === "query") {
|
|
69
|
+
const u = new URL(req.url);
|
|
70
|
+
for (const [k, v] of Object.entries(req.query ?? {}))
|
|
71
|
+
u.searchParams.set(k, v);
|
|
72
|
+
u.searchParams.set(req.keyInjection.name, apiKey);
|
|
73
|
+
const r = await this.fetchFn(u.toString(), { method: req.method });
|
|
74
|
+
return { ok: r.ok, status: r.status, json: () => r.json() };
|
|
75
|
+
}
|
|
76
|
+
const body = JSON.stringify({ [req.keyInjection.name]: apiKey, ...(req.jsonBody ?? {}) });
|
|
77
|
+
const r = await this.fetchFn(req.url, {
|
|
78
|
+
method: req.method,
|
|
79
|
+
headers: { "content-type": "application/json" },
|
|
80
|
+
body,
|
|
81
|
+
});
|
|
82
|
+
return { ok: r.ok, status: r.status, json: () => r.json() };
|
|
83
|
+
};
|
|
84
|
+
return req.timeoutMs !== undefined ? withTimeout(exec(), req.timeoutMs) : exec();
|
|
85
|
+
}
|
|
48
86
|
/**
|
|
49
87
|
* Submit a reCAPTCHA v2 sitekey + page URL to 2Captcha, poll until
|
|
50
88
|
* a token is returned (or the deadline elapses). Fire-and-forget
|
|
@@ -102,15 +140,13 @@ export class TwoCaptchaSolver {
|
|
|
102
140
|
async solveCoordinates(input) {
|
|
103
141
|
if (!this.isAvailable())
|
|
104
142
|
return { kind: "no_key" };
|
|
105
|
-
const apiKey = this.apiKey;
|
|
106
143
|
const startMs = Date.now();
|
|
107
144
|
let taskId;
|
|
108
145
|
try {
|
|
109
|
-
const res = await
|
|
146
|
+
const res = await this.dispatch({
|
|
147
|
+
url: `${TWOCAPTCHA_API_BASE}/createTask`,
|
|
110
148
|
method: "POST",
|
|
111
|
-
|
|
112
|
-
body: JSON.stringify({
|
|
113
|
-
clientKey: apiKey,
|
|
149
|
+
jsonBody: {
|
|
114
150
|
task: {
|
|
115
151
|
type: "CoordinatesTask",
|
|
116
152
|
body: input.imageBase64,
|
|
@@ -118,8 +154,10 @@ export class TwoCaptchaSolver {
|
|
|
118
154
|
...(input.minClicks !== undefined ? { minClicks: input.minClicks } : {}),
|
|
119
155
|
...(input.maxClicks !== undefined ? { maxClicks: input.maxClicks } : {}),
|
|
120
156
|
},
|
|
121
|
-
}
|
|
122
|
-
|
|
157
|
+
},
|
|
158
|
+
keyInjection: { in: "body", name: "clientKey" },
|
|
159
|
+
timeoutMs: IN_TIMEOUT_MS,
|
|
160
|
+
});
|
|
123
161
|
if (!res.ok)
|
|
124
162
|
return { kind: "submission_failed", reason: `createTask HTTP ${res.status}` };
|
|
125
163
|
const body = (await res.json());
|
|
@@ -140,10 +178,11 @@ export class TwoCaptchaSolver {
|
|
|
140
178
|
while (Date.now() - startMs < this.resTimeoutMs) {
|
|
141
179
|
await this.sleepFn(RES_POLL_INTERVAL_MS);
|
|
142
180
|
try {
|
|
143
|
-
const res = await this.
|
|
181
|
+
const res = await this.dispatch({
|
|
182
|
+
url: `${TWOCAPTCHA_API_BASE}/getTaskResult`,
|
|
144
183
|
method: "POST",
|
|
145
|
-
|
|
146
|
-
|
|
184
|
+
jsonBody: { taskId },
|
|
185
|
+
keyInjection: { in: "body", name: "clientKey" },
|
|
147
186
|
});
|
|
148
187
|
if (!res.ok)
|
|
149
188
|
continue;
|
|
@@ -177,17 +216,17 @@ export class TwoCaptchaSolver {
|
|
|
177
216
|
async submitAndPoll(params) {
|
|
178
217
|
if (!this.isAvailable())
|
|
179
218
|
return { kind: "no_key" };
|
|
180
|
-
const apiKey = this.apiKey;
|
|
181
219
|
const startMs = Date.now();
|
|
182
220
|
// ── 1. Submit ────────────────────────────────────────────────
|
|
183
|
-
const inUrl = new URL(`${TWOCAPTCHA_BASE}/in.php`);
|
|
184
|
-
inUrl.searchParams.set("key", apiKey);
|
|
185
|
-
for (const [k, v] of Object.entries(params))
|
|
186
|
-
inUrl.searchParams.set(k, v);
|
|
187
|
-
inUrl.searchParams.set("json", "1");
|
|
188
221
|
let captchaId;
|
|
189
222
|
try {
|
|
190
|
-
const inRes = await
|
|
223
|
+
const inRes = await this.dispatch({
|
|
224
|
+
url: `${TWOCAPTCHA_BASE}/in.php`,
|
|
225
|
+
method: "POST",
|
|
226
|
+
query: { ...params, json: "1" },
|
|
227
|
+
keyInjection: { in: "query", name: "key" },
|
|
228
|
+
timeoutMs: IN_TIMEOUT_MS,
|
|
229
|
+
});
|
|
191
230
|
if (!inRes.ok) {
|
|
192
231
|
return {
|
|
193
232
|
kind: "submission_failed",
|
|
@@ -212,15 +251,15 @@ export class TwoCaptchaSolver {
|
|
|
212
251
|
};
|
|
213
252
|
}
|
|
214
253
|
// ── 2. Poll for the token ────────────────────────────────────
|
|
215
|
-
const resUrl = new URL(`${TWOCAPTCHA_BASE}/res.php`);
|
|
216
|
-
resUrl.searchParams.set("key", apiKey);
|
|
217
|
-
resUrl.searchParams.set("action", "get");
|
|
218
|
-
resUrl.searchParams.set("id", captchaId);
|
|
219
|
-
resUrl.searchParams.set("json", "1");
|
|
220
254
|
while (Date.now() - startMs < this.resTimeoutMs) {
|
|
221
255
|
await this.sleepFn(RES_POLL_INTERVAL_MS);
|
|
222
256
|
try {
|
|
223
|
-
const resRes = await this.
|
|
257
|
+
const resRes = await this.dispatch({
|
|
258
|
+
url: `${TWOCAPTCHA_BASE}/res.php`,
|
|
259
|
+
method: "GET",
|
|
260
|
+
query: { action: "get", id: captchaId, json: "1" },
|
|
261
|
+
keyInjection: { in: "query", name: "key" },
|
|
262
|
+
});
|
|
224
263
|
if (!resRes.ok)
|
|
225
264
|
continue; // transient — retry on next tick
|
|
226
265
|
const body = (await resRes.json());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captcha-solver-2captcha.js","sourceRoot":"","sources":["../../src/bot/captcha-solver-2captcha.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,gBAAgB;AAChB,EAAE;AACF,oDAAoD;AACpD,mEAAmE;AACnE,6CAA6C;AAC7C,sEAAsE;AACtE,0DAA0D;AAC1D,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,iEAAiE;AACjE,oEAAoE;AACpE,6DAA6D;AAC7D,yDAAyD;AACzD,EAAE;AACF,kEAAkE;AAClE,kEAAkE;AAClE,6DAA6D;AAC7D,oEAAoE;AACpE,sDAAsD;AACtD,EAAE;AACF,oEAAoE;AACpE,+DAA+D;AAC/D,oCAAoC;AAEpC,MAAM,eAAe,GAAG,sBAAsB,CAAC;AAC/C,MAAM,mBAAmB,GAAG,0BAA0B,CAAC;AAEvD,8DAA8D;AAC9D,kEAAkE;AAClE,sEAAsE;AACtE,MAAM,aAAa,GAAG,MAAM,CAAC;AAC7B,MAAM,oBAAoB,GAAG,KAAK,CAAC;AACnC,MAAM,cAAc,GAAG,OAAO,CAAC;AAuB/B,MAAM,OAAO,gBAAgB;IACV,MAAM,CAAqB;IAC3B,OAAO,CAA0B;IACjC,OAAO,CAAgC;IACvC,YAAY,CAAS;IAEtC,YAAY,OAA6B,EAAE;QACzC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;QAC5D,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC;QAChD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/E,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,cAAc,CAAC;IAC1D,CAAC;IAED,WAAW;QACT,OAAO,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7D,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,gBAAgB,CAAC,KAMtB;QACC,OAAO,IAAI,CAAC,aAAa,CAAC;YACxB,MAAM,EAAE,eAAe;YACvB,SAAS,EAAE,KAAK,CAAC,OAAO;YACxB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAChE,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,aAAa,CAAC,KAMnB;QACC,OAAO,IAAI,CAAC,aAAa,CAAC;YACxB,MAAM,EAAE,UAAU;YAClB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,GAAG,CAAC,KAAK,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACvD,GAAG,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;gBACpE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE;gBAChC,CAAC,CAAC,EAAE,CAAC;YACP,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1F,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,cAAc,CAAC,KAKpB;QACC,OAAO,IAAI,CAAC,aAAa,CAAC;YACxB,MAAM,EAAE,WAAW;YACnB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/D,GAAG,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1D,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,KAKtB;QACC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QACnD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAO,CAAC;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAE3B,IAAI,MAAc,CAAC;QACnB,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,WAAW,CAC3B,IAAI,CAAC,OAAO,CAAC,GAAG,mBAAmB,aAAa,EAAE;gBAChD,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;gBAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,SAAS,EAAE,MAAM;oBACjB,IAAI,EAAE;wBACJ,IAAI,EAAE,iBAAiB;wBACvB,IAAI,EAAE,KAAK,CAAC,WAAW;wBACvB,GAAG,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBAClE,GAAG,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBACxE,GAAG,CAAC,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBACzE;iBACF,CAAC;aACH,CAAC,EACF,aAAa,CACd,CAAC;YACF,IAAI,CAAC,GAAG,CAAC,EAAE;gBAAE,OAAO,EAAE,IAAI,EAAE,mBAAmB,EAAE,MAAM,EAAE,mBAAmB,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC;YAC3F,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAK7B,CAAC;YACF,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAC1D,OAAO;oBACL,IAAI,EAAE,mBAAmB;oBACzB,MAAM,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,gBAAgB,IAAI,wBAAwB;iBAC5E,CAAC;YACJ,CAAC;YACD,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,IAAI,EAAE,mBAAmB;gBACzB,MAAM,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;aACzD,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YAChD,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;YACzC,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,mBAAmB,gBAAgB,EAAE;oBACrE,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;oBAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;iBACpD,CAAC,CAAC;gBACH,IAAI,CAAC,GAAG,CAAC,EAAE;oBAAE,SAAS;gBACtB,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAM7B,CAAC;gBACF,IAAI,IAAI,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;oBACvB,OAAO;wBACL,IAAI,EAAE,cAAc;wBACpB,MAAM,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,gBAAgB,IAAI,mBAAmB;qBACvE,CAAC;gBACJ,CAAC;gBACD,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO;oBAAE,SAAS;gBACtC,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,IAAI,EAAE,CAAC;qBACnD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;qBAChD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/D,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC7B,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC;gBACjE,CAAC;gBACD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;YACvE,CAAC;YAAC,MAAM,CAAC;gBACP,gCAAgC;YAClC,CAAC;QACH,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;IACrE,CAAC;IAED,4DAA4D;IAC5D,qEAAqE;IACrE,oEAAoE;IACpE,0BAA0B;IAClB,KAAK,CAAC,aAAa,CACzB,MAA8B;QAE9B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QACnD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAO,CAAC;QAC5B,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAE3B,gEAAgE;QAChE,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,GAAG,eAAe,SAAS,CAAC,CAAC;QACnD,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACtC,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;YAAE,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1E,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAEpC,IAAI,SAAiB,CAAC;QACtB,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,WAAW,CAC7B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EAClD,aAAa,CACd,CAAC;YACF,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;gBACd,OAAO;oBACL,IAAI,EAAE,mBAAmB;oBACzB,MAAM,EAAE,eAAe,KAAK,CAAC,MAAM,EAAE;iBACtC,CAAC;YACJ,CAAC;YACD,MAAM,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,IAAI,EAAE,CAAwC,CAAC;YACzE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACtB,2DAA2D;gBAC3D,0DAA0D;gBAC1D,OAAO;oBACL,IAAI,EAAE,mBAAmB;oBACzB,MAAM,EAAE,IAAI,CAAC,OAAO,IAAI,wBAAwB;iBACjD,CAAC;YACJ,CAAC;YACD,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;QAC3B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,IAAI,EAAE,mBAAmB;gBACzB,MAAM,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;aACzD,CAAC;QACJ,CAAC;QAED,gEAAgE;QAChE,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,eAAe,UAAU,CAAC,CAAC;QACrD,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QACvC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACzC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACzC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAErC,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YAChD,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;YACzC,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACrD,IAAI,CAAC,MAAM,CAAC,EAAE;oBAAE,SAAS,CAAC,iCAAiC;gBAC3D,MAAM,IAAI,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,EAAE,CAAwC,CAAC;gBAC1E,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACtB,OAAO;wBACL,IAAI,EAAE,IAAI;wBACV,KAAK,EAAE,IAAI,CAAC,OAAO;wBACnB,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO;qBACjC,CAAC;gBACJ,CAAC;gBACD,+DAA+D;gBAC/D,qDAAqD;gBACrD,wCAAwC;gBACxC,IAAI,IAAI,CAAC,OAAO,KAAK,kBAAkB;oBAAE,SAAS;gBAClD,OAAO;oBACL,IAAI,EAAE,cAAc;oBACpB,MAAM,EAAE,IAAI,CAAC,OAAO,IAAI,mBAAmB;iBAC5C,CAAC;YACJ,CAAC;YAAC,MAAM,CAAC;gBACP,gDAAgD;YAClD,CAAC;QACH,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;IACrE,CAAC;CACF;AAED,kEAAkE;AAClE,wCAAwC;AACxC,KAAK,UAAU,WAAW,CAAI,CAAa,EAAE,EAAU;IACrD,OAAO,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACxC,MAAM,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3E,CAAC,CAAC,IAAI,CACJ,CAAC,CAAC,EAAE,EAAE;YACJ,YAAY,CAAC,CAAC,CAAC,CAAC;YAChB,OAAO,CAAC,CAAC,CAAC,CAAC;QACb,CAAC,EACD,CAAC,CAAC,EAAE,EAAE;YACJ,YAAY,CAAC,CAAC,CAAC,CAAC;YAChB,MAAM,CAAC,CAAC,CAAC,CAAC;QACZ,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
1
|
+
{"version":3,"file":"captcha-solver-2captcha.js","sourceRoot":"","sources":["../../src/bot/captcha-solver-2captcha.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { type InteractiveElement } from "./browser.js";
|
|
2
|
+
import { type TwoCaptchaVaultProxy } from "./captcha-solver-2captcha.js";
|
|
3
|
+
import type { ApiClient } from "../api-client.js";
|
|
2
4
|
import { type Postcondition, type PostconditionResult } from "./operator-recipe.js";
|
|
3
5
|
import type { OAuthProviderId } from "./oauth-providers.js";
|
|
4
6
|
export interface ObservedElement {
|
|
@@ -131,6 +133,7 @@ export interface StartOptions {
|
|
|
131
133
|
hint?: string;
|
|
132
134
|
requireLiveIdentity?: boolean;
|
|
133
135
|
consentInboxRead?: boolean;
|
|
136
|
+
api?: ApiClient;
|
|
134
137
|
}
|
|
135
138
|
export interface NeedsUserConnect {
|
|
136
139
|
wall: "google_session";
|
|
@@ -188,6 +191,7 @@ export interface CaptchaGateResult {
|
|
|
188
191
|
variant: string;
|
|
189
192
|
settled: boolean;
|
|
190
193
|
}
|
|
194
|
+
export declare function makeTwoCaptchaVaultProxy(api: ApiClient): TwoCaptchaVaultProxy;
|
|
191
195
|
export declare function captchaGate(sessionId: string): Promise<CaptchaGateResult>;
|
|
192
196
|
export interface NeedsUserCode {
|
|
193
197
|
wall: "verification_code";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provision-session.d.ts","sourceRoot":"","sources":["../../src/bot/provision-session.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAqB,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"provision-session.d.ts","sourceRoot":"","sources":["../../src/bot/provision-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
// `finish`/extract path; the vault stays write-only.
|
|
18
18
|
import { createHash, randomInt, randomUUID } from "node:crypto";
|
|
19
19
|
import { BrowserController } from "./browser.js";
|
|
20
|
-
import { TwoCaptchaSolver } from "./captcha-solver-2captcha.js";
|
|
20
|
+
import { TwoCaptchaSolver, } from "./captcha-solver-2captcha.js";
|
|
21
21
|
import { extractApiKeyFromText, isTruncatedCapture } from "./credential-text.js";
|
|
22
22
|
import { pickVerificationLink } from "./email-verification.js";
|
|
23
23
|
import { detectActiveProviderSessions, ensureOAuthSession, } from "./google-login.js";
|
|
@@ -695,6 +695,7 @@ export async function startProvisionSession(opts) {
|
|
|
695
695
|
actionTrace: [],
|
|
696
696
|
consentInboxRead: opts.consentInboxRead === true,
|
|
697
697
|
userEmail: loggedInEmail("google", opts.profileDir),
|
|
698
|
+
...(opts.api !== undefined ? { api: opts.api } : {}),
|
|
698
699
|
};
|
|
699
700
|
sessions.set(id, session);
|
|
700
701
|
audit(id, "start", {
|
|
@@ -1337,8 +1338,53 @@ export async function extractCredentials(sessionId) {
|
|
|
1337
1338
|
...(notLegit !== null ? { blocked_reason: notLegit } : {}),
|
|
1338
1339
|
};
|
|
1339
1340
|
}
|
|
1340
|
-
|
|
1341
|
-
|
|
1341
|
+
// A TwoCaptchaVaultProxy backed by the MCP api-client: every 2Captcha call is
|
|
1342
|
+
// routed through use_credential against the vaulted "2captcha" credential, so
|
|
1343
|
+
// the raw key is injected server-side and never lives in this process. The
|
|
1344
|
+
// ${SECRET} placeholder goes in the query (`key`) or JSON body (`clientKey`)
|
|
1345
|
+
// per the request's keyInjection; the proxy substitutes it at the boundary.
|
|
1346
|
+
export function makeTwoCaptchaVaultProxy(api) {
|
|
1347
|
+
return {
|
|
1348
|
+
async request(req) {
|
|
1349
|
+
const http = { method: req.method, url: req.url };
|
|
1350
|
+
if (req.keyInjection.in === "query") {
|
|
1351
|
+
http.query = { ...(req.query ?? {}), [req.keyInjection.name]: "${SECRET}" };
|
|
1352
|
+
}
|
|
1353
|
+
else {
|
|
1354
|
+
http.headers = { "content-type": "application/json" };
|
|
1355
|
+
http.body = JSON.stringify({
|
|
1356
|
+
[req.keyInjection.name]: "${SECRET}",
|
|
1357
|
+
...(req.jsonBody ?? {}),
|
|
1358
|
+
});
|
|
1359
|
+
}
|
|
1360
|
+
const { response } = await api.useCredential({ service: "2captcha", http });
|
|
1361
|
+
return {
|
|
1362
|
+
ok: response.status >= 200 && response.status < 300,
|
|
1363
|
+
status: response.status,
|
|
1364
|
+
json: async () => JSON.parse(response.body),
|
|
1365
|
+
};
|
|
1366
|
+
},
|
|
1367
|
+
};
|
|
1368
|
+
}
|
|
1369
|
+
// Build the right-transport solver for a session: vault-proxy when the install
|
|
1370
|
+
// vaulted a "2captcha" credential (key never in this process), else the env key
|
|
1371
|
+
// (TWOCAPTCHA_API_KEY, back-compat). Listing creds is metadata-only — no secret.
|
|
1372
|
+
async function buildTwoCaptchaSolver(session) {
|
|
1373
|
+
if (session.api !== undefined) {
|
|
1374
|
+
try {
|
|
1375
|
+
const { credentials } = await session.api.listCredentials();
|
|
1376
|
+
const hasVaulted = credentials.some((c) => (c.service ?? "").toLowerCase() === "2captcha");
|
|
1377
|
+
if (hasVaulted) {
|
|
1378
|
+
return new TwoCaptchaSolver({ vaultProxy: makeTwoCaptchaVaultProxy(session.api) });
|
|
1379
|
+
}
|
|
1380
|
+
}
|
|
1381
|
+
catch {
|
|
1382
|
+
// Listing failed (offline / transient) — fall back to the env key.
|
|
1383
|
+
}
|
|
1384
|
+
}
|
|
1385
|
+
return new TwoCaptchaSolver();
|
|
1386
|
+
}
|
|
1387
|
+
async function solveCaptchaWithTokenSolver(solver, browser, variant) {
|
|
1342
1388
|
if (!solver.isAvailable())
|
|
1343
1389
|
return { solved: false, outcome: "no_key" };
|
|
1344
1390
|
if (variant === "recaptcha_v2") {
|
|
@@ -1420,7 +1466,8 @@ export async function captchaGate(sessionId) {
|
|
|
1420
1466
|
solvedBySubstrate = solved.found && solved.solved;
|
|
1421
1467
|
token = solvedBySubstrate || (await session.browser.waitForCaptchaResponseToken(2_000));
|
|
1422
1468
|
if (!token) {
|
|
1423
|
-
const
|
|
1469
|
+
const solver = await buildTwoCaptchaSolver(session);
|
|
1470
|
+
const tokenSolved = await solveCaptchaWithTokenSolver(solver, session.browser, det.variant);
|
|
1424
1471
|
tokenSolverOutcome = tokenSolved.outcome;
|
|
1425
1472
|
token = tokenSolved.solved;
|
|
1426
1473
|
}
|