steamutils 1.3.16 → 1.3.18

package/index.js

@@ -1655,7 +1655,8 @@ class SteamUser {
                     cookie: this._cookies.toString()
                 },
                 maxRedirects: 0,
-                url: redirectURL || params.url
+                url: redirectURL || params.url,
+                httpsAgent: new https.Agent({ keepAlive: true }),
             }
 
 
@@ -1744,6 +1745,17 @@ class SteamUser {
         return response
     }
 
+    async _httpMyRequest(params) {
+        if (typeof params === "string") {
+            return await this._httpRequest(`${this.getMyProfileURL()}/${_.trimStart(params, '/')}`)
+        } else {
+            return await this._httpRequest({
+                ...params,
+                url: `${this.getMyProfileURL()}/${_.trimStart(params.url, '/')}`
+            })
+        }
+    }
+
     async _httpRequestAjax(params) {
         params = this._formatHttpRequest(params)
         const headers = params.headers instanceof Header ? params.headers : new Header(_.cloneDeep(params.headers))
@@ -1755,6 +1767,17 @@ class SteamUser {
         return await this._httpRequest(params)
     }
 
+    async _httpMyRequestAjax(params) {
+        if (typeof params === "string") {
+            return await this._httpRequestAjax(`${this.getMyProfileURL()}/${_.trimStart(params, '/')}`)
+        } else {
+            return await this._httpRequestAjax({
+                ...params,
+                url: `${this.getMyProfileURL()}/${_.trimStart(params.url, '/')}`
+            })
+        }
+    }
+
     static RequestXML_TooManyRequests = 0
 
     static async _httpRequestXML(link) {
@@ -2460,7 +2483,7 @@ class SteamUser {
     }
 
     async getPendingFriendList() {
-        const result = await this._httpRequest(`${this._myProfile}/friends/pending`)
+        const result = await this._httpMyRequest(`friends/pending`)
         if (!result?.data || typeof result._$ !== 'function') return null
         const sentInvites = this._parsePendingFriendList(result.data, '#search_results_sentinvites > div')
         const receiveInvites = this._parsePendingFriendList(result.data, '#search_results > div')
@@ -2474,7 +2497,7 @@ class SteamUser {
         if (!matchHistoryType) {
             return
         }
-        let result = await this._httpRequest(`${this.getMyProfileURL()}/gcpd/${AppID_CSGO}/?tab=${matchHistoryType}`)
+        let result = await this._httpMyRequestAjax(`gcpd/${AppID_CSGO}/?tab=${matchHistoryType}`)
         if (result?.data) {
             const matches = this._parseMatchHistory(result?.data)
             const continue_token = result.data.substringBetweenOrNull('var g_sGcContinueToken =', ';').trim().removeSurrounding('\'').trim()
@@ -2527,8 +2550,8 @@ class SteamUser {
         let result,
             i = MAX_RETRY
         while (result?.data?.success !== true && i--) {
-            result = await _self._httpRequest(
-                `${this.getMyProfileURL()}/gcpd/${AppID_CSGO}?ajax=1&tab=${matchHistoryType}${token ? `&continue_token=${token}` : ''}&sessionid=${_self._sessionid}`)
+            result = await _self._httpMyRequest(
+                `gcpd/${AppID_CSGO}?ajax=1&tab=${matchHistoryType}${token ? `&continue_token=${token}` : ''}&sessionid=${_self._sessionid}`)
         }
         if (!result.data) {
             return null
@@ -2809,8 +2832,8 @@ class SteamUser {
             formData.append('steamids[]', steamID.toString())
         })
 
-        const {data} = await this._httpRequestAjax({
-            url: `${this.getMyProfileURL()}/friends/action`,
+        const {data} = await this._httpMyRequestAjax({
+            url: `friends/action`,
             method: 'POST',
             data: formData,
         })
@@ -2913,8 +2936,8 @@ class SteamUser {
     }
 
     async acceptFriendRequest(steamID) {
-        const {data} = await this._httpRequest({
-            url: `${this.getMyProfileURL()}/friends/action`,
+        const {data} = await this._httpMyRequest({
+            url: `friends/action`,
             data: {
                 steamid: this._steamid_user,
                 ajax: 1,
@@ -2992,8 +3015,8 @@ class SteamUser {
     getPreviousAliases = this.getNameHistory
 
     async clearPreviousAliases() {
-        const {data} = await this._httpRequestAjax({
-            url: `${this.getMyProfileURL()}/ajaxclearaliashistory/`,
+        const {data} = await this._httpMyRequestAjax({
+            url: `ajaxclearaliashistory/`,
             method: 'POST',
             headers: {
                 'Content-Type': 'multipart/form-data',
@@ -3003,7 +3026,7 @@ class SteamUser {
     }
 
     async setupProfile() {
-        const profile = await this._httpRequest(`${this._myProfile}/edit?welcomed=1`)
+        const profile = await this._httpMyRequest(`edit?welcomed=1`)
         if (!profile.data) {
             return false
         }
@@ -3019,7 +3042,7 @@ class SteamUser {
                             summary = null,
                             hide_profile_awards = null,
                         }) {
-        const existProfile = await this._httpRequest(`${this.getMyProfileURL()}/edit/info`)
+        const existProfile = await this._httpMyRequest(`edit/info`)
         if (!existProfile.data) {
             return
         }
@@ -3029,8 +3052,8 @@ class SteamUser {
             return
         }
 
-        const {data} = await this._httpRequestAjax({
-            url: `${this.getMyProfileURL()}/edit/`,
+        const {data} = await this._httpMyRequestAjax({
+            url: `edit/`,
             method: 'POST',
             data: {
                 type: 'profileSave',
@@ -3066,8 +3089,8 @@ class SteamUser {
     }
 
     async setPersonaName(name) {
-        const result = await this._httpRequestAjax({
-            url: `${this.getMyProfileURL()}/ajaxsetpersonaname/`,
+        const result = await this._httpMyRequestAjax({
+            url: `ajaxsetpersonaname/`,
             method: 'POST',
             data: {
                 persona: name,
@@ -3137,9 +3160,7 @@ class SteamUser {
     }
 
     async getPrivacySettings() {
-        const result = await this._httpRequest({
-            url: `${this.getMyProfileURL()}/edit/settings`,
-        })
+        const result = await this._httpMyRequest(`edit/settings`)
 
         if (!result.data) {
             return
@@ -3246,8 +3267,8 @@ class SteamUser {
 
         const {
             data,
-        } = await this._httpRequestAjax({
-            url: `${this.getMyProfileURL()}/ajaxsetprivacy`,
+        } = await this._httpMyRequestAjax({
+            url: `ajaxsetprivacy`,
             method: 'POST',
             data: {
                 Privacy: JSON.stringify(privacyValue.PrivacySettings),
@@ -3399,7 +3420,7 @@ class SteamUser {
             return
         }
         const _self = this
-        const result = await this._httpRequest(`${this.getMyProfileURL()}/friendsthatplay/${appID}`)
+        const result = await this._httpMyRequest(`friendsthatplay/${appID}`)
         const data = {
             YourOwnPlaytime: [],//Your own playtime _
             FriendsCurrentlyPlaying: [],//Friends currently playing Counter-Strike: Global Offensive_
@@ -3503,7 +3524,7 @@ class SteamUser {
     }
 
     async getOwnedAppsDetail() {
-        const response = await this._httpRequest(`${this.getMyProfileURL()}/games/?tab=all`)
+        const response = await this._httpMyRequest(`games/?tab=all`)
 
         let rgGames = response?.data?.substringBetweenOrNull('var rgGames = ', 'var rgChangingGames = []')?.trim()?.removeSuffix(';')?.trim()
         if (!rgGames) {
@@ -3668,8 +3689,8 @@ class SteamUser {
     }
 
     async _respondToGroupInvite(groupSteamID, accept) {
-        const {data} = await this._httpRequestAjax({
-            url: `${this.getMyProfileURL()}/friends/action`,
+        const {data} = await this._httpMyRequestAjax({
+            url: `friends/action`,
             data: {
                 steamid: this.getSteamidUser(),
                 ajax: 1,
@@ -3717,8 +3738,8 @@ class SteamUser {
     }
 
     async leaveGroup(groupSteamID) {
-        const {data} = await this._httpRequestAjax({
-            url: `${this.getMyProfileURL()}/friends/action`,
+        const {data} = await this._httpMyRequestAjax({
+            url: `friends/action`,
             data: {
                 steamid: this.getSteamidUser(),
                 ajax: 1,
@@ -4291,7 +4312,7 @@ class SteamUser {
     }
 
     async getNotifications() {
-        const {data} = await this._httpRequest(`/actions/GetNotificationCounts`)
+        const {data} = await this._httpRequest(`actions/GetNotificationCounts`)
         if (!data) {
             return
         }
@@ -4402,9 +4423,7 @@ class SteamUser {
     requestFreeLicense = this.addFreeLicense
 
     async getCurrentSteamLogin() {
-        const result = await this._httpRequest({
-            url: `${this.getMyProfileURL()}/games/?tab=all`,
-        })
+        const result = await this._httpMyRequest(`games/?tab=all`)
         const $ = result._$()
         return $('.clientConnMachineText').text()?.trim()?.substringBeforeLast('|')?.trim()
     }
@@ -4495,9 +4514,7 @@ class SteamUser {
 
     //Personal Game Data
     async getCompetitiveCooldownLevel() {
-        const result = await this._httpRequest({
-            url: `${this.getMyProfileURL()}/gcpd/730/?tab=matchmaking`,
-        })
+        const result = await this._httpMyRequest(`gcpd/730/?tab=matchmaking`)
         const $ = result._$()
 
         const $table = $('table.generic_kv_table')
@@ -4575,9 +4592,7 @@ class SteamUser {
     }
 
     async getPersonalGameDataAccountInformation() {
-        const result = await this._httpRequest({
-            url: `${this.getMyProfileURL()}/gcpd/730/?tab=accountmain`,
-        })
+        const result = await this._httpMyRequest(`gcpd/730/?tab=accountmain`)
         if (!result?.data) {
             return
         }
@@ -4782,9 +4797,7 @@ class SteamUser {
     }
 
     async getSteamGuardStatus() {
-        const result = await this._httpRequest({
-            url: `https://store.steampowered.com/twofactor/manage_action`,
-        })
+        const result = await this._httpRequest(`https://store.steampowered.com/twofactor/manage_action`)
         const $ = cheerio.load(result?.data || '')
 
         if ($('#steam_authenticator_form #steam_authenticator_check[checked]')?.length) {
@@ -5014,9 +5027,7 @@ class SteamUser {
     }
 
     async removePhoneNumber() {
-        const result = await this._httpRequest({
-            url: `https://help.steampowered.com/en/wizard/HelpRemovePhoneNumber?redir=store/account`,
-        })
+        const result = await this._httpRequest(`https://help.steampowered.com/en/wizard/HelpRemovePhoneNumber?redir=store/account`)
         let href = null
         const $ = result._$()
         $('a').each(function (index, el) {
@@ -5077,9 +5088,7 @@ class SteamUser {
             gamepad: 0,
         }
 
-        const result = await this._httpRequest({
-            url: `https://help.steampowered.com/en/wizard/AjaxVerifyAccountRecoveryCode?` + Object.keys(params).map(k => `${k}=${params[k]}`).join('&'),
-        })
+        const result = await this._httpRequest(`https://help.steampowered.com/en/wizard/AjaxVerifyAccountRecoveryCode?` + Object.keys(params).map(k => `${k}=${params[k]}`).join('&'))
 
         if (result.data.errorMsg) {
             return {
@@ -5256,8 +5265,7 @@ class SteamUser {
     async getInventoryTrading(appID, contextid = 2) {
         const steamId = this.getSteamidUser()
         for (let i = 0; i < 10; i++) {
-            const url = `${this.getMyProfileURL()}/inventory/json/${appID}/${contextid}?l=english&trading=1`;
-            const _result = (await this._httpRequestAjax(url))?.data
+            const _result = (await this._httpMyRequestAjax(`inventory/json/${appID}/${contextid}?l=english&trading=1`))?.data
             if (!_result) {
                 await sleep(5000)
             } else if (_result.success !== true) {
@@ -5480,10 +5488,10 @@ class SteamUser {
                 query['cursor[time_frac]'] = cursor.time_frac
                 query['cursor[time]'] = cursor.time
             }
-            const url = `${this.getMyProfileURL()}/inventoryhistory/?${Object.keys(query).map(k => `${encodeURIComponent(k)}=${encodeURIComponent(query[k])}`).join('&')}`;
             let _result
+            const params = Object.keys(query).map(k => `${encodeURIComponent(k)}=${encodeURIComponent(query[k])}`);
             try {
-                _result = (await this._httpRequestAjax({url}))?.data
+                _result = (await this._httpMyRequestAjax(`inventoryhistory/?${params.join('&')}`))?.data
             } catch (e) {
             }
             if (!_result) {
@@ -5491,7 +5499,6 @@ class SteamUser {
             } else if (typeof _result === "string") {
 
             } else if (_result.success !== true) {
-                console.error(url)
                 console.error(_result)
                 await sleep(5000)
             } else {
@@ -5698,7 +5705,7 @@ class SteamUser {
     }
 
     async getTradeURL() {
-        const result = await this._httpRequest(`${this.getMyProfileURL()}/tradeoffers/privacy`)
+        const result = await this._httpMyRequest(`tradeoffers/privacy`)
         const $ = cheerio.load(result?.data || '')
         const trade_offer_access_url = $('#trade_offer_access_url').attr('value')
         return trade_offer_access_url
@@ -5758,9 +5765,7 @@ class SteamUser {
     async acceptTradeOffer(tradeOfferID, partnerSteamId) {
         if (!partnerSteamId) {
             try {
-                partnerSteamId = (await this._httpRequest({
-                    url: `tradeoffer/${tradeOfferID}`,
-                }))?.data?.split(`var g_ulTradePartnerSteamID = '`)?.[1]?.split(`';`)[0]
+                partnerSteamId = (await this._httpRequest(`tradeoffer/${tradeOfferID}`))?.data?.split(`var g_ulTradePartnerSteamID = '`)?.[1]?.split(`';`)[0]
             } catch (e) {
             }
         }
@@ -5786,10 +5791,7 @@ class SteamUser {
     }
 
     async getTradeOffer() {
-        const result = await this._httpRequest({
-            url: `${this._myProfile}/tradeoffers/`,
-            method: 'GET',
-        })
+        const result = await this._httpMyRequest(`tradeoffers/`)
         if (!result?.data) {
             return
         }
@@ -5942,9 +5944,7 @@ class SteamUser {
     }
 
     async getMiniprofile(steamId = this._steamid_user) {
-        const response = await this._httpRequestAjax({
-            url: `miniprofile/${SteamUser.steamID642Miniprofile(steamId)}/json/?origin=https://steamcommunity.com/`
-        })
+        const response = await this._httpRequestAjax(`miniprofile/${SteamUser.steamID642Miniprofile(steamId)}/json/?origin=https://steamcommunity.com/`)
         const miniProfile = response.data;
         const avatar_hash = SteamUser.GetAvatarHashFromURL(miniProfile?.avatar_url) || ''
         return {
@@ -5981,9 +5981,7 @@ class SteamUser {
     }
 
     async getMarketUnavailable() {
-        const response = (await this._httpRequest({
-            url: `market`,
-        }))?.data
+        const response = (await this._httpRequest(`market`))?.data
         if (!response) {
             return null
         }
@@ -6008,9 +6006,7 @@ class SteamUser {
     }
 
     async getAmountSpentOnSteam() {
-        const response = (await this._httpRequest({
-            url: `https://help.steampowered.com/en/`,
-        }))?.data
+        const response = (await this._httpRequest(`https://help.steampowered.com/en/`))?.data
         if (!response) {
             return null
         }
@@ -6121,9 +6117,7 @@ class SteamUser {
             ajax: 1,
             ...(!!token && {continue_token: token})
         }
-        const data = (await this._httpRequestAjax({
-            url: `my/gcpd/730?${Object.keys(param).map(k => `${k}=${param[k]}`).join('&')}`,
-        }))?.data
+        const data = (await this._httpMyRequestAjax(`gcpd/730?${Object.keys(param).map(k => `${k}=${param[k]}`).join('&')}`))?.data
         if (data.success !== true) {
             return
         }
@@ -6172,8 +6166,8 @@ class SteamUser {
         let token = null
         do {
             const result = await this.getPlayerReports(token)
-            token = result.token
-            onPageCb?.(result)
+            token = result?.token
+            result && onPageCb?.(result)
         } while (token)
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "steamutils",
-  "version": "1.3.16",
+  "version": "1.3.18",
   "main": "index.js",
   "dependencies": {
     "alpha-common-utils": "^1.0.5",