steamutils 1.2.80 → 1.2.83

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

@@ -75,7 +75,7 @@ export const LOCS = {
 
 
 const appid = 730
-export let CSGO_VER = 13958
+export let CSGO_VER = 13960
 const FreeAppList = JSON.parse(fs.readFileSync(path.join(__dirname, 'free_packages.json'))).packages
 
 // SteamUtils.GetCurrentVersion(appid).then(function (ver) {
@@ -88,7 +88,9 @@ function SteamClient({
                          username,
                          password,
                          cookie,
+                         clientJsToken,
                          isAutoRequestFreeLicense = true,
+                         isFakeGameScore = true,
                          isPartyRegister = true,
                          autoPlay = false,
                          autoAcceptTradeRequest = false,
@@ -103,6 +105,7 @@ function SteamClient({
     let sendMessageTimestamp = 0
     let lastTimePartyRegister = 0
     let lastTimePartySearch = 0
+    let appsPlayed = []
 
     const onAnyCallbacks = []
 
@@ -443,7 +446,7 @@ function SteamClient({
 
 
     function bindEvent() {
-        const events = {
+        const _events = {
             async disconnected(eresult, msg) {
                 state = 'Offline'
                 log('disconnected', eresult, msg)
@@ -1139,7 +1142,7 @@ function SteamClient({
             }
         }
 
-        const chatEvents = {
+        const _chatEvents = {
             async friendMessage(data) {
                 if (!data) return
                 data.message_no_bbcode = data.message_no_bbcode?.replaceAll(`ː`, `:`)
@@ -1225,12 +1228,13 @@ function SteamClient({
             }
         }
 
-        for (const name in events) {
-            steamClient.on(name, events[name])
+
+        for (const [name, _event] of Object.entries(_events)) {
+            steamClient.on(name, _event)
         }
 
-        for (const name in chatEvents) {
-            steamClient.chat.on(name, chatEvents[name])
+        for (const [name, _event] of Object.entries(_chatEvents)) {
+            steamClient.chat.on(name, _event)
         }
     }
 
@@ -1349,7 +1353,11 @@ function SteamClient({
     }
 
     async function login(reconnect = false) {
-        if (cookie) {
+        if (clientJsToken?.logged_in) {
+            log(reconnect ? 'reconnect with clientJsToken' : 'login with clientJsToken')
+            steamClient.logOn(clientJsToken)
+            return true
+        } else if (cookie) {
             log(reconnect ? 'reconnect with cookie' : 'login with cookie')
             const newCookie = await loginWithCookie(cookie)
             if (newCookie) {
@@ -1481,100 +1489,104 @@ function SteamClient({
         gamesPlayed(appid)
     }
 
+    function doFakeGameScore() {
+        const maxRound = Math.random() > 0.7 ? 16 : 12
+        const maps = [
+            "ar_baggage",
+            "ar_dizzy",
+            "ar_monastery",
+            "ar_shoots",
+            "cs_agency",
+            "cs_assault",
+            "cs_italy",
+            "cs_militia",
+            "cs_office",
+            "de_ancient",
+            "de_anubis",
+            "de_bank",
+            "de_boyard",
+            "de_cache",
+            "de_canals",
+            "de_cbble",
+            "de_chalice",
+            "de_dust2",
+            "de_inferno",
+            "de_lake",
+            "de_mirage",
+            "de_nuke",
+            "de_overpass",
+            "de_safehouse",
+            // "de_shortnuke",
+            "de_stmarc",
+            "de_sugarcane",
+            "de_train",
+            "de_tuscan",
+            "de_vertigo",
+            "dz_ember",
+            "dz_vineyard",
+            "gd_cbble",
+            "training1"
+        ]
+
+        if (richPresence.myScore === undefined) {
+            richPresence.myScore = _.random(0, maxRound)
+        }
+        if (richPresence.theirScore === undefined) {
+            richPresence.theirScore = _.random(0, maxRound)
+        }
+        if (richPresence.map === undefined) {
+            richPresence.map = maps[Math.floor(Math.random() * maps.length)]
+        }
+        if (richPresence.myScore === maxRound || richPresence.theirScore === maxRound) {
+            richPresence.myScore = 0
+            richPresence.theirScore = 0
+            richPresence.map = maps[Math.floor(Math.random() * maps.length)]
+        } else {
+            const isMyTeamWin = Math.random() > 0.5
+            if (isMyTeamWin) {
+                richPresence.myScore++
+            } else {
+                richPresence.theirScore++
+            }
+        }
+
+        const score = richPresence.myScore === 0 && richPresence.theirScore === 0 ? '' : `[ ${richPresence.myScore} : ${richPresence.theirScore} ]`
+        steamClient.uploadRichPresence(730, {
+            'game:state': 'game',
+            steam_display: '#display_GameKnownMapScore',
+            connect: '+gcconnectG082AA752',
+            version: CSGO_VER.toString(),
+            'game:mode': 'competitive',
+            'game:map': richPresence.map,
+            'game:server': 'kv',
+            'watch': _.random(1, 5).toString(),
+            'game:score': score,
+        })
+    }
+
+    function updateFakeGameScore() {
+        if (isFakeGameScore && appsPlayed.some(a => (a.game_id || a) == 730)) {
+            doSetInterval(doFakeGameScore, [60000, 180000], 'uploadRichPresenceCSGO')
+        } else {
+            doClearInterval('uploadRichPresenceCSGO')
+        }
+    }
+
     async function gamesPlayed(apps) {
         if (!Array.isArray(apps)) {
             apps = [apps]
         }
+        appsPlayed = apps
         if (apps.length) {
             state = 'InGame'
         } else {
             state = 'Online'
         }
-        steamClient.gamesPlayed(apps);
+        steamClient.gamesPlayed(appsPlayed);
         await sleep(2000)
         // steamClient.setPersona(SteamUser.EPersonaState.Online)
         await sendHello()
-
-        const isLongGame = true
-        const maxRound = isLongGame ? 16 : 9
-
-        if (apps.some(a => (a.game_id || a) == 730)) {
-            doSetInterval(function () {
-                const maps = [
-                    "ar_baggage",
-                    "ar_dizzy",
-                    "ar_monastery",
-                    "ar_shoots",
-                    "cs_agency",
-                    "cs_assault",
-                    "cs_italy",
-                    "cs_militia",
-                    "cs_office",
-                    "de_ancient",
-                    "de_anubis",
-                    "de_bank",
-                    "de_boyard",
-                    "de_cache",
-                    "de_canals",
-                    "de_cbble",
-                    "de_chalice",
-                    "de_dust2",
-                    "de_inferno",
-                    "de_lake",
-                    "de_mirage",
-                    "de_nuke",
-                    "de_overpass",
-                    "de_safehouse",
-                    // "de_shortnuke",
-                    "de_stmarc",
-                    "de_sugarcane",
-                    "de_train",
-                    "de_tuscan",
-                    "de_vertigo",
-                    "dz_ember",
-                    "dz_vineyard",
-                    "gd_cbble",
-                    "training1"
-                ]
-
-                if (richPresence.myScore === undefined) {
-                    richPresence.myScore = _.random(0, maxRound)
-                }
-                if (richPresence.theirScore === undefined) {
-                    richPresence.theirScore = _.random(0, maxRound)
-                }
-                if (richPresence.map === undefined) {
-                    richPresence.map = maps[Math.floor(Math.random() * maps.length)]
-                }
-                if (richPresence.myScore === maxRound || richPresence.theirScore === maxRound) {
-                    richPresence.myScore = 0
-                    richPresence.theirScore = 0
-                    richPresence.map = maps[Math.floor(Math.random() * maps.length)]
-                } else {
-                    const isMyTeamWin = Math.random() > 0.5
-                    if (isMyTeamWin) {
-                        richPresence.myScore++
-                    } else {
-                        richPresence.theirScore++
-                    }
-                }
-
-                const score = richPresence.myScore === 0 && richPresence.theirScore === 0 ? '' : `[ ${richPresence.myScore} : ${richPresence.theirScore} ]`
-                steamClient.uploadRichPresence(730, {
-                    'game:state': 'game',
-                    steam_display: '#display_GameKnownMapScore',
-                    connect: '+gcconnectG082AA752',
-                    version: CSGO_VER.toString(),
-                    'game:mode': 'competitive',
-                    'game:map': richPresence.map,
-                    'game:server': 'kv',
-                    'watch': _.random(1, 5).toString(),
-                    'game:score': score,
-                })
-            }, [60000, 180000], 'uploadRichPresenceCSGO')
-        } else {
-            doClearInterval('uploadRichPresenceCSGO')
-        }
+        updateFakeGameScore()
 
         // await sleep(10000)
         // self.steamUser.uploadRichPresence(730, {
@@ -1675,6 +1687,10 @@ function SteamClient({
                 sendHello()
             }
         },
+        setFakeGameScore(_isFakeGameScore) {
+            isFakeGameScore = _isFakeGameScore
+            updateFakeGameScore()
+        },
         getState() {
             return state
         },