Ailur
/
jsFetch
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patched apple phones not being able to read from jsStreams for some unknown reason (3)

This commit is contained in:
Tracker-Friendly 2025-02-05 17:21:55 +00:00
parent 981b39a00b
commit b80cca5731
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
main.go
View File

@ -190,22 +190,22 @@ func (t *Transport) RoundTrip(req *Request) (resp *Response, err error) {
} }
// Safari doesn't support readable streams // Safari doesn't support readable streams
if !js.Global().Get("ApplePaySession").IsUndefined() { println("Trying duck test")
if js.Global().Get("ApplePaySession").IsUndefined() {
println("Not an apple")
resp.Body = jsStreams.NewReadableStream(args[0].Get("body")) resp.Body = jsStreams.NewReadableStream(args[0].Get("body"))
} else { } else {
// Read in the body with .arrayBuffer() // Read in the body with .arrayBuffer()
promise := args[0].Call("bytes") promise := args[0].Call("arrayBuffer")
var waitGroup sync.WaitGroup
waitGroup.Add(1) waitGroup.Add(1)
promise.Call("then", js.FuncOf(func(this js.Value, args []js.Value) interface{} { promise.Call("then", js.FuncOf(func(this js.Value, args []js.Value) interface{} {
b := make([]byte, args[0].Get("length").Int()) uint8Array := js.Global().Get("Uint8Array").New(args[0])
js.CopyBytesToGo(b, args[0]) b := make([]byte, uint8Array.Get("length").Int())
js.CopyBytesToGo(b, uint8Array)
resp.Body = io.NopCloser(bytes.NewReader(b)) resp.Body = io.NopCloser(bytes.NewReader(b))
waitGroup.Done() waitGroup.Done()
return nil return nil
})) }))
waitGroup.Wait()
} }
// Standard-library compatibility fields // Standard-library compatibility fields
@ -675,7 +675,7 @@ func Get(url string) (response *Response, err error) {
return return
} }
// Disable if not https, we don't detect chromium, or we are on safari // Disable if not https, we don't detect chromium, or we are on safari
if !strings.HasPrefix(url, "https://") || !js.Global().Get("chrome").IsUndefined() || !js.Global().Get("ApplePaySession").IsUndefined() { if !strings.HasPrefix(url, "https://") || !js.Global().Get("chrome").IsUndefined() || js.Global().Get("ApplePaySession").IsUndefined() {
request.DisableStreamedClient = true request.DisableStreamedClient = true
} }
response, err = Fetch.Do(request) response, err = Fetch.Do(request)
@ -692,7 +692,7 @@ func Post(url string, contentType string, body io.Reader) (response *Response, e
return return
} }
// Disable if not https, we don't detect chromium, or we are on safari // Disable if not https, we don't detect chromium, or we are on safari
if !strings.HasPrefix(url, "https://") || !js.Global().Get("chrome").IsUndefined() || !js.Global().Get("ApplePaySession").IsUndefined() { if !strings.HasPrefix(url, "https://") || !js.Global().Get("chrome").IsUndefined() || js.Global().Get("ApplePaySession").IsUndefined() {
request.DisableStreamedClient = true request.DisableStreamedClient = true
} }
request.Header.Add("Content-Type", contentType) request.Header.Add("Content-Type", contentType)
@ -712,7 +712,7 @@ func PostForm(url string, data url.Values) (response *Response, err error) {
} }
request.Header.Add("Content-Type", "application/x-www-form-urlencoded") request.Header.Add("Content-Type", "application/x-www-form-urlencoded")
// Disable if not https, we don't detect chromium, or we are on safari // Disable if not https, we don't detect chromium, or we are on safari
if !strings.HasPrefix(url, "https://") || !js.Global().Get("chrome").IsUndefined() || !js.Global().Get("ApplePaySession").IsUndefined() { if !strings.HasPrefix(url, "https://") || !js.Global().Get("chrome").IsUndefined() || js.Global().Get("ApplePaySession").IsUndefined() {
request.DisableStreamedClient = true request.DisableStreamedClient = true
} }
response, err = Fetch.Do(request) response, err = Fetch.Do(request)