Revert "feat: add proxy function"

This reverts commit 46c772c.

Author: hans000

package.json

@@ -10,6 +10,7 @@
     "build:local": "cross-env VITE_LOCAL=true node script.js && cross-env VITE_LOCAL=true npm run build:web && cross-env VITE_LOCAL=true npm run build:ts"
   },
   "dependencies": {
+    "@ant-design/compatible": "^5.1.2",
     "@ant-design/icons": "^5.2.6",
     "@monaco-editor/react": "^4.4.6",
     "antd": "^5.12.1",

public/manifest.json

@@ -20,7 +20,7 @@
   "default_locale": "zh_CN",
   "content_security_policy" : "script-src 'self' 'unsafe-eval'; script-src-elem 'self' data: blob: https://unpkg.com; worker-src 'self' data: blob:; object-src 'self'",
   "browser_action": {
-    "default_title": "Easy Interceptor by hans000 - v1.17.0",
+    "default_title": "Easy Interceptor by hans000 - v1.16.0",
     "default_popup": "index.html",
     "default_icon": "images/128-gray.png"
   },

src/App.tsx

@@ -164,6 +164,8 @@ export default function App() {
     }
 
     const update = (value: Record<FileType, string>, index: number) => {
+        const configInfo = JSON.parse(value.setting)
+        setConfigInfo(configInfo)
         setRules(rule => {
             const result = [...rule]
             const config = JSON.parse(value.config)
@@ -822,14 +824,7 @@ export default function App() {
                                         setFileName(fileName)
                                     }}
                                     onChange={(value, invalid) => {
-                                        if (fileName === 'setting') {
-                                            if (!invalid) {
-                                                const configInfo = JSON.parse(value.setting)
-                                                setConfigInfo(configInfo)  
-                                            }
-                                        } else {
-                                            update(value, activeIndex)
-                                        }
+                                        update(value, activeIndex)
                                         setInvalid(invalid)
                                     }} />
                             </div>

src/background/index.ts

@@ -8,7 +8,6 @@ import { ActiveGroupId, BackgroundMsgKey, ConfigInfoFieldKey, PopupMsgKey, Rules
 import { CustomEventProps, sendMessageToContent } from "../tools/message"
 import updateIcon from "../tools/updateIcon"
 import { arrayBufferToString, createRunFunc, objectToHttpHeaders, randID, trimUrlParams } from "../tools"
-import { URL } from "url"
 
 let __result = new Map<string, any>()
 let __rules: MatchRule[] = []
@@ -215,8 +214,6 @@ function responseStartedWatch(details: chrome.webRequest.WebResponseCacheDetails
 function beforeRequestIntercept(details: chrome.webRequest.WebRequestBodyDetails, url: string) {
     for (const rule of __rules) {
         if (rule.enable && matchPath(rule.test, url)) {
-            // 处理重定向优先级
-            // code面板 > rule.redirectUrl
             const fn = createRunFunc(rule.code, 'onRedirect')
             const redirectUrl = fn({
                 ...rule,

src/injected/index.ts

@@ -96,13 +96,12 @@ const app = {
     configInfo: {} as ConfigInfoType,
     rules: [],
     intercept(fetcher?: FetcherType) {
-        const { faked, fakedLog, banType, proxy } = app.configInfo
+        const { faked, fakedLog, banType } = app.configInfo
         proxyRequest({
             ...fetcher,
             faked,
             fakedLog,
             banType,
-            proxy,
             onMatch(req) {
                 if (app.configInfo.action === 'intercept') {
                     return matching(app.rules, req)

src/injected/proxy/fetch.ts

@@ -2,7 +2,7 @@
  * The AGPL License (AGPL)
  * Copyright (c) 2022 hans000
  */
-import { delayRun, tryToProxyUrl } from "../../tools";
+import { delayRun } from "../../tools";
 import { log } from "../../tools/log";
 import { parseUrl } from "../../tools";
 import { Options, __global__ } from "./globalVar";
@@ -22,9 +22,8 @@ export function proxyFetch(options: Options) {
     const proxyFetch = new Proxy(__global__.NativeFetch, {
         async apply(target, thisArg, args) {
             const [input, init] = args
-            const isRequest = input instanceof Request
-            const req = isRequest ? input.clone() : new Request(input.toString(), init)
-            const url = isRequest
+            const req = input instanceof Request ? input.clone() : new Request(input.toString(), init)
+            const url = input instanceof Request
                 ? parseUrl(input.url)
                 : input instanceof URL
                 ? input
@@ -36,8 +35,6 @@ export function proxyFetch(options: Options) {
                 params: [...url.searchParams.entries()],
             })
             const realFetch = __global__.PageFetch || target
-            const proxyUrl = tryToProxyUrl(input, __global__.options.proxy)
-            const proxyInput = isRequest ? new Request(proxyUrl, init) : proxyUrl
 
             if (matchItem) {
                 const loggable = options.faked && options.fakedLog
@@ -51,7 +48,7 @@ export function proxyFetch(options: Options) {
                 }
                 const realResponse = options.faked 
                     ? new Response(new Blob(['null'])) 
-                    : await realFetch.call(thisArg, proxyInput, init)
+                    : await realFetch.call(thisArg, input, init)
                 const response = await onFetchIntercept(matchItem)(realResponse)
 
                 return new Promise(resolve => {
@@ -71,11 +68,10 @@ export function proxyFetch(options: Options) {
                     }, matchItem ? matchItem.delay : undefined)
                 })
             }
-
             if (__global__.PageFetch) {
-                return __global__.PageFetch.call(thisArg, proxyInput, init)
+                return __global__.PageFetch.call(thisArg, ...args)
             }
-            return target.call(thisArg, proxyInput, init)
+            return target.call(thisArg, ...args)
         },
     })
 
@@ -104,4 +100,4 @@ export function unproxyFetch() {
             }
         })
     }
-}
+}

src/injected/proxy/globalVar.ts

@@ -2,7 +2,7 @@
  * The AGPL License (AGPL)
  * Copyright (c) 2022 hans000
  */
-import { MatchRule, BanType, ConfigInfoType } from "../../App"
+import { MatchRule, BanType } from "../../App"
 
 interface GlobalVar {
     NativeXhr: typeof XMLHttpRequest | undefined
@@ -23,7 +23,6 @@ export interface Options {
     faked: boolean
     fakedLog: boolean
     banType?: BanType
-    proxy?: ConfigInfoType['proxy']
     NativeFetch?: typeof fetch
     NativeXhr?: typeof XMLHttpRequest
     onMatch?: (reqestInfo: CustomRequestInfo) => MatchRule

src/injected/proxy/handle.ts

@@ -4,7 +4,7 @@
  */
 
 import { MatchRule } from "../../App"
-import { createSymbol, delayRun, modifyXhrProto, modifyXhrProtoProps, toTitleCase, tryToProxyUrl } from "../../tools"
+import { createSymbol, delayRun, modifyXhrProto, modifyXhrProtoProps, toTitleCase } from "../../tools"
 import { log } from "../../tools/log"
 import { parseUrl, parseXML, stringifyHeaders } from "../../tools"
 import { HttpStatusCodes } from "./constants"
@@ -101,11 +101,10 @@ export function proxyXhrInstance(inst: ProxyXMLHttpRequest) {
     const originOpen = inst.open
     const originSend = inst.send
     inst.open = (method: string, url: string | URL, async?: boolean) => {
-        const proxyUrl = tryToProxyUrl(url, __global__.options.proxy)
         inst._async = async
-        inst._url = proxyUrl
+        inst._url = url
         inst._method = method
-        originOpen.call(inst, method, proxyUrl, async)
+        originOpen.call(inst, method, url, async)
     }
     inst.send = (data) => {
         const delay = inst._matchItem ? inst._matchItem.delay : undefined
@@ -225,4 +224,4 @@ export function proxyFakeXhrInstance(inst: ProxyXMLHttpRequest, options: Options
     }
 
     return inst
-}
+}

src/tools/JsonParse.ts

@@ -221,33 +221,4 @@ export function matchPath(pattern: string, path: string) {
 
 export function toTitleCase(str = '') {
     return str.replace(/\b[a-z]/g, c => c.toUpperCase())
-}
-
-export function tryToProxyUrl(url: string | URL, proxy: Record<string, string | {
-    target: string
-    rewrite?: string
-}> = {}) {
-    const urlObj = url instanceof URL ? url : new URL(url)
-    for (const [name, value] of Object.entries(proxy)) {
-        try {
-            const reg = new RegExp(name)
-            if (reg.test(urlObj.pathname)) {
-                if (typeof value === 'string') {
-                    urlObj.host = value
-                    return urlObj.toString()
-                } else {
-                    if (value.target) {
-                        urlObj.host = value.target
-                    }
-                    if (value.rewrite) {
-                        urlObj.pathname = urlObj.pathname.replace(reg, '')
-                    }
-                    return urlObj.toString()
-                }
-            }
-        } catch (error) {
-            console.error(error)
-        }
-    }
-    return url
-}
+}