Compare commits

...

2 commits

22
main.go
View file

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