From 8dc6da56a767f374c806420f8062872304a4fb6f Mon Sep 17 00:00:00 2001
From: bietiaop <1527109126@qq.com>
Date: Sun, 2 Feb 2025 14:33:39 +0800
Subject: [PATCH] fix: node-pty

---
 napcat.webui/src/pages/dashboard/terminal.tsx |  6 +++---
 package.json                                  |  2 +-
 .../src/terminal/init-dynamic-dirname.ts      | 21 +++++++++++++++++++
 src/webui/src/terminal/terminal_manager.ts    |  3 ++-
 vite.config.ts                                |  2 +-
 5 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 src/webui/src/terminal/init-dynamic-dirname.ts

diff --git a/napcat.webui/src/pages/dashboard/terminal.tsx b/napcat.webui/src/pages/dashboard/terminal.tsx
index e26e1a2d..c95e0ee1 100644
--- a/napcat.webui/src/pages/dashboard/terminal.tsx
+++ b/napcat.webui/src/pages/dashboard/terminal.tsx
@@ -112,7 +112,7 @@ export default function TerminalPage() {
           className="h-full overflow-hidden"
         >
           <div className="flex items-center gap-2 flex-shrink-0 flex-grow-0">
-            <TabList className="flex-1 !overflow-x-auto hide-scrollbar">
+            <TabList className="flex-1 !overflow-x-auto w-full hide-scrollbar">
               <SortableContext
                 items={tabs}
                 strategy={horizontalListSortingStrategy}
@@ -123,7 +123,7 @@ export default function TerminalPage() {
                     id={tab.id}
                     value={tab.id}
                     isSelected={selectedTab === tab.id}
-                    className="flex gap-2 items-center"
+                    className="flex gap-2 items-center flex-shrink-0"
                   >
                     {tab.title}
                     <Button
@@ -131,7 +131,7 @@ export default function TerminalPage() {
                       radius="full"
                       variant="flat"
                       size="sm"
-                      className="min-w-0 w-4 h-4"
+                      className="min-w-0 w-4 h-4 flex-shrink-0"
                       onPress={() => closeTerminal(tab.id)}
                       color={selectedTab === tab.id ? 'danger' : 'default'}
                     >
diff --git a/package.json b/package.json
index 4319b57f..fbde38b1 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
   "dependencies": {
     "@ffmpeg.wasm/core-mt": "^0.13.2",
     "@ffmpeg.wasm/main": "^0.13.1",
-    "@homebridge/node-pty-prebuilt-multiarch": "^0.11.14",
+    "@homebridge/node-pty-prebuilt-multiarch": "^0.12.0-beta.5",
     "express": "^5.0.0",
     "piscina": "^4.7.0",
     "qrcode-terminal": "^0.12.0",
diff --git a/src/webui/src/terminal/init-dynamic-dirname.ts b/src/webui/src/terminal/init-dynamic-dirname.ts
new file mode 100644
index 00000000..9c6ee8d8
--- /dev/null
+++ b/src/webui/src/terminal/init-dynamic-dirname.ts
@@ -0,0 +1,21 @@
+import path from 'path';
+
+Object.defineProperty(global, '__dirname', {
+    get() {
+        const err = new Error();
+        const stack = err.stack?.split('\n') || [];
+        let callerFile = '';
+        // 遍历错误堆栈，跳过当前文件所在行
+        // 注意：堆栈格式可能不同，请根据实际环境调整索引及正则表达式
+        for (const line of stack) {
+            const match = line.match(/\((.*):\d+:\d+\)/);
+            if (match) {
+                callerFile = match[1];
+                if (!callerFile.includes('init-dynamic-dirname.ts')) {
+                    break;
+                }
+            }
+        }
+        return callerFile ? path.dirname(callerFile) : '';
+    },
+});
diff --git a/src/webui/src/terminal/terminal_manager.ts b/src/webui/src/terminal/terminal_manager.ts
index 563a3568..fc7a9b30 100644
--- a/src/webui/src/terminal/terminal_manager.ts
+++ b/src/webui/src/terminal/terminal_manager.ts
@@ -1,9 +1,10 @@
+import './init-dynamic-dirname';
 import { WebUiConfig } from '@/webui';
 import { AuthHelper } from '../helper/SignToken';
 import { LogWrapper } from '@/common/log';
 import { WebSocket, WebSocketServer } from 'ws';
 import os from 'os';
-import { IPty, spawn as ptySpawn } from '@homebridge/node-pty-prebuilt-multiarch';
+import { type IPty, spawn as ptySpawn } from '@homebridge/node-pty-prebuilt-multiarch';
 import { randomUUID } from 'crypto';
 
 interface TerminalInstance {
diff --git a/vite.config.ts b/vite.config.ts
index aa54a330..1b59f00f 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -12,7 +12,7 @@ const external = [
     'piscina',
     '@ffmpeg.wasm/core-mt',
     '@ffmpeg.wasm/main',
-    'node-pty',
+    '@homebridge/node-pty-prebuilt-multiarch',
 ];
 const nodeModules = [...builtinModules, builtinModules.map((m) => `node:${m}`)].flat();