Skip to content

Commit 42e10f0

Browse files
DragonRex004DragonRex004
committed
fix sum issues
generate new issuse
1 parent 0232bbb commit 42e10f0

File tree

8 files changed

+143
-6
lines changed

8 files changed

+143
-6
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Here are a few simple examples to help you get started with nexo-net.
4646

4747
```java
4848
import com.nexoscript.nexonet.server.Server;
49-
import com.nexoscript.packets.MessagePacket;
49+
import packets.com.nexoscript.MessagePacket;
5050

5151
public class Testserver {
5252

@@ -84,7 +84,7 @@ This example demonstrates how to create a simple server that listens for incomin
8484

8585
```java
8686
import com.nexoscript.nexonet.client.Client;
87-
import com.nexoscript.packets.MessagePacket;
87+
import packets.com.nexoscript.MessagePacket;
8888

8989
public class Testclient {
9090

‎nexo-net-client/src/main/java/com/nexoscript/nexonet/client/Client.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,8 @@ public void connect(String hostname, int port) {
101101
String serverResponse;
102102
if(reader.read() > 0) {
103103
if ((serverResponse = reader.readLine()) != null) {
104-
String modifiedString = "{" + serverResponse;
105-
System.out.println(modifiedString);
106-
Packet packet = this.packetManager.fromJson(modifiedString);
104+
System.out.println(serverResponse);
105+
Packet packet = this.packetManager.fromJson(serverResponse);
107106
if(this.isAuth) {
108107
this.clientReceivedEvent.onClientReceived(this, packet);
109108
}

‎nexo-net-packet/src/main/java/com/nexoscript/nexonet/packet/crypto/CryptoManager.java‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ public void initCrypto(String path, CryptoType type, KeySize size) {
5858
public String encryptString(String data) {
5959
try {
6060
this.logger.log(LoggingType.INFO, "Try to encode String");
61+
logger.log(LoggingType.INFO, "Crypto: " + data);
62+
data = data.replace('{', '=').replace('}', '+');
63+
logger.log(LoggingType.INFO, "Crypto: " + data);
6164
cipher.init(Cipher.ENCRYPT_MODE, secretKey);
6265
return Base64.getEncoder().encodeToString(cipher.doFinal(data.getBytes()));
6366
} catch (InvalidKeyException | IllegalBlockSizeException | BadPaddingException e) {
@@ -70,7 +73,12 @@ public String decryptString(String data) {
7073
try {
7174
this.logger.log(LoggingType.INFO, "Try to decode String");
7275
cipher.init(Cipher.DECRYPT_MODE, secretKey);
73-
return new String(cipher.doFinal(Base64.getDecoder().decode(data)));
76+
String s = new String(cipher.doFinal(Base64.getDecoder().decode(data)));
77+
s = '=' + s;
78+
logger.log(LoggingType.INFO, "Crypto: " + s);
79+
s = s.replace('=', '{').replace('+', '}');
80+
logger.log(LoggingType.INFO, "Crypto: " + s);
81+
return s;
7482
} catch (InvalidKeyException | BadPaddingException | IllegalBlockSizeException e) {
7583
throw new RuntimeException(e);
7684
}

‎nexo-net-test/pom.xml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<parent>
7+
<groupId>com.nexoscript</groupId>
8+
<artifactId>nexo-net</artifactId>
9+
<version>0.1.1-dev</version>
10+
</parent>
11+
12+
<artifactId>nexo-net-test</artifactId>
13+
14+
<properties>
15+
<maven.compiler.source>17</maven.compiler.source>
16+
<maven.compiler.target>17</maven.compiler.target>
17+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
18+
</properties>
19+
20+
<dependencies>
21+
<dependency>
22+
<groupId>com.nexoscript</groupId>
23+
<artifactId>nexo-net-client</artifactId>
24+
<version>0.1.1-dev</version>
25+
</dependency>
26+
<dependency>
27+
<groupId>com.nexoscript</groupId>
28+
<artifactId>nexo-net-server</artifactId>
29+
<version>0.1.1-dev</version>
30+
</dependency>
31+
</dependencies>
32+
</project>

‎nexo-net-test/src/main/java/com/nexoscript/MyClient.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package com.nexoscript;
2+
3+
import com.nexoscript.nexonet.client.Client;
4+
import com.nexoscript.packets.MessagePacket;
5+
6+
public class MyClient {
7+
8+
public static void main(String[] args) {
9+
Client client = new Client(true, true);
10+
client.getPacketManager().registerPacketType("MESSAGE_PACKET", MessagePacket.class);
11+
client.onClientConnect(iClient -> {
12+
System.out.println("Client connected with ID: " + iClient.getID());
13+
client.send(new MessagePacket("ping"));
14+
});
15+
client.onClientDisconnect(iClient -> {
16+
System.out.println("Client disconnected with ID: " + iClient.getID());
17+
});
18+
client.onClientReceived((iClient, packet) -> {
19+
System.out.println("Client with ID: " + iClient.getID() + " received!");
20+
if(packet instanceof MessagePacket messagePacket) {
21+
System.out.println(messagePacket);
22+
}
23+
});
24+
client.onClientSend((iClient, packet) -> {
25+
System.out.println("Client with ID: " + iClient.getID() + " send!");
26+
if(packet instanceof MessagePacket messagePacket) {
27+
System.out.println(messagePacket);
28+
}
29+
});
30+
client.connect("127.0.0.1", 1234);
31+
}
32+
}

‎nexo-net-test/src/main/java/com/nexoscript/MyServer.java‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package com.nexoscript;
2+
3+
import com.nexoscript.nexonet.server.Server;
4+
import com.nexoscript.packets.MessagePacket;
5+
6+
public class MyServer {
7+
8+
public static void main(String[] args) {
9+
Server server = new Server(true, true);
10+
server.getPacketManager().registerPacketType("MESSAGE_PACKET", MessagePacket.class);
11+
server.onClientConnect(client -> {
12+
System.out.println("Client connected with ID: " + client.getId());
13+
});
14+
server.onClientDisconnect(client -> {
15+
System.out.println("Client connected with ID: " + client.getId());
16+
});
17+
server.onServerReceived((client, packet) -> {
18+
System.out.println("Server received from client with ID: " + client.getId());
19+
if(packet instanceof MessagePacket messagePacket) {
20+
System.out.println(messagePacket);
21+
if(messagePacket.getMessage().equalsIgnoreCase("ping")) {
22+
server.sendToClient(client.getId(), new MessagePacket("pong"));
23+
}
24+
}
25+
});
26+
server.onServerSend((client, packet) -> {
27+
System.out.println("Server send from client with ID: " + client.getId());
28+
if(packet instanceof MessagePacket dataPacket) {
29+
System.out.println(dataPacket);
30+
}
31+
});
32+
server.start(1234);
33+
}
34+
}

‎nexo-net-test/src/main/java/com/nexoscript/packets/MessagePacket.java‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package com.nexoscript.packets;
2+
3+
import com.nexoscript.nexonet.api.packet.Packet;
4+
5+
public class MessagePacket extends Packet {
6+
private String message;
7+
8+
public MessagePacket() {
9+
super("MESSAGE_PACKET");
10+
}
11+
12+
public MessagePacket(String message) {
13+
super("MESSAGE_PACKET");
14+
this.message = message;
15+
}
16+
17+
public String getMessage() {
18+
return message;
19+
}
20+
21+
public void setMessage(String message) {
22+
this.message = message;
23+
}
24+
25+
@Override
26+
public String toString() {
27+
return "MessagePacket{" +
28+
"message='" + message + '\'' +
29+
'}';
30+
}
31+
}

‎pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<module>nexo-net-logger</module>
1717
<module>nexo-net-packet</module>
1818
<module>nexo-net-server</module>
19+
<module>nexo-net-test</module>
1920
</modules>
2021

2122
<properties>

0 commit comments

Comments
 (0)