steamutils 1.3.36 → 1.3.38

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

@@ -611,13 +611,38 @@ function SteamClient({
 
     async function joinLobby(lobbyID) {
         log("joinLobby", lobbyID);//SteamID.fromIndividualAccountID(lobbyId).accountid
-        steamClient.sendToGC(730, Protos.csgo.EMsg.k_EMsgClientMMSJoinLobby, {}, protoEncode(Protos.csgo.CMsgClientMMSJoinLobby, {
-            app_id: 730,
-            steam_id_lobby: lobbyID,
-            persona_name: steamClient.accountInfo.name,
-        }), function (...args) {
-            log("joinLobby response", args)
-        })
+
+        steamClient._send(
+            {
+                msg: Protos.csgo.EMsg.k_EMsgClientMMSJoinLobby,
+                proto: {
+                    steamid: steamClient.steamID.getSteamID64(),
+                    routing_appid: 730
+                }
+            },//CMsgClientMMSUserJoinedLobby CMsgClientMMSJoinLobby
+            protoEncode(Protos.csgo.CMsgClientMMSJoinLobby, {
+                app_id: 730,
+                steam_id_lobby: lobbyID,
+                persona_name: steamClient.accountInfo.name,
+            }),
+            function (payload) {
+                const result = protoDecode(Protos.csgo.CMsgClientMMSJoinLobbyResponse, payload.toBuffer())
+                result.steam_id_lobby = result.steam_id_lobby.toString()
+                result.steam_id_owner = result.steam_id_owner.toString()
+                console.log(result);
+                const resultExample = {
+                    members: [],
+                    app_id: 730,
+                    steam_id_lobby: "3641224920",
+                    chat_room_enter_response: 2,
+                    max_members: 0,
+                    lobby_type: 0,
+                    lobby_flags: 0,
+                    steam_id_owner: "0",
+                    metadata: null//Buffer
+                }
+            }
+        )
     }
 
     async function sendHello() {
@@ -1632,8 +1657,12 @@ function SteamClient({
             log(reconnect ? 'reconnect with cookie' : 'login with cookie')
             const _clientJsToken = await new SteamUtils(typeof cookie === "function" ? await cookie() : cookie).getClientJsToken()
             if (_clientJsToken?.logged_in === true) {
-                steamClient.logOn(_clientJsToken)
-                return true
+                try {
+                    await steamClient.logOn(_clientJsToken)
+                    return true
+                } catch (e) {
+                    return false
+                }
             } else {
                 return false
             }

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