zhaolei/FileSqlServerSync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: c# websocket 不能脱离http上下文，也就是请求接口的函数作用域，否则就会异常退出（这是什么？）。 因此改了一些websocket的结构。

Browse source
This commit is contained in:
zerlei 2024-10-10 13:15:14 +08:00
parent f7e911943c
commit 5517ea9df8
11 changed files with 115 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Server/Common/ConnectPipeline.cs
View file

@ -55,7 +55,7 @@ public class WebSocPipeLine<TSocket>(TSocket socket, bool isAES) : AbsPipeLine(i
);
var fileContent = new ProgressStreamContent(fileStream, progress);
content.Add(fileContent, "file", Path.GetFileName(filePath));
var it = await client.PostAsync(url + "/UploadPacked", content);
var it = await client.PostAsync("http://" + url + "/UploadPacked", content);
if (it.StatusCode != System.Net.HttpStatusCode.OK)
{
throw new Exception(it.Content.ReadAsStringAsync().Result);
@ -72,7 +72,7 @@ public class WebSocPipeLine<TSocket>(TSocket socket, bool isAES) : AbsPipeLine(i
if (Socket is ClientWebSocket CSocket)
{
//连接失败会抛出异常
await CSocket.ConnectAsync(new Uri(addr), CancellationToken.None);
await CSocket.ConnectAsync(new Uri("ws://" + addr), CancellationToken.None);
yield return 0;
}
// 从controller 来，这个已经连接上了
@ -121,6 +121,14 @@ public class WebSocPipeLine<TSocket>(TSocket socket, bool isAES) : AbsPipeLine(i
{
if (Socket.State == WebSocketState.Open)
{
//await SendMsg(
// new SyncMsg
// {
// Type = SyncMsgType.Error,
// Step = SyncProcessStep.Finally,
// Body = CloseReason ?? ""
// }
//);
await Socket.CloseAsync(
WebSocketCloseStatus.NormalClosure,
CloseReason,

33
Server/LocalServer/Controllers/LocalServerController.cs
View file

@ -10,6 +10,36 @@ namespace LocalServer.Controllers
{
private readonly LocalSyncServerFactory Factory = factory;
private static async Task Echo(WebSocket webSocket)
{
var buffer = new byte[1024 * 4];
var receiveResult = await webSocket.ReceiveAsync(
new ArraySegment<byte>(buffer),
CancellationToken.None
);
while (!receiveResult.CloseStatus.HasValue)
{
await webSocket.SendAsync(
new ArraySegment<byte>(buffer, 0, receiveResult.Count),
receiveResult.MessageType,
receiveResult.EndOfMessage,
CancellationToken.None
);
receiveResult = await webSocket.ReceiveAsync(
new ArraySegment<byte>(buffer),
CancellationToken.None
);
}
await webSocket.CloseAsync(
receiveResult.CloseStatus.Value,
receiveResult.CloseStatusDescription,
CancellationToken.None
);
}
[Route("/websoc")]
public async Task WebsocketConnection(string Name)
{
@ -20,8 +50,9 @@ namespace LocalServer.Controllers
if (Factory.GetServerByName(Name) == null)
{
var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
//await Echo(webSocket);
var pipeLine = new WebSocPipeLine<WebSocket>(webSocket, false);
Factory.CreateLocalSyncServer(
await Factory.CreateLocalSyncServer(
pipeLine,
Name,
new WebSocPipeLine<ClientWebSocket>(new ClientWebSocket(), false)

4
Server/LocalServer/LocalSyncServer.cs
View file

@ -105,8 +105,9 @@ public class LocalSyncServer
StateHelper = new ConnectAuthorityHelper(this);
Name = name;
RemotePipe = remotePipe;
}
Task.Run(async () =>
public async Task Connect()
{
try
{
@ -122,7 +123,6 @@ public class LocalSyncServer
{
Close(e.Message);
}
});
}
public void Close(string? CloseReason)

16
Server/LocalServer/LocalSyncServerFactory.cs
View file

@ -1,5 +1,5 @@
using Common;
using System.Net.WebSockets;
using Common;
namespace LocalServer;
@ -7,18 +7,18 @@ public class LocalSyncServerFactory
{
private readonly object Lock = new();
public void CreateLocalSyncServer(AbsPipeLine pipeLine, string name,AbsPipeLine absPipeLine)
public async Task CreateLocalSyncServer(
AbsPipeLine pipeLine,
string name,
AbsPipeLine absPipeLine
)
{
var server = new LocalSyncServer(
pipeLine,
this,
name,
absPipeLine
);
var server = new LocalSyncServer(pipeLine, this, name, absPipeLine);
lock (Lock)
{
Servers.Add(server);
}
await server.Connect();
}
private readonly List<LocalSyncServer> Servers = [];

2
Server/RemoteServer/Controllers/RemoteServerController.cs
View file

@ -23,7 +23,7 @@ public class SyncFilesController(RemoteSyncServerFactory factory, SqliteDbContex
{
var webSocket = await HttpContext.WebSockets.AcceptWebSocketAsync();
var pipeLine = new WebSocPipeLine<WebSocket>(webSocket, true);
Factory.CreateRemoteSyncServer(pipeLine, Name);
await Factory.CreateRemoteSyncServer(pipeLine, Name);
}
else
{

2
Server/RemoteServer/Program.cs
View file

@ -38,6 +38,6 @@ if (app.Environment.IsDevelopment())
}
app.UseWebSockets();
app.Urls.Clear();
app.Urls.Add("http://0.0.0.0:6818");
app.Urls.Add("http://0.0.0.0:6819");
app.MapControllers();
app.Run();

4
Server/RemoteServer/RemoteSyncServer.cs
View file

@ -61,8 +61,9 @@ public class RemoteSyncServer
Name = name;
Pwd = pwd;
StateHelper = new ConnectAuthorityHelper(this);
}
Task.Run(async () =>
public async Task Connect()
{
try
{
@ -78,7 +79,6 @@ public class RemoteSyncServer
{
Close(e.Message);
}
});
}
public void Close(string? CloseReason)

3
Server/RemoteServer/RemoteSyncServerFactory.cs
View file

@ -10,7 +10,7 @@ public class RemoteSyncServerFactory
public static List<Tuple<string, string>> NamePwd = [];
#pragma warning restore CA2211 // Non-constant fields should not be visible
public void CreateRemoteSyncServer(AbsPipeLine pipeLine, string Name)
public async Task CreateRemoteSyncServer(AbsPipeLine pipeLine, string Name)
{
var pwd =
NamePwd.Where(x => x.Item1 == Name).FirstOrDefault()
@ -20,6 +20,7 @@ public class RemoteSyncServerFactory
{
Servers.Add(server);
}
await server.Connect();
}
private readonly List<RemoteSyncServer> Servers = [];

12
Server/ServerTest/PipeTest.cs
View file

@ -52,9 +52,17 @@ public class PipeTest
RemoteSyncServer.TempRootFile = "D:/FileSyncTest/dtemp";
RemoteSyncServerFactory.NamePwd = [new Tuple<string, string>("Test", "t123")];
var lf = new LocalSyncServerFactory();
lf.CreateLocalSyncServer(p2, "Test", p3);
var task1 = Task.Run(() =>
{
lf.CreateLocalSyncServer(p2, "Test", p3).RunSynchronously();
});
var rf = new RemoteSyncServerFactory();
rf.CreateRemoteSyncServer(p4, "Test");
var task2 = Task.Run(async () =>
{
await rf.CreateRemoteSyncServer(p4, "Test");
});
TestPipe.syncServerFactory = rf;
var starter = new SyncMsg
{

14
Tool/webtool/src/App.vue
View file

@ -3,6 +3,7 @@ import MonacoEditor from 'monaco-editor-vue3';
import HistoryBtn from "./HistoryBtn.vue"
import { ref, onMounted, computed } from 'vue';
import stringifyObject from 'stringify-object';
import ConnectPipe from './connect.js'
const cacheConfig = ref({})
const options = ref({
@ -13,7 +14,7 @@ const options = ref({
const code = ref(`
config = {
Name: "Test",
RemoteUrl: "D:/FileSyncTest/dtemp",
RemoteUrl: "127.0.0.1:6819",
RemotePwd: "t123",
IsDeployDb: false,
IsDeployProject: false,
@ -59,6 +60,9 @@ function submit() {
}
cacheConfig.value[config.Name] = config
updateStorage()
var p = new ConnectPipe()
p.OpenPipe(config,()=>{})
}
catch (e) {
window.alert(e)
@ -76,9 +80,6 @@ const history = computed(() => {
return Object.keys(cacheConfig.value)
})
function publishCB(MsgIt) {
}
function onDel(name) {
delete cacheConfig.value[name]
updateStorage()
@ -86,6 +87,11 @@ function onDel(name) {
function updateStorage() {
localStorage.setItem('config', JSON.stringify(cacheConfig.value))
}
function publishCB(MsgIt) {
}
onMounted(() => {
var cacheConfigStr = localStorage.getItem('config')
if (cacheConfigStr) {

16
Tool/webtool/src/connect.js
View file

@ -5,22 +5,25 @@ class ConnectPipe {
//Id,Msgtype,callback
// this.#websocket = new WebSocket(`ws://${window.location.host}`)
}
#OpenPipe(config, MsgCb) {
OpenPipe(config, MsgCb) {
this.config = config;
var webSocUrl = `ws://${window.location.host}:${window.location.port}/websoc?Name=${config.Name}`
// var webSocUrl = `ws://${window.location.host}:${window.location.port}/websoc?Name=${config.Name}`
var webSocUrl = "ws://127.0.0.1:6818/websoc?Name=Test"
this.#websocket = new WebSocket(webSocUrl);
this.#websocket.onopen = (event) => {
// console.warn("websocket connected!");
this.#websocket.send(JSON.stringify(this.config));
};
this.#websocket.onmessage = (event) => {
console.log(event.data)
};
this.#websocket.onclose = (event) => {};
this.#websocket.onclose = (event) => {
console.warn(event.reason)
};
this.#websocket.onerror = (e) => {
console.error(e)
if (this.#websocket.readyState) {
//bla bla
}
@ -28,6 +31,5 @@ class ConnectPipe {
}
}
let cPipe = new ConnectPipe();
export default cPipe;
export default ConnectPipe;