steamutils 1.4.47 → 1.4.49

package/SteamClient.js

@@ -1,12 +1,10 @@
 import NodeSteamUser from "steam-user";
 import _ from "lodash";
 import SteamID from "steamid";
-import FriendCode from "csgo-friendcode";
 import axios from "axios";
 import SteamUser from "./index.js";
 import { v4 as uuidv4 } from "uuid";
 import EFriendRelationship from "steam-user/enums/EFriendRelationship.js";
-import SteamCommunity from "steamcommunity";
 import moment from "moment-timezone";
 import { encode, encodeUids } from "./bufferHelpers.js";
 import { ESteamProto, SteamProto, SteamProtoType } from "./steamproto.js";
@@ -1154,23 +1152,26 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
             // }
 
             const players = [];
-            for (const player of entries) {
-              try {
-                const prime = player.apr === 1 ? "PRIME" : "NON-PRIME";
-                const loc = LOCS[player.loc] || player.loc;
-                const steamId = SteamID.fromIndividualAccountID(player.id).getSteamID64();
-                const friendCode = FriendCode.encode(steamId);
-
-                // if ((LOCS[player.loc] == 'VN' || !LOCS[player.loc])) {
-                players.push({
-                  prime,
-                  rank: RANKS[player.ark] !== undefined ? RANKS[player.ark] : player.ark,
-                  loc,
-                  steamId,
-                  friendCode,
-                });
-                // }
-              } catch (e) {}
+            if (entries.length) {
+              const FriendCode = (await import("csgo-friendcode")).default;
+              for (const player of entries) {
+                try {
+                  const prime = player.apr === 1 ? "PRIME" : "NON-PRIME";
+                  const loc = LOCS[player.loc] || player.loc;
+                  const steamId = SteamID.fromIndividualAccountID(player.id).getSteamID64();
+                  const friendCode = FriendCode.encode(steamId);
+
+                  // if ((LOCS[player.loc] == 'VN' || !LOCS[player.loc])) {
+                  players.push({
+                    prime,
+                    rank: RANKS[player.ark] !== undefined ? RANKS[player.ark] : player.ark,
+                    loc,
+                    steamId,
+                    friendCode,
+                  });
+                  // }
+                } catch (e) {}
+              }
             }
 
             callGCCallback("partySearch", players);
@@ -1298,7 +1299,16 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
       async user(steamId, data) {
         callEvent(events.user, { steamId: steamId.getSteamID64(), data });
 
-        _cleanNodeSteamUserData();
+        // cleanNodeSteamUserData
+        for (const friendSteamId in steamClient.users) {
+          steamClient.users[friendSteamId] = {};
+        }
+        if (_cleanNodeSteamUserTimeout) {
+          clearTimeout(_cleanNodeSteamUserTimeout);
+        }
+        _cleanNodeSteamUserTimeout = setTimeout(function () {
+          steamClient.users = {};
+        }, 60000);
 
         const dataExample = {
           rich_presence: [
@@ -1392,9 +1402,10 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
         }
         if (playing_blocked) {
           //true, false
-          log("Playing else where");
+          log(`Playing else where ${playing_app ?? ""}`);
+        } else {
+          log(`playingState not blocked ${playing_app ?? ""}`);
         }
-        log("playingState", playing_blocked, playing_app);
         callEvent(events.playingState, { playing_blocked, playing_app });
       },
       async friendRelationship(sid, relationship, previousRelationship) {
@@ -2301,18 +2312,6 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
     );
   }
 
-  function _cleanNodeSteamUserData() {
-    for (const friendSteamId in steamClient.users) {
-      steamClient.users[friendSteamId] = {};
-    }
-    if (_cleanNodeSteamUserTimeout) {
-      clearTimeout(_cleanNodeSteamUserTimeout);
-    }
-    setTimeout(function () {
-      steamClient.users = {};
-    }, 60000);
-  }
-
   return {
     init,
     partySearch,
@@ -2443,6 +2442,7 @@ function SteamClient({ username, password, cookie, clientJsToken, isAutoRequestF
     onAnyEvent,
     async redeemGift(gid) {
       try {
+        const SteamCommunity = (await import("steamcommunity")).default;
         const community = new SteamCommunity();
         let cookies = await getCookiesWait();
         community.setCookies(typeof cookies === "string" ? cookies.split(";") : cookies);

package/_steamproto.js

@@ -22,6 +22,10 @@ export class SteamProto {
     return protobuf.encode(protobuf.create(obj)).finish();
   }
 
+  protoEncodeBase64(obj) {
+    return this.protoEncode(obj);
+  }
+
   protoDecode(obj) {
     const protobuf = this.toProto();
     return protobuf.toObject(protobuf.decode(obj), { defaults: true });