Merge branch 'master' into IPC

Author: idinium96

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "tf2autobot",
-    "version": "5.9.1",
+    "version": "5.10.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": {
@@ -33,7 +33,7 @@
         "@tf2autobot/steamcommunity": "^3.47.2",
         "@tf2autobot/tf2": "^1.3.5",
         "@tf2autobot/tf2-currencies": "^2.0.1",
-        "@tf2autobot/tf2-schema": "^4.3.0",
+        "@tf2autobot/tf2-schema": "^4.3.1",
         "@tf2autobot/tf2-sku": "^2.0.4",
         "@tf2autobot/tradeoffer-manager": "^2.15.2",
         "async": "^3.2.5",

package.json

@@ -57,6 +57,24 @@ if (process.env.DOCKER !== undefined) {
     );
 }
 
+import SchemaManager from '@tf2autobot/tf2-schema';
+import { apiRequest } from './lib/apiRequest';
+
+// Make the schema manager request the schema from schema.autobot.tf
+
+/*eslint-disable */
+SchemaManager.prototype.getSchema = function (callback): void {
+    apiRequest('GET', 'https://schema.autobot.tf/schema')
+        .then(schema => {
+            this.setSchema(schema, true);
+            callback(null, this.schema);
+        })
+        .catch(err => {
+            callback(err);
+        });
+};
+/*eslint-enable */
+
 import BotManager from './classes/BotManager';
 const botManager = new BotManager(
     getPricer({

src/app.ts

@@ -18,21 +18,9 @@ export function getItemAndAmount(
     prefix: string,
     from?: 'buy' | 'sell' | 'buycart' | 'sellcart'
 ): { match: Entry; priceKey: string; amount: number } | null {
-    let name = removeLinkProtocol(message);
-    let amount = 1;
-    const args = name.split(' ');
-    if (/^[-]?\d+$/.test(args[0]) && args.length > 2) {
-        // Check if the first part of the name is a number, if so, then that is the amount the user wants to trade
-        amount = parseInt(args[0]);
-        name = name.replace(amount.toString(), '').trim();
-    } else if (Pricelist.isAssetId(args[0]) && args.length === 1) {
-        // Check if the only parameter is an assetid
-        name = args[0];
-    }
-
-    if (1 > amount) {
-        amount = 1;
-    }
+    const parsedMessage = parseItemAndAmountFromMessage(message);
+    const name = parsedMessage.name;
+    let amount = parsedMessage.amount;
 
     if (['!price', '!sellcart', '!buycart', '!sell', '!buy', '!pc', '!s', '!b'].includes(name)) {
         bot.sendMessage(
@@ -210,6 +198,26 @@ export function getItemAndAmount(
     };
 }
 
+export function parseItemAndAmountFromMessage(message: string): { name: string; amount: number } {
+    let name = removeLinkProtocol(message);
+    let amount = 1;
+    const args = name.split(' ');
+    if (/^[-]?\d+$/.test(args[0]) && args.length > 1) {
+        // Check if the first part of the name is a number, if so, then that is the amount the user wants to trade
+        amount = parseInt(args[0]);
+        name = name.replace(amount.toString(), '').trim();
+    } else if (Pricelist.isAssetId(args[0]) && args.length === 1) {
+        // Check if the only parameter is an assetid
+        name = args[0];
+    }
+
+    if (1 > amount) {
+        amount = 1;
+    }
+
+    return { name: name, amount: amount };
+}
+
 export function getItemFromParams(
     steamID: SteamID | string,
     params: UnknownDictionaryKnownValues,

src/classes/Commands/functions/utils.ts

@@ -0,0 +1,21 @@
+import { parseItemAndAmountFromMessage } from '../../../Commands/functions/utils';
+
+it('can parse one word item names', () => {
+    let messageArgs = '5 Maul';
+    let parsedMessage = parseItemAndAmountFromMessage(messageArgs);
+    expect(parsedMessage).toEqual({ name: 'Maul', amount: 5 });
+
+    messageArgs = 'Maul';
+    parsedMessage = parseItemAndAmountFromMessage(messageArgs);
+    expect(parsedMessage).toEqual({ name: 'Maul', amount: 1 });
+});
+
+it('can parse multiple word item names', () => {
+    let messageArgs = '5 Nostromo Napalmer';
+    let parsedMessage = parseItemAndAmountFromMessage(messageArgs);
+    expect(parsedMessage).toEqual({ name: 'Nostromo Napalmer', amount: 5 });
+
+    messageArgs = 'Nostromo Napalmer';
+    parsedMessage = parseItemAndAmountFromMessage(messageArgs);
+    expect(parsedMessage).toEqual({ name: 'Nostromo Napalmer', amount: 1 });
+});

src/classes/__tests__/Commands/functions/utils.ts

@@ -0,0 +1,45 @@
+import axios, { AxiosRequestConfig, Method, AxiosError } from 'axios';
+import filterAxiosError from '@tf2autobot/filter-axios-error';
+
+export async function apiRequest<B>(
+    httpMethod: string,
+    url: string,
+    params?: Record<string, any>,
+    data?: Record<string, any>,
+    headers?: Record<string, unknown>
+): Promise<B> {
+    if (!headers) {
+        headers = {};
+    }
+
+    const options: AxiosRequestConfig = {
+        method: httpMethod as Method,
+        url,
+        headers: {
+            'User-Agent': 'TF2Autobot@' + process.env.BOT_VERSION,
+            ...headers
+        },
+        timeout: 30000
+    };
+
+    if (params) {
+        options.params = params;
+    }
+
+    if (data) {
+        options.data = data;
+    }
+
+    return new Promise((resolve, reject) => {
+        void axios(options)
+            .then(response => {
+                const body = response.data as B;
+                resolve(body);
+            })
+            .catch((err: AxiosError) => {
+                if (err) {
+                    reject(filterAxiosError(err));
+                }
+            });
+    });
+}

src/lib/apiRequest.ts

@@ -506,7 +506,7 @@ function getCraftNumber(item: EconItem, schema: Schema, normalizeCraftNumber: bo
         return null;
     }
 
-    const name = item.market_hash_name;
+    const name = item.name;
     const withoutNumber = name.replace(/#\d+/, '');
     if (name === withoutNumber) {
         // no change