fix: 事件监听失效

This commit is contained in:
ningmengchongshui 2024-06-09 21:45:25 +08:00
parent 52d8992562
commit aec1927b99
9 changed files with 22 additions and 26 deletions

View File

@ -27,17 +27,13 @@ export async function checkRun() {
* *
*/ */
if (status.stdout.includes('online')) { if (status.stdout.includes('online')) {
//
logger.mark('检测到后台正在运行') logger.mark('检测到后台正在运行')
logger.mark('已停止后台进程,防止重复运行') logger.mark('已停止后台进程,防止重复运行')
execAsync(`pm2 stop ${cfg.apps[0].name}`).catch(logger.error) execAsync(`pm2 stop ${cfg.apps[0].name}`).catch(logger.error)
//
} }
}).catch(logger.error) }).catch(()=>{})
} }

View File

@ -1,6 +1,6 @@
import fs, { promises } from "node:fs" import fs, { promises } from "node:fs"
import yaml from "yaml" import yaml from "yaml"
import { BOT_NAME } from "./system.js" import { BOT_NAME, CONFIG_INIT_PATH } from "./system.js"
import createQQ from "./qq.js" import createQQ from "./qq.js"
import setLog from "./log.js" import setLog from "./log.js"
import redisInit from "./redis.js" import redisInit from "./redis.js"
@ -17,7 +17,7 @@ export async function UpdateTitle() {
let title = BOT_NAME let title = BOT_NAME
// //
const qq = await promises.readFile("./config/config/qq.yaml", 'utf-8').then(yaml.parse).catch(() => null) const qq = await promises.readFile(`./${CONFIG_INIT_PATH}qq.yaml`, 'utf-8').then(yaml.parse).catch(() => null)
/** /**
* *

View File

@ -1,5 +1,5 @@
import EventListener from './listener.js' import EventListener from '../listener.js'
import { sleep } from '../utils/common.js' import { sleep } from '../../utils/common.js'
import inquirer from 'inquirer' import inquirer from 'inquirer'
import lodash from 'lodash' import lodash from 'lodash'
import fetch from 'node-fetch' import fetch from 'node-fetch'
@ -71,7 +71,7 @@ export default class loginEvent extends EventListener {
*/ */
inquirer inquirer
.prompt({ .prompt({
type: 'input', // type: 'input',
message: '回车刷新二维码,等待扫码中...\n', message: '回车刷新二维码,等待扫码中...\n',
name: 'enter' name: 'enter'
}) })
@ -134,7 +134,7 @@ export default class loginEvent extends EventListener {
if (!ticket) { if (!ticket) {
let res = await inquirer.prompt({ let res = await inquirer.prompt({
type: 'input', // type: 'input',
message: '请输入ticket:', message: '请输入ticket:',
name: 'ticket', name: 'ticket',
validate(value) { validate(value) {
@ -211,7 +211,7 @@ export default class loginEvent extends EventListener {
// //
await inquirer.prompt({ await inquirer.prompt({
type: 'input', // type: 'input',
message: '验证完成后按回车确认,等待在操作中...', message: '验证完成后按回车确认,等待在操作中...',
name: 'enter' name: 'enter'
}) })
@ -261,7 +261,7 @@ export default class loginEvent extends EventListener {
console.log('\n' + logger.green(event.url) + '\n') console.log('\n' + logger.green(event.url) + '\n')
console.log('请打开上面链接,完成验证后按回车') console.log('请打开上面链接,完成验证后按回车')
await inquirer.prompt({ await inquirer.prompt({
type: 'input', // type: 'input',
message: '等待操作中...', message: '等待操作中...',
name: 'enter' name: 'enter'
}) })
@ -272,7 +272,7 @@ export default class loginEvent extends EventListener {
await sleep(200) await sleep(200)
logger.info(`验证码已发送:${event.phone}\n`) logger.info(`验证码已发送:${event.phone}\n`)
let res = await inquirer.prompt({ let res = await inquirer.prompt({
type: 'input', // type: 'input',
message: '请输入短信验证码:', message: '请输入短信验证码:',
name: 'sms' name: 'sms'
}) })

View File

@ -1,4 +1,4 @@
import EventListener from './listener.js' import EventListener from '../listener.js'
/** /**
* *

View File

@ -1,4 +1,4 @@
import EventListener from './listener.js' import EventListener from '../listener.js'
/** /**
* *

View File

@ -1,7 +1,7 @@
import EventListener from './listener.js' import EventListener from '../listener.js'
import fetch from 'node-fetch' import fetch from 'node-fetch'
import cfg from '../config/config.js' import cfg from '../../config/config.js'
import { BOT_NAME } from '../config/system.js' import { BOT_NAME } from '../../config/system.js'
/** /**
* 线 * 线

View File

@ -1,7 +1,7 @@
import EventListener from './listener.js' import EventListener from '../listener.js'
import cfg from '../config/config.js' import cfg from '../../config/config.js'
import { relpyPrivate } from '../core/common.js' import { relpyPrivate } from '../common.js'
import { BOT_NAME } from '../config/system.js' import { BOT_NAME } from '../../config/system.js'
/** /**
* 线 * 线

View File

@ -1,4 +1,4 @@
import EventListener from './listener.js' import EventListener from '../listener.js'
/** /**
* *

View File

@ -15,12 +15,12 @@ class ListenerLoader {
this.client = client this.client = client
const files = fs const files = fs
.readdirSync('./lib/events') .readdirSync('./src/core/events')
.filter(file => file.endsWith('.js')) .filter(file => file.endsWith('.js'))
for (let File of files) { for (let File of files) {
try { try {
let listener = await import(`../events/${File}`) let listener = await import(`./events/${File}`)
/* eslint-disable new-cap */ /* eslint-disable new-cap */
if (!listener.default) continue if (!listener.default) continue