Merge pull request #111 from caorushizi/feat/terminal

feat: ✨ use terminal
caorushizi · Mar 10, 2024 · cf77cf8 · cf77cf8
2 parents 712338d + 84196b0
commit cf77cf8
Show file tree

Hide file tree

Showing 9 changed files with 191 additions and 215 deletions.
diff --git a/packages/main/package.json b/packages/main/package.json
@@ -60,6 +60,7 @@
     "lodash": "^4.17.21",
     "node-pty": "^1.0.0",
     "reflect-metadata": "^0.2.1",
+    "strip-ansi": "^7.1.0",
     "ts-node": "^10.9.2",
     "typeorm": "^0.3.19"
   }

diff --git a/packages/main/src/helper/index.ts b/packages/main/src/helper/index.ts
@@ -23,7 +23,7 @@ export function getLocalIP() {
   return localIP;
 }
 
-export { sleep, stripColors, formatHeaders } from "./utils";
+export { sleep, formatHeaders } from "./utils";
 export * from "./variables";
 export { on, handle } from "./decorator";
 export { convertToAudio } from "./ffmpeg";

diff --git a/packages/main/src/helper/utils.ts b/packages/main/src/helper/utils.ts
@@ -4,14 +4,6 @@ export async function sleep(second = 1): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, second * 1000));
 }
 
-export function stripColors(str: string) {
-  // 匹配控制台颜色字符的正则表达式
-  // eslint-disable-next-line no-control-regex
-  const colorRegex = /\x1b\[(\d+)(;\d+)*m/g;
-  // 将所有颜色字符替换为空字符串
-  return str.replace(colorRegex, "");
-}
-
 export function formatHeaders(headersStr: string): string {
   const headers: Record<string, any> | null = JSON.parse(headersStr);
   if (!headers) return "";

diff --git a/packages/main/src/interfaces.ts b/packages/main/src/interfaces.ts
@@ -43,8 +43,7 @@ export type Task = {
 export interface DownloadProgress {
   id: number;
   type: string;
-  cur: string;
-  total: string;
+  percent: string;
   speed: string;
   isLive: boolean;
 }