Skip to content

Commit

Permalink
v1.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@839128
839128 committed Dec 28, 2020
1 parent 3b684df commit e80cab5
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 37 deletions.
10 changes: 5 additions & 5 deletions src/main/java/org/aoju/lancia/Puppeteer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,7 @@ private static Browser rawLaunch() throws IOException {
}

private static Browser rawLaunch(boolean headless) throws IOException {
Puppeteer puppeteer = new Puppeteer();
return Puppeteer.rawLaunch(new LaunchBuilder().withHeadless(headless).build(), puppeteer);
return Puppeteer.rawLaunch(new LaunchBuilder().headless(headless).build(), new Puppeteer());
}

/**
Expand All @@ -116,8 +115,9 @@ private static Browser rawLaunch(boolean headless) throws IOException {
public static Browser connect(BrowserOption options, String browserWSEndpoint, String browserURL, Transport transport, String product) {
Puppeteer puppeteer = new Puppeteer();

if (StringKit.isNotEmpty(product))
if (StringKit.isNotEmpty(product)) {
puppeteer.setProductName(product);
}
adapterLauncher(puppeteer);
return puppeteer.getLauncher().connect(options, browserWSEndpoint, browserURL, transport);
}
Expand Down Expand Up @@ -174,8 +174,8 @@ private static void adapterLauncher(Puppeteer puppeteer) {
String productName;
Launcher launcher;
Standard env;
if (StringKit.isEmpty(productName = puppeteer.getProductName()) && !puppeteer.getIsPuppeteerCore()) {

if (StringKit.isEmpty(productName = puppeteer.getProductName())
&& !puppeteer.getIsPuppeteerCore()) {
if ((env = puppeteer.getEnv()) == null) {
puppeteer.setEnv(env = System::getenv);
}
Expand Down
30 changes: 15 additions & 15 deletions src/main/java/org/aoju/lancia/option/LaunchBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public LaunchBuilder() {
options = new LaunchOption();
}

public LaunchBuilder withExecutablePath(String executablePath) {
public LaunchBuilder executablePath(String executablePath) {
options.setExecutablePath(executablePath);
return this;
}
Expand All @@ -57,7 +57,7 @@ public LaunchBuilder withExecutablePath(String executablePath) {
* @param ignoreAllDefaultArgs true为忽略所有启动参数
* @return LaunchOptionsBuilder
*/
public LaunchBuilder withIgnoreDefaultArgs(boolean ignoreAllDefaultArgs) {
public LaunchBuilder ignoreDefaultArgs(boolean ignoreAllDefaultArgs) {
options.setIgnoreAllDefaultArgs(ignoreAllDefaultArgs);
return this;
}
Expand All @@ -68,32 +68,32 @@ public LaunchBuilder withIgnoreDefaultArgs(boolean ignoreAllDefaultArgs) {
* @param ignoreDefaultArgs 要忽略的启动参数
* @return LaunchOptionsBuilder
*/
public LaunchBuilder withIgnoreDefaultArgs(List<String> ignoreDefaultArgs) {
public LaunchBuilder ignoreDefaultArgs(List<String> ignoreDefaultArgs) {
options.setIgnoreDefaultArgs(ignoreDefaultArgs);
return this;
}

public LaunchBuilder withHandleSIGINT(boolean handleSIGINT) {
public LaunchBuilder handleSIGINT(boolean handleSIGINT) {
options.setHandleSIGINT(handleSIGINT);
return this;
}

public LaunchBuilder withHandleSIGTERM(boolean handleSIGTERM) {
public LaunchBuilder handleSIGTERM(boolean handleSIGTERM) {
options.setHandleSIGTERM(handleSIGTERM);
return this;
}

public LaunchBuilder withHandleSIGHUP(boolean handleSIGHUP) {
public LaunchBuilder handleSIGHUP(boolean handleSIGHUP) {
options.setHandleSIGHUP(handleSIGHUP);
return this;
}

public LaunchBuilder withEnv(Standard env) {
public LaunchBuilder env(Standard env) {
options.setEnv(env);
return this;
}

public LaunchBuilder withPipe(boolean pipe) {
public LaunchBuilder pipe(boolean pipe) {
options.setPipe(pipe);
return this;
}
Expand All @@ -103,37 +103,37 @@ public LaunchBuilder withProduct(String product) {
return this;
}

public LaunchBuilder withIgnoreHTTPSErrors(boolean ignoreHTTPSErrors) {
public LaunchBuilder ignoreHTTPSErrors(boolean ignoreHTTPSErrors) {
options.setIgnoreHTTPSErrors(ignoreHTTPSErrors);
return this;
}

public LaunchBuilder withViewport(Viewport viewport) {
public LaunchBuilder viewport(Viewport viewport) {
options.setViewport(viewport);
return this;
}

public LaunchBuilder withSlowMo(int slowMo) {
public LaunchBuilder slowMo(int slowMo) {
options.setSlowMo(slowMo);
return this;
}

public LaunchBuilder withHeadless(boolean headless) {
public LaunchBuilder headless(boolean headless) {
options.setHeadless(headless);
return this;
}

public LaunchBuilder withArgs(List<String> args) {
public LaunchBuilder args(List<String> args) {
options.setArgs(args);
return this;
}

public LaunchBuilder withUserDataDir(String userDataDir) {
public LaunchBuilder userDataDir(String userDataDir) {
options.setUserDataDir(userDataDir);
return this;
}

public LaunchBuilder withDevtools(boolean devtools) {
public LaunchBuilder devtools(boolean devtools) {
options.setDevtools(devtools);
return this;
}
Expand Down
24 changes: 7 additions & 17 deletions src/main/java/org/aoju/lancia/worker/RFCWebSocket.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import org.aoju.bus.core.io.ByteString;
import org.aoju.bus.core.lang.Charset;
import org.aoju.bus.core.lang.Header;
import org.aoju.bus.core.lang.Normal;
import org.aoju.bus.core.lang.Symbol;
import org.aoju.bus.core.lang.exception.InstrumentException;
Expand Down Expand Up @@ -56,18 +57,7 @@ public abstract class RFCWebSocket implements WebSocket, Runnable {
* 连接已刷新并关闭
*/
public static final int FLASHPOLICY = -3;
/**
* 键的握手特定字段
*/
private static final String SEC_WEB_SOCKET_KEY = "Sec-WebSocket-Key";
/**
* 升级的握手特定字段
*/
private static final String UPGRADE = "Upgrade";
/**
* 连接的握手特定字段
*/
private static final String CONNECTION = "Connection";

/**
* Attribute来同步写操作
*/
Expand Down Expand Up @@ -407,11 +397,11 @@ public void close(InstrumentException e) {

public void startHandshake() throws InstrumentException {
TreeMap<String, String> map = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
map.put("Host", this.host);
map.put(UPGRADE, "websocket");
map.put(CONNECTION, UPGRADE);
map.put(SEC_WEB_SOCKET_KEY, RandomKit.randomString(16));
map.put("Sec-WebSocket-Version", "13");
map.put(Header.HOST, this.host);
map.put(Header.UPGRADE, "websocket");
map.put(Header.CONNECTION, Header.UPGRADE);
map.put(Header.SEC_WEBSOCKET_KEY, RandomKit.randomString(16));
map.put(Header.SEC_WEBSOCKET_VERSION, "13");

StringBuilder bui = new StringBuilder(100);
bui.append("GET ")
Expand Down

0 comments on commit e80cab5

Please sign in to comment.