Merge branch 'development' into IPC

TF2Autobot · May 2, 2024 · 38939e3 · 38939e3
2 parents 0e66802 + bb264ec
commit 38939e3
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 21 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tf2autobot",
-    "version": "5.11.2",
+    "version": "5.12.0",
     "description": "Fully automated TF2 trading bot advertising on www.backpack.tf using prices from www.prices.tf, Originally made by Nicklason.",
     "main": "dist/app.js",
     "scripts": {

diff --git a/src/classes/Bot.ts b/src/classes/Bot.ts
@@ -182,7 +182,7 @@ export default class Bot {
         this.manager = new TradeOfferManager({
             steam: this.client,
             community: this.community,
-            // useAccessToken: false, // https://github.com/DoctorMcKay/node-steam-tradeoffer-manager/wiki/Access-Tokens
+            useAccessToken: !this.options.steamApiKey, // https://github.com/DoctorMcKay/node-steam-tradeoffer-manager/wiki/Access-Tokens
             language: 'en',
             pollInterval: -1,
             cancelTime: 15 * 60 * 1000,
@@ -964,7 +964,7 @@ export default class Bot {
                         });
                     },
                     (callback): void => {
-                        log.info('Getting Steam API key...');
+                        log.info('Setting cookies...');
                         void this.setCookies(cookies).asCallback(callback);
                     },
                     (callback): void => {
@@ -988,8 +988,7 @@ export default class Bot {
                     },
                     (callback): void => {
                         this.schemaManager = new SchemaManager({
-                            apiKey: this.manager.apiKey,
-                            updateTime: 24 * 60 * 60 * 1000,
+                            updateTime: 1 * 60 * 60 * 1000,
                             lite: true
                         });
 
@@ -1255,6 +1254,10 @@ export default class Bot {
             this.listingManager.setUserID(this.userID);
         }
 
+        if (this.options.steamApiKey) {
+            this.manager.apiKey = this.options.steamApiKey;
+        }
+
         return new Promise((resolve, reject) => {
             this.manager.setCookies(cookies, err => {
                 if (err) {

diff --git a/src/classes/Friends.ts b/src/classes/Friends.ts
@@ -43,16 +43,26 @@ export default class Friends {
 
     get getMaxFriends(): Promise<number> {
         return new Promise((resolve, reject) => {
+            const params: {
+                steamid: string;
+                key?: string;
+                access_token?: string;
+            } = {
+                steamid: (this.bot.client.steamID === null
+                    ? this.bot.handler.getBotInfo.steamID
+                    : this.bot.client.steamID
+                ).getSteamID64()
+            };
+
+            if (this.bot.manager.apiKey) {
+                params.key = this.bot.manager.apiKey;
+            } else {
+                params.access_token = this.bot.manager.accessToken;
+            }
             void axios({
                 url: 'https://api.steampowered.com/IPlayerService/GetBadges/v1/',
                 method: 'GET',
-                params: {
-                    key: this.bot.manager.apiKey,
-                    steamid: (this.bot.client.steamID === null
-                        ? this.bot.handler.getBotInfo.steamID
-                        : this.bot.client.steamID
-                    ).getSteamID64()
-                }
+                params
             })
                 .then(response => {
                     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access

diff --git a/src/classes/InventoryApis/InventoryApi.ts b/src/classes/InventoryApis/InventoryApi.ts
@@ -91,6 +91,11 @@ export default class InventoryApi {
                         return;
                     }
 
+                    if (result?.fake_redirect === 0) {
+                        // fake redirect caused by steam erros on the proxy's side
+                        return callback(new Error('Received fake redirect 0'));
+                    }
+
                     if (result && result.success && result.total_inventory_count === 0) {
                         // Empty inventory
                         callback(null, [], [], 0);
@@ -177,4 +182,5 @@ interface GetUserInventoryContentsResult {
     more_items?: number;
     total_inventory_count?: number;
     success?: number;
+    fake_redirect?: 1 | 0;
 }
diff --git a/src/classes/Options.ts b/src/classes/Options.ts
@@ -2178,6 +2178,7 @@ export default interface Options extends JsonOptions {
     steamPassword?: string;
     steamSharedSecret?: string;
     steamIdentitySecret?: string;
+    steamApiKey?: string;
 
     bptfAccessToken?: string;
     bptfApiKey?: string;
@@ -2499,6 +2500,7 @@ export function loadOptions(options?: Options): Options {
         steamPassword: getOption('steamPassword', '', String, incomingOptions),
         steamSharedSecret: getOption('steamSharedSecret', '', String, incomingOptions),
         steamIdentitySecret: getOption('steamIdentitySecret', '', String, incomingOptions),
+        steamApiKey: getOption('steamApiKey', '', String, incomingOptions),
 
         bptfAccessToken: getOption('bptfAccessToken', '', String, incomingOptions),
         bptfApiKey: getOption('bptfApiKey', '', String, incomingOptions),

diff --git a/src/classes/TF2Inventory.ts b/src/classes/TF2Inventory.ts
@@ -99,13 +99,22 @@ export default class TF2Inventory {
 
     private fetch(): Promise<void> {
         return new Promise((resolve, reject) => {
+            const params: {
+                steamid: string;
+                key?: string;
+                access_token?: string;
+            } = { steamid: this.getSteamID.toString() };
+
+            if (this.manager.apiKey) {
+                params.key = this.manager.apiKey;
+            } else {
+                params.access_token = this.manager.accessToken;
+            }
+
             void axios({
                 url: 'https://api.steampowered.com/IEconItems_440/GetPlayerItems/v0001/',
                 method: 'GET',
-                params: {
-                    key: this.manager.apiKey,
-                    steamid: this.getSteamID.toString()
-                }
+                params
             })
                 .then(response => {
                     const body = response.data as GetPlayerItems;

diff --git a/src/types/modules/@tf2autobot/tradeoffer-manager/index.d.ts b/src/types/modules/@tf2autobot/tradeoffer-manager/index.d.ts
@@ -27,6 +27,8 @@ declare module '@tf2autobot/tradeoffer-manager' {
 
         apiKey: string | null;
 
+        accessToken: string | null;
+
         pollInterval: number;
 
         getUserInventoryContents(

diff --git a/template.ecosystem.json b/template.ecosystem.json
@@ -17,6 +17,7 @@
                 "STEAM_PASSWORD": "",
                 "STEAM_SHARED_SECRET": "",
                 "STEAM_IDENTITY_SECRET": "",
+                "STEAM_API_KEY": "",
 
                 "BPTF_ACCESS_TOKEN": "",
                 "BPTF_API_KEY": "",
@@ -28,9 +29,7 @@
                 "STEAMSUPPLY_API_KEY": "",
                 "STEAMAPIS_API_KEY": "",
 
-                "ADMINS": [
-                    { "steam": "<your steamid 64>", "discord": null }
-                ],
+                "ADMINS": [{ "steam": "<your steamid 64>", "discord": null }],
                 "KEEP": ["<steamid of person to keep in friendslist>"],
                 "ITEM_STATS_WHITELIST": [],
                 "GROUPS": ["103582791469033930"],

diff --git a/template.env b/template.env
@@ -4,6 +4,7 @@ STEAM_ACCOUNT_NAME=""
 STEAM_PASSWORD=""
 STEAM_SHARED_SECRET=""
 STEAM_IDENTITY_SECRET=""
+STEAM_API_KEY=""
 
 BPTF_ACCESS_TOKEN=""
 BPTF_API_KEY=""