steamutils 1.5.10 → 1.5.12

package/SteamClient.js

@@ -3,62 +3,13 @@ import _ from "lodash";
 import SteamID from "steamid";
 import axios from "axios";
 import SteamUser from "./index.js";
+import { LOCS, RANKS } from "./const.js";
 import { v4 as uuidv4 } from "uuid";
 import EFriendRelationship from "steam-user/enums/EFriendRelationship.js";
 import moment from "moment-timezone";
 import { encode, encodeUids } from "./bufferHelpers.js";
 import { ESteamProto, SteamProto, SteamProtoType } from "./steamproto.js";
-
-export const RANKS = {
-  0: "Unranked",
-  1: "Silver I",
-  2: "Silver II",
-  3: "Silver III",
-  4: "Silver IV",
-  5: "Silver Elite",
-  6: "Silver Elite Master",
-  7: "Gold Nova I",
-  8: "Gold Nova II",
-  9: "Gold Nova III",
-  10: "Gold Nova Master",
-  11: "Master Guardian I",
-  12: "Master Guardian II",
-  13: "Master Guardian Elite",
-  14: "Distinguished Master Guardian",
-  15: "Legendary Eagle",
-  16: "Legendary Eagle Master",
-  17: "Supreme Master First Class",
-  18: "The Global Elite",
-};
-
-export const LOCS = {
-  20054: "VN",
-  23115: "KZ",
-  20041: "IN",
-  20035: "CN",
-  17474: "BD",
-  17481: "ID",
-  22861: "MY",
-  18516: "TH",
-  22356: "TW",
-  21067: "KR",
-  19272: "HK",
-  18512: "PH",
-  21842: "RU",
-  16716: "LA",
-  20558: "NP",
-  18259: "SG",
-  19789: "MM",
-  20045: "MN",
-  18251: "KG",
-  18507: "KH",
-  22605: "MX",
-  19280: "PK",
-  20301: "HK/MO", //hongkong or macau
-  21333: "Unknown",
-  21825: "AU",
-  20034: "Unkown",
-};
+import PQueue from "p-queue";
 
 const AppID = 730;
 export let CSGO_VER = 13960;
@@ -93,6 +44,8 @@ export const SteamClientEvents = {
   logOff: "logOff",
 };
 
+const _sendMessageDelayQueue = new PQueue({ concurrency: 1 });
+
 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;
@@ -2296,59 +2249,43 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
     );
   }
 
-  const MessageQueue = [];
+  const messageQueue = new PQueue({ concurrency: 1 });
+  const messageController = new AbortController();
 
   function clearMessageQueue() {
-    while (MessageQueue.length) {
-      const item = MessageQueue.shift();
-      item?.callback?.();
-    }
+    messageQueue.clear();
+    messageController.abort();
   }
 
-  let isSendingFriendMessages = false;
-  async function _execMessageQueue() {
-    if (isLogOff) {
-      clearMessageQueue();
-      return;
-    }
-
-    if (isSendingFriendMessages) {
-      return;
-    }
-    while (MessageQueue.length) {
-      try {
-        isSendingFriendMessages = true;
-        const item = MessageQueue.shift();
-        if (!item) {
-          break;
-        }
-        const result = await _sendFriendMessage(item.steamId, item.message);
-        if (typeof item.callback === "function") {
-          try {
-            await item.callback(result);
-          } catch (e) {}
-        }
-        if (MessageQueue.length) {
-          await sleep(1000);
-        }
-      } catch (e) {
-        console.error("_execMessageQueue", e);
-      }
-    }
-    isSendingFriendMessages = false;
-  }
-
-  async function _sendFriendMessage(steamId, message) {
+  async function _sendFriendMessage({ steamId, message, signal }) {
     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 (...args) {
-          resolve(args);
+
+      try {
+        result = await new Promise((resolve, reject) => {
+          function listener() {
+            reject(new Error("aborted"));
+            removeListener();
+          }
+
+          function removeListener() {
+            signal.removeEventListener("abort", listener);
+          }
+
+          signal.addEventListener("abort", listener);
+          steamClient.chat.sendFriendMessage(steamId, message, undefined, function (...args) {
+            resolve(args);
+            removeListener();
+          });
         });
-      });
+      } catch (e) {
+        console.error("_sendFriendMessage Error", e);
+        return;
+      }
+
       if (result?.[1]?.server_timestamp) {
         return result?.[1];
       } else if (result?.[0]?.message?.includes?.("RateLimitExceeded")) {
@@ -2364,10 +2301,16 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
     if (isLogOff) {
       return;
     }
-    return new Promise((resolve) => {
-      MessageQueue.push({ steamId, message, callback: resolve });
-      _execMessageQueue();
-    });
+    try {
+      return await messageQueue.add(
+        async ({ signal }) => {
+          try {
+            return await _sendFriendMessage({ steamId, message, signal });
+          } catch (error) {}
+        },
+        { signal: messageController.signal },
+      );
+    } catch (error) {}
   }
 
   async function autoRequestFreeLicense(shouldLog = false, max = 10) {
@@ -2889,7 +2832,18 @@ function SteamClient({ username, cookie, clientJsToken, isAutoRequestFreeLicense
     setPersona(state, name) {
       steamClient.setPersona(state, name);
     },
-    sendFriendMessage,
+    sendFriendMessage: async (steamId, message) => {
+      if (isLogOff) {
+        return;
+      }
+
+      return new Promise(async (resolve, reject) => {
+        _sendMessageDelayQueue.add(async () => {
+          sendFriendMessage(steamId, message).then(resolve).catch(reject);
+          await sleep(500);
+        });
+      });
+    },
     sendFriendTyping,
     getSteamClient() {
       return steamClient;

package/const.js

@@ -516,3 +516,54 @@ export const ItemQuality = {
   Favoured: 13,
   Max: 14,
 };
+
+export const RANKS = {
+  0: "Unranked",
+  1: "Silver I",
+  2: "Silver II",
+  3: "Silver III",
+  4: "Silver IV",
+  5: "Silver Elite",
+  6: "Silver Elite Master",
+  7: "Gold Nova I",
+  8: "Gold Nova II",
+  9: "Gold Nova III",
+  10: "Gold Nova Master",
+  11: "Master Guardian I",
+  12: "Master Guardian II",
+  13: "Master Guardian Elite",
+  14: "Distinguished Master Guardian",
+  15: "Legendary Eagle",
+  16: "Legendary Eagle Master",
+  17: "Supreme Master First Class",
+  18: "The Global Elite",
+};
+
+export const LOCS = {
+  20054: "VN",
+  23115: "KZ",
+  20041: "IN",
+  20035: "CN",
+  17474: "BD",
+  17481: "ID",
+  22861: "MY",
+  18516: "TH",
+  22356: "TW",
+  21067: "KR",
+  19272: "HK",
+  18512: "PH",
+  21842: "RU",
+  16716: "LA",
+  20558: "NP",
+  18259: "SG",
+  19789: "MM",
+  20045: "MN",
+  18251: "KG",
+  18507: "KH",
+  22605: "MX",
+  19280: "PK",
+  20301: "HK/MO", //hongkong or macau
+  21333: "Unknown",
+  21825: "AU",
+  20034: "Unkown",
+};