33/**
44 * static files (404.html, sw.js, conf.js)
55 */
6- const ASSET_URL = 'https://zjcqoo .github.io'
6+ const ASSET_URL = 'https://etherdream .github.io/jsproxy '
77
8- const JS_VER = 8
8+ const JS_VER = 10
99const MAX_RETRY = 1
1010
11-
11+ /** @type { RequestInit } */
1212const PREFLIGHT_INIT = {
1313 status : 204 ,
1414 headers : new Headers ( {
1515 'access-control-allow-origin' : '*' ,
1616 'access-control-allow-methods' : 'GET,POST,PUT,PATCH,TRACE,DELETE,HEAD,OPTIONS' ,
17- 'access-control-allow-headers' : '--raw-info,--level,--url,--referer,--cookie,--origin,--ext,--aceh,--ver,--type,--mode,accept,accept-charset,accept-encoding,accept-language,accept-datetime,authorization,cache-control,content-length,content-type,date,if-match,if-modified-since,if-none-match,if-range,if-unmodified-since,max-forwards,pragma,range,te,upgrade,upgrade-insecure-requests,x-requested-with,chrome-proxy,purpose' ,
1817 'access-control-max-age' : '1728000' ,
1918 } ) ,
2019}
2120
2221/**
23- * @param {string } message
22+ * @param {any } body
2423 * @param {number } status
25- * @param {any } headers
24+ * @param {Object<string, string> } headers
2625 */
27- function makeRes ( message , status = 200 , headers = { } ) {
28- headers [ 'cache-control' ] = 'no-cache'
29- headers [ 'vary' ] = '--url'
26+ function makeRes ( body , status = 200 , headers = { } ) {
27+ headers [ '--ver' ] = JS_VER
3028 headers [ 'access-control-allow-origin' ] = '*'
31- return new Response ( message , { status, headers} )
29+ return new Response ( body , { status, headers} )
30+ }
31+
32+
33+ /**
34+ * @param {string } urlStr
35+ */
36+ function newUrl ( urlStr ) {
37+ try {
38+ return new URL ( urlStr )
39+ } catch ( err ) {
40+ return null
41+ }
3242}
3343
3444
3545addEventListener ( 'fetch' , e => {
3646 const ret = fetchHandler ( e )
37- . catch ( err => makeRes ( 'cfworker error:' + err , 502 ) )
47+ . catch ( err => makeRes ( 'cfworker error:\n ' + err . stack , 502 ) )
3848 e . respondWith ( ret )
3949} )
4050
4151
42- function fetchHandler ( e ) {
52+ /**
53+ * @param {FetchEvent } e
54+ */
55+ async function fetchHandler ( e ) {
4356 const req = e . request
4457 const urlStr = req . url
4558 const urlObj = new URL ( urlStr )
59+ const path = urlObj . href . substr ( urlObj . origin . length )
4660
4761 if ( urlObj . protocol === 'http:' ) {
4862 urlObj . protocol = 'https:'
@@ -52,25 +66,29 @@ function fetchHandler(e) {
5266 } )
5367 }
5468
55- switch ( urlObj . pathname ) {
69+ if ( path . startsWith ( '/http/' ) ) {
70+ return httpHandler ( req , path . substr ( 6 ) )
71+ }
72+
73+ switch ( path ) {
5674 case '/http' :
57- return httpHandler ( req )
75+ return makeRes ( '请更新 cfworker 到最新版本!' )
5876 case '/ws' :
5977 return makeRes ( 'not support' , 400 )
6078 case '/works' :
6179 return makeRes ( 'it works' )
6280 default :
6381 // static files
64- return fetch ( ASSET_URL + urlObj . pathname )
82+ return fetch ( ASSET_URL + path )
6583 }
6684}
6785
6886
69-
7087/**
7188 * @param {Request } req
89+ * @param {string } pathname
7290 */
73- async function httpHandler ( req ) {
91+ function httpHandler ( req , pathname ) {
7492 const reqHdrRaw = req . headers
7593 if ( reqHdrRaw . has ( 'x-jsproxy' ) ) {
7694 return Response . error ( )
@@ -83,8 +101,6 @@ async function httpHandler(req) {
83101 return new Response ( null , PREFLIGHT_INIT )
84102 }
85103
86- let urlObj = null
87- let extHdrs = null
88104 let acehOld = false
89105 let rawSvr = ''
90106 let rawLen = ''
@@ -93,52 +109,51 @@ async function httpHandler(req) {
93109 const reqHdrNew = new Headers ( reqHdrRaw )
94110 reqHdrNew . set ( 'x-jsproxy' , '1' )
95111
96- for ( const [ k , v ] of reqHdrRaw . entries ( ) ) {
97- if ( ! k . startsWith ( '--' ) ) {
98- continue
99- }
100- reqHdrNew . delete ( k )
101-
102- const k2 = k . substr ( 2 )
103- switch ( k2 ) {
104- case 'url' :
105- urlObj = new URL ( v )
106- break
107- case 'aceh' :
108- acehOld = true
109- break
110- case 'raw-info' :
111- [ rawSvr , rawLen , rawEtag ] = v . split ( '|' )
112- break
113- case 'level' :
114- case 'mode' :
115- case 'type' :
116- break
117- case 'ext' :
118- extHdrs = JSON . parse ( v )
119- break
120- default :
112+ // 此处逻辑和 http-dec-req-hdr.lua 大致相同
113+ // https://github.com/EtherDream/jsproxy/blob/master/lua/http-dec-req-hdr.lua
114+ const refer = reqHdrNew . get ( 'referer' )
115+ const query = refer . substr ( refer . indexOf ( '?' ) + 1 )
116+ if ( ! query ) {
117+ return makeRes ( 'missing params' , 403 )
118+ }
119+ const param = new URLSearchParams ( query )
120+
121+ for ( const [ k , v ] of Object . entries ( param ) ) {
122+ if ( k . substr ( 0 , 2 ) === '--' ) {
123+ // 系统信息
124+ switch ( k . substr ( 2 ) ) {
125+ case 'aceh' :
126+ acehOld = true
127+ break
128+ case 'raw-info' :
129+ [ rawSvr , rawLen , rawEtag ] = v . split ( '|' )
130+ break
131+ }
132+ } else {
133+ // 还原 HTTP 请求头
121134 if ( v ) {
122- reqHdrNew . set ( k2 , v )
135+ reqHdrNew . set ( k , v )
123136 } else {
124- reqHdrNew . delete ( k2 )
137+ reqHdrNew . delete ( k )
125138 }
126- break
127139 }
128140 }
129- if ( extHdrs ) {
130- for ( const [ k , v ] of Object . entries ( extHdrs ) ) {
131- reqHdrNew . set ( k , v )
132- }
141+ if ( ! param . has ( 'referer' ) ) {
142+ reqHdrNew . delete ( 'referer' )
133143 }
144+
145+ // cfworker 会把路径中的 `//` 合并成 `/`
146+ const urlStr = pathname . replace ( / ^ ( h t t p s ? ) : \/ + / , '$1://' )
147+ const urlObj = newUrl ( urlStr )
134148 if ( ! urlObj ) {
135- return makeRes ( 'missing url param' , 403 )
149+ return makeRes ( 'invalid proxy url: ' + urlStr , 403 )
136150 }
137151
138152 /** @type {RequestInit } */
139153 const reqInit = {
140154 method : req . method ,
141155 headers : reqHdrNew ,
156+ redirect : 'manual' ,
142157 }
143158 if ( req . method === 'POST' ) {
144159 reqInit . body = req . body
@@ -159,7 +174,6 @@ async function proxy(urlObj, reqInit, acehOld, rawLen, retryTimes) {
159174 const resHdrNew = new Headers ( resHdrOld )
160175
161176 let expose = '*'
162- let vary = '--url'
163177
164178 for ( const [ k , v ] of resHdrOld . entries ( ) ) {
165179 if ( k === 'access-control-allow-origin' ||
@@ -174,9 +188,6 @@ async function proxy(urlObj, reqInit, acehOld, rawLen, retryTimes) {
174188 }
175189 resHdrNew . delete ( k )
176190 }
177- else if ( k === 'vary' ) {
178- vary = vary + ',' + v
179- }
180191 else if ( acehOld &&
181192 k !== 'cache-control' &&
182193 k !== 'content-language' &&
@@ -206,8 +217,9 @@ async function proxy(urlObj, reqInit, acehOld, rawLen, retryTimes) {
206217 return proxy ( urlObj , reqInit , acehOld , rawLen , retryTimes + 1 )
207218 }
208219 }
209- return makeRes ( 'error' , 400 , {
210- '--error' : 'bad len:' + newLen
220+ return makeRes ( res . body , 400 , {
221+ '--error' : `bad len: ${ newLen } ${ rawLen } ,
222+ 'access-control-expose-headers' : '--error' ,
211223 } )
212224 }
213225
@@ -220,12 +232,12 @@ async function proxy(urlObj, reqInit, acehOld, rawLen, retryTimes) {
220232
221233 resHdrNew . set ( 'access-control-expose-headers' , expose )
222234 resHdrNew . set ( 'access-control-allow-origin' , '*' )
223- resHdrNew . set ( 'vary' , vary )
224235 resHdrNew . set ( '--s' , status )
225236 resHdrNew . set ( '--ver' , JS_VER )
226237
227238 resHdrNew . delete ( 'content-security-policy' )
228239 resHdrNew . delete ( 'content-security-policy-report-only' )
240+ resHdrNew . delete ( 'clear-site-data' )
229241
230242 if ( status === 301 ||
231243 status === 302 ||
0 commit comments