steamutils 1.1.54 → 1.1.56

package/.idea/steamutils.iml

@@ -2,8 +2,8 @@
 <module type="WEB_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
       <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
       <excludeFolder url="file://$MODULE_DIR$/tmp" />
     </content>
     <orderEntry type="inheritedJdk" />

package/.idea/vcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>

package/index.js

@@ -593,6 +593,8 @@ class SteamUser {
       sessionid,
     } = SteamUser.parseCookie(this._cookies.toString())
 
+    this._myProfile = `profiles/${steamID}`
+
     if (!sessionid) {
       sessionid = SteamUser.generateSessionID()
       this._cookies.setCookie("sessionid", sessionid)
@@ -684,12 +686,12 @@ class SteamUser {
     return this._steamMachineAuth
   }
 
-  getSteamUserProfileURL (steamID = this.getSteamidUser()) {
+  getSteamUserProfileURL (steamID) {
     return `profiles/${steamID}`
   }
 
-  getMySteamUserProfileURL () {
-    return this.getSteamUserProfileURL()
+  getMyProfileURL() {
+    return this._myProfile
   }
 
   /**
@@ -1530,9 +1532,17 @@ class SteamUser {
       this._cookies.setCookies(response.headers["set-cookie"])
       if (response.status === 302) {
         redirectURL = response.headers.location
+
+        if (redirectURL?.startsWith('https://steamcommunity.com/id/')) {
+          const customURL = redirectURL.split('/')[4];
+          if (customURL) {
+            this._myProfile = `id/${customURL}`
+          }
+        }
+
         console.log(`Redirect to ${redirectURL}`)
       } else if (response.status === 200) {
-        if(response.data && typeof response.data === 'string') {
+        if (response.data && typeof response.data === 'string') {
           response._$ = function () {
             return cheerio.load(response.data
                 .replaceAll(/[\t\n\r]/gi, '')
@@ -2249,7 +2259,7 @@ class SteamUser {
     if (!matchHistoryType) {
       return
     }
-    let result = await this._httpRequest(`${this.getMySteamUserProfileURL()}/gcpd/${AppID_CSGO}/?tab=${matchHistoryType}`)
+    let result = await this._httpRequest(`${this.getMyProfileURL()}/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()
@@ -2303,7 +2313,7 @@ class SteamUser {
       i = MAX_RETRY
     while (result?.data?.success !== true && i--) {
       result = await _self._httpRequest(
-        `${this.getMySteamUserProfileURL()}/gcpd/${AppID_CSGO}?ajax=1&tab=${matchHistoryType}${token ? `&continue_token=${token}` : ''}&sessionid=${_self._sessionid}`)
+        `${this.getMyProfileURL()}/gcpd/${AppID_CSGO}?ajax=1&tab=${matchHistoryType}${token ? `&continue_token=${token}` : ''}&sessionid=${_self._sessionid}`)
     }
     if (!result.data) {
       return null
@@ -2582,7 +2592,7 @@ class SteamUser {
     })
 
     const { data } = await this._httpRequestAjax({
-      url: `${this.getMySteamUserProfileURL()}/friends/action`,
+      url: `${this.getMyProfileURL()}/friends/action`,
       method: 'POST',
       data: formData,
     })
@@ -2652,7 +2662,7 @@ class SteamUser {
 
   async acceptFriendRequest (steamID) {
     const { data } = await this._httpRequest({
-      url: `${this.getMySteamUserProfileURL()}/friends/action`,
+      url: `${this.getMyProfileURL()}/friends/action`,
       data: {
         steamid: this._steamid_user,
         ajax: 1,
@@ -2728,7 +2738,7 @@ class SteamUser {
 
   async clearPreviousAliases () {
     const { data } = await this._httpRequestAjax({
-      url: `${this.getMySteamUserProfileURL()}/ajaxclearaliashistory/`,
+      url: `${this.getMyProfileURL()}/ajaxclearaliashistory/`,
       method: 'POST',
       headers: {
         'Content-Type': 'multipart/form-data',
@@ -2754,7 +2764,7 @@ class SteamUser {
     summary = null,
     hide_profile_awards = null,
   }) {
-    const existProfile = await this._httpRequest(`/my/edit/info`)
+    const existProfile = await this._httpRequest(`${this.getMyProfileURL()}/edit/info`)
     if (!existProfile.data) {
       return
     }
@@ -2765,7 +2775,7 @@ class SteamUser {
     }
 
     const { data } = await this._httpRequestAjax({
-      url: `${this.getMySteamUserProfileURL()}/edit/`,
+      url: `${this.getMyProfileURL()}/edit/`,
       method: 'POST',
       data: {
         type: 'profileSave',
@@ -2802,7 +2812,7 @@ class SteamUser {
 
   async setPersonaName (name) {
     const result = await this._httpRequestAjax({
-      url: `${this.getMySteamUserProfileURL()}/ajaxsetpersonaname/`,
+      url: `${this.getMyProfileURL()}/ajaxsetpersonaname/`,
       method: 'POST',
       data: {
         persona: name,
@@ -2873,7 +2883,7 @@ class SteamUser {
 
   async getPrivacySettings () {
     const result = await this._httpRequest({
-      url: `${this.getMySteamUserProfileURL()}/edit/settings`,
+      url: `${this.getMyProfileURL()}/edit/settings`,
     })
 
     if (!result.data) {
@@ -2982,7 +2992,7 @@ class SteamUser {
     const {
       data,
     } = await this._httpRequestAjax({
-      url: `${this.getMySteamUserProfileURL()}/ajaxsetprivacy`,
+      url: `${this.getMyProfileURL()}/ajaxsetprivacy`,
       method: 'POST',
       data: {
         Privacy: JSON.stringify(privacyValue.PrivacySettings),
@@ -3134,7 +3144,7 @@ class SteamUser {
       return
     }
     const _self = this
-    const result = await this._httpRequest(`${this.getMySteamUserProfileURL()}/friendsthatplay/${appID}`)
+    const result = await this._httpRequest(`${this.getMyProfileURL()}/friendsthatplay/${appID}`)
     const data = {
       YourOwnPlaytime: [],//Your own playtime _
       FriendsCurrentlyPlaying: [],//Friends currently playing Counter-Strike: Global Offensive_
@@ -3236,7 +3246,7 @@ class SteamUser {
   }
 
   async getOwnedAppsDetail () {
-    const response = await this._httpRequest(`${this.getMySteamUserProfileURL()}/games/?tab=all`)
+    const response = await this._httpRequest(`${this.getMyProfileURL()}/games/?tab=all`)
 
     let rgGames = response?.data?.substringBetweenOrNull('var rgGames = ', 'var rgChangingGames = []')?.trim()?.removeSuffix(';')?.trim()
     if (!rgGames) {
@@ -3399,7 +3409,7 @@ class SteamUser {
 
   async _respondToGroupInvite (groupSteamID, accept) {
     const { data } = await this._httpRequestAjax({
-      url: `${this.getMySteamUserProfileURL()}/friends/action`,
+      url: `${this.getMyProfileURL()}/friends/action`,
       data: {
         steamid: this.getSteamidUser(),
         ajax: 1,
@@ -3448,7 +3458,7 @@ class SteamUser {
 
   async leaveGroup (groupSteamID) {
     const { data } = await this._httpRequestAjax({
-      url: `${this.getMySteamUserProfileURL()}/friends/action`,
+      url: `${this.getMyProfileURL()}/friends/action`,
       data: {
         steamid: this.getSteamidUser(),
         ajax: 1,
@@ -3796,7 +3806,7 @@ class SteamUser {
     const activity = []
     let next_request_timestart = null,
       next_request = null
-    const { data } = await this._httpRequestAjax(typeof start_or_url === 'string' ? start_or_url : `my/ajaxgetusernews/?start=${start_or_url}`)//use my, not profiles/76561197977736539 getMySteamUserProfileURL
+    const { data } = await this._httpRequestAjax(typeof start_or_url === 'string' ? start_or_url : `${this.getMyProfileURL()}/ajaxgetusernews/?start=${start_or_url}`)//use my, not profiles/76561197977736539 getMySteamUserProfileURL
     if (data?.success) {
       next_request = data.next_request || null
       next_request_timestart = parseInt(next_request.substringAfterLast('?start=')) || null
@@ -4121,7 +4131,7 @@ class SteamUser {
 
   async getCurrentSteamLogin () {
     const result = await this._httpRequest({
-      url: `${this.getMySteamUserProfileURL()}/games/?tab=all`,
+      url: `${this.getMyProfileURL()}/games/?tab=all`,
     })
     const $ = result._$()
     return $('.clientConnMachineText').text()?.trim()?.substringBeforeLast('|')?.trim()
@@ -4214,7 +4224,7 @@ class SteamUser {
   //Personal Game Data
   async getCompetitiveCooldownLevel () {
     const result = await this._httpRequest({
-      url: `${this.getMySteamUserProfileURL()}/gcpd/730/?tab=matchmaking`,
+      url: `${this.getMyProfileURL()}/gcpd/730/?tab=matchmaking`,
     })
     const $ = result._$()
 
@@ -4296,7 +4306,7 @@ class SteamUser {
 
   async getPersonalGameDataAccountInformation () {
     const result = await this._httpRequest({
-      url: `${this.getMySteamUserProfileURL()}/gcpd/730/?tab=accountmain`,
+      url: `${this.getMyProfileURL()}/gcpd/730/?tab=accountmain`,
     })
     if (!result?.data) {
       return
@@ -4976,7 +4986,7 @@ class SteamUser {
 
   async getInventoryTrading (appID) {
     for (let i = 0; i < 10; i++) {
-      const url = `${this.getMySteamUserProfileURL()}/inventory/json/${appID}/2?l=english&trading=1`;
+      const url = `${this.getMyProfileURL()}/inventory/json/${appID}/2?l=english&trading=1`;
       const _result = (await this._httpRequestAjax(url))?.data
       if (!_result) {
         await sleep(5000)
@@ -5179,7 +5189,7 @@ class SteamUser {
         query['cursor[time_frac]'] = cursor.time_frac
         query['cursor[time]'] = cursor.time
       }
-      const url = `https://steamcommunity.com/my/inventoryhistory/?${Object.keys(query).map(k => `${encodeURIComponent(k)}=${encodeURIComponent(query[k])}`).join('&')}`;
+      const url = `${this.getMyProfileURL()}/inventoryhistory/?${Object.keys(query).map(k => `${encodeURIComponent(k)}=${encodeURIComponent(query[k])}`).join('&')}`;
       let _result
       try {
         _result = (await this._httpRequestAjax({url}))?.data
@@ -5427,7 +5437,7 @@ class SteamUser {
   }
 
   async getTradeURL(){
-    const result = await this._httpRequest(`${this.getMySteamUserProfileURL()}/tradeoffers/privacy`)
+    const result = await this._httpRequest(`${this.getMyProfileURL()}/tradeoffers/privacy`)
     const $ = cherrio.load(result.data)
     const trade_offer_access_url = $('#trade_offer_access_url').attr('value')
     return trade_offer_access_url

package/package.json

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

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>