Compare commits

...
12 Commits
6 changed files with 888 additions and 602 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
{ {
"manifest_version": 3, "manifest_version": 3,
"name": "Yakit Chrome Endpoint", "name": "Yakit Chrome Endpoint",
"version": "1.0", "version": "0.0.7",
"description": "A Endpoint for Yakit MITM or more", "description": "A Endpoint for Yakit MITM or more",
"options_ui": { "options_ui": {
"page": "proxy/options.html", "page": "proxy/options.html",
@@ -24,7 +24,7 @@
}, },
"content_scripts": [ "content_scripts": [
{ {
"matches": ["http://mitm/"], "matches": ["<all_urls>","http://mitm/"],
"run_at": "document_start", "run_at": "document_start",
"js": ["proxy/content.js"] "js": ["proxy/content.js"]
} }
+13 -6
View File
@@ -290,6 +290,16 @@ async function checkAndSetInitialProxy() {
// 确保默认配置存在 // 确保默认配置存在
await ProxySettings.setDefaultConfigs(); 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(); const settings = await getProxySettings();
console.log('Current proxy settings:', settings); console.log('Current proxy settings:', settings);
@@ -338,7 +348,7 @@ async function checkAndSetInitialProxy() {
} }
} }
// 如果没有检测到代理或已存在配置,则设置为系统代理 // 如果没有之前的配置也没有检测到代理,才设置为系统代理
await handleSetProxyConfig({ await handleSetProxyConfig({
id: 'system', id: 'system',
name: '[系统代理]', name: '[系统代理]',
@@ -346,9 +356,6 @@ async function checkAndSetInitialProxy() {
enabled: true enabled: true
}, () => {}); }, () => {});
// 设置认证监听
await ProxyAuth.setupAuthListener();
} catch (error) { } catch (error) {
console.error('Error during initialization:', error); console.error('Error during initialization:', error);
} }
@@ -356,10 +363,10 @@ async function checkAndSetInitialProxy() {
// 修改 setupProxyHandlers 函数 // 修改 setupProxyHandlers 函数
export function setupProxyHandlers() { export function setupProxyHandlers() {
// 设置代理错误处理和认证 // 设置代理错误处理
ProxyAuth.setupErrorHandler(); ProxyAuth.setupErrorHandler();
// 设置认证监听
ProxyAuth.setupAuthListener(); ProxyAuth.setupAuthListener();
// 设置代理请求监听器 // 设置代理请求监听器
setupProxyRequestListener(); setupProxyRequestListener();
+862 -587
View File
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -43,9 +43,9 @@ export class ProxySettings {
]); ]);
} }
// 确保日志存储已初始化 // 确保日志存储已初始化
const logs = await proxyStore.getLogs(); // 使用 getLogs 而不是 getProxyLogs const logs = await proxyStore.getLogs();
if (!logs || logs.length === 0) { if (!logs || logs.length === 0) {
await proxyStore.clearLogs(); // 初始化日志存储 await proxyStore.clearLogs();
} }
} }
} }
+8 -4
View File
@@ -237,21 +237,25 @@ export const ProxySwitch: React.FC<ProxySwitchProps> = () => {
const menuItems: MenuProps['items'] = [ const menuItems: MenuProps['items'] = [
...FIXED_MODES.map(mode => ({ ...FIXED_MODES.map(mode => ({
key: mode.key, key: mode.key,
icon: <span className="menu-icon" style={{ color: mode.color }}>{mode.icon}</span>, icon: <span className="menu-icon" style={{
label: mode.name, 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' : ''}`, className: `${currentMode === mode.key ? 'menu-item-selected' : ''} ${isLoading ? 'menu-item-loading' : ''}`,
title: mode.name.replace(/[\[\]]/g, '') title: mode.name.replace(/[\[\]]/g, '')
})), })),
{ type: 'divider' }, { type: 'divider' },
...customProxies.map(proxy => ({ ...customProxies.map(proxy => ({
key: proxy.key, 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 />} {proxy.config.proxyType === 'pac_script' ? '📜' : <GlobalOutlined />}
</span>, </span>,
label: <span style={{ label: <span style={{
color: currentMode === proxy.key ? 'var(--yakit-primary)' : 'inherit', color: currentMode === proxy.key ? 'var(--yakit-primary)' : 'inherit',
opacity: isLoading ? 0.7 : 1 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' : ''}`, className: `${currentMode === proxy.key ? 'menu-item-selected' : ''} ${isLoading ? 'menu-item-loading' : ''}`,
title: proxy.config.scheme title: proxy.config.scheme
? `${proxy.config.scheme.toUpperCase()} ${proxy.config.host}:${proxy.config.port}` ? `${proxy.config.scheme.toUpperCase()} ${proxy.config.host}:${proxy.config.port}`
@@ -107,7 +107,7 @@ export const ProxySettings: React.FC<ProxySettingsProps> = ({
// 处理固定代理服务器模式 // 处理固定代理服务器模式
const bypassList = values.bypassList const bypassList = values.bypassList
? values.bypassList.split('\n').map(line => line.trim()).filter(line => line.length > 0) ? values.bypassList.split('\n').map(line => line.trim()).filter(line => line.length > 0)
: ["localhost", "127.0.0.1"]; : [""];
updatedConfig = { updatedConfig = {
id: editingConfig.id, id: editingConfig.id,