steamutils 1.3.5 → 1.3.7

package/SteamClient.js

@@ -108,6 +108,7 @@ function SteamClient({
     let lastTimePartySearch = 0
     const appsPlayed = []
     const ownedApps = []
+    let logOffEvent = null
 
     const onAnyCallbacks = []
 
@@ -487,7 +488,10 @@ function SteamClient({
 
                 if (['ServiceUnavailable', 'NoConnection'].includes(msg) && autoReconnect && !isLogOff) {
                     async function relogin(retry) {
-                        if (retry <= 0) {
+                        if (isLogOff) {
+                            console.error("Cannot relogin (logoff)")
+                            return false
+                        } else if (retry <= 0) {
                             console.error("Cannot relogin")
                             return false
                         } else {
@@ -500,21 +504,44 @@ function SteamClient({
                                     console.log("Relogin success")
                                     return true
                                 } else {
-                                    await sleep(120000)
+                                    const isLogOff = await new Promise((resolve, reject) => {
+                                        logOffEvent = resolve
+                                        setTimeout(resolve, 120000)
+                                    })
+                                    logOffEvent = null
+                                    if (isLogOff === true) {
+                                        return false
+                                    }
                                     return await relogin(retry - 1)
                                 }
                             } else {
-                                await sleep(120000)
+                                const isLogOff = await new Promise((resolve, reject) => {
+                                    logOffEvent = resolve
+                                    setTimeout(resolve, 120000)
+                                })
+                                logOffEvent = null
+                                if (isLogOff === true) {
+                                    return false
+                                }
                                 return await relogin(retry - 1)
                             }
                         }
                     }
 
-                    await sleep(60000)
-                    const isSuccess = await relogin(50)
-                    if (!isSuccess) {
+                    const isLogOff = await new Promise((resolve, reject) => {
+                        logOffEvent = resolve
+                        setTimeout(resolve, 60000)
+                    })
+                    logOffEvent = null
+                    if (isLogOff === true) {
                         offAllEvent()
                         doClearIntervals()
+                    } else {
+                        const isSuccess = await relogin(50)
+                        if (!isSuccess) {
+                            offAllEvent()
+                            doClearIntervals()
+                        }
                     }
                 } else {
                     offAllEvent()
@@ -1407,7 +1434,7 @@ function SteamClient({
 
     async function logOff() {
         isLogOff = true
-
+        logOffEvent?.(true)
         steamClient.logOff()
     }
 
@@ -1764,10 +1791,10 @@ function SteamClient({
             return steamClient
         },
         getAccountInfoName,
-        async getPlayersProfile(steamId, retry = 3){
+        async getPlayersProfile(steamId, retry = 3) {
             for (let i = 0; i < retry; i++) {
                 const profile = await getPlayersProfile(steamId)
-                if(profile){
+                if (profile) {
                     return profile
                 }
             }
@@ -1873,13 +1900,13 @@ function SteamClient({
             } catch (e) {
             }
         },
-        getLastTimePartyRegister(){
+        getLastTimePartyRegister() {
             return lastTimePartyRegister
         },
-        getLastTimePartySearch(){
+        getLastTimePartySearch() {
             return lastTimePartySearch
         },
-        getLicenses(){
+        getLicenses() {
             return steamClient.licenses
             const exampleLicenses = [{
                 package_id: 303386,

package/index.js

@@ -16,6 +16,7 @@ import axios from 'axios'
 import * as cheerio from 'cheerio'
 import fs from "fs";
 import FormData from "form-data";
+import {StringUtils} from "alpha-common-utils/src";
 
 const MAX_RETRY = 10
 let requestTimestamp = 0
@@ -998,7 +999,7 @@ class SteamUser {
             const text = $(line).text()
             $(line).remove()
             return text
-        }).concat(profileBanStatusEl.text()).map(text => text?.replaceAll(/[\t\n\r]/gi, ' ')?.replaceAll(/\s+/gi, ' ')?.trim()).filter(Boolean)
+        }).concat(profileBanStatusEl.text()).map(text => StringUtils.cleanSpace(text)).filter(Boolean)
         const GameBan = SteamUser.parseGameBanType(gameBanFull)
         let dayLastBan = null
         if (GameBan && GameBan.daysSinceLastBan !== null) {
@@ -2357,10 +2358,10 @@ class SteamUser {
 
             const isNickname = !!friendBlockContent.find('.player_nickname_hint').length
 
-            const game = friendBlockContent.find(`.friend_game_link, .linkFriend_in-game`).text().replaceAll(/\s+/g, ' ').trim().removePrefix('In-Game').trim()
+            const game = StringUtils.cleanSpace(friendBlockContent.find(`.friend_game_link, .linkFriend_in-game`).text()).removePrefix('In-Game').trim()
             friendBlockContent.find(`.friend_small_text, .friendSmallText`).remove()
 
-            const lastOnline = friendBlockContent.find(`.friend_last_online_text`).text().replaceAll(/\s+/g, ' ').trim()
+            const lastOnline = StringUtils.cleanSpace(friendBlockContent.find(`.friend_last_online_text`).text())
             friendBlockContent.find(`.friend_last_online_text`).remove()
 
             let username = friendBlockContent.text().trim()
@@ -5532,6 +5533,7 @@ class SteamUser {
                 "You listed an item on the Community Market.",
                 "You canceled a listing on the Community Market. The item was returned to you.",
                 "Crafted",
+                "Expired",
                 "Earned a new rank and got a drop",
                 "Got an item drop",
                 "Random item drop",
@@ -5603,7 +5605,7 @@ class SteamUser {
             for (const tradehistory_items_el of querySelectorAll($, '.tradehistory_items', tradehistoryrow_el)) {
                 const plusminus = tradehistory_items_el.find('.tradehistory_items_plusminus').text().trim()
                 for (const itemEl of querySelectorAll($, '.tradehistory_items_group > .history_item', tradehistory_items_el)) {
-                    const text = plainText(itemEl.text())//You did not receive any items in this trade.
+                    const text = StringUtils.cleanSpace(itemEl.text())//You did not receive any items in this trade.
                     const appID = itemEl.attr('data-appid')
                     const classid = itemEl.attr('data-classid')
                     const instanceid = itemEl.attr('data-instanceid')
@@ -5837,7 +5839,7 @@ class SteamUser {
                 const playerAvatar = $1.find('.playerAvatar')
                 const avatar = playerAvatar.find('img')?.attr('src')
                 const link = playerAvatar.find('a')?.attr('href')
-                const header = $1.find('.tradeoffer_header').text().replaceAll(/\t/g, ' ').replaceAll(/\s+/g, ' ').trim()
+                const header = StringUtils.cleanSpace($1.find('.tradeoffer_header').text())
                 const active = $1.find('.tradeoffer_items_ctn').hasClass("active")
 
                 tradeOffers.push({
@@ -5989,12 +5991,12 @@ class SteamUser {
         const market_headertip_container_warning_el = $('.market_headertip_container_warning')
         const market_warning_header_el = market_headertip_container_warning_el.find('#market_warning_header')
         if (market_headertip_container_warning_el.length && market_warning_header_el.length) {
-            const market_warning_header = market_warning_header_el.text().replaceAll(/\t/g, ' ').replaceAll(/\s+/g, ' ').trim()
+            const market_warning_header = StringUtils.cleanSpace(market_warning_header_el.text())
             const market_restrictions = []
             market_headertip_container_warning_el.find('ul.market_restrictions > li').each(function () {
                 const el = $(this);
                 el.find('a').remove()
-                market_restrictions.push(el.text().replaceAll(/\t/g, ' ').replaceAll(/\s+/g, ' ').trim())
+                market_restrictions.push(StringUtils.cleanSpace(el.text()))
             })
             return {
                 market_warning_header,
@@ -6013,7 +6015,7 @@ class SteamUser {
             return null
         }
         const $ = cheerio.load(response)
-        const text = $('.help_event_limiteduser .help_event_limiteduser_spend').text().replaceAll(/[\t\n\r]/gi, ' ').replaceAll(/\s+/g, ' ').trim()
+        const text = StringUtils.cleanSpace($('.help_event_limiteduser .help_event_limiteduser_spend').text())
         if (text?.startsWith("Amount Spent on Steam")) {
             return text
         } else {
@@ -6091,7 +6093,7 @@ class SteamUser {
                     const receive_price = parseInt($1.find(`.market_listing_price span[title="This is how much you will receive."]`).text().replaceAll(`(`, '').replaceAll(`)`, '').replaceAll(`₫`, '').replaceAll(`.`, '').replaceAll(`,`, '').trim())
                     const item_name = $1.find('.market_listing_item_name_link').text()
                     const game_name = $1.find('.market_listing_game_name').text()
-                    const date_combined = $1.find('.market_listing_listed_date_combined').text().replaceAll(`Listed:`, '').replaceAll(/[\t\n\r]/gi, ' ').replaceAll(/\s+/gi, ' ').trim()
+                    const date_combined = StringUtils.cleanSpace($1.find('.market_listing_listed_date_combined').text().replaceAll(`Listed:`, ''))
                     list.push({
                         listingid,
                         appid,
@@ -6113,10 +6115,6 @@ class SteamUser {
     }
 }
 
-function plainText(text) {
-    return text?.replaceAll(/[\t\n\r]/gi, ' ')?.replaceAll(/\s+/g, ' ')?.trim()
-}
-
 function querySelectorAll($, selector, root) {
     try {
         if (root) {

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "steamutils",
-  "version": "1.3.05",
+  "version": "1.3.07",
   "main": "index.js",
   "dependencies": {
+    "alpha-common-utils": "^1.0.4",
     "axios": "^1.5.1",
     "cheerio": "^1.0.0-rc.12",
     "crypto-js": "^4.1.1",