steamutils 1.4.77 → 1.4.78

package/create_proto.js

@@ -1,96 +1,96 @@
-import helpers, { loadProfos } from "./helpers/protos.js";
-import path from "path";
-import { fileURLToPath } from "url";
-import Protobuf from "protobufjs";
-import fs from "fs";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const shortfileName = "steamproto.js";
-const fullfileName = "full_steamproto.js";
-
-function main() {
-  const rootDir = `${__dirname}/protos/`;
-  const Protos = helpers([
-    {
-      name: "csgo",
-      protos: loadProfos(rootDir),
-    },
-  ]);
-
-  const content = fs.readFileSync("_steamproto.js", { encoding: "utf8", flag: "r" });
-
-  fs.writeFileSync(shortfileName, `${content}\nexport const SteamProtoType = {};export const ESteamProto = {};`);
-  fs.writeFileSync(fullfileName, `${content}\nexport const SteamProtoType = {};export const ESteamProto = {};`);
-
-  for (const key in Protos.csgo) {
-    let csgo = Protos.csgo[key];
-    if (typeof csgo === "function" || typeof csgo === "boolean" || typeof csgo === "string" || Array.isArray(csgo) || csgo === null) {
-      continue;
-    }
-
-    if (csgo instanceof Protobuf.Type) {
-      const fields = {};
-      for (const fieldsKey in csgo.fields) {
-        fields[fieldsKey] = fieldsKey;
-      }
-
-      const filename = path.relative(rootDir, csgo.filename);
-      const text = `SteamProtoType.${key} = ${JSON.stringify({ name: csgo.name, filename })};`;
-      fs.appendFileSync(fullfileName, text);
-      if (hasKeyDir(key, __dirname)) {
-        fs.appendFileSync(shortfileName, text);
-      }
-    } else {
-      for (const csgoKey in csgo) {
-        if (csgo[csgoKey] instanceof Protobuf.Enum) {
-          const values = csgo[csgoKey].values;
-          fs.appendFileSync(fullfileName, `ESteamProto.${csgoKey} = ${JSON.stringify(values)};`);
-
-          for (const valuesKey in values) {
-            if (!hasKeyDir(`${csgoKey}.${valuesKey}`, __dirname)) {
-              delete values[valuesKey];
-            }
-          }
-          if (Object.keys(values).length) {
-            fs.appendFileSync(shortfileName, `ESteamProto.${csgoKey} = ${JSON.stringify(values)};`);
-          }
-        }
-      }
-    }
-  }
-}
-
-const ignoreFiles = ["create_remote_file.js", shortfileName, fullfileName];
-
-export function hasKeyDir(key, dir) {
-  const currentDir = fs.readdirSync(dir);
-  for (const currentFile of currentDir) {
-    if (!["SteamClient.js", "index.js"].includes(currentFile)) {
-      continue;
-    }
-
-    const _dir = path.join(dir, currentFile);
-    const isDirectory = fs.lstatSync(_dir).isDirectory();
-    if (isDirectory) {
-      if (currentFile !== "node_modules") {
-        if (hasKeyDir(key, _dir)) {
-          return true;
-        }
-      }
-    } else {
-      if (currentFile.endsWith(".js") && !ignoreFiles.includes(currentFile)) {
-        if (hasKeyFile(key, _dir)) {
-          return true;
-        }
-      }
-    }
-  }
-  return false;
-}
-
-export function hasKeyFile(key, file) {
-  const content = fs.readFileSync(file);
-  return content.includes(key);
-}
-
-main();
+import helpers, { loadProfos } from "./helpers/protos.js";
+import path from "path";
+import { fileURLToPath } from "url";
+import Protobuf from "protobufjs";
+import fs from "fs";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const shortfileName = "steamproto.js";
+const fullfileName = "full_steamproto.js";
+
+function main() {
+  const rootDir = `${__dirname}/protos/`;
+  const Protos = helpers([
+    {
+      name: "csgo",
+      protos: loadProfos(rootDir),
+    },
+  ]);
+
+  const content = fs.readFileSync("_steamproto.js", { encoding: "utf8", flag: "r" });
+
+  fs.writeFileSync(shortfileName, `${content}\nexport const SteamProtoType = {};export const ESteamProto = {};`);
+  fs.writeFileSync(fullfileName, `${content}\nexport const SteamProtoType = {};export const ESteamProto = {};`);
+
+  for (const key in Protos.csgo) {
+    let csgo = Protos.csgo[key];
+    if (typeof csgo === "function" || typeof csgo === "boolean" || typeof csgo === "string" || Array.isArray(csgo) || csgo === null) {
+      continue;
+    }
+
+    if (csgo instanceof Protobuf.Type) {
+      const fields = {};
+      for (const fieldsKey in csgo.fields) {
+        fields[fieldsKey] = fieldsKey;
+      }
+
+      const filename = path.relative(rootDir, csgo.filename);
+      const text = `SteamProtoType.${key} = ${JSON.stringify({ name: csgo.name, filename })};`;
+      fs.appendFileSync(fullfileName, text);
+      if (hasKeyDir(key, __dirname)) {
+        fs.appendFileSync(shortfileName, text);
+      }
+    } else {
+      for (const csgoKey in csgo) {
+        if (csgo[csgoKey] instanceof Protobuf.Enum) {
+          const values = csgo[csgoKey].values;
+          fs.appendFileSync(fullfileName, `ESteamProto.${csgoKey} = ${JSON.stringify(values)};`);
+
+          for (const valuesKey in values) {
+            if (!hasKeyDir(`${csgoKey}.${valuesKey}`, __dirname)) {
+              delete values[valuesKey];
+            }
+          }
+          if (Object.keys(values).length) {
+            fs.appendFileSync(shortfileName, `ESteamProto.${csgoKey} = ${JSON.stringify(values)};`);
+          }
+        }
+      }
+    }
+  }
+}
+
+const ignoreFiles = ["create_remote_file.js", shortfileName, fullfileName];
+
+export function hasKeyDir(key, dir) {
+  const currentDir = fs.readdirSync(dir);
+  for (const currentFile of currentDir) {
+    if (!["SteamClient.js", "index.js"].includes(currentFile)) {
+      continue;
+    }
+
+    const _dir = path.join(dir, currentFile);
+    const isDirectory = fs.lstatSync(_dir).isDirectory();
+    if (isDirectory) {
+      if (currentFile !== "node_modules") {
+        if (hasKeyDir(key, _dir)) {
+          return true;
+        }
+      }
+    } else {
+      if (currentFile.endsWith(".js") && !ignoreFiles.includes(currentFile)) {
+        if (hasKeyFile(key, _dir)) {
+          return true;
+        }
+      }
+    }
+  }
+  return false;
+}
+
+export function hasKeyFile(key, file) {
+  const content = fs.readFileSync(file);
+  return content.includes(key);
+}
+
+main();

package/create_remote_file.js

@@ -1,74 +1,146 @@
-import SteamUser from "./index.js";
-import _ from "lodash";
-
-(async function () {
-  const xx = SteamUser;
-
-  let json = "";
-
-  function doWrite(user, is_static) {
-    for (const methodName of Object.getOwnPropertyNames(user)) {
-      if (methodName === "constructor" || methodName === "length" || methodName === "name" || methodName === "prototype" || methodName === "RequestXML_TooManyRequests" || methodName === "MAX_RETRY") {
-        continue;
-      }
-      const fnString = user[methodName].toString().trim();
-      const async = "async";
-      // const async = fnString.startsWith("async") ? "async" : "";
-      let params = fnString.split("(")[1].split(")")[0];
-      const paramsList = params.split(",");
-      for (let i = 0; i < paramsList.length; i++) {
-        if (paramsList[i].includes("=")) {
-          paramsList[i] = paramsList[i].split("=")[0].trim();
-        }
-      }
-      params = paramsList.join(", ").trim();
-      if (params.startsWith("{") && !params.endsWith("}")) {
-        params = `${params}}`;
-      }
-
-      json += `${`
-  ${is_static ? "static " : ""}  ${async} ${methodName}(${params}){
-        const __params = [${params}];
-        if(__params.length === 1 && __params[0] === undefined){
-            __params.length = 0
-        }
-        let __cookies = this._cookies;
-        if (__cookies) {
-          if (!Array.isArray(__cookies)) {
-            __cookies = [__cookies];
-          }
-          __cookies = __cookies.map(function (cookie) {
-            return cookie.toString();
-          });
-        }
-        
-        for (let i = 0; i < 5; i++) {
-          try {
-            const response = await axios.post(getAppURL(), {
-              method: "${methodName}",
-              params: __params,
-              cookies: __cookies,
-              is_static: ${!!is_static}
-            });
-      
-            if (!response || response.error) {
-              if (response?.message) {
-                console.error(response?.message);
-              }
-              continue;
-            }
-      
-            return response.data?.result;
-          } catch (e) {
-            /* empty */
-          }
-        }
-    }`.trim()}\n`;
-    }
-  }
-
-  doWrite(SteamUser.prototype, false);
-  doWrite(SteamUser, true);
-
-  console.log("");
-})();
+import SteamUser from "./index.js";
+import fs from "fs";
+
+(async function () {
+  let content = "";
+
+  function doWrite(user, is_static) {
+    for (const methodName of Object.getOwnPropertyNames(user)) {
+      if (methodName === "constructor" || methodName === "length" || methodName === "name" || methodName === "prototype" || methodName === "RequestXML_TooManyRequests" || methodName === "MAX_RETRY") {
+        continue;
+      }
+      const fnString = user[methodName].toString().trim();
+      const async = "async";
+      // const async = fnString.startsWith("async") ? "async" : "";
+      let params = fnString.split("(")[1].split(")")[0];
+      const paramsList = params.split(",");
+      for (let i = 0; i < paramsList.length; i++) {
+        if (paramsList[i].includes("=")) {
+          paramsList[i] = paramsList[i].split("=")[0].trim();
+        }
+      }
+      params = paramsList.join(", ").trim();
+      if (params.startsWith("{") && !params.endsWith("}")) {
+        params = `${params}}`;
+      }
+
+      content += `${`
+  ${is_static ? "static " : ""}  ${async} ${methodName}(${params}){
+        const {__params, __cookies} = formatParams([${params}] ${is_static ? "" : ", this._cookies"} );
+        const config = {
+              method: "${methodName}",
+              params: __params,${is_static ? "" : "cookies: __cookies,"}
+              is_static: ${!!is_static}
+            }
+        return await doRequest(config)
+    }`.trim()}\n`;
+    }
+  }
+
+  doWrite(SteamUser.prototype, false);
+  doWrite(SteamUser, true);
+
+  const fileContent = `
+  
+import axios from "axios";
+import SteamUser, { ELanguage } from "./index.js";
+import CookieManager from "./CookieManager.js";
+
+function getAppURL() {
+  if (!RemoteSteamUser.__appIndex) {
+    RemoteSteamUser.__appIndex = 0;
+  }
+  RemoteSteamUser.__appIndex++;
+  if (RemoteSteamUser.__appIndex >= RemoteSteamUser.__apps.length) {
+    RemoteSteamUser.__appIndex = 0;
+  }
+  return RemoteSteamUser.__apps[RemoteSteamUser.__appIndex];
+}
+
+function formatParams(__params, __cookies) {
+  if (__params.length === 1 && __params[0] === undefined) {
+    __params.length = 0;
+  }
+  if (__cookies) {
+    if (!Array.isArray(__cookies)) {
+      __cookies = [__cookies];
+    }
+    __cookies = __cookies.map(function (cookie) {
+      return cookie.toString();
+    });
+  }
+
+  return {
+    __params,
+    __cookies,
+  };
+}
+
+const MAX_RETRY = 5;
+
+async function doRequest(config){
+  for (let i = 0; i < MAX_RETRY; i++) {
+      const url = getAppURL();
+
+      try {
+        const response = await axios.post(url, config);
+
+        if (!response || !response.data) {
+          continue;
+        }
+
+        return response.data?.result;
+      } catch (e) {
+        /* empty */
+      }
+    }
+}
+
+export default class RemoteSteamUser {
+  constructor(cookies, refreshCookie, onRefreshCookie) {
+    if (!Array.isArray(cookies)) {
+      cookies = [cookies];
+    }
+    this._refreshCookie = refreshCookie;
+    this._onRefreshCookie = onRefreshCookie;
+    this._cookies = cookies.map(function (cookie) {
+      return new CookieManager(cookie?.cookie || cookie);
+    });
+    const timezoneOffset = new Date().getTimezoneOffset() * -1 * 60 + ",0";
+    for (const cookie of this._cookies) {
+      cookie.setCookie("timezoneOffset", timezoneOffset);
+
+      let { steamMachineAuth, steamLoginSecure, steamRememberLogin, steamId, miniprofile, sessionid } = SteamUser.parseCookie(cookie.toString());
+
+      if (!sessionid) {
+        sessionid = SteamUser.generateSessionID();
+        cookie.setCookie("sessionid", sessionid);
+      }
+
+      this._sessionId = sessionid;
+      this._customURL = null;
+      this._steamIdUser = steamId;
+      this._miniProfileUser = miniprofile;
+      this._steamMachineAuth = steamMachineAuth;
+      this._steamLoginSecure = steamLoginSecure;
+      this._steamRememberLogin = steamRememberLogin;
+    }
+
+    this.setSteamLanguage(ELanguage.english);
+
+    if (!this._steamIdUser) {
+      console.error("Invalid cookie. Missing steamId");
+    }
+  }
+
+${content}
+
+}
+
+  
+  `;
+
+  fs.writeFileSync("./remote.js", fileContent.trim());
+
+  console.log("");
+})();