api-client/turnstile: expose information about client needing session

This commit is contained in:
dumbmoron 2024-09-11 21:12:17 +00:00
parent 1d30ac0139
commit ff57a6a448
No known key found for this signature in database
2 changed files with 15 additions and 3 deletions

View file

@ -49,9 +49,13 @@ export default class CobaltSessionHandler {
return response;
}
hasSession() {
return this.#session && this.#session.exp - EXPIRY_THRESHOLD_SECONDS > currentTime();
}
async getSession(turnstileResponse?: string): Promise<CobaltSessionResponse> {
if (this.#session && this.#session.exp - EXPIRY_THRESHOLD_SECONDS > currentTime()) {
return this.#session;
if (this.hasSession()) {
return this.#session!;
}
return this.#requestSession(turnstileResponse);

View file

@ -2,15 +2,21 @@ import CobaltSessionHandler from "./internal/session";
import BaseCobaltAPI from "./internal/base-api";
import { CobaltRequest } from "./types/request";
import { CobaltAuthError } from "./types/errors";
import { CobaltAPIClient } from "./types/interface";
export default class TurnstileCobaltAPI extends BaseCobaltAPI {
export default class TurnstileCobaltAPI extends BaseCobaltAPI implements CobaltAPIClient {
#session: CobaltSessionHandler;
#instanceHasTurnstile = true;
constructor(baseURL: string) {
super(baseURL);
this.#session = new CobaltSessionHandler(baseURL);
}
needsSession() {
return this.#instanceHasTurnstile && !this.#session.hasSession();
}
async request(data: CobaltRequest, turnstileResponse?: string) {
const sessionOrError = await this.#session.getSession(turnstileResponse);
const headers: Record<string, string> = {};
@ -18,6 +24,8 @@ export default class TurnstileCobaltAPI extends BaseCobaltAPI {
if ("error" in sessionOrError) {
if (sessionOrError.error.code !== CobaltAuthError.NotConfigured) {
return sessionOrError;
} else {
this.#instanceHasTurnstile = false;
}
} else {
headers['Authorization'] = `Bearer ${sessionOrError.token}`;