Revert "Revert "Types""

Author: Nicklason

.eslintignore

@@ -1 +1,2 @@
-local
+local
+dist

.gitignore

@@ -74,3 +74,6 @@ files/
 
 # log folder
 logs/
+
+# ignore compiled code
+dist/

app/handler/index.js

@@ -19,16 +19,6 @@
     "url": "https://github.com/Nicklason/tf2-automatic/issues"
   },
   "homepage": "https://github.com/Nicklason/tf2-automatic#readme",
-  "_moduleAliases": {
-    "@root": ".",
-    "app": "app",
-    "utils": "app/utils",
-    "resources": "app/resources",
-    "handler": "app/handler",
-    "lib": "lib",
-    "classes": "classes",
-    "schemas": "schemas"
-  },
   "dependencies": {
     "@nicklason/request-retry": "^1.1.2",
     "async": "^3.1.0",
@@ -43,9 +33,9 @@
     "is-path-inside": "^3.0.2",
     "isobject": "^4.0.0",
     "jsonschema": "^1.2.5",
-    "module-alias": "^2.2.2",
     "moment": "^2.24.0",
     "path": "^0.12.7",
+    "pjson": "^1.0.9",
     "pluralize": "^8.0.0",
     "pm2": "^4.2.1",
     "retry": "^0.12.0",

app/resources/paths.js

@@ -1,21 +1,13 @@
-try {
-    require('module-alias/register');
-} catch (err) {
-    /* eslint-disable-next-line no-console */
-    console.error('Missing dependencies! Install them with `npm install`');
-    process.exit(1);
-}
-
 const dotenv = require('dotenv');
 dotenv.config();
 
-const log = require('lib/logger');
+const log = require('./lib/logger');
 
 if (process.env.pm_id === undefined) {
     log.warn('You are not running the bot with PM2! If the bot crashes it won\'t start again, see the documentation: https://github.com/Nicklason/tf2-automatic/wiki/PM2');
 }
 
-const handlerManager = require('app/handler-manager');
+const handlerManager = require('./app/handler-manager');
 handlerManager.setup();
 
 const handler = handlerManager.getHandler();
@@ -24,18 +16,18 @@ const EconItem = require('steam-tradeoffer-manager/lib/classes/EconItem.js');
 const CEconItem = require('steamcommunity/classes/CEconItem.js');
 
 ['hasDescription', 'getAction', 'getTag', 'getItem', 'getSKU', 'getName', 'getPrice'].forEach(function (v) {
-    const func = require('utils/item/' + v);
+    const func = require('./app/utils/item/' + v);
     EconItem.prototype[v] = func;
     CEconItem.prototype[v] = func;
 });
 
 const TradeOffer = require('steam-tradeoffer-manager/lib/classes/TradeOffer');
 
 ['log', 'summarize'].forEach(function (v) {
-    TradeOffer.prototype[v] = require('utils/offer/' + v);
+    TradeOffer.prototype[v] = require('./app/utils/offer/' + v);
 });
 
-const package = require('@root/package.json');
+const pjson = require('pjson');
 
 require('death')({ uncaughtException: true })(function (signal, err) {
     const crashed = typeof err !== 'string';
@@ -46,8 +38,8 @@ require('death')({ uncaughtException: true })(function (signal, err) {
         }
 
         log.error([
-            package.name + (!handler.isReady() ? ' failed to start properly, this is most likely a temporary error. See the log:' : ' crashed! Please create an issue with the following log:'),
-            `package.version: ${package.version || undefined}; node: ${process.version} ${process.platform} ${process.arch}}`,
+            pjson.name + (!handler.isReady() ? ' failed to start properly, this is most likely a temporary error. See the log:' : ' crashed! Please create an issue with the following log:'),
+            `package.version: ${pjson.version || undefined}; node: ${process.version} ${process.platform} ${process.arch}}`,
             'Stack trace:',
             require('util').inspect(err)
         ].join('\r\n'));
@@ -79,18 +71,18 @@ const SteamUser = require('steam-user');
 const async = require('async');
 
 // Set up node-tf2
-require('lib/tf2');
+require('./lib/tf2');
 
 const pm2 = require('pm2');
 
-const client = require('lib/client');
-const manager = require('lib/manager');
-const community = require('lib/community');
+const client = require('./lib/client');
+const manager = require('./lib/manager');
+const community = require('./lib/community');
 
-const schemaManager = require('lib/tf2-schema');
-const listingManager = require('lib/bptf-listings');
+const schemaManager = require('./lib/tf2-schema');
+const listingManager = require('./lib/bptf-listings');
 
-log.info(package.name + ' v' + package.version + ' is starting...');
+log.info(pjson.name + ' v' + pjson.version + ' is starting...');
 
 start();
 
@@ -121,13 +113,13 @@ function start () {
             log.info('Setting up pricelist...');
 
             // Set up pricelist
-            require('app/prices').init(callback);
+            require('./app/prices').init(callback);
         },
         function (callback) {
             // Sign in to Steam
             log.info('Signing in to Steam...');
 
-            const login = require('app/login');
+            const login = require('./app/login');
 
             const loginKey = opts.loginKey || null;
             let lastLoginFailed = false;
@@ -159,7 +151,7 @@ function start () {
 
             log.verbose('Checking account limitations...');
 
-            require('utils/limitationsCallback')(function (err, limitations) {
+            require('./app/utils/limitationsCallback')(function (err, limitations) {
                 if (err) {
                     return callback(err);
                 }
@@ -182,7 +174,7 @@ function start () {
             log.debug('Waiting for web session...');
 
             // Wait for steamcommunity session
-            require('utils/communityLoginCallback')(false, function (err, v) {
+            require('./app/utils/communityLoginCallback')(false, function (err, v) {
                 if (err) {
                     return callback(err);
                 }
@@ -194,9 +186,9 @@ function start () {
         },
         function (callback) {
             // Sign in to backpack.tf if needed
-            require('lib/bptf-login').setCookies(cookies);
+            require('./lib/bptf-login').setCookies(cookies);
 
-            require('app/bptf').setup(callback);
+            require('./app/bptf').setup(callback);
         },
         function (callback) {
             // Set up tf2-schema
@@ -227,7 +219,7 @@ function start () {
             async.parallel({
                 inventory: function (callback) {
                     // Load inventory
-                    require('app/inventory').getInventory(client.steamID, callback);
+                    require('./app/inventory').getInventory(client.steamID, callback);
                 },
                 listings: function (callback) {
                     // Initialize bptf-listings
@@ -251,13 +243,13 @@ function start () {
             // Create listings
             log.info('Creating listings...');
 
-            require('handler/listings').redoListings(callback);
+            require('./app/handler/listings').redoListings(callback);
         },
         function (callback) {
             // Set up trade offer manager
 
             // Connect to socketio server after creating listings
-            require('lib/ptf-socket').open();
+            require('./lib/ptf-socket').open();
 
             log.info('Getting Steam API key...');
 
@@ -266,7 +258,7 @@ function start () {
         },
         function (callback) {
             // Get friends limit
-            require('handler/friends').getMaxFriends(callback);
+            require('./app/handler/friends').getMaxFriends(callback);
         }
     ], function (item, callback) {
         // Check if we are trying to shut down
@@ -289,6 +281,6 @@ function start () {
         handler.onReady();
 
         // Start version checker
-        require('app/version-check').startVersionChecker();
+        require('./app/version-check').startVersionChecker();
     });
 }

package-lock.json

@@ -1,6 +1,6 @@
 const SteamID = require('steamid');
 
-const client = require('lib/client');
+const client = require('../lib/client');
 
 const admins = process.env.ADMINS === undefined ? [] : JSON.parse(process.env.ADMINS);
 

package.json

@@ -1,10 +1,10 @@
 const async = require('async');
 
-const log = require('lib/logger');
-const bptfLogin = require('lib/bptf-login');
-const community = require('lib/community');
+const log = require('../lib/logger');
+const bptfLogin = require('../lib/bptf-login');
+const community = require('../lib/community');
 
-const handlerManager = require('app/handler-manager');
+const handlerManager = require('./handler-manager');
 
 let hasLoggedIn = false;
 

app.js src/app.js

@@ -1,9 +1,9 @@
-const log = require('lib/logger');
-const client = require('lib/client');
-const tf2 = require('lib/tf2');
+const log = require('../lib/logger');
+const client = require('../lib/client');
+const tf2 = require('../lib/tf2');
 
-const handlerManager = require('app/handler-manager');
-const inventoryManager = require('app/inventory');
+const handlerManager = require('./handler-manager');
+const inventoryManager = require('./inventory');
 
 const jobs = [];