steamutils 1.5.24 → 1.5.26

package/index.js

@@ -7,7 +7,7 @@ import SteamID from "steamid";
 import URL from "url";
 import Url from "url-parse";
 import qs from "qs";
-import { console_log, downloadImage, getCleanObject, getImageSize, JSON_parse, JSON_stringify, removeSpaceKeys, secretAsBuffer, sleep } from "./utils.js";
+import { console_log, downloadImage, formatMarketHistoryDate, getCleanObject, getImageSize, JSON_parse, JSON_stringify, removeSpaceKeys, secretAsBuffer, sleep } from "./utils.js";
 import { Header, request } from "./axios.js";
 import { getTableHasHeaders, querySelectorAll, table2json } from "./cheerio.js";
 import { getJSObjectFronXML } from "./xml2json.js";
@@ -6261,110 +6261,118 @@ export default class SteamUser {
     const result = await this._httpRequestAjax({
       url: `market/mylistings/render/?count=100`,
     });
+
     if (result instanceof ResponseError) {
       return result;
     }
+
     const data = result?.data;
-    if (data?.success === true) {
-      const $ = cheerio.load(data.results_html);
-      const list = [];
-      $(".market_listing_row").each(function () {
-        try {
-          const $1 = $(this);
-          const [sElementPrefix, listingid, appid, contextid, itemid] = $1
-            .find(".market_listing_cancel_button > a")
-            .attr("href")
-            .split("(")[1]
-            .split(")")[0]
-            .split(",")
-            .map((r) => r.trim().replaceAll(`'`, "").replaceAll(`"`, ""));
-          const image = $1.find(`#mylisting_${listingid}_image`).attr("src");
-          const buyer_pays_price = StringUtils.cleanSpace($1.find(`.market_listing_price span[title="This is the price the buyer pays."]`).text().replaceAll(`(`, "").replaceAll(`)`, ""));
-          const receive_price = StringUtils.cleanSpace($1.find(`.market_listing_price span[title="This is how much you will receive."]`).text().replaceAll(`(`, "").replaceAll(`)`, ""));
-          const item_name = $1.find(".market_listing_item_name_link").text() || $1.find(".market_listing_item_name").text();
-          const game_name = $1.find(".market_listing_game_name").text();
-          const date_combined = StringUtils.cleanSpace($1.find(".market_listing_game_name + .market_listing_listed_date_combined").text());
-          list.push({
-            listingid,
-            appid,
-            contextid,
-            itemid,
-            buyer_pays_price,
-            receive_price,
-            item_name,
-            game_name,
-            date_combined,
-            image,
-          });
-        } catch (e) {}
-      });
-      const assets = Object.values(data.assets["730"]?.["2"] || {});
-      return { list, assets, success: true };
+    if (data?.success !== true) {
+      return null;
     }
+
+    const $ = cheerio.load(data.results_html);
+    const list = [];
+    $(".market_listing_row").each(function () {
+      try {
+        const $row = $(this);
+        const [sElementPrefix, listingid, appid, contextid, itemid] = $row
+          .find(".market_listing_cancel_button > a")
+          .attr("href")
+          .split("(")[1]
+          .split(")")[0]
+          .split(",")
+          .map((r) => r.trim().replaceAll(`'`, "").replaceAll(`"`, ""));
+        const image = $row.find(`#mylisting_${listingid}_image`).attr("src");
+        const buyer_pays_price = StringUtils.cleanSpace($row.find(`.market_listing_price span[title="This is the price the buyer pays."]`).text().replaceAll(`(`, "").replaceAll(`)`, ""));
+        const receive_price = StringUtils.cleanSpace($row.find(`.market_listing_price span[title="This is how much you will receive."]`).text().replaceAll(`(`, "").replaceAll(`)`, ""));
+        const item_name = $row.find(".market_listing_item_name_link").text() || $row.find(".market_listing_item_name").text();
+        const game_name = $row.find(".market_listing_game_name").text();
+        const date_combined = formatMarketHistoryDate(StringUtils.cleanSpace($row.find(".market_listing_game_name + .market_listing_listed_date_combined").text()));
+        list.push({
+          listingid,
+          appid,
+          contextid,
+          itemid,
+          buyer_pays_price,
+          receive_price,
+          item_name,
+          game_name,
+          date_combined,
+          image,
+        });
+      } catch (e) {}
+    });
+    const assets = Object.values(data.assets["730"]?.["2"] || {});
+    return { list, assets, success: true };
   }
 
   async getMyMarketHistory({ start = 0, count = 100 } = {}) {
     const result = await this._httpRequestAjax({
       url: `market/myhistory/render/?query=&start=${start}&count=${count}`,
     });
+
     if (result instanceof ResponseError) {
       return result;
     }
+
     const data = result?.data;
-    if (data?.success === true) {
-      const hovers = StringUtils.cleanSpace(data.hovers);
-      const assetById = data.assets?.[730]?.[2] || {};
-      const assestByListingId = {};
-      hovers.split("CreateItemHoverFromContainer").forEach(function (text) {
-        text = text.trim();
-        if (!text.startsWith("(")) {
-          return;
-        }
-        const texts = text.split(",");
-        const listingId = texts[1]?.substringBetweenOrNull("history_row_", "_");
-        const assestId = texts[4]?.trim()?.removeSurrounding("'");
-        if (!listingId || !assestId || !assetById[assestId]) {
+    if (data?.success !== true) {
+      return null;
+    }
+
+    const hovers = StringUtils.cleanSpace(data.hovers);
+    const assetById = data.assets?.[730]?.[2] || {};
+    const assestByListingId = {};
+    hovers.split("CreateItemHoverFromContainer").forEach(function (text) {
+      text = text.trim();
+      if (!text.startsWith("(")) {
+        return;
+      }
+      const texts = text.split(",");
+      const listingId = texts[1]?.substringBetweenOrNull("history_row_", "_");
+      const assestId = texts[4]?.trim()?.removeSurrounding("'");
+      if (!listingId || !assestId || !assetById[assestId]) {
+        return;
+      }
+      assestByListingId[listingId] = assestId;
+    });
+
+    const $ = cheerio.load(data.results_html);
+    const list = [...$(".market_listing_row")]
+      .map(function (el) {
+        el = $(el);
+        const id = el.attr("id");
+        const listingid = id.substringBetweenOrNull("history_row_", "_");
+        if (!listingid) {
           return;
         }
-        assestByListingId[listingId] = assestId;
-      });
-
-      const $ = cheerio.load(data.results_html);
-      const list = [...$(".market_listing_row")]
-        .map(function (el) {
-          el = $(el);
-          const id = el.attr("id");
-          const listingid = id.substringBetweenOrNull("history_row_", "_");
-          if (!listingid) {
-            return;
-          }
-          const gainOrLoss = StringUtils.cleanSpace(el.find(".market_listing_gainorloss").text());
-          const image = el.find(`.market_listing_item_img`).attr("src");
-          const price = parseInt(el.find(`.market_table_value .market_listing_price`).text().replaceAll(`(`, "").replaceAll(`)`, "").replaceAll(`₫`, "").replaceAll(`.`, "").replaceAll(`,`, "").trim()) || "";
-          const item_name = el.find(".market_listing_item_name").text();
-          const game_name = el.find(".market_listing_game_name").text();
-          const listedOn = StringUtils.cleanSpace(el.find(".market_listing_listed_date + .market_listing_listed_date").text().replaceAll(`Listed:`, ""));
-          const actedOn = StringUtils.cleanSpace(el.find(".market_listing_whoactedwith + .market_listing_listed_date").text().replaceAll(`Listed:`, ""));
-          const status = StringUtils.cleanSpace(el.find(".market_listing_whoactedwith").text());
+        const gainOrLoss = StringUtils.cleanSpace(el.find(".market_listing_gainorloss").text());
+        const image = el.find(`.market_listing_item_img`).attr("src");
+        const price = parseInt(el.find(`.market_table_value .market_listing_price`).text().replaceAll(`(`, "").replaceAll(`)`, "").replaceAll(`₫`, "").replaceAll(`.`, "").replaceAll(`,`, "").trim()) || "";
+        const item_name = el.find(".market_listing_item_name").text();
+        const game_name = el.find(".market_listing_game_name").text();
+        const listedOn = formatMarketHistoryDate(StringUtils.cleanSpace(el.find(".market_listing_listed_date + .market_listing_listed_date").text().replaceAll(`Listed:`, "")));
+        const actedOn = formatMarketHistoryDate(StringUtils.cleanSpace(el.find(".market_listing_whoactedwith + .market_listing_listed_date").text().replaceAll(`Listed:`, "")));
+        const status = StringUtils.cleanSpace(el.find(".market_listing_whoactedwith").text());
 
-          return {
-            id,
-            listingid,
-            price,
-            item_name,
-            game_name,
-            listedOn,
-            actedOn,
-            image,
-            gainOrLoss,
-            status,
-            ...(!!assestByListingId[listingid] && { assetId: assestByListingId[listingid] }),
-          };
-        })
-        .filter(Boolean);
-      const assets = Object.values(assetById);
-      return { ...data, list, assets, success: true };
-    }
+        return {
+          id,
+          listingid,
+          price,
+          item_name,
+          game_name,
+          listedOn,
+          actedOn,
+          image,
+          gainOrLoss,
+          status,
+          ...(!!assestByListingId[listingid] && { assetId: assestByListingId[listingid] }),
+        };
+      })
+      .filter(Boolean);
+    const assets = Object.values(assetById);
+    return { ...data, list, assets, success: true };
   }
 
   async getPlayerReports(token) {
@@ -6432,8 +6440,8 @@ export default class SteamUser {
   }
 
   async beginFileUpload(filePath) {
-    const { Jimp } = await import("jimp");
-    const image = await Jimp.read(filePath);
+    const { imageSize } = await import("image-size");
+    const dimensions = imageSize(filePath);
     const stats = fs.statSync(filePath);
 
     let sha1 = "";
@@ -6446,9 +6454,9 @@ export default class SteamUser {
       file_size: stats.size,
       file_name: path.basename(filePath),
       file_sha: sha1,
-      file_image_width: image.getWidth(),
-      file_image_height: image.getHeight(),
-      file_type: image.getMIME(),
+      file_image_width: dimensions.width,
+      file_image_height: dimensions.height,
+      file_type: dimensions.type, // Returns "jpg", "png", "webp", etc.
       sessionid: this.getSessionid(),
     };
 
@@ -7257,8 +7265,8 @@ export default class SteamUser {
     }
 
     data.communityitemid = Number(data.communityitemid);
-    if(!data.communityitemid){
-      return
+    if (!data.communityitemid) {
+      return;
     }
     return data;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "steamutils",
-  "version": "1.5.24",
+  "version": "1.5.26",
   "main": "index.js",
   "dependencies": {
     "alpha-common-utils": "^1.0.6",
@@ -10,6 +10,7 @@
     "crypto-js": "^4.2.0",
     "csgo-friendcode": "^3.0.3",
     "form-data": "^4.0.1",
+    "image-size": "^2.0.0",
     "jimp": "^1.6.0",
     "jsqr": "^1.4.0",
     "lodash": "^4.17.21",

package/utils.js

@@ -932,13 +932,15 @@ export async function loginWithCredentials({ username, password, timeoutMs = 120
           let error = null;
           const maxRetry = 3;
           for (let i = 0; i < maxRetry; i++) {
-            try {
-              await session.submitSteamGuardCode(SteamTotp.generateAuthCode(sharedSecret));
-              error = null;
-            } catch (e) {
-              error = e;
+            if (!authenticated) {
+              try {
+                await session.submitSteamGuardCode(SteamTotp.generateAuthCode(sharedSecret));
+                error = null;
+              } catch (e) {
+                error = e;
+              }
+              await sleep(1000);
             }
-            await sleep(1000);
           }
           if (error) {
             console.error(error);
@@ -986,6 +988,20 @@ export async function loginWithCredentials({ username, password, timeoutMs = 120
         return onResolve(e);
       });
 
+    session.on("error", (err) => {
+      console.error(`An error occurred: ${err.message}`);
+      return onResolve({
+        error: `An error occurred: ${err.message}`,
+      });
+    });
+
+    session.on("timeout", () => {
+      console.log("This login attempt has timed out.");
+      return onResolve({
+        error: "This login attempt has timed out.",
+      });
+    });
+
     function onResolve(data) {
       clearTimeout(timeout);
       return resolve(data);
@@ -1232,3 +1248,17 @@ export function getGameDetailScore(scoreString) {
   }
   // console.log("No match found", scoreString);
 }
+
+export function formatMarketHistoryDate(dateStr) {
+  const momentObj = moment(dateStr, "DD MMM", true);
+  if (!momentObj.isValid()) {
+    return dateStr;
+  }
+
+  const now = moment();
+  while (momentObj.isAfter(now)) {
+    momentObj.subtract(1, "years");
+  }
+
+  return momentObj.format("DD MMM YYYY");
+}