mirror of
https://github.com/yaklang/yaklang-chrome-extension.git
synced 2026-09-22 19:21:53 +08:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
82d1c066cd | ||
|
|
2481b22d8e | ||
|
|
6013a7ae4e | ||
|
|
8742711b68 | ||
|
|
f463076def |
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"manifest_version": 3,
|
||||
"name": "Yakit Chrome Endpoint",
|
||||
"version": "1.0",
|
||||
"version": "0.0.3",
|
||||
"description": "A Endpoint for Yakit MITM or more",
|
||||
"options_ui": {
|
||||
"page": "proxy/options.html",
|
||||
|
||||
+13
-6
@@ -290,6 +290,16 @@ async function checkAndSetInitialProxy() {
|
||||
// 确保默认配置存在
|
||||
await ProxySettings.setDefaultConfigs();
|
||||
|
||||
// 获取上次保存的代理配置
|
||||
const lastProxy = await proxyStore.getCurrentProxy();
|
||||
|
||||
if (lastProxy) {
|
||||
// 如果有上次的配置,恢复它
|
||||
console.log('Restoring last proxy configuration:', lastProxy);
|
||||
await handleSetProxyConfig(lastProxy, () => {});
|
||||
return;
|
||||
}
|
||||
|
||||
// 获取当前的代理设置
|
||||
const settings = await getProxySettings();
|
||||
console.log('Current proxy settings:', settings);
|
||||
@@ -338,7 +348,7 @@ async function checkAndSetInitialProxy() {
|
||||
}
|
||||
}
|
||||
|
||||
// 如果没有检测到代理或已存在配置,则设置为系统代理
|
||||
// 如果没有之前的配置也没有检测到代理,才设置为系统代理
|
||||
await handleSetProxyConfig({
|
||||
id: 'system',
|
||||
name: '[系统代理]',
|
||||
@@ -346,9 +356,6 @@ async function checkAndSetInitialProxy() {
|
||||
enabled: true
|
||||
}, () => {});
|
||||
|
||||
// 设置认证监听
|
||||
await ProxyAuth.setupAuthListener();
|
||||
|
||||
} catch (error) {
|
||||
console.error('Error during initialization:', error);
|
||||
}
|
||||
@@ -356,10 +363,10 @@ async function checkAndSetInitialProxy() {
|
||||
|
||||
// 修改 setupProxyHandlers 函数
|
||||
export function setupProxyHandlers() {
|
||||
// 设置代理错误处理和认证
|
||||
// 设置代理错误处理
|
||||
ProxyAuth.setupErrorHandler();
|
||||
// 设置认证监听
|
||||
ProxyAuth.setupAuthListener();
|
||||
|
||||
// 设置代理请求监听器
|
||||
setupProxyRequestListener();
|
||||
|
||||
|
||||
@@ -105,6 +105,7 @@ async function switchProxy(config) {
|
||||
};
|
||||
}
|
||||
|
||||
// 发送配置更改消息
|
||||
await sendMessageWithRetry({
|
||||
action: ProxyActionType.SET_PROXY_CONFIG,
|
||||
config: proxyConfig
|
||||
|
||||
@@ -43,9 +43,9 @@ export class ProxySettings {
|
||||
]);
|
||||
}
|
||||
// 确保日志存储已初始化
|
||||
const logs = await proxyStore.getLogs(); // 使用 getLogs 而不是 getProxyLogs
|
||||
const logs = await proxyStore.getLogs();
|
||||
if (!logs || logs.length === 0) {
|
||||
await proxyStore.clearLogs(); // 初始化日志存储
|
||||
await proxyStore.clearLogs();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -237,21 +237,25 @@ export const ProxySwitch: React.FC<ProxySwitchProps> = () => {
|
||||
const menuItems: MenuProps['items'] = [
|
||||
...FIXED_MODES.map(mode => ({
|
||||
key: mode.key,
|
||||
icon: <span className="menu-icon" style={{ color: mode.color }}>{mode.icon}</span>,
|
||||
label: mode.name,
|
||||
icon: <span className="menu-icon" style={{
|
||||
color: currentMode === mode.key ? 'var(--yakit-primary)' : mode.color
|
||||
}}>{mode.icon}</span>,
|
||||
label: `${mode.name}${currentMode === mode.key ? ' ✅' : ''}`,
|
||||
className: `${currentMode === mode.key ? 'menu-item-selected' : ''} ${isLoading ? 'menu-item-loading' : ''}`,
|
||||
title: mode.name.replace(/[\[\]]/g, '')
|
||||
})),
|
||||
{ type: 'divider' },
|
||||
...customProxies.map(proxy => ({
|
||||
key: proxy.key,
|
||||
icon: <span className="menu-icon" style={{ color: proxy.color }}>
|
||||
icon: <span className="menu-icon" style={{
|
||||
color: currentMode === proxy.key ? 'var(--yakit-primary)' : proxy.color
|
||||
}}>
|
||||
{proxy.config.proxyType === 'pac_script' ? '📜' : <GlobalOutlined />}
|
||||
</span>,
|
||||
label: <span style={{
|
||||
color: currentMode === proxy.key ? 'var(--yakit-primary)' : 'inherit',
|
||||
opacity: isLoading ? 0.7 : 1
|
||||
}}>{proxy.name}</span>,
|
||||
}}>{proxy.name}{currentMode === proxy.key ? ' ✅' : ''}</span>,
|
||||
className: `${currentMode === proxy.key ? 'menu-item-selected' : ''} ${isLoading ? 'menu-item-loading' : ''}`,
|
||||
title: proxy.config.scheme
|
||||
? `${proxy.config.scheme.toUpperCase()} ${proxy.config.host}:${proxy.config.port}`
|
||||
|
||||
Reference in New Issue
Block a user