steamutils 1.0.22 → 1.0.24

package/SteamClient.js

@@ -587,21 +587,64 @@ function SteamClient({
         })
     }
 
-    async function login() {
-        if (cookie) {
-            console.log('login with cookie')
-            const result = (await axios.request({
-                url: 'https://steamcommunity.com/chat/clientjstoken', headers: {
+    async function getNewCookie(cookie){
+        let response = (await axios.request({
+            url: 'https://store.steampowered.com/', headers: {
+                cookie,
+                accept: "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
+            }
+        }))
+        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
+            }, {})
+            for (const mcookie of response.headers["set-cookie"]) {
+                const name = mcookie.split('=')[0].trim()
+                const value = mcookie.split('=')[1].split(";")[0].trim()
+                cookieObj[name] = value
+            }
+            cookie = Object.keys(cookieObj).map(name => `${name}=${cookieObj[name]}`).join(';')
+            response = (await axios.request({
+                url: 'https://store.steampowered.com/', headers: {
                     cookie,
+                    accept: "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
                 }
-            }))?.data
-            if (result?.logged_in) {
-                Object.assign(result, {
-                    steamID: new SteamID(result.steamid), accountName: result.account_name, webLogonToken: result.token
-                })
-                steamClient.logOn(result)
-            } else {
+            }))
+        }
+        return cookie
+    }
+
+
+    async function loginWithCookie(cookie, tryNewCookie = false) {
+        const response = (await axios.request({
+            url: 'https://steamcommunity.com/chat/clientjstoken', headers: {
+                cookie,
+            }
+        }))
+        const result = response?.data
+        if (result?.logged_in) {
+            Object.assign(result, {
+                steamID: new SteamID(result.steamid), accountName: result.account_name, webLogonToken: result.token
+            })
+            steamClient.logOn(result)
+            return cookie
+        } else {
+            if (tryNewCookie) {
                 console.log('You are not logged in', cookie)
+                return null
+            } else {
+                return await loginWithCookie(await getNewCookie(cookie), true)
+            }
+        }
+    }
+
+    async function login() {
+        if (cookie) {
+            console.log('login with cookie')
+            const newCookie = await loginWithCookie(cookie)
+            if (newCookie) {
+                cookie = newCookie
             }
         } else if (username && password) {
             console.log(`login with username ${username}`)
@@ -654,6 +697,12 @@ function SteamClient({
         getUsername() {
             return username
         },
+        getCookie() {
+            return cookie
+        },
+        getLogOnDetails() {
+            return steamClient?._logOnDetails
+        },
         onEvent(name, cb) {
             if (!events[name]) {
                 events[name] = []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "steamutils",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "dependencies": {
     "axios": "^1.3.4",
     "cheerio": "^1.0.0-rc.12",