Merge pull request #11 from blackravenx/TwoCaptcha

Two captcha

twocaptcha/README.md

@@ -5,11 +5,11 @@
 Docs: https://2captcha.com/api-docs
 
 ## Installation
-Via [npm](https://www.npmjs.com/package/@captcha-libs/twocaptcha)
+* [npm](https://www.npmjs.com/package/@captcha-libs/twocaptcha)
     ```$ npm i @captcha-libs/twocaptcha```
-pnpm
+* pnpm
     ```$ pnpm i @captcha-libs/twocaptcha```
-yarn
+* yarn
     ```$ yarn add @captcha-libs/twocaptcha```
 
 ### Usage

twocaptcha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@captcha-libs/twocaptcha",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "keywords": [
       "TwoCaptcha",
       "Captcha recognition",

twocaptcha/project.json

@@ -6,7 +6,8 @@
   "targets": {
     "lint": {
       "executor": "@nx/eslint:lint",
-      "outputs": ["{options.outputFile}"]
+      "outputs": ["{options.outputFile}"],
+      "options": {"fix": true}
     },
     "test": {
       "executor": "@nx/jest:jest",

twocaptcha/src/lib/Requests/Recognition/AudioTask.ts

@@ -1,5 +1,6 @@
+import type { _IsTaskType } from "../_BaseTaskRequest";
 import {
-  BaseTask, type BaseParams, _IsTaskType
+  BaseTask, type BaseParams
 } from "../_BaseTaskRequest";
 
 type AudioLangs = "de" | "el" | "en" | "fr" | "pt" | "ru";

twocaptcha/src/lib/Requests/Recognition/BoundingBoxTask.ts

@@ -1,6 +1,5 @@
-import {
-  BaseTask, _IsTaskType
-} from "../_BaseTaskRequest";
+import type { _IsTaskType } from "../_BaseTaskRequest";
+import { BaseTask } from "../_BaseTaskRequest";
 
 interface BoundingBoxTaskParams {
   body: string;

twocaptcha/src/lib/Requests/Recognition/CoordinatesTask.ts

@@ -1,6 +1,5 @@
-import {
-  BaseTask, _IsTaskType
-} from "../_BaseTaskRequest";
+import type { _IsTaskType } from "../_BaseTaskRequest";
+import { BaseTask } from "../_BaseTaskRequest";
 
 type CoordinatesTaskParams = {
   body: string;

twocaptcha/src/lib/Requests/Recognition/DrawAroundTask.ts

@@ -1,6 +1,5 @@
-import {
-  BaseTask, _IsTaskType
-} from "../_BaseTaskRequest";
+import type { _IsTaskType } from "../_BaseTaskRequest";
+import { BaseTask } from "../_BaseTaskRequest";
 
 interface DrawAroundTaskParams {
   body: string;

twocaptcha/src/lib/Requests/Recognition/GridTask.ts

@@ -1,6 +1,5 @@
-import {
-  BaseTask, _IsTaskType
-} from "../_BaseTaskRequest";
+import type { _IsTaskType } from "../_BaseTaskRequest";
+import { BaseTask } from "../_BaseTaskRequest";
 
 type GridTaskParams = {
   body: string;

twocaptcha/src/lib/Requests/Recognition/ImageToTextTask.ts

@@ -1,5 +1,6 @@
+import type { _IsTaskType } from "../_BaseTaskRequest";
 import {
-  BaseTask, type BaseParams, _IsTaskType
+  BaseTask, type BaseParams
 } from "../_BaseTaskRequest";
 
 export enum NumericOptions {

twocaptcha/src/lib/Requests/Recognition/RotateTask.ts

@@ -1,5 +1,6 @@
+import type { _IsTaskType } from "../_BaseTaskRequest";
 import {
-  BaseTask, type BaseParams, _IsTaskType
+  BaseTask, type BaseParams
 } from "../_BaseTaskRequest";
 
 type RotateTaskParams = Omit<BaseParams, "type"> & {

twocaptcha/src/lib/Requests/Recognition/TextCaptchaTask.ts

@@ -1,5 +1,6 @@
+import type { _IsTaskType } from "../_BaseTaskRequest";
 import {
-  BaseTask, type BaseParams, _IsTaskType
+  BaseTask, type BaseParams
 } from "../_BaseTaskRequest";
 
 type TextCaptchaParams = Omit<BaseParams, "type"> & {

twocaptcha/src/lib/Requests/Token/AmazonTask.ts

@@ -1,9 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  AmazonTaskBase, AmazonTaskBaseParams
-} from "./_AmazonTaskBase";
+import type { AmazonTaskBaseParams } from "./Base/_AmazonTaskBase";
+import { AmazonTaskBase } from "./Base/_AmazonTaskBase";
 
 type AmazonTaskParams = ProxyRequiredTaskParams<AmazonTaskBaseParams>;
 

twocaptcha/src/lib/Requests/Token/AmazonTaskProxyless.ts

@@ -1,9 +1,8 @@
-import {
+import type {
   ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  AmazonTaskBase, AmazonTaskBaseParams
-} from "./_AmazonTaskBase";
+import type { AmazonTaskBaseParams } from "./Base/_AmazonTaskBase";
+import { AmazonTaskBase } from "./Base/_AmazonTaskBase";
 
 type AmazonTaskProxylessParams = ProxylessTaskParams<AmazonTaskBaseParams>;
 

twocaptcha/src/lib/Requests/Token/AntiCyberSiAraTask.ts

@@ -1,9 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  AntiCyberSiAraTaskBase, AntiCyberSiAraTaskBaseParams
-} from "./_AntiCyberSiAraTaskBase";
+import type { AntiCyberSiAraTaskBaseParams } from "./Base/_AntiCyberSiAraTaskBase";
+import { AntiCyberSiAraTaskBase } from "./Base/_AntiCyberSiAraTaskBase";
 
 type AntiCyberSiAraTaskParams = ProxyRequiredTaskParams<AntiCyberSiAraTaskBaseParams>;
 

twocaptcha/src/lib/Requests/Token/AntiCyberSiAraTaskProxyless.ts

@@ -1,9 +1,8 @@
-import {
+import type {
   ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  AntiCyberSiAraTaskBase, AntiCyberSiAraTaskBaseParams
-} from "./_AntiCyberSiAraTaskBase";
+import type { AntiCyberSiAraTaskBaseParams } from "./Base/_AntiCyberSiAraTaskBase";
+import { AntiCyberSiAraTaskBase } from "./Base/_AntiCyberSiAraTaskBase";
 
 type AntiCyberSiAraTaskProxylessParams = ProxylessTaskParams<AntiCyberSiAraTaskBaseParams>;
 

twocaptcha/src/lib/Requests/Token/_AmazonTaskBase.ts → twocaptcha/src/lib/Requests/Token/Base/_AmazonTaskBase.ts

@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type AmazonTaskBaseParams = Partial<ProxyCredentials> & {
   captchaScript?: string;

twocaptcha/src/lib/Requests/Token/_AntiCyberSiAraTaskBase.ts → twocaptcha/src/lib/Requests/Token/Base/_AntiCyberSiAraTaskBase.ts

@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type AntiCyberSiAraTaskBaseParams = Partial<ProxyCredentials> & {
   SlideMasterUrlId: string;

twocaptcha/src/lib/Requests/Token/_CapyTaskBase.ts → twocaptcha/src/lib/Requests/Token/Base/_CapyTaskBase.ts

@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type CapyTaskBaseParams = Partial<ProxyCredentials> & {
   userAgent?: string;

twocaptcha/src/lib/Requests/Token/_CutCaptchaTask.ts → twocaptcha/src/lib/Requests/Token/Base/_CutCaptchaTask.ts

@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type CutCaptchaTaskBaseParams = Partial<ProxyCredentials> & {
   apiKey: string;

twocaptcha/src/lib/Requests/Token/_DataDomeSliderTaskBase.ts → twocaptcha/src/lib/Requests/Token/Base/_DataDomeSliderTaskBase.ts

@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyRequiredTaskParams, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyRequiredTaskParams, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
  type _DataDomeSliderTaskBaseParams = {
    captchaUrl: string;

twocaptcha/src/lib/Requests/Token/_FriendlyCaptchaTask.ts → twocaptcha/src/lib/Requests/Token/Base/_FriendlyCaptchaTask.ts

@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type FriendlyCaptchaTaskBaseParams = Partial<ProxyCredentials> & {
   websiteKey: string;

twocaptcha/src/lib/Requests/Token/_FunCaptchaTaskBase.ts → twocaptcha/src/lib/Requests/Token/Base/_FunCaptchaTaskBase.ts

@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type FunCaptchaTaskBaseParams = Partial<ProxyCredentials> & {
   data?: string;

twocaptcha/src/lib/Requests/Token/_GeeTestTaskBase.ts → twocaptcha/src/lib/Requests/Token/Base/_GeeTestTaskBase.ts

@@ -1,9 +1,9 @@
 import type {
   ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+} from "../../_BaseTaskRequest";
 import {
   BaseTask, _IsTaskType
-} from "../_BaseTaskRequest";
+} from "../../_BaseTaskRequest";
 
 export type GeetestV3TaskBaseParams = {
   challenge: string;

twocaptcha/src/lib/Requests/Token/_GeeTestV3TaskBase.ts → twocaptcha/src/lib/Requests/Token/Base/_GeeTestV3TaskBase.ts

@@ -1,7 +1,8 @@
-import {
-  BaseTask, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
-import { GeeTestV3TaskParams } from "./_GeeTestTaskBase";
+import type {
+  ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
+import type { GeeTestV3TaskParams } from "./_GeeTestTaskBase";
 
 /**
  * Base class for geetest

twocaptcha/src/lib/Requests/Token/_GeeTestV4TaskBase.ts → twocaptcha/src/lib/Requests/Token/Base/_GeeTestV4TaskBase.ts

@@ -1,7 +1,8 @@
-import {
-  BaseTask, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
-import { GeeTestV4TaskParams } from "./_GeeTestTaskBase";
+import type {
+  ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
+import type { GeeTestV4TaskParams } from "./_GeeTestTaskBase";
 
 /**
  * Base class for geetest

twocaptcha/src/lib/Requests/Token/_HCaptchaTaskBase.ts → twocaptcha/src/lib/Requests/Token/Base/_HCaptchaTaskBase.ts

@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type HCaptchaTaskBaseParams = Partial<ProxyCredentials> & {
   enterprisePayload?: Record<string, string>;

twocaptcha/src/lib/Requests/Token/_KeyCaptchaTaskBase.ts → twocaptcha/src/lib/Requests/Token/Base/_KeyCaptchaTaskBase.ts

@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type KeyCaptchaTaskBaseParams = Partial<ProxyCredentials> & {
   s_s_c_session_id: string;

twocaptcha/src/lib/Requests/Token/_LeminTaskBase.ts → twocaptcha/src/lib/Requests/Token/Base/_LeminTaskBase.ts

@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type LeminTaskBaseParams = Partial<ProxyCredentials> & {
   captchaId: string;

twocaptcha/src/lib/Requests/Token/_MtCaptchaTask.ts → twocaptcha/src/lib/Requests/Token/Base/_MtCaptchaTask.ts

@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type MtCaptchaTaskBaseParams = Partial<ProxyCredentials> & {
   websiteKey: string;

twocaptcha/src/lib/Requests/Token/_RecaptchaV2TaskBase.ts → twocaptcha/src/lib/Requests/Token/Base/_RecaptchaV2TaskBase.ts

@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type RecaptchaV2TaskBaseParams = Partial<ProxyCredentials> & {
   apiDomain?: string;

twocaptcha/src/lib/Requests/Token/_RecaptchaV3TaskBase.ts → twocaptcha/src/lib/Requests/Token/Base/_RecaptchaV3TaskBase.ts

@@ -1,6 +1,7 @@
+import type { TaskTypes } from "../../_BaseTaskRequest";
 import {
-  BaseTask, ProxyCredentials, TaskTypes
-} from "../_BaseTaskRequest";
+  BaseTask, ProxyCredentials
+} from "../../_BaseTaskRequest";
 
 export type RecaptchaV3TaskBaseParams = {
   apiDomain?: string;

twocaptcha/src/lib/Requests/Token/_TurnstileTaskBase.ts → twocaptcha/src/lib/Requests/Token/Base/_TurnstileTaskBase.ts

@@ -1,6 +1,7 @@
-import {
-  BaseTask, ProxyCredentials, ProxyTypes, TaskTypes
-} from "../_BaseTaskRequest";
+import type {
+  ProxyCredentials, ProxyTypes, TaskTypes
+} from "../../_BaseTaskRequest";
+import { BaseTask } from "../../_BaseTaskRequest";
 
 export type TurnstileTaskBaseParams = Partial<ProxyCredentials> & {
   action?: string;

twocaptcha/src/lib/Requests/Token/CapyTask.ts

@@ -1,9 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  CapyTaskBase, CapyTaskBaseParams
-} from "./_CapyTaskBase";
+import type { CapyTaskBaseParams } from "./Base/_CapyTaskBase";
+import { CapyTaskBase } from "./Base/_CapyTaskBase";
 
 type CapyTaskParams = ProxyRequiredTaskParams<CapyTaskBaseParams>;
 

twocaptcha/src/lib/Requests/Token/CapyTaskProxyless.ts

@@ -1,9 +1,8 @@
-import {
+import type {
   ProxylessTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  CapyTaskBase, CapyTaskBaseParams
-} from "./_CapyTaskBase";
+import type { CapyTaskBaseParams } from "./Base/_CapyTaskBase";
+import { CapyTaskBase } from "./Base/_CapyTaskBase";
 
 type CapyTaskProxylessParams = ProxylessTaskParams<CapyTaskBaseParams>;
 

twocaptcha/src/lib/Requests/Token/CutCaptchaTask.ts

@@ -1,9 +1,8 @@
-import {
+import type {
   ProxyRequiredTaskParams, _IsTaskType
 } from "../_BaseTaskRequest";
-import {
-  CutCaptchaTaskBase, CutCaptchaTaskBaseParams
-} from "./_CutCaptchaTask";
+import type { CutCaptchaTaskBaseParams } from "./Base/_CutCaptchaTask";
+import { CutCaptchaTaskBase } from "./Base/_CutCaptchaTask";
 
 type CutCaptchaTaskParams = ProxyRequiredTaskParams<CutCaptchaTaskBaseParams>;