Skip to content

Commit fe9ccd4

Browse files
drallieivdrallieiv
committed
rename everything capchaai.io to capsolver
1 parent 5ba0ebb commit fe9ccd4

24 files changed

+94
-95
lines changed

‎KinanCity-captcha-captchaai/.gitignore ‎KinanCity-captcha-capsolver/.gitignore

File renamed without changes.

‎KinanCity-captcha-captchaai/pom.xml ‎KinanCity-captcha-capsolver/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

10-
<artifactId>kinancity-captcha-captchaii</artifactId>
10+
<artifactId>kinancity-captcha-capsolver</artifactId>
1111

1212
<properties>
1313
<maven.compiler.source>8</maven.compiler.source>

‎KinanCity-captcha-captchaai/src/main/java/com/kinancity/core/captcha/captchaai/CaptchaaiCaptchaProvider.java ‎KinanCity-captcha-capsolver/src/main/java/com/kinancity/core/captcha/capsolver/CapsolverCaptchaProvider.java

+32-32
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.kinancity.core.captcha.captchaai;
1+
package com.kinancity.core.captcha.capsolver;
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
44
import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -7,13 +7,13 @@
77
import com.kinancity.core.captcha.CaptchaException;
88
import com.kinancity.core.captcha.CaptchaProvider;
99
import com.kinancity.core.captcha.CaptchaQueue;
10-
import com.kinancity.core.captcha.captchaai.dto.request.BalanceRequestDto;
11-
import com.kinancity.core.captcha.captchaai.dto.request.CreateTaskRequestDto;
12-
import com.kinancity.core.captcha.captchaai.dto.request.TaskResultRequestDto;
13-
import com.kinancity.core.captcha.captchaai.dto.response.BalanceResponseDto;
14-
import com.kinancity.core.captcha.captchaai.dto.response.BaseResponseDto;
15-
import com.kinancity.core.captcha.captchaai.dto.response.CreateTaskResponseDto;
16-
import com.kinancity.core.captcha.captchaai.dto.response.GetTaskResulResponseDto;
10+
import com.kinancity.core.captcha.capsolver.dto.request.BalanceRequestDto;
11+
import com.kinancity.core.captcha.capsolver.dto.request.CreateTaskRequestDto;
12+
import com.kinancity.core.captcha.capsolver.dto.request.TaskResultRequestDto;
13+
import com.kinancity.core.captcha.capsolver.dto.response.BalanceResponseDto;
14+
import com.kinancity.core.captcha.capsolver.dto.response.BaseResponseDto;
15+
import com.kinancity.core.captcha.capsolver.dto.response.CreateTaskResponseDto;
16+
import com.kinancity.core.captcha.capsolver.dto.response.GetTaskResulResponseDto;
1717
import lombok.Setter;
1818
import okhttp3.*;
1919
import okhttp3.logging.HttpLoggingInterceptor;
@@ -28,15 +28,15 @@
2828
import java.util.Set;
2929
import java.util.stream.Collectors;
3030

31-
public class CaptchaaiCaptchaProvider extends CaptchaProvider {
31+
public class CapsolverCaptchaProvider extends CaptchaProvider {
3232

33-
private static final String BASE_URL = "https://api.captchaai.io";
33+
private static final String BASE_URL = "https://api.capsolver.com";
3434
private static final String BALANCE_URL = BASE_URL + "/getBalance";
3535
private static final String NEW_TASK_URL = BASE_URL + "/createTask";
3636
private static final String GET_TASK_URL = BASE_URL + "/getTaskResult";
3737

3838

39-
private static final String HTTP_ERROR_MSG = "Could not reach Captchaai servers";
39+
private static final String HTTP_ERROR_MSG = "Could not reach Capsolver servers";
4040
public static final String ERROR_ZERO_BALANCE = "ERROR_ZERO_BALANCE";
4141

4242
private final ObjectMapper objectMapper;
@@ -49,7 +49,7 @@ public class CaptchaaiCaptchaProvider extends CaptchaProvider {
4949

5050
private int maxRequestPerTask = 120;
5151

52-
private List<CaptchaiiTask> tasks;
52+
private List<CapsolverTask> tasks;
5353

5454
private boolean hasBalanceLeft = true;
5555

@@ -65,15 +65,15 @@ public class CaptchaaiCaptchaProvider extends CaptchaProvider {
6565
private int minTimeBeforeFirstResolve = 5;
6666

6767
/**
68-
* How often should we call Captchaai (default 5000 ms)
68+
* How often should we call Capsolver (default 5000 ms)
6969
*/
7070
@Setter
7171
private int waitBeforeRetry = 5000;
7272

7373
@Setter
7474
private int waitForBalance = 5*60*1000;
7575

76-
public CaptchaaiCaptchaProvider(CaptchaQueue queue, String apiKey) throws CaptchaException {
76+
public CapsolverCaptchaProvider(CaptchaQueue queue, String apiKey) throws CaptchaException {
7777
this.queue = queue;
7878
this.apiKey = apiKey;
7979

@@ -92,12 +92,12 @@ public CaptchaaiCaptchaProvider(CaptchaQueue queue, String apiKey) throws Captch
9292
this.objectMapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
9393

9494
if (this.apiKey == null || this.apiKey.isEmpty()) {
95-
throw new CaptchaException("Missing Captchaai API key");
95+
throw new CaptchaException("Missing Capsolver API key");
9696
}
9797
}
9898

9999
public static CaptchaProvider getInstance(CaptchaQueue queue, String apiKey) throws CaptchaException {
100-
return new CaptchaaiCaptchaProvider(queue, apiKey);
100+
return new CapsolverCaptchaProvider(queue, apiKey);
101101
}
102102

103103
@Override
@@ -109,15 +109,15 @@ public void run() {
109109
if (this.getBalance() > 0) {
110110
hasBalanceLeft = true;
111111
}
112-
} catch (TechnicalException | CaptchaaiConfigurationException e) {
112+
} catch (TechnicalException | CapsolverConfigurationException e) {
113113
logger.error("Error getting balance", e);
114114
}
115115
}
116116

117117
if(hasBalanceLeft) {
118118

119119
LocalDateTime minDate = LocalDateTime.now().minusSeconds(minTimeBeforeFirstResolve);
120-
Set<CaptchaiiTask> captchaiiTasksToResolve = tasks.stream().filter(c -> c.getSentTime().isBefore(minDate)).collect(Collectors.toSet());
120+
Set<CapsolverTask> captchaiiTasksToResolve = tasks.stream().filter(c -> c.getSentTime().isBefore(minDate)).collect(Collectors.toSet());
121121

122122

123123
if (captchaiiTasksToResolve.isEmpty()) {
@@ -127,7 +127,7 @@ public void run() {
127127
// Waiting for captchas
128128
logger.debug("Check status of {} captchas", captchaiiTasksToResolve.size());
129129

130-
for (CaptchaiiTask task : captchaiiTasksToResolve) {
130+
for (CapsolverTask task : captchaiiTasksToResolve) {
131131
try {
132132
Request taskResultRequest = buildGetTaskResultRequest(task.getTaskId());
133133
Response solveResponse = captchaClient.newCall(taskResultRequest).execute();
@@ -137,7 +137,7 @@ public void run() {
137137

138138
this.manageTaskResulResponse(task, taskResponse);
139139

140-
} catch (CaptchaaiConfigurationException e) {
140+
} catch (CapsolverConfigurationException e) {
141141
logger.error("Error while creating GetTaskResult request : {}", e.getMessage());
142142
} catch (IOException e) {
143143
logger.error("Error while calling captcha provider : {}", e.getMessage());
@@ -176,7 +176,7 @@ public void run() {
176176
}
177177

178178
logger.info("Requested new Captcha, taskid : {}", taskResponse.getTaskId());
179-
tasks.add(new CaptchaiiTask(taskResponse.getTaskId()));
179+
tasks.add(new CapsolverTask(taskResponse.getTaskId()));
180180

181181
} catch (TechnicalException | IOException e) {
182182
logger.error("Error while calling captcha provider : {}", e.getMessage());
@@ -186,7 +186,7 @@ public void run() {
186186
break;
187187
}
188188
}
189-
} catch (CaptchaaiConfigurationException e) {
189+
} catch (CapsolverConfigurationException e) {
190190
logger.error("Error while creating new task request : {}", e.getMessage());
191191
}
192192
}
@@ -211,7 +211,7 @@ public void run() {
211211
}
212212
}
213213

214-
private void manageTaskResulResponse(CaptchaiiTask task, GetTaskResulResponseDto taskResponse) {
214+
private void manageTaskResulResponse(CapsolverTask task, GetTaskResulResponseDto taskResponse) {
215215
if ("Idle".equals(taskResponse.getStatus())) {
216216
logger.debug("Task {} Idle, will retry later", task.getTaskId());
217217
task.setNbTries(task.getNbTries() + 1);
@@ -247,9 +247,9 @@ private void manageTaskResulResponse(CaptchaiiTask task, GetTaskResulResponseDto
247247
*
248248
* @return current balance in USD
249249
* @throws TechnicalException
250-
* @throws CaptchaaiConfigurationException
250+
* @throws CapsolverConfigurationException
251251
*/
252-
public double getBalance() throws TechnicalException, CaptchaaiConfigurationException {
252+
public double getBalance() throws TechnicalException, CapsolverConfigurationException {
253253
Request sendRequest = buildBalanceCheckequest();
254254
try (Response sendResponse = captchaClient.newCall(sendRequest).execute()) {
255255
String body = sendResponse.body().string();
@@ -268,15 +268,15 @@ public double getBalance() throws TechnicalException, CaptchaaiConfigurationExce
268268
private TechnicalException generateException(BaseResponseDto responseDto) {
269269
return new TechnicalException(
270270
(new StringBuilder())
271-
.append("Captchaai Error, ")
271+
.append("Capsolver Error, ")
272272
.append(responseDto.getErrorCode())
273273
.append(" : ")
274274
.append(responseDto.getErrorDescription())
275275
.toString());
276276
}
277277

278278

279-
private Request buildGetTaskResultRequest(String taskId) throws CaptchaaiConfigurationException {
279+
private Request buildGetTaskResultRequest(String taskId) throws CapsolverConfigurationException {
280280
try {
281281
HttpUrl url = HttpUrl.parse(GET_TASK_URL).newBuilder()
282282
.build();
@@ -292,12 +292,12 @@ private Request buildGetTaskResultRequest(String taskId) throws CaptchaaiConfigu
292292
.build();
293293
return request;
294294
} catch (JsonProcessingException e) {
295-
throw new CaptchaaiConfigurationException("Failed creating new taskResult request", e);
295+
throw new CapsolverConfigurationException("Failed creating new taskResult request", e);
296296
}
297297
}
298298

299299

300-
private Request buildSendCaptchaRequest() throws CaptchaaiConfigurationException {
300+
private Request buildSendCaptchaRequest() throws CapsolverConfigurationException {
301301
try {
302302
HttpUrl url = HttpUrl.parse(NEW_TASK_URL).newBuilder()
303303
.build();
@@ -313,7 +313,7 @@ private Request buildSendCaptchaRequest() throws CaptchaaiConfigurationException
313313
.build();
314314
return request;
315315
} catch (JsonProcessingException e) {
316-
throw new CaptchaaiConfigurationException("Failed creating new task request", e);
316+
throw new CapsolverConfigurationException("Failed creating new task request", e);
317317
}
318318
}
319319

@@ -323,7 +323,7 @@ private Request buildSendCaptchaRequest() throws CaptchaaiConfigurationException
323323
*
324324
* @return Request to sent for balance check
325325
*/
326-
private Request buildBalanceCheckequest() throws CaptchaaiConfigurationException {
326+
private Request buildBalanceCheckequest() throws CapsolverConfigurationException {
327327
try {
328328
HttpUrl url = HttpUrl.parse(BALANCE_URL).newBuilder()
329329
.build();
@@ -339,7 +339,7 @@ private Request buildBalanceCheckequest() throws CaptchaaiConfigurationException
339339
.build();
340340
return request;
341341
} catch (JsonProcessingException e) {
342-
throw new CaptchaaiConfigurationException("Failed creating balance request", e);
342+
throw new CapsolverConfigurationException("Failed creating balance request", e);
343343
}
344344
}
345345

‎KinanCity-captcha-capsolver/src/main/java/com/kinancity/core/captcha/capsolver/CapsolverConfigurationException.java

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package com.kinancity.core.captcha.capsolver;
2+
3+
import com.kinancity.core.captcha.CaptchaException;
4+
5+
/**
6+
* Capsolver Captcha Errors
7+
*
8+
* @author drallieiv
9+
*
10+
*/
11+
public class CapsolverConfigurationException extends CaptchaException {
12+
13+
private static final long serialVersionUID = -1173353148853930289L;
14+
15+
public CapsolverConfigurationException() {
16+
super();
17+
}
18+
19+
public CapsolverConfigurationException(String message, Throwable cause) {
20+
super(message, cause);
21+
}
22+
23+
public CapsolverConfigurationException(String message) {
24+
super(message);
25+
}
26+
27+
public CapsolverConfigurationException(Throwable cause) {
28+
super(cause);
29+
}
30+
31+
}

‎KinanCity-captcha-captchaai/src/main/java/com/kinancity/core/captcha/captchaai/CaptchaiiTask.java ‎KinanCity-captcha-capsolver/src/main/java/com/kinancity/core/captcha/capsolver/CapsolverTask.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
package com.kinancity.core.captcha.captchaai;
1+
package com.kinancity.core.captcha.capsolver;
22

33
import lombok.Data;
44

55
import java.time.LocalDateTime;
66

77
@Data
8-
public class CaptchaiiTask {
8+
public class CapsolverTask {
99
private int nbTries = 0;
1010
private String taskId;
1111
private String appId = "F651F862-8811-421D-9172-80A95BDFB1D3";
1212
private LocalDateTime sentTime;
1313

14-
public CaptchaiiTask(String taskId) {
14+
public CapsolverTask(String taskId) {
1515
this.taskId = taskId;
1616
this.sentTime = LocalDateTime.now();
1717
}

‎KinanCity-captcha-captchaai/src/main/java/com/kinancity/core/captcha/captchaai/dto/PtcReCaptchaV2Task.java ‎KinanCity-captcha-capsolver/src/main/java/com/kinancity/core/captcha/capsolver/dto/PtcReCaptchaV2Task.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.kinancity.core.captcha.captchaai.dto;
1+
package com.kinancity.core.captcha.capsolver.dto;
22

33
import lombok.Data;
44
import lombok.NoArgsConstructor;

‎KinanCity-captcha-captchaai/src/main/java/com/kinancity/core/captcha/captchaai/dto/PtcReCaptchaV2TaskProxyLess.java ‎KinanCity-captcha-capsolver/src/main/java/com/kinancity/core/captcha/capsolver/dto/PtcReCaptchaV2TaskProxyLess.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.kinancity.core.captcha.captchaai.dto;
1+
package com.kinancity.core.captcha.capsolver.dto;
22

33
import lombok.Data;
44
import lombok.NoArgsConstructor;

‎KinanCity-captcha-captchaai/src/main/java/com/kinancity/core/captcha/captchaai/dto/PtcReCaptchaV2TaskSolution.java ‎KinanCity-captcha-capsolver/src/main/java/com/kinancity/core/captcha/capsolver/dto/PtcReCaptchaV2TaskSolution.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.kinancity.core.captcha.captchaai.dto;
1+
package com.kinancity.core.captcha.capsolver.dto;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
44
import lombok.Data;

‎KinanCity-captcha-captchaai/src/main/java/com/kinancity/core/captcha/captchaai/dto/request/BalanceRequestDto.java ‎KinanCity-captcha-capsolver/src/main/java/com/kinancity/core/captcha/capsolver/dto/request/BalanceRequestDto.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.kinancity.core.captcha.captchaai.dto.request;
1+
package com.kinancity.core.captcha.capsolver.dto.request;
22

33
import lombok.Data;
44

‎KinanCity-captcha-captchaai/src/main/java/com/kinancity/core/captcha/captchaai/dto/request/BaseRequestDto.java ‎KinanCity-captcha-capsolver/src/main/java/com/kinancity/core/captcha/capsolver/dto/request/BaseRequestDto.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.kinancity.core.captcha.captchaai.dto.request;
1+
package com.kinancity.core.captcha.capsolver.dto.request;
22

33
import lombok.AllArgsConstructor;
44
import lombok.Data;

‎KinanCity-captcha-captchaai/src/main/java/com/kinancity/core/captcha/captchaai/dto/request/CreateTaskRequestDto.java ‎KinanCity-captcha-capsolver/src/main/java/com/kinancity/core/captcha/capsolver/dto/request/CreateTaskRequestDto.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.kinancity.core.captcha.captchaai.dto.request;
1+
package com.kinancity.core.captcha.capsolver.dto.request;
22

3-
import com.kinancity.core.captcha.captchaai.dto.PtcReCaptchaV2TaskProxyLess;
3+
import com.kinancity.core.captcha.capsolver.dto.PtcReCaptchaV2TaskProxyLess;
44
import lombok.Data;
55

66
@Data

‎KinanCity-captcha-captchaai/src/main/java/com/kinancity/core/captcha/captchaai/dto/request/TaskResultRequestDto.java ‎KinanCity-captcha-capsolver/src/main/java/com/kinancity/core/captcha/capsolver/dto/request/TaskResultRequestDto.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.kinancity.core.captcha.captchaai.dto.request;
1+
package com.kinancity.core.captcha.capsolver.dto.request;
22

33
import lombok.Data;
44

‎KinanCity-captcha-captchaai/src/main/java/com/kinancity/core/captcha/captchaai/dto/response/BalanceResponseDto.java ‎KinanCity-captcha-capsolver/src/main/java/com/kinancity/core/captcha/capsolver/dto/response/BalanceResponseDto.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.kinancity.core.captcha.captchaai.dto.response;
1+
package com.kinancity.core.captcha.capsolver.dto.response;
22

33
import lombok.Data;
44
import lombok.Getter;

‎KinanCity-captcha-captchaai/src/main/java/com/kinancity/core/captcha/captchaai/dto/response/BaseResponseDto.java ‎KinanCity-captcha-capsolver/src/main/java/com/kinancity/core/captcha/capsolver/dto/response/BaseResponseDto.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.kinancity.core.captcha.captchaai.dto.response;
1+
package com.kinancity.core.captcha.capsolver.dto.response;
22

33
import com.fasterxml.jackson.annotation.JsonIgnore;
44
import lombok.Data;

‎KinanCity-captcha-captchaai/src/main/java/com/kinancity/core/captcha/captchaai/dto/response/CreateTaskResponseDto.java ‎KinanCity-captcha-capsolver/src/main/java/com/kinancity/core/captcha/capsolver/dto/response/CreateTaskResponseDto.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.kinancity.core.captcha.captchaai.dto.response;
1+
package com.kinancity.core.captcha.capsolver.dto.response;
22

33
import lombok.AllArgsConstructor;
44
import lombok.Data;

‎KinanCity-captcha-captchaai/src/main/java/com/kinancity/core/captcha/captchaai/dto/response/GetTaskResulResponseDto.java ‎KinanCity-captcha-capsolver/src/main/java/com/kinancity/core/captcha/capsolver/dto/response/GetTaskResulResponseDto.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.kinancity.core.captcha.captchaai.dto.response;
1+
package com.kinancity.core.captcha.capsolver.dto.response;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import com.kinancity.core.captcha.captchaai.dto.PtcReCaptchaV2TaskSolution;
4+
import com.kinancity.core.captcha.capsolver.dto.PtcReCaptchaV2TaskSolution;
55
import lombok.Data;
66

77
@Data

‎KinanCity-captcha-captchaai/src/test/java/com/kinancity/core/captcha/captchaai/CaptchaaiCaptchaProviderErrorTest.java ‎KinanCity-captcha-capsolver/src/test/java/com/kinancity/core/captcha/capsolver/CapsolverCaptchaProviderErrorTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package com.kinancity.core.captcha.captchaai;
1+
package com.kinancity.core.captcha.capsolver;
22

33
import com.fasterxml.jackson.databind.DeserializationFeature;
44
import com.fasterxml.jackson.databind.ObjectMapper;
55
import com.kinancity.api.errors.TechnicalException;
66
import com.kinancity.core.captcha.CaptchaException;
77
import com.kinancity.core.captcha.CaptchaQueue;
88
import com.kinancity.core.captcha.CaptchaRequest;
9-
import com.kinancity.core.captcha.captchaai.dto.response.GetTaskResulResponseDto;
9+
import com.kinancity.core.captcha.capsolver.dto.response.GetTaskResulResponseDto;
1010
import com.kinancity.core.captcha.impl.LogCaptchaCollector;
1111
import lombok.extern.slf4j.Slf4j;
1212
import okhttp3.OkHttpClient;
@@ -19,7 +19,7 @@
1919
import java.util.Properties;
2020

2121
@Slf4j
22-
public class CaptchaaiCaptchaProviderErrorTest {
22+
public class CapsolverCaptchaProviderErrorTest {
2323

2424
private Logger logger = LoggerFactory.getLogger(getClass());
2525

0 commit comments

Comments
 (0)