redis.ts: deprecate and migrate remaining uses

Author: siddharthvp

bot-monitor/AlertsDb.ts

@@ -1,9 +1,6 @@
-import {Cassandra} from "../cassandra";
 import {MwnDate} from "mwn";
 import {getKey, Rule} from "./Rule";
 import {bot, toolsdb} from "../botbase";
-import * as fs from "fs/promises";
-import {getRedisInstance, Redis} from "../redis";
 import {ResultSetHeader} from "mysql2";
 import {CustomError} from "../utils";
 
@@ -78,6 +75,11 @@ class MariadbAlertsDb implements AlertsDb {
 
 /*
 UNMAINTAINED IMPLEMENTATIONS:
+
+import {Cassandra} from "../cassandra";
+import * as fs from "fs/promises";
+import {redis} from "../redis-io";
+
 class CassandraAlertsDb implements AlertsDb {
     cs: Cassandra = new Cassandra();
 
@@ -128,16 +130,14 @@ class FileSystemAlertsDb implements AlertsDb {
 }
 
 class RedisAlertsDb implements AlertsDb {
-    redis: Redis;
     async connect() {
-        this.redis = getRedisInstance();
     }
 
     async getLastEmailedTime(rule: Rule) {
-        return new bot.Date(await this.redis.hget('botmonitor-last-emailed', getKey(rule)));
+        return new bot.Date(await redis.hget('botmonitor-last-emailed', getKey(rule)));
     }
     async saveLastEmailedTime(rule: Rule) {
-        await this.redis.hset('botmonitor-last-emailed', getKey(rule), new bot.Date().toISOString);
+        await redis.hset('botmonitor-last-emailed', getKey(rule), new bot.Date().toISOString);
     }
     async getPausedTillTime(name: string, webKey: string) { return new bot.Date(0); }
     async setPausedTillTime(bot: string, webKey: string, pauseTill: MwnDate) { return -1; }

bot-monitor/ChecksDb.ts

@@ -5,7 +5,7 @@ import {RawRule, subtractFromNow} from './index'
 import * as sqlite from "sqlite";
 import * as sqlite3 from "sqlite3";
 import * as hash from 'object-hash';
-import {getRedisInstance} from "../redis";
+import {redis} from "../redis-io";
 
 class SqliteDb {
 	db: sqlite.Database;
@@ -37,18 +37,16 @@ interface ChecksDb {
  *
  */
 class RedisChecksDb implements ChecksDb {
-	redis = getRedisInstance();
-
 	async connect() {
-		await this.redis.ping();
+		await redis.ping();
 	}
 
 	getKey(rule: RawRule) {
 		return `botmonitor-${rule.bot}: ${rule.task}`;
 	}
 
 	async update(rule: RawRule, ts: string) {
-		await this.redis.hset(this.getKey(rule) + '-cached',
+		await redis.hset(this.getKey(rule) + '-cached',
 			'rulehash', hash.sha1(rule),
 			'ts', ts);
 	}
@@ -57,7 +55,7 @@ class RedisChecksDb implements ChecksDb {
 		if (argv.nocache) {
 			return false;
 		}
-		let cached = await this.redis.hgetall(this.getKey(rule) + '-cached');
+		let cached = await redis.hgetall(this.getKey(rule) + '-cached');
 		return cached.rulehash === hash.sha1(rule) &&
 			new bot.Date(cached.ts).isAfter(subtractFromNow(rule.duration));
 	}
@@ -66,7 +64,7 @@ class RedisChecksDb implements ChecksDb {
 		if (argv.nocache) {
 			return;
 		}
-		let lastseen = await this.redis.hgetall(this.getKey(rule) + '-seen');
+		let lastseen = await redis.hgetall(this.getKey(rule) + '-seen');
 		if (lastseen && lastseen.rulehash === hash.sha1(rule)) {
 			return lastseen;
 		} // else return undefined
@@ -80,7 +78,7 @@ class RedisChecksDb implements ChecksDb {
 		if (notSeen) {
 			props.notseen = '1';
 		}
-		await this.redis.hset(this.getKey(rule) + '-seen', ...Object.entries(props).flat());
+		await redis.hset(this.getKey(rule) + '-seen', ...Object.entries(props).flat());
 	}
 
 }

redis.ts

@@ -3,6 +3,11 @@ import * as asyncRedis from "async-redis";
 import { onToolforge, readFile } from "./utils";
 import { log } from "./botbase";
 
+/**
+ * @deprecated
+ * Use redis-io.ts instead
+ */
+
 // Source: https://github.com/moaxaca/async-redis (MIT)
 // for some reason the Promisified type that we need isn't exported from there
 // so we copy-paste that type definition here
@@ -28,6 +33,8 @@ let instance: Redis;
  * 	let item = await redis.get('key');
  * 	await redis.set('key', 'value');
  * 	...
+ *
+ * @deprecated Use redis-io.ts instead
  */
 export function createRedisClient(config: redis.ClientOpts = {}): Redis {
 	return asyncRedis.createClient(getRedisConfig(config));
@@ -50,6 +57,7 @@ export function getRedisConfig(config: redis.ClientOpts = {}): redis.ClientOpts
  * For typical usage with the default options.
  * Note: this triggers a network request even though it doesn't take a callback or return a
  * promise.
+ * @deprecated Use redis-io.ts instead
  */
 export function getRedisInstance(): Redis {
 	if (!instance) {