steamutils 1.1.63 → 1.1.65

package/example.js

@@ -11,94 +11,4 @@ import * as cherrio from "cheerio";
     // 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

@@ -1505,7 +1505,7 @@ class SteamUser {
       const config = {
         baseURL: SteamcommunityURL,
         ...params,
-        data: typeof params.data === 'object' && !Object.keys(params.data).length ? undefined : params.data,
+        data:( typeof params.data === 'object' && !Object.keys(params.data).length && !(params.data instanceof URLSearchParams)) ? undefined : params.data,
         validateStatus: () => true,
         headers: {
           ...(params.headers.get()),
@@ -5456,9 +5456,7 @@ class SteamUser {
     //        currency: [],
     //        ready: false
     //  }
-    const tradeURLParams = url.parse(tradeURL).query.split('&').reduce((accumulator, currentValue, index) => ({
-      ...accumulator, [currentValue.split('=')[0]]: currentValue.split('=')[1]
-    }), {})
+    const tradeURLParams = SteamUser.parseTradeURL(tradeURL)
     const result = await this._httpRequest({
       url: `tradeoffer/new/send`,
       headers: {
@@ -5468,9 +5466,9 @@ class SteamUser {
       },
       data: {
         serverid: 1,
-        partner: SteamID.fromIndividualAccountID(tradeURLParams.partner).getSteamID64(),
+        partner: tradeURLParams.steamId,
         tradeoffermessage,
-        json_tradeoffer: encodeURIComponent(JSON.stringify({
+        json_tradeoffer: JSON.stringify({
           newversion: true,
           version: 3,
           me: {
@@ -5483,9 +5481,9 @@ class SteamUser {
             currency: [],
             ready: false
           },
-        })),
+        }),
         captcha: '',
-        trade_offer_create_params: encodeURIComponent(JSON.stringify({trade_offer_access_token: tradeURLParams.token})),
+        trade_offer_create_params: JSON.stringify({trade_offer_access_token: tradeURLParams.token}),
       },
       method: 'POST',
     })
@@ -5497,6 +5495,18 @@ class SteamUser {
       email_domain: "gmail.com"
     }
   }
+
+  static parseTradeURL(tradeURL){
+    const tradeURLParams = url.parse(tradeURL).query.split('&').reduce((accumulator, currentValue, index) => ({
+      ...accumulator, [currentValue.split('=')[0]]: currentValue.split('=')[1]
+    }), {})
+
+    return {
+      accountId: tradeURLParams.partner,
+      steamId: SteamID.fromIndividualAccountID(tradeURLParams.partner).getSteamID64(),
+      token: tradeURLParams.token,
+    }
+  }
 }
 
 export default SteamUser

package/package.json

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