steamutils 1.2.77 → 1.2.79

package/SteamClient.js

@@ -168,7 +168,7 @@ function SteamClient({
                 delete e.callback
             }
         })
-        _.remove(_events, e => e.once)
+        _.remove(_events, e => !e || e?.once)
     }
 
     function onEvent(name, callback, once, timeout) {
@@ -1079,51 +1079,6 @@ function SteamClient({
                     "avatar_pending_review": null
                 }
             },
-            async friendMessage(data) {
-                if (!data) return
-                data.message_no_bbcode = data.message_no_bbcode?.replaceAll(`ː`, `:`)
-                data.message = data.message?.replaceAll(`ː`, `:`)
-                const example = {
-                    "steamid_friend": {
-                        "universe": 1,
-                        "type": 1,
-                        "instance": 1,
-                        "accountid": 1080136620
-                    },
-                    "chat_entry_type": 1,
-                    "from_limited_account": false,
-                    "message": "xxx",
-                    "ordinal": 0,
-                    "local_echo": false,
-                    "message_no_bbcode": "xxx",
-                    "low_priority": false,
-                    "server_timestamp": "2023-05-14T09:26:25.000Z",
-                    "message_bbcode_parsed": [
-                        "xxx"
-                    ]
-                }
-                const timestamp = new Date(data.server_timestamp).getTime()
-                const steamId = data.steamid_friend.getSteamID64()
-                const personas = await getPersonas([steamId])
-                const player_name = personas.find(p => p.id == steamId)?.player_name || ''
-                const invite = [`Invited you to play a game!`, `Đã mời bạn chơi một trò chơi!`].includes(data.message_no_bbcode || data.message)
-                const emotion = (data.message_no_bbcode || '').split(' ').find(m => m.startsWith(':') && m.endsWith(':'))
-
-                callEvent(events.friendMessage, {
-                    player_name,
-                    message: data.message_no_bbcode,
-                    invite,
-                    steamId,
-                    timestamp,
-                    from_limited_account: data.from_limited_account,
-                    emotion,
-                })
-            },
-            async friendTyping(steamId, message) {
-                callEvent(events.friendTyping, {
-                    steamId, message
-                })
-            },
             async playingState(playing_blocked, playing_app) {
                 playingBlocked = playing_blocked
                 if (playing_app === 0) {
@@ -1184,6 +1139,53 @@ function SteamClient({
             }
         }
 
+        const chatEvents = {
+            async friendMessage(data) {
+                if (!data) return
+                data.message_no_bbcode = data.message_no_bbcode?.replaceAll(`ː`, `:`)
+                data.message = data.message?.replaceAll(`ː`, `:`)
+                const example = {
+                    "steamid_friend": {
+                        "universe": 1,
+                        "type": 1,
+                        "instance": 1,
+                        "accountid": 1080136620
+                    },
+                    "chat_entry_type": 1,
+                    "from_limited_account": false,
+                    "message": "xxx",
+                    "ordinal": 0,
+                    "local_echo": false,
+                    "message_no_bbcode": "xxx",
+                    "low_priority": false,
+                    "server_timestamp": "2023-05-14T09:26:25.000Z",
+                    "message_bbcode_parsed": [
+                        "xxx"
+                    ]
+                }
+                const timestamp = new Date(data.server_timestamp).getTime()
+                const steamId = data.steamid_friend.getSteamID64()
+                const personas = await getPersonas([steamId])
+                const player_name = personas.find(p => p.id == steamId)?.player_name || ''
+                const invite = [`Invited you to play a game!`, `Đã mời bạn chơi một trò chơi!`].includes(data.message_no_bbcode || data.message)
+                const emotion = (data.message_no_bbcode || '').split(' ').find(m => m.startsWith(':') && m.endsWith(':'))
+
+                callEvent(events.friendMessage, {
+                    player_name,
+                    message: data.message_no_bbcode,
+                    invite,
+                    steamId,
+                    timestamp,
+                    from_limited_account: data.from_limited_account,
+                    emotion,
+                })
+            },
+            async friendTyping(steamId, message) {
+                callEvent(events.friendTyping, {
+                    steamId, message
+                })
+            },
+        }
 
         // steamClient.on('lobbyInvite', (inviterID, lobbyID ) => {
         //     joinLobby(lobbyID)
@@ -1226,6 +1228,10 @@ function SteamClient({
         for (const name in events) {
             steamClient.on(name, events[name])
         }
+
+        for (const name in chatEvents) {
+            steamClient.chat.on(name, chatEvents[name])
+        }
     }
 
     function getFriendList() {

package/index.js

@@ -15,7 +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";
+import * as cheerio from "cheerio";
 import fs from "fs";
 import FormData from "form-data";
 
@@ -2427,7 +2427,7 @@ class SteamUser {
     }
 
     _parsePendingFriendList(html, selector) {
-        const $ = cherrio.load(html || '')
+        const $ = cheerio.load(html || '')
         const data = []
         $(selector).each(function () {
             const el = $(this)
@@ -5691,7 +5691,7 @@ class SteamUser {
 
     async getTradeURL() {
         const result = await this._httpRequest(`${this.getMyProfileURL()}/tradeoffers/privacy`)
-        const $ = cherrio.load(result?.data || '')
+        const $ = cheerio.load(result?.data || '')
         const trade_offer_access_url = $('#trade_offer_access_url').attr('value')
         return trade_offer_access_url
     }
@@ -5825,9 +5825,19 @@ class SteamUser {
                 }
                 const partnerSteamId = partner.split(`',`)[0].trim()
                 let partnerName = partner.split(`', "`)[1].trim();
+                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 active = $1.find('.tradeoffer_items_ctn').hasClass("active")
+
                 tradeOffers.push({
                     tradeofferid, partner: {
-                        steamId: partnerSteamId, name: partnerName
+                        steamId: partnerSteamId,
+                        name: partnerName,
+                        avatar,
+                        link,
+                        header,
                     },
                 })
             }
@@ -6061,7 +6071,7 @@ class SteamUser {
             url: `market/mylistings/render/?count=100`,
         }))?.data
         if (result?.success === true) {
-            const $ = cherrio.load(result.results_html)
+            const $ = cheerio.load(result.results_html)
             const list = []
             $('.market_listing_row').each(function () {
                 try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "steamutils",
-  "version": "1.2.77",
+  "version": "1.2.79",
   "main": "index.js",
   "dependencies": {
     "axios": "^1.5.1",