ApfelTeeSaft/LawinServerV2
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/LawinServerV2.git synced 2026-08-26 19:23:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

MCP and XMPP code updates

Browse Source
This commit is contained in:
Lawin0129
2023-04-16 23:01:38 +01:00
parent ea126f91a7
commit db67caedec
2 changed files with 58 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routes/mcp.js
+19 -19
View File
@@ -29,9 +29,7 @@ app.post("/fortnite/api/game/v2/profile/*/client/MarkItemSeen", verifyToken, asy
let QueryRevision = req.query.rvn || -1;
let StatChanged = false;
let missingFields = { fields: [] };
checkFields(["itemIds"], missingFields, req.body);
let missingFields = checkFields(["itemIds"], req.body);
if (missingFields.fields.length > 0) return res.status(400).json(error.createError(
"errors.com.epicgames.validation.validation_failed",
@@ -111,9 +109,7 @@ app.post("/fortnite/api/game/v2/profile/*/client/SetItemFavoriteStatusBatch", ve
let QueryRevision = req.query.rvn || -1;
let StatChanged = false;
let missingFields = { fields: [] };
checkFields(["itemIds","itemFavStatus"], missingFields, req.body);
let missingFields = checkFields(["itemIds","itemFavStatus"], req.body);
if (missingFields.fields.length > 0) return res.status(400).json(error.createError(
"errors.com.epicgames.validation.validation_failed",
@@ -193,9 +189,7 @@ app.post("/fortnite/api/game/v2/profile/*/client/SetBattleRoyaleBanner", verifyT
let QueryRevision = req.query.rvn || -1;
let StatChanged = false;
let missingFields = { fields: [] };
checkFields(["homebaseBannerIconId","homebaseBannerColorId"], missingFields, req.body);
let missingFields = checkFields(["homebaseBannerIconId","homebaseBannerColorId"], req.body);
if (missingFields.fields.length > 0) return res.status(400).json(error.createError(
"errors.com.epicgames.validation.validation_failed",
@@ -319,9 +313,7 @@ app.post("/fortnite/api/game/v2/profile/*/client/EquipBattleRoyaleCustomization"
"athenaloadingscreen:lsid_random"
];
let missingFields = { fields: [] };
checkFields(["slotName"], missingFields, req.body);
let missingFields = checkFields(["slotName"], req.body);
if (missingFields.fields.length > 0) return res.status(400).json(error.createError(
"errors.com.epicgames.validation.validation_failed",
@@ -431,6 +423,10 @@ app.post("/fortnite/api/game/v2/profile/*/client/EquipBattleRoyaleCustomization"
if (!slotNames.includes(req.body.slotName)) break;
if (!profile.items[activeLoadoutId].attributes.locker_slots_data.slots[req.body.slotName]) break;
if (req.body.slotName == "Pickaxe" || req.body.slotName == "Glider") {
if (!req.body.itemToSlot) break;
}
profile.stats.attributes[(`favorite_${req.body.slotName}`).toLowerCase()] = req.body.itemToSlot;
profile.items[activeLoadoutId].attributes.locker_slots_data.slots[req.body.slotName].items = [templateId];
@@ -500,9 +496,7 @@ app.post("/fortnite/api/game/v2/profile/*/client/SetCosmeticLockerBanner", verif
let QueryRevision = req.query.rvn || -1;
let StatChanged = false;
let missingFields = { fields: [] };
checkFields(["bannerIconTemplateName","bannerColorTemplateName","lockerItem"], missingFields, req.body);
let missingFields = checkFields(["bannerIconTemplateName","bannerColorTemplateName","lockerItem"], req.body);
if (missingFields.fields.length > 0) return res.status(400).json(error.createError(
"errors.com.epicgames.validation.validation_failed",
@@ -639,9 +633,7 @@ app.post("/fortnite/api/game/v2/profile/*/client/SetCosmeticLockerSlot", verifyT
"athenaloadingscreen:lsid_random"
];
let missingFields = { fields: [] };
checkFields(["category","lockerItem"], missingFields, req.body);
let missingFields = checkFields(["category","lockerItem"], req.body);
if (missingFields.fields.length > 0) return res.status(400).json(error.createError(
"errors.com.epicgames.validation.validation_failed",
@@ -766,6 +758,10 @@ app.post("/fortnite/api/game/v2/profile/*/client/SetCosmeticLockerSlot", verifyT
default:
if (!profile.items[req.body.lockerItem].attributes.locker_slots_data.slots[req.body.category]) break;
if (req.body.category == "Pickaxe" || req.body.category == "Glider") {
if (!req.body.itemToSlot) break;
}
profile.items[req.body.lockerItem].attributes.locker_slots_data.slots[req.body.category].items = [req.body.itemToSlot];
profile.stats.attributes[(`favorite_${req.body.category}`).toLowerCase()] = itemToSlotID || req.body.itemToSlot;
@@ -863,10 +859,14 @@ app.post("/fortnite/api/game/v2/profile/*/client/:operation", verifyToken, async
});
});
function checkFields(fields, missingFields, body) {
function checkFields(fields, body) {
let missingFields = { fields: [] };
fields.forEach(field => {
if (!body[field]) missingFields.fields.push(field);
});
return missingFields;
}
function ValidationError(field, type) {
xmpp/xmpp.js
+39 -33
View File
@@ -14,6 +14,8 @@ const port = 80;
const wss = new WebSocket({ server: app.listen(port) });
const matchmaker = require("../matchmaker/matchmaker.js");
let domain = "xmpp.lawinserver.net";
global.Clients = [];
// multi user chat rooms (global chat/party chat)
@@ -74,7 +76,7 @@ wss.on('connection', async (ws) => {
case "open":
ws.send(XMLBuilder.create("open")
.attribute("xmlns", "urn:ietf:params:xml:ns:xmpp-framing")
.attribute("from", "prod.ol.epicgames.com")
.attribute("from", domain)
.attribute("id", ID)
.attribute("version", "1.0")
.attribute("xml:lang", "en").toString());
@@ -138,7 +140,7 @@ wss.on('connection', async (ws) => {
if (!findResource.content) return;
resource = findResource.content;
jid = `${accountId}@prod.ol.epicgames.com/${resource}`;
jid = `${accountId}@${domain}/${resource}`;
ws.send(XMLBuilder.create("iq")
.attribute("to", jid)
@@ -155,7 +157,7 @@ wss.on('connection', async (ws) => {
ws.send(XMLBuilder.create("iq")
.attribute("to", jid)
.attribute("from", "prod.ol.epicgames.com")
.attribute("from", domain)
.attribute("id", "_xmpp_session1")
.attribute("xmlns", "jabber:client")
.attribute("type", "result").toString());
@@ -168,7 +170,7 @@ wss.on('connection', async (ws) => {
ws.send(XMLBuilder.create("iq")
.attribute("to", jid)
.attribute("from", "prod.ol.epicgames.com")
.attribute("from", domain)
.attribute("id", msg.root.attributes.id)
.attribute("xmlns", "jabber:client")
.attribute("type", "result").toString());
@@ -247,7 +249,7 @@ wss.on('connection', async (ws) => {
if (msg.root.attributes.type == "unavailable") {
if (!msg.root.attributes.to) return;
if (msg.root.attributes.to.endsWith("@muc.prod.ol.epicgames.com") || msg.root.attributes.to.split("/")[0].endsWith("@muc.prod.ol.epicgames.com")) {
if (msg.root.attributes.to.endsWith(`@muc.${domain}`) || msg.root.attributes.to.split("/")[0].endsWith(`@muc.${domain}`)) {
if (msg.root.attributes.to.toLowerCase().startsWith("party-")) {
let roomName = msg.root.attributes.to.split("@")[0];
@@ -266,7 +268,7 @@ wss.on('connection', async (ws) => {
.attribute("type", "unavailable")
.element("x").attribute("xmlns", "http://jabber.org/protocol/muc#user")
.element("item")
.attribute("nick", getMUCmember(roomName, displayName, accountId, resource).replace(`${roomName}@muc.prod.ol.epicgames.com/`, ""))
.attribute("nick", getMUCmember(roomName, displayName, accountId, resource).replace(`${roomName}@muc.${domain}/`, ""))
.attribute("jid", jid)
.attribute("role", "none").up()
.element("status").attribute("code", "110").up()
@@ -297,7 +299,7 @@ wss.on('connection', async (ws) => {
.attribute("xmlns", "jabber:client")
.element("x").attribute("xmlns", "http://jabber.org/protocol/muc#user")
.element("item")
.attribute("nick", getMUCmember(roomName, displayName, accountId, resource).replace(`${roomName}@muc.prod.ol.epicgames.com/`, ""))
.attribute("nick", getMUCmember(roomName, displayName, accountId, resource).replace(`${roomName}@muc.${domain}/`, ""))
.attribute("jid", jid)
.attribute("role", "participant")
.attribute("affiliation", "none").up()
@@ -317,24 +319,24 @@ wss.on('connection', async (ws) => {
.element("x")
.attribute("xmlns", "http://jabber.org/protocol/muc#user")
.element("item")
.attribute("nick", getMUCmember(roomName, ClientData.displayName, ClientData.accountId, ClientData.resource).replace(`${roomName}@muc.prod.ol.epicgames.com/`, ""))
.attribute("nick", getMUCmember(roomName, ClientData.displayName, ClientData.accountId, ClientData.resource).replace(`${roomName}@muc.${domain}/`, ""))
.attribute("jid", ClientData.jid)
.attribute("role", "participant")
.attribute("affiliation", "none").up().up().toString());
if (accountId.toLowerCase() != ClientData.accountId.toLowerCase()) {
ClientData.client.send(XMLBuilder.create("presence")
.attribute("from", getMUCmember(roomName, displayName, accountId, resource))
.attribute("to", ClientData.jid)
.attribute("xmlns", "jabber:client")
.element("x")
.attribute("xmlns", "http://jabber.org/protocol/muc#user")
.element("item")
.attribute("nick", getMUCmember(roomName, displayName, accountId, resource).replace(`${roomName}@muc.prod.ol.epicgames.com/`, ""))
.attribute("jid", jid)
.attribute("role", "participant")
.attribute("affiliation", "none").up().up().toString());
}
if (accountId == ClientData.accountId) return;
ClientData.client.send(XMLBuilder.create("presence")
.attribute("from", getMUCmember(roomName, displayName, accountId, resource))
.attribute("to", ClientData.jid)
.attribute("xmlns", "jabber:client")
.element("x")
.attribute("xmlns", "http://jabber.org/protocol/muc#user")
.element("item")
.attribute("nick", getMUCmember(roomName, displayName, accountId, resource).replace(`${roomName}@muc.${domain}/`, ""))
.attribute("jid", jid)
.attribute("role", "participant")
.attribute("affiliation", "none").up().up().toString());
});
return;
@@ -405,19 +407,23 @@ function RemoveClient(ws, joinedMUCs) {
let partyId = "";
switch (true) {
case (!ClientStatus.Properties): break;
case (isObject(ClientStatus.Properties)): {
for (let key in ClientStatus.Properties) {
if (key.toLowerCase().startsWith("party")) {
if (ClientStatus.Properties[key] && isObject(ClientStatus.Properties[key])) partyId = ClientStatus.Properties[key].partyId;
try {
switch (true) {
case (!ClientStatus.Properties): break;
case (isObject(ClientStatus.Properties)): {
for (let key in ClientStatus.Properties) {
if (key.toLowerCase().startsWith("party.joininfo")) {
if (ClientStatus.Properties[key] && isObject(ClientStatus.Properties[key])) partyId = ClientStatus.Properties[key].partyId;
}
}
}
}
}
} catch {}
if (partyId) {
global.Clients.forEach(ClientData => {
if (client.accountId == ClientData.accountId) return;
global.Clients.forEach(ClientData => {
if (client.accountId.toLowerCase() != ClientData.accountId.toLowerCase()) {
ClientData.client.send(XMLBuilder.create("message")
.attribute("id", functions.MakeID().replace(/-/ig, "").toUpperCase())
.attribute("from", client.jid)
@@ -432,8 +438,8 @@ function RemoveClient(ws, joinedMUCs) {
},
"timestamp": new Date().toISOString()
})).up().toString());
}
});
});
}
log.xmpp(`An xmpp client with the displayName ${client.displayName} has logged out.`);
}
@@ -505,7 +511,7 @@ function sendXmppMessageToClient(senderJid, msg, body) {
}
function getMUCmember(roomName, displayName, accountId, resource) {
return `${roomName}@muc.prod.ol.epicgames.com/${encodeURI(displayName)}:${accountId}:${resource}`;
return `${roomName}@muc.${domain}/${encodeURI(displayName)}:${accountId}:${resource}`;
}
function isObject(value) {