From 2f67bef139d53c34b80fd57a445c04a3daa3c79d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Fri, 7 Feb 2025 17:25:48 +0800 Subject: [PATCH] fix: #775 --- src/core/services/NodeIKernelMSFService.ts | 7 +++++-- src/shell/base.ts | 12 ++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/core/services/NodeIKernelMSFService.ts b/src/core/services/NodeIKernelMSFService.ts index b280819d..f2bcb9a3 100644 --- a/src/core/services/NodeIKernelMSFService.ts +++ b/src/core/services/NodeIKernelMSFService.ts @@ -1,5 +1,8 @@ import { GeneralCallResult } from './common'; - +enum ProxyType { + HTTP = 1, + SOCKET = 2 +} export interface NodeIKernelMSFService { getServerTime(): string; setNetworkProxy(param: { @@ -7,7 +10,7 @@ export interface NodeIKernelMSFService { userPwd: string, address: string, port: number, - proxyType: number, + proxyType: ProxyType, domain: string, isSocket: boolean }): Promise; diff --git a/src/shell/base.ts b/src/shell/base.ts index 4969fab9..dfd92561 100644 --- a/src/shell/base.ts +++ b/src/shell/base.ts @@ -294,6 +294,18 @@ export async function NCoreInitShell() { const dataTimestape = new Date().getTime().toString(); o3Service.reportAmgomWeather('login', 'a1', [dataTimestape, '0', '0']); + if (process.env['NAPCAT_PROXY_PORT']) { + session.getMSFService().setNetworkProxy({ + userName: '', + userPwd: '', + address: process.env['NAPCAT_PROXY_ADDRESS'] || '127.0.0.1', + port: +process.env['NAPCAT_PROXY_PORT'], + proxyType: 2, + domain: '', + isSocket: true + }); + logger.logWarn('已设置代理', process.env['NAPCAT_PROXY_ADDRESS'], process.env['NAPCAT_PROXY_PORT']); + } const selfInfo = await handleLogin(loginService, logger, pathWrapper, quickLoginUin, historyLoginList); const amgomDataPiece = 'eb1fd6ac257461580dc7438eb099f23aae04ca679f4d88f53072dc56e3bb1129'; o3Service.setAmgomDataPiece(basicInfoWrapper.QQVersionAppid, new Uint8Array(Buffer.from(amgomDataPiece, 'hex')));