steamutils 1.2.85 → 1.2.87

package/index.js

@@ -5486,12 +5486,11 @@ class SteamUser {
         if (!result) return
 
         const descriptions = result.descriptions
-        const $ = cheerio.load(result.html?.replaceAll(/[\t\n\r]/gi, '')
-            ?.trim() || '')
+        const html = result.html?.replaceAll(/[\t\n\r]/gi, '')?.trim() || ''
+        const $ = cheerio.load(html)
 
         const tradehistory = []
-        $('.tradehistoryrow').each(function () {
-            const tradehistoryrow_el = $(this)
+        for (const tradehistoryrow_el of querySelectorAll($, '.tradehistoryrow')) {
             const tradehistory_date_el = tradehistoryrow_el.find('.tradehistory_date')
             const tradehistory_timestamp_el = tradehistory_date_el.find('.tradehistory_timestamp')
 
@@ -5584,40 +5583,31 @@ class SteamUser {
 
             const plusminus = tradehistoryrow_el.find('.tradehistory_items_plusminus').text().trim()//+ -
             const tradehistory_items = []
-            tradehistoryrow_el.find('.tradehistory_items').each(function () {
-                const tradehistory_items_el = $(this)
-                const items_plusminus = tradehistory_items_el.find('.tradehistory_items_plusminus').text().trim()
-                tradehistory_items_el.find('.tradehistory_items_group > .history_item').each(function () {
-                    const itemEl = $(this)
-                    const text = itemEl.text().trim()//You did not receive any items in this trade.
+
+            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 appID = itemEl.attr('data-appid')
                     const classid = itemEl.attr('data-classid')
                     const instanceid = itemEl.attr('data-instanceid')
                     const contextid = itemEl.attr('data-contextid')
 
                     if (text !== `You did not receive any items in this trade.`) {
-                        if (descriptions[appID]) {
-                            const item = descriptions[appID][classid + '_' + instanceid]
-                            if (item) {
-                                tradehistory_items.push({...item, plusminus: items_plusminus})
-                            } else {
-                                tradehistory_items.push({
-                                    appID,
-                                    classid,
-                                    instanceid,
-                                    contextid,
-                                    steamId,
-                                    plusminus: items_plusminus
-                                })
-                            }
-                        } else {
-                            // console.log("No app descriptions", appID);
-                        }
+                        tradehistory_items.push({
+                            appID,
+                            classid,
+                            instanceid,
+                            contextid,
+                            steamId,
+                            plusminus,
+                            ...(descriptions[appID]?.[classid + '_' + instanceid])
+                        })
                     }
-                })
-            })
+                }
+            }
 
-            if(tradehistory_items.length){
+            if (tradehistory_items.length) {
                 const id = [timestamp, description, plusminus, tradehistory_items.map(item => (item.classid || '0') + "_" + (item.instanceid || '0')).join('|')]
                     .map(item => item.toString().replaceAll(/[^a-zA-Z0-9-+_|]/gi, ''))
                     .join('_').toLowerCase()
@@ -5633,9 +5623,10 @@ class SteamUser {
                     ...(!!tradePeople && {tradePeople})
                 })
             } else {
+                fs.writeFileSync('tradehistory_items_empty_' + steamId + "_" + new Date().getTime(), html)
                 console.error("tradehistory_items empty", steamId);
             }
-        })
+        }
 
         return {cursor: result.cursor, tradehistory}
         const exampleTradeHistory = [
@@ -6103,4 +6094,21 @@ class SteamUser {
     }
 }
 
+function plainText(text) {
+    return text?.replaceAll(/[\t\n\r]/gi, ' ')?.replaceAll(/\s+/g, ' ')?.trim()
+}
+
+function querySelectorAll($, selector, root) {
+    try {
+        if (root) {
+            return [...root.find(selector)].map(el => $(el))
+        } else {
+            return [...$(selector)].map(el => $(el))
+        }
+    } catch (e) {
+        console.error(e);
+        return []
+    }
+}
+
 export default SteamUser

package/package.json

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