From d4081a4f5174331a3dc4533ac9951efe0c28e775 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Fri, 3 May 2024 18:21:06 +0100 Subject: [PATCH] Create timer helper --- .gitignore | 3 +- package-lock.json | 23 +++++++++++++ package.json | 1 + src/bot.ts | 12 ++++++- src/helpers/TimerHelper.ts | 67 ++++++++++++++++++++++++++++++++++++++ src/timers/GiveCurrency.ts | 9 +++++ 6 files changed, 113 insertions(+), 2 deletions(-) create mode 100644 src/helpers/TimerHelper.ts create mode 100644 src/timers/GiveCurrency.ts diff --git a/.gitignore b/.gitignore index aecb458..9326cc8 100644 --- a/.gitignore +++ b/.gitignore @@ -108,4 +108,5 @@ config.json ormconfig.json gdrive-credentials.json data/ -*.db \ No newline at end of file +*.db +.temp/ \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index e93e59f..7f521cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "@types/uuid": "^9.0.0", "body-parser": "^1.20.2", "clone-deep": "^4.0.1", + "cron": "^3.1.7", "discord.js": "^14.3.0", "dotenv": "^16.0.0", "express": "^4.18.2", @@ -1895,6 +1896,11 @@ "@types/node": "*" } }, + "node_modules/@types/luxon": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz", + "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==" + }, "node_modules/@types/mime": { "version": "3.0.4", "license": "MIT" @@ -3841,6 +3847,15 @@ "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/cron": { + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/cron/-/cron-3.1.7.tgz", + "integrity": "sha512-tlBg7ARsAMQLzgwqVxy8AZl/qlTc5nibqYwtNGoCrd+cV+ugI+tvZC1oT/8dFH8W455YrywGykx/KMmAqOr7Jw==", + "dependencies": { + "@types/luxon": "~3.4.0", + "luxon": "~3.4.0" + } + }, "node_modules/cross-spawn": { "version": "7.0.3", "license": "MIT", @@ -7700,6 +7715,14 @@ "node": ">=10" } }, + "node_modules/luxon": { + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz", + "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==", + "engines": { + "node": ">=12" + } + }, "node_modules/magic-bytes.js": { "version": "1.6.0", "license": "MIT" diff --git a/package.json b/package.json index 178f288..004cfb8 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "@types/uuid": "^9.0.0", "body-parser": "^1.20.2", "clone-deep": "^4.0.1", + "cron": "^3.1.7", "discord.js": "^14.3.0", "dotenv": "^16.0.0", "express": "^4.18.2", diff --git a/src/bot.ts b/src/bot.ts index 87008c5..f75bbff 100644 --- a/src/bot.ts +++ b/src/bot.ts @@ -4,6 +4,8 @@ import { IntentsBitField } from "discord.js"; import Registry from "./registry"; import { existsSync } from "fs"; import { ExecException, exec } from "child_process"; +import TimerHelper from "./helpers/TimerHelper"; +import GiveCurrency from "./timers/GiveCurrency"; dotenv.config(); @@ -56,4 +58,12 @@ if (!existsSync(`${process.env.DATA_DIR}/cards`) && process.env.GDRIVESYNC_AUTO }); } -client.start(); \ No newline at end of file +client.start(); + +const timerHelper = new TimerHelper(); + +const id = timerHelper.AddTimer('* * * * * *', 'Europe/London', GiveCurrency); + +console.log(`Timer Created: ${id}`); + +timerHelper.StartAllTimers(); \ No newline at end of file diff --git a/src/helpers/TimerHelper.ts b/src/helpers/TimerHelper.ts new file mode 100644 index 0000000..3d3f7e9 --- /dev/null +++ b/src/helpers/TimerHelper.ts @@ -0,0 +1,67 @@ +import { CronJob } from "cron"; +import { v4 } from "uuid"; + +interface Timer { + id: string; + job: CronJob; + context: Map; +} + +export default class TimerHelper { + private _timers: Timer[]; + + constructor() { + this._timers = []; + } + + public AddTimer( + cronTime: string, + timeZone: string, + onTick: ((context: Map) => void) | ((context: Map) => Promise)): string { + const context = new Map(); + + const job = new CronJob( + cronTime, + () => { + onTick(context); + }, + null, + false, + timeZone, + ); + + const id = v4(); + + this._timers.push({ + id, + job, + context, + }); + + return id; + } + + public StartAllTimers() { + this._timers.forEach(timer => timer.job.start()); + } + + public StopAllTimers() { + this._timers.forEach(timer => timer.job.stop()); + } + + public StartTimer(id: string) { + const timer = this._timers.find(x => x.id == id); + + if (!timer) return; + + timer.job.start(); + } + + public StopTimer(id: string) { + const timer = this._timers.find(x => x.id == id); + + if (!timer) return; + + timer.job.stop(); + } +} \ No newline at end of file diff --git a/src/timers/GiveCurrency.ts b/src/timers/GiveCurrency.ts new file mode 100644 index 0000000..d9e40fa --- /dev/null +++ b/src/timers/GiveCurrency.ts @@ -0,0 +1,9 @@ +export default function GiveCurrency(context: Map) { + let calledTimes = context.get('times') as number; + + if (!calledTimes) calledTimes = 1; + + console.log(`This has been called ${calledTimes} times!`); + + context.set('times', calledTimes + 1); +} \ No newline at end of file