qq27800734/taoyao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] 日常优化

Browse Source
This commit is contained in:
acgist
2023-08-16 07:53:05 +08:00
parent b31398ff1d
commit 77e244a512
8 changed files with 171 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
taoyao-client-web/src/components/Taoyao.js
View File

@@ -2524,6 +2524,20 @@ class Taoyao extends RemoteClient {
return response.body;
}
/**
* 房间状态信令
*
* @param {*} roomId 房间ID
*
* @returns 房间状态
*/
async roomStatus(roomId) {
const response = await this.request(protocol.buildMessage("room::status", {
roomId: roomId || this.roomId
}));
return response.body;
}
/**
* 生产媒体
*
@@ -3072,13 +3086,11 @@ class Taoyao extends RemoteClient {
await me.buildPeerConnection(session, sessionId);
session.peerConnection.createOffer().then(async (description) => {
await session.peerConnection.setLocalDescription(description);
me.push(
protocol.buildMessage("session::exchange", {
me.push(protocol.buildMessage("session::exchange", {
sdp : description.sdp,
type : description.type,
sessionId: sessionId
})
);
}));
});
}
@@ -3126,13 +3138,11 @@ class Taoyao extends RemoteClient {
await session.peerConnection.setRemoteDescription(new RTCSessionDescription(message.body));
session.peerConnection.createAnswer().then(async description => {
await session.peerConnection.setLocalDescription(description);
me.push(
protocol.buildMessage("session::exchange", {
me.push(protocol.buildMessage("session::exchange", {
sdp : description.sdp,
type : description.type,
sessionId: sessionId
})
);
}));
});
} else if (type === "answer") {
await session.peerConnection.setRemoteDescription(new RTCSessionDescription(message.body));
@@ -3215,6 +3225,33 @@ class Taoyao extends RemoteClient {
}
}
/**
* 系统信息信令
*
* @returns 系统信息
*/
async systemInfo() {
return await this.request(protocol.buildMessage("system::info", {}));
}
/**
* 重启系统信令
*
* @returns 重启系统
*/
async systemReboot() {
return await this.request(protocol.buildMessage("system::reboot", {}));
}
/**
* 关闭系统信令
*
* @returns 关闭系统
*/
async systemShutdown() {
return await this.request(protocol.buildMessage("system::shutdown", {}));
}
/**
* @param {*} session 会话
* @param {*} sessionId 会话ID
@@ -3250,13 +3287,11 @@ class Taoyao extends RemoteClient {
};
peerConnection.onicecandidate = event => {
console.debug("会话媒体协商", event);
me.push(
protocol.buildMessage("session::exchange", {
me.push(protocol.buildMessage("session::exchange", {
type : "candidate",
sessionId : sessionId,
candidate : event.candidate
})
);
}));
};
peerConnection.onnegotiationneeded = event => {
console.debug("会话媒体重新协商", event);

10
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/session/SessionCallProtocol.java
View File

@@ -28,11 +28,13 @@ import lombok.extern.slf4j.Slf4j;
"audio" : 是否需要声音（true|false），
"video" : 是否需要视频（true|false）
}
""",
flow = {
"终端->信令服务->终端",
"终端=>信令服务->终端"
{
"name" : "终端名称",
"clientId" : "终端ID",
"sessionId": "会话ID"
}
""",
flow = "终端=>信令服务->终端"
)
public class SessionCallProtocol extends ProtocolSessionAdapter {

3
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/session/SessionCloseProtocol.java
View File

@@ -23,9 +23,10 @@ import com.acgist.taoyao.signal.protocol.ProtocolSessionAdapter;
@Description(
body = """
{
"sessionId": "会话ID"
}
""",
flow = "终端->信令服务+)终端"
flow = "终端->信令服务->终端"
)
public class SessionCloseProtocol extends ProtocolSessionAdapter implements ApplicationListener<SessionCloseEvent> {

16
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/session/SessionExchangeProtocol.java
View File

@@ -25,22 +25,22 @@ import com.acgist.taoyao.signal.protocol.ProtocolSessionAdapter;
""",
body = """
{
"sdp": "sdp"
"type": "offer",
"sdp" : "sdp"
"type" : "offer",
"sessionId": "会话ID"
}
{
"sdp": "sdp"
"type": "answer",
"sdp" : "sdp"
"type" : "answer",
"sessionId": "会话ID"
}
{
"type": "candidate",
"type" : "candidate",
"sessionId": "会话ID",
"candidate": {
"sdpMid": "sdpMid",
"candidate": "candidate信息",
"sdpMLineIndex":sdpMLineIndex
"sdpMid" : "sdpMid",
"candidate" : "candidate信息",
"sdpMLineIndex": sdpMLineIndex
}
}
""",

26
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/system/SystemInfoProtocol.java
View File

@@ -29,23 +29,24 @@ import lombok.Setter;
{
"diskspace": [
{
"path": "存储路径",
"free": 存储空闲,
"path" : "存储路径",
"free" : 存储空闲,
"total": 存储总量
},
...
],
"maxMemory": 最大能用内存,
"freeMemory": 空闲内存,
"totalMemory": 已用内存,
"osArch": "系统架构",
"osName": "系统名称",
"osVersion": "系统版本",
"javaVmName": "虚拟机名称",
"javaVersion": "虚拟机版本",
"maxMemory" : 最大能用内存,
"freeMemory" : 空闲内存,
"totalMemory" : 已用内存,
"osArch" : "系统架构",
"osName" : "系统名称",
"osVersion" : "系统版本",
"javaVmName" : "虚拟机名称",
"javaVersion" : "虚拟机版本",
"cpuProcessors": CPU核心数量
}
"""
""",
flow = "终端=>信令服务"
)
public class SystemInfoProtocol extends ProtocolClientAdapter {
@@ -82,7 +83,8 @@ public class SystemInfoProtocol extends ProtocolClientAdapter {
info.put("javaVersion", System.getProperty("java.version"));
info.put("cpuProcessors", runtime.availableProcessors());
// 响应
client.push(this.build(info));
message.setBody(info);
client.push(message);
};
@Getter

3
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/system/SystemRebootProtocol.java
View File

@@ -21,7 +21,8 @@ import lombok.extern.slf4j.Slf4j;
@Description(
flow = {
"信令服务+)终端",
"终端->信令服务+)终端"
"终端->信令服务+)终端",
"终端=>信令服务+)终端"
}
)
public class SystemRebootProtocol extends ProtocolClientAdapter {

3
taoyao-signal-server/taoyao-signal/src/main/java/com/acgist/taoyao/signal/protocol/system/SystemShutdownProtocol.java
View File

@@ -21,7 +21,8 @@ import lombok.extern.slf4j.Slf4j;
@Description(
flow = {
"信令服务+)终端",
"终端->信令服务+)终端"
"终端->信令服务+)终端",
"终端=>信令服务+)终端"
}
)
public class SystemShutdownProtocol extends ProtocolClientAdapter {