steamutils 1.3.25 → 1.3.27

package/SteamClient.js

@@ -14,6 +14,7 @@ import EFriendRelationship from "steam-user/enums/EFriendRelationship.js";
 import SteamCommunity from "steamcommunity";
 import ELobbyType from "steam-user/enums/ELobbyType.js";
 import moment from "moment-timezone";
+import {encode, encodeUids} from "./bufferHelpers.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -344,22 +345,7 @@ function SteamClient({
     }
 
     async function gamePlay() {
-        let ownedApps = []
-        for (let i = 0; i < 5; i++) {
-            ownedApps = await getUserOwnedApps()
-            if (ownedApps?.length) {
-                break
-            }
-        }
-        if (!ownedApps?.length) {
-            gamesPlayed(730)
-        } else {
-            ownedApps = ownedApps.map(({appid}) => appid)
-            ownedApps = _.shuffle(ownedApps)
-            ownedApps.length = Math.min(ownedApps.length, MAX_GAME_PLAY - 1)
-            _.remove(ownedApps, app => app == 730)
-            gamesPlayed([...ownedApps, 730])
-        }
+        gamesPlayed(730)
     }
 
     async function autoGamePlay() {
@@ -425,34 +411,127 @@ function SteamClient({
 
     async function createLobby() {
         console.log("createLobby");
-        steamClient.sendToGC(730, Protos.csgo.EMsg.k_EMsgClientMMSCreateLobby, null, protoEncode(Protos.csgo.CMsgClientMMSCreateLobby, {
-            app_id: 730,
-            routing_appid: 730,
-            max_members: 10,
-            lobby_type: ELobbyType.Public,
-            lobby_flags: 1,
-            cell_id: steamClient.cellID,
-            public_ip: steamClient.logOnResult?.public_ip || {
-                v4: steamClient.publicIP,
+        steamClient._send(
+            {
+                msg: Protos.csgo.EMsg.k_EMsgClientMMSCreateLobby,
+                proto: {
+                    steamid: steamClient.steamID.getSteamID64(),
+                    routing_appid: 730
+                }
             },
-            persona_name_owner: steamClient.accountInfo.name,
-            metadata: null,
-        }))
+            protoEncode(Protos.csgo.CMsgClientMMSCreateLobby, {
+                app_id: 730,
+                max_members: 1,
+                lobby_type: 1,
+                lobby_flags: 1
+            })
+        );
+
+        return new Promise(resolve => {
+            const timeout = setTimeout(function () {
+                delete steamClient._handlerManager._handlers[Protos.csgo.EMsg.k_EMsgClientMMSCreateLobbyResponse];
+                resolve()
+            }, 60000)
+            steamClient._handlerManager.add(Protos.csgo.EMsg.k_EMsgClientMMSCreateLobbyResponse, (payload) => {
+                clearTimeout(timeout)
+                delete steamClient._handlerManager._handlers[Protos.csgo.EMsg.k_EMsgClientMMSCreateLobbyResponse];
+                const result = protoDecode(Protos.csgo.CMsgClientMMSCreateLobbyResponse, payload.toBuffer())
+                const steam_id_lobby = result.steam_id_lobby.toString();
+                resolve(steam_id_lobby);
+            });
+        })
+
+        // steamClient.sendToGC(730, Protos.csgo.EMsg.k_EMsgClientMMSCreateLobby, {
+        //     steamid: steamClient.steamID,
+        //     routing_appid: 730,
+        // }, protoEncode(Protos.csgo.CMsgClientMMSCreateLobby, {
+        //     app_id: 730,
+        //     max_members: 1,
+        //     lobby_type: 1,
+        //     lobby_flags: 1
+        // }))
+    }
+
+    async function updateLobby(lobbyID) {
+        console.log("updateLobby", lobbyID);
+        steamClient._send(
+            {
+                msg: Protos.csgo.EMsg.k_EMsgClientMMSSetLobbyData,
+                proto: {
+                    steamid: steamClient.steamID.getSteamID64(),
+                    routing_appid: 730
+                }
+            },
+            protoEncode(Protos.csgo.CMsgClientMMSSetLobbyData, {
+                app_id: 730,
+                steam_id_lobby: lobbyID,
+                steam_id_member: '0',
+                max_members: 10,
+                lobby_type: 1,
+                lobby_flags: 1,
+                metadata: encode({
+                    'game:ark': '0',
+                    // Country/Message
+                    'game:loc': '',
+                    'game:mapgroupname': 'mg_de_mirage',
+                    'game:mode': 'competitive',
+                    'game:prime': '1',
+                    'game:type': 'classic',
+                    'members:numPlayers': '1',
+                    'options:action': 'custommatch',
+                    'options:anytypemode': '0',
+                    'system:access': 'private',
+                    'system:network': 'LIVE',
+                    uids: [steamClient.steamID]
+                }, [0x00, 0x00], [0x08], {uids: encodeUids}).toBuffer()
+            })
+        );
+
+        return new Promise(resolve => {
+            const timeout = setTimeout(function () {
+                delete steamClient._handlerManager._handlers[Protos.csgo.EMsg.k_EMsgClientMMSSetLobbyDataResponse];
+                resolve()
+            }, 60000)
+            //ClientMMSLobbyData
+            steamClient._handlerManager.add(Protos.csgo.EMsg.k_EMsgClientMMSSetLobbyDataResponse, (payload) => {
+                clearTimeout(timeout)
+                delete steamClient._handlerManager._handlers[Protos.csgo.EMsg.k_EMsgClientMMSSetLobbyDataResponse];
+                const result = protoDecode(Protos.csgo.CMsgClientMMSSetLobbyDataResponse, payload.toBuffer())
+                const steam_id_lobby = result.steam_id_lobby.toString();
+                resolve(steam_id_lobby);
+            });
+        })
     }
 
     async function invite2Lobby(lobbyID, steamId) {
+        steamClient._send(
+            {
+                msg: Protos.csgo.EMsg.k_EMsgClientMMSInviteToLobby,
+                proto: {
+                    steamid: steamClient.steamID.getSteamID64(),
+                    routing_appid: 730
+                }
+            },
+            protoEncode(Protos.csgo.CMsgClientMMSInviteToLobby, {
+                app_id: 730,
+                steam_id_lobby: lobbyID,
+                steam_id_user_invited: steamId,
+            })
+        );
+
+
         const accountid = new SteamID(steamId).accountid;
         // lobbyID = new SteamID(lobbyID).accountid;
 
         // Protos.csgo.EMsg.k_EMsgGCHInviteUserToLobby
         // Protos.csgo.EMsg.k_EMsgClientMMSInviteToLobby
-        steamClient.sendToGC(730, Protos.csgo.EMsg.k_EMsgClientMMSInviteToLobby, {}, protoEncode(Protos.csgo.CMsgClientMMSInviteToLobby, {
-            app_id: 730,
-            steam_id_lobby: lobbyID,
-            steam_id_user_invited: accountid,
-        }), function (...args) {
-            console.log("invite2Lobby response", args)
-        })
+        // steamClient.sendToGC(730, Protos.csgo.EMsg.k_EMsgClientMMSInviteToLobby, {}, protoEncode(Protos.csgo.CMsgClientMMSInviteToLobby, {
+        //     app_id: 730,
+        //     steam_id_lobby: lobbyID,
+        //     steam_id_user_invited: accountid,
+        // }), function (...args) {
+        //     console.log("invite2Lobby response", args)
+        // })
     }
 
 
@@ -861,6 +940,7 @@ function SteamClient({
                     }
                     case Protos.csgo.EMsg.k_EMsgClientMMSCreateLobbyResponse: {
                         const result = protoDecode(Protos.csgo.CMsgClientMMSCreateLobbyResponse, payload)
+                        console.log("k_EMsgClientMMSCreateLobbyResponse", result);
                         break
                     }
                     case Protos.csgo.ECsgoGCMsg.k_EMsgGCCStrike15_v2_ClientGCRankUpdate: {
@@ -1141,7 +1221,11 @@ function SteamClient({
                 callEvent(events.playingState, {playing_blocked, playing_app})
             },
             async friendRelationship(sid, relationship, previousRelationship) {
-                callEvent(events.friendRelationship, {steamId: sid.getSteamID64(), relationship, previousRelationship})
+                callEvent(events.friendRelationship, {
+                    steamId: sid.getSteamID64(),
+                    relationship,
+                    previousRelationship
+                })
                 switch (relationship) {
                     case EFriendRelationship.None: {
                         //we got unfriended.
@@ -1781,6 +1865,7 @@ function SteamClient({
         partySearch,
         invite2Lobby,
         createLobby,
+        updateLobby,
         joinLobby,
         partyRegister,
         requestCoPlays,

package/bufferHelpers.js

@@ -0,0 +1,115 @@
+import ByteBuffer from 'bytebuffer';
+import SteamID from 'steamid';
+
+const Type = {
+    None : 0,
+    String : 1,
+    Int32 : 2,
+    Float32 : 3,
+    Pointer : 4,
+    WideString : 5,
+    Color : 6,
+    UInt64 : 7,
+    End : 8
+}
+
+// Encodes an object into a ByteBuffer
+export const encode = (
+    _object,
+    prefix = [0x00, 0x00],
+    suffix = [],
+    customEncodeFields = {}
+) => {
+    // Create a copy of the input object to avoid modifying it
+    const object = { ..._object };
+    const buffer = new ByteBuffer();
+
+    // Write the prefix bytes to the buffer
+    for (let pre of prefix) {
+        buffer.writeByte(pre);
+    }
+
+    // Iterate through the object's properties and encode them
+    for (let item in object) {
+        if (object.hasOwnProperty(item) === false) {
+            continue;
+        }
+
+        // If a custom encoder function exists for the property, use it
+        if (typeof customEncodeFields[item] === 'function') {
+            object[item] = customEncodeFields[item](object[item]);
+        }
+        _encode(object[item], buffer, item);
+    }
+
+    // Write the suffix bytes to the buffer
+    for (let suf of suffix) {
+        buffer.writeByte(suf);
+    }
+
+    // Write an End marker to the buffer
+    buffer.writeByte(Type.End);
+    buffer.flip(); // Prepare the buffer for reading
+    return buffer;
+};
+
+// Encodes individual properties into the ByteBuffer
+const _encode = (object, buffer, name) => {
+    if (object instanceof Buffer) {
+        // If the object is a Buffer
+        buffer.writeByte(Type.String);
+        buffer.writeCString(name);
+
+        // Convert the Buffer to a hexadecimal string, split into 2-character parts, and write each part as a byte
+        let parts = object
+            .toString('hex')
+            .toUpperCase()
+            .match(/.{1,2}/g);
+
+        for (let part of parts) {
+            buffer.writeByte(parseInt('0x' + part));
+        }
+    } else {
+        // If the object is not a Buffer, check its type
+        switch (typeof object) {
+            case 'object': {
+                buffer.writeByte(Type.None);
+                buffer.writeCString(name);
+
+                for (let index in object) {
+                    _encode(object[index], buffer, index); // Recursively encode each property
+                }
+
+                buffer.writeByte(Type.End);
+                break;
+            }
+            case 'string': {
+                buffer.writeByte(Type.String);
+                buffer.writeCString(name);
+                buffer.writeCString(object ? object : '');
+                break;
+            }
+            case 'number': {
+                buffer.writeByte(Type.String);
+                buffer.writeCString(name);
+                buffer.writeCString(object.toString());
+                break;
+            }
+        }
+    }
+};
+
+// Encodes SteamIDs into a Buffer
+export const encodeUids = (steamids) => {
+    const outputBuffer = [];
+
+    for (let id of steamids.map((s) => s.accountid)) {
+        while (id > 0x7f) {
+            outputBuffer.push((id | 0x80) & 0xff);
+            id >>= 7;
+        }
+        outputBuffer.push(id);
+    }
+    outputBuffer.push(0x00); // Null terminator
+    return Buffer.from(outputBuffer);
+};

package/index.js

@@ -5816,17 +5816,18 @@ class SteamUser {
 
         $('.profile_subpage_selector > a').each(function () {
             const text = $(this).text()
-            const link = $(this).attr('href')
+            const link = _.trimEnd($(this).attr('href'), '/')
             let count = 0
             let offer = {}
             if (text.includes('(') && text.includes(')')) {
                 count = parseInt(text.split('(')[1].split(')')[0].trim())
             }
-            if (text.startsWith('Incoming Offers')) {
+            if (link.endsWith('tradeoffers')) {
                 offer = IncomingOffers
-            } else if (text.startsWith('Sent Offers')) {
+            } else if (link.endsWith('tradeoffers/sent')) {
                 offer = SentOffers
             } else {
+                console.error("getTradeOffer", link);
                 //invalid text
             }
             offer.link = link
@@ -5841,30 +5842,65 @@ class SteamUser {
         $('.profile_leftcol > .tradeoffer').each(function () {
             const $1 = $(this);
             const id = $1.attr('id')
-            if (id.startsWith('tradeofferid_')) {
-                const tradeofferid = parseInt(id.split('tradeofferid_')[1])
-                let partner = $1.html().split('ReportTradeScam(')[1].split(');')[0].trim()
-                for (const s of [`"`, `'`, `"`]) {
-                    partner = _.trim(partner, s);
-                }
-                const partnerSteamId = partner.split(`',`)[0].trim()
-                let partnerName = partner.split(`', "`)[1].trim();
-                const playerAvatar = $1.find('.playerAvatar')
-                const avatar = playerAvatar.find('img')?.attr('src')
-                const link = playerAvatar.find('a')?.attr('href')
-                const header = StringUtils.cleanSpace($1.find('.tradeoffer_header').text())
-                const active = $1.find('.tradeoffer_items_ctn').hasClass("active")
-
-                tradeOffers.push({
-                    tradeofferid, partner: {
-                        steamId: partnerSteamId,
-                        name: partnerName,
-                        avatar,
-                        link,
-                        header,
-                    },
-                })
+            if (!id.startsWith('tradeofferid_')) {
+                return;
             }
+            const tradeofferid = parseInt(id.split('tradeofferid_')[1])
+            if(!tradeofferid){
+                return
+            }
+            let partner = $1.html().split('ReportTradeScam(')[1].split(');')[0].trim()
+            for (const s of [`"`, `'`, `"`]) {
+                partner = _.trim(partner, s);
+            }
+            const partnerSteamId = partner.split(`',`)[0].trim()
+            const partnerName = partner.split(`', "`)[1].trim();
+            const playerAvatar = $1.find('.playerAvatar')
+            const avatar = playerAvatar.find('img')?.attr('src')
+            const link = playerAvatar.find('a')?.attr('href')
+            const header = StringUtils.cleanSpace($1.find('.tradeoffer_header').text())
+            const active = $1.find('.tradeoffer_items_ctn').hasClass("active")
+            const tradeoffer_items_primary = $1.find('.tradeoffer_items_ctn .tradeoffer_items.primary')
+            const tradeoffer_items_secondary = $1.find('.tradeoffer_items_ctn .tradeoffer_items.secondary')
+            const primarySteamId = (SteamID.fromIndividualAccountID(parseInt(tradeoffer_items_primary.find("a.tradeoffer_avatar").attr("data-miniprofile")))).getSteamID64()
+            const primaryItems = [...tradeoffer_items_primary.find(".tradeoffer_item_list > .trade_item")].map(function (el) {
+                el = $(el)
+                const economyItem = el.attr("data-economy-item")//classinfo/730/310777338/302028390
+                const img = el.find("img").attr("src")
+                return {
+                    economyItem,
+                    img
+                }
+            })
+            const secondarySteamId = (SteamID.fromIndividualAccountID(parseInt(tradeoffer_items_secondary.find("a.tradeoffer_avatar").attr("data-miniprofile")))).getSteamID64()
+            const secondaryItems = [...tradeoffer_items_secondary.find(".tradeoffer_item_list > .trade_item")].map(function (el) {
+                el = $(el)
+                const economyItem = el.attr("data-economy-item")//classinfo/730/310777338/302028390
+                const img = el.find("img").attr("src")
+                return {
+                    economyItem,
+                    img
+                }
+            })
+            tradeOffers.push({
+                tradeofferid,
+                partner: {
+                    steamId: partnerSteamId,
+                    name: partnerName,
+                    avatarHash: SteamUser.GetAvatarHashFromURL(avatar),
+                    link,
+                    header,
+                },
+                active,
+                primary: {
+                    steamId: primarySteamId,
+                    items: primaryItems
+                },
+                secondary: {
+                    steamId: secondarySteamId,
+                    items: secondaryItems
+                }
+            })
         })
 
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "steamutils",
-  "version": "1.3.25",
+  "version": "1.3.27",
   "main": "index.js",
   "dependencies": {
     "alpha-common-utils": "^1.0.5",