steamutils 1.2.7 → 1.2.9

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

@@ -377,9 +377,30 @@ function SteamClient({
             callEvent(events.disconnected, {eresult, msg})
 
             if (eresult === 3 && autoReconnect && !isLogOff) {
-                setTimeout(function () {
-                    login(true)
-                }, 30000)
+
+                async function relogin(retry) {
+                    if (retry <= 0) {
+                        console.error("Cannot relogin")
+                        return
+                    }
+                    const isSuccess = await login(true)
+                    if (isSuccess) {
+                        onEvent('loggedOn', function (loggedOnResponse) {
+                            if (loggedOnResponse) {
+                                console.log("Relogin success")
+                            } else {
+                                relogin(retry - 1)
+                            }
+                        }, true, 120000)
+                    } else {
+                        setTimeout(function () {
+                            relogin(retry - 1)
+                        }, 60000)
+                    }
+                }
+
+                await sleep(60000)
+                await relogin(10)
             }
         })
         steamClient.on('error', async (e) => {
@@ -720,7 +741,7 @@ function SteamClient({
             steamClient.setPersona(SteamUser.EPersonaState.Online)
             state = 'Online'
             await sendHello()
-            callEvent(events.loggedOn)
+            callEvent(events.loggedOn, loggedOnResponse)
             if (isAutoRequestFreeLicense) {
                 doSetInterval(function () {
                     autoRequestFreeLicense(false, 50)
@@ -995,7 +1016,7 @@ function SteamClient({
         if(!response){
             return
         }
-        while (Array.isArray(response.headers?.["set-cookie"])) {
+        while (Array.isArray(response?.headers?.["set-cookie"])) {
             const cookieObj = cookie.split(';').reduce(function (accumulator, currentValue) {
                 accumulator[currentValue.trim().split('=')[0].trim()] = currentValue.trim().split('=')[1].trim()
                 return accumulator
@@ -1031,20 +1052,23 @@ function SteamClient({
 
         const result = response?.data
         if (result?.logged_in) {
-            console.log(`clientjstoken success`)
             Object.assign(result, {
                 steamID: new SteamID(result.steamid), accountName: result.account_name, webLogonToken: result.token
             })
             steamClient.logOn(result)
             return cookie
         } else {
-            console.log(`clientjstoken fail`)
             if (tryNewCookie) {
                 log('You are not logged in', cookie)
                 return null
             } else {
                 const newCookie = await getNewCookie(cookie)
-                return newCookie && await loginWithCookie(newCookie, true)
+                if(!newCookie){
+                    console.error("Cannot get new cookie")
+                    return null
+                } else {
+                    return await loginWithCookie(newCookie, true)
+                }
             }
         }
     }
@@ -1055,12 +1079,16 @@ function SteamClient({
             const newCookie = await loginWithCookie(cookie)
             if (newCookie) {
                 cookie = newCookie
+                return true
+            } else {
+                return false
             }
         } else if (username && password) {
             log(reconnect ? `reconnect with username ${username}` : `login with username ${username}`)
             steamClient.logOn({
                 accountName: username, password: password, rememberPassword: true, machineName: 'Natri',
             })
+            return true
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "steamutils",
-  "version": "1.2.07",
+  "version": "1.2.09",
   "main": "index.js",
   "dependencies": {
     "axios": "^1.3.4",