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

add missing null checks to R2 conversion

Browse Source
This commit is contained in:
syumai 2024-04-18 01:58:23 +09:00
parent 482b28195a
commit 13b7485b1a
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cloudflare/r2object.go
View File

@ -82,6 +82,9 @@ type R2HTTPMetadata struct {
} }
func toR2HTTPMetadata(v js.Value) (R2HTTPMetadata, error) { func toR2HTTPMetadata(v js.Value) (R2HTTPMetadata, error) {
if v.IsUndefined() || v.IsNull() {
return R2HTTPMetadata{}, nil
}
cacheExpiry, err := jsutil.MaybeDate(v.Get("cacheExpiry")) cacheExpiry, err := jsutil.MaybeDate(v.Get("cacheExpiry"))
if err != nil { if err != nil {
return R2HTTPMetadata{}, fmt.Errorf("error converting cacheExpiry: %w", err) return R2HTTPMetadata{}, fmt.Errorf("error converting cacheExpiry: %w", err)

3
internal/jsutil/jsutil.go
View File

@ -66,6 +66,9 @@ func AwaitPromise(promiseVal js.Value) (js.Value, error) {
// StrRecordToMap converts JavaScript side's Record<string, string> into map[string]string. // StrRecordToMap converts JavaScript side's Record<string, string> into map[string]string.
func StrRecordToMap(v js.Value) map[string]string { func StrRecordToMap(v js.Value) map[string]string {
if v.IsUndefined() || v.IsNull() {
return map[string]string{}
}
entries := ObjectClass.Call("entries", v) entries := ObjectClass.Call("entries", v)
entriesLen := entries.Get("length").Int() entriesLen := entries.Get("length").Int()
result := make(map[string]string, entriesLen) result := make(map[string]string, entriesLen)