steamutils 1.3.32 → 1.3.34

package/.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

package/.idea/steamutils.iml

@@ -2,8 +2,8 @@
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
       <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
       <excludeFolder url="file://$MODULE_DIR$/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />

package/.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>

package/SteamClient.js

@@ -12,7 +12,6 @@ import SteamUtils from "./index.js";
 import {v4 as uuidv4} from 'uuid';
 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";
 
@@ -109,7 +108,6 @@ function SteamClient({
     let sendMessageTimestamp = 0
     let lastTimePartyRegister = 0
     let lastTimePartySearch = 0
-    const appsPlayed = []
     const ownedApps = []
     let logOffEvent = null
 
@@ -134,6 +132,7 @@ function SteamClient({
         gifts: [],
         playingState: [],
         emailInfo: [],
+        accountLimitations: [],
     }
 
     const gcCallback = {}
@@ -296,6 +295,10 @@ function SteamClient({
         return [steamClient?.accountInfo?.name, steamClient?._logOnDetails?.account_name].filter(Boolean).join(" - ")
     }
 
+    function getPersonaName() {
+        return steamClient?.accountInfo?.name
+    }
+
     function log(...msg) {
         const now = moment().tz('Asia/Ho_Chi_Minh').format("DD/MM/YYYY HH:mm:ss")
         console.log(`[${now}] [${getAccountInfoName()}]`, ...msg)
@@ -573,6 +576,39 @@ function SteamClient({
     }
 
 
+    async function getLobbyData(lobbyID) {
+        if (!steamClient.steamID) {
+            return
+        }
+
+        return new Promise(resolve => {
+            const timeout = setTimeout(function () {
+                resolve()
+            }, 30000)
+
+            steamClient._send(
+                {
+                    msg: Protos.csgo.EMsg.k_EMsgClientMMSGetLobbyData,
+                    proto: {
+                        steamid: steamClient.steamID.getSteamID64(),
+                        routing_appid: 730
+                    }
+                },
+                protoEncode(Protos.csgo.CMsgClientMMSGetLobbyData, {
+                    app_id: 730,
+                    steam_id_lobby: lobbyID.toString(),
+                }),
+                function (payload) {
+                    clearTimeout(timeout)
+                    const result = protoDecode(Protos.csgo.CMsgClientMMSLobbyData, payload.toBuffer())
+                    result.steam_id_lobby = result.steam_id_lobby.toString()
+                    resolve(result)
+                }
+            );
+        })
+    }
+
+
     async function joinLobby(lobbyID) {
         log("joinLobby", lobbyID);//SteamID.fromIndividualAccountID(lobbyId).accountid
         steamClient.sendToGC(730, Protos.csgo.EMsg.k_EMsgClientMMSJoinLobby, {}, protoEncode(Protos.csgo.CMsgClientMMSJoinLobby, {
@@ -739,6 +775,7 @@ function SteamClient({
                                     switch (cache_object.type_id) {
                                         case 1: {
                                             const result = protoDecode(Protos.csgo.CSOEconItem, object_data);
+                                            result.id = result.id.toNumber()
                                             break
                                         }
                                         case 2: {
@@ -776,9 +813,7 @@ function SteamClient({
                                                 prime = true
                                                 CSOEconGameAccountClient.prime = true
                                             }
-                                            if (CSOEconGameAccountClient) {
-                                                obj.GameAccountClient = CSOEconGameAccountClient
-                                            }
+                                            obj.GameAccountClient = CSOEconGameAccountClient
                                             break
                                         }
 
@@ -829,6 +864,15 @@ function SteamClient({
                                             const result = protoDecode(Protos.csgo.CSOQuestProgress, object_data);
                                             break
                                         }
+                                        case 4: {
+                                            const result = protoDecode(Protos.csgo.CSOAccountItemPersonalStore, object_data);
+                                            result.generation_time = result.generation_time * 1000
+                                            if (Array.isArray(result.items)) {
+                                                result.items = result.items.map(item => item.toNumber())
+                                            }
+                                            obj.personalStore = result
+                                            break
+                                        }
 
                                         default: {
                                             log("cache_object.type_id", cache_object.type_id);
@@ -925,7 +969,7 @@ function SteamClient({
                             player_cur_xp: 327684501,
                             player_xp_bonus_flags: 0
                         }
-                        if (result?.global_stats?.required_appid_version && result.global_stats.required_appid_version > CSGO_VER) {
+                        if (result?.global_stats?.required_appid_version && (!CSGO_VER || result.global_stats.required_appid_version > CSGO_VER)) {
                             CSGO_VER = result.global_stats.required_appid_version
                         }
                         callEvent(events.csgoClientHello, result)
@@ -1314,6 +1358,24 @@ function SteamClient({
             async emailInfo(address, validated) {
                 callEvent(events.emailInfo, {address, validated})
             },
+            async appLaunched() {
+                setTimeout(function () {
+                    state = getPlayingAppIds().length ? 'InGame' : (isInvisible ? "Invisible" : 'Online')
+                }, 1000)
+            },
+            async appQuit() {
+                setTimeout(function () {
+                    state = getPlayingAppIds().length ? 'InGame' : (isInvisible ? "Invisible" : 'Online')
+                }, 1000)
+            },
+            async accountLimitations(bis_limited_account, bis_community_banned, bis_locked_account, bis_limited_account_allowed_to_invite_friends) {
+                callEvent(events.accountLimitations, {
+                    limited: bis_limited_account,
+                    communityBanned: bis_community_banned,
+                    locked: bis_locked_account,
+                    canInviteFriends: bis_limited_account_allowed_to_invite_friends
+                })
+            },
         }
 
         const _chatEvents = {
@@ -1604,13 +1666,13 @@ function SteamClient({
         bindEvent()
         login()
 
-        steamClient._handlerManager.add(5480, function (payload) {
+        steamClient._handlerManager.add(Protos.csgo.EMsg.k_EMsgClientRequestedClientStats, function (payload) {
             const result = protoDecode(Protos.csgo.CMsgClientRequestedClientStats, payload.toBuffer())
             // console.log("CMsgClientRequestedClientStats", result);
         })
-        steamClient._handlerManager.add(6612, function (payload) {
+        steamClient._handlerManager.add(Protos.csgo.EMsg.k_EMsgClientMMSLobbyData, function (payload) {
             const result = protoDecode(Protos.csgo.CMsgClientMMSLobbyData, payload.toBuffer())
-            // console.log("CMsgClientMMSLobbyData", result);
+            // console.log("CMsgClientMMSLobbyData", result, result.metadata);
         })
     }
 
@@ -1794,7 +1856,7 @@ function SteamClient({
     }
 
     function updateFakeGameScore() {
-        if (isFakeGameScore && appsPlayed.some(a => (a.game_id || a) == 730)) {
+        if (isFakeGameScore && getPlayingAppIds().some(a => a == 730)) {
             doSetInterval(doFakeGameScore, [60000, 180000], 'uploadRichPresenceCSGO')
         } else {
             doClearInterval('uploadRichPresenceCSGO')
@@ -1826,15 +1888,7 @@ function SteamClient({
             apps = [apps]
         }
 
-        appsPlayed.length = 0
-        appsPlayed.push(...apps)
-
-        if (apps.length) {
-            state = 'InGame'
-        } else {
-            state = 'Online'
-        }
-        steamClient.gamesPlayed(appsPlayed);
+        steamClient.gamesPlayed(apps);
         await sleep(2000)
         // steamClient.setPersona(SteamUser.EPersonaState.Online)
         await sendHello()
@@ -1942,6 +1996,10 @@ function SteamClient({
         }
     }
 
+    function getPlayingAppIds() {
+        return steamClient._playingAppIds || []
+    }
+
     return {
         init,
         partySearch,
@@ -1949,6 +2007,7 @@ function SteamClient({
         createLobby,
         updateLobby,
         joinLobby,
+        getLobbyData,
         partyRegister,
         requestCoPlays,
         getPersonas,
@@ -1972,6 +2031,7 @@ function SteamClient({
             return steamClient
         },
         getAccountInfoName,
+        getPersonaName,
         async getPlayersProfile(steamId, retry = 3) {
             for (let i = 0; i < retry; i++) {
                 const profile = await getPlayersProfile(steamId)
@@ -2128,7 +2188,8 @@ function SteamClient({
             }
             steamClient.uploadRichPresence(appid, richPresence)
         },
-        getUserOwnedApps
+        getUserOwnedApps,
+        getPlayingAppIds
     }
 }
 

package/bufferHelpers.js

@@ -1,115 +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);
-};
+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);
+};