steamutils 1.3.54 → 1.3.55

package/SteamClient.js

@@ -1696,15 +1696,14 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
 
   async function login(reconnect = false) {
     function logOn(clientJsToken) {
-      if (clientJsToken.steamid) {
-        Object.assign(clientJsToken, {
+      try {
+        steamClient.logOn({
+          ...clientJsToken,
           steamId: new SteamID(clientJsToken.steamid),
+          steamID: new SteamID(clientJsToken.steamid),
           accountName: clientJsToken.account_name,
           webLogonToken: clientJsToken.token,
         });
-      }
-      try {
-        steamClient.logOn(clientJsToken);
         return true;
       } catch (e) {
         console.error(e);
@@ -1714,11 +1713,10 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
 
     if (clientJsToken?.logged_in === true) {
       log(reconnect ? "reconnect with clientJsToken" : "login with clientJsToken");
-      return logOn(clientJsToken);
       setTimeout(function () {
         clientJsToken = null;
       }, 1000);
-      return true;
+      return logOn(clientJsToken);
     } else if (cookie) {
       log(reconnect ? "reconnect with cookie" : "login with cookie");
       const _clientJsToken = await new SteamUser(typeof cookie === "function" ? await cookie() : cookie).getClientJsToken();
@@ -1763,18 +1761,18 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
     }
   }
 
-  function init() {
+  async function init() {
     bindEvent();
-    login();
-
-    steamClient._handlerManager.add(Protos.csgo.EMsg.k_EMsgClientRequestedClientStats, function (payload) {
-      const result = protoDecode(Protos.csgo.CMsgClientRequestedClientStats, payload.toBuffer());
-      // console.log("CMsgClientRequestedClientStats", result);
-    });
-    steamClient._handlerManager.add(Protos.csgo.EMsg.k_EMsgClientMMSLobbyData, function (payload) {
-      const result = protoDecode(Protos.csgo.CMsgClientMMSLobbyData, payload.toBuffer());
-      // console.log("CMsgClientMMSLobbyData", result, result.metadata);
-    });
+    if (await login()) {
+      steamClient._handlerManager.add(Protos.csgo.EMsg.k_EMsgClientRequestedClientStats, function (payload) {
+        const result = protoDecode(Protos.csgo.CMsgClientRequestedClientStats, payload.toBuffer());
+        // console.log("CMsgClientRequestedClientStats", result);
+      });
+      steamClient._handlerManager.add(Protos.csgo.EMsg.k_EMsgClientMMSLobbyData, function (payload) {
+        const result = protoDecode(Protos.csgo.CMsgClientMMSLobbyData, payload.toBuffer());
+        // console.log("CMsgClientMMSLobbyData", result, result.metadata);
+      });
+    }
   }
 
   function partyRegister() {

package/index.js

@@ -2093,19 +2093,45 @@ export default class SteamUser {
   }
 
   async getClientJsToken(retry = null) {
+    function returnAlter(userinfo) {
+      return userinfo
+        ? {
+            ...userinfo,
+            steamId: new SteamID(userinfo.steamid),
+            steamID: new SteamID(userinfo.steamid),
+            accountName: userinfo.account_name,
+            webLogonToken: userinfo.token,
+          }
+        : null;
+    }
+
+    const html = (await this._httpRequest("chat"))?.data;
+    const userinfo = cheerio
+      .load(html || "")("#webui_config")
+      .data("userinfo");
+    if (userinfo?.logged_in === true) {
+      return returnAlter(userinfo);
+    }
+
+    const exampleUserinfo = {
+      logged_in: true,
+      steamid: "76561199040402348",
+      accountid: 1080136620,
+      account_name: "henry22230",
+      is_support: false,
+      is_limited: false,
+      is_partner_member: false,
+      country_code: "VN",
+      token: "tpXZZcmhvw4AAAAAAAAAAAAAAAAAAAAAAwCNGElboy44N8CqQzVFAkX4",
+      token_use_id: "432e9779bcc4c2bf39022031",
+    };
+
     const result = (await this._httpRequest("chat/clientjstoken"))?.data;
     if (result instanceof ResponseError) {
       return result;
     }
-    if (!result?.steamid) {
-      if (retry !== null && retry !== undefined && retry >= 0) {
-        await sleep(2000);
-        return await this.getClientJsToken(retry - 1);
-      } else {
-        return null;
-      }
-    }
 
+    return returnAlter(result);
     const dataExample = {
       logged_in: true,
       steamid: "76561199040402348",
@@ -2113,12 +2139,6 @@ export default class SteamUser {
       account_name: "henry22230",
       token: "1o7xYpbcmTsAAAAAAAAAAAAAAAAAAAAAAwCf6fVEGxM9H7Tnk5oW5QPI",
     };
-
-    return Object.assign(result, {
-      steamId: new SteamID(result.steamid),
-      accountName: result.account_name,
-      webLogonToken: result.token,
-    });
   }
 
   getClientLogonToken = this.getClientJsToken;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "steamutils",
-  "version": "1.3.54",
+  "version": "1.3.55",
   "main": "index.js",
   "dependencies": {
     "alpha-common-utils": "^1.0.6",
@@ -10,7 +10,7 @@
     "crypto-js": "^4.2.0",
     "csgo-friendcode": "^3.0.3",
     "form-data": "^4.0.0",
-    "jimp": "^0.22.10",
+    "jimp": "^0.22.12",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "moment-timezone": "^0.5.45",

package/test_steamclient.js

@@ -2,7 +2,7 @@ import SteamClient from "./SteamClient.js";
 
 (async function () {
   const steamClient = new SteamClient({
-    cookie: "steamLoginSecure=76561199408140539%7C%7CeyAidHlwIjogIkpXVCIsICJhbGciOiAiRWREU0EiIH0.eyAiaXNzIjogInI6MUEwRl8yM0Y3MTMxRF83MDdCQSIsICJzdWIiOiAiNzY1NjExOTk0MDgxNDA1MzkiLCAiYXVkIjogWyAid2ViIiwgIm1vYmlsZSIgXSwgImV4cCI6IDE3MDg3MzkyNjEsICJuYmYiOiAxNzAwMDEyMDAwLCAiaWF0IjogMTcwODY1MjAwMCwgImp0aSI6ICIwRUYxXzIzRkVENzg5X0EyMkE2IiwgIm9hdCI6IDE3MDgwODcxMDgsICJydF9leHAiOiAxNzI2MTk0MDQ2LCAicGVyIjogMCwgImlwX3N1YmplY3QiOiAiMTQuMTkxLjE2Ny4yMDEiLCAiaXBfY29uZmlybWVyIjogIjE0LjE5MS4xNjcuMjAxIiB9.OwQczS3Ey_twA27KGtOdx3kRimOfWLDkuRgfOtjl3ZmHAv_qYtwO6x2PGZtaQFyE75rSEzN-aUW_WjYDAOdRCQ;sessionid=165fb1e643efb54f7dc81557",
+    cookie: "timezoneOffset=25200,0; _ga=GA1.2.51100933.1683654836; browserid=2699389310852036147; rgDiscussionPrefs=%7B%22cTopicRepliesPerPage%22%3A50%7D; wants_mature_content_apps=218640|1599340; strInventoryLastContext=730_2; steamLoginSecure=76561199040402348%7C%7CeyAidHlwIjogIkpXVCIsICJhbGciOiAiRWREU0EiIH0.eyAiaXNzIjogInI6MUI0Ql8yM0Y3MUE1MV8wNjRDMSIsICJzdWIiOiAiNzY1NjExOTkwNDA0MDIzNDgiLCAiYXVkIjogWyAid2ViOmNvbW11bml0eSIgXSwgImV4cCI6IDE3MDg3NzcyNTgsICJuYmYiOiAxNzAwMDUwMzkxLCAiaWF0IjogMTcwODY5MDM5MSwgImp0aSI6ICIwRUUxXzIzRkVEN0YxXzczNjVEIiwgIm9hdCI6IDE3MDgyNDUxNjAsICJydF9leHAiOiAxNzI2MTg5NzEyLCAicGVyIjogMCwgImlwX3N1YmplY3QiOiAiMTQuMTkxLjE2Ny4yMDEiLCAiaXBfY29uZmlybWVyIjogIjE0LjE5MS4xNjcuMjAxIiB9.dkeAiPn2YX3S60olBHLL7cbQVAbDvqjgAmKpnLaKiiQIglks6z590YW-4wLPLCKl-uExgf_gtd_JrKk3qZkWAQ; recentlyVisitedAppHubs=218640%2C1568590%2C413850%2C1580960%2C221410%2C346110%2C2529120%2C552540%2C1203220%2C264710%2C1599340%2C439700%2C1085660%2C730%2C440; sessionid=e5fbb58bfa8c18fd51891d24",
     isAutoPlay: true,
     // password: "VitGa_23",
     // twoFactorCode: "99B9G",