mirror of
https://github.com/aNNiMON/Own-Programming-Language-Tutorial.git
synced 2024-09-20 00:34:20 +03:00
Update deps
This commit is contained in:
parent
b1cfc6bcfc
commit
f89bca0d68
18
build.gradle
18
build.gradle
@ -2,19 +2,19 @@ ext {
|
|||||||
versions = [
|
versions = [
|
||||||
project: '2.0.0',
|
project: '2.0.0',
|
||||||
|
|
||||||
json: '20230227', // org.json:json
|
json: '20240205', // org.json:json
|
||||||
snakeyaml: '1.20', // org.yaml:snakeyaml
|
snakeyaml: '1.33', // org.yaml:snakeyaml
|
||||||
okhttp: '3.8.1', // com.squareup.okhttp3:okhttp
|
okhttp: '3.14.9', // com.squareup.okhttp3:okhttp
|
||||||
socket: '1.0.2', // io.socket:socket.io-client
|
socket: '2.1.0', // io.socket:socket.io-client
|
||||||
jline: '2.14.6', // jline:jline
|
jline: '2.14.6', // jline:jline
|
||||||
|
|
||||||
javalin: '5.6.3', // io.javalin:javalin
|
javalin: '6.1.0', // io.javalin:javalin
|
||||||
slf4j: '2.0.9', // org.slf4j:slf4j-simple
|
slf4j: '2.0.12', // org.slf4j:slf4j-simple
|
||||||
jackson: '2.15.3', // com.fasterxml.jackson.core:jackson-databind
|
jackson: '2.16.1', // com.fasterxml.jackson.core:jackson-databind
|
||||||
|
|
||||||
junit: '5.9.2', // org.junit:junit-bom
|
junit: '5.10.2', // org.junit:junit-bom
|
||||||
jmh: '1.37', // org.openjdk.jmh:jmh-core
|
jmh: '1.37', // org.openjdk.jmh:jmh-core
|
||||||
assertj: '3.24.2' // org.assertj:assertj-core
|
assertj: '3.25.3' // org.assertj:assertj-core
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -6,7 +6,6 @@ import com.annimon.ownlang.modules.Module;
|
|||||||
import io.socket.client.IO;
|
import io.socket.client.IO;
|
||||||
import io.socket.client.Socket;
|
import io.socket.client.Socket;
|
||||||
import java.net.URISyntaxException;
|
import java.net.URISyntaxException;
|
||||||
import java.util.LinkedHashMap;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -18,22 +17,11 @@ public final class socket implements Module {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Map<String, Value> constants() {
|
public Map<String, Value> constants() {
|
||||||
final var result = new LinkedHashMap<String, Value>(15);
|
return Map.of(
|
||||||
result.put("EVENT_CONNECT", new StringValue(Socket.EVENT_CONNECT));
|
"EVENT_CONNECT", new StringValue(Socket.EVENT_CONNECT),
|
||||||
result.put("EVENT_CONNECTING", new StringValue(Socket.EVENT_CONNECTING));
|
"EVENT_CONNECT_ERROR", new StringValue(Socket.EVENT_CONNECT_ERROR),
|
||||||
result.put("EVENT_CONNECT_ERROR", new StringValue(Socket.EVENT_CONNECT_ERROR));
|
"EVENT_DISCONNECT", new StringValue(Socket.EVENT_DISCONNECT)
|
||||||
result.put("EVENT_CONNECT_TIMEOUT", new StringValue(Socket.EVENT_CONNECT_TIMEOUT));
|
);
|
||||||
result.put("EVENT_DISCONNECT", new StringValue(Socket.EVENT_DISCONNECT));
|
|
||||||
result.put("EVENT_ERROR", new StringValue(Socket.EVENT_ERROR));
|
|
||||||
result.put("EVENT_MESSAGE", new StringValue(Socket.EVENT_MESSAGE));
|
|
||||||
result.put("EVENT_PING", new StringValue(Socket.EVENT_PING));
|
|
||||||
result.put("EVENT_PONG", new StringValue(Socket.EVENT_PONG));
|
|
||||||
result.put("EVENT_RECONNECT", new StringValue(Socket.EVENT_RECONNECT));
|
|
||||||
result.put("EVENT_RECONNECTING", new StringValue(Socket.EVENT_RECONNECTING));
|
|
||||||
result.put("EVENT_RECONNECT_ATTEMPT", new StringValue(Socket.EVENT_RECONNECT_ATTEMPT));
|
|
||||||
result.put("EVENT_RECONNECT_ERROR", new StringValue(Socket.EVENT_RECONNECT_ERROR));
|
|
||||||
result.put("EVENT_RECONNECT_FAILED", new StringValue(Socket.EVENT_RECONNECT_FAILED));
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -71,39 +59,20 @@ public final class socket implements Module {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void init() {
|
private void init() {
|
||||||
set("close", this::close);
|
set("close", Converters.voidToVoid(socket::close));
|
||||||
set("connect", this::connect);
|
set("connect", Converters.voidToVoid(socket::connect));
|
||||||
set("connected", this::connected);
|
set("connected", Converters.voidToBoolean(socket::connected));
|
||||||
set("disconnect", this::disconnect);
|
set("disconnect", Converters.voidToVoid(socket::disconnect));
|
||||||
set("emit", this::emit);
|
set("emit", this::emit);
|
||||||
set("hasListeners", this::hasListeners);
|
set("hasListeners", this::hasListeners);
|
||||||
set("id", this::id);
|
set("id", Converters.voidToString(socket::id));
|
||||||
set("off", this::off);
|
set("off", this::off);
|
||||||
set("on", this::on);
|
set("on", this::on);
|
||||||
set("once", this::once);
|
set("once", this::once);
|
||||||
set("open", this::open);
|
set("open", Converters.voidToVoid(socket::open));
|
||||||
set("send", this::send);
|
set("send", this::send);
|
||||||
}
|
}
|
||||||
|
|
||||||
private Value close(Value[] args) {
|
|
||||||
socket.close();
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Value connect(Value[] args) {
|
|
||||||
socket.connect();
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Value connected(Value[] args) {
|
|
||||||
return NumberValue.fromBoolean(socket.connected());
|
|
||||||
}
|
|
||||||
|
|
||||||
private Value disconnect(Value[] args) {
|
|
||||||
socket.disconnect();
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Value hasListeners(Value[] args) {
|
private Value hasListeners(Value[] args) {
|
||||||
Arguments.check(1, args.length);
|
Arguments.check(1, args.length);
|
||||||
return NumberValue.fromBoolean(
|
return NumberValue.fromBoolean(
|
||||||
@ -122,10 +91,6 @@ public final class socket implements Module {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Value id(Value[] args) {
|
|
||||||
return new StringValue(socket.id());
|
|
||||||
}
|
|
||||||
|
|
||||||
private Value off(Value[] args) {
|
private Value off(Value[] args) {
|
||||||
Arguments.checkOrOr(0, 1, args.length);
|
Arguments.checkOrOr(0, 1, args.length);
|
||||||
if (args.length == 1) {
|
if (args.length == 1) {
|
||||||
@ -156,11 +121,6 @@ public final class socket implements Module {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Value open(Value[] args) {
|
|
||||||
socket.open();
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
private Value send(Value[] args) {
|
private Value send(Value[] args) {
|
||||||
Arguments.check(1, args.length);
|
Arguments.check(1, args.length);
|
||||||
socket.send(ValueUtils.toObject(args[0]));
|
socket.send(ValueUtils.toObject(args[0]));
|
||||||
|
@ -61,16 +61,16 @@ class Config {
|
|||||||
ifNumber("maxRequestSize", value -> config.http.maxRequestSize = value.asLong());
|
ifNumber("maxRequestSize", value -> config.http.maxRequestSize = value.asLong());
|
||||||
|
|
||||||
// routing
|
// routing
|
||||||
ifBoolean("caseInsensitiveRoutes", flag -> config.routing.caseInsensitiveRoutes = flag);
|
ifBoolean("caseInsensitiveRoutes", flag -> config.router.caseInsensitiveRoutes = flag);
|
||||||
ifBoolean("ignoreTrailingSlashes", flag -> config.routing.ignoreTrailingSlashes = flag);
|
ifBoolean("ignoreTrailingSlashes", flag -> config.router.ignoreTrailingSlashes = flag);
|
||||||
ifBoolean("multipleSlashesAsSingle", flag -> config.routing.treatMultipleSlashesAsSingleSlash = flag);
|
ifBoolean("multipleSlashesAsSingle", flag -> config.router.treatMultipleSlashesAsSingleSlash = flag);
|
||||||
ifString("contextPath", path -> config.routing.contextPath = path);
|
ifString("contextPath", path -> config.router.contextPath = path);
|
||||||
|
|
||||||
// other
|
// other
|
||||||
ifArray("basicAuth", arr -> config.plugins.enableBasicAuth(arr.get(0).asString(), arr.get(1).asString()));
|
ifArray("basicAuth", arr -> config.bundledPlugins.enableBasicAuth(arr.get(0).asString(), arr.get(1).asString()));
|
||||||
ifBoolean("showBanner", flag -> config.showJavalinBanner = flag);
|
ifBoolean("showBanner", flag -> config.showJavalinBanner = flag);
|
||||||
ifTrue("dev", config.plugins::enableDevLogging);
|
ifTrue("dev", config.bundledPlugins::enableDevLogging);
|
||||||
ifTrue("sslRedirects", config.plugins::enableSslRedirects);
|
ifTrue("sslRedirects", config.bundledPlugins::enableSslRedirects);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ifTrue(String key, Runnable action) {
|
private void ifTrue(String key, Runnable action) {
|
||||||
|
Loading…
Reference in New Issue
Block a user