steamutils 1.4.71 → 1.4.73

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

@@ -42,18 +42,26 @@ import _ from "lodash";
           });
         }
         
-        try {
-            const result = (
-                await axios.post(getAppURL(), {
-                    method: "${methodName}",
-                    params: __params,
-                    cookies: __cookies,
-                    is_static: ${!!is_static}
-                })
-            ).data?.result;
-            return result
-        } catch (e) {
-          /* empty */
+        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`;
     }

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

@@ -1302,6 +1302,7 @@ export default class SteamUser {
                 const $ = cheerio.load(html.replaceAll(/[\t\n\r]/gi, "").trim());
                 const title = $("head > title").text().trim();
                 const errorMsg = $("#error_msg").text().trim();
+                const headline = $("#headline").text().trim();
 
                 if (title && SteamErrorTitle.includes(title)) {
                   isError = true;
@@ -1310,6 +1311,14 @@ export default class SteamUser {
                     steamId: self._steamIdUser,
                     originalURL,
                   });
+                } else if (title === "Error" && headline === "Something Went Wrong") {
+                  isError = true;
+                  response = new ResponseError({
+                    message: headline,
+                    detail: $("#message").text().trim(),
+                    steamId: self._steamIdUser,
+                    originalURL,
+                  });
                 }
               }
 

package/package.json

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