Skip to content

Commit c83228b

Browse files
HttpRafaHttpRafa
authored
feat: Add notification for servers that are ready (#122)
* feat: Rust part * feat: Implement java code
1 parent 5195f47 commit c83228b

29 files changed

Lines changed: 259 additions & 56 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ jobs:
129129
cp $(find ./clients/java/paper/build -name "*-all.jar") ac-core.jar
130130
cp $(find ./clients/java/paper/send/build -name "*-all.jar") ac-send.jar
131131
cp $(find ./clients/java/paper/notify/build -name "*-all.jar") ac-notify.jar
132+
cp $(find ./clients/java/paper/fake-proxy/build -name "*-all.jar") ac-fake-proxy.jar
132133
133134
- name: Create egg tar.gz and template tar.gz
134135
run: |
@@ -158,3 +159,4 @@ jobs:
158159
ac-core.jar
159160
ac-send.jar
160161
ac-notify.jar
162+
ac-fake-proxy.jar

‎clients/java/common/src/main/java/io/atomic/cloud/common/channel/subscription/BytesImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class BytesImpl implements StreamObserver<Channel.Msg>, Bytes {
2525

2626
@Override
2727
public void close() {
28-
this.handle.cancel();
28+
this.handle.cancel("Closed by user");
2929
}
3030

3131
@Override

‎clients/java/common/src/main/java/io/atomic/cloud/common/connection/call/CallHandle.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public class CallHandle<ReqT, RespT> implements ClientResponseObserver<ReqT, Res
1414
@Getter
1515
private ClientCallStreamObserver<ReqT> stream;
1616

17-
public void cancel() {
18-
stream.cancel(null, null);
17+
public void cancel(String message) {
18+
stream.cancel(message, new InterruptedException(message));
1919
}
2020

2121
@Override

‎clients/java/common/src/main/java/io/atomic/cloud/common/connection/client/ClientConnection.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,12 @@ public CallHandle<?, Notify.PowerEvent> subscribeToPowerEvents(StreamObserver<No
174174
return handle;
175175
}
176176

177+
public CallHandle<?, Notify.ReadyEvent> subscribeToReadyEvents(StreamObserver<Notify.ReadyEvent> observer) {
178+
var handle = new CallHandle<>(observer);
179+
this.client.subscribeToReadyEvents(Empty.getDefaultInstance(), handle);
180+
return handle;
181+
}
182+
177183
@Contract(" -> new")
178184
public static @NotNull ClientConnection createFromEnv() {
179185
var address = System.getenv("CONTROLLER_ADDRESS");

‎clients/java/paper/notify/src/main/java/io/atomic/cloud/paper/notify/NotifyPlugin.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package io.atomic.cloud.paper.notify;
22

33
import io.atomic.cloud.paper.CloudPlugin;
4-
import io.atomic.cloud.paper.notify.notify.PowerHandler;
4+
import io.atomic.cloud.paper.notify.handler.PowerHandler;
5+
import io.atomic.cloud.paper.notify.handler.ReadyHandler;
56
import io.atomic.cloud.paper.notify.setting.message.Messages;
67
import lombok.Getter;
78
import org.bukkit.plugin.java.JavaPlugin;
@@ -17,6 +18,7 @@ public class NotifyPlugin extends JavaPlugin {
1718
private Messages messages;
1819

1920
private PowerHandler powerHandler;
21+
private ReadyHandler readyHandler;
2022

2123
@Override
2224
public void onLoad() {
@@ -25,17 +27,20 @@ public void onLoad() {
2527
this.messages = new Messages(this.getConfig());
2628

2729
this.powerHandler = new PowerHandler(CloudPlugin.INSTANCE.clientConnection());
30+
this.readyHandler = new ReadyHandler(CloudPlugin.INSTANCE.clientConnection());
2831
}
2932

3033
@Override
3134
public void onEnable() {
3235
// Enable the notification system
3336
this.powerHandler.enable();
37+
this.readyHandler.enable();
3438
}
3539

3640
@Override
3741
public void onDisable() {
3842
// Cleanup
3943
this.powerHandler.cleanup();
44+
this.readyHandler.cleanup();
4045
}
4146
}

clients/java/paper/notify/src/main/java/io/atomic/cloud/paper/notify/notify/PowerHandler.java renamed to clients/java/paper/notify/src/main/java/io/atomic/cloud/paper/notify/handler/PowerHandler.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.atomic.cloud.paper.notify.notify;
1+
package io.atomic.cloud.paper.notify.handler;
22

33
import io.atomic.cloud.common.connection.call.CallHandle;
44
import io.atomic.cloud.common.connection.client.ClientConnection;
@@ -23,35 +23,35 @@ public void enable() {
2323
}
2424

2525
public void cleanup() {
26-
this.handle.cancel();
26+
this.handle.cancel("Closed by cleanup");
2727
}
2828

2929
@Override
30-
public void onNext(Notify.PowerEvent powerEvent) {
30+
public void onNext(Notify.PowerEvent event) {
3131
try {
3232
Bukkit.getOnlinePlayers().stream()
3333
.filter(Permissions.POWER_NOTIFY::check)
3434
.forEach(player -> {
35-
if (powerEvent.getState() == Notify.PowerEvent.State.START) {
35+
if (event.getState() == Notify.PowerEvent.State.START) {
3636
NotifyPlugin.INSTANCE
3737
.messages()
3838
.serverStarting()
3939
.send(
4040
player,
41-
Placeholder.unparsed("name", powerEvent.getName()),
42-
Placeholder.unparsed("node", powerEvent.getNode()));
41+
Placeholder.unparsed("name", event.getName()),
42+
Placeholder.unparsed("node", event.getNode()));
4343
} else {
4444
NotifyPlugin.INSTANCE
4545
.messages()
4646
.serverStopping()
4747
.send(
4848
player,
49-
Placeholder.unparsed("name", powerEvent.getName()),
50-
Placeholder.unparsed("node", powerEvent.getNode()));
49+
Placeholder.unparsed("name", event.getName()),
50+
Placeholder.unparsed("node", event.getNode()));
5151
}
5252
});
5353
} catch (Throwable throwable) {
54-
NotifyPlugin.LOGGER.info("Failed to process power event for server {}:", powerEvent.getName());
54+
NotifyPlugin.LOGGER.info("Failed to process power event for server {}:", event.getName());
5555
NotifyPlugin.LOGGER.error("-> ", throwable);
5656
}
5757
}

‎clients/java/paper/notify/src/main/java/io/atomic/cloud/paper/notify/handler/ReadyHandler.java‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
package io.atomic.cloud.paper.notify.handler;
2+
3+
import io.atomic.cloud.common.connection.call.CallHandle;
4+
import io.atomic.cloud.common.connection.client.ClientConnection;
5+
import io.atomic.cloud.grpc.common.Notify;
6+
import io.atomic.cloud.paper.CloudPlugin;
7+
import io.atomic.cloud.paper.notify.NotifyPlugin;
8+
import io.atomic.cloud.paper.notify.permission.Permissions;
9+
import io.grpc.stub.StreamObserver;
10+
import lombok.RequiredArgsConstructor;
11+
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
12+
import org.bukkit.Bukkit;
13+
14+
@RequiredArgsConstructor
15+
public class ReadyHandler implements StreamObserver<Notify.ReadyEvent> {
16+
17+
private final ClientConnection connection;
18+
private CallHandle<?, ?> handle;
19+
20+
public void enable() {
21+
NotifyPlugin.LOGGER.info("Enabling ready notifications...");
22+
this.handle = this.connection.subscribeToReadyEvents(this);
23+
}
24+
25+
public void cleanup() {
26+
this.handle.cancel("Closed by cleanup");
27+
}
28+
29+
@Override
30+
public void onNext(Notify.ReadyEvent event) {
31+
try {
32+
Bukkit.getOnlinePlayers().stream()
33+
.filter(Permissions.READY_NOTIFY::check)
34+
.forEach(player -> {
35+
if (event.getReady()) {
36+
NotifyPlugin.INSTANCE
37+
.messages()
38+
.serverReady()
39+
.send(player, Placeholder.unparsed("name", event.getName()));
40+
} else {
41+
NotifyPlugin.INSTANCE
42+
.messages()
43+
.serverNotReady()
44+
.send(player, Placeholder.unparsed("name", event.getName()));
45+
}
46+
});
47+
} catch (Throwable throwable) {
48+
NotifyPlugin.LOGGER.info("Failed to process ready event for server {}:", event.getName());
49+
NotifyPlugin.LOGGER.error("-> ", throwable);
50+
}
51+
}
52+
53+
@Override
54+
public void onError(Throwable throwable) {
55+
CloudPlugin.LOGGER.error("Failed to handle ready event", throwable);
56+
}
57+
58+
@Override
59+
public void onCompleted() {}
60+
}

‎clients/java/paper/notify/src/main/java/io/atomic/cloud/paper/notify/permission/Permissions.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
@Getter
1111
@SuppressWarnings("UnstableApiUsage")
1212
public enum Permissions {
13-
POWER_NOTIFY("atomic.cloud.power.notify");
13+
POWER_NOTIFY("atomic.cloud.power.notify"),
14+
READY_NOTIFY("atomic.cloud.ready.notify");
1415

1516
private final String permission;
1617

‎clients/java/paper/notify/src/main/java/io/atomic/cloud/paper/notify/setting/message/Messages.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,14 @@ public class Messages {
1111
private final Message serverStarting;
1212
private final Message serverStopping;
1313

14+
private final Message serverReady;
15+
private final Message serverNotReady;
16+
1417
public Messages(FileConfiguration configuration) {
1518
this.serverStarting = new SingleLine("messages.server-starting", configuration);
1619
this.serverStopping = new SingleLine("messages.server-stopping", configuration);
20+
21+
this.serverReady = new SingleLine("messages.server-ready", configuration);
22+
this.serverNotReady = new SingleLine("messages.server-not-ready", configuration);
1723
}
1824
}

‎clients/java/paper/notify/src/main/resources/config.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
messages:
22
server-starting: "<green>⬆ <color:#4AE77A>Spinning up server <color:#2DA953><name> <color:#4AE77A>on node <color:#2DA953><node>!"
3-
server-stopping: "<red>⬇ <color:#C85252>Shutting down server <color:#FA2E2E><name>!"
3+
server-stopping: "<red>⬇ <color:#C85252>Shutting down server <color:#FA2E2E><name>!"
4+
server-ready: "<green>✓ <color:#4AE77A>Server <color:#2DA953><name> <color:#4AE77A>is now ready!"
5+
server-not-ready: "<red>⚠ <color:#C85252>Server <color:#FA2E2E><name> <color:#C85252>is no longer ready!"

0 commit comments

Comments
 (0)