@jayfong/x-server 2.35.2 → 2.37.0

package/lib/_cjs/core/handler.js

@@ -10,6 +10,7 @@ var vae = _interopRequireWildcard(require("vtils/vae"));
 var _validator = require("vtils/validator");
 var _http_error = require("../core/http_error");
 var _dispose = require("../services/dispose");
+var _http_redirect = require("./http_redirect");
 var _server = require("./server");
 _validator.yup.setLocale((0, _validator.getZhCN)({
   getLabel: params => params.label || params.path
@@ -61,6 +62,10 @@ class Handler {
         }
       }
       let res = await this.options.handle(data, ctx);
+      if (res instanceof _http_redirect.HttpRedirect) {
+        ctx.redirect(res.url, res.permanently);
+        return {};
+      }
 
       // 设置响应的 Content-Type 头
       if (this.options.responseContentType) {

package/lib/_cjs/core/http_redirect.js

@@ -0,0 +1,11 @@
+"use strict";
+
+exports.__esModule = true;
+exports.HttpRedirect = void 0;
+class HttpRedirect {
+  constructor(url, permanently) {
+    this.url = url;
+    this.permanently = permanently;
+  }
+}
+exports.HttpRedirect = HttpRedirect;

package/lib/_cjs/core/server.js

@@ -113,7 +113,7 @@ class Server {
           url: url,
           headers: req.headers,
           setHeader: (k, v) => res.header(k, v),
-          redirect: url => res.redirect(url),
+          redirect: (url, permanently) => res.redirect(permanently ? 301 : 302, url),
           ws: undefined,
           req: req,
           res: res

package/lib/_cjs/index.js

@@ -67,6 +67,12 @@ Object.keys(_http_method).forEach(function (key) {
   if (key in exports && exports[key] === _http_method[key]) return;
   exports[key] = _http_method[key];
 });
+var _http_redirect = require("./core/http_redirect");
+Object.keys(_http_redirect).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _http_redirect[key]) return;
+  exports[key] = _http_redirect[key];
+});
 var _server = require("./core/server");
 Object.keys(_server).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/core/handler.js

@@ -4,6 +4,7 @@ import * as vae from 'vtils/vae';
 import { getZhCN, yup } from 'vtils/validator';
 import { HttpError } from "../core/http_error";
 import { DisposeService } from "../services/dispose";
+import { HttpRedirect } from "./http_redirect";
 import { Server } from "./server";
 yup.setLocale(getZhCN({
   getLabel: params => params.label || params.path
@@ -55,6 +56,10 @@ export class Handler {
         }
       }
       let res = await this.options.handle(data, ctx);
+      if (res instanceof HttpRedirect) {
+        ctx.redirect(res.url, res.permanently);
+        return {};
+      }
 
       // 设置响应的 Content-Type 头
       if (this.options.responseContentType) {

package/lib/core/http_redirect.d.ts

@@ -0,0 +1,5 @@
+export declare class HttpRedirect {
+    url: string;
+    permanently?: boolean;
+    constructor(url: string, permanently?: boolean);
+}

package/lib/core/http_redirect.js

@@ -0,0 +1,6 @@
+export class HttpRedirect {
+  constructor(url, permanently) {
+    this.url = url;
+    this.permanently = permanently;
+  }
+}

package/lib/core/server.js

@@ -107,7 +107,7 @@ export class Server {
           url: url,
           headers: req.headers,
           setHeader: (k, v) => res.header(k, v),
-          redirect: url => res.redirect(url),
+          redirect: (url, permanently) => res.redirect(permanently ? 301 : 302, url),
           ws: undefined,
           req: req,
           res: res

package/lib/core/types.d.ts

@@ -77,8 +77,11 @@ export declare namespace XHandler {
         setHeader: (key: string, value: string) => void;
         /**
          * HTTP 跳转
+         *
+         * 默认是临时跳转，状态码是 302，
+         * 可将第二个参数设为 true 表示永久跳转，状态码是 301
          */
-        redirect: (url: string) => void;
+        redirect: (url: string, permanently?: boolean) => void;
         /**
          * WS
          */

package/lib/index.d.ts

@@ -9,6 +9,7 @@ export * from './core/handler';
 export * from './core/http_error';
 export * from './core/http_header';
 export * from './core/http_method';
+export * from './core/http_redirect';
 export * from './core/server';
 export * from './core/types';
 export * from './plugins/base';

package/lib/index.js

@@ -1,4 +1,4 @@
-// @index(['./**/*.ts', '!**/*.test.ts', '!./cli/**', '!**/_*'], f => `export * from '${f.path}'`)
+// @index(['./**/*.ts', '!**/*.test.ts', '!./cli/**', '!**/_*'], f => `export * from '${f.path}';`)
 export * from "./core/define_bus";
 export * from "./core/define_cron";
 export * from "./core/define_handler";
@@ -10,6 +10,7 @@ export * from "./core/handler";
 export * from "./core/http_error";
 export * from "./core/http_header";
 export * from "./core/http_method";
+export * from "./core/http_redirect";
 export * from "./core/server";
 export * from "./core/types";
 export * from "./plugins/base";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.35.2",
+  "version": "2.37.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",