Skip to content

fix: fetch half duplex in Chromium 105 & fix lost body in other http … #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Teddy-Zhu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: fetch half duplex in Chromium 105 & fix lost body in other http … #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 29 additions & 26 deletions src/proxy/src/network.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {Database} from './database.js'

const REFER_ORIGIN = location.origin + '/'
const ENABLE_3RD_COOKIE = true
const hasBodyMethods = ['POST','PUT','DELETE','PATCH']

/** @type {Database} */
let mDB
Expand Down Expand Up @@ -38,36 +39,36 @@ export async function setDB(db) {


/**
* @param {string} url
* @param {string} url
*/
function getUrlCache(url) {
return mDB.get('url-cache', url)
}


/**
* @param {string} url
* @param {string} host
* @param {string} info
* @param {number} expires
* @param {string} url
* @param {string} host
* @param {string} info
* @param {number} expires
*/
async function setUrlCache(url, host, info, expires) {
await mDB.put('url-cache', {url, host, info, expires})
}


/**
* @param {string} url
* @param {string} url
*/
async function delUrlCache(url) {
await mDB.delete('url-cache', url)
}


/**
* @param {URL} targetUrlObj
* @param {URL} clientUrlObj
* @param {Request} req
* @param {URL} targetUrlObj
* @param {URL} clientUrlObj
* @param {Request} req
*/
function getReqCookie(targetUrlObj, clientUrlObj, req) {
const cred = req.credentials
Expand All @@ -87,7 +88,7 @@ function getReqCookie(targetUrlObj, clientUrlObj, req) {


/**
* @param {Headers} header
* @param {Headers} header
*/
function parseResCache(header) {
const cacheStr = header.get('cache-control')
Expand Down Expand Up @@ -115,8 +116,8 @@ function parseResCache(header) {


/**
* @param {string[]} cookieStrArr
* @param {URL} urlObj
* @param {string[]} cookieStrArr
* @param {URL} urlObj
* @param {URL} cliUrlObj
*/
function procResCookie(cookieStrArr, urlObj, cliUrlObj) {
Expand Down Expand Up @@ -146,7 +147,7 @@ function procResCookie(cookieStrArr, urlObj, cliUrlObj) {


/**
* @param {Response} res
* @param {Response} res
*/
function getResInfo(res) {
const rawHeaders = res.headers
Expand Down Expand Up @@ -215,8 +216,8 @@ const R_UNSAFE_REQ_HDR_CHAR =
/[\x00-\x08\x0a-\x1f\x22\x28\x29\x3a\x3c\x3e\x3f\x40\x5b\x5c\x5d\x7b\x7d\x7f]/

/**
* @param {string} key
* @param {string} val
* @param {string} key
* @param {string} val
*/
function isSimpleReqHdr(key, val) {
if (key === 'content-type') {
Expand All @@ -238,9 +239,9 @@ function isSimpleReqHdr(key, val) {


/**
* @param {Request} req
* @param {URL} urlObj
* @param {URL} cliUrlObj
* @param {Request} req
* @param {URL} urlObj
* @param {URL} cliUrlObj
*/
function initReqHdr(req, urlObj, cliUrlObj) {
const reqHdr = new Headers()
Expand Down Expand Up @@ -286,8 +287,8 @@ function initReqHdr(req, urlObj, cliUrlObj) {
}

/**
* @param {RequestInit} reqOpt
* @param {Object<string, string>} info
* @param {RequestInit} reqOpt
* @param {Object<string, string>} info
*/
function updateReqHeaders(reqOpt, info) {
reqOpt.referrer = '/?' + new URLSearchParams(info)
Expand All @@ -297,9 +298,9 @@ function updateReqHeaders(reqOpt, info) {
const MAX_RETRY = 5

/**
* @param {Request} req
* @param {URL} urlObj
* @param {URL} cliUrlObj
* @param {Request} req
* @param {URL} urlObj
* @param {URL} cliUrlObj
*/
export async function launch(req, urlObj, cliUrlObj) {
const {method} = req
Expand All @@ -310,7 +311,7 @@ export async function launch(req, urlObj, cliUrlObj) {
method,
}

if (method === 'POST' && !req.bodyUsed) {
if (hasBodyMethods.indexOf(method) >= 0 && !req.bodyUsed) {
if (req.body) {
reqOpt.body = req.body
} else {
Expand Down Expand Up @@ -398,7 +399,7 @@ export async function launch(req, urlObj, cliUrlObj) {
} else {
host = route.getHost(urlHash, level)
}

const rawUrl = urlx.delHash(urlObj.href)
let proxyUrl = route.genUrl(host, 'http') + '/' + rawUrl

Expand All @@ -408,7 +409,9 @@ export async function launch(req, urlObj, cliUrlObj) {
} else {
delete reqMap['--raw-info']
}

if (reqOpt['body'] instanceof ReadableStream){
reqOpt['duplex'] = 'half'
}
res = null
try {
reqMap['--level'] = level
Expand Down