修复一些小问题

Author: MiaowFISH

hdic.ts

@@ -1,25 +1,21 @@
 import { Bot, Session } from './src/medic.js'
 
-import { app } from './src/index.js'
+// 事件监听器
+import './src/extensions/events.js'
+const Event = globalThis.Event
 
 // 消息相关，At Image Text 是消息元素
-import { At, Image, Text, createChain, reply, sendGroupMessage } from './src/message.js'
+//import { At, Image, Text, createChain, reply, sendGroupMessage } from './src/message.js'
 
 // 文件扩展
-import * as fs from './src/extensions/fs.js'
+//import * as fs from './src/extensions/fs.js'
 
 // http 扩展
-import http from './src/extensions/http.js'
+//import http from './src/extensions/http.js'
 
 // 导入插件
-import { Plugin } from './src/types/plugin.js'
 import './src/plugins/jrrp.js'
 
-// 事件监听器
-import EventEmitter, { once } from './src/extensions/events.js'
-const Event = new EventEmitter()
-globalThis.Event = Event
-
 import { InnerMode } from './src/utils/helper.js'
 let innerMode = new InnerMode()
 async function messageHandler(session: Session) {
@@ -29,18 +25,18 @@ async function messageHandler(session: Session) {
   innerMode.setMsg(session)
   if (session.msg.includes('test')) {
     innerMode.enter()
-    reply('是否确认')
+    session.reply('是否确认')
     return
   }
   if (innerMode.getStatus()) {
     if (session.msg === '是' || session.msg === '确认') {
-      reply('确认')
+      session.reply('确认')
       innerMode.exit()
     } else if (session.msg === '否' || session.msg === '取消') {
-      reply('取消')
+      session.reply('取消')
       innerMode.exit()
     } else {
-      reply('请回答是或否')
+      session.reply('请回答是或否')
     }
   }
   // 消息中断器示例结束
@@ -65,21 +61,19 @@ $.on('message.temp', async (message) => {
 })
 
 // Bot 上线事件
-$.on('online', (bot: typeof globalThis.bot) => {
+Event.on('online', (bot: typeof globalThis.bot) => {
   console.log(`${bot.uin} 已上线`)
-  try {
-    globalThis.bot = new Bot()
-    bot = globalThis.bot
-  } catch (e) {
-    console.log(e)
-  }
+
+  globalThis.bot = new Bot()
+  bot = globalThis.bot
+
   console.log('初始化完成')
 })
 
 // 循环检测
 while (true) {
   if (bot.uin) {
-    $.emit('online', bot)
+    Event.emit('online', bot)
     break
   }
 }

package.json

@@ -13,9 +13,8 @@
     "docs:type": "typedoc"
   },
   "dependencies": {
-    "@types/java": "^0.9.2",
+    "events": "^3.3.0",
     "minimist": "^1.2.5",
-    "node-java": "^1.0.1",
     "typescript": "^4.6.2"
   },
   "devDependencies": {

src/extensions/events.js

@@ -1,4 +1,5 @@
 // @ts-nocheck
+// @pittier-ignore
 // Copyright Joyent, Inc. and other Node contributors.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
@@ -54,9 +55,6 @@ var NumberIsNaN = Number.isNaN || function NumberIsNaN(value) {
 function EventEmitter() {
   EventEmitter.init.call(this);
 }
-export default EventEmitter;
-const _once = once;
-export { _once as once };
 
 // Backwards-compat with node 0.10.x
 EventEmitter.EventEmitter = EventEmitter;
@@ -497,3 +495,6 @@ function eventTargetAgnosticAddListener(emitter, name, listener, flags) {
     throw new TypeError('The "emitter" argument must be of type EventEmitter. Received type ' + typeof emitter);
   }
 }
+export default EventEmitter;
+export { once };
+globalThis.Event =globalThis.Event || new EventEmitter;

src/medic.ts

@@ -1,4 +1,4 @@
-const odd_bot = bot
+const mebot = bot
 import { getAvatarById } from './utils/index.js'
 import { getCSRFToken } from './utils/util.js'
 
@@ -13,72 +13,72 @@ export class Bot {
   batteryStatus: string
   bkn: number
   constructor() {
-    this.avatar = getAvatarById(this.uin)
-    this.batteryLevel = odd_bot.batteryLevel
-    this.batteryStatus = odd_bot.batteryStatus
-    this.bkn = getCSRFToken(this.skey)
-    this.machineCode = odd_bot.machineCode
-    this.name = odd_bot.name
-    this.pskey = odd_bot.pskey
-    this.skey = odd_bot.skey
-    this.uin = odd_bot.uin
+    this.avatar = getAvatarById(mebot.uin)
+    this.batteryLevel = mebot.batteryLevel
+    this.batteryStatus = mebot.batteryStatus
+    this.bkn = getCSRFToken(mebot.skey)
+    this.machineCode = mebot.machineCode
+    this.name = mebot.name
+    this.pskey = mebot.pskey
+    this.skey = mebot.skey
+    this.uin = mebot.uin
   }
   checkAdmin(group_id: number, qq_id: number): boolean {
-    return odd_bot.checkAdmin(group_id, qq_id)
+    return mebot.checkAdmin(group_id, qq_id)
   }
   deleteMember(group_id: number, qq_id: number): void {
-    odd_bot.deleteMember(group_id, qq_id)
+    mebot.deleteMember(group_id, qq_id)
   }
   getClientKey(): string {
-    return odd_bot.getClientKey()
+    return mebot.getClientKey()
   }
   getPSkey(): string {
-    return odd_bot.getPSkey()
+    return mebot.getPSkey()
   }
   getSkey(): string {
-    return odd_bot.getSkey()
+    return mebot.getSkey()
   }
   getTroopList(): number[] {
-    return odd_bot.getTroopList()
+    return mebot.getTroopList()
   }
   getTroopMemberList(group_id: number | number[]): number[] {
-    return odd_bot.getTroopMemberList(group_id)
+    return mebot.getTroopMemberList(group_id)
   }
   getTroopSwicth(group_id: number): boolean {
-    return odd_bot.getTroopSwicth(group_id)
+    return mebot.getTroopSwicth(group_id)
   }
   pokeAvatar(group_id: number, qq_id: number): void {
-    odd_bot.pokeAvatar(group_id, qq_id)
+    mebot.pokeAvatar(group_id, qq_id)
   }
   reload(): void {
-    odd_bot.reload()
+    mebot.reload()
   }
   send(client: client): void {
-    odd_bot.send(client)
+    mebot.send(client)
   }
   sendRedPacket(group_id: number, title: string, money: number, qq_id: number | number[]): void {
-    odd_bot.sendRedPacket(group_id, title, money, qq_id)
+    mebot.sendRedPacket(group_id, title, money, qq_id)
   }
   setAdmin(group_id: number, qq_id: number, is_admin: boolean): void {
-    odd_bot.setAdmin(group_id, qq_id, is_admin)
+    mebot.setAdmin(group_id, qq_id, is_admin)
   }
   setGroupAdmin(id: number, qq: number, is_admin: boolean): any {
-    return odd_bot.setGroupAdmin(id, qq, is_admin)
+    return mebot.setGroupAdmin(id, qq, is_admin)
   }
   setMemberCard(group_id: number, qq_id: number, card: string): void {
-    odd_bot.setMemberCard(group_id, qq_id, card)
+    mebot.setMemberCard(group_id, qq_id, card)
   }
   setTroopSwicth(group_id: number, iSwitch: boolean): void {
-    odd_bot.setTroopSwicth(group_id, iSwitch)
+    mebot.setTroopSwicth(group_id, iSwitch)
   }
   shutup(group_id: number, qq_id: number, time: number): void {
-    odd_bot.shutup(group_id, qq_id, time)
+    mebot.shutup(group_id, qq_id, time)
   }
   shutupAll(group_id: number, time: number): void {
-    odd_bot.shutupAll(group_id, time)
+    mebot.shutupAll(group_id, time)
   }
   withDrawMsg(group_id: number, mark: number): void {
-    odd_bot.withDrawMsg(group_id, mark)
+    mebot.withDrawMsg(group_id, mark)
   }
 }
 

src/plugins/jrrp.ts

@@ -2,19 +2,19 @@ import cli from '../extensions/commander.js'
 import { File } from '../extensions/java.js'
 import * as fs from '../extensions/fs.js'
 import { Session } from '../medic.js'
-// 插件信息
+
 const jrrp = {
-  info: {
-    name: 'jrrp',
-    version: '0.1',
-    description: '获取今日人品',
-    author: 'Miaow',
-    help: 'jrrp',
-  },
+  // 插件信息
+  name: 'jrrp',
+  version: '0.1',
+  description: '获取今日人品',
+  author: 'Miaow',
+  help: 'jrrp',
   // 是否启用
   enable: true,
   // 插件主函数
 }
+
 globalThis.Event.on('message.group', async (session: Session) => {
   // 命令解析
   let argv = cli(session.msg)
@@ -59,3 +59,4 @@ globalThis.Event.on('message.group', async (session: Session) => {
     session.reply(`${session.nick} 的今日人品是：${luckValue}，${luckText}`)
   }
 })
+export default jrrp