steamutils 1.4.61 → 1.4.63

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,66 +1,66 @@
-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();
-          });
-        }
-        
-        try {
-            const result = (
-                await axios.post(getAppURL(), {
-                    method: "${methodName}",
-                    params: __params,
-                    cookies: __cookies,
-                    is_static: ${!!is_static}
-                })
-            ).data?.result;
-            return result
-        } catch (e) {
-          /* empty */
-        }
-    }`.trim()}\n`;
-    }
-  }
-
-  doWrite(SteamUser.prototype, false);
-  doWrite(SteamUser, true);
-
-  console.log("");
-})();
+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();
+          });
+        }
+        
+        try {
+            const result = (
+                await axios.post(getAppURL(), {
+                    method: "${methodName}",
+                    params: __params,
+                    cookies: __cookies,
+                    is_static: ${!!is_static}
+                })
+            ).data?.result;
+            return result
+        } catch (e) {
+          /* empty */
+        }
+    }`.trim()}\n`;
+    }
+  }
+
+  doWrite(SteamUser.prototype, false);
+  doWrite(SteamUser, true);
+
+  console.log("");
+})();

package/helpers/protos.js

@@ -1,48 +1,48 @@
-import Protobuf from "protobufjs";
-import fs from "fs";
-import path from "path";
-
-export default function Protos(protos, ignoreErrors = true) {
-  const protobufs = {};
-
-  for (let proto of protos) {
-    const root = new Protobuf.Root();
-    const files = Array.isArray(proto.protos) ? proto.protos : fs.readdirSync(proto.protos).map((file) => path.join(proto.protos, file));
-
-    for (const file of files) {
-      if (!file.endsWith(".proto") || !fs.existsSync(file)) {
-        continue;
-      }
-
-      const childRoot = new Protobuf.Root().loadSync(file, {
-        keepCase: true,
-      });
-
-      for (const child of childRoot.nestedArray) {
-        try {
-          root.add(child);
-        } catch (e) {}
-      }
-    }
-
-    protobufs[proto.name] = root;
-  }
-
-  return protobufs;
-}
-
-export function loadProfos(dir, protos = []) {
-  const currentDir = fs.readdirSync(dir);
-  for (const currentFile of currentDir) {
-    const _dir = path.join(dir, currentFile);
-    const isDirectory = fs.lstatSync(_dir).isDirectory();
-    if (isDirectory) {
-      loadProfos(_dir, protos);
-    } else {
-      if (currentFile.endsWith(".proto")) {
-        protos.push(_dir);
-      }
-    }
-  }
-  return protos;
-}
+import Protobuf from "protobufjs";
+import fs from "fs";
+import path from "path";
+
+export default function Protos(protos, ignoreErrors = true) {
+  const protobufs = {};
+
+  for (let proto of protos) {
+    const root = new Protobuf.Root();
+    const files = Array.isArray(proto.protos) ? proto.protos : fs.readdirSync(proto.protos).map((file) => path.join(proto.protos, file));
+
+    for (const file of files) {
+      if (!file.endsWith(".proto") || !fs.existsSync(file)) {
+        continue;
+      }
+
+      const childRoot = new Protobuf.Root().loadSync(file, {
+        keepCase: true,
+      });
+
+      for (const child of childRoot.nestedArray) {
+        try {
+          root.add(child);
+        } catch (e) {}
+      }
+    }
+
+    protobufs[proto.name] = root;
+  }
+
+  return protobufs;
+}
+
+export function loadProfos(dir, protos = []) {
+  const currentDir = fs.readdirSync(dir);
+  for (const currentFile of currentDir) {
+    const _dir = path.join(dir, currentFile);
+    const isDirectory = fs.lstatSync(_dir).isDirectory();
+    if (isDirectory) {
+      loadProfos(_dir, protos);
+    } else {
+      if (currentFile.endsWith(".proto")) {
+        protos.push(_dir);
+      }
+    }
+  }
+  return protos;
+}

package/index.js

@@ -387,7 +387,15 @@ export default class SteamUser {
   }
 
   async getUserSummaryFromProfile(steamId) {
-    const url = !steamId || steamId === this.getSteamIdUser() ? "my" : "https://steamcommunity.com/profiles/" + steamId;
+    let url = "";
+    if (typeof steamId === "string" && steamId.startsWith("http")) {
+      url = steamId;
+    } else if (!steamId || steamId === this.getSteamIdUser()) {
+      url = "my";
+    } else {
+      url = "https://steamcommunity.com/profiles/" + steamId;
+    }
+
     const result = await this._httpRequest(url);
     if (result instanceof ResponseError) {
       return result;
@@ -396,9 +404,12 @@ export default class SteamUser {
   }
 
   static async getUserSummaryFromProfile(steamId, cookie) {
+    if (typeof steamId !== "string") {
+      return;
+    }
     const result = (
       await request({
-        url: "https://steamcommunity.com/profiles/" + steamId,
+        url: steamId.startsWith("http") ? steamId : "https://steamcommunity.com/profiles/" + steamId,
         headers: { ...(cookie && { cookie }) },
       })
     )?.data;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "steamutils",
-  "version": "1.4.61",
+  "version": "1.4.63",
   "main": "index.js",
   "dependencies": {
     "alpha-common-utils": "^1.0.6",