diff --git a/src/common/ffmpeg-addon-adapter.ts b/src/common/ffmpeg-addon-adapter.ts index eb1b9973..a906d6e1 100644 --- a/src/common/ffmpeg-addon-adapter.ts +++ b/src/common/ffmpeg-addon-adapter.ts @@ -32,7 +32,7 @@ function getAddonPath(binaryPath: string): string { } else { throw new Error(`Unsupported platform: ${platformName} ${archName}`); } - return path.join(binaryPath, "./nodeffmpeg/", addonFileName); + return path.join(binaryPath, "./native/ffmpeg/", addonFileName); } /** diff --git a/src/core/packet/client/nativeClient.ts b/src/core/packet/client/nativeClient.ts index cd94871a..ecbb842b 100644 --- a/src/core/packet/client/nativeClient.ts +++ b/src/core/packet/client/nativeClient.ts @@ -43,7 +43,7 @@ export class NativePacketClient { this.logStack.pushLogWarn(`NativePacketClient: 不支持的平台: ${platform}`); return false; } - const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './moehoo/napi2native.' + platform + '.node'); + const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './native/napi2native/napi2native.' + platform + '.node'); if (!fs.existsSync(moehoo_path)) { this.logStack.pushLogWarn(`NativePacketClient: 缺失运行时文件: ${moehoo_path}`); return false; @@ -55,7 +55,7 @@ export class NativePacketClient { const platform = process.platform + '.' + process.arch; const isNewQQ = this.napcore.basicInfo.requireMinNTQQBuild("40824"); if (isNewQQ) { - const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './moehoo/napi2native.' + platform + '.node'); + const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './native/napi2native/napi2native.' + platform + '.node'); process.dlopen(this.MoeHooExport, moehoo_path, constants.dlopen.RTLD_LAZY); this.MoeHooExport?.exports.initHook?.(send, recv); this.available = true; diff --git a/src/native/packet/napi2native.win32.x64.node b/src/native/napi2native/napi2native.win32.x64.node similarity index 100% rename from src/native/packet/napi2native.win32.x64.node rename to src/native/napi2native/napi2native.win32.x64.node diff --git a/src/native/packet/MoeHoo.darwin.arm64.new.node b/src/native/packet/MoeHoo.darwin.arm64.node similarity index 57% rename from src/native/packet/MoeHoo.darwin.arm64.new.node rename to src/native/packet/MoeHoo.darwin.arm64.node index 6c2c3e40..15fad35d 100644 Binary files a/src/native/packet/MoeHoo.darwin.arm64.new.node and b/src/native/packet/MoeHoo.darwin.arm64.node differ diff --git a/src/native/packet/MoeHoo.linux.arm64.new.node b/src/native/packet/MoeHoo.linux.arm64.node similarity index 74% rename from src/native/packet/MoeHoo.linux.arm64.new.node rename to src/native/packet/MoeHoo.linux.arm64.node index 64e54db0..982f74b7 100644 Binary files a/src/native/packet/MoeHoo.linux.arm64.new.node and b/src/native/packet/MoeHoo.linux.arm64.node differ diff --git a/src/native/packet/MoeHoo.linux.x64.new.node b/src/native/packet/MoeHoo.linux.x64.new.node deleted file mode 100644 index ec8a577c..00000000 Binary files a/src/native/packet/MoeHoo.linux.x64.new.node and /dev/null differ diff --git a/src/native/packet/MoeHoo.linux.x64.node b/src/native/packet/MoeHoo.linux.x64.node new file mode 100644 index 00000000..27ec1dd4 Binary files /dev/null and b/src/native/packet/MoeHoo.linux.x64.node differ diff --git a/src/native/packet/MoeHoo.win.x64.node b/src/native/packet/MoeHoo.win.x64.node new file mode 100644 index 00000000..20733409 Binary files /dev/null and b/src/native/packet/MoeHoo.win.x64.node differ diff --git a/src/native/packet/MoeHoo.win32.x64.new.node b/src/native/packet/MoeHoo.win32.x64.new.node deleted file mode 100644 index d70d3cae..00000000 Binary files a/src/native/packet/MoeHoo.win32.x64.new.node and /dev/null differ diff --git a/src/pty/windowsPtyAgent.ts b/src/pty/windowsPtyAgent.ts index de30a61f..7ffbceb4 100644 --- a/src/pty/windowsPtyAgent.ts +++ b/src/pty/windowsPtyAgent.ts @@ -67,11 +67,11 @@ export class WindowsPtyAgent { } if (this._useConpty) { if (!conptyNative) { - conptyNative = require_dlopen('./pty/' + process.platform + '.' + process.arch + '/conpty.node'); + conptyNative = require_dlopen('./native/pty/' + process.platform + '.' + process.arch + '/conpty.node'); } } else { if (!winptyNative) { - winptyNative = require_dlopen('./pty/' + process.platform + '.' + process.arch + '/pty.node'); + winptyNative = require_dlopen('./native/pty/' + process.platform + '.' + process.arch + '/pty.node'); } } this._ptyNative = this._useConpty ? conptyNative : winptyNative; diff --git a/vite.config.ts b/vite.config.ts index eaa81d62..86add854 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -31,8 +31,7 @@ const UniversalBaseConfigPlugin: PluginOption[] = [ targets: [ { src: './manifest.json', dest: 'dist' }, { src: './src/core/external/napcat.json', dest: 'dist/config/' }, - { src: './src/native/packet', dest: 'dist/moehoo', flatten: false }, - { src: './src/native/pty', dest: 'dist/pty', flatten: false }, + { src: './src/native/', dest: 'dist/native', flatten: false }, { src: './napcat.webui/dist/', dest: 'dist/static/', flatten: false }, { src: './src/framework/liteloader.cjs', dest: 'dist' }, { src: './src/framework/napcat.cjs', dest: 'dist' }, @@ -57,10 +56,9 @@ const FrameworkBaseConfigPlugin: PluginOption[] = [ // }), cp({ targets: [ + { src: './src/native/', dest: 'dist/native', flatten: false }, { src: './manifest.json', dest: 'dist' }, { src: './src/core/external/napcat.json', dest: 'dist/config/' }, - { src: './src/native/packet', dest: 'dist/moehoo', flatten: false }, - { src: './src/native/pty', dest: 'dist/pty', flatten: false }, { src: './napcat.webui/dist/', dest: 'dist/static/', flatten: false }, { src: './src/framework/liteloader.cjs', dest: 'dist' }, { src: './src/framework/napcat.cjs', dest: 'dist' }, @@ -82,9 +80,7 @@ const ShellBaseConfigPlugin: PluginOption[] = [ // }), cp({ targets: [ - { src: './src/native/ffmpeg', dest: 'dist/nodeffmpeg', flatten: false }, - { src: './src/native/packet', dest: 'dist/moehoo', flatten: false }, - { src: './src/native/pty', dest: 'dist/pty', flatten: false }, + { src: './src/native/', dest: 'dist/native', flatten: false }, { src: './napcat.webui/dist/', dest: 'dist/static/', flatten: false }, { src: './src/core/external/napcat.json', dest: 'dist/config/' }, { src: './package.json', dest: 'dist' },