steamutils 1.3.30 → 1.3.31

package/.idea/deployment.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PublishConfigData" remoteFilesAllowedToDisappearOnAutoupload="false">
+    <serverData>
+      <paths name="steamsupport">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="steamsupportui">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+    </serverData>
+  </component>
+</project>

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$/.tmp" />
       <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
       <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="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

package/SteamClient.js

@@ -442,36 +442,37 @@ function SteamClient({
             return
         }
 
-        steamClient._send(
-            {
-                msg: Protos.csgo.EMsg.k_EMsgClientMMSCreateLobby,
-                proto: {
-                    steamid: steamClient.steamID.getSteamID64(),
-                    routing_appid: 730
-                }
-            },
-            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);
-            });
+            }, 30000)
+
+            steamClient._send(
+                {
+                    msg: Protos.csgo.EMsg.k_EMsgClientMMSCreateLobby,
+                    proto: {
+                        steamid: steamClient.steamID.getSteamID64(),
+                        routing_appid: 730
+                    }
+                },
+                protoEncode(Protos.csgo.CMsgClientMMSCreateLobby, {
+                    app_id: 730,
+                    max_members: 1,
+                    lobby_type: 1,
+                    lobby_flags: 1
+                }), function (payload) {
+                    clearTimeout(timeout)
+                    const result = protoDecode(Protos.csgo.CMsgClientMMSCreateLobbyResponse, payload.toBuffer())
+                    resolve(result.steam_id_lobby.toString())
+                }
+            );
         })
 
+        // return await getHandlerResult(Protos.csgo.EMsg.k_EMsgClientMMSCreateLobbyResponse, function (payload) {
+        //     const result = protoDecode(Protos.csgo.CMsgClientMMSCreateLobbyResponse, payload.toBuffer())
+        //     return result.steam_id_lobby.toString()
+        // })
+
         // steamClient.sendToGC(730, Protos.csgo.EMsg.k_EMsgClientMMSCreateLobby, {
         //     steamid: steamClient.steamID,
         //     routing_appid: 730,
@@ -488,53 +489,54 @@ function SteamClient({
             return
         }
 
-        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);
-            });
+            }, 30000)
+
+            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()
+                }),
+                function (payload) {
+                    clearTimeout(timeout)
+                    const result = protoDecode(Protos.csgo.CMsgClientMMSSetLobbyDataResponse, payload.toBuffer())
+                    resolve(result.steam_id_lobby.toString())
+                }
+            );
         })
+
+        // return await getHandlerResult(Protos.csgo.EMsg.k_EMsgClientMMSSetLobbyDataResponse, function (payload) {
+        //     const result = protoDecode(Protos.csgo.CMsgClientMMSSetLobbyDataResponse, payload.toBuffer())
+        //     return result.steam_id_lobby.toString()
+        // })
     }
 
     async function invite2Lobby(lobbyID, steamId) {
@@ -554,11 +556,8 @@ function SteamClient({
                 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
@@ -704,7 +703,7 @@ function SteamClient({
                         break
                     }
                     case Protos.csgo.ECsgoGCMsg.k_EMsgClientMMSJoinLobbyResponse: {
-                        let msg = protoDecode(Protos.csgo.CMsgClientMMSJoinLobbyResponse, payload)
+                        const msg = protoDecode(Protos.csgo.CMsgClientMMSJoinLobbyResponse, payload);
                         log(msg)
                         break
                     }
@@ -925,6 +924,9 @@ 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) {
+                            CSGO_VER = result.global_stats.required_appid_version
+                        }
                         callEvent(events.csgoClientHello, result)
                         break
                     }
@@ -1341,18 +1343,15 @@ function SteamClient({
                 }
                 const timestamp = new Date(data.server_timestamp).getTime()
                 const steamId = data.steamid_friend.getSteamID64()
-                const personas = await getPersonas([steamId])
-                const player_name = personas.find(p => p.id == steamId)?.player_name || ''
                 const invite = [`Invited you to play a game!`, `Đã mời bạn chơi một trò chơi!`].includes(data.message_no_bbcode || data.message)
                 const emotion = (data.message_no_bbcode || '').split(' ').find(m => m.startsWith(':') && m.endsWith(':'))
 
                 callEvent(events.friendMessage, {
-                    player_name,
+                    ...data,
                     message: data.message_no_bbcode,
                     invite,
                     steamId,
                     timestamp,
-                    from_limited_account: data.from_limited_account,
                     emotion,
                 })
             },
@@ -1411,6 +1410,33 @@ function SteamClient({
         }
     }
 
+    function getHandlerResult(msg, handler) {
+        const timeout = {current: null}
+        return new Promise(resolve => {
+
+            function myhandler(...args) {
+                timeout.current && clearTimeout(timeout.current)
+                removeHandler()
+                resolve(handler?.(...args))
+            }
+
+            function removeHandler() {
+                if (Array.isArray(steamClient._handlerManager._handlers[msg])) {
+                    const index = steamClient._handlerManager._handlers[msg].findIndex(_handler => _handler === myhandler)
+                    if (index > -1) {
+                        steamClient._handlerManager._handlers[msg].splice(index, 1)
+                    }
+                }
+            }
+
+            timeout.current = setTimeout(function () {
+                removeHandler()
+                resolve()
+            }, 60000)
+            steamClient._handlerManager.add(msg, myhandler);
+        })
+    }
+
     function getFriendList() {
         return Object.keys(steamClient.myFriends).filter(steamId => steamClient.myFriends[steamId] === SteamUser.EFriendRelationship.Friend)
     }
@@ -1578,6 +1604,15 @@ function SteamClient({
     function init() {
         bindEvent()
         login()
+
+        steamClient._handlerManager.add(5480, function (payload) {
+            const result = protoDecode(Protos.csgo.CMsgClientRequestedClientStats, payload.toBuffer())
+            console.log("CMsgClientRequestedClientStats", result);
+        })
+        steamClient._handlerManager.add(6612, function (payload) {
+            const result = protoDecode(Protos.csgo.CMsgClientMMSLobbyData, payload.toBuffer())
+            console.log("CMsgClientMMSLobbyData", result);
+        })
     }
 
 

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);
+};