steamutils 1.2.9 → 1.2.11

package/SteamClient.js

@@ -199,7 +199,9 @@ function SteamClient({
             }
             intervalRandoms[key] = setTimeout(function () {
                 doSetInterval(cb, timeout, key)
-                cb()
+                if (state !== 'Offline') {
+                    cb()
+                }
             }, _.random(timeout[0], timeout[1]))
         } else {
             if (intervals[key] !== undefined) {
@@ -208,7 +210,12 @@ function SteamClient({
                 } catch (e) {
                 }
             }
-            intervals[key] = setInterval(cb, timeout)
+
+            intervals[key] = setInterval(function () {
+                if (state !== 'Offline') {
+                    cb()
+                }
+            }, timeout)
         }
 
         return key
@@ -373,34 +380,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) {
-
                 async function relogin(retry) {
                     if (retry <= 0) {
                         console.error("Cannot relogin")
-                        return
-                    }
-                    const isSuccess = await login(true)
-                    if (isSuccess) {
-                        onEvent('loggedOn', function (loggedOnResponse) {
+                        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 {
-                                relogin(retry - 1)
+                                return await relogin(retry - 1)
                             }
-                        }, true, 120000)
-                    } else {
-                        setTimeout(function () {
-                            relogin(retry - 1)
-                        }, 60000)
+                        } else {
+                            await sleep(60000)
+                            return await relogin(retry - 1)
+                        }
                     }
                 }
 
                 await sleep(60000)
-                await relogin(10)
+                const isSuccess = await relogin(10)
+                if (!isSuccess) {
+                    doClearIntervals()
+                }
+            } else {
+                doClearIntervals()
             }
         })
         steamClient.on('error', async (e) => {

package/package.json

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