saqut
/
MWSE
1
1
Fork 0
Code Issues 10 Pull Requests Packages Projects 2 Releases 1 Wiki Activity

Disconnected pair event added

This commit is contained in:
Abdussamed 2024-04-05 10:06:23 +03:00
parent 73b5ade3e1
commit 4cd68f4a7f
4 changed files with 55 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Client.js
View File

@ -125,7 +125,7 @@ Client.prototype.isSecure = function(client)
return false;
}
/**
* @returns {{pairs:Map<string, Client>,roompairs:Map<string, Client>}}
* @returns {{pairs:Map<string, Client>,roompairs:Map<string, Client>,intersection:Map<string, Client>}}
*/
Client.prototype.getSucureClients = function()
{
@ -152,7 +152,11 @@ Client.prototype.getSucureClients = function()
};
return {
pairs,
roompairs
roompairs,
intersection : new Map([
...pairs,
...roompairs
])
};
}

15
Source/Services/Auth.js
View File

@ -1,6 +1,19 @@
const { Client } = require("../Client.js");
let {addService, addListener} = require("../WebSocket.js");
addListener('disconnect',(global, xclient)=>{
const {intersection} = xclient.getSucureClients();
for (const [clientid, client] of intersection)
{
client.send([
{
id: clientid
},
"peer/disconnect"
])
}
});
addService(({
client,
message,
@ -62,7 +75,7 @@ addService(({
message: 'ALREADY-PAIRED'
})
}
if(client.pairs.add(to))
if(client.pairs.has(to))
{
return end({
status: 'fail',

33
Source/Services/DataTransfer.js
View File

@ -38,12 +38,21 @@ addService(({
if(Client.clients.has(to))
{
let otherPeer = Client.clients.get(to);
if(otherPeer.requiredPair && !otherPeer.pairs.has(to))
if(otherPeer.requiredPair)
{
console.error("Client, güvenilir olmayan bir cliente mesaj iletiyor")
return handshake && end({
type: 'fail'
})
if(!otherPeer.pairs.has(to))
{
console.error("Client, güvenilir olmayan bir cliente mesaj iletiyor")
return handshake && end({
type: 'fail'
})
}
}else{
if(!otherPeer.pairs.has(to))
{
otherPeer.pairs.add(client.id);
client.pairs.add(otherPeer.id);
}
}
if(!otherPeer.packWriteable()){
@ -72,10 +81,18 @@ addService(({
if(Client.clients.has(to))
{
let otherPeer = Client.clients.get(to);
if(otherPeer.requiredPair && !otherPeer.pairs.has(to))
if(otherPeer.requiredPair)
{
console.error("response istenen peer güvenli değil")
return;
if(!otherPeer.pairs.has(to))
{
console.error("Client, güvenilir olmayan bir clientden veri istiyor")
return handshake && end({
type: 'fail'
})
}
}else{
otherPeer.pairs.add(client.id);
client.pairs.add(otherPeer.id);
}
otherPeer.send([{
from: client.id,

15
frontend/index.ts
View File

@ -149,7 +149,7 @@ export default class MWSE extends EventTarget {
this.EventPooling.signal('room/ejected',(payload : {id:string,roomid:any,ownerid:string}) => {
let {id,roomid} = payload;
let room = this.room(roomid);
let peer = this.peer(id);
let peer = this.peer(id, true);
room.peers.delete(peer.socketId as string);
room.emit('eject', peer);
})
@ -162,27 +162,32 @@ export default class MWSE extends EventTarget {
})
this.EventPooling.signal("pair/info", (payload : {from : string,name: string, value: string | number | boolean}) => {
let {from, name, value} = payload;
let peer = this.peer(from);
let peer = this.peer(from, true);
peer.info.info[name] = value;
peer.emit("info", name, value);
})
this.EventPooling.signal("request/pair", (payload : {from : string,info: any}) => {
let {from, info} = payload;
let peer = this.peer(from);
let peer = this.peer(from, true);
peer.info.info = info;
peer.emit("request/pair", peer);
this.peer('me').emit('request/pair', peer);
})
this.EventPooling.signal("peer/disconnect", (payload : {id : string}) => {
let {id} = payload;
let peer = this.peer(id, true);
peer.emit("disconnect", peer);
})
this.EventPooling.signal("accepted/pair", (payload : {from : string,info: any}) => {
let {from, info} = payload;
let peer = this.peer(from);
let peer = this.peer(from, true);
peer.info.info = info;
peer.emit("accepted/pair", peer);
this.peer('me').emit('accepted/pairr', peer);
})
this.EventPooling.signal("end/pair", (payload : {from : string,info: any}) => {
let {from, info} = payload;
let peer = this.peer(from);
let peer = this.peer(from, true);
peer.emit("endPair", info);
this.peer('me').emit('endPair', from, info);
})