Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use native promises #1171

Merged
merged 15 commits into from
Jul 7, 2022
Merged

Use native promises #1171

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6d4c955
⏱ Use native promise timers over `sleep-async`
carloslbello Jun 11, 2022
575c543
🔥 Remove `async`, `bluebird` and `bluebird-global` packages
carloslbello Jun 11, 2022
435903a
Merge branch 'development' into native-promises
idinium96 Jun 17, 2022
241642d
🔨 put steamid in ListingManager constructor
idinium96 Jun 17, 2022
2cf18cc
🔨 refactor
idinium96 Jun 17, 2022
0236442
🔨 let everything run in series
idinium96 Jun 17, 2022
8ac46b1
🔨 fix missing line (missed during solving conflicts)
idinium96 Jun 17, 2022
1dd1499
🔨 refactor
idinium96 Jun 17, 2022
aaf13c5
Add missing return statement
carloslbello Jun 17, 2022
744ac00
Revert "Add missing return statement"
carloslbello Jun 17, 2022
22cd056
Add .catch to app.ts promise
carloslbello Jun 17, 2022
1276279
Revert "Add .catch to app.ts promise"
carloslbello Jun 17, 2022
285d04e
🔄 refactor codes - retain original behavior
idinium96 Jul 7, 2022
f66a5e4
Merge branch 'development' into native-promises
idinium96 Jul 7, 2022
2714582
🔨 fix eslint errors
idinium96 Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 7 additions & 100 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@
"@tf2autobot/tf2-schema": "^2.8.3",
"@tf2autobot/tf2-sku": "^2.0.3",
"@tf2autobot/tradeoffer-manager": "^2.13.6",
"async": "^3.2.4",
"axios": "^0.27.2",
"bluebird": "^3.7.2",
"bluebird-global": "^1.0.1",
"body-parser": "^1.20.0",
"callback-queue": "^3.0.0",
"change-case": "^4.1.2",
Expand All @@ -58,7 +55,6 @@
"pretty-ms": "^7.0.1",
"reconnecting-websocket": "^4.4.0",
"retry": "^0.13.1",
"sleep-async": "^1.0.5",
"socket.io-client": "^4.5.1",
"steam-totp": "^2.1.2",
"steam-user": "^4.24.3",
Expand All @@ -73,13 +69,12 @@
},
"devDependencies": {
"@babel/preset-typescript": "^7.17.12",
"@types/async": "^3.2.13",
"@types/bluebird-global": "^3.5.13",
"@types/cheerio": "^0.22.31",
"@types/death": "^1.1.2",
"@types/express": "^4.17.13",
"@types/graceful-fs": "^4.1.5",
"@types/jest": "^28.1.1",
"@types/node": "^17.0.41",
"@types/pluralize": "0.0.29",
"@types/request": "^2.48.8",
"@types/retry": "^0.12.2",
Expand Down
22 changes: 6 additions & 16 deletions src/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ if (process.env.BOT_VERSION !== pjson.version) {
process.exit(1);
}

import 'bluebird-global';

import dotenv from 'dotenv';

dotenv.config({ path: path.join(__dirname, '../.env') });
Expand Down Expand Up @@ -143,20 +141,12 @@ process.on('message', message => {
}
});

void botManager.start(options).asCallback(err => {
if (err) {
throw err;
}
void (async () => {
await botManager.start(options);

if (options.enableHttpApi) {
void import('./classes/HttpManager').then(({ default: HttpManager }) => {
const httpManager = new HttpManager(options);

void httpManager.start().asCallback(err => {
if (err) {
throw err;
}
});
});
const { default: HttpManager } = await import('./classes/HttpManager');
const httpManager = new HttpManager(options);
await httpManager.start();
}
});
})();
Loading