refactor: AB and UpdateSentenceTask

Author: greenhat616

config.example.yml

@@ -24,7 +24,7 @@ redis: # 配置 Redis
   port: 6379 # Redis 端口
   password: '' # Redis 密码
   database: 0 # Redis 数据库
-sentences_ab_switchter: # 本节是服务 AB 异步更新的配置，如果您不知道这个是什么意思，请保持默认
+sentences_ab_switcher: # 本节是服务 AB 异步更新的配置，如果您不知道这个是什么意思，请保持默认
   a: 1 # a 状态对应的 redis 数据库
   b: 2 # b 状态对应的 redis 数据库
 log_level: info # 本节已废弃，输出到日记文件的一律为 Error；输出到终端由 flag `-D` 控制。

package.json

@@ -68,12 +68,12 @@
     "@hitokoto/koa-respond": "3.0.3",
     "NeteaseCloudMusicApi": "3.40.0",
     "async": "3.2.0",
-    "axios": "0.20.0",
     "bytes": "3.1.0",
     "chalk": "4.1.0",
     "commander": "6.1.0",
     "cron": "1.8.2",
     "fast-json-stringify": "2.2.6",
+    "got": "^11.7.0",
     "humanize-number": "0.0.2",
     "ioredis": "4.17.3",
     "joi": "17.2.1",

src/cache.js

@@ -13,7 +13,7 @@ class Cache {
     // Connect Redis
     if (!newConnection) {
       this.redis = new Redis(ConnectionConfig)
-      this.redis.on('connect', () => nconf.set('connectionFailedAttemp', 0))
+      this.redis.on('connect', () => nconf.set('connectionFailedAttempt', 0))
       this.redis.on('error', handleError.bind(this))
       return true
     }
@@ -27,13 +27,14 @@ class Cache {
     return this.redis ? true : this.connect()
   }
 
-  static command(commands, ...params) {
+  static async command(commands, ...params) {
+    this.connectOrSkip()
     params[0] = 'cache:' + params[0]
     return this.redis[commands](params)
   }
 
-  static set(key, v, time) {
-    this.connectOrSkip(this.isABSwitcher)
+  static async set(key, v, time) {
+    await this.connectOrSkip()
     const value = typeof v === 'object' ? JSON.stringify(v) : v
     if (time) {
       return this.redis.set('cache:' + key, value, 'EX', time)
@@ -43,7 +44,7 @@ class Cache {
   }
 
   static async get(key, toJson = true) {
-    this.connectOrSkip(this.isABSwitcher)
+    await this.connectOrSkip()
     const data = await this.redis.get('cache:' + key)
     if (toJson) {
       try {
@@ -65,13 +66,13 @@ class Cache {
    * @param {any[]} callerParams the callerFunc params
    * @param {boolean} toJSON
    */
-  static async remeber(key, time, ...params) {
-    this.connectOrSkip(this.isABSwitcher)
+  static async remember(key, time, ...params) {
+    await this.connectOrSkip()
     if (params.length <= 0 || params.length > 3) {
       throw new Error('the length of params is wrong')
     }
     if (typeof params[0] !== 'function') {
-      throw new Error('the remeber caller must be a function')
+      throw new Error('the remember caller must be a function')
     }
     const caller = params[0]
     const callerParams = params[1] ?? []

src/extensions/sentencesABSwitcher.js

@@ -5,8 +5,10 @@
 const Cache = require('../cache')
 const nconf = require('nconf')
 const Redis = require('ioredis')
-const databaseA = nconf.get('sentences_ab_switchter:a') || 1
-const databaseB = nconf.get('sentences_ab_switchter:b') || 2
+const databaseA = nconf.get('sentences_ab_switcher:a') || 1
+const databaseB = nconf.get('sentences_ab_switcher:b') || 2
+const chalk = require('chalk')
+const winston = require('winston')
 
 const { ConnectionConfig, handleError } = require('../utils/cache')
 class SentencesABSwitcher extends Cache {
@@ -19,29 +21,33 @@ class SentencesABSwitcher extends Cache {
     }
     // Connect Redis
     const tmp = new Redis(config)
-    tmp.on('connect', () => nconf.set('connectionFailedAttemp', 0))
+    tmp.on('connect', () => nconf.set('connectionFailedAttempt', 0))
     tmp.on('error', handleError.bind(this))
     if (isDefault) {
-      this.redis = tmp // set defalt slot
+      this.redis = tmp // set default slot
     }
     this['redis' + target.toUpperCase()] = tmp
   }
 
-  static connectOrSkip(database = 'a') {
+  static async connectOrSkip() {
     if (this.redis) {
       return true
     } else {
+      const database = await Cache.get('hitokoto:ab') // 初始化时读取默认分区
       this.connect('a', database === 'a')
       this.connect('b', database !== 'a')
+      this.db = database
     }
   }
 
   static setDatabase(target) {
+    winston.verbose('[AB] switching database: ' + chalk.blue(target))
     if (target === 'a') {
       this.redis = this.redisA
     } else {
       this.redis = this.redisB
     }
+    this.db = target
   }
 
   static getConnection(target) {