steamutils 1.3.37 → 1.3.39

package/SteamClient.js

@@ -111,6 +111,11 @@ function SteamClient({
     const ownedApps = []
     let logOffEvent = null
 
+    const currentLobby = {
+        lobbyID: null,
+        timestamp: 0
+    }
+
     const onAnyCallbacks = []
 
     const events = {
@@ -467,7 +472,10 @@ function SteamClient({
                 }), function (payload) {
                     clearTimeout(timeout)
                     const result = protoDecode(Protos.csgo.CMsgClientMMSCreateLobbyResponse, payload.toBuffer())
-                    resolve(result.steam_id_lobby.toString())
+                    const steam_id_lobby = result.steam_id_lobby.toString();
+                    currentLobby.lobbyID = steam_id_lobby
+                    currentLobby.timestamp = new Date().getTime()
+                    resolve(steam_id_lobby)
                 }
             );
         })
@@ -532,7 +540,10 @@ function SteamClient({
                 function (payload) {
                     clearTimeout(timeout)
                     const result = protoDecode(Protos.csgo.CMsgClientMMSSetLobbyDataResponse, payload.toBuffer())
-                    resolve(result.steam_id_lobby.toString())
+                    const steam_id_lobby = result.steam_id_lobby.toString();
+                    currentLobby.lobbyID = steam_id_lobby
+                    currentLobby.timestamp = new Date().getTime()
+                    resolve(steam_id_lobby)
                 }
             );
         })
@@ -575,6 +586,28 @@ function SteamClient({
         // })
     }
 
+    async function createThenInvite2Lobby(steamIds) {
+        if (!steamClient.steamID) {
+            return
+        }
+
+        if(!Array.isArray(steamIds)){
+            steamIds = [steamIds]
+        }
+
+        let lobbyID = null
+        if (currentLobby.lobbyID && currentLobby.timestamp > new Date().getTime() - 30000) {//30 seconds
+            lobbyID = currentLobby.lobbyID
+        } else {
+            lobbyID = await createLobby();
+            lobbyID = await updateLobby(lobbyID)
+        }
+
+        for (const steamId of steamIds) {
+           await invite2Lobby(lobbyID, steamId)
+        }
+    }
+
 
     async function getLobbyData(lobbyID) {
         if (!steamClient.steamID) {
@@ -611,13 +644,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 +1690,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
             }
@@ -2006,6 +2068,7 @@ function SteamClient({
         invite2Lobby,
         createLobby,
         updateLobby,
+        createThenInvite2Lobby,
         joinLobby,
         getLobbyData,
         partyRegister,
@@ -2189,7 +2252,10 @@ function SteamClient({
             steamClient.uploadRichPresence(appid, richPresence)
         },
         getUserOwnedApps,
-        getPlayingAppIds
+        getPlayingAppIds,
+        getCurrentLobby(){
+            return currentLobby
+        }
     }
 }
 

package/index.js

@@ -18,7 +18,7 @@ import fs from "fs";
 import FormData from "form-data";
 import {StringUtils} from "alpha-common-utils/index.js";
 import * as https from "https";
-import sharp from "sharp";
+import Jimp from "jimp";
 import path from "path";
 
 const MAX_RETRY = 10
@@ -6245,7 +6245,7 @@ class SteamUser {
     }
 
     async beginFileUpload(filePath) {
-        const metadata = await new sharp(filePath).metadata()
+        const image = await Jimp.read(filePath)
         const stats = fs.statSync(filePath)
 
         let sha1 = "";
@@ -6258,9 +6258,9 @@ class SteamUser {
             file_size: stats.size,
             file_name: path.basename(filePath),
             file_sha: sha1,
-            file_image_width: metadata.width,
-            file_image_height: metadata.height,
-            file_type: "image/" + metadata.format,
+            file_image_width: image.getWidth(),
+            file_image_height: image.getHeight(),
+            file_type: image.getMIME(),
             sessionid: this.getSessionid()
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "steamutils",
-  "version": "1.3.37",
+  "version": "1.3.39",
   "main": "index.js",
   "dependencies": {
     "alpha-common-utils": "^1.0.5",
@@ -10,11 +10,11 @@
     "crypto-js": "^4.2.0",
     "csgo-friendcode": "^3.0.3",
     "form-data": "^4.0.0",
+    "jimp": "^0.22.10",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "moment-timezone": "^0.5.44",
     "node-bignumber": "^1.2.2",
-    "sharp": "^0.33.2",
     "steam-session": "^1.7.2",
     "steam-user": "^5.0.7",
     "steamcommunity": "^3.48.2",