fix: wtf did I do in last commit

Author: Ikaleio

src/plugins.ts

@@ -2,7 +2,7 @@ import { z } from 'zod'
 import fs from 'fs/promises'
 import path from 'path'
 import { Component, MotdSchema } from './motd'
-import { ConnectionController, OutboundSchema } from './proxy'
+import { OutboundSchema } from './proxy'
 import { fromError } from 'zod-validation-error'
 import { ConfigSchema } from './config'
 
@@ -43,6 +43,7 @@ export interface Context {
 	playerName?: string
 	config?: any
 	fullConfig: z.infer<typeof ConfigSchema> // 添加 fullConfig 属性，确保其为必填项
+	terminator?: Function // 添加 terminator 属性
 	on(event: 'motd', handler: MotdHandler, pre?: boolean): void
 	on(event: 'login', handler: LoginHandler, pre?: boolean): void
 	on(
@@ -51,9 +52,6 @@ export interface Context {
 		pre?: boolean,
 	): void
 	temp?(callback: Handler): void
-	registerConnection(host: string, controller: ConnectionController): void
-	unregisterConnection(host: string): void
-	getConnectionController(host: string): ConnectionController | undefined
 }
 
 // 插件的接口
@@ -82,7 +80,6 @@ export class PluginLoader {
 		motd: [],
 	}
 	private fullConfig: z.infer<typeof ConfigSchema> = ConfigSchema.parse({}) // 保存完整的配置
-	private connectionControllers: Map<string, ConnectionController> = new Map()
 
 	// 加载单个内置插件
 	private async loadBuiltinPlugin(
@@ -109,9 +106,6 @@ export class PluginLoader {
 						} else this.eventHandlers[event].push(handler)
 					}
 				},
-				registerConnection: this.registerConnection.bind(this),
-				unregisterConnection: this.unregisterConnection.bind(this),
-				getConnectionController: this.getConnectionController.bind(this),
 			}
 
 			// 调用插件的 apply 方法进行初始化
@@ -206,9 +200,6 @@ export class PluginLoader {
 								} else this.eventHandlers[event].push(handler)
 							}
 						},
-						registerConnection: this.registerConnection.bind(this),
-						unregisterConnection: this.unregisterConnection.bind(this),
-						getConnectionController: this.getConnectionController.bind(this),
 					}
 
 					// 调用插件的 apply 方法进行初始化
@@ -237,18 +228,17 @@ export class PluginLoader {
 		host: string,
 		playerName: string,
 		ip: string,
+		terminator: Function, // 应当传入 clientSocket.end()
 	): Promise<LoaderLoginResult> {
 		// 创建临时回调函数队列
 		const tempHandlers: Array<LoginHandler> = []
 
 		// 创建完整的上下文，包括 temp 方法
 		const ctx: Context = {
-			registerConnection: this.registerConnection.bind(this),
-			unregisterConnection: this.unregisterConnection.bind(this),
-			getConnectionController: this.getConnectionController.bind(this),
 			host,
 			playerName,
 			ip,
+			terminator,
 			fullConfig: this.fullConfig, // 传入完整的配置
 			on: (event, handler, pre = false) => {
 				if (this.eventHandlers[event]) {
@@ -346,9 +336,6 @@ export class PluginLoader {
 
 		// 创建完整的上下文，包括 temp 方法
 		const ctx: Context = {
-			registerConnection: this.registerConnection.bind(this),
-			unregisterConnection: this.unregisterConnection.bind(this),
-			getConnectionController: this.getConnectionController.bind(this),
 			host,
 			ip,
 			fullConfig: this.fullConfig, // 传入完整的配置
@@ -434,9 +421,6 @@ export class PluginLoader {
 					} else this.eventHandlers[event].push(handler)
 				}
 			},
-			registerConnection: this.registerConnection.bind(this),
-			unregisterConnection: this.unregisterConnection.bind(this),
-			getConnectionController: this.getConnectionController.bind(this),
 		}
 
 		for (const handler of this.eventHandlers['disconnect']) {
@@ -467,16 +451,4 @@ export class PluginLoader {
 			motd: [],
 		}
 	}
-
-	registerConnection(host: string, controller: ConnectionController) {
-		this.connectionControllers.set(host, controller)
-	}
-
-	unregisterConnection(host: string) {
-		this.connectionControllers.delete(host)
-	}
-
-	getConnectionController(host: string): ConnectionController | undefined {
-		return this.connectionControllers.get(host)
-	}
 }

src/proxy.ts

@@ -231,12 +231,6 @@ export class MinecraftProxy {
 						FML: null,
 					}
 
-					const controller = new ConnectionController(clientSocket)
-					globalThis.pluginLoader.registerConnection(
-						clientSocket.data.host!,
-						controller,
-					)
-
 					logger.debug(
 						`${colorHash(clientSocket.data.connId)} Connection established`,
 					)
@@ -272,8 +266,6 @@ export class MinecraftProxy {
 						`${colorHash(clientSocket.data.connId)} Connection closed`,
 					)
 
-					globalThis.pluginLoader.unregisterConnection(clientSocket.data.host!)
-
 					if (clientSocket.data.host && clientSocket.data.username) {
 						await globalThis.pluginLoader.disconnect(
 							clientSocket.data.host,
@@ -471,6 +463,7 @@ export class MinecraftProxy {
 								clientSocket.data.host!,
 								username,
 								clientSocket.data.originIP!.toString(),
+								() => clientSocket.end(),
 							)
 							if (loginResult.type === LoginResultType.REJECT) {
 								logger.warn(
@@ -559,7 +552,7 @@ export class MinecraftProxy {
 								headers = Buffer.from(pp.build())
 							}
 
-							// 构造��手包
+							// 构造握手包
 							const remoteHostWithFML = outbound.removeFMLSignature
 								? remoteHost
 								: clientSocket.data.FML === 1