steamutils 1.3.51 → 1.3.52

package/CookieManager.js

@@ -0,0 +1,64 @@
+export default function CookieManager(cookie) {
+  const _CookieObj = {};
+  if (typeof cookie === "string") {
+    cookie.split(";").forEach(function (_cookie) {
+      setCookie(_cookie.split("=")[0].trim(), _cookie.split("=")[1].trim());
+    });
+  } else if (Array.isArray(cookie)) {
+    cookie.forEach(function (_cookie) {
+      if (typeof _cookie === "string") {
+        setCookie(_cookie.split("=")[0].trim(), _cookie.split("=")[1].trim());
+      } else {
+        //to do
+      }
+    });
+  } else if (typeof cookie === "object" && Object.keys(cookie).length) {
+    for (const key in cookie) {
+      setCookie(key, cookie[key]);
+    }
+  } else {
+    //to do
+  }
+
+  function setCookie(name, value) {
+    removeCookie(name);
+    _CookieObj[name] = value;
+  }
+
+  function removeCookie(name) {
+    const existedKey = Object.keys(_CookieObj).find((k) => k.toLowerCase() === name.toLowerCase());
+    if (existedKey) {
+      delete _CookieObj[existedKey];
+    }
+  }
+
+  function setCookies(cookies) {
+    if (Array.isArray(cookies)) {
+      for (let cookie of cookies) {
+        if (typeof cookie === "string") {
+          cookie = cookie.split(";")[0].trim();
+          setCookie(cookie.split("=")[0].trim(), cookie.split("=")[1].trim());
+        }
+      }
+    }
+  }
+
+  function getCookie(name) {
+    const existedKey = Object.keys(_CookieObj).find((k) => k.toLowerCase() === name.toLowerCase());
+    return _CookieObj[existedKey];
+  }
+
+  function toString() {
+    return Object.keys(_CookieObj)
+      .map((k) => `${k}=${_CookieObj[k]}`)
+      .join(";");
+  }
+
+  return {
+    setCookie,
+    removeCookie,
+    setCookies,
+    getCookie,
+    toString,
+  };
+}

package/SteamClient.js

@@ -680,8 +680,17 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
   }
 
   async function sendHello() {
-    steamClient.sendToGC(AppID, Protos.csgo.ECsgoGCMsg.k_EMsgGCCStrike15_v2_MatchmakingClient2GCHello, {}, Buffer.alloc(0));
-    steamClient.sendToGC(AppID, Protos.csgo.EGCBaseClientMsg.k_EMsgGCClientHello, {}, Buffer.alloc(0));
+    steamClient.sendToGC(
+      AppID,
+      Protos.csgo.EGCBaseClientMsg.k_EMsgGCClientHello,
+      {},
+      protoEncode(Protos.csgo.CMsgClientHello, {
+        version: 2000258, //get from https://github.com/SteamDatabase/GameTracking-CS2/commits
+        client_session_need: 0,
+        client_launcher: 0,
+        steam_launcher: 0,
+      }),
+    );
   }
 
   async function requestCoPlays() {
@@ -1686,9 +1695,28 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
   }
 
   async function login(reconnect = false) {
+    function logOn(clientJsToken) {
+      if (clientJsToken.steamid) {
+        Object.assign(clientJsToken, {
+          steamId: new SteamID(clientJsToken.steamid),
+          accountName: clientJsToken.account_name,
+          webLogonToken: clientJsToken.token,
+          password,
+          twoFactorCode,
+        });
+      }
+      try {
+        steamClient.logOn(clientJsToken);
+        return true;
+      } catch (e) {
+        console.error(e);
+        return false;
+      }
+    }
+
     if (clientJsToken?.logged_in === true) {
       log(reconnect ? "reconnect with clientJsToken" : "login with clientJsToken");
-      steamClient.logOn(clientJsToken);
+      return logOn(clientJsToken);
       setTimeout(function () {
         clientJsToken = null;
       }, 1000);
@@ -1697,13 +1725,9 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
       log(reconnect ? "reconnect with cookie" : "login with cookie");
       const _clientJsToken = await new SteamUser(typeof cookie === "function" ? await cookie() : cookie).getClientJsToken();
       if (_clientJsToken?.logged_in === true) {
-        try {
-          await steamClient.logOn(_clientJsToken);
-          return true;
-        } catch (e) {
-          return false;
-        }
+        return logOn(_clientJsToken);
       } else {
+        log("Account not logged in");
         return false;
       }
     } else if (username && password) {
@@ -1975,8 +1999,22 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
       apps = [apps];
     }
 
-    steamClient.gamesPlayed(apps);
-    const shouldHello = apps.some((app) => parseInt(app) === 730);
+    const processedApps = apps.map((app) => {
+      if (typeof app == "string") {
+        app = { game_id: "15190414816125648896", game_extra_info: app };
+      } else if (typeof app === "number" || typeof app != "object") {
+        app = { game_id: app };
+      }
+
+      if (typeof app.game_ip_address == "number") {
+        app.game_ip_address = { v4: app.game_ip_address };
+      }
+
+      return app;
+    });
+
+    steamClient.gamesPlayed(processedApps);
+    const shouldHello = processedApps.some((app) => parseInt(app.game_id) === 730);
     await sleep(2000);
     if (shouldHello) {
       await sendHello();

package/cheerio.js

@@ -1,71 +1,103 @@
-export function tables2json($, tables, getValue) {
-    const tablesData = []
-    $(tables).each(function (index, el) {
-        tablesData.push(table2json($, el, getValue))
-    })
-    return tablesData
-}
-
-export function table2json($, table, getValue = function ($, el) {
-    return $(el).text().trim()
-}) {
-    const data = []
-    const header = []
-    $($(table)[0]).find('tr').each(function (trIndex, trEl) {
-        const tr = $(trEl)
-        const row = []
-        tr.children().each(function (tdIndex, tdEl) {
-            const isHeader = tdEl.name.toLowerCase() === 'th'
-            tdEl = $(tdEl)
-            const tdContent = getValue($, tdEl, isHeader);
-            (isHeader ? header : row).push(tdContent)
-        })
-        if(row.length) {
-            data.push(row)
-        }
-    })
-
-    if(!header.length) return data
-
-    for (let i = 0; i < data.length; i++) {
-        const obj = {}
-        for (let j = 0; j < header.length; j++) {
-            obj[header[j]] = data[i][j]
-        }
-        data[i] = obj
-    }
-
-    return data
-}
-
-export function getTableHasHeaders($, $tables, headers = []) {
-    headers = headers.slice()
-    const tables = []
-    $($tables).each((tableIndex, tableEl) => {
-        const _headers = headers.slice()
-        let table
-        if(table) {
-            return
-        }
-        const $tableEl = $(tableEl)
-        $tableEl.find('tr').children().each(function (trIndex, trEl) {
-            if(table) {
-                return
-            }
-            const $trEl = $(trEl)
-            let text = $trEl.text().trim()
-
-            if(_headers.includes(text)) {
-                _headers.splice(_headers.indexOf(text), 1)
-
-                if(!_headers.length) {
-                    table = $tableEl
-                }
-            }
-        })
-        if(table) {
-            tables.push(table)
-        }
-    })
-    return tables
-}
+import * as cheerio from "cheerio";
+
+export function tables2json($, tables, getValue) {
+  const tablesData = [];
+  $(tables).each(function (index, el) {
+    tablesData.push(table2json($, el, getValue));
+  });
+  return tablesData;
+}
+
+export function table2json(
+  $,
+  table,
+  getValue = function ($, el) {
+    return $(el).text().trim();
+  },
+) {
+  const data = [];
+  const header = [];
+  $($(table)[0])
+    .find("tr")
+    .each(function (trIndex, trEl) {
+      const tr = $(trEl);
+      const row = [];
+      tr.children().each(function (tdIndex, tdEl) {
+        const isHeader = tdEl.name.toLowerCase() === "th";
+        tdEl = $(tdEl);
+        const tdContent = getValue($, tdEl, isHeader);
+        (isHeader ? header : row).push(tdContent);
+      });
+      if (row.length) {
+        data.push(row);
+      }
+    });
+
+  if (!header.length) return data;
+
+  for (let i = 0; i < data.length; i++) {
+    const obj = {};
+    for (let j = 0; j < header.length; j++) {
+      obj[header[j]] = data[i][j];
+    }
+    data[i] = obj;
+  }
+
+  return data;
+}
+
+export function getTableHasHeaders($, $tables, headers = []) {
+  headers = headers.slice();
+  const tables = [];
+  $($tables).each((tableIndex, tableEl) => {
+    const _headers = headers.slice();
+    let table;
+    if (table) {
+      return;
+    }
+    const $tableEl = $(tableEl);
+    $tableEl
+      .find("tr")
+      .children()
+      .each(function (trIndex, trEl) {
+        if (table) {
+          return;
+        }
+        const $trEl = $(trEl);
+        let text = $trEl.text().trim();
+
+        if (_headers.includes(text)) {
+          _headers.splice(_headers.indexOf(text), 1);
+
+          if (!_headers.length) {
+            table = $tableEl;
+          }
+        }
+      });
+    if (table) {
+      tables.push(table);
+    }
+  });
+  return tables;
+}
+
+export 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 function getDocumentTitle(html) {
+  if (!html || typeof html !== "string") return;
+  return cheerio
+    .load(html.replaceAll(/[\t\n\r]/gi, "").trim())("head > title")
+    .text()
+    .trim();
+}