steamutils 1.4.34 → 1.4.35

package/SteamClient.js

@@ -76,7 +76,6 @@ export const LOCS = {
 
 const AppID = 730;
 export let CSGO_VER = 13960;
-export const FreeAppList = JSON.parse(fs.readFileSync(path.join(__dirname, "free_packages.json"))).packages;
 
 SteamUser.getAppVersion(AppID).then(function (ver) {
   CSGO_VER = ver;
@@ -92,7 +91,6 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
   let isLogOff = false;
   let playingBlocked = null;
   const richPresence = {};
-  let sendMessageTimestamp = 0;
   let lastTimePartyRegister = 0;
   let lastTimePartySearch = 0;
   const ownedApps = [];
@@ -406,7 +404,7 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
           game_type: game_type === "Competitive" ? 8 : 10,
         }),
       );
-      lastTimePartySearch = new Date().getTime();
+      lastTimePartySearch = Date.now();
       pushGCCallback("partySearch", resolve, timeout);
     });
     if (Array.isArray(players) && players.length) {
@@ -451,7 +449,7 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
           const result = protoDecode(Protos.csgo.CMsgClientMMSCreateLobbyResponse, payload.toBuffer());
           const steam_id_lobby = result.steam_id_lobby.toString();
           currentLobby.lobbyID = steam_id_lobby;
-          currentLobby.timestamp = new Date().getTime();
+          currentLobby.timestamp = Date.now();
           resolve(steam_id_lobby);
         },
       );
@@ -524,7 +522,7 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
           const result = protoDecode(Protos.csgo.CMsgClientMMSSetLobbyDataResponse, payload.toBuffer());
           const steam_id_lobby = result.steam_id_lobby.toString();
           currentLobby.lobbyID = steam_id_lobby;
-          currentLobby.timestamp = new Date().getTime();
+          currentLobby.timestamp = Date.now();
           resolve(steam_id_lobby);
         },
       );
@@ -579,7 +577,7 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
     }
 
     let lobbyID = null;
-    if (currentLobby.lobbyID && currentLobby.timestamp > new Date().getTime() - 30000) {
+    if (currentLobby.lobbyID && currentLobby.timestamp > Date.now() - 30000) {
       //30 seconds
       lobbyID = currentLobby.lobbyID;
     } else {
@@ -1818,7 +1816,7 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
 
   function _partyRegister(prime) {
     log("partyRegister", prime);
-    lastTimePartyRegister = new Date().getTime();
+    lastTimePartyRegister = Date.now();
     steamClient.sendToGC(
       730,
       Protos.csgo.ECsgoGCMsg.k_EMsgGCCStrike15_v2_Party_Register,
@@ -1835,37 +1833,48 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
     );
   }
 
-  async function sendFriendMessage(steamId, message) {
-    while (sendMessageTimestamp && new Date().getTime() - sendMessageTimestamp < 2000) {
-      await sleep(1000);
-    }
+  const MessageQueue = [];
 
-    while (isSendingFriendMessages) {
-      await sleep(5000);
+  async function _execMessageQueue() {
+    if (isSendingFriendMessages) {
+      return;
     }
+    while (MessageQueue.length) {
+      isSendingFriendMessages = true;
+      const item = MessageQueue.shift();
+      const result = await _sendFriendMessage(item.steamId, item.message);
+      item.callback(result);
+      if (MessageQueue.length) {
+        await sleep(1000);
+      }
+    }
+    isSendingFriendMessages = false;
+  }
 
-    isSendingFriendMessages = true;
-    const now = new Date().getTime();
-    while (new Date().getTime() - now < 2 * 60000) {
-      //2 minutes
-      const result = await new Promise((resolve) => {
+  async function _sendFriendMessage(steamId, message) {
+    let result = null;
+    for (let i = 0; i < 10; i++) {
+      result = await new Promise((resolve) => {
         steamClient.chat.sendFriendMessage(steamId, message, undefined, function (...arg) {
-          sendMessageTimestamp = new Date().getTime();
           resolve(arg);
         });
       });
-
       if (result?.[1]?.server_timestamp) {
-        isSendingFriendMessages = false;
         return result?.[1];
       } else if (result?.[0]?.message?.includes?.("RateLimitExceeded")) {
         await sleep(5000);
       } else {
-        isSendingFriendMessages = false;
         return result;
       }
     }
-    isSendingFriendMessages = false;
+    return result;
+  }
+
+  async function sendFriendMessage(steamId, message) {
+    return new Promise((resolve) => {
+      MessageQueue.push({ steamId, message, callback: resolve });
+      _execMessageQueue();
+    });
   }
 
   async function autoRequestFreeLicense(shouldLog = false, max = 10) {

package/package.json

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