Skip to content
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

Fix legacy router #1031

Merged
merged 2 commits into from
Jan 15, 2025
Merged

Fix legacy router #1031

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83d5762
Fix leacy router
ije Jan 15, 2025
598273e
Update `LegacyBuildMeta` struct
ije Jan 15, 2025
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
39 changes: 22 additions & 17 deletions server/legacy_router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,12 @@ func esmLegacyRouter(buildStorage storage.Storage) rex.Handle {
}
}

type LegacyBuildMeta struct {
EsmId string `json:"esmId,omitempty"`
Dts string `json:"dts,omitempty"`
Code string `json:"code"`
}

func legacyESM(ctx *rex.Context, buildStorage storage.Storage, buildVersionPrefix string) any {
pathname := ctx.R.URL.Path
if buildVersionPrefix != "" {
Expand Down Expand Up @@ -179,26 +185,27 @@ func legacyESM(ctx *rex.Context, buildStorage storage.Storage, buildVersionPrefi
h.Write([]byte(query))
savePath += "." + base64.RawURLEncoding.EncodeToString(h.Sum(nil))
}
savePath += ".mjs"
savePath += ".meta"
f, _, e := buildStorage.Get(savePath)
if e != nil && e != storage.ErrNotFound {
return rex.Status(500, "Storage error: "+e.Error())
}
if e == nil {
defer f.Close()
var ret []string
if json.NewDecoder(f).Decode(&ret) == nil && len(ret) >= 2 {
var ret LegacyBuildMeta
if json.NewDecoder(f).Decode(&ret) == nil {
ctx.SetHeader("Content-Type", ctJavaScript)
ctx.SetHeader("Control-Cache", ccImmutable)
ctx.SetHeader("X-ESM-Id", ret[0])
if varyUA {
appendVaryHeader(ctx.W.Header(), "User-Agent")
}
if len(ret) == 3 {
ctx.SetHeader("X-TypeScript-Types", getOrigin(ctx)+ret[1])
return ret[2]
if ret.EsmId != "" {
ctx.SetHeader("X-ESM-Id", ret.EsmId)
}
if ret.Dts != "" {
ctx.SetHeader("X-TypeScript-Types", getOrigin(ctx)+ret.Dts)
}
return ret[1]
return ret.Code
}
}
}
Expand Down Expand Up @@ -242,10 +249,6 @@ func legacyESM(ctx *rex.Context, buildStorage storage.Storage, buildVersionPrefi
return rex.Status(500, "Failed to fetch data from the legacy esm.sh server")
}
esmId := res.Header.Get("X-Esm-Id")
if esmId == "" {
ctx.SetHeader("Cache-Control", "public, max-age=600")
return rex.Status(502, "Unexpected response from the legacy esm.sh server")
}
dts := res.Header.Get("X-TypeScript-Types")
if dts != "" {
u, err := url.Parse(dts)
Expand All @@ -255,21 +258,23 @@ func legacyESM(ctx *rex.Context, buildStorage storage.Storage, buildVersionPrefi
dts = u.Path
}
}
ret := []string{esmId}
if dts != "" {
ret = append(ret, dts)
ret := LegacyBuildMeta{
EsmId: esmId,
Dts: dts,
Code: string(code),
}
ret = append(ret, string(code))
err = buildStorage.Put(savePath, bytes.NewReader(utils.MustEncodeJSON(ret)))
if err != nil {
return rex.Status(500, "Storage error: "+err.Error())
}
ctx.SetHeader("Content-Type", res.Header.Get("Content-Type"))
ctx.SetHeader("Control-Cache", ccImmutable)
ctx.SetHeader("X-ESM-Id", esmId)
if query != "" && !ctx.R.URL.Query().Has("target") {
appendVaryHeader(ctx.W.Header(), "User-Agent")
}
if esmId != "" {
ctx.SetHeader("X-ESM-Id", esmId)
}
if dts != "" {
ctx.SetHeader("X-TypeScript-Types", getOrigin(ctx)+dts)
}
Expand Down
Loading