@cicctencent/midwayjs-base 1.0.35 → 1.0.37

package/dist/lib/jwt.d.ts

@@ -1,135 +1,34 @@
+import * as jwt from 'jsonwebtoken';
 export type Algorithm = 'HS256' | 'HS384' | 'HS512' | 'RS256' | 'RS384' | 'RS512' | 'ES256' | 'ES384' | 'ES512' | 'PS256' | 'PS384' | 'PS512';
 export interface VerifyOptions {
-    /**
-     * 允许的算法列表
-     * 如果未指定，将根据提供的密钥类型使用默认值：
-     * - secret: ['HS256', 'HS384', 'HS512']
-     * - rsa: ['RS256', 'RS384', 'RS512']
-     * - ec: ['ES256', 'ES384', 'ES512']
-     * - 默认: ['RS256', 'RS384', 'RS512']
-     */
     algorithms?: Algorithm[];
-    /**
-     * 用于验证受众（aud 声明）
-     * 可以是字符串、正则表达式或它们的数组
-     * 例如: "urn:foo", /urn:f[o]{2}/, [/urn:f[o]{2}/, "urn:bar"]
-     */
     audience?: string | RegExp | (string | RegExp)[];
-    /**
-     * 如果为 true，返回包含 decoded { payload, header, signature } 的对象
-     * 而不仅仅是 payload 的内容
-     */
     complete?: boolean;
-    /**
-     * issuer 声明的有效值（iss 字段），可以是字符串或字符串数组
-     */
     issuer?: string | string[];
-    /**
-     * 用于验证 JWT ID（jti 声明）的值
-     */
     jwtid?: string;
-    /**
-     * 如果为 true，则不验证令牌的过期时间（exp 声明）
-     */
     ignoreExpiration?: boolean;
-    /**
-     * 如果为 true，则不验证令牌的生效时间（nbf 声明）
-     */
     ignoreNotBefore?: boolean;
-    /**
-     * 用于验证主题（sub 声明）的值
-     */
     subject?: string;
-    /**
-     * 检查 nbf 和 exp 声明时允许的秒数偏差
-     * 用于处理不同服务器之间的时钟差异
-     */
     clockTolerance?: number;
-    /**
-     * 令牌仍然有效的最大允许年龄
-     * 可以是秒数或描述时间跨度的字符串
-     * 例如: 1000, "2 days", "10h", "7d"
-     * 数值被解释为秒数，字符串需提供时间单位
-     */
     maxAge?: number | string;
-    /**
-     * 用于所有必要比较的当前时间（以秒为单位）
-     */
     clockTimestamp?: number;
-    /**
-     * 用于验证 nonce 声明的值
-     * 在 OpenID 中用于 ID 令牌
-     */
     nonce?: string;
-    /**
-     * 如果为 true，允许与指定算法不匹配的非对称密钥
-     * 此选项仅用于向后兼容，应避免使用
-     */
     allowInvalidAsymmetricKeyTypes?: boolean;
 }
 export interface SignOptions {
-    /**
-     * 用于签名的算法
-     * @default 'HS256'
-     */
     algorithm?: Algorithm;
-    /**
-     * 令牌过期时间
-     * 可以是秒数或描述时间跨度的字符串（如 "2 days"、"10h"）
-     * 不能与 payload 中的 exp 同时存在
-     */
     expiresIn?: number | string;
-    /**
-     * 令牌生效时间（在此时间前令牌无效）
-     * 可以是秒数或描述时间跨度的字符串（如 "2 days"、"10h"）
-     * 不能与 payload 中的 nbf 同时存在
-     */
     notBefore?: number | string;
-    /**
-     * 受众声明（aud）
-     * 不能与 payload 中的 aud 同时存在
-     */
     audience?: string | string[];
-    /**
-     * 发行者声明（iss）
-     * 不能与 payload 中的 iss 同时存在
-     */
     issuer?: string;
-    /**
-     * JWT ID 声明（jti）
-     */
     jwtid?: string;
-    /**
-     * 主题声明（sub）
-     * 不能与 payload 中的 sub 同时存在
-     */
     subject?: string;
-    /**
-     * 如果为 true，则不在令牌中包含 iat（发行时间）声明
-     */
     noTimestamp?: boolean;
-    /**
-     * 自定义 JWT 头部信息
-     */
     header?: Record<string, any>;
-    /**
-     * 用于头部中的 kid（密钥 ID）声明
-     */
     keyid?: string;
-    /**
-     * 如果为 true，签名函数将直接修改 payload 对象
-     * 在需要获取应用声明后但编码前的原始 payload 引用时有用
-     */
     mutatePayload?: boolean;
-    /**
-     * 如果为 true，允许使用 modulus 小于 2048 的私钥进行 RSA 签名
-     */
     allowInsecureKeySizes?: boolean;
-    /**
-     * 如果为 true，允许与指定算法不匹配的非对称密钥
-     * 此选项仅用于向后兼容，应避免使用
-     */
     allowInvalidAsymmetricKeyTypes?: boolean;
 }
-export declare function decodeJWT(token: string, secretKey: string, options?: VerifyOptions): any;
-export declare function encodeJWT(data: any, secretKey: string, options?: SignOptions): any;
+export declare function decodeJWT(token: string, secretKey: string, options?: VerifyOptions): jwt.Jwt | null;
+export declare function encodeJWT(data: any, secretKey: string, options?: SignOptions): string;

package/dist/lib/jwt.js

@@ -1,38 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeJWT = decodeJWT;
-exports.encodeJWT = encodeJWT;
-const jwt = require("jsonwebtoken");
-// 验证jwt
-function decodeJWT(token, secretKey, options) {
+import * as jwt from 'jsonwebtoken';
+export function decodeJWT(token, secretKey, options) {
     try {
         const decoded = jwt.verify(token, secretKey, {
-            algorithm: 'HS256',
-            ...(options || {})
+            algorithms: ['HS256'],
+            ...(options || {}),
         });
         return decoded;
     }
     catch (err) {
-        console.error('Token 验证失败:', err.message); // 如过期、篡改等
+        console.error('Token 验证失败:', err?.message);
         return null;
     }
 }
-/*
-id: string;
-    code?: string;
-    loginId: string;
-    userId?: number;
-    user?: User;
-    account?: Account;
-    appId?: number;
-    status?: EStatus;
-    lastDate: Date;
-*/
-function encodeJWT(data, secretKey, options) {
+export function encodeJWT(data, secretKey, options) {
     const token = jwt.sign(data, secretKey, {
         algorithm: 'HS256',
-        ...(options || {})
+        ...(options || {}),
     });
     return token;
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiand0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xpYi9qd3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUF3S0EsOEJBV0M7QUFhRCw4QkFNQztBQXJNRCxvQ0FBb0M7QUFzS3BDLFFBQVE7QUFDUixTQUFnQixTQUFTLENBQUMsS0FBYSxFQUFFLFNBQWlCLEVBQUUsT0FBdUI7SUFDL0UsSUFBSSxDQUFDO1FBQ0QsTUFBTSxPQUFPLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsU0FBUyxFQUFFO1lBQzdDLFNBQVMsRUFBRSxPQUFPO1lBQ2xCLEdBQUcsQ0FBQyxPQUFPLElBQUUsRUFBRSxDQUFDO1NBQ25CLENBQUMsQ0FBQztRQUNDLE9BQU8sT0FBTyxDQUFDO0lBQ2pCLENBQUM7SUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO1FBQ2IsT0FBTyxDQUFDLEtBQUssQ0FBQyxhQUFhLEVBQUUsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsVUFBVTtRQUNyRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7QUFDUCxDQUFDO0FBRUQ7Ozs7Ozs7Ozs7RUFVRTtBQUNGLFNBQWdCLFNBQVMsQ0FBQyxJQUFTLEVBQUUsU0FBaUIsRUFBRSxPQUFxQjtJQUN6RSxNQUFNLEtBQUssR0FBRyxHQUFHLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxTQUFTLEVBQUU7UUFDcEMsU0FBUyxFQUFFLE9BQU87UUFDbEIsR0FBRyxDQUFDLE9BQU8sSUFBRSxFQUFFLENBQUM7S0FDbkIsQ0FBQyxDQUFDO0lBQ0gsT0FBTyxLQUFLLENBQUM7QUFDakIsQ0FBQyJ9
+//# sourceMappingURL=jwt.js.map

package/dist/lib/request.d.ts

@@ -1,7 +1,2 @@
 import { requestApi, requestServer } from '@fefeding/common/dist/utils/axios';
-/**
- * 请求远程API
- * @param req 请求对象
- * @returns
- */
 export { requestApi, requestServer };

package/dist/lib/request.js

@@ -1,7 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.requestServer = exports.requestApi = void 0;
-const axios_1 = require("@fefeding/common/dist/utils/axios");
-Object.defineProperty(exports, "requestApi", { enumerable: true, get: function () { return axios_1.requestApi; } });
-Object.defineProperty(exports, "requestServer", { enumerable: true, get: function () { return axios_1.requestServer; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVxdWVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9saWIvcmVxdWVzdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw2REFBOEU7QUFPckUsMkZBUEEsa0JBQVUsT0FPQTtBQUFFLDhGQVBBLHFCQUFhLE9BT0EifQ==
+import { requestApi, requestServer } from '@fefeding/common/dist/utils/axios';
+export { requestApi, requestServer };
+//# sourceMappingURL=request.js.map

package/dist/lib/utils.d.ts

@@ -3,13 +3,7 @@ import { CookieSetOptions, CookieGetOptions } from '@midwayjs/cookies';
 export * from './jwt';
 import { loadEnv } from '../config/env';
 export declare function checkUrlHost(url: string, host: string | Array<string>): boolean;
-/**
-     * render模板
-     * @param ctx
-     * @param file
-     * @returns
-     */
 export declare function getDefaultTemplate(ctx: Context, file?: string, data?: any): Promise<string>;
 export declare function getAuthToken(ctx: Context, option?: CookieGetOptions): any;
 export declare function setAuthToken(ctx: Context, token: string, option?: CookieSetOptions): void;
-export { loadEnv, };
+export { loadEnv };

package/dist/lib/utils.js

@@ -1,29 +1,6 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadEnv = void 0;
-exports.checkUrlHost = checkUrlHost;
-exports.getDefaultTemplate = getDefaultTemplate;
-exports.getAuthToken = getAuthToken;
-exports.setAuthToken = setAuthToken;
-__exportStar(require("./jwt"), exports);
-const env_1 = require("../config/env");
-Object.defineProperty(exports, "loadEnv", { enumerable: true, get: function () { return env_1.loadEnv; } });
-//判断url是否是对应的域名
-function checkUrlHost(url, host) {
+export * from './jwt';
+import { loadEnv } from '../config/env';
+export function checkUrlHost(url, host) {
     if (/^\/[^\/]{1,}/.test(url))
         return true;
     if (Array.isArray(host)) {
@@ -36,14 +13,7 @@ function checkUrlHost(url, host) {
     const reg = new RegExp('^(http(s)?:)?//' + host);
     return reg.test(url);
 }
-/**
-     * render模板
-     * @param ctx
-     * @param file
-     * @returns
-     */
-function getDefaultTemplate(ctx, file = 'index.html', data = {}) {
-    // 前端端口，如果为空，说明就是开发环境了
+export function getDefaultTemplate(ctx, file = 'index.html', data = {}) {
     const viteTarget = process.env.VITE_PORT;
     const config = ctx.app.getConfig();
     const prefix = config.koa.globalPrefix;
@@ -62,28 +32,26 @@ function getDefaultTemplate(ctx, file = 'index.html', data = {}) {
         prefix,
         viteTarget: viteTarget ? `//${ctx.hostname}:${viteTarget}` : '',
     };
-    //console.log(file, data);
     return ctx.render(file, option);
 }
-// 从当前请求中获取登陆态token
-function getAuthToken(ctx, option) {
+export function getAuthToken(ctx, option) {
     const body = (ctx.request.body || {});
     const token = ctx.URL.searchParams.get('token') ||
         ctx.request.header['x-auth-token'] ||
         ctx.cookies.get('token', {
             signed: false,
-            ...(option || {})
+            ...(option || {}),
         }) ||
         ctx.request.header['authorization'] ||
         body.token;
     return token;
 }
-// 种登陆态token
-function setAuthToken(ctx, token, option) {
+export function setAuthToken(ctx, token, option) {
     ctx.cookies.set('token', token, {
         httpOnly: true,
         maxAge: 1000 * 60 * 60 * 24 * 30,
-        ...(option || {})
+        ...(option || {}),
     });
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGliL3V0aWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBT0Esb0NBVUM7QUFRRCxnREFzQkM7QUFHRCxvQ0FZQztBQUdELG9DQU1DO0FBcEVELHdDQUFzQjtBQUN0Qix1Q0FBd0M7QUF1RXBDLHdGQXZFSyxhQUFPLE9BdUVMO0FBckVYLGVBQWU7QUFDZixTQUFnQixZQUFZLENBQUMsR0FBVyxFQUFFLElBQTBCO0lBQ2hFLElBQUcsY0FBYyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUM7UUFBRSxPQUFPLElBQUksQ0FBQztJQUN6QyxJQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztRQUNyQixLQUFJLE1BQU0sQ0FBQyxJQUFJLElBQUksRUFBRSxDQUFDO1lBQ2xCLElBQUcsWUFBWSxDQUFDLEdBQUcsRUFBRSxDQUFDLENBQUM7Z0JBQUUsT0FBTyxJQUFJLENBQUM7UUFDekMsQ0FBQztRQUNELE9BQU8sS0FBSyxDQUFDO0lBQ2pCLENBQUM7SUFDRCxNQUFNLEdBQUcsR0FBRyxJQUFJLE1BQU0sQ0FBQyxpQkFBaUIsR0FBRyxJQUFJLENBQUMsQ0FBQztJQUNqRCxPQUFPLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7QUFDekIsQ0FBQztBQUVEOzs7OztPQUtPO0FBQ1AsU0FBZ0Isa0JBQWtCLENBQUMsR0FBWSxFQUFFLElBQUksR0FBQyxZQUFZLEVBQUUsT0FBWSxFQUFFO0lBQzlFLHNCQUFzQjtJQUN0QixNQUFNLFVBQVUsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFDLFNBQVMsQ0FBQztJQUN6QyxNQUFNLE1BQU0sR0FBRyxHQUFHLENBQUMsR0FBRyxDQUFDLFNBQVMsRUFBRSxDQUFDO0lBQ25DLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDO0lBQ3ZDLE1BQU0sTUFBTSxHQUFHO1FBQ1gsSUFBSSxFQUFFO1lBQ0YsT0FBTyxFQUFFLEdBQUcsQ0FBQyxjQUFjLElBQUUsSUFBSTtZQUNqQyxHQUFHLElBQUk7WUFDUCxNQUFNLEVBQUU7Z0JBQ0osTUFBTTtnQkFDTixHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU0sSUFBRSxFQUFFLENBQUM7YUFDdkI7U0FDSjtRQUNELEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSyxJQUFJLEVBQUU7UUFDdkIsV0FBVyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsV0FBVyxJQUFJLEVBQUU7UUFDMUMsR0FBRyxFQUFFLE9BQU8sQ0FBQyxHQUFHO1FBQ2hCLE1BQU07UUFDTixVQUFVLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsQ0FBQyxRQUFRLElBQUksVUFBVSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUU7S0FDbEUsQ0FBQztJQUNGLDBCQUEwQjtJQUMxQixPQUFPLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0FBQ3BDLENBQUM7QUFFRCxtQkFBbUI7QUFDbkIsU0FBZ0IsWUFBWSxDQUFDLEdBQVksRUFBRSxNQUF5QjtJQUNoRSxNQUFNLElBQUksR0FBRyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsSUFBSSxJQUFJLEVBQUUsQ0FBUSxDQUFDO0lBQ3pDLE1BQU0sS0FBSyxHQUNYLEdBQUcsQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUM7UUFDakMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsY0FBYyxDQUFDO1FBQ2xDLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRTtZQUNyQixNQUFNLEVBQUUsS0FBSztZQUNiLEdBQUcsQ0FBQyxNQUFNLElBQUksRUFBRSxDQUFDO1NBQ3BCLENBQUM7UUFDRixHQUFHLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxlQUFlLENBQUM7UUFDL0IsSUFBSSxDQUFDLEtBQUssQ0FBRTtJQUNwQixPQUFPLEtBQUssQ0FBQztBQUNqQixDQUFDO0FBRUQsWUFBWTtBQUNaLFNBQWdCLFlBQVksQ0FBQyxHQUFZLEVBQUUsS0FBYSxFQUFFLE1BQXlCO0lBQy9FLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxLQUFLLEVBQUU7UUFDNUIsUUFBUSxFQUFFLElBQUk7UUFDZCxNQUFNLEVBQUUsSUFBSSxHQUFHLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUU7UUFDaEMsR0FBRyxDQUFDLE1BQU0sSUFBSSxFQUFFLENBQUM7S0FDcEIsQ0FBQyxDQUFDO0FBQ1AsQ0FBQyJ9
+export { loadEnv };
+//# sourceMappingURL=utils.js.map

package/dist/middleware/apiResultFormatter.d.ts

@@ -1,8 +1,7 @@
-import { IMiddleware } from '@midwayjs/core';
-import { NextFunction, Context } from '@midwayjs/koa';
-export declare class ApiResultFormatterMiddleware implements IMiddleware<Context, NextFunction> {
+import { IMiddleware, IMidwayContext } from '@midwayjs/core';
+export declare class ApiResultFormatterMiddleware implements IMiddleware<IMidwayContext, any> {
     apiOption: any;
-    ignore(ctx: Context): boolean;
-    resolve(): (ctx: Context, next: NextFunction) => Promise<void>;
+    ignore(ctx: IMidwayContext): boolean;
+    resolve(): (ctx: IMidwayContext, next: any) => Promise<void>;
     canFormat(data: any): boolean;
 }

package/dist/middleware/apiResultFormatter.js

@@ -1,4 +1,3 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -8,20 +7,16 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApiResultFormatterMiddleware = void 0;
-// @ts-ignore
-const core_1 = require("@midwayjs/core");
-const stream_1 = require("stream");
+import { Middleware, Config, } from '@midwayjs/core';
+import { Stream } from 'stream';
 let ApiResultFormatterMiddleware = class ApiResultFormatterMiddleware {
-    apiOption;
     ignore(ctx) {
-        // 下面的路由将忽略此中间件
+        const koaCtx = ctx;
         if (this.apiOption?.ignore) {
             for (const ig of this.apiOption.ignore) {
-                if (typeof ig === 'string' && ctx.path === ig)
+                if (typeof ig === 'string' && koaCtx.path === ig)
                     return true;
-                if (ig?.test?.(ctx.path))
+                if (ig?.test?.(koaCtx.path))
                     return true;
             }
         }
@@ -29,38 +24,36 @@ let ApiResultFormatterMiddleware = class ApiResultFormatterMiddleware {
     }
     resolve() {
         return async (ctx, next) => {
-            const isApi = this.apiOption?.reg?.test(ctx.request.path);
-            //console.log(ctx.URL.toString(), isApi);
+            const koaCtx = ctx;
+            const isApi = this.apiOption?.reg?.test(koaCtx.request.path);
             if (isApi) {
                 try {
                     await next();
-                    const res = ctx.body;
-                    // 是否是可格式化的类型
+                    const res = koaCtx.body;
                     if (this.canFormat(res)) {
-                        ctx.body = Object.assign({
+                        koaCtx.body = Object.assign({
                             ret: 0,
                             msg: 'success',
                             data: null,
                         }, typeof res?.ret === 'number' ? res : { data: res });
-                        //ctx.logger.info(ctx.request.rawBody, ctx.body);
                     }
                 }
                 catch (err) {
                     console.error(err);
-                    if (typeof err.ret === 'number') {
-                        ctx.body = err;
+                    if (typeof err?.ret === 'number') {
+                        koaCtx.body = err;
                     }
                     else {
-                        ctx.body = {
+                        koaCtx.body = {
                             ret: 1001,
-                            msg: err.message,
+                            msg: err?.message || 'Error',
                         };
                     }
-                    ctx.logger.error(ctx.request.rawBody, ctx.body);
+                    koaCtx.logger.error(koaCtx.request.rawBody, koaCtx.body);
                 }
                 finally {
-                    if (ctx.status !== 302)
-                        ctx.status = 200;
+                    if (koaCtx.status !== 302)
+                        koaCtx.status = 200;
                 }
             }
             else {
@@ -69,16 +62,19 @@ let ApiResultFormatterMiddleware = class ApiResultFormatterMiddleware {
         };
     }
     canFormat(data) {
-        return data !== '' && !Buffer.isBuffer(data) &&
-            !(data instanceof stream_1.Stream || data instanceof Uint8Array || data instanceof Blob);
+        return (data !== '' &&
+            !Buffer.isBuffer(data) &&
+            !(data instanceof Stream ||
+                data instanceof Uint8Array ||
+                data instanceof Blob));
     }
 };
-exports.ApiResultFormatterMiddleware = ApiResultFormatterMiddleware;
 __decorate([
-    (0, core_1.Config)('apiOption'),
+    Config('apiOption'),
     __metadata("design:type", Object)
 ], ApiResultFormatterMiddleware.prototype, "apiOption", void 0);
-exports.ApiResultFormatterMiddleware = ApiResultFormatterMiddleware = __decorate([
-    (0, core_1.Middleware)()
+ApiResultFormatterMiddleware = __decorate([
+    Middleware()
 ], ApiResultFormatterMiddleware);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBpUmVzdWx0Rm9ybWF0dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL21pZGRsZXdhcmUvYXBpUmVzdWx0Rm9ybWF0dGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLGFBQWE7QUFDYix5Q0FBaUU7QUFFakUsbUNBQWdDO0FBR3pCLElBQU0sNEJBQTRCLEdBQWxDLE1BQU0sNEJBQTRCO0lBSXJDLFNBQVMsQ0FBTTtJQUVmLE1BQU0sQ0FBQyxHQUFZO1FBQ2YsZUFBZTtRQUNmLElBQUcsSUFBSSxDQUFDLFNBQVMsRUFBRSxNQUFNLEVBQUUsQ0FBQztZQUN4QixLQUFJLE1BQU0sRUFBRSxJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxFQUFFLENBQUM7Z0JBQ3BDLElBQUcsT0FBTyxFQUFFLEtBQUssUUFBUSxJQUFJLEdBQUcsQ0FBQyxJQUFJLEtBQUssRUFBRTtvQkFBRSxPQUFPLElBQUksQ0FBQztnQkFDMUQsSUFBRyxFQUFFLEVBQUUsSUFBSSxFQUFFLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQztvQkFBRSxPQUFPLElBQUksQ0FBQztZQUN6QyxDQUFDO1FBQ0wsQ0FBQztRQUNELE9BQU8sS0FBSyxDQUFDO0lBQ2pCLENBQUM7SUFFRCxPQUFPO1FBQ0gsT0FBTyxLQUFLLEVBQUUsR0FBWSxFQUFFLElBQWtCLEVBQUUsRUFBRTtZQUM5QyxNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsU0FBUyxFQUFFLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUMxRCx5Q0FBeUM7WUFDekMsSUFBSSxLQUFLLEVBQUUsQ0FBQztnQkFDUixJQUFJLENBQUM7b0JBQ0QsTUFBTSxJQUFJLEVBQUUsQ0FBQztvQkFDYixNQUFNLEdBQUcsR0FBUSxHQUFHLENBQUMsSUFBSSxDQUFDO29CQUMxQixhQUFhO29CQUNiLElBQUcsSUFBSSxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDO3dCQUNyQixHQUFHLENBQUMsSUFBSSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQ3BCOzRCQUNJLEdBQUcsRUFBRSxDQUFDOzRCQUNOLEdBQUcsRUFBRSxTQUFTOzRCQUNkLElBQUksRUFBRSxJQUFJO3lCQUNiLEVBQ0QsT0FBTyxHQUFHLEVBQUUsR0FBRyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsQ0FDckQsQ0FBQzt3QkFDRixpREFBaUQ7b0JBQ3JELENBQUM7Z0JBQ0wsQ0FBQztnQkFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO29CQUNYLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7b0JBQ25CLElBQUksT0FBTyxHQUFHLENBQUMsR0FBRyxLQUFLLFFBQVEsRUFBRSxDQUFDO3dCQUM5QixHQUFHLENBQUMsSUFBSSxHQUFHLEdBQUcsQ0FBQztvQkFDbkIsQ0FBQzt5QkFBTSxDQUFDO3dCQUNKLEdBQUcsQ0FBQyxJQUFJLEdBQUc7NEJBQ1AsR0FBRyxFQUFFLElBQUk7NEJBQ1QsR0FBRyxFQUFFLEdBQUcsQ0FBQyxPQUFPO3lCQUNuQixDQUFDO29CQUNOLENBQUM7b0JBQ0QsR0FBRyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO2dCQUNwRCxDQUFDO3dCQUNPLENBQUM7b0JBQ0wsSUFBRyxHQUFHLENBQUMsTUFBTSxLQUFLLEdBQUc7d0JBQUUsR0FBRyxDQUFDLE1BQU0sR0FBRyxHQUFHLENBQUM7Z0JBQzVDLENBQUM7WUFDTCxDQUFDO2lCQUFNLENBQUM7Z0JBQ0osTUFBTSxJQUFJLEVBQUUsQ0FBQztZQUNqQixDQUFDO1FBQ0wsQ0FBQyxDQUFDO0lBQ04sQ0FBQztJQUNELFNBQVMsQ0FBQyxJQUFTO1FBQ2YsT0FBTyxJQUFJLEtBQUssRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUM7WUFDNUMsQ0FBQyxDQUFDLElBQUksWUFBWSxlQUFNLElBQUksSUFBSSxZQUFZLFVBQVUsSUFBSSxJQUFJLFlBQVksSUFBSSxDQUFDLENBQUM7SUFDcEYsQ0FBQztDQUNKLENBQUE7QUE3RFksb0VBQTRCO0FBSXJDO0lBREMsSUFBQSxhQUFNLEVBQUMsV0FBVyxDQUFDOzsrREFDTDt1Q0FKTiw0QkFBNEI7SUFEeEMsSUFBQSxpQkFBVSxHQUFFO0dBQ0EsNEJBQTRCLENBNkR4QyJ9
+export { ApiResultFormatterMiddleware };
+//# sourceMappingURL=apiResultFormatter.js.map

package/dist/middleware/detect.middleware.d.ts

@@ -1,5 +1,4 @@
-import { IMiddleware } from '@midwayjs/core';
-import { NextFunction, Context } from '@midwayjs/koa';
-export declare class DetectMiddleware implements IMiddleware<Context, NextFunction> {
-    resolve(): (ctx: Context, next: NextFunction) => Promise<any>;
+import { IMiddleware, IMidwayContext } from '@midwayjs/core';
+export declare class DetectMiddleware implements IMiddleware<IMidwayContext, any> {
+    resolve(): (ctx: IMidwayContext, next: any) => Promise<any>;
 }

package/dist/middleware/detect.middleware.js

@@ -1,44 +1,38 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DetectMiddleware = void 0;
-const core_1 = require("@midwayjs/core");
+import { Middleware } from '@midwayjs/core';
 let DetectMiddleware = class DetectMiddleware {
     resolve() {
         return async (ctx, next) => {
-            const UA = ctx.get('user-agent') || '';
+            const koaCtx = ctx;
+            const UA = koaCtx.get('user-agent') || '';
             const IS_MOBILE = /Mobile/i.test(UA);
             const VER_MQQ = UA.match(/QQ\/([\d.]+)/i) && UA.match(/QQ\/([\d.]+)/i)?.[1];
             const IS_MQQ = Boolean(VER_MQQ);
-            // 微信版本号可能分4段，影响业务代码里使用semver比较版本号（会报错），如果业务需要4段版本号可以自己从ua里取
             const VER_WEIXIN = UA.match(/MicroMessenger\/([\d.]+)/i) &&
                 UA.match(/MicroMessenger\/([\d.]+)/i)?.[1]
                     .split('.')
                     .slice(0, 3)
                     .join('.');
             const IS_WEIXIN = Boolean(VER_WEIXIN);
-            // 是否是开发者工具
             const IS_WECHATTOOLS = /wechatdevtools\//i.test(UA);
-            // @ts-ignore
             const IS_PCWEIXIN = /(Windows|Mac)Wechat/i.test(UA);
-            // 是否是企业微信
             const IS_WXWORK = /wxwork\//i.test(UA);
-            // @ts-ignore
             const VER_MINA = /miniProgram/i.test(UA);
             const IS_MINA = Boolean(VER_MINA);
-            let requestIP = (ctx.request.header['x-forwarded-for'] ||
-                ctx.request.ip || '').toString();
+            let requestIP = (koaCtx.request.header['x-forwarded-for'] ||
+                koaCtx.request.ip ||
+                '').toString();
             if (requestIP.includes(','))
                 requestIP = requestIP.split(',')[0];
-            const clientIP = (ctx.request.header['x-client-ip'] || requestIP).toString();
-            const hostname = ctx.get('tencent-acceleration-domain-name') || ctx.request.hostname;
-            // 环境变量
-            ctx.detect = {
+            const clientIP = (koaCtx.request.header['x-client-ip'] || requestIP).toString();
+            const hostname = koaCtx.get('tencent-acceleration-domain-name') ||
+                koaCtx.request.hostname;
+            koaCtx.detect = {
                 IS_MOBILE,
                 IS_MQQ,
                 IS_WEIXIN,
@@ -54,8 +48,8 @@ let DetectMiddleware = class DetectMiddleware {
         };
     }
 };
-exports.DetectMiddleware = DetectMiddleware;
-exports.DetectMiddleware = DetectMiddleware = __decorate([
-    (0, core_1.Middleware)()
+DetectMiddleware = __decorate([
+    Middleware()
 ], DetectMiddleware);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGV0ZWN0Lm1pZGRsZXdhcmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbWlkZGxld2FyZS9kZXRlY3QubWlkZGxld2FyZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSx5Q0FBeUQ7QUFJbEQsSUFBTSxnQkFBZ0IsR0FBdEIsTUFBTSxnQkFBZ0I7SUFDekIsT0FBTztRQUNILE9BQU8sS0FBSyxFQUFFLEdBQVksRUFBRSxJQUFrQixFQUFFLEVBQUU7WUFDOUMsTUFBTSxFQUFFLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDdkMsTUFBTSxTQUFTLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNyQyxNQUFNLE9BQU8sR0FBRyxFQUFFLENBQUMsS0FBSyxDQUFDLGVBQWUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUMsZUFBZSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUM1RSxNQUFNLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7WUFDaEMsNERBQTREO1lBQzVELE1BQU0sVUFBVSxHQUNaLEVBQUUsQ0FBQyxLQUFLLENBQUMsMkJBQTJCLENBQUM7Z0JBQ3JDLEVBQUUsQ0FBQyxLQUFLLENBQUMsMkJBQTJCLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztxQkFDckMsS0FBSyxDQUFDLEdBQUcsQ0FBQztxQkFDVixLQUFLLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQztxQkFDWCxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDbkIsTUFBTSxTQUFTLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBRXRDLFdBQVc7WUFDWCxNQUFNLGNBQWMsR0FBRyxtQkFBbUIsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7WUFDcEQsYUFBYTtZQUNiLE1BQU0sV0FBVyxHQUFHLHNCQUFzQixDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNwRCxVQUFVO1lBQ1YsTUFBTSxTQUFTLEdBQUcsV0FBVyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUN2QyxhQUFhO1lBQ2IsTUFBTSxRQUFRLEdBQUcsY0FBYyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUN6QyxNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUM7WUFFbEMsSUFBSSxTQUFTLEdBQUcsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxpQkFBaUIsQ0FBQztnQkFDdEQsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7WUFDakMsSUFBRyxTQUFTLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQztnQkFBRSxTQUFTLEdBQUcsU0FBUyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUVoRSxNQUFNLFFBQVEsR0FBRyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLGFBQWEsQ0FBQyxJQUFJLFNBQVMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBRTdFLE1BQU0sUUFBUSxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUMsa0NBQWtDLENBQUMsSUFBSSxHQUFHLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQztZQUVyRixPQUFPO1lBQ1AsR0FBRyxDQUFDLE1BQU0sR0FBRztnQkFDVCxTQUFTO2dCQUNULE1BQU07Z0JBQ04sU0FBUztnQkFDVCxjQUFjO2dCQUNkLFdBQVc7Z0JBQ1gsU0FBUztnQkFDVCxPQUFPO2dCQUNQLFFBQVEsRUFBRSxRQUFRO2dCQUNsQixTQUFTLEVBQUUsU0FBUztnQkFDcEIsUUFBUSxFQUFFLFFBQVE7YUFDckIsQ0FBQTtZQUNELE9BQU8sSUFBSSxFQUFFLENBQUM7UUFDbEIsQ0FBQyxDQUFDO0lBQ04sQ0FBQztDQUNKLENBQUE7QUFsRFksNENBQWdCOzJCQUFoQixnQkFBZ0I7SUFENUIsSUFBQSxpQkFBVSxHQUFFO0dBQ0EsZ0JBQWdCLENBa0Q1QiJ9
+export { DetectMiddleware };
+//# sourceMappingURL=detect.middleware.js.map

package/dist/middleware/requestInit.d.ts

@@ -1,8 +1,7 @@
-import { IMiddleware } from '@midwayjs/core';
-import { NextFunction, Context } from '@midwayjs/koa';
-export declare class RequestInitMiddleware implements IMiddleware<Context, NextFunction> {
+import { IMiddleware, IMidwayContext } from '@midwayjs/core';
+export declare class RequestInitMiddleware implements IMiddleware<IMidwayContext, any> {
     loggerConfig: any;
     private staticExtensions;
-    ignore(ctx: Context): boolean;
-    resolve(): (ctx: Context, next: NextFunction) => Promise<any>;
+    ignore(ctx: IMidwayContext): boolean;
+    resolve(): (ctx: IMidwayContext, next: any) => Promise<any>;
 }