@cicctencent/midwayjs-base 1.0.37 → 1.0.39

package/dist/config/config.default.js

@@ -1,6 +1,41 @@
-import * as path from 'path';
-import * as fs from 'fs';
-export default (appInfo) => {
+"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = __importStar(require("path"));
+const fs = __importStar(require("fs"));
+exports.default = (appInfo) => {
     appInfo.appId = Number(process.env.APP_ID) || 0;
     const appRoot = appInfo.appDir || appInfo.root;
     appInfo.dist = path.join(appRoot, 'dist');

package/dist/config/env.js

@@ -1,15 +1,54 @@
-import * as dotenv from 'dotenv';
-import * as path from 'path';
-import * as fs from 'fs';
-export function loadEnv(envPath) {
+"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadEnv = loadEnv;
+const dotenv = __importStar(require("dotenv"));
+const path = __importStar(require("path"));
+const fs = __importStar(require("fs"));
+function loadEnv(envPath) {
     envPath = envPath || path.join(process.cwd(), '.env');
-    console.log('env path', envPath);
     if (fs.existsSync(envPath)) {
-        const env = dotenv.config({
+        const result = dotenv.config({
             path: envPath,
             encoding: 'utf-8',
         });
-        console.log(env);
+        if (result.error) {
+            if (process.env.NODE_ENV !== 'production') {
+                console.warn('[midwayjs-base] Failed to load .env file:', result.error.message);
+            }
+        }
     }
     return process.env;
 }

package/dist/configuration.js

@@ -1,27 +1,63 @@
+"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 __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 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;
 };
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { Configuration, App } from '@midwayjs/core';
-import * as koa from '@midwayjs/koa';
-import * as info from '@midwayjs/info';
-import * as axios from '@midwayjs/axios';
-import { ApiResultFormatterMiddleware } from './middleware/apiResultFormatter';
-import { RequestInitMiddleware } from './middleware/requestInit';
-import { DetectMiddleware } from './middleware/detect.middleware';
-import * as view from '@midwayjs/view-nunjucks';
-import * as staticFile from '@midwayjs/static-file';
-import * as cacheManager from '@midwayjs/cache-manager';
-import * as DefaultConfig from './config/config.default';
-import { ApiGuard } from './guard/api';
-import { AuthGuard } from './guard/auth';
-import { loadEnv } from './config/env';
-loadEnv();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseConfiguration = void 0;
+const core_1 = require("@midwayjs/core");
+const koa = __importStar(require("@midwayjs/koa"));
+const info = __importStar(require("@midwayjs/info"));
+const axios = __importStar(require("@midwayjs/axios"));
+const apiResultFormatter_1 = require("./middleware/apiResultFormatter");
+const requestInit_1 = require("./middleware/requestInit");
+const detect_middleware_1 = require("./middleware/detect.middleware");
+const view = __importStar(require("@midwayjs/view-nunjucks"));
+const staticFile = __importStar(require("@midwayjs/static-file"));
+const cacheManager = __importStar(require("@midwayjs/cache-manager"));
+const DefaultConfig = __importStar(require("./config/config.default"));
+const api_1 = require("./guard/api");
+const auth_1 = require("./guard/auth");
+const env_1 = require("./config/env");
+(0, env_1.loadEnv)();
 let BaseConfiguration = class BaseConfiguration {
     async onReady() {
         if (process.env.FEFE_MIDWAYJS_BASE_READY === 'true') {
@@ -29,21 +65,22 @@ let BaseConfiguration = class BaseConfiguration {
         }
         process.env.SERVICE_NAME =
             process.env.SERVICE_NAME || this.app.getProjectName();
-        this.app.useGuard([ApiGuard, AuthGuard]);
+        this.app.useGuard([api_1.ApiGuard, auth_1.AuthGuard]);
         this.app.useMiddleware([
-            RequestInitMiddleware,
-            DetectMiddleware,
-            ApiResultFormatterMiddleware,
+            requestInit_1.RequestInitMiddleware,
+            detect_middleware_1.DetectMiddleware,
+            apiResultFormatter_1.ApiResultFormatterMiddleware,
         ]);
         process.env.FEFE_MIDWAYJS_BASE_READY = 'true';
     }
 };
+exports.BaseConfiguration = BaseConfiguration;
 __decorate([
-    App(),
+    (0, core_1.App)(),
     __metadata("design:type", Object)
 ], BaseConfiguration.prototype, "app", void 0);
-BaseConfiguration = __decorate([
-    Configuration({
+exports.BaseConfiguration = BaseConfiguration = __decorate([
+    (0, core_1.Configuration)({
         namespace: 'MidwayjsBase',
         imports: [
             koa,
@@ -63,5 +100,4 @@ BaseConfiguration = __decorate([
         ],
     })
 ], BaseConfiguration);
-export { BaseConfiguration };
 //# sourceMappingURL=configuration.js.map

package/dist/constants/error-code.d.ts

@@ -0,0 +1,27 @@
+export declare enum ErrorCode {
+    SUCCESS = 0,
+    SYSTEM_ERROR = 1001,
+    PARAM_ERROR = 1002,
+    TIMEOUT = 1003,
+    TOKEN_INVALID = 50001,
+    TOKEN_EXPIRED = 50002,
+    AUTH_REQUIRED = 50003,
+    IP_NOT_ALLOWED = 50004,
+    TIMESTAMP_EXPIRED = 50005,
+    TIMESTAMP_INVALID = 50006,
+    TOKEN_EMPTY = 50007
+}
+export declare const ErrorMessages: Record<ErrorCode, string>;
+export declare function createError(code: ErrorCode, msg?: string): {
+    ret: ErrorCode;
+    msg: string;
+};
+export declare class BizError extends Error {
+    ret: ErrorCode;
+    msg: string;
+    constructor(code: ErrorCode, msg?: string);
+    toJSON(): {
+        ret: ErrorCode;
+        msg: string;
+    };
+}

package/dist/constants/error-code.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BizError = exports.ErrorMessages = exports.ErrorCode = void 0;
+exports.createError = createError;
+var ErrorCode;
+(function (ErrorCode) {
+    ErrorCode[ErrorCode["SUCCESS"] = 0] = "SUCCESS";
+    ErrorCode[ErrorCode["SYSTEM_ERROR"] = 1001] = "SYSTEM_ERROR";
+    ErrorCode[ErrorCode["PARAM_ERROR"] = 1002] = "PARAM_ERROR";
+    ErrorCode[ErrorCode["TIMEOUT"] = 1003] = "TIMEOUT";
+    ErrorCode[ErrorCode["TOKEN_INVALID"] = 50001] = "TOKEN_INVALID";
+    ErrorCode[ErrorCode["TOKEN_EXPIRED"] = 50002] = "TOKEN_EXPIRED";
+    ErrorCode[ErrorCode["AUTH_REQUIRED"] = 50003] = "AUTH_REQUIRED";
+    ErrorCode[ErrorCode["IP_NOT_ALLOWED"] = 50004] = "IP_NOT_ALLOWED";
+    ErrorCode[ErrorCode["TIMESTAMP_EXPIRED"] = 50005] = "TIMESTAMP_EXPIRED";
+    ErrorCode[ErrorCode["TIMESTAMP_INVALID"] = 50006] = "TIMESTAMP_INVALID";
+    ErrorCode[ErrorCode["TOKEN_EMPTY"] = 50007] = "TOKEN_EMPTY";
+})(ErrorCode || (exports.ErrorCode = ErrorCode = {}));
+exports.ErrorMessages = {
+    [ErrorCode.SUCCESS]: 'success',
+    [ErrorCode.SYSTEM_ERROR]: '系统错误',
+    [ErrorCode.PARAM_ERROR]: '参数错误',
+    [ErrorCode.TIMEOUT]: '请求超时',
+    [ErrorCode.TOKEN_INVALID]: 'token输入错误',
+    [ErrorCode.TOKEN_EXPIRED]: 'token不存在或已过期',
+    [ErrorCode.AUTH_REQUIRED]: '需要登陆态',
+    [ErrorCode.IP_NOT_ALLOWED]: 'IP不在白名单内',
+    [ErrorCode.TIMESTAMP_EXPIRED]: 'timestamp已超过有效时间',
+    [ErrorCode.TIMESTAMP_INVALID]: 'timestamp时间异常',
+    [ErrorCode.TOKEN_EMPTY]: 'token为空，非法请求',
+};
+function createError(code, msg) {
+    return {
+        ret: code,
+        msg: msg || exports.ErrorMessages[code] || '未知错误',
+    };
+}
+class BizError extends Error {
+    constructor(code, msg) {
+        super(msg || exports.ErrorMessages[code] || '未知错误');
+        this.ret = code;
+        this.msg = this.message;
+        this.name = 'BizError';
+    }
+    toJSON() {
+        return {
+            ret: this.ret,
+            msg: this.msg,
+        };
+    }
+}
+exports.BizError = BizError;
+//# sourceMappingURL=error-code.js.map

package/dist/filter/default.filter.d.ts

@@ -1,7 +1,8 @@
 import { Context } from '@midwayjs/koa';
+import { ErrorCode, BizError } from '../constants/error-code';
 export declare class DefaultErrorFilter {
-    catch(err: Error, ctx: Context): Promise<{
-        success: boolean;
-        message: string;
+    catch(err: Error | BizError, ctx: Context): Promise<{
+        ret: ErrorCode;
+        msg: string;
     }>;
 }

package/dist/filter/default.filter.js

@@ -1,20 +1,33 @@
+"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;
 };
-import { Catch } from '@midwayjs/core';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultErrorFilter = void 0;
+const core_1 = require("@midwayjs/core");
+const error_code_1 = require("../constants/error-code");
 let DefaultErrorFilter = class DefaultErrorFilter {
     async catch(err, ctx) {
-        return {
-            success: false,
+        if (err instanceof error_code_1.BizError) {
+            ctx.logger?.error('Business error:', err.toJSON());
+            return err.toJSON();
+        }
+        ctx.logger?.error('Unhandled error:', {
+            name: err.name,
             message: err.message,
+            stack: err.stack,
+        });
+        return {
+            ret: error_code_1.ErrorCode.SYSTEM_ERROR,
+            msg: err.message || '系统错误',
         };
     }
 };
-DefaultErrorFilter = __decorate([
-    Catch()
+exports.DefaultErrorFilter = DefaultErrorFilter;
+exports.DefaultErrorFilter = DefaultErrorFilter = __decorate([
+    (0, core_1.Catch)()
 ], DefaultErrorFilter);
-export { DefaultErrorFilter };
 //# sourceMappingURL=default.filter.js.map

package/dist/filter/notfound.filter.js

@@ -1,17 +1,20 @@
+"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;
 };
-import { Catch, httpError } from '@midwayjs/core';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NotFoundFilter = void 0;
+const core_1 = require("@midwayjs/core");
 let NotFoundFilter = class NotFoundFilter {
     async catch(err, ctx) {
         ctx.redirect('/404.html');
     }
 };
-NotFoundFilter = __decorate([
-    Catch(httpError.NotFoundError)
+exports.NotFoundFilter = NotFoundFilter;
+exports.NotFoundFilter = NotFoundFilter = __decorate([
+    (0, core_1.Catch)(core_1.httpError.NotFoundError)
 ], NotFoundFilter);
-export { NotFoundFilter };
 //# sourceMappingURL=notfound.filter.js.map

package/dist/guard/api.js

@@ -1,3 +1,4 @@
+"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);
@@ -7,16 +8,22 @@ 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);
 };
-import { Guard, Config } from '@midwayjs/core';
-import { getApiToken, getCheckIP } from '../lib/decorator';
-import api from '@fefeding/common/dist/utils/api';
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApiGuard = void 0;
+const core_1 = require("@midwayjs/core");
+const decorator_1 = require("../lib/decorator");
+const api_1 = __importDefault(require("@fefeding/common/dist/utils/api"));
+const error_code_1 = require("../constants/error-code");
 let ApiGuard = class ApiGuard {
     async canActivate(context, supplierClz, methodName) {
-        const needIP = getCheckIP(supplierClz, methodName);
+        const needIP = (0, decorator_1.getCheckIP)(supplierClz, methodName);
         if (needIP) {
             this.checkIPInWhiteList(context);
         }
-        const needToken = getApiToken(supplierClz, methodName);
+        const needToken = (0, decorator_1.getApiToken)(supplierClz, methodName);
         if (needToken) {
             await this.checkApiToken(context);
         }
@@ -34,16 +41,21 @@ let ApiGuard = class ApiGuard {
             context.cookies.get('timestamp'));
         if (!reqToken || !timestamp) {
             context.logger.error(`token为空，非法请求, token: ${reqToken}, timestamp: ${timestamp}`);
-            throw Error('token为空，非法请求');
+            throw new error_code_1.BizError(error_code_1.ErrorCode.TOKEN_EMPTY);
+        }
+        const now = Date.now();
+        const validWindow = 5 * 60 * 1000;
+        if (timestamp < now - validWindow) {
+            throw new error_code_1.BizError(error_code_1.ErrorCode.TIMESTAMP_EXPIRED);
         }
-        console.log('token time', reqToken, timestamp);
-        if (timestamp < Date.now() - 5 * 60 * 1000) {
-            throw Error('timestamp已超过有效时间');
+        if (timestamp > now + validWindow) {
+            context.logger.error(`timestamp时间异常，客户端时间超前: ${timestamp}, 当前时间: ${now}`);
+            throw new error_code_1.BizError(error_code_1.ErrorCode.TIMESTAMP_INVALID);
         }
-        const thisToken = api.createApiToken(this.apiOption.key, timestamp);
+        const thisToken = api_1.default.createApiToken(this.apiOption.key, timestamp);
         if (reqToken !== thisToken.sign) {
             context.logger.error(`输入token:${reqToken}  本地: ${thisToken.sign} 不一致`);
-            throw Error('token输入错误');
+            throw new error_code_1.BizError(error_code_1.ErrorCode.TOKEN_INVALID);
         }
     }
     checkIPInWhiteList(context) {
@@ -51,21 +63,21 @@ let ApiGuard = class ApiGuard {
         if (this.ipOption?.whiteList && !this.ipOption.whiteList.includes('*')) {
             if (!this.ipOption.whiteList.includes(requestIp)) {
                 context.logger.error(`IP:${requestIp} 不在白名单内`);
-                throw Error(`IP:${requestIp} 不在白名单内`);
+                throw new error_code_1.BizError(error_code_1.ErrorCode.IP_NOT_ALLOWED, `IP:${requestIp} 不在白名单内`);
             }
         }
     }
 };
+exports.ApiGuard = ApiGuard;
 __decorate([
-    Config('apiOption'),
+    (0, core_1.Config)('apiOption'),
     __metadata("design:type", Object)
 ], ApiGuard.prototype, "apiOption", void 0);
 __decorate([
-    Config('ipOption'),
+    (0, core_1.Config)('ipOption'),
     __metadata("design:type", Object)
 ], ApiGuard.prototype, "ipOption", void 0);
-ApiGuard = __decorate([
-    Guard()
+exports.ApiGuard = ApiGuard = __decorate([
+    (0, core_1.Guard)()
 ], ApiGuard);
-export { ApiGuard };
 //# sourceMappingURL=api.js.map

package/dist/guard/auth.d.ts

@@ -11,8 +11,12 @@ export declare class AuthGuard implements IGuard<Context> {
     apiOption: any;
     koa: any;
     init(): Promise<void>;
-    checkNeedAuth(context: Context, supplierClz: any, methodName: string): any;
+    private isPathIgnored;
+    checkNeedAuth(context: Context, supplierClz: any, methodName: string): boolean;
     canActivate(context: Context, supplierClz: any, methodName: string): Promise<boolean>;
-    checkAuth(context: Context, token: string, needAuth?: boolean): Promise<boolean>;
-    authError(context: Context, error?: any): void;
+    checkAuth(context: Context, token: string, needAuth?: boolean): Promise<void>;
+    authError(context: Context, error: {
+        ret: number;
+        msg: string;
+    }): void;
 }