Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
fa4adfd5
Commit
fa4adfd5
authored
Aug 11, 2019
by
liujiahua123123
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UDP client
parent
48db4a92
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
78 additions
and
124 deletions
+78
-124
mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java
mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java
+23
-1
mirai-core/src/main/java/net/mamoe/mirai/network/MiraiUDPClient.java
...src/main/java/net/mamoe/mirai/network/MiraiUDPClient.java
+4
-0
mirai-core/src/main/java/net/mamoe/mirai/network/MiraiUDPServer.java
...src/main/java/net/mamoe/mirai/network/MiraiUDPServer.java
+51
-0
mirai-core/src/main/java/net/mamoe/mirai/network/NetworkPacketHandler.java
...in/java/net/mamoe/mirai/network/NetworkPacketHandler.java
+0
-123
No files found.
mirai-core/src/main/java/net/mamoe/mirai/MiraiServer.java
View file @
fa4adfd5
...
@@ -5,6 +5,8 @@ import net.mamoe.mirai.event.MiraiEventManager;
...
@@ -5,6 +5,8 @@ import net.mamoe.mirai.event.MiraiEventManager;
import
net.mamoe.mirai.event.events.server.ServerDisableEvent
;
import
net.mamoe.mirai.event.events.server.ServerDisableEvent
;
import
net.mamoe.mirai.event.events.server.ServerEnableEvent
;
import
net.mamoe.mirai.event.events.server.ServerEnableEvent
;
import
net.mamoe.mirai.network.MiraiNetwork
;
import
net.mamoe.mirai.network.MiraiNetwork
;
import
net.mamoe.mirai.network.MiraiUDPClient
;
import
net.mamoe.mirai.network.MiraiUDPServer
;
import
net.mamoe.mirai.task.MiraiTaskManager
;
import
net.mamoe.mirai.task.MiraiTaskManager
;
import
net.mamoe.mirai.utils.LoggerTextFormat
;
import
net.mamoe.mirai.utils.LoggerTextFormat
;
import
net.mamoe.mirai.utils.MiraiLogger
;
import
net.mamoe.mirai.utils.MiraiLogger
;
...
@@ -14,6 +16,9 @@ import net.mamoe.mirai.utils.config.MiraiMapSection;
...
@@ -14,6 +16,9 @@ import net.mamoe.mirai.utils.config.MiraiMapSection;
import
java.awt.*
;
import
java.awt.*
;
import
java.io.File
;
import
java.io.File
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.net.DatagramPacket
;
import
java.net.InetAddress
;
import
java.nio.charset.StandardCharsets
;
import
java.nio.file.Path
;
import
java.nio.file.Path
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.Scanner
;
import
java.util.Scanner
;
...
@@ -48,7 +53,6 @@ public class MiraiServer {
...
@@ -48,7 +53,6 @@ public class MiraiServer {
protected
MiraiServer
(){
protected
MiraiServer
(){
instance
=
this
;
instance
=
this
;
this
.
onLoad
();
this
.
onLoad
();
Thread
.
yield
();
this
.
onEnable
();
this
.
onEnable
();
}
}
...
@@ -84,6 +88,7 @@ public class MiraiServer {
...
@@ -84,6 +88,7 @@ public class MiraiServer {
this
.
setting
=
new
MiraiConfig
(
setting
);
this
.
setting
=
new
MiraiConfig
(
setting
);
}
}
/*
MiraiMapSection qqs = this.setting.getMapSection("qq");
MiraiMapSection qqs = this.setting.getMapSection("qq");
qqs.forEach((a,p) -> {
qqs.forEach((a,p) -> {
this.getLogger().log(LoggerTextFormat.SKY_BLUE + "Finding available ports between " + "1-65536");
this.getLogger().log(LoggerTextFormat.SKY_BLUE + "Finding available ports between " + "1-65536");
...
@@ -95,6 +100,23 @@ public class MiraiServer {
...
@@ -95,6 +100,23 @@ public class MiraiServer {
e.printStackTrace();
e.printStackTrace();
}
}
});
});
*/
System
.
out
.
println
(
"network test"
);
try
{
MiraiUDPServer
server
=
new
MiraiUDPServer
();
MiraiUDPClient
client
=
new
MiraiUDPClient
(
InetAddress
.
getLocalHost
(),
9999
,
MiraiNetwork
.
getAvailablePort
());
this
.
getTaskManager
().
repeatingTask
(()
->
{
byte
[]
sendInfo
=
"test test"
.
getBytes
(
StandardCharsets
.
UTF_8
);
try
{
client
.
send
(
new
DatagramPacket
(
sendInfo
,
sendInfo
.
length
));
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
},
300
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
}
}
public
void
initSetting
(
File
setting
){
public
void
initSetting
(
File
setting
){
...
...
mirai-core/src/main/java/net/mamoe/mirai/network/MiraiUDPClient.java
View file @
fa4adfd5
package
net.mamoe.mirai.network
;
package
net.mamoe.mirai.network
;
import
net.mamoe.mirai.MiraiServer
;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.io.UnsupportedEncodingException
;
import
java.io.UnsupportedEncodingException
;
import
java.net.*
;
import
java.net.*
;
...
@@ -10,6 +12,7 @@ public class MiraiUDPClient {
...
@@ -10,6 +12,7 @@ public class MiraiUDPClient {
private
Thread
thread
;
private
Thread
thread
;
public
MiraiUDPClient
(
InetAddress
target
,
int
targetPort
,
int
localPort
)
{
public
MiraiUDPClient
(
InetAddress
target
,
int
targetPort
,
int
localPort
)
{
MiraiServer
.
getInstance
().
getLogger
().
log
(
"creating client"
);
try
{
try
{
this
.
localUDPSocket
=
new
DatagramSocket
(
localPort
);
this
.
localUDPSocket
=
new
DatagramSocket
(
localPort
);
this
.
localUDPSocket
.
connect
(
target
,
targetPort
);
this
.
localUDPSocket
.
connect
(
target
,
targetPort
);
...
@@ -36,6 +39,7 @@ public class MiraiUDPClient {
...
@@ -36,6 +39,7 @@ public class MiraiUDPClient {
}
catch
(
SocketException
e
)
{
}
catch
(
SocketException
e
)
{
e
.
printStackTrace
();
e
.
printStackTrace
();
}
}
MiraiServer
.
getInstance
().
getLogger
().
log
(
"created client"
);
}
}
public
void
onReceive
(
DatagramPacket
packet
){
public
void
onReceive
(
DatagramPacket
packet
){
System
.
out
.
println
(
new
String
(
packet
.
getData
(),
0
,
packet
.
getLength
(),
StandardCharsets
.
UTF_8
));
System
.
out
.
println
(
new
String
(
packet
.
getData
(),
0
,
packet
.
getLength
(),
StandardCharsets
.
UTF_8
));
...
...
mirai-core/src/main/java/net/mamoe/mirai/network/MiraiUDPServer.java
0 → 100644
View file @
fa4adfd5
package
net.mamoe.mirai.network
;
import
io.netty.bootstrap.Bootstrap
;
import
io.netty.buffer.ByteBuf
;
import
io.netty.buffer.Unpooled
;
import
io.netty.channel.ChannelHandlerContext
;
import
io.netty.channel.EventLoopGroup
;
import
io.netty.channel.SimpleChannelInboundHandler
;
import
io.netty.channel.nio.NioEventLoopGroup
;
import
io.netty.channel.socket.DatagramPacket
;
import
io.netty.channel.socket.nio.NioDatagramChannel
;
import
io.netty.handler.codec.dns.DatagramDnsQueryDecoder
;
import
io.netty.util.CharsetUtil
;
import
net.mamoe.mirai.MiraiServer
;
public
class
MiraiUDPServer
{
public
MiraiUDPServer
()
{
MiraiServer
.
getInstance
().
getLogger
().
log
(
"creating server"
);
new
Thread
(()
->
{
Bootstrap
b
=
new
Bootstrap
();
EventLoopGroup
group
=
new
NioEventLoopGroup
();
b
.
group
(
group
)
.
channel
(
NioDatagramChannel
.
class
)
.
handler
(
new
SimpleChannelInboundHandler
<
DatagramPacket
>()
{
protected
void
channelRead0
(
ChannelHandlerContext
ctx
,
DatagramPacket
packet
)
throws
Exception
{
// 读取收到的数据
ByteBuf
buf
=
(
ByteBuf
)
packet
.
copy
().
content
();
byte
[]
req
=
new
byte
[
buf
.
readableBytes
()];
buf
.
readBytes
(
req
);
String
body
=
new
String
(
req
,
CharsetUtil
.
UTF_8
);
System
.
out
.
println
(
"【NOTE】>>>>>> 收到客户端的数据:"
+
body
);
// 回复一条信息给客户端
ctx
.
writeAndFlush
(
new
DatagramPacket
(
Unpooled
.
copiedBuffer
(
"Hello,我是Server,我的时间戳是"
+
System
.
currentTimeMillis
()
,
CharsetUtil
.
UTF_8
)
,
packet
.
sender
())).
sync
();
}
});
// 服务端监听在9999端口
try
{
b
.
bind
(
9999
).
sync
().
channel
().
closeFuture
().
await
();
}
catch
(
InterruptedException
e
)
{
e
.
printStackTrace
();
}
}).
start
();
MiraiServer
.
getInstance
().
getLogger
().
log
(
"created server"
);
}
}
mirai-core/src/main/java/net/mamoe/mirai/network/NetworkPacketHandler.java
deleted
100644 → 0
View file @
48db4a92
package
net.mamoe.mirai.network
;
import
io.netty.channel.ChannelHandlerContext
;
import
io.netty.channel.SimpleChannelInboundHandler
;
import
java.io.IOException
;
/**
* 网络数据包接收器. 该类属于网络层, 插件一般不需要使用
*
* @author Him188 @ JPRE Project
*/
public
class
NetworkPacketHandler
extends
SimpleChannelInboundHandler
<
byte
[]>
{
@Override
public
void
channelRead
(
ChannelHandlerContext
ctx
,
Object
msg
)
throws
Exception
{
super
.
channelRead
(
ctx
,
msg
);
}
@Override
protected
void
channelRead0
(
ChannelHandlerContext
ctx
,
byte
[]
data
)
throws
Exception
{
synchronized
(
this
)
{
handlePacket
(
ctx
,
data
);
}
}
private
byte
[]
temp
=
new
byte
[
0
];
/**
* Synchronized by {@code synchronized (this)} in {@link #channelRead0}
*/
private
void
handlePacket
(
ChannelHandlerContext
ctx
,
byte
[]
data
)
{
/*try {
temp = Utils.arrayAppend(temp, data);
while (temp.length != 0) {
int position = Utils.arraySearch(temp, Protocol.SIGNATURE);
if (position < 0) {
return;//收到的是子包, 数据未结尾
}
byte[] d = Utils.arrayGetCenter(temp, 0, position);
temp = Utils.arrayDelete(temp, position + Protocol.SIGNATURE.length);
JPREMain.getInstance().getScheduler().addTask(() -> processPacket(ctx, d));
}
} catch (Exception e) {
e.printStackTrace();
}*/
}
//TODO 改为 public, 并将 ctx 改为插件可扩展的消息源以实现多源化
private
void
processPacket
(
ChannelHandlerContext
ctx
,
byte
[]
data
)
{
if
(
data
.
length
==
0
)
{
return
;
}
processPacket
(
ctx
,
new
BinaryStream
());
}
private
void
processPacket
(
ChannelHandlerContext
ctx
,
BinaryStream
stream
)
{
//System.out.println(stream);
/*for (MPQClient client : clients) {
if (client.is((InetSocketAddress) ctx.channel().remoteAddress())) {
client.getFrame().getScheduler().addTask(() -> {
try {
client.dataReceive(stream);
} catch (Exception e) {
e.printStackTrace();
}
});
return;
}
}*/
}
@Override
public
void
exceptionCaught
(
ChannelHandlerContext
ctx
,
Throwable
cause
)
throws
Exception
{
if
(
cause
instanceof
IOException
)
{
//远程主机强迫关闭了一个现有的连接
return
;
}
super
.
exceptionCaught
(
ctx
,
cause
);
}
@Override
public
void
channelActive
(
ChannelHandlerContext
ctx
)
throws
Exception
{
super
.
channelActive
(
ctx
);
/*
FrameConnectionEvent event = null;
for (MPQClient client : clients) {
if (client.is((InetSocketAddress) ctx.channel().remoteAddress())) {
event = new FrameConnectionEvent(client.getFrame());
client.setAddress((InetSocketAddress) ctx.channel().remoteAddress());
client.setCtx(ctx);
break;
}
}
if (event == null) {
Frame frame = new Frame(getJPREMain());
MPQClient client = new MPQClient(frame, (InetSocketAddress) ctx.channel().remoteAddress(), ctx);
clients.add(client);
event = new FrameConnectionEvent(frame);
}
event.getFrame().getPluginManager().callEvent(event);*/
}
@Override
public
void
channelInactive
(
ChannelHandlerContext
ctx
)
throws
Exception
{
System
.
out
.
println
(
"[Network] RemoteClient: "
+
ctx
.
channel
().
remoteAddress
()
+
" disconnected."
);
/*
for (MPQClient client : clients) {
if (client.is((InetSocketAddress) ctx.channel().remoteAddress())) {
FrameDisconnectionEvent event = new FrameDisconnectionEvent(client.getFrame());
client.getFrame().getPluginManager().callEvent(event);
break;
}
}
*/
super
.
channelInactive
(
ctx
);
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment