steamutils 1.4.64 → 1.4.66

package/SteamClient.js

@@ -94,8 +94,8 @@ export const SteamClientEvents = {
 };
 let isSendingFriendMessages = false;
 
-function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense = true, isFakeGameScore = true, isPartyRegister = true, isAutoPlay = false, isInvisible = false, autoAcceptTradeRequest = false, autoReconnect = true, MAX_GAME_PLAY = 10, games = null }) {
-  const steamClient = new NodeSteamUser();
+function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense = true, isFakeGameScore = true, isPartyRegister = true, isAutoPlay = false, isInvisible = false, autoAcceptTradeRequest = false, autoReconnect = true, games = null }) {
+  let steamClient = null;
   let prime = null;
   let state = "Offline"; //InGame, Online, Invisible
   let isLogOff = false;
@@ -119,11 +119,46 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
 
   const onAnyCallbacks = [];
 
-  const events = { ...SteamClientEvents };
+  /**
+   * @type {Object.<string, Array>}
+   * @property {Array} user
+   * @property {Array} loggedOn
+   * @property {Array} csgoOnline
+   * @property {Array} csgoClientHello
+   * @property {Array} webSession
+   * @property {Array} friendMessage
+   * @property {Array} friendTyping
+   * @property {Array} disconnected
+   * @property {Array} error
+   * @property {Array} playersProfile
+   * @property {Array} fatalError
+   * @property {Array} partyInvite
+   * @property {Array} friendRelationship
+   * @property {Array} tradeOffers
+   * @property {Array} offlineMessages
+   * @property {Array} friendsList
+   * @property {Array} gifts
+   * @property {Array} playingState
+   * @property {Array} emailInfo
+   * @property {Array} accountLimitations
+   * @property {Array} wallet
+   * @property {Array} licenses
+   * @property {Array} logOff
+   */
+  const events = {};
   for (const name in SteamClientEvents) {
     events[name] = [];
   }
 
+  /**
+   * @typedef {Object} GCEvents
+   * @property {Array} requestJoinFriendData
+   * @property {Array} requestCoPlays
+   * @property {Array} partySearch
+   * @property {Array} playersProfile
+   *
+   * @type {GCEvents}
+   */
   const gcEvents = {
     requestJoinFriendData: [],
     requestCoPlays: [],
@@ -159,51 +194,23 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   function clearGCCallback(name) {
-    if (!Array.isArray(name)) {
-      name = [name];
-    }
-    for (const nameE of name) {
-      switch (typeof nameE) {
-        case "string":
-          if (Array.isArray(gcEvents[nameE])) {
-            //name
-            for (const eventElement of gcEvents[nameE]) {
-              if (eventElement.timeout) {
-                clearTimeout(eventElement.timeout);
-              }
-            }
-            gcEvents[nameE] = [];
-          } else {
-            //id
-            for (const eventsKey in gcEvents) {
-              if (!Array.isArray(gcEvents[eventsKey])) {
-                continue;
-              }
-              const index = gcEvents[eventsKey].findIndex((e) => e.id === nameE);
-              if (index > -1) {
-                if (gcEvents[eventsKey].timeout) {
-                  clearTimeout(gcEvents[eventsKey].timeout);
-                }
-                gcEvents[eventsKey].splice(index, 1);
-              }
-            }
+    for (const [eventName, events] of Object.entries(gcEvents)) {
+      if (eventName === name) {
+        for (const event of events) {
+          if (event.timeout) {
+            clearTimeout(event.timeout);
           }
-          break;
-        case "function":
-          //callback
-          for (const eventsKey in gcEvents) {
-            if (!Array.isArray(gcEvents[eventsKey])) {
-              continue;
-            }
-            const index = gcEvents[eventsKey].findIndex((e) => e.callback === nameE);
-            if (index > -1) {
-              if (gcEvents[eventsKey].timeout) {
-                clearTimeout(gcEvents[eventsKey].timeout);
-              }
-              gcEvents[eventsKey].splice(index, 1);
-            }
+        }
+        events.length = 0;
+      } else {
+        const removedEvents = _.remove(events, function (e) {
+          return Object.values(e).some((v) => v === name);
+        });
+        for (const removedEvent of removedEvents) {
+          if (removedEvent.timeout) {
+            clearTimeout(removedEvent.timeout);
           }
-          break;
+        }
       }
     }
   }
@@ -217,14 +224,14 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
       return;
     }
 
-    const events = _.remove(gcEvents[name], (item) => !key || item.key === key);
+    const removedEvents = _.remove(gcEvents[name], (item) => !key || item.key === key);
     let _data = null;
     let calculated = false;
 
-    for (const event of events) {
-      if (event.timeout) {
-        clearTimeout(event.timeout);
-        delete event.timeout;
+    for (const removedEvent of removedEvents) {
+      if (removedEvent.timeout) {
+        clearTimeout(removedEvent.timeout);
+        delete removedEvent.timeout;
       }
 
       if (!calculated) {
@@ -232,23 +239,22 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
         _data = typeof data === "function" ? await data() : data;
       }
 
-      event.callback(_data);
+      removedEvent.callback(_data);
     }
   }
 
-  function callEvent(_events, data) {
-    const eventName = Object.keys(events).find((eventName) => events[eventName] === _events);
-    eventName && onAnyCallbacks.forEach((cb) => cb?.({ eventName, data }));
+  function callEvent(name, data) {
+    if (typeof name !== "string") {
+      name = Object.keys(events).find((eventName) => events[eventName] === name);
+    }
 
-    _events?.forEach?.((e) => {
+    const _events = events[name];
+    onAnyCallbacks.forEach((cb) => cb?.({ eventName: name, data }));
+    _events.forEach((e) => {
+      clearTimeout(e.timeout);
       e.callback?.(data);
-      e.timeout && clearTimeout(e.timeout);
-      delete e.timeout;
-      if (e.once) {
-        delete e.callback;
-      }
     });
-    _.remove(_events, (e) => !e || e?.once);
+    _.remove(_events, (e) => !e || e.once);
   }
 
   function onEvent({ name, id, callback, once, timeout }) {
@@ -279,51 +285,23 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
 
   // name, id, callback
   function offEvent(name) {
-    if (!Array.isArray(name)) {
-      name = [name];
-    }
-    for (const nameE of name) {
-      switch (typeof nameE) {
-        case "string":
-          if (Array.isArray(events[nameE])) {
-            //name
-            for (const eventElement of events[nameE]) {
-              if (eventElement.timeout) {
-                clearTimeout(eventElement.timeout);
-              }
-            }
-            events[nameE] = [];
-          } else {
-            //id
-            for (const eventsKey in events) {
-              if (!Array.isArray(events[eventsKey])) {
-                continue;
-              }
-              const index = events[eventsKey].findIndex((e) => e.id === nameE);
-              if (index > -1) {
-                if (events[eventsKey].timeout) {
-                  clearTimeout(events[eventsKey].timeout);
-                }
-                events[eventsKey].splice(index, 1);
-              }
-            }
+    for (const [eventName, _events] of Object.entries(events)) {
+      if (eventName === name) {
+        for (const event of _events) {
+          if (event.timeout) {
+            clearTimeout(event.timeout);
           }
-          break;
-        case "function":
-          //callback
-          for (const eventsKey in events) {
-            if (!Array.isArray(events[eventsKey])) {
-              continue;
-            }
-            const index = events[eventsKey].findIndex((e) => e.callback === nameE);
-            if (index > -1) {
-              if (events[eventsKey].timeout) {
-                clearTimeout(events[eventsKey].timeout);
-              }
-              events[eventsKey].splice(index, 1);
-            }
+        }
+        _events.length = 0;
+      } else {
+        const removedEvents = _.remove(_events, function (e) {
+          return Object.values(e).some((v) => v === name);
+        });
+        for (const removedEvent of removedEvents) {
+          if (removedEvent.timeout) {
+            clearTimeout(removedEvent.timeout);
           }
-          break;
+        }
       }
     }
   }
@@ -342,7 +320,7 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
           delete event.timeout;
         }
       }
-      events[name] = [];
+      events[name].length = 0;
     }
     onAnyCallbacks.length = 0;
   }
@@ -429,6 +407,7 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   async function getPersonas(steamIDs) {
+    if (isLogOff) return [];
     if (!steamIDs) return [];
     if (!Array.isArray(steamIDs)) {
       steamIDs = [steamIDs];
@@ -491,6 +470,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   async function getCookiesWait() {
+    if (isLogOff) {
+      return;
+    }
     return (
       getCookies() ||
       new Promise((resolve) => {
@@ -507,6 +489,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   async function gamePlay() {
+    if (isLogOff) {
+      return;
+    }
     return await gamesPlayed(730);
   }
 
@@ -522,9 +507,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
 
   async function updateAutoGamePlay() {
     if (isAutoPlay) {
-      autoGamePlay();
+      await autoGamePlay();
     } else {
-      offAutoGamePlay();
+      await offAutoGamePlay();
     }
   }
 
@@ -537,6 +522,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
    * @returns {Promise.<Array>}
    */
   async function partySearch({ prime = false, game_type = "Premier", rank, timeout = 5000 } = {}) {
+    if (isLogOff) {
+      return;
+    }
     const gameTypeMap = {
       Competitive: 8,
       Wingman: 10,
@@ -588,6 +576,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   async function createLobby() {
+    if (isLogOff) {
+      return;
+    }
     if (!steamClient.steamID) {
       return;
     }
@@ -639,6 +630,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   async function updateLobby(lobbyID) {
+    if (isLogOff) {
+      return;
+    }
     if (!steamClient.steamID) {
       return;
     }
@@ -702,6 +696,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   async function invite2Lobby(lobbyID, steamId) {
+    if (isLogOff) {
+      return;
+    }
     if (!steamClient.steamID) {
       return;
     }
@@ -735,6 +732,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   async function createThenInvite2Lobby(steamIds, onInvite) {
+    if (isLogOff) {
+      return;
+    }
     if (!steamClient.steamID) {
       return;
     }
@@ -761,6 +761,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   async function getLobbyData(lobbyID) {
+    if (isLogOff) {
+      return;
+    }
     if (!steamClient.steamID) {
       return;
     }
@@ -793,6 +796,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   async function joinLobby(lobbyID) {
+    if (isLogOff) {
+      return;
+    }
     log("joinLobby", lobbyID); //SteamID.fromIndividualAccountID(lobbyId).accountid
 
     steamClient._send(
@@ -829,6 +835,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   async function sendHello() {
+    if (isLogOff) {
+      return;
+    }
     steamClient.sendToGC(AppID, ESteamProto.ECsgoGCMsg.k_EMsgGCCStrike15_v2_MatchmakingClient2GCHello, {}, Buffer.alloc(0));
     // steamClient.sendToGC(AppID, ESteamProto.EGCBaseClientMsg.k_EMsgGCClientHello, {}, Buffer.alloc(0));
 
@@ -846,6 +855,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   async function requestCoPlays() {
+    if (isLogOff) {
+      return;
+    }
     const gcEventId = uuidv4();
     const response = await ensureLogin(
       new Promise((resolve) => {
@@ -1807,6 +1819,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   function sendFriendTyping(steamId, callback) {
+    if (isLogOff) {
+      return;
+    }
     steamClient.chat.sendFriendTyping(steamId, callback);
   }
 
@@ -1814,6 +1829,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
    * usually take 400 -> 800 miliseconds
    * */
   async function getPlayersProfile(steamId) {
+    if (isLogOff) {
+      return;
+    }
     const accountid = new SteamID(steamId).accountid;
     const gcEventId = uuidv4();
     const result = await ensureLogin(
@@ -1841,6 +1859,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   async function checkPlayerPrimeStatus(steamId) {
+    if (isLogOff) {
+      return;
+    }
     const profile = await getPlayersProfile(steamId);
     if (!profile) return false;
 
@@ -1972,6 +1993,11 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
    */
   async function logOn(token) {
     try {
+      isLogOff = false;
+      if (!steamClient) {
+        steamClient = new NodeSteamUser();
+        bindEvent();
+      }
       steamClient.logOn({
         ...token,
         steamId: new SteamID(token.steamid),
@@ -2087,8 +2113,11 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   async function logOff() {
+    log("logOff");
     isLogOff = true;
 
+    MessageQueue.length = 0;
+
     callEvent(events.logOff);
     events.logOff = [];
 
@@ -2101,44 +2130,54 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
     if (_cleanNodeSteamFriendTimeout) {
       clearTimeout(_cleanNodeSteamFriendTimeout);
     }
-    steamClient.users = {};
-    steamClient.myFriends = {};
-    steamClient.licenses = [];
 
     steamClient.logOff();
     await sleep(5000);
-    delete steamClient._logOnDetails;
-    delete steamClient.logOnResult;
-    delete steamClient._httpClient;
-    delete steamClient._lastChosenCM;
-    try {
-      steamClient._connection.end();
-    } catch (e) {}
-    delete steamClient._connection;
-    delete steamClient.accountInfo;
-    delete steamClient.emailInfo;
-    delete steamClient.limitations;
-    delete steamClient.vac;
-    delete steamClient.wallet;
-    delete steamClient.licenses;
-    delete steamClient.gifts;
-    delete steamClient.myGroups;
-    delete steamClient.playingState;
-
-    delete steamClient._heartbeatInterval;
-    delete steamClient.chat;
-    delete steamClient._httpClient;
-    delete steamClient._events;
-    delete steamClient.picsCache;
-    delete steamClient.options;
+
+    steamClient._connection?.end(true);
+
+    function cleanSteamClient(obj, key) {
+      const value = obj[key];
+
+      try {
+        delete obj[key];
+      } catch (e) {
+        return;
+      }
+
+      if (!value) {
+        return;
+      }
+
+      if (typeof value !== "object") {
+        return;
+      }
+
+      if (Array.isArray(value)) {
+        value.length = 0;
+      } else {
+        const constructorName = Object.getPrototypeOf(value)?.constructor?.name;
+        if (constructorName === "TLSSocket") {
+          value.destroy?.();
+        } else if (constructorName === "Timeout") {
+          clearTimeout(value);
+        } else if (constructorName === "SteamUser") {
+        } else {
+          for (const valuekey in value) {
+            cleanSteamClient(value, valuekey);
+          }
+        }
+      }
+    }
 
     for (const key in steamClient) {
-      delete steamClient[key];
+      cleanSteamClient(steamClient, key);
     }
+    steamClient = null;
   }
 
   async function init() {
-    bindEvent();
+    isLogOff = false;
     const logged = await login();
     if (logged) {
       steamClient._handlerManager.add(ESteamProto.EMsg.k_EMsgClientRequestedClientStats, function (payload) {
@@ -2153,6 +2192,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   function partyRegister() {
+    if (isLogOff) {
+      return;
+    }
     if (prime === null) {
       _partyRegister(true);
       _partyRegister(false);
@@ -2162,6 +2204,10 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   function _partyRegister(prime) {
+    if (isLogOff) {
+      return;
+    }
+
     log("partyRegister", prime);
     lastTimePartyRegister = Date.now();
     steamClient.sendToGC(
@@ -2183,6 +2229,10 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   const MessageQueue = [];
 
   async function _execMessageQueue() {
+    if (isLogOff) {
+      return;
+    }
+
     if (isSendingFriendMessages) {
       return;
     }
@@ -2201,6 +2251,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   async function _sendFriendMessage(steamId, message) {
     let result = null;
     for (let i = 0; i < 10; i++) {
+      if (isLogOff) {
+        return;
+      }
       result = await new Promise((resolve) => {
         steamClient.chat.sendFriendMessage(steamId, message, undefined, function (...arg) {
           resolve(arg);
@@ -2218,6 +2271,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   async function sendFriendMessage(steamId, message) {
+    if (isLogOff) {
+      return;
+    }
     return new Promise((resolve) => {
       MessageQueue.push({ steamId, message, callback: resolve });
       _execMessageQueue();
@@ -2323,6 +2379,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   function doFakeGameScore() {
+    if (isLogOff) {
+      return;
+    }
     const maxRound = Math.random() > 0.7 ? 16 : 12;
     const maps = ["cs_agency", "cs_assault", "cs_italy", "cs_militia", "cs_office", "de_ancient", "de_anubis", "de_bank", "de_boyard", "de_cache", "de_canals", "de_cbble", "de_chalice", "de_dust2", "de_inferno", "de_lake", "de_mirage", "de_nuke", "de_overpass", "de_safehouse", "de_sugarcane", "de_train", "de_tuscan", "de_vertigo", "de_thera", "de_mills", "de_memento", "de_assembly", "training1"];
 
@@ -2404,6 +2463,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   async function gamesPlayed(apps) {
+    if (isLogOff) {
+      return;
+    }
     if (!Array.isArray(apps)) {
       apps = [apps];
     }
@@ -2441,6 +2503,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   function getFriendsList() {
+    if (isLogOff) {
+      return;
+    }
     const methodName = "FriendsList.GetFriendsList#1";
     const { users, myFriends } = steamClient; //object
     /*
@@ -2480,6 +2545,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   async function getUserOwnedApps(steamId = steamClient.steamID) {
+    if (isLogOff) {
+      return;
+    }
     if (!steamId) {
       return [];
     }
@@ -2536,6 +2604,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   async function requestJoinFriendData(token, version) {
+    if (isLogOff) {
+      return;
+    }
     if (!steamClient.steamID) {
       return;
     }
@@ -2578,6 +2649,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   function redeemFreeReward(itemIds, generation_time) {
+    if (isLogOff) {
+      return;
+    }
     console.log(`Sent message to GC: AppID ${AppID}, MessageType ${ESteamProto.ECsgoGCMsg.k_EMsgGCCStrike15_v2_ClientRedeemFreeReward}`);
 
     const encodedMessages = new SteamProto(SteamProtoType.CMsgGCCstrike15_v2_ClientRedeemFreeReward).protoEncode({
@@ -2598,6 +2672,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   function requestRankingInfo() {
+    if (isLogOff) {
+      return;
+    }
     return new Promise((resolve) => {
       const timeout = setTimeout(function () {
         resolve();
@@ -2633,6 +2710,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   function acknowledgePenalty() {
+    if (isLogOff) {
+      return;
+    }
     steamClient.sendToGC(
       730,
       ESteamProto.ECsgoGCMsg.k_EMsgGCCStrike15_v2_AcknowledgePenalty,
@@ -2644,6 +2724,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
   }
 
   async function ensureLogin(promise) {
+    if (isLogOff) {
+      return null;
+    }
     const logOffEventId = uuidv4();
     const result = await Promise.race([
       new Promise((resolve) => {
@@ -2697,6 +2780,9 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
     getPersonaName,
     async getPlayersProfile(steamId, retry = 3) {
       for (let i = 0; i < retry; i++) {
+        if (isLogOff) {
+          return;
+        }
         const profile = await getPlayersProfile(steamId);
         if (profile) {
           return profile;

package/package.json

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