steamutils 1.1.16 → 1.1.17

package/example.js

@@ -1,14 +1,104 @@
 import SteamUser from "./index.js";
-import Steamutils from "./index.js";
+import axios from "axios";
+import * as cherrio from "cheerio";
 
 (async function () {
-    const loginResult = await SteamUser.communityLogin({
-        username: "abc",
-        password: "xyz",
-    })
-    console.log(loginResult.cookie);
-    const user = new SteamUser(loginResult.cookie)
-    const friendList = await user.turningSteamGuardOff()
-    // const friendList = await user.turningEmailAuthenticatorCheckOn()
-    console.log(friendList);
+    // const loginResult = await SteamUser.communityLogin({
+    //     username: "abc",
+    //     password: "xyz",
+    // })
+    // console.log(loginResult.cookie);
+    // const user = new SteamUser(loginResult.cookie)
+
+
+    // let cookies = `timezoneOffset=25200,0; _ga=GA1.2.187887660.1678676715; browserid=2823232875076552481; strInventoryLastContext=730_2; recentlyVisitedAppHubs=730%2C1859270; sessionid=83e614b63d78d0d2b4d93680; steamCountry=VN%7C3c7bd5df99a265a3e5102a225d1ab62d; steamLoginSecure=76561199040402348%7C%7CeyAidHlwIjogIkpXVCIsICJhbGciOiAiRWREU0EiIH0.eyAiaXNzIjogInI6MEQwM18yMjM1ODQ2MF8xM0YyNCIsICJzdWIiOiAiNzY1NjExOTkwNDA0MDIzNDgiLCAiYXVkIjogWyAid2ViIiBdLCAiZXhwIjogMTY4NTA2NTUzMiwgIm5iZiI6IDE2NzYzMzc4MDcsICJpYXQiOiAxNjg0OTc3ODA3LCAianRpIjogIjBEMkRfMjI5NkUxQkNfQzNERjUiLCAib2F0IjogMTY3ODY3NjgzMywgInJ0X2V4cCI6IDE2OTY4NjYxMDEsICJwZXIiOiAwLCAiaXBfc3ViamVjdCI6ICIxNC4yMzIuMjE0LjE4NiIsICJpcF9jb25maXJtZXIiOiAiMTQuMjMyLjIxNC4xODYiIH0.AhLuV9mQzv2j2CEgBe5ZpGyUqpHXogHFClfdsd3Ve7-Dt4aHagrJhOsgLewh1gmkO5ZewAN4FO4Y5S3D7u4FCw; webTradeEligibility=%7B%22allowed%22%3A1%2C%22allowed_at_time%22%3A0%2C%22steamguard_required_days%22%3A15%2C%22new_device_cooldown_days%22%3A0%2C%22time_checked%22%3A1684981543%7D; tsTradeOffersLastRead=1684321053`;
+    // const user = new SteamUser("timezoneOffset=25200,0; _ga=GA1.2.187887660.1678676715; browserid=2823232875076552481; strInventoryLastContext=730_2; recentlyVisitedAppHubs=730%2C1859270; sessionid=83e614b63d78d0d2b4d93680; steamCountry=VN%7C3c7bd5df99a265a3e5102a225d1ab62d; steamLoginSecure=76561199040402348%7C%7CeyAidHlwIjogIkpXVCIsICJhbGciOiAiRWREU0EiIH0.eyAiaXNzIjogInI6MEQwM18yMjM1ODQ2MF8xM0YyNCIsICJzdWIiOiAiNzY1NjExOTkwNDA0MDIzNDgiLCAiYXVkIjogWyAid2ViIiBdLCAiZXhwIjogMTY4NTA2NTUzMiwgIm5iZiI6IDE2NzYzMzc4MDcsICJpYXQiOiAxNjg0OTc3ODA3LCAianRpIjogIjBEMkRfMjI5NkUxQkNfQzNERjUiLCAib2F0IjogMTY3ODY3NjgzMywgInJ0X2V4cCI6IDE2OTY4NjYxMDEsICJwZXIiOiAwLCAiaXBfc3ViamVjdCI6ICIxNC4yMzIuMjE0LjE4NiIsICJpcF9jb25maXJtZXIiOiAiMTQuMjMyLjIxNC4xODYiIH0.AhLuV9mQzv2j2CEgBe5ZpGyUqpHXogHFClfdsd3Ve7-Dt4aHagrJhOsgLewh1gmkO5ZewAN4FO4Y5S3D7u4FCw; webTradeEligibility=%7B%22allowed%22%3A1%2C%22allowed_at_time%22%3A0%2C%22steamguard_required_days%22%3A15%2C%22new_device_cooldown_days%22%3A0%2C%22time_checked%22%3A1684981543%7D; tsTradeOffersLastRead=1684321053")
+    // const friendList = await user.getTradeURL()
+
+    function CookieManager(cookie) {
+        const _CookieObj = {}
+        if (typeof cookie === "string") {
+            cookie.split(";").forEach(function (_cookie) {
+                setCookie(_cookie.split("=")[0].trim(), _cookie.split("=")[1].trim())
+            })
+        } else if (Array.isArray(cookie)) {
+            cookie.forEach(function (_cookie) {
+                if (typeof _cookie === "string") {
+                    setCookie(_cookie.split("=")[0].trim(), _cookie.split("=")[1].trim())
+                } else {
+                    //to do
+                }
+            })
+        } else if (typeof cookie === "object" && Object.keys(cookie).length) {
+            for (const key in cookie) {
+                setCookie(key, cookie[key])
+            }
+        } else {
+            //to do
+        }
+
+        function setCookie(name, value) {
+            const existedKey = Object.keys(_CookieObj).find(k => k.toLowerCase() === name.toLowerCase())
+            if (existedKey) {
+                delete _CookieObj[existedKey]
+            }
+            _CookieObj[name] = value
+        }
+
+        function setCookies(cookies) {
+            if (Array.isArray(cookies)) {
+                for (let cookie of cookies) {
+                    if (typeof cookie === "string") {
+                        cookie = cookie.split(";")[0].trim()
+                        setCookie(cookie.split("=")[0].trim(), cookie.split("=")[1].trim())
+                    }
+                }
+            }
+        }
+
+        function getCookie(name) {
+            const existedKey = Object.keys(_CookieObj).find(k => k.toLowerCase() === name.toLowerCase())
+            return _CookieObj[existedKey]
+        }
+
+
+        function toString() {
+            return Object.keys(_CookieObj).map(k => `${k}=${_CookieObj[k]}`).join(';')
+        }
+
+        return {
+            setCookie,
+            setCookies,
+            getCookie,
+            toString,
+        }
+    }
+
+    const cookiesObj = new CookieManager("steamLoginSecure=76561199490333788%7C%7CeyAidHlwIjogIkpXVCIsICJhbGciOiAiRWREU0EiIH0.eyAiaXNzIjogInI6MEQyRF8yMjhEQTcxQV9DOEZGRCIsICJzdWIiOiAiNzY1NjExOTk0OTAzMzM3ODgiLCAiYXVkIjogWyAid2ViIiwgIm1vYmlsZSIgXSwgImV4cCI6IDE2ODUwNjY0MzgsICJuYmYiOiAxNjc2MzQwMDAwLCAiaWF0IjogMTY4NDk4MDAwMCwgImp0aSI6ICIwRDJCXzIyOTZFMUJGXzUyNEU2IiwgIm9hdCI6IDE2ODQzODUwODksICJydF9leHAiOiAxNzAyNzQzMDU3LCAicGVyIjogMCwgImlwX3N1YmplY3QiOiAiMTQuMjMyLjIxNC4xODYiLCAiaXBfY29uZmlybWVyIjogIjE0LjIzMi4yMTQuMTg2IiB9.t884pdEgtcWk8Apy1HrzhQixy0u-RQFM-qb3JuaYMZjCwTRXdCnOZFbCxFe2JesC5xfFttHe4ufqtyizcEmVDA")
+
+    let url = `my/tradeoffers/privacy`
+    while (true) {
+        const response = await axios({
+            baseURL: "https://steamcommunity.com",
+            url,
+            validateStatus: () => true,
+            headers: {
+                cookie: cookiesObj.toString()
+            },
+            maxRedirects: 0,
+        })
+        cookiesObj.setCookies(response.headers["set-cookie"])
+        if (response.status === 302) {
+            url = response.headers.location
+            console.log(`Redirect to ${url}`)
+        } else if (response.status === 200) {
+            const $ = cherrio.load(response.data)
+            const trade_offer_access_url = $('#trade_offer_access_url').attr('value')
+            console.log(trade_offer_access_url);
+            return response
+        } else {
+            console.log(response.status);
+        }
+    }
+
 })()

package/index.js

@@ -15,6 +15,7 @@ import { getTableHasHeaders, table2json } from './cheerio.js'
 import { getJSObjectFronXML } from './xml2json.js'
 import axios from 'axios'
 import url from 'url'
+import * as cherrio from "cheerio";
 
 const MAX_RETRY = 10
 export const MatchHistoryType = {
@@ -497,6 +498,65 @@ const EdaySinceLastBanRegExp = Object.freeze([
   '(\\d+) nap az utolsó kitiltás óta'])
 const SteamImageCDN = ['community.cloudflare.steamstatic.com', 'community.akamai.steamstatic.com'].map(cdn => `https://${cdn}`)
 
+function CookieManager(cookie) {
+  const _CookieObj = {}
+  if (typeof cookie === "string") {
+    cookie.split(";").forEach(function (_cookie) {
+      setCookie(_cookie.split("=")[0].trim(), _cookie.split("=")[1].trim())
+    })
+  } else if (Array.isArray(cookie)) {
+    cookie.forEach(function (_cookie) {
+      if (typeof _cookie === "string") {
+        setCookie(_cookie.split("=")[0].trim(), _cookie.split("=")[1].trim())
+      } else {
+        //to do
+      }
+    })
+  } else if (typeof cookie === "object" && Object.keys(cookie).length) {
+    for (const key in cookie) {
+      setCookie(key, cookie[key])
+    }
+  } else {
+    //to do
+  }
+
+  function setCookie(name, value) {
+    const existedKey = Object.keys(_CookieObj).find(k => k.toLowerCase() === name.toLowerCase())
+    if (existedKey) {
+      delete _CookieObj[existedKey]
+    }
+    _CookieObj[name] = value
+  }
+
+  function setCookies(cookies) {
+    if (Array.isArray(cookies)) {
+      for (let cookie of cookies) {
+        if (typeof cookie === "string") {
+          cookie = cookie.split(";")[0].trim()
+          setCookie(cookie.split("=")[0].trim(), cookie.split("=")[1].trim())
+        }
+      }
+    }
+  }
+
+  function getCookie(name) {
+    const existedKey = Object.keys(_CookieObj).find(k => k.toLowerCase() === name.toLowerCase())
+    return _CookieObj[existedKey]
+  }
+
+
+  function toString() {
+    return Object.keys(_CookieObj).map(k => `${k}=${_CookieObj[k]}`).join(';')
+  }
+
+  return {
+    setCookie,
+    setCookies,
+    getCookie,
+    toString,
+  }
+}
+
 class SteamUser {
   Steam_Language = ELanguage.english
 
@@ -512,27 +572,8 @@ class SteamUser {
     Public: 1,
   })
 
-  constructor (cookies, steamMachineAuth) {
-    this.setCookies(cookies, steamMachineAuth)
-  }
-
-  setSteamLanguage (language) {
-    language = language?.toLowerCase()
-    if (!Object.hasOwn(ELanguage, language)) {
-      return
-    }
-    this.Steam_Language = language
-    this._cookies = SteamUser.generateCookie({
-      ...SteamUser.parseCookie(this._cookies),
-      Steam_Language: this.Steam_Language,
-    })
-  }
-
-  setCookies (cookies, _steamMachineAuth) {
-    if (!cookies) {
-      return
-    }
-    cookies = Array.isArray(cookies) ? cookies.join(';') : cookies
+  constructor (cookies) {
+    this._cookies = new CookieManager(cookies)
 
     let {
       steamMachineAuth,
@@ -541,25 +582,13 @@ class SteamUser {
       steamID,
       miniprofile,
       sessionid,
-    } = SteamUser.parseCookie(cookies)
+    } = SteamUser.parseCookie(this._cookies.toString())
 
-    if (!steamMachineAuth && _steamMachineAuth) {
-      steamMachineAuth = _steamMachineAuth
-    }
     if (!sessionid) {
       sessionid = SteamUser.generateSessionID()
+      this._cookies.setCookie("sessionid", sessionid)
     }
 
-    this._cookies = SteamUser.generateCookie({
-      steamMachineAuth,
-      steamLoginSecure,
-      steamRememberLogin,
-      steamID,
-      miniprofile,
-      sessionid,
-      Steam_Language: this.Steam_Language,
-    })
-
     this._sessionid = sessionid
     this._steamid_user = steamID
     this._miniprofile_user = miniprofile
@@ -568,6 +597,15 @@ class SteamUser {
     this._steamRememberLogin = steamRememberLogin
   }
 
+  setSteamLanguage (language) {
+    language = language?.toLowerCase()
+    if (!Object.hasOwn(ELanguage, language)) {
+      return
+    }
+    this.Steam_Language = language
+    this._cookies.setCookie("Steam_Language", language)
+  }
+
   static parseCookie (cookies) {
     if (!Array.isArray(cookies)) {
       cookies = cookies.split(';')
@@ -618,7 +656,7 @@ class SteamUser {
   }
 
   getCookies () {
-    return this._cookies
+    return this._cookies.toString()
   }
 
   getSteamidUser () {
@@ -1377,21 +1415,8 @@ class SteamUser {
     }
 
     params.headers.set({
-      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.9',
-      'Accept-Language': 'en-US,en;q=0.9',
-      'Cache-Control': 'no-cache',
-      Connection: 'keep-alive',
-      Pragma: 'no-cache',
-      'Sec-Fetch-Dest': 'document',
-      'Sec-Fetch-Mode': 'navigate',
-      'Sec-Fetch-Site': 'none',
-      'Sec-Fetch-User': '?1',
-      'Upgrade-Insecure-Requests': '1',
       'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36',
-      'sec-ch-ua': '".Not/A)Brand";v="99", "Google Chrome";v="103", "Chromium";v="103"',
-      'sec-ch-ua-mobile': '?0',
-      'sec-ch-ua-platform': '"Windows"',
-      Cookie: this._cookies,
+      Cookie: this._cookies.toString(),
     })
 
     let referer = params.headers.get('referer')
@@ -1431,8 +1456,6 @@ class SteamUser {
   }
 
   async _httpRequest (params) {
-    let result = null,
-      i = 0
     params = this._formatHttpRequest(params)
 
     if (!this._cookies) {
@@ -1461,58 +1484,48 @@ class SteamUser {
       if (params.data instanceof URLSearchParams) {
         params.headers.set('content-type', 'application/x-www-form-urlencoded')
       }
-
     }
 
-    while (!result && i++ < MAX_RETRY) {
+    let redirectURL = null
+    let response = null
+    let retry = 21
+    while (--retry) {
       const config = {
-        baseURL: SteamcommunityURL, ...params,
+        baseURL: SteamcommunityURL,
+        ...params,
         data: typeof params.data === 'object' && !Object.keys(params.data).length ? undefined : params.data,
-        headers: params.headers.get(),
-        beforeRedirect: (options) => {
-          options.headers = options.headers || {}
-          if (options?.hostname === 'steamcommunity.com') {
-            options.headers.cookie = this._cookies
-          }
-          if (options.headers.location?.startsWith('https://login.steampowered.com/jwt/refresh')) {
-            //should login first
-          }
+        validateStatus: () => true,
+        headers: {
+          ...(params.headers.get()),
+          cookie: this._cookies.toString()
         },
+        maxRedirects: 0,
+        url: redirectURL || params.url
       }
+      response = await axios.request(config)
 
-      let plsLoginFirst = false
-
-      result = await request(config)
-      if (result.status === 429) {
+      this._cookies.setCookies(response.headers["set-cookie"])
+      if (response.status === 302) {
+        redirectURL = response.headers.location
+        console.log(`Redirect to ${redirectURL}`)
+      } else if (response.status === 200) {
+        break
+      } else if (response.status === 429) {
         console.log('Too Many Requests')
-        await sleep(60000)
-        result = await request(config)
-      } else if (result.status === 401) {
+        await sleep(30000)
+        break
+      } else if (response.status === 401) {
         console.log('Unauthorized')
         if (params.method.toUpperCase() === 'POST') {
-          config.headers['Content-Type'] = 'multipart/form-data'
-          result = await request(config)
-        }
-      }
-      if (result?.error?.code === 'ERR_FR_TOO_MANY_REDIRECTS') {
-        //Maximum number of redirects exceeded
-        plsLoginFirst = true
-      }
-
-      if (SteamUser._isPlsLoginFirst(result?.data?.data)) {
-        plsLoginFirst = true
-      }
-
-      if (plsLoginFirst) {
-        console.error(params.url, `Please login first`)
-        return {
-          data: null,
-          headers: config.headers,
+          config.headers['Content-Type'] = config.headers['content-type'] = 'multipart/form-data'
+          retry = 1
         }
+        break
+      } else {
+        console.log(response.status);
       }
     }
-
-    return result
+    return response
   }
 
   async _httpRequestAjax (params) {
@@ -4954,10 +4967,14 @@ class SteamUser {
 
   async getFullInventoryHistory() {
     let result = null
+    const tradehistory = []
     do {
-       result = await this.getInventoryHistory(result?.cursor)
-      result.tradehistory.forEach(r => console.log(r))
+      result = await this.getInventoryHistory(result?.cursor)
+      if (Array.isArray(result?.tradehistory)) {
+        tradehistory.push(...result.tradehistory)
+      }
     } while (result?.cursor)
+    return tradehistory
   }
   async getInventoryHistory(cursor) {
     if (!cursor) {
@@ -5177,6 +5194,13 @@ class SteamUser {
       },
     ]
   }
+
+  async getTradeURL(){
+    const result = await this._httpRequest(`${this.getMySteamUserProfileURL()}/tradeoffers/privacy`)
+    const $ = cherrio.load(result.data)
+    const trade_offer_access_url = $('#trade_offer_access_url').attr('value')
+    return trade_offer_access_url
+  }
 }
 
 export default SteamUser

package/package.json

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