steamutils 1.2.51 → 1.2.53

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

@@ -5,7 +5,7 @@ import {protoDecode, protoEncode} from "./helpers/util.js";
 import SteamID from "steamid";
 import FriendCode from "csgo-friendcode";
 import axios from "axios";
-import helpers from "./helpers/protos.js";
+import helpers, {loadProfos} from "./helpers/protos.js";
 import {fileURLToPath} from "url";
 import path from "path";
 import SteamUtils from "./index.js";
@@ -19,7 +19,7 @@ const __dirname = path.dirname(__filename);
 
 const Protos = helpers([{
     name: 'csgo',
-    protos: fs.readdirSync(__dirname + '/protos/').filter(s => s.endsWith('.proto')).map(s => __dirname + '/protos/' + s)
+    protos: loadProfos(__dirname + '/protos/')
 }])
 
 export const RANKS = {
@@ -69,6 +69,7 @@ export const LOCS = {
     20301: 'HK/MO',//hongkong or macau
     21333: 'Unknown',
     21825: 'AU',
+    20034: 'Unkown',
 }
 
 
@@ -364,7 +365,8 @@ function SteamClient({
                                    game_type = 'Competitive',
                                    rank = 'Silver Elite',
                                    timeout = 10000,
-                               }) {
+                               } = {}) {
+        return []
 
         return new Promise(resolve => {
             steamClient.sendToGC(appid, Protos.csgo.ECsgoGCMsg.k_EMsgGCCStrike15_v2_Party_Search, {}, protoEncode(Protos.csgo.CMsgGCCStrike15_v2_Party_Search, {
@@ -388,7 +390,7 @@ function SteamClient({
             lobby_type: ELobbyType.Public,
             lobby_flags: 1,
             cell_id: steamClient.cellID,
-            public_ip: {
+            public_ip: steamClient.logOnResult?.public_ip || {
                 v4: steamClient.publicIP,
             },
             persona_name_owner: steamClient.accountInfo.name,
@@ -413,13 +415,13 @@ function SteamClient({
 
 
     async function joinLobby(lobbyID) {
-        console.log("joinLobby", lobbyID.accountid);
+        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.accountid,
+            steam_id_lobby: lobbyID,
             persona_name: steamClient.accountInfo.name,
         }), function (...args) {
-            console.log("joinLobby response", args)
+            log("joinLobby response", args)
         })
     }
 
@@ -539,12 +541,14 @@ function SteamClient({
                 case Protos.csgo.ECsgoGCMsg.k_EMsgGCCStrike15_v2_Party_Invite: {
                     const msg = protoDecode(Protos.csgo.CMsgGCCStrike15_v2_Party_Invite, payload);
                     const sid64 = SteamID.fromIndividualAccountID(msg.accountid).getSteamID64();
-                    const personas = await getPersonas([sid64]);
-                    const player_name = personas.find(p => p.id == sid64)?.player_name
-                    if (player_name === undefined) {
-                        log(sid64, personas);
+                    if (events.partyInvite?.length) {
+                        const personas = await getPersonas([sid64]);
+                        const player_name = personas.find(p => p.id == sid64)?.player_name
+                        if (player_name === undefined) {
+                            log(sid64, personas);
+                        }
+                        callEvent(events.partyInvite, {player_name, steamId: sid64, lobbyId: msg.lobbyid})
                     }
-                    callEvent(events.partyInvite, {player_name, steamId: sid64})
                     // log(player_name, `https://steamcommunity.com/profiles/${sid64}`);
                     // joinLobby(msg.lobbyid, msg.accountid)
                     break
@@ -1373,6 +1377,7 @@ function SteamClient({
 
 
     function partyRegister() {
+        return;
         if (prime === null) {
             _partyRegister(true)
             _partyRegister(false)
@@ -1626,6 +1631,7 @@ function SteamClient({
         partySearch,
         invite2Lobby,
         createLobby,
+        joinLobby,
         partyRegister,
         requestCoPlays,
         getPersonas,

package/example.js

@@ -1,6 +1,7 @@
 import SteamUser from "./index.js";
 import axios from "axios";
 import * as cherrio from "cheerio";
+import SteamClient from "./SteamClient.js";
 
 (async function () {
     // const loginResult = await SteamUser.communityLogin({

package/helpers/protos.js

@@ -1,6 +1,10 @@
 import Protobuf from "protobufjs";
 import fs from "fs";
 import path from "path";
+import {fileURLToPath} from "url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 
 export default function Protos(protos, ignoreErrors = true) {
     const protobufs = {};
@@ -31,3 +35,20 @@ export default function Protos(protos, ignoreErrors = true) {
 
     return protobufs;
 }
+
+
+export function loadProfos(dir, protos = []) {
+    const currentDir = fs.readdirSync(dir);
+    for (const currentFile of currentDir) {
+        const _dir = path.join(dir, currentFile);
+        const isDirectory = fs.lstatSync(_dir).isDirectory()
+        if (isDirectory) {
+            loadProfos(_dir, protos)
+        } else {
+            if (currentFile.endsWith(".proto")) {
+                protos.push(_dir)
+            }
+        }
+    }
+    return protos
+}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "steamutils",
-  "version": "1.2.51",
+  "version": "1.2.53",
   "main": "index.js",
   "dependencies": {
-    "axios": "^1.4.0",
+    "axios": "^1.5.1",
     "cheerio": "^1.0.0-rc.12",
     "crypto-js": "^4.1.1",
     "csgo-friendcode": "^3.0.3",
@@ -11,14 +11,14 @@
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "node-bignumber": "^1.2.2",
-    "steam-session": "^1.2.3",
-    "steam-user": "^4.28.6",
+    "steam-session": "^1.3.4",
+    "steam-user": "^5.0.1",
     "steamcommunity": "^3.46.1",
     "steamid": "^2.0.0",
     "url-parse": "^1.5.10",
-    "uuid": "^9.0.0",
+    "uuid": "^9.0.1",
     "xml-js": "^1.6.11",
-    "xml2js": "^0.6.0"
+    "xml2js": "^0.6.2"
   },
   "type": "module"
 }