steamutils 1.4.75 → 1.4.77

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

@@ -109,6 +109,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   let _cleanNodeSteamLicensesTimeout = null;
   let _cleanNodeSteamFriendTimeout = null;
 
+  let _appLaunchedTimeout = null;
+  let _appQuitTimeout = null;
+
   let _clientWelcome = null;
   let _clientHello = null;
 
@@ -197,9 +200,7 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
     for (const [eventName, events] of Object.entries(gcEvents)) {
       if (eventName === name) {
         for (const event of events) {
-          if (event.timeout) {
-            clearTimeout(event.timeout);
-          }
+          clearTimeout(event.timeout);
         }
         events.length = 0;
       } else {
@@ -207,9 +208,7 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
           return Object.values(e).some((v) => v === name);
         });
         for (const removedEvent of removedEvents) {
-          if (removedEvent.timeout) {
-            clearTimeout(removedEvent.timeout);
-          }
+          clearTimeout(removedEvent.timeout);
         }
       }
     }
@@ -229,10 +228,8 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
     let calculated = false;
 
     for (const removedEvent of removedEvents) {
-      if (removedEvent.timeout) {
-        clearTimeout(removedEvent.timeout);
-        delete removedEvent.timeout;
-      }
+      clearTimeout(removedEvent.timeout);
+      delete removedEvent.timeout;
 
       if (!calculated) {
         calculated = true;
@@ -288,9 +285,7 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
     for (const [eventName, _events] of Object.entries(events)) {
       if (eventName === name) {
         for (const event of _events) {
-          if (event.timeout) {
-            clearTimeout(event.timeout);
-          }
+          clearTimeout(event.timeout);
         }
         _events.length = 0;
       } else {
@@ -298,9 +293,7 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
           return Object.values(e).some((v) => v === name);
         });
         for (const removedEvent of removedEvents) {
-          if (removedEvent.timeout) {
-            clearTimeout(removedEvent.timeout);
-          }
+          clearTimeout(removedEvent.timeout);
         }
       }
     }
@@ -313,12 +306,8 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   function offAllEvent() {
     for (const name in events) {
       for (const event of events[name]) {
-        if (event.timeout) {
-          try {
-            clearTimeout(event.timeout);
-          } catch (e) {}
-          delete event.timeout;
-        }
+        clearTimeout(event.timeout);
+        delete event.timeout;
       }
       events[name].length = 0;
     }
@@ -335,9 +324,7 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
     }
     if (isRandom) {
       if (intervalRandoms[key] !== undefined) {
-        try {
-          clearTimeout(intervalRandoms[key]);
-        } catch (e) {}
+        clearTimeout(intervalRandoms[key]);
       }
       intervalRandoms[key] = setTimeout(
         function () {
@@ -382,9 +369,7 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
     } catch (e) {}
     delete intervals[key];
 
-    try {
-      clearTimeout(intervalRandoms[key]);
-    } catch (e) {}
+    clearTimeout(intervalRandoms[key]);
     delete intervalRandoms[key];
   }
 
@@ -450,9 +435,7 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
           if (!globalThis.SteamClient_PersonasCache_Timeout) {
             globalThis.SteamClient_PersonasCache_Timeout = {};
           }
-          if (globalThis.SteamClient_PersonasCache_Timeout[sid64]) {
-            clearTimeout(globalThis.SteamClient_PersonasCache_Timeout[sid64]);
-          }
+          clearTimeout(globalThis.SteamClient_PersonasCache_Timeout[sid64]);
           globalThis.SteamClient_PersonasCache_Timeout[sid64] = setTimeout(function () {
             delete globalThis.SteamClient_PersonasCache[sid64];
             delete globalThis.SteamClient_PersonasCache_Timeout[sid64];
@@ -1518,13 +1501,10 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
       async user(steamId, data) {
         callEvent(events.user, { steamId: steamId.getSteamID64(), data });
 
-        // cleanNodeSteamUserData
         for (const friendSteamId in steamClient.users) {
           steamClient.users[friendSteamId] = {};
         }
-        if (_cleanNodeSteamUserTimeout) {
-          clearTimeout(_cleanNodeSteamUserTimeout);
-        }
+        clearTimeout(_cleanNodeSteamUserTimeout);
         _cleanNodeSteamUserTimeout = setTimeout(function () {
           steamClient.users = {};
         }, 60000);
@@ -1667,9 +1647,7 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
 
         steamClient.myFriends = {};
 
-        if (_cleanNodeSteamFriendTimeout) {
-          clearTimeout(_cleanNodeSteamFriendTimeout);
-        }
+        clearTimeout(_cleanNodeSteamFriendTimeout);
 
         _cleanNodeSteamFriendTimeout = setTimeout(function () {
           steamClient.myFriends = {};
@@ -1693,12 +1671,14 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
         callEvent(events.emailInfo, { address, validated });
       },
       async appLaunched() {
-        setTimeout(function () {
+        clearTimeout(_appLaunchedTimeout);
+        _appLaunchedTimeout = setTimeout(function () {
           state = getPlayingAppIds().length ? "InGame" : isInvisible ? "Invisible" : "Online";
         }, 2000);
       },
       async appQuit() {
-        setTimeout(function () {
+        clearTimeout(_appQuitTimeout);
+        _appQuitTimeout = setTimeout(function () {
           state = getPlayingAppIds().length ? "InGame" : isInvisible ? "Invisible" : "Online";
         }, 2000);
       },
@@ -1720,9 +1700,7 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
       async licenses() {
         steamClient.licenses = [];
 
-        if (_cleanNodeSteamLicensesTimeout) {
-          clearTimeout(_cleanNodeSteamLicensesTimeout);
-        }
+        clearTimeout(_cleanNodeSteamLicensesTimeout);
 
         _cleanNodeSteamLicensesTimeout = setTimeout(function () {
           steamClient.licenses = [];
@@ -1812,7 +1790,14 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
     }
 
     for (const [name, _event] of Object.entries(_events)) {
-      steamClient.on(name, _event);
+      steamClient.on(name, async (...args) => {
+        if (!steamClient) {
+          return;
+        }
+        try {
+          await _event?.(...args);
+        } catch (e) {}
+      });
     }
 
     for (const [name, _event] of Object.entries(_chatEvents)) {
@@ -1824,7 +1809,7 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
     const timeout = { current: null };
     return new Promise((resolve) => {
       function myhandler(...args) {
-        timeout.current && clearTimeout(timeout.current);
+        clearTimeout(timeout.current);
         removeHandler();
         resolve(handler?.(...args));
       }
@@ -2154,15 +2139,11 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
     callEvent(events.logOff);
     events.logOff = [];
 
-    if (_cleanNodeSteamUserTimeout) {
-      clearTimeout(_cleanNodeSteamUserTimeout);
-    }
-    if (_cleanNodeSteamLicensesTimeout) {
-      clearTimeout(_cleanNodeSteamLicensesTimeout);
-    }
-    if (_cleanNodeSteamFriendTimeout) {
-      clearTimeout(_cleanNodeSteamFriendTimeout);
-    }
+    clearTimeout(_cleanNodeSteamUserTimeout);
+    clearTimeout(_cleanNodeSteamLicensesTimeout);
+    clearTimeout(_cleanNodeSteamFriendTimeout);
+    clearTimeout(_appLaunchedTimeout);
+    clearTimeout(_appQuitTimeout);
 
     if (steamClient) {
       steamClient.logOff();
@@ -2660,7 +2641,7 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   function getPlayingAppIds() {
-    return steamClient._playingAppIds || [];
+    return steamClient?._playingAppIds || [];
   }
 
   async function requestJoinFriendData(token, version) {

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,
+    };
+  }
+}