steamutils 1.2.8 → 1.2.10

package/SteamClient.js

@@ -373,13 +373,42 @@ function SteamClient({
         steamClient.on('disconnected', async (eresult, msg) => {
             state = 'Offline'
             log('disconnected', eresult, msg)
-            doClearIntervals()
+
             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 false
+                    } else {
+                        const isSuccess = await login(true)
+                        if (isSuccess) {
+                            const loggedOnResponse = await new Promise(resolve => {
+                                onEvent('loggedOn', function (loggedOnResponse) {
+                                    resolve(loggedOnResponse)
+                                }, true, 120000)
+                            })
+                            if (loggedOnResponse) {
+                                console.log("Relogin success")
+                                return true
+                            } else {
+                                return await relogin(retry - 1)
+                            }
+                        } else {
+                            await sleep(60000)
+                            return await relogin(retry - 1)
+                        }
+                    }
+                }
+
+                await sleep(60000)
+                const isSuccess = await relogin(10)
+                if (!isSuccess) {
+                    doClearIntervals()
+                }
+            } else {
+                doClearIntervals()
             }
         })
         steamClient.on('error', async (e) => {
@@ -720,7 +749,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)
@@ -1031,23 +1060,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)
                 if(!newCookie){
-                    console.log("Cannot get new cookie")
+                    console.error("Cannot get new cookie")
+                    return null
+                } else {
+                    return await loginWithCookie(newCookie, true)
                 }
-                return newCookie && await loginWithCookie(newCookie, true)
             }
         }
     }
@@ -1058,12 +1087,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.08",
+  "version": "1.2.10",
   "main": "index.js",
   "dependencies": {
     "axios": "^1.3.4",