fix: redirection in router handler

DIYgod · Nov 12, 2024 · 91d9acc · 91d9acc
1 parent 482986d
commit 91d9acc
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 13 deletions.
diff --git a/lib/middleware/template.test.ts b/lib/middleware/template.test.ts
@@ -108,4 +108,10 @@ describe('template', () => {
         expect(parsed.items[0].enclosure?.length).toBe('3661');
         expect(parsed.items[0].itunes.duration).toBe('10:10:10');
     });
+
+    it(`redirect`, async () => {
+        const response = await app.request('/test/redirect');
+        expect(response.status).toBe(301);
+        expect(response.headers.get('location')).toBe('/test/1');
+    });
 });
diff --git a/lib/middleware/template.tsx b/lib/middleware/template.tsx
@@ -102,7 +102,9 @@ const middleware: MiddlewareHandler = async (ctx, next) => {
         return ctx.json(result);
     }
 
-    if (ctx.get('no-content')) {
+    if (ctx.get('redirect')) {
+        return ctx.redirect(ctx.get('redirect'), 301);
+    } else if (ctx.get('no-content')) {
         return ctx.body(null);
     } else {
         // retain .ums for backward compatibility

diff --git a/lib/routes/141jav/index.ts b/lib/routes/141jav/index.ts
@@ -66,7 +66,7 @@ async function handler(ctx) {
     const $ = load(response.data);
 
     if (getSubPath(ctx) === '/') {
-        ctx.redirect(`/141jav${$('.overview').first().attr('href')}`);
+        ctx.set('redirect', `/141jav${$('.overview').first().attr('href')}`);
         return;
     }
 

diff --git a/lib/routes/141ppv/index.ts b/lib/routes/141ppv/index.ts
@@ -66,7 +66,7 @@ async function handler(ctx) {
     const $ = load(response.data);
 
     if (getSubPath(ctx) === '/') {
-        ctx.redirect(`/141ppv${$('.overview').first().attr('href')}`);
+        ctx.set('redirect', `/141ppv${$('.overview').first().attr('href')}`);
         return;
     }
 

diff --git a/lib/routes/aqara/region.ts b/lib/routes/aqara/region.ts
@@ -14,5 +14,5 @@ function handler(ctx) {
 
     const { region = 'en', type = 'news' } = ctx.req.param();
     const redirectTo = `/aqara/${region}/category/${types[type]}`;
-    ctx.redirect(redirectTo);
+    ctx.set('redirect', redirectTo);
 }
diff --git a/lib/routes/cs/zzkx.ts b/lib/routes/cs/zzkx.ts
@@ -10,5 +10,5 @@ function handler(ctx) {
     // https://www.cs.com.cn/sylm/jsbd/
 
     const redirectTo = '/cs/sylm/jsbd';
-    ctx.redirect(redirectTo);
+    ctx.set('redirect', redirectTo);
 }
diff --git a/lib/routes/dongqiudi/daily.ts b/lib/routes/dongqiudi/daily.ts
@@ -18,5 +18,5 @@ export const route: Route = {
 };
 
 function handler(ctx) {
-    ctx.redirect('/dongqiudi/special/48');
+    ctx.set('redirect', '/dongqiudi/special/48');
 }
diff --git a/lib/routes/hostmonit/cloudflareyesv6.ts b/lib/routes/hostmonit/cloudflareyesv6.ts
@@ -7,5 +7,5 @@ export const route: Route = {
 };
 
 function handler(ctx) {
-    ctx.redirect('/hostmonit/cloudflareyes/v6');
+    ctx.set('redirect', '/hostmonit/cloudflareyes/v6');
 }
diff --git a/lib/routes/jiemian/list.ts b/lib/routes/jiemian/list.ts
@@ -10,5 +10,5 @@ function handler(ctx) {
     const id = ctx.req.param('id');
 
     const redirectTo = `/jiemian${id ? `/lists/${id}` : ''}`;
-    ctx.redirect(redirectTo);
+    ctx.set('redirect', redirectTo);
 }
diff --git a/lib/routes/liulinblog/itnews.ts b/lib/routes/liulinblog/itnews.ts
@@ -9,5 +9,5 @@ export const route: Route = {
 function handler(ctx) {
     const { channel } = ctx.req.param();
     const redirectTo = `/liulinblog/${channel}`;
-    ctx.redirect(redirectTo);
+    ctx.set('redirect', redirectTo);
 }
diff --git a/lib/routes/nbd/daily.ts b/lib/routes/nbd/daily.ts
@@ -24,5 +24,5 @@ export const route: Route = {
 };
 
 function handler(ctx) {
-    ctx.redirect('/nbd/332');
+    ctx.set('redirect', '/nbd/332');
 }
diff --git a/lib/routes/scmp/coronavirus.ts b/lib/routes/scmp/coronavirus.ts
@@ -18,5 +18,5 @@ export const route: Route = {
 };
 
 function handler(ctx) {
-    ctx.redirect('/scmp/topics/coronavirus-pandemic-all-stories');
+    ctx.set('redirect', '/scmp/topics/coronavirus-pandemic-all-stories');
 }
diff --git a/lib/routes/test/index.ts b/lib/routes/test/index.ts
@@ -32,6 +32,10 @@ async function handler(ctx) {
     if (ctx.req.param('id') === 'invalid-parameter-error') {
         throw new InvalidParameterError('Test invalid parameter error');
     }
+    if (ctx.req.param('id') === 'redirect') {
+        ctx.set('redirect', '/test/1');
+        return;
+    }
     let item: DataItem[] = [];
     let image: string | null = null;
     switch (ctx.req.param('id')) {

diff --git a/lib/routes/weibo/timeline.ts b/lib/routes/weibo/timeline.ts
@@ -95,7 +95,8 @@ async function handler(ctx) {
             ctx.set({
                 'Cache-Control': 'no-cache',
             });
-            ctx.redirect(`https://api.weibo.com/oauth2/authorize?client_id=${app_key}&redirect_uri=${redirect_url}${routeParams ? `&state=${routeParams}` : ''}`);
+            ctx.set('redirect', `https://api.weibo.com/oauth2/authorize?client_id=${app_key}&redirect_uri=${redirect_url}${routeParams ? `&state=${routeParams}` : ''}`);
+            return;
         }
         const resultItem = await Promise.all(
             response.statuses.map(async (item) => {
@@ -183,6 +184,6 @@ async function handler(ctx) {
         ctx.set({
             'Cache-Control': 'no-cache',
         });
-        ctx.redirect(`https://api.weibo.com/oauth2/authorize?client_id=${app_key}&redirect_uri=${redirect_url}${routeParams ? `&state=${feature}/${routeParams.replaceAll('&', '%26')}` : ''}`);
+        ctx.set('redirect', `https://api.weibo.com/oauth2/authorize?client_id=${app_key}&redirect_uri=${redirect_url}${routeParams ? `&state=${feature}/${routeParams.replaceAll('&', '%26')}` : ''}`);
     }
 }