Skip to content

Commit

Permalink
fix #697
Browse files Browse the repository at this point in the history
  • Loading branch information
@shuzijun
shuzijun committed Mar 8, 2024
1 parent 6ae19d0 commit e637e3f
Show file tree
Hide file tree
Showing 7 changed files with 118 additions and 110 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,20 @@
[![捐赠][badge:donate-zh]][shuzijun-donate]
[![内推][badge:referrals]][shuzijun-referrals]

## 8.10.0

### Added

### Changed

### Deprecated

### Fixed
- fix [#697](https://github.com/shuzijun/leetcode-editor/issues/697)

### Removed


## 8.9.0

### Added
Expand Down
3 changes: 3 additions & 0 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,13 @@ targetCompatibility = 11


repositories {
mavenLocal()
maven { url 'https://jitpack.io' }
mavenCentral()
}

dependencies {
api 'com.shuzijun:lc-sdk:0.0.2'
api 'com.alibaba:fastjson:1.2.47'
api 'org.jsoup:jsoup:1.11.3'
api('io.sentry:sentry:1.7.9') {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pluginGroup = com.shuzijun.leetcode
pluginName = leetcode-editor
pluginVersion = 8.9
pluginVersion = 8.10

pluginSinceBuild = 203.0
pluginUntilBuild =
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/shuzijun/leetcode/plugin/manager/CodeTopManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ private static List<Tag> getCompany() {
List<Tag> tags = new ArrayList<>();

HttpResponse response = HttpRequest.builderGet(CodeTopURLUtils.getCompanies()).request();
if (response != null && response.getStatusCode() == 200) {
if (response.getStatusCode() == 200) {
try {
String body = response.getBody();
if (StringUtils.isNotBlank(body)) {
Expand Down Expand Up @@ -150,7 +150,7 @@ private static PageInfo<CodeTopQuestionView> getQuestionService(Project project,
pageInfo.setRowTotal(pageObject.getInteger("count"));
pageInfo.setRows(questionList);
} else {
LogUtils.LOG.error("Request question list failed, status:" + response == null ? "" : response.getStatusCode());
LogUtils.LOG.error("Request question list failed, status:" + response.getStatusCode());
throw new RuntimeException("Request question list failed");
}

Expand Down
200 changes: 94 additions & 106 deletions src/main/java/com/shuzijun/leetcode/plugin/utils/HttpRequestUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,26 @@
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.intellij.openapi.project.Project;
import com.intellij.util.io.HttpRequests;
import com.intellij.util.net.HttpConfigurable;
import com.intellij.util.net.IdeaWideAuthenticator;
import com.intellij.util.net.IdeaWideProxySelector;
import com.shuzijun.lc.LcClient;
import com.shuzijun.lc.errors.LcException;
import com.shuzijun.lc.http.DefaultExecutoHttp;
import com.shuzijun.lc.http.HttpClient;
import com.shuzijun.leetcode.plugin.model.HttpRequest;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpHeaders;
import okhttp3.Credentials;
import okhttp3.OkHttpClient;
import org.jetbrains.annotations.NotNull;

import java.io.IOException;
import java.net.*;
import java.net.CookieHandler;
import java.net.CookieManager;
import java.net.HttpCookie;
import java.net.PasswordAuthentication;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.TimeUnit;

/**
Expand All @@ -22,6 +32,9 @@ public class HttpRequestUtils {

private static final Cache<String, HttpResponse> httpResponseCache = CacheBuilder.newBuilder().expireAfterWrite(30, TimeUnit.SECONDS).build();

private static MyExecutorHttp executorHttp = new MyExecutorHttp();
private static LcClient enLcClient = LcClient.builder(HttpClient.SiteEnum.EN).executorHttp(executorHttp).build();
private static LcClient cnLcClient = LcClient.builder(HttpClient.SiteEnum.CN).executorHttp(executorHttp).build();
private static final CookieManager cookieManager = new CookieManager(null, (uri, cookie) -> {
if (uri == null || cookie == null || uri.getHost().equals("hm.baidu.com")) {
return false;
Expand All @@ -33,18 +46,36 @@ public class HttpRequestUtils {
CookieHandler.setDefault(cookieManager);
}

private static HttpResponse buildResp(com.shuzijun.lc.http.HttpResponse response, HttpResponse httpResponse) {
httpResponse.setUrl(response.getHttpRequest().getUrl());
httpResponse.setStatusCode(response.getStatusCode());
httpResponse.setBody(response.getBody());
return httpResponse;
}

private static Map<String, String> getHeader(String url) {
if (url.contains(HttpClient.SiteEnum.EN.defaultEndpoint)){
return enLcClient.getClient().getHeader();
} else {
return cnLcClient.getClient().getHeader();
}
}

@NotNull
public static HttpResponse executeGet(HttpRequest httpRequest) {

return CacheProcessor.processor(httpRequest, request -> {

HttpResponse httpResponse = new HttpResponse();
try {
HttpRequests.request(request.getUrl()).
throwStatusCodeException(false).
tuner(new HttpRequestTuner(request)).
connect(new HttpResponseProcessor(request, httpResponse));
com.shuzijun.lc.http.HttpRequest.HttpRequestBuilder builder = com.shuzijun.lc.http.HttpRequest.
builderGet(request.getUrl()).body(request.getBody()).addHeader(getHeader(request.getUrl()));
if (request.getHeader() != null) {
builder.addHeader(request.getHeader());
}
return buildResp(executorHttp.executeGet(builder.build()), httpResponse);

} catch (IOException e) {
} catch (LcException e) {
LogUtils.LOG.error("HttpRequestUtils request error:", e);
httpResponse.setStatusCode(-1);
}
Expand All @@ -59,11 +90,13 @@ public static HttpResponse executePost(HttpRequest httpRequest) {
return CacheProcessor.processor(httpRequest, request -> {
HttpResponse httpResponse = new HttpResponse();
try {
HttpRequests.post(request.getUrl(), request.getContentType())
.throwStatusCodeException(false)
.tuner(new HttpRequestTuner(request))
.connect(new HttpResponseProcessor(request, httpResponse));
} catch (IOException e) {
com.shuzijun.lc.http.HttpRequest.HttpRequestBuilder builder = com.shuzijun.lc.http.HttpRequest.
builderPost(request.getUrl(), request.getContentType()).body(request.getBody()).addHeader(getHeader(request.getUrl()));
if (request.getHeader() != null) {
builder.addHeader(request.getHeader());
}
return buildResp(executorHttp.executePost(builder.build()), httpResponse);
} catch (LcException e) {
LogUtils.LOG.error("HttpRequestUtils request error:", e);
httpResponse.setStatusCode(-1);
}
Expand All @@ -75,11 +108,13 @@ public static HttpResponse executePut(HttpRequest httpRequest) {
return CacheProcessor.processor(httpRequest, request -> {
HttpResponse httpResponse = new HttpResponse();
try {
HttpRequests.put(request.getUrl(), request.getContentType())
.throwStatusCodeException(false)
.tuner(new HttpRequestTuner(request))
.connect(new HttpResponseProcessor(request, httpResponse));
} catch (IOException e) {
com.shuzijun.lc.http.HttpRequest.HttpRequestBuilder builder = com.shuzijun.lc.http.HttpRequest.
builderPut(request.getUrl(), request.getContentType()).body(request.getBody()).addHeader(getHeader(request.getUrl()));
if (request.getHeader() != null) {
builder.addHeader(request.getHeader());
}
return buildResp(executorHttp.executePut(builder.build()), httpResponse);
} catch (LcException e) {
LogUtils.LOG.error("HttpRequestUtils request error:", e);
httpResponse.setStatusCode(-1);
}
Expand All @@ -88,17 +123,8 @@ public static HttpResponse executePut(HttpRequest httpRequest) {
}

public static String getToken() {
if (cookieManager.getCookieStore().getCookies() == null) {
return null;
}
for (HttpCookie cookie : cookieManager.getCookieStore().getCookies()) {
if (StringUtils.isNotBlank(cookie.getDomain()) &&
cookie.getDomain().toLowerCase().contains(URLUtils.getLeetcodeHost()) && "csrftoken".equals(cookie.getName())) {
return cookie.getValue();
}

}
return null;
Map<String,String> headerMap = getHeader(URLUtils.getLeetcodeHost());
return headerMap.get("x-csrftoken");
}

public static boolean isLogin(Project project) {
Expand All @@ -110,87 +136,15 @@ public static boolean isLogin(Project project) {
}

public static void setCookie(List<HttpCookie> cookieList) {

cookieManager.getCookieStore().removeAll();
for (HttpCookie cookie : cookieList) {
cookie.setVersion(0);
cookieManager.getCookieStore().add(null, cookie);
}
enLcClient.getClient().cookieStore().clearCookie(URLUtils.getLeetcodeHost());
enLcClient.getClient().cookieStore().addCookie(URLUtils.getLeetcodeHost(),cookieList);
}

public static void resetHttpclient() {
cookieManager.getCookieStore().removeAll();
}


private static void defaultHeader(HttpRequest httpRequest) {
Map<String, String> header = httpRequest.getHeader();
header.putIfAbsent(HttpHeaders.USER_AGENT, "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.119 Safari/537.36");
header.putIfAbsent(HttpHeaders.ACCEPT, "*/*");
//header.putIfAbsent(HttpHeaders.ACCEPT_ENCODING, "gzip, deflate, br");
header.putIfAbsent(HttpHeaders.ACCEPT_LANGUAGE, "zh-CN,zh;q=0.9");
header.putIfAbsent("origin", URLUtils.getLeetcodeUrl());
//header.putIfAbsent(":authority", URLUtils.getLeetcodeHost());
//header.putIfAbsent(":scheme", "https");
}

private static class HttpRequestTuner implements HttpRequests.ConnectionTuner {

private final HttpRequest httpRequest;

public HttpRequestTuner(HttpRequest httpRequest) {
this.httpRequest = httpRequest;
}

@Override
public void tune(@NotNull URLConnection urlConnection) throws IOException {

if (StringUtils.isNotBlank(getToken()) && (urlConnection.getURL().toString().contains(URLUtils.leetcode) || urlConnection.getURL().toString().contains(URLUtils.leetcodecn))) {
urlConnection.addRequestProperty("x-csrftoken", getToken());
}
urlConnection.addRequestProperty("referer", urlConnection.getURL().toString());
//urlConnection.addRequestProperty(":path", urlConnection.getURL().getPath());

defaultHeader(httpRequest);
httpRequest.getHeader().forEach(urlConnection::addRequestProperty);
}
enLcClient.getClient().cookieStore().clearCookie(URLUtils.getLeetcodeHost());
}


private static class HttpResponseProcessor implements HttpRequests.RequestProcessor<HttpResponse> {

private final HttpRequest httpRequest;
private final HttpResponse httpResponse;

public HttpResponseProcessor(HttpRequest httpRequest, HttpResponse httpResponse) {
this.httpRequest = httpRequest;
this.httpResponse = httpResponse;
}

@Override
public HttpResponse process(@NotNull HttpRequests.Request request) throws IOException {

if (StringUtils.isNoneBlank(httpRequest.getBody())) {
request.write(httpRequest.getBody());
}

URLConnection urlConnection = request.getConnection();

if (!(urlConnection instanceof HttpURLConnection)) {
httpResponse.setStatusCode(-1);
return httpResponse;
} else {
httpResponse.setStatusCode(((HttpURLConnection) urlConnection).getResponseCode());
}
httpResponse.setUrl(urlConnection.getURL().toString());
try {
httpResponse.setBody(request.readString());
} catch (IOException ignore) {
}
return httpResponse;
}
}

private static class CacheProcessor {
public static HttpResponse processor(HttpRequest httpRequest, HttpRequestUtils.Callable<HttpResponse> callable) {

Expand Down Expand Up @@ -222,4 +176,38 @@ private interface Callable<V> {
V call(HttpRequest request);
}


private static class MyExecutorHttp extends DefaultExecutoHttp {
@Override
public OkHttpClient getRequestClient() {
final HttpConfigurable httpConfigurable = HttpConfigurable.getInstance();
if (!httpConfigurable.USE_HTTP_PROXY && !httpConfigurable.USE_PROXY_PAC) {
return super.getRequestClient();
}
final IdeaWideProxySelector ideaWideProxySelector = new IdeaWideProxySelector(httpConfigurable);
OkHttpClient.Builder builder = super.getRequestClient().newBuilder().proxySelector(ideaWideProxySelector);
if (httpConfigurable.PROXY_AUTHENTICATION) {
final IdeaWideAuthenticator ideaWideAuthenticator = new IdeaWideAuthenticator(httpConfigurable);
final okhttp3.Authenticator proxyAuthenticator = getProxyAuthenticator(ideaWideAuthenticator);
builder.proxyAuthenticator(proxyAuthenticator);
}
return builder.build();
}

private okhttp3.Authenticator getProxyAuthenticator(IdeaWideAuthenticator ideaWideAuthenticator) {
okhttp3.Authenticator proxyAuthenticator = null;

if (Objects.nonNull(ideaWideAuthenticator)) {
proxyAuthenticator = (route, response) -> {
final PasswordAuthentication authentication = ideaWideAuthenticator.getPasswordAuthentication();
final String credential = Credentials.basic(authentication.getUserName(), Arrays.toString(authentication.getPassword()));
return response.request().newBuilder()
.header("Proxy-Authorization", credential)
.build();
};
}
return proxyAuthenticator;
}
}
}

2 changes: 1 addition & 1 deletion src/main/java/com/shuzijun/leetcode/plugin/utils/URLUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class URLUtils {
private static String leetcodeSubmissions = "/submissions/detail/";
private static String leetcodeTags = "/problems/api/tags/";
private static String leetcodeFavorites = "/problems/api/favorites/";
private static String leetcodeVerify = "/problemset/all/";
private static String leetcodeVerify = "/problemset/";
private static String leetcodeProgress = "/api/progress/all/";
private static String leetcodeSession = "/session/";
private static String leetcodeCardInfo = "/problems/api/card-info/";
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/com/shuzijun/leetcode/plugin/window/navigator/AllNavigatorTable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ public Object getValue(QuestionView question, int columnIndex) {

if (columnIndex == 2) {
Integer level = question.getLevel();
if (level == null) {
return null;
}
if (level == 1) {
return "Easy";
} else if (level == 2) {
Expand Down

0 comments on commit e637e3f

Please sign in to comment.