steamutils 1.4.69 → 1.4.71

package/.idea/codeStyles/Project.xml

@@ -2,6 +2,7 @@
   <code_scheme name="Project" version="173">
     <HTMLCodeStyleSettings>
       <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+      <option name="HTML_ENFORCE_QUOTES" value="true" />
     </HTMLCodeStyleSettings>
     <JSCodeStyleSettings version="0">
       <option name="FORCE_SEMICOLON_STYLE" value="true" />

package/.idea/deployment.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PublishConfigData" remoteFilesAllowedToDisappearOnAutoupload="false">
+    <serverData>
+      <paths name="botnatridiscord">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+    </serverData>
+  </component>
+</project>

package/.prettierrc.json

@@ -1,3 +1,3 @@
-{
-  "printWidth": 1000
-}
+{
+  "printWidth": 1000
+}

package/SteamClient.js

@@ -388,8 +388,13 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
     delete intervalRandoms[key];
   }
 
+  function getSteamIdFromCookie() {
+    const regex = /steamLoginSecure=(\d+)/;
+    return cookie?.match?.(regex)?.[1];
+  }
+
   function getAccountInfoName() {
-    return [steamClient?.accountInfo?.name, steamClient?._logOnDetails?.account_name].filter(Boolean).join(" - ");
+    return [getSteamIdFromCookie(), steamClient?.accountInfo?.name, steamClient?._logOnDetails?.account_name].filter(Boolean).join(" - ");
   }
 
   function getPersonaName() {
@@ -1995,7 +2000,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
     try {
       isLogOff = false;
       if (!steamClient) {
-        steamClient = new NodeSteamUser();
+        steamClient = new NodeSteamUser({
+          machineIdType: 4,
+        });
         bindEvent();
       }
       steamClient.logOn({
@@ -2126,9 +2133,7 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
 
     if (steamClient) {
       steamClient.logOff();
-      await sleep(5000);
-
-      steamClient._connection?.end(true);
+      await sleep(30000);
 
       function cleanSteamClient(obj, key) {
         const value = obj[key];

package/_steamproto.js

@@ -1,33 +1,33 @@
-import path from "path";
-import { fileURLToPath } from "url";
-import Protobuf from "protobufjs";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-export class SteamProto {
-  constructor(proto) {
-    this._proto = proto;
-  }
-
-  toProto() {
-    const root = new Protobuf.Root().loadSync(path.join(`${__dirname}/protos/`, this._proto.filename), {
-      keepCase: true,
-    });
-    return root[this._proto.name];
-  }
-
-  protoEncode(obj) {
-    const protobuf = this.toProto();
-    return protobuf.encode(protobuf.create(obj)).finish();
-  }
-
-  protoEncodeBase64(obj) {
-    return this.protoEncode(obj).toString("base64");
-  }
-
-  protoDecode(obj) {
-    const protobuf = this.toProto();
-    return protobuf.toObject(protobuf.decode(obj), { defaults: true });
-  }
-}
+import path from "path";
+import { fileURLToPath } from "url";
+import Protobuf from "protobufjs";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export class SteamProto {
+  constructor(proto) {
+    this._proto = proto;
+  }
+
+  toProto() {
+    const root = new Protobuf.Root().loadSync(path.join(`${__dirname}/protos/`, this._proto.filename), {
+      keepCase: true,
+    });
+    return root[this._proto.name];
+  }
+
+  protoEncode(obj) {
+    const protobuf = this.toProto();
+    return protobuf.encode(protobuf.create(obj)).finish();
+  }
+
+  protoEncodeBase64(obj) {
+    return this.protoEncode(obj).toString("base64");
+  }
+
+  protoDecode(obj) {
+    const protobuf = this.toProto();
+    return protobuf.toObject(protobuf.decode(obj), { defaults: true });
+  }
+}

package/axios.js

@@ -1,84 +1,84 @@
-import * as _axios from "axios";
-import * as cheerio from "cheerio";
-
-export class Header {
-  headers = {};
-
-  constructor(headers) {
-    if (typeof headers === "object" && Object.keys(headers).length) {
-      this.headers = this.validate(headers);
-    }
-  }
-
-  validate(headers) {
-    headers = Object.keys(headers).reduce(function (previousValue, currentValue, currentIndex, array) {
-      previousValue[currentValue.toLowerCase()] = headers[currentValue]?.trim();
-      return previousValue;
-    }, {});
-    if (headers.cookie === undefined || headers.cookie === null) {
-      headers.cookie = "";
-    }
-    return headers;
-  }
-
-  get(key) {
-    if (key === undefined) {
-      return { ...this.headers };
-    } else {
-      return this.headers[key.toLowerCase()];
-    }
-  }
-
-  set(key, value) {
-    if (typeof key === "string") {
-      this.headers[key.toLowerCase()] = value;
-    } else {
-      for (let _key in key) {
-        this.headers[_key.toLowerCase()] = key[_key];
-      }
-    }
-    this.headers = this.validate(this.headers);
-    return this;
-  }
-}
-
-const axios = _axios.default.create({
-  baseURL: "/",
-  timeout: 60000,
-  headers: {
-    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36",
-  },
-  validateStatus: () => true,
-  withCredentials: true,
-  maxContentLength: Infinity,
-  maxBodyLength: Infinity,
-});
-
-//debug
-// axios.interceptors.request.use(function (config) {
-//     console_log(`[axios]`, config.method, config.url)
-//     return config
-// }, function (error) {
-//     return Promise.reject(error)
-// })
-
-export async function request(config) {
-  try {
-    if (!config?.headers?.cookie) {
-      try {
-        delete config.headers.cookie;
-      } catch (e) {}
-    }
-    const result = await axios.request(config);
-    if (result.data && typeof result.data === "string") {
-      result._$ = function () {
-        return cheerio.load(result.data.replaceAll(/[\t\n\r]/gi, "").trim());
-      };
-    }
-    return result;
-  } catch (e) {
-    return {
-      error: e,
-    };
-  }
-}
+import * as _axios from "axios";
+import * as cheerio from "cheerio";
+
+export class Header {
+  headers = {};
+
+  constructor(headers) {
+    if (typeof headers === "object" && Object.keys(headers).length) {
+      this.headers = this.validate(headers);
+    }
+  }
+
+  validate(headers) {
+    headers = Object.keys(headers).reduce(function (previousValue, currentValue, currentIndex, array) {
+      previousValue[currentValue.toLowerCase()] = headers[currentValue]?.trim();
+      return previousValue;
+    }, {});
+    if (headers.cookie === undefined || headers.cookie === null) {
+      headers.cookie = "";
+    }
+    return headers;
+  }
+
+  get(key) {
+    if (key === undefined) {
+      return { ...this.headers };
+    } else {
+      return this.headers[key.toLowerCase()];
+    }
+  }
+
+  set(key, value) {
+    if (typeof key === "string") {
+      this.headers[key.toLowerCase()] = value;
+    } else {
+      for (let _key in key) {
+        this.headers[_key.toLowerCase()] = key[_key];
+      }
+    }
+    this.headers = this.validate(this.headers);
+    return this;
+  }
+}
+
+const axios = _axios.default.create({
+  baseURL: "/",
+  timeout: 60000,
+  headers: {
+    "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36",
+  },
+  validateStatus: () => true,
+  withCredentials: true,
+  maxContentLength: Infinity,
+  maxBodyLength: Infinity,
+});
+
+//debug
+// axios.interceptors.request.use(function (config) {
+//     console_log(`[axios]`, config.method, config.url)
+//     return config
+// }, function (error) {
+//     return Promise.reject(error)
+// })
+
+export async function request(config) {
+  try {
+    if (!config?.headers?.cookie) {
+      try {
+        delete config.headers.cookie;
+      } catch (e) {}
+    }
+    const result = await axios.request(config);
+    if (result.data && typeof result.data === "string") {
+      result._$ = function () {
+        return cheerio.load(result.data.replaceAll(/[\t\n\r]/gi, "").trim());
+      };
+    }
+    return result;
+  } catch (e) {
+    return {
+      error: e,
+    };
+  }
+}

package/bufferHelpers.js

@@ -1,115 +1,115 @@
-import ByteBuffer from 'bytebuffer';
-import SteamID from 'steamid';
-
-const Type = {
-    None : 0,
-    String : 1,
-    Int32 : 2,
-    Float32 : 3,
-    Pointer : 4,
-    WideString : 5,
-    Color : 6,
-    UInt64 : 7,
-    End : 8
-}
-
-// Encodes an object into a ByteBuffer
-export const encode = (
-    _object,
-    prefix = [0x00, 0x00],
-    suffix = [],
-    customEncodeFields = {}
-) => {
-    // Create a copy of the input object to avoid modifying it
-    const object = { ..._object };
-    const buffer = new ByteBuffer();
-
-    // Write the prefix bytes to the buffer
-    for (let pre of prefix) {
-        buffer.writeByte(pre);
-    }
-
-    // Iterate through the object's properties and encode them
-    for (let item in object) {
-        if (object.hasOwnProperty(item) === false) {
-            continue;
-        }
-
-        // If a custom encoder function exists for the property, use it
-        if (typeof customEncodeFields[item] === 'function') {
-            object[item] = customEncodeFields[item](object[item]);
-        }
-        _encode(object[item], buffer, item);
-    }
-
-    // Write the suffix bytes to the buffer
-    for (let suf of suffix) {
-        buffer.writeByte(suf);
-    }
-
-    // Write an End marker to the buffer
-    buffer.writeByte(Type.End);
-    buffer.flip(); // Prepare the buffer for reading
-    return buffer;
-};
-
-// Encodes individual properties into the ByteBuffer
-const _encode = (object, buffer, name) => {
-    if (object instanceof Buffer) {
-        // If the object is a Buffer
-        buffer.writeByte(Type.String);
-        buffer.writeCString(name);
-
-        // Convert the Buffer to a hexadecimal string, split into 2-character parts, and write each part as a byte
-        let parts = object
-            .toString('hex')
-            .toUpperCase()
-            .match(/.{1,2}/g);
-
-        for (let part of parts) {
-            buffer.writeByte(parseInt('0x' + part));
-        }
-    } else {
-        // If the object is not a Buffer, check its type
-        switch (typeof object) {
-            case 'object': {
-                buffer.writeByte(Type.None);
-                buffer.writeCString(name);
-
-                for (let index in object) {
-                    _encode(object[index], buffer, index); // Recursively encode each property
-                }
-
-                buffer.writeByte(Type.End);
-                break;
-            }
-            case 'string': {
-                buffer.writeByte(Type.String);
-                buffer.writeCString(name);
-                buffer.writeCString(object ? object : '');
-                break;
-            }
-            case 'number': {
-                buffer.writeByte(Type.String);
-                buffer.writeCString(name);
-                buffer.writeCString(object.toString());
-                break;
-            }
-        }
-    }
-};
-
-// Encodes SteamIDs into a Buffer
-export const encodeUids = (steamids) => {
-    const outputBuffer = [];
-
-    for (let id of steamids.map((s) => s.accountid)) {
-        while (id > 0x7f) {
-            outputBuffer.push((id | 0x80) & 0xff);
-            id >>= 7;
-        }
-        outputBuffer.push(id);
-    }
-    outputBuffer.push(0x00); // Null terminator
-    return Buffer.from(outputBuffer);
-};
+import ByteBuffer from 'bytebuffer';
+import SteamID from 'steamid';
+
+const Type = {
+    None : 0,
+    String : 1,
+    Int32 : 2,
+    Float32 : 3,
+    Pointer : 4,
+    WideString : 5,
+    Color : 6,
+    UInt64 : 7,
+    End : 8
+}
+
+// Encodes an object into a ByteBuffer
+export const encode = (
+    _object,
+    prefix = [0x00, 0x00],
+    suffix = [],
+    customEncodeFields = {}
+) => {
+    // Create a copy of the input object to avoid modifying it
+    const object = { ..._object };
+    const buffer = new ByteBuffer();
+
+    // Write the prefix bytes to the buffer
+    for (let pre of prefix) {
+        buffer.writeByte(pre);
+    }
+
+    // Iterate through the object's properties and encode them
+    for (let item in object) {
+        if (object.hasOwnProperty(item) === false) {
+            continue;
+        }
+
+        // If a custom encoder function exists for the property, use it
+        if (typeof customEncodeFields[item] === 'function') {
+            object[item] = customEncodeFields[item](object[item]);
+        }
+        _encode(object[item], buffer, item);
+    }
+
+    // Write the suffix bytes to the buffer
+    for (let suf of suffix) {
+        buffer.writeByte(suf);
+    }
+
+    // Write an End marker to the buffer
+    buffer.writeByte(Type.End);
+    buffer.flip(); // Prepare the buffer for reading
+    return buffer;
+};
+
+// Encodes individual properties into the ByteBuffer
+const _encode = (object, buffer, name) => {
+    if (object instanceof Buffer) {
+        // If the object is a Buffer
+        buffer.writeByte(Type.String);
+        buffer.writeCString(name);
+
+        // Convert the Buffer to a hexadecimal string, split into 2-character parts, and write each part as a byte
+        let parts = object
+            .toString('hex')
+            .toUpperCase()
+            .match(/.{1,2}/g);
+
+        for (let part of parts) {
+            buffer.writeByte(parseInt('0x' + part));
+        }
+    } else {
+        // If the object is not a Buffer, check its type
+        switch (typeof object) {
+            case 'object': {
+                buffer.writeByte(Type.None);
+                buffer.writeCString(name);
+
+                for (let index in object) {
+                    _encode(object[index], buffer, index); // Recursively encode each property
+                }
+
+                buffer.writeByte(Type.End);
+                break;
+            }
+            case 'string': {
+                buffer.writeByte(Type.String);
+                buffer.writeCString(name);
+                buffer.writeCString(object ? object : '');
+                break;
+            }
+            case 'number': {
+                buffer.writeByte(Type.String);
+                buffer.writeCString(name);
+                buffer.writeCString(object.toString());
+                break;
+            }
+        }
+    }
+};
+
+// Encodes SteamIDs into a Buffer
+export const encodeUids = (steamids) => {
+    const outputBuffer = [];
+
+    for (let id of steamids.map((s) => s.accountid)) {
+        while (id > 0x7f) {
+            outputBuffer.push((id | 0x80) & 0xff);
+            id >>= 7;
+        }
+        outputBuffer.push(id);
+    }
+    outputBuffer.push(0x00); // Null terminator
+    return Buffer.from(outputBuffer);
+};