pkgs/cloudflare-workers
pkgs/cloudflare-workers
1
0
Fork 0
mirror of https://github.com/syumai/workers.git synced 2025-03-11 01:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #120 from Skee/main

Browse Source 
add jsutil.MaybeInt wrapper; apply it to IncomingProperties.Asn
This commit is contained in:
syumai 2024-07-30 11:08:04 +09:00 committed by GitHub
commit 50d520dbd0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloudflare/fetch/property.go
View File

@ -184,7 +184,7 @@ func NewIncomingProperties(ctx context.Context) (*IncomingProperties, error) {
Latitude: jsutil.MaybeString(cf.Get("latitude")), Latitude: jsutil.MaybeString(cf.Get("latitude")),
TLSCipher: jsutil.MaybeString(cf.Get("tlsCipher")), TLSCipher: jsutil.MaybeString(cf.Get("tlsCipher")),
Continent: jsutil.MaybeString(cf.Get("continent")), Continent: jsutil.MaybeString(cf.Get("continent")),
Asn: cf.Get("asn").Int(), Asn: jsutil.MaybeInt(cf.Get("asn")),
ClientAcceptEncoding: jsutil.MaybeString(cf.Get("clientAcceptEncoding")), ClientAcceptEncoding: jsutil.MaybeString(cf.Get("clientAcceptEncoding")),
Country: jsutil.MaybeString(cf.Get("country")), Country: jsutil.MaybeString(cf.Get("country")),
TLSClientAuth: NewIncomingTLSClientAuth(cf.Get("tlsClientAuth")), TLSClientAuth: NewIncomingTLSClientAuth(cf.Get("tlsClientAuth")),

8
internal/jsutil/jsutil.go
View File

@ -97,6 +97,14 @@ func MaybeString(v js.Value) string {
return v.String() return v.String()
} }
// MaybeInt returns int value of given JavaScript value or returns nil if the value is undefined.
func MaybeInt(v js.Value) int {
if v.IsUndefined() {
return 0
}
return v.Int()
}
// MaybeDate returns time.Time value of given JavaScript Date value or returns nil if the value is undefined. // MaybeDate returns time.Time value of given JavaScript Date value or returns nil if the value is undefined.
func MaybeDate(v js.Value) (time.Time, error) { func MaybeDate(v js.Value) (time.Time, error) {
if v.IsUndefined() { if v.IsUndefined() {