itd-api 0.10.0 → 0.10.1

package/dist/events/index.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_url = require("../shared/url-CDVgMIq5.cjs");
+const require_url = require("../shared/url-DgTYZN_v.cjs");
 const require_errors = require("../shared/errors-BmP3TKoW.cjs");
 const require_redact = require("../shared/redact-lAmck1Z6.cjs");
-const require_events = require("../shared/events-BB791aPk.cjs");
+const require_events = require("../shared/events-MtRNe_TF.cjs");
 exports.DEFAULT_BASE_URL = require_url.DEFAULT_BASE_URL;
 exports.EventChannel = require_events.EventChannel;
 exports.EventChannelStatus = require_url.EventChannelStatus;

package/dist/events/index.d.cts

@@ -1,3 +1,3 @@
-import { $ as isItdStateError, A as ItdErrorKind, B as ItdStateError, Bt as RuntimeMode, C as ItdApiError, D as ItdConfigError, E as ItdAuthError, F as ItdNetworkError, Ft as RuntimeOptions, H as ItdValidationError, Ht as systemClock, I as ItdNotFoundError, K as isItdError, P as ItdForbiddenError, R as ItdRateLimitError, S as ItdAbortError, T as ItdApiErrorKind, U as isItdApiError, V as ItdTimeoutError, Vt as ItdClock, W as isItdAuthError, Z as isItdRateLimitError, _n as Loose, a as NotificationEvent, at as bearerToken, c as NotificationSettings, ct as Listener, dn as EventChannelStatus, et as isItdValidationError, ft as LIBRARY_VERSION, i as formatNotificationText, it as anonymousAuth, k as ItdError, lt as Unsubscribe, n as canonicalNotificationType, nt as AuthIdentity, o as normalizeNotification, ot as tokenProvider, r as isKnownNotificationType, rt as AuthProvider, s as Notification, t as resolveNotificationUrl, tt as ClientConnection, ut as DEFAULT_BASE_URL, vn as NotificationType, xt as Logger, yt as ClientHooks, z as ItdServerError } from "../shared/url-DkMueFAT.cjs";
-import { $ as EventTransportContext, A as EventHandler, B as NotificationEventContext, C as EventChannelDeps, D as EventSession, E as EventEnqueueOptions, F as EventSequentializer, G as NotificationOfType, H as NotificationEventOfType, I as EventTypeGuard, J as NotificationUpdateOrigin, K as NotificationUpdate, L as runEventMiddleware, M as EventMiddlewareObject, N as EventNext, O as EventSyncReason, P as EventPredicate, Q as EventTransport, R as EventContext, S as EventChannel, T as EventChannelOptions, U as NotificationEventSelector, V as NotificationEventFilter, W as NotificationEventsUpdate, X as UnknownNotificationUpdate, Y as NotificationUpdateType, Z as UnreadCountUpdate, _ as createNotificationEventsClient, a as WebSocketTransportOptions, b as NotificationEventsOptions, c as EventErrorContext, d as EventMiddlewareLike, et as EventTransportFrame, f as EventRouteTable, g as NotificationEventsClientOptions, h as NotificationEventsClient, i as WebSocketTransport, j as EventMiddleware, k as ReconnectOptions, l as EventFilter, m as EventRouter, n as WebSocketLike, o as EventComposer, p as EventRouteSelector, q as NotificationUpdateOfType, r as WebSocketOpenFailureClassifier, s as EventErrorBoundary, t as WebSocketImplementationOptions, tt as UnauthorizedStreamError, u as EventMiddlewareGroup, v as NotificationEvents, w as EventChannelEvents, x as NotificationEventsTransport, y as NotificationEventsMap, z as NotificationContext } from "../shared/events-BNGjJVI3.cjs";
+import { $ as isItdStateError, A as ItdErrorKind, B as ItdStateError, Bt as RuntimeMode, C as ItdApiError, D as ItdConfigError, E as ItdAuthError, F as ItdNetworkError, Ft as RuntimeOptions, H as ItdValidationError, Ht as systemClock, I as ItdNotFoundError, K as isItdError, P as ItdForbiddenError, R as ItdRateLimitError, S as ItdAbortError, T as ItdApiErrorKind, U as isItdApiError, V as ItdTimeoutError, Vt as ItdClock, W as isItdAuthError, Z as isItdRateLimitError, _n as Loose, a as NotificationEvent, at as bearerToken, c as NotificationSettings, ct as Listener, dn as EventChannelStatus, et as isItdValidationError, ft as LIBRARY_VERSION, i as formatNotificationText, it as anonymousAuth, k as ItdError, lt as Unsubscribe, n as canonicalNotificationType, nt as AuthIdentity, o as normalizeNotification, ot as tokenProvider, r as isKnownNotificationType, rt as AuthProvider, s as Notification, t as resolveNotificationUrl, tt as ClientConnection, ut as DEFAULT_BASE_URL, vn as NotificationType, xt as Logger, yt as ClientHooks, z as ItdServerError } from "../shared/url-Dum7r_FT.cjs";
+import { $ as EventTransportContext, A as EventHandler, B as NotificationEventContext, C as EventChannelDeps, D as EventSession, E as EventEnqueueOptions, F as EventSequentializer, G as NotificationOfType, H as NotificationEventOfType, I as EventTypeGuard, J as NotificationUpdateOrigin, K as NotificationUpdate, L as runEventMiddleware, M as EventMiddlewareObject, N as EventNext, O as EventSyncReason, P as EventPredicate, Q as EventTransport, R as EventContext, S as EventChannel, T as EventChannelOptions, U as NotificationEventSelector, V as NotificationEventFilter, W as NotificationEventsUpdate, X as UnknownNotificationUpdate, Y as NotificationUpdateType, Z as UnreadCountUpdate, _ as createNotificationEventsClient, a as WebSocketTransportOptions, b as NotificationEventsOptions, c as EventErrorContext, d as EventMiddlewareLike, et as EventTransportFrame, f as EventRouteTable, g as NotificationEventsClientOptions, h as NotificationEventsClient, i as WebSocketTransport, j as EventMiddleware, k as ReconnectOptions, l as EventFilter, m as EventRouter, n as WebSocketLike, o as EventComposer, p as EventRouteSelector, q as NotificationUpdateOfType, r as WebSocketOpenFailureClassifier, s as EventErrorBoundary, t as WebSocketImplementationOptions, tt as UnauthorizedStreamError, u as EventMiddlewareGroup, v as NotificationEvents, w as EventChannelEvents, x as NotificationEventsTransport, y as NotificationEventsMap, z as NotificationContext } from "../shared/events-CZXU16qU.cjs";
 export { type AuthIdentity, type AuthProvider, type ClientConnection, type ClientHooks, DEFAULT_BASE_URL, EventChannel, type EventChannelDeps, type EventChannelEvents, type EventChannelOptions, EventChannelStatus, EventComposer, type EventContext, type EventEnqueueOptions, type EventErrorBoundary, type EventErrorContext, type EventFilter, type EventHandler, type EventMiddleware, type EventMiddlewareGroup, type EventMiddlewareLike, type EventMiddlewareObject, type EventNext, type EventPredicate, type EventRouteSelector, type EventRouteTable, EventRouter, type EventSequentializer, type EventSession, type EventSyncReason, type EventTransport, type EventTransportContext, type EventTransportFrame, type EventTypeGuard, ItdAbortError, ItdApiError, ItdApiErrorKind, ItdAuthError, type ItdClock, ItdConfigError, ItdError, ItdErrorKind, ItdForbiddenError, ItdNetworkError, ItdNotFoundError, ItdRateLimitError, ItdServerError, ItdStateError, ItdTimeoutError, ItdValidationError, LIBRARY_VERSION, type Listener, type Logger, type Loose, type Notification, type NotificationContext, type NotificationEvent, type NotificationEventContext, type NotificationEventFilter, type NotificationEventOfType, type NotificationEventSelector, NotificationEvents, NotificationEventsClient, type NotificationEventsClientOptions, type NotificationEventsMap, type NotificationEventsOptions, NotificationEventsTransport, type NotificationEventsUpdate, type NotificationOfType, type NotificationSettings, NotificationType, type NotificationUpdate, type NotificationUpdateOfType, NotificationUpdateOrigin, NotificationUpdateType, type ReconnectOptions, RuntimeMode, type RuntimeOptions, UnauthorizedStreamError, type UnknownNotificationUpdate, type UnreadCountUpdate, type Unsubscribe, type WebSocketImplementationOptions, type WebSocketLike, type WebSocketOpenFailureClassifier, WebSocketTransport, type WebSocketTransportOptions, anonymousAuth, bearerToken, canonicalNotificationType, createNotificationEventsClient, formatNotificationText, isItdApiError, isItdAuthError, isItdError, isItdRateLimitError, isItdStateError, isItdValidationError, isKnownNotificationType, normalizeNotification, resolveNotificationUrl, runEventMiddleware, systemClock, tokenProvider };

package/dist/events/index.d.ts

@@ -1,3 +1,3 @@
-import { $ as isItdStateError, A as ItdErrorKind, B as ItdStateError, Bt as RuntimeMode, C as ItdApiError, D as ItdConfigError, E as ItdAuthError, F as ItdNetworkError, Ft as RuntimeOptions, H as ItdValidationError, Ht as systemClock, I as ItdNotFoundError, K as isItdError, P as ItdForbiddenError, R as ItdRateLimitError, S as ItdAbortError, T as ItdApiErrorKind, U as isItdApiError, V as ItdTimeoutError, Vt as ItdClock, W as isItdAuthError, Z as isItdRateLimitError, _n as Loose, a as NotificationEvent, at as bearerToken, c as NotificationSettings, ct as Listener, dn as EventChannelStatus, et as isItdValidationError, ft as LIBRARY_VERSION, i as formatNotificationText, it as anonymousAuth, k as ItdError, lt as Unsubscribe, n as canonicalNotificationType, nt as AuthIdentity, o as normalizeNotification, ot as tokenProvider, r as isKnownNotificationType, rt as AuthProvider, s as Notification, t as resolveNotificationUrl, tt as ClientConnection, ut as DEFAULT_BASE_URL, vn as NotificationType, xt as Logger, yt as ClientHooks, z as ItdServerError } from "../shared/url-DkMueFAT.js";
-import { $ as EventTransportContext, A as EventHandler, B as NotificationEventContext, C as EventChannelDeps, D as EventSession, E as EventEnqueueOptions, F as EventSequentializer, G as NotificationOfType, H as NotificationEventOfType, I as EventTypeGuard, J as NotificationUpdateOrigin, K as NotificationUpdate, L as runEventMiddleware, M as EventMiddlewareObject, N as EventNext, O as EventSyncReason, P as EventPredicate, Q as EventTransport, R as EventContext, S as EventChannel, T as EventChannelOptions, U as NotificationEventSelector, V as NotificationEventFilter, W as NotificationEventsUpdate, X as UnknownNotificationUpdate, Y as NotificationUpdateType, Z as UnreadCountUpdate, _ as createNotificationEventsClient, a as WebSocketTransportOptions, b as NotificationEventsOptions, c as EventErrorContext, d as EventMiddlewareLike, et as EventTransportFrame, f as EventRouteTable, g as NotificationEventsClientOptions, h as NotificationEventsClient, i as WebSocketTransport, j as EventMiddleware, k as ReconnectOptions, l as EventFilter, m as EventRouter, n as WebSocketLike, o as EventComposer, p as EventRouteSelector, q as NotificationUpdateOfType, r as WebSocketOpenFailureClassifier, s as EventErrorBoundary, t as WebSocketImplementationOptions, tt as UnauthorizedStreamError, u as EventMiddlewareGroup, v as NotificationEvents, w as EventChannelEvents, x as NotificationEventsTransport, y as NotificationEventsMap, z as NotificationContext } from "../shared/events-CJO6q93Z.js";
+import { $ as isItdStateError, A as ItdErrorKind, B as ItdStateError, Bt as RuntimeMode, C as ItdApiError, D as ItdConfigError, E as ItdAuthError, F as ItdNetworkError, Ft as RuntimeOptions, H as ItdValidationError, Ht as systemClock, I as ItdNotFoundError, K as isItdError, P as ItdForbiddenError, R as ItdRateLimitError, S as ItdAbortError, T as ItdApiErrorKind, U as isItdApiError, V as ItdTimeoutError, Vt as ItdClock, W as isItdAuthError, Z as isItdRateLimitError, _n as Loose, a as NotificationEvent, at as bearerToken, c as NotificationSettings, ct as Listener, dn as EventChannelStatus, et as isItdValidationError, ft as LIBRARY_VERSION, i as formatNotificationText, it as anonymousAuth, k as ItdError, lt as Unsubscribe, n as canonicalNotificationType, nt as AuthIdentity, o as normalizeNotification, ot as tokenProvider, r as isKnownNotificationType, rt as AuthProvider, s as Notification, t as resolveNotificationUrl, tt as ClientConnection, ut as DEFAULT_BASE_URL, vn as NotificationType, xt as Logger, yt as ClientHooks, z as ItdServerError } from "../shared/url-Dum7r_FT.js";
+import { $ as EventTransportContext, A as EventHandler, B as NotificationEventContext, C as EventChannelDeps, D as EventSession, E as EventEnqueueOptions, F as EventSequentializer, G as NotificationOfType, H as NotificationEventOfType, I as EventTypeGuard, J as NotificationUpdateOrigin, K as NotificationUpdate, L as runEventMiddleware, M as EventMiddlewareObject, N as EventNext, O as EventSyncReason, P as EventPredicate, Q as EventTransport, R as EventContext, S as EventChannel, T as EventChannelOptions, U as NotificationEventSelector, V as NotificationEventFilter, W as NotificationEventsUpdate, X as UnknownNotificationUpdate, Y as NotificationUpdateType, Z as UnreadCountUpdate, _ as createNotificationEventsClient, a as WebSocketTransportOptions, b as NotificationEventsOptions, c as EventErrorContext, d as EventMiddlewareLike, et as EventTransportFrame, f as EventRouteTable, g as NotificationEventsClientOptions, h as NotificationEventsClient, i as WebSocketTransport, j as EventMiddleware, k as ReconnectOptions, l as EventFilter, m as EventRouter, n as WebSocketLike, o as EventComposer, p as EventRouteSelector, q as NotificationUpdateOfType, r as WebSocketOpenFailureClassifier, s as EventErrorBoundary, t as WebSocketImplementationOptions, tt as UnauthorizedStreamError, u as EventMiddlewareGroup, v as NotificationEvents, w as EventChannelEvents, x as NotificationEventsTransport, y as NotificationEventsMap, z as NotificationContext } from "../shared/events-D3CSlpXR.js";
 export { type AuthIdentity, type AuthProvider, type ClientConnection, type ClientHooks, DEFAULT_BASE_URL, EventChannel, type EventChannelDeps, type EventChannelEvents, type EventChannelOptions, EventChannelStatus, EventComposer, type EventContext, type EventEnqueueOptions, type EventErrorBoundary, type EventErrorContext, type EventFilter, type EventHandler, type EventMiddleware, type EventMiddlewareGroup, type EventMiddlewareLike, type EventMiddlewareObject, type EventNext, type EventPredicate, type EventRouteSelector, type EventRouteTable, EventRouter, type EventSequentializer, type EventSession, type EventSyncReason, type EventTransport, type EventTransportContext, type EventTransportFrame, type EventTypeGuard, ItdAbortError, ItdApiError, ItdApiErrorKind, ItdAuthError, type ItdClock, ItdConfigError, ItdError, ItdErrorKind, ItdForbiddenError, ItdNetworkError, ItdNotFoundError, ItdRateLimitError, ItdServerError, ItdStateError, ItdTimeoutError, ItdValidationError, LIBRARY_VERSION, type Listener, type Logger, type Loose, type Notification, type NotificationContext, type NotificationEvent, type NotificationEventContext, type NotificationEventFilter, type NotificationEventOfType, type NotificationEventSelector, NotificationEvents, NotificationEventsClient, type NotificationEventsClientOptions, type NotificationEventsMap, type NotificationEventsOptions, NotificationEventsTransport, type NotificationEventsUpdate, type NotificationOfType, type NotificationSettings, NotificationType, type NotificationUpdate, type NotificationUpdateOfType, NotificationUpdateOrigin, NotificationUpdateType, type ReconnectOptions, RuntimeMode, type RuntimeOptions, UnauthorizedStreamError, type UnknownNotificationUpdate, type UnreadCountUpdate, type Unsubscribe, type WebSocketImplementationOptions, type WebSocketLike, type WebSocketOpenFailureClassifier, WebSocketTransport, type WebSocketTransportOptions, anonymousAuth, bearerToken, canonicalNotificationType, createNotificationEventsClient, formatNotificationText, isItdApiError, isItdAuthError, isItdError, isItdRateLimitError, isItdStateError, isItdValidationError, isKnownNotificationType, normalizeNotification, resolveNotificationUrl, runEventMiddleware, systemClock, tokenProvider };

package/dist/events/index.js

@@ -1,5 +1,5 @@
-import { T as NotificationType, a as tokenProvider, c as normalizeNotification, d as canonicalNotificationType, f as isKnownNotificationType, ht as systemClock, i as bearerToken, n as formatNotificationText, ot as DEFAULT_BASE_URL, r as anonymousAuth, t as resolveNotificationUrl, ut as LIBRARY_VERSION, y as EventChannelStatus } from "../shared/url-BA5hEwj2.js";
+import { T as NotificationType, a as tokenProvider, c as normalizeNotification, d as canonicalNotificationType, f as isKnownNotificationType, ht as systemClock, i as bearerToken, n as formatNotificationText, ot as DEFAULT_BASE_URL, r as anonymousAuth, t as resolveNotificationUrl, ut as LIBRARY_VERSION, y as EventChannelStatus } from "../shared/url-CntTEAxu.js";
 import { A as isItdStateError, C as isItdError, O as isItdRateLimitError, _ as ItdStateError, a as ItdConfigError, b as isItdApiError, c as ItdErrorKind, d as ItdForbiddenError, f as ItdNetworkError, g as ItdServerError, h as ItdRateLimitError, i as ItdAuthError, j as isItdValidationError, n as ItdApiError, p as ItdNotFoundError, r as ItdApiErrorKind, s as ItdError, t as ItdAbortError, v as ItdTimeoutError, x as isItdAuthError, y as ItdValidationError } from "../shared/errors-GI10kZxk.js";
 import { v as RuntimeMode } from "../shared/redact-DJV0XM3n.js";
-import { a as WebSocketTransport, c as NotificationEventsTransport, d as NotificationUpdateOrigin, f as NotificationUpdateType, g as runEventMiddleware, h as UnauthorizedStreamError, i as createNotificationEventsClient, m as EventChannel, n as EventRouter, r as NotificationEventsClient, s as NotificationEvents, t as EventComposer } from "../shared/events-B0Wtn4cF.js";
+import { a as WebSocketTransport, c as NotificationEventsTransport, d as NotificationUpdateOrigin, f as NotificationUpdateType, g as runEventMiddleware, h as UnauthorizedStreamError, i as createNotificationEventsClient, m as EventChannel, n as EventRouter, r as NotificationEventsClient, s as NotificationEvents, t as EventComposer } from "../shared/events-Cipe-Fm9.js";
 export { DEFAULT_BASE_URL, EventChannel, EventChannelStatus, EventComposer, EventRouter, ItdAbortError, ItdApiError, ItdApiErrorKind, ItdAuthError, ItdConfigError, ItdError, ItdErrorKind, ItdForbiddenError, ItdNetworkError, ItdNotFoundError, ItdRateLimitError, ItdServerError, ItdStateError, ItdTimeoutError, ItdValidationError, LIBRARY_VERSION, NotificationEvents, NotificationEventsClient, NotificationEventsTransport, NotificationType, NotificationUpdateOrigin, NotificationUpdateType, RuntimeMode, UnauthorizedStreamError, WebSocketTransport, anonymousAuth, bearerToken, canonicalNotificationType, createNotificationEventsClient, formatNotificationText, isItdApiError, isItdAuthError, isItdError, isItdRateLimitError, isItdStateError, isItdValidationError, isKnownNotificationType, normalizeNotification, resolveNotificationUrl, runEventMiddleware, systemClock, tokenProvider };

package/dist/index.cjs

@@ -1,10 +1,10 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_url = require("./shared/url-CDVgMIq5.cjs");
+const require_url = require("./shared/url-DgTYZN_v.cjs");
 const require_errors = require("./shared/errors-BmP3TKoW.cjs");
 const require_redact = require("./shared/redact-lAmck1Z6.cjs");
-const require_render = require("./shared/render-BimHjOhw.cjs");
+const require_render = require("./shared/render-dscKp9CC.cjs");
 const require_options = require("./shared/options-DjEtbVaf.cjs");
-const require_events = require("./shared/events-BB791aPk.cjs");
+const require_events = require("./shared/events-MtRNe_TF.cjs");
 const require_key_value_store = require("./shared/key-value-store-B5GYVEYZ.cjs");
 const require_storage = require("./shared/storage-CZJZoaz9.cjs");
 const require_multi_storage = require("./shared/multi-storage-s-fPtjoy.cjs");
@@ -92,21 +92,36 @@ function requireCaptchaText(value, field) {
 	if (value !== void 0 && (typeof value !== "string" || value.trim() === "")) throw new require_errors.ItdConfigError(`${field} должен быть непустой строкой`);
 }
 /**
-* Проверяет форму блока `auth.captcha`.
+* Проверяет форму источника токена и приводит его к объекту.
 *
-* Отсутствие источника токена ошибкой не считается: до входа по паролю дело может и не
-* дойти. О нехватке сообщит {@link resolveCaptchaBody} в момент входа.
+* Сам объект сохраняется как есть: `getToken` вызывается на нём, чтобы источнику остался
+* доступен собственный `this`.
 *
 * @throws {ItdConfigError} при некорректных значениях
 */
-function validateCaptchaOptions(captcha) {
+function resolveCaptchaSolver(captcha) {
+	if (captcha === void 0) return void 0;
+	if (typeof captcha === "function") return { getToken: captcha };
+	if (!require_url.isRecord$1(captcha)) throw new require_errors.ItdConfigError("captcha должен быть функцией либо объектом с getToken");
+	const { getToken, type, field } = captcha;
+	if (typeof getToken !== "function") throw new require_errors.ItdConfigError("captcha.getToken должен быть функцией");
+	requireCaptchaText(type, "captcha.type");
+	requireCaptchaText(field, "captcha.field");
+	return captcha;
+}
+/**
+* Проверяет форму готового токена капчи.
+*
+* @param path имя опции или аргумента для текста ошибки
+* @throws {ItdConfigError} если токен или его тип не указаны
+*/
+function validateCaptchaToken(captcha, path) {
 	if (captcha === void 0) return;
-	if (!require_url.isRecord$1(captcha)) throw new require_errors.ItdConfigError("auth.captcha должен быть объектом");
-	const { type, token, getToken, field } = captcha;
-	requireCaptchaText(type, "auth.captcha.type");
-	requireCaptchaText(token, "auth.captcha.token");
-	requireCaptchaText(field, "auth.captcha.field");
-	if (getToken !== void 0 && typeof getToken !== "function") throw new require_errors.ItdConfigError("auth.captcha.getToken должен быть функцией");
+	if (!require_url.isRecord$1(captcha)) throw new require_errors.ItdConfigError(`${path} должен быть объектом { type, token }`);
+	const { type, token, field } = captcha;
+	if (typeof token !== "string" || token.trim() === "") throw new require_errors.ItdConfigError(`${path}.token должен быть непустой строкой`);
+	if (typeof type !== "string" || type.trim() === "") throw new require_errors.ItdConfigError(`${path}.type должен быть непустой строкой`);
+	requireCaptchaText(field, `${path}.field`);
 }
 /** Разбирает ответ `GET /api/v1/auth/captcha/provider` для автоматического входа. */
 function readCaptchaProvider(body) {
@@ -123,43 +138,40 @@ function readCaptchaProvider(body) {
 function resolveField(type, configured) {
 	const field = configured ?? CAPTCHA_FIELDS[type];
 	if (field) return field;
-	throw new require_errors.ItdConfigError(`Неизвестно, в каком поле сервер ждёт токен капчи «${type}». Передайте auth.captcha.field либо оставьте auth.captcha.type = ${require_url.CaptchaChoice.Auto}, чтобы поле назвал сервер.`);
+	throw new require_errors.ItdConfigError(`Неизвестно, в каком поле сервер ждёт токен капчи «${type}». Передайте captcha.field либо оставьте captcha.type = ${require_url.CaptchaChoice.Auto}, чтобы поле назвал сервер.`);
 }
-/** Спрашивает свежий токен, затем берёт разовый. */
-async function resolveToken(captcha, type) {
-	const token = await captcha.getToken?.(type) || captcha.token;
-	if (token) return token;
-	throw new require_errors.ItdConfigError(`Источник капчи не вернул токен для провайдера «${type}». Проверьте auth.captcha.getToken.`);
+/** Спрашивает токен у источника и убеждается, что он непустой. */
+async function requireSolvedToken(solver, type) {
+	const token = await solver.getToken(type);
+	if (typeof token === "string" && token.trim() !== "") return token;
+	throw new require_errors.ItdConfigError(`Источник капчи не вернул токен для провайдера «${type}». Проверьте captcha.getToken.`);
 }
 /**
-* Готовит фрагмент тела запроса с токеном капчи.
+* Готовит фрагмент тела запроса, взяв токен у источника.
 *
 * При `CaptchaChoice.Auto` провайдер спрашивается у сервера — тогда и тип виджета,
-* и имя поля приходят оттуда. Явно названный тип решается без этого запроса.
+* и имя поля приходят оттуда. Явно названный тип обходится без этого запроса.
 *
 * @param askProvider как спросить активного провайдера; вызывается, только если это нужно
-* @throws {ItdConfigError} если капча не настроена или токен не получен
+* @throws {ItdConfigError} если токен получить не удалось
 */
-async function resolveCaptchaBody(captcha, askProvider) {
-	if (!captcha?.token && !captcha?.getToken) throw new require_errors.ItdConfigError("Вход по email и паролю требует токен капчи. Передайте auth.captcha.getToken — источник свежего токена — либо разовый auth.captcha.token. В Node токен получает пакет @itd-api/captcha.");
-	const choice = captcha.type ?? require_url.CaptchaChoice.Auto;
+async function solveCaptchaBody(solver, askProvider) {
+	const choice = solver.type ?? require_url.CaptchaChoice.Auto;
 	if (choice === require_url.CaptchaChoice.Auto) {
 		const { provider, field } = await askProvider();
-		return { [field]: await resolveToken(captcha, provider) };
+		return { [field]: await requireSolvedToken(solver, provider) };
 	}
-	return { [resolveField(choice, captcha.field)]: await resolveToken(captcha, choice) };
+	return { [resolveField(choice, solver.field)]: await requireSolvedToken(solver, choice) };
 }
 /**
-* Готовит фрагмент тела для разового вызова с готовым доказательством.
+* Готовит фрагмент тела из готового токена.
 *
-* Поле берётся из самого доказательства либо из умолчания провайдера; запроса к серверу нет.
+* Поле берётся из самого токена либо из умолчания провайдера; запроса к серверу нет.
 *
-* @throws {ItdConfigError} если доказательство неполное
+* @throws {ItdConfigError} если токен или его тип не указаны
 */
 function captchaBody(captcha) {
-	if (!require_url.isRecord$1(captcha)) throw new require_errors.ItdConfigError("captcha должен быть объектом { type, token }");
-	if (typeof captcha.token !== "string" || captcha.token.trim() === "") throw new require_errors.ItdConfigError("captcha.token должен быть непустой строкой");
-	if (typeof captcha.type !== "string" || captcha.type.trim() === "") throw new require_errors.ItdConfigError("captcha.type должен быть непустой строкой");
+	validateCaptchaToken(captcha, "captcha");
 	return { [resolveField(captcha.type, captcha.field)]: captcha.token };
 }
 //#endregion
@@ -237,7 +249,7 @@ function validateAuth(auth) {
 		const { email, password, captcha } = auth;
 		if (typeof email !== "string" || email.trim() === "") throw new require_errors.ItdConfigError("auth.email должен быть непустой строкой");
 		if (typeof password !== "string" || password === "") throw new require_errors.ItdConfigError("auth.password должен быть непустой строкой");
-		validateCaptchaOptions(captcha);
+		validateCaptchaToken(captcha, "auth.captcha");
 		return { ...auth };
 	}
 	throw new require_errors.ItdConfigError("auth не распознан. Ожидается строка с accessToken либо объект { accessToken }, { email, password } или { getToken }");
@@ -266,6 +278,7 @@ function resolveSessionConfig(options, runtime) {
 	return {
 		...runtime,
 		auth: validateAuth(options.auth),
+		captcha: resolveCaptchaSolver(options.captcha),
 		storage: resolveStorage(options.storage),
 		deviceId: options.deviceId,
 		autoRefresh: options.autoRefresh ?? true,
@@ -437,6 +450,8 @@ var AuthManager = class {
 	*/
 	#authEpoch = 0;
 	#externalReadGeneration = 0;
+	/** Разовый токен из `auth.captcha` тратится ровно на один запрос. */
+	#configCaptchaSpent = false;
 	#disposed = false;
 	#persistence = Promise.resolve();
 	constructor(config, http, jar, hooks = {}) {
@@ -964,6 +979,34 @@ var AuthManager = class {
 		this.#signingIn = promise;
 		return promise;
 	}
+	/**
+	* Готовит фрагмент тела с токеном капчи для запроса, который её требует.
+	*
+	* Источники в порядке убывания приоритета: токен, переданный в сам вызов; разовый токен
+	* из `auth.captcha`; опция `captcha`. Когда ни одного нет, фрагмент пустой: нужна ли
+	* капча этому запросу, решает сервер.
+	*
+	* @param explicit готовый токен, переданный в вызов
+	* @throws {ItdConfigError} если токен неполный или источник его не вернул
+	*/
+	async captchaBody(explicit) {
+		if (explicit) return captchaBody(explicit);
+		const configured = this.#takeConfiguredCaptcha();
+		if (configured) return captchaBody(configured);
+		const solver = this.#config.captcha;
+		if (solver) return solveCaptchaBody(solver, () => this.#resolveCaptchaProvider());
+		this.#config.logger?.debug("Запрос уходит без токена капчи: не передан аргумент captcha и не задана опция captcha");
+		return {};
+	}
+	/** Отдаёт разовый токен из `auth.captcha`, помечая его потраченным. */
+	#takeConfiguredCaptcha() {
+		if (this.#configCaptchaSpent) return void 0;
+		const auth = this.#config.auth;
+		const captcha = require_url.isRecord$1(auth) ? auth.captcha : void 0;
+		if (!captcha) return void 0;
+		this.#configCaptchaSpent = true;
+		return captcha;
+	}
 	/** Спрашивает у сервера активного провайдера и поле, в котором он ждёт токен. */
 	async #resolveCaptchaProvider() {
 		return readCaptchaProvider(await this.#http.execute(AUTH_CAPTCHA_PROVIDER, {
@@ -973,7 +1016,7 @@ var AuthManager = class {
 		}));
 	}
 	async #performSignIn(credentials, revision) {
-		const captcha = await resolveCaptchaBody(credentials.captcha, () => this.#resolveCaptchaProvider());
+		const captcha = await this.captchaBody();
 		const flowCookies = new require_redact.CookieJar();
 		const result = await this.#http.execute(AUTH_SIGN_IN, {
 			path: AUTH_PATHS.signIn,
@@ -1154,7 +1197,8 @@ var AuthResource = class extends require_render.BaseResource {
 		if (existing) return existing;
 		const flow = {
 			cookies: this.#auth.createCookieFlow(false),
-			expiresAt: void 0
+			expiresAt: void 0,
+			captchaRequired: false
 		};
 		this.#qrFlows.set(qrId, flow);
 		return flow;
@@ -1205,7 +1249,8 @@ var AuthResource = class extends require_render.BaseResource {
 		if (typeof result.qrId === "string" && result.qrId !== "") {
 			const flow = {
 				cookies,
-				expiresAt: void 0
+				expiresAt: void 0,
+				captchaRequired: false
 			};
 			this.#touchQrFlow(flow, result.expiresIn);
 			this.#qrFlows.set(result.qrId, flow);
@@ -1215,20 +1260,21 @@ var AuthResource = class extends require_render.BaseResource {
 	/**
 	* Проверяет QR-сессию и завершает вход после подтверждения на другом устройстве.
 	*
-	* До подтверждения возвращает промежуточный статус. Если сервер потребовал капчу,
-	* повторите вызов с `captcha` — тип берётся из {@link captchaProvider}.
-	* Полученный `accessToken` автоматически сохраняется в клиенте.
+	* До подтверждения возвращает промежуточный статус. Токен капчи добывается, только когда
+	* сервер о ней попросил — статусом `captcha_required` на прошлой проверке, — либо когда
+	* передан в сам вызов. Полученный `accessToken` автоматически сохраняется в клиенте.
 	*/
 	async claimQrLogin(input, options = {}) {
 		const revision = this.#auth.revision();
 		const flow = this.#qrFlow(input.qrId);
 		try {
 			const { captcha, ...rest } = input;
+			const needsCaptcha = captcha !== void 0 || flow.captchaRequired;
 			const result = await this.http.execute(AUTH_QR_CLAIM, {
 				path: AUTH_PATHS.qrClaim,
 				body: {
 					...rest,
-					...captcha ? captchaBody(captcha) : {}
+					...needsCaptcha ? await this.#auth.captchaBody(captcha) : {}
 				},
 				skipAuth: true,
 				skipAuthRefresh: true,
@@ -1236,6 +1282,7 @@ var AuthResource = class extends require_render.BaseResource {
 				...options
 			});
 			this.#touchQrFlow(flow, result.expiresIn);
+			if (result.status === QrLoginStatus.CaptchaRequired) flow.captchaRequired = true;
 			if (result.status === QrLoginStatus.Authorized) {
 				await this.#auth.commitAuthFlow(result.accessToken, flow.cookies, revision);
 				this.#qrFlows.delete(input.qrId);
@@ -1271,13 +1318,13 @@ var AuthResource = class extends require_render.BaseResource {
 	*
 	* @returns `flowToken`, который нужно передать в {@link verifyOtp}
 	*/
-	signUp(credentials, options = {}) {
+	async signUp(credentials, options = {}) {
 		const { captcha, ...rest } = credentials;
 		return this.http.execute(AUTH_SIGN_UP, {
 			path: AUTH_PATHS.signUp,
 			body: {
 				...rest,
-				...captchaBody(captcha)
+				...await this.#auth.captchaBody(captcha)
 			},
 			skipAuth: true,
 			skipAuthRefresh: true,
@@ -1292,18 +1339,19 @@ var AuthResource = class extends require_render.BaseResource {
 	*
 	* При успешном входе токен сохраняется в клиенте автоматически.
 	*
-	* @param credentials email, пароль и обязательный токен капчи — см. {@link CaptchaCredentials}
+	* @param credentials email, пароль и токен капчи — см. {@link CredentialsWithCaptcha}
 	*/
 	async signIn(credentials, options = {}) {
 		const { captcha, ...rest } = credentials;
 		const revision = this.#auth.revision();
 		const cookies = this.#auth.createCookieFlow(false);
+		const body = {
+			...rest,
+			...await this.#auth.captchaBody(captcha)
+		};
 		const result = await this.http.execute(AUTH_SIGN_IN, {
 			path: AUTH_PATHS.signIn,
-			body: {
-				...rest,
-				...captchaBody(captcha)
-			},
+			body,
 			skipAuth: true,
 			skipAuthRefresh: true,
 			cookieJar: cookies,
@@ -1431,12 +1479,12 @@ var AuthResource = class extends require_render.BaseResource {
 	*
 	* @returns `flowToken`, который нужно передать в {@link resetPassword}
 	*/
-	forgotPassword(input, options = {}) {
+	async forgotPassword(input, options = {}) {
 		return this.http.execute(AUTH_FORGOT_PASSWORD, {
 			path: AUTH_PATHS.forgotPassword,
 			body: {
 				email: input.email,
-				...captchaBody(input.captcha)
+				...await this.#auth.captchaBody(input.captcha)
 			},
 			skipAuth: true,
 			skipAuthRefresh: true,
@@ -1571,8 +1619,9 @@ function createManagedClient(options, internals) {
 * const itd = new ItdClient({
 *   // `auth` не обязателен: когда хранилище уже содержит сессию, токен берётся оттуда,
 *   // а истёкший продлевается сам. Здесь он нужен на первый запуск.
-*   // Вход по паролю требует токена капчи — см. CaptchaOptions.
-*   auth: { email, password, captcha: createCaptchaSolver() },
+*   auth: { email, password },
+*   // Капчу входа решает пакет @itd-api/captcha — см. CaptchaSolver.
+*   captcha: createCaptchaSolver(),
 *   storage: new FileTokenStorage('./.itd-session.json'),
 *   rateLimit: { concurrency: 4, rps: 8 },
 * });
@@ -2086,6 +2135,8 @@ function assertAccountsActive(accounts, action) {
 *
 * await using accounts = new ItdAccounts({
 *   storage: new FileMultiTokenStorage('./.itd-sessions.json'),
+*   // Общие опции достаются каждому аккаунту: один источник токена капчи на всех.
+*   captcha: createCaptchaSolver(),
 *   rateLimit: { concurrency: 4 },
 * });
 *
@@ -2093,9 +2144,7 @@ function assertAccountsActive(accounts, action) {
 * await accounts.restore();
 *
 * if (!accounts.has('kiow')) {
-*   accounts.addAccount('kiow', {
-*     auth: { email, password, captcha: createCaptchaSolver() },
-*   });
+*   accounts.addAccount('kiow', { auth: { email, password } });
 * }
 *
 * await accounts.account('kiow').posts.create({ content: 'привет' });
@@ -2174,9 +2223,7 @@ var ItdAccounts = class ItdAccounts {
 	*
 	* @example
 	* ```ts
-	* accounts.addAccount('bot', {
-	*   auth: { email, password, captcha: createCaptchaSolver() },
-	* });
+	* accounts.addAccount('bot', { auth: { email, password } });
 	* accounts.addAccount('reader', { auth: '<accessToken>' });
 	* accounts.addAccount('через-прокси', { fetch: proxyFetch('socks5://…') });
 	* ```