[optimize] sync req use timeout global

Author: Hiram

src/main/core/global/index.ts

@@ -12,7 +12,7 @@ const setup = async () => {
     debug: (await setting.get('debug')) || false,
   };
 
-  global.variable = variable;
+  globalThis.variable = variable;
   logger.info(`[global][variable]`, variable);
 };
 

src/main/core/ipc/index.ts

@@ -77,7 +77,7 @@ const ipcListen = () => {
   });
 
   ipcMain.handle('ffmpeg-thumbnail', async (_, url, key) => {
-    const ua = global.variable.ua;
+    const ua = globalThis.variable.ua;
     const formatPath = is.dev
       ? join(process.cwd(), 'thumbnail', `${key}.jpg`)
       : join(app.getPath('userData'), 'thumbnail', `${key}.jpg`);
@@ -184,7 +184,7 @@ const ipcListen = () => {
     globalShortcut.register(shortcut, () => {
       toggleWindowVisibility();
     });
-    global.variable.recordShortcut = shortcut;
+    globalThis.variable.recordShortcut = shortcut;
   });
 
   ipcMain.on('manage-win', (_, winName, action) => {
@@ -252,8 +252,8 @@ const ipcListen = () => {
 
   ipcMain.on('update-global', (_, key, value) => {
     logger.info(`[ipcMain] update-global: key: ${key} - value: ${value}`);
-    if (Object.keys(global.variable).includes(key)) {
-      global.variable[key] = value;
+    if (Object.keys(globalThis.variable).includes(key)) {
+      globalThis.variable[key] = value;
     }
   });
 

src/main/core/server/routes/v1/lab/ai/utils/index.ts

@@ -92,7 +92,7 @@ export function createOpenAI(config: CreateOpenAIConfig = {}): OpenAIApp {
 
     const spinner = ora(logStart(`AI is answering your question, please wait a moment`)).start();
     try {
-      const timeout = global.variable.timeout || 5000;
+      const timeout = globalThis.variable.timeout || 5000;
       const completion = await openai.chat.completions.create(
         {
           model,

src/main/core/server/routes/v1/site/cms/adapter/drpy/index.ts

@@ -6,14 +6,15 @@ import treeKill from 'tree-kill';
 import logger from '@main/core/logger';
 
 let child: ChildProcess | null = null;
-const restart = (): void => {
+const restart = async () => {
   logger.warn(`[t3][worker][restart] worker id:${uuidv4()}`);
   if (child) {
     child.removeAllListeners();
     treeKill(child.pid!, 'SIGTERM');
   }
   child = null;
-  child = fork(resolve(__dirname, 'worker.js'), [`T3DrpyWorker-${uuidv4()}`]);
+  const TIMEOUT = globalThis.variable.timeout;
+  child = fork(resolve(__dirname, 'worker.js'), [`T3DrpyWorker-${uuidv4()}`, TIMEOUT]);
 };
 
 const doWork = (data: { [key: string]: string | object | null }): Promise<{ [key: string]: any }> => {
@@ -61,7 +62,7 @@ class T3Adapter {
 
   private async getInstance() {
     if (!this.instance) {
-      restart();
+      await restart();
       this.instance = await doWork({ type: 'init', data: this.ext });
     }
     return this.instance;

src/main/core/server/routes/v1/site/cms/adapter/drpy/worker.ts

@@ -64,6 +64,10 @@ const drpyWork = (parms) => {
 };
 
 process.on('message', (message: { [key: string]: any }) => {
+  const variable = {
+    timeout: process.argv?.[3] || 3000,
+  };
+  globalThis.variable = variable;
   let res;
   try {
     res = drpyWork(message);

src/main/core/shortcut.ts

@@ -9,8 +9,8 @@ const customShortcutResgin = (shortcut, func) => {
 };
 
 const bossShortcutResgin = () => {
-  if (global.variable.recordShortcut) {
-    globalShortcut.register(global.variable.recordShortcut, () => {
+  if (globalThis.variable.recordShortcut) {
+    globalShortcut.register(globalThis.variable.recordShortcut, () => {
       toggleWindowVisibility();
     });
   }

src/main/index.ts

@@ -1,5 +1,5 @@
 import { initialize as remoteInit } from '@electron/remote/main';
-import { electronApp, is, optimizer } from '@electron-toolkit/utils';
+import { electronApp, platform, optimizer } from '@electron-toolkit/utils';
 import { registerContextMenuListener } from '@electron-uikit/contextmenu';
 import { registerTitleBarListener } from '@electron-uikit/titlebar';
 import { app, BrowserWindow, globalShortcut, nativeTheme, session } from 'electron';
@@ -41,6 +41,10 @@ const setup = async () => {
   app.commandLine.appendSwitch('disable-web-security'); // 禁用安全
   app.commandLine.appendSwitch('gpu-memory-buffer-compositor-resources'); // GPU内存缓冲
 
+  if (platform.isLinux) {
+    app.disableHardwareAcceleration();
+  }
+
   remoteInit(); // 主进程初始化
   await dbInit(); // 初始化数据库
   await globalVariable(); // 全局变量
@@ -55,11 +59,11 @@ const ready = () => {
   // initialization and is ready to create browser windows.
   // Some APIs can only be used after this event occurs.
   app.whenReady().then(() => {
-    if (global.variable.dns) {
-      logger.info(`[dns] doh: ${global.variable.dns}`);
+    if (globalThis.variable.dns) {
+      logger.info(`[dns] doh: ${globalThis.variable.dns}`);
       app.configureHostResolver({
         secureDnsMode: 'secure',
-        secureDnsServers: [global.variable.dns],
+        secureDnsServers: [globalThis.variable.dns],
       });
     }
 
@@ -111,7 +115,8 @@ const ready = () => {
       }
 
       // 处理 User-Agent
-      requestHeaders['User-Agent'] = headers?.['User-Agent'] || requestHeaders?.['User-Agent'] || global.variable.ua;
+      requestHeaders['User-Agent'] =
+        headers?.['User-Agent'] || requestHeaders?.['User-Agent'] || globalThis.variable.ua;
       // 处理 Host
       requestHeaders['Host'] = headers?.['Host'] || requestHeaders?.['Host'] || new URL(url).host;
       // 处理 Cookie

src/main/utils/hiker/request.ts

@@ -7,6 +7,20 @@ import { getHome, keysToLowerCase, parseQueryString } from './base';
 
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 
+const getTimeout = (timeout: number | undefined | null) => {
+  const baseTimeout = 3000;
+
+  if (timeout !== null && timeout !== undefined) {
+    return Math.max(baseTimeout, timeout);
+  }
+
+  if (globalThis.variable?.timeout) {
+    return Math.max(baseTimeout, globalThis.variable.timeout);
+  }
+
+  return baseTimeout;
+};
+
 type HttpMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'HEAD';
 
 interface RequestOptions {
@@ -41,7 +55,7 @@ const fetch = (url: string, options: RequestOptions = {}) => {
 
     const config = {
       headers: headersInTitleCase,
-      timeout: options?.timeout || 5000,
+      timeout: getTimeout(options?.timeout),
       followRedirects: options?.redirect === false ? false : true,
     };
 

src/main/utils/request/index.ts

@@ -1,15 +1,15 @@
 import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
 import PQueue from 'p-queue';
 
-const getTimeout = (timeout: number | undefined) => {
+const getTimeout = (timeout: number | undefined | null) => {
   const baseTimeout = 3000;
 
-  if (timeout != null) {
+  if (timeout !== null && timeout !== undefined) {
     return Math.max(baseTimeout, timeout);
   }
 
-  if (global.variable?.timeout) {
-    return Math.max(baseTimeout, global.variable.timeout);
+  if (globalThis.variable?.timeout) {
+    return Math.max(baseTimeout, globalThis.variable.timeout);
   }
 
   return baseTimeout;

src/main/utils/sniffer/index.ts

@@ -58,7 +58,7 @@ const puppeteerInElectron = async (
 
   try {
     const browser = await pie.connect(app, puppeteer as any); // 连接puppeteer
-    const debugStatus = global.variable.debug || false;
+    const debugStatus = globalThis.variable.debug || false;
     snifferWindow = createWin(`sniffer-${pageId}`, { title: 'zy-sniifer', show: debugStatus }); // 创建无界面窗口
     snifferWindow.webContents.setAudioMuted(true); // 设置窗口静音
     snifferWindow.webContents.setWindowOpenHandler(() => {