diff --git a/src/index.js b/src/index.js index a15aa74a6..4a25db225 100644 --- a/src/index.js +++ b/src/index.js @@ -149,10 +149,11 @@ app.use(render({ assetsVersion, }, app)); -/** - * Redirect old URLs #1. - */ + if (site === 'jsdelivr') { + /** + * Redirect old URLs #1. + */ app.use(async (ctx, next) => { if (!ctx.query._escaped_fragment_) { return next(); @@ -165,6 +166,18 @@ if (site === 'jsdelivr') { return ctx.redirect(`/package/${legacyMapping[name].type}/${legacyMapping[name].name}`); } }); + + /** + * Redirect previous Globalping pages. + */ + app.use(async (ctx, next) => { + if (/^\/globalping(?:\/|$)/.test(ctx.path)) { + ctx.status = 301; + return ctx.redirect(`https://globalping.io${ctx.url.replace(/^\/[^/?]+/, '')}`); + } + + return next(); + }); } /** diff --git a/src/routes/jsdelivr.js b/src/routes/jsdelivr.js index c4a5f2cd8..17889068a 100644 --- a/src/routes/jsdelivr.js +++ b/src/routes/jsdelivr.js @@ -172,13 +172,4 @@ koaElasticUtils.addRoutes(router, [ [ '/open-graph/image/npm/:name', '/open-graph/image/:type(npm)/:scope?/:name' ], ], ogImage); - -/** - * Redirect previous Globalping pages. - */ -router.get('/globalping/:path(.*)?', async (ctx) => { - ctx.status = 301; - return ctx.redirect(`https://globalping.io${ctx.url.replace(/^\/[^/?]+/, '')}`); -}); - module.exports = router;