@cicctencent/midwayjs-base 1.0.35 → 1.0.37

package/dist/types/base.service.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,30 +7,13 @@ 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.BaseService = void 0;
-// @ts-ignore
-const core_1 = require("@midwayjs/core");
-const api_1 = require("@fefeding/common/dist/utils/api");
-const request_1 = require("../lib/request");
-class BaseService {
-    app;
-    ctx;
-    baseServiceOption;
-    // 登陆态验证配置
-    apiOption;
-    /**
-     * 是否是管理员帐号
-     * @param account
-     */
+import { App, Inject, Config } from '@midwayjs/core';
+import api from '@fefeding/common/dist/utils/api';
+import { requestServer } from '../lib/request';
+export class BaseService {
     async checkManager(account = this.ctx.currentSession?.account?.account) {
         return account && this.baseServiceOption.manager?.includes(account);
     }
-    /**
-     * 基础服务请求
-     * @param req
-     * @param option
-     */
     async requestBaseApi(req, option) {
         const res = await this.requestBaseServer(req, option);
         return res?.data || null;
@@ -45,42 +27,37 @@ class BaseService {
         };
         const headers = option.headers || {};
         if (option.accessKey) {
-            const thisToken = api_1.default.createApiToken(option.accessKey);
+            const thisToken = api.createApiToken(option.accessKey);
             headers['x-api-token'] = thisToken.sign;
             headers['x-api-timestamp'] = thisToken.timestamp;
-            /*if(typeof req === 'object') {
-                req.api_token = thisToken.sign;
-                req.timestamp = thisToken.timestamp;
-            }*/
         }
         headers['x-request-id'] = this.ctx.request_id;
         headers['x-auth-token'] = this.ctx.currentSession?.id || '';
-        const ip = this.ctx?.detect?.CLIENTIP || (this.ctx.request?.header?.['x-client-ip'] ||
-            this.ctx.request?.header?.['x-forwarded-for'] ||
-            this.ctx.request?.ip || '').toString();
+        const ip = this.ctx?.detect?.CLIENTIP ||
+            (this.ctx.request?.header?.['x-client-ip'] ||
+                this.ctx.request?.header?.['x-forwarded-for'] ||
+                this.ctx.request?.ip ||
+                '').toString();
         headers['x-client-ip'] = ip;
-        //console.log(req, option);
         option.headers = headers;
-        // @ts-ignore
-        const res = await (0, request_1.requestServer)(req, option);
+        const res = await requestServer(req, option);
         return res;
     }
 }
-exports.BaseService = BaseService;
 __decorate([
-    (0, core_1.App)(),
+    App(),
     __metadata("design:type", Object)
 ], BaseService.prototype, "app", void 0);
 __decorate([
-    (0, core_1.Inject)(),
+    Inject(),
     __metadata("design:type", Object)
 ], BaseService.prototype, "ctx", void 0);
 __decorate([
-    (0, core_1.Config)('baseService'),
+    Config('baseService'),
     __metadata("design:type", Object)
 ], BaseService.prototype, "baseServiceOption", void 0);
 __decorate([
-    (0, core_1.Config)('apiOption'),
+    Config('apiOption'),
     __metadata("design:type", Object)
 ], BaseService.prototype, "apiOption", void 0);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5zZXJ2aWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3R5cGVzL2Jhc2Uuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxhQUFhO0FBQ2IseUNBQXFEO0FBT3JELHlEQUFrRDtBQUNsRCw0Q0FBK0M7QUFFL0MsTUFBc0IsV0FBVztJQUVuQixHQUFHLENBQWM7SUFHcEIsR0FBRyxDQUFVO0lBR3BCLGlCQUFpQixDQUloQjtJQUNELFVBQVU7SUFFVixTQUFTLENBRVA7SUFFRjs7O09BR0c7SUFDSCxLQUFLLENBQUMsWUFBWSxDQUFDLFVBQWtCLElBQUksQ0FBQyxHQUFHLENBQUMsY0FBYyxFQUFFLE9BQU8sRUFBRSxPQUFPO1FBQzFFLE9BQU8sT0FBTyxJQUFJLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxPQUFPLEVBQUUsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDO0lBQ3hFLENBQUM7SUFFRDs7OztPQUlHO0lBQ0gsS0FBSyxDQUFDLGNBQWMsQ0FBcUIsR0FBbUIsRUFBRSxNQUEyQjtRQUNyRixNQUFNLEdBQUcsR0FBRyxNQUFNLElBQUksQ0FBQyxpQkFBaUIsQ0FBSSxHQUFHLEVBQUUsTUFBTSxDQUFDLENBQUM7UUFDekQsT0FBTyxHQUFHLEVBQUUsSUFBSSxJQUFJLElBQUksQ0FBQztJQUM3QixDQUFDO0lBRUQsS0FBSyxDQUFDLGlCQUFpQixDQUFnQixHQUFtQixFQUFFLE1BRTNEO1FBQ0csTUFBTSxHQUFHO1lBQ0wsTUFBTSxFQUFFLE1BQU07WUFDZCxPQUFPLEVBQUUsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEdBQUc7WUFDbkMsU0FBUyxFQUFFLElBQUksQ0FBQyxTQUFTLEVBQUUsR0FBRyxJQUFJLEVBQUU7WUFDcEMsR0FBRyxNQUFNO1NBQ1UsQ0FBQztRQUV4QixNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsT0FBTyxJQUFJLEVBQUUsQ0FBQztRQUNyQyxJQUFHLE1BQU0sQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUNsQixNQUFNLFNBQVMsR0FBRyxhQUFHLENBQUMsY0FBYyxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUN2RCxPQUFPLENBQUMsYUFBYSxDQUFDLEdBQUcsU0FBUyxDQUFDLElBQUksQ0FBQztZQUN4QyxPQUFPLENBQUMsaUJBQWlCLENBQUMsR0FBRyxTQUFTLENBQUMsU0FBUyxDQUFDO1lBRWpEOzs7ZUFHRztRQUNQLENBQUM7UUFDRCxPQUFPLENBQUMsY0FBYyxDQUFDLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUM7UUFDOUMsT0FBTyxDQUFDLGNBQWMsQ0FBQyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsY0FBYyxFQUFFLEVBQUUsSUFBSSxFQUFFLENBQUM7UUFDNUQsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxNQUFNLEVBQUUsUUFBUSxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxPQUFPLEVBQUUsTUFBTSxFQUFFLENBQUMsYUFBYSxDQUFDO1lBQy9FLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLE1BQU0sRUFBRSxDQUFDLGlCQUFpQixDQUFDO1lBQzdDLElBQUksQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxRQUFRLEVBQUUsQ0FBQztRQUMzQyxPQUFPLENBQUMsYUFBYSxDQUFDLEdBQUcsRUFBRSxDQUFDO1FBQzVCLDJCQUEyQjtRQUMzQixNQUFNLENBQUMsT0FBTyxHQUFHLE9BQU8sQ0FBQztRQUN6QixhQUFhO1FBQ2IsTUFBTSxHQUFHLEdBQUcsTUFBTSxJQUFBLHVCQUFhLEVBQXdCLEdBQUcsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUNwRSxPQUFPLEdBQUcsQ0FBQztJQUNmLENBQUM7Q0FDSjtBQXRFRCxrQ0FzRUM7QUFwRWE7SUFEVCxJQUFBLFVBQUcsR0FBRTs7d0NBQ3FCO0FBR3BCO0lBRE4sSUFBQSxhQUFNLEdBQUU7O3dDQUNXO0FBR3BCO0lBREMsSUFBQSxhQUFNLEVBQUMsYUFBYSxDQUFDOztzREFLckI7QUFHRDtJQURDLElBQUEsYUFBTSxFQUFDLFdBQVcsQ0FBQzs7OENBR2xCIn0=
+//# sourceMappingURL=base.service.js.map

package/dist/types/session.service.interface.d.ts

@@ -10,21 +10,7 @@ export declare abstract class ISessionService extends BaseService {
         secretKey: string;
         serviceKey: ObjectIdentifier;
     };
-    /**
-     * 根据ID获取session
-     * 并判断session是否在有效期
-     * @param id token唯一
-     */
-    abstract getLoginSession(id: string): Promise<Session>;
-    /**
-     * 下线
-     * @param id 需要下线的id或者session
-     */
+    abstract getLoginSession(id: string): Promise<Session | null>;
     abstract logout(id: string): Promise<any>;
-    /**
-     * 用临时码登陆
-     * @param code 登陆临时码
-     * @returns
-     */
     abstract loginByCode(code: string): Promise<Session>;
 }

package/dist/types/session.service.interface.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,25 +7,18 @@ 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.ISessionService = exports.DEFAULT_SESSION_SERVICE_KEY = void 0;
-// @ts-ignore
-const core_1 = require("@midwayjs/core");
-const cache_manager_1 = require("@midwayjs/cache-manager");
-const base_service_1 = require("./base.service");
-// 定义服务标识符常量
-exports.DEFAULT_SESSION_SERVICE_KEY = 'default:session:service';
-class ISessionService extends base_service_1.BaseService {
-    sessionCache;
-    sessionOption;
+import { InjectClient, Config, } from '@midwayjs/core';
+import { CachingFactory } from '@midwayjs/cache-manager';
+import { BaseService } from './base.service';
+export const DEFAULT_SESSION_SERVICE_KEY = 'default:session:service';
+export class ISessionService extends BaseService {
 }
-exports.ISessionService = ISessionService;
 __decorate([
-    (0, core_1.InjectClient)(cache_manager_1.CachingFactory, 'session'),
+    InjectClient(CachingFactory, 'session'),
     __metadata("design:type", Object)
 ], ISessionService.prototype, "sessionCache", void 0);
 __decorate([
-    (0, core_1.Config)('session'),
+    Config('session'),
     __metadata("design:type", Object)
 ], ISessionService.prototype, "sessionOption", void 0);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Vzc2lvbi5zZXJ2aWNlLmludGVyZmFjZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy90eXBlcy9zZXNzaW9uLnNlcnZpY2UuaW50ZXJmYWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLGFBQWE7QUFDYix5Q0FBbUc7QUFDbkcsMkRBQXNFO0FBQ3RFLGlEQUE2QztBQUc3QyxZQUFZO0FBQ0MsUUFBQSwyQkFBMkIsR0FBRyx5QkFBNkMsQ0FBQztBQUV6RixNQUFzQixlQUFnQixTQUFRLDBCQUFXO0lBR3JELFlBQVksQ0FBYztJQUcxQixhQUFhLENBSVo7Q0FxQko7QUEvQkQsMENBK0JDO0FBNUJHO0lBREMsSUFBQSxtQkFBWSxFQUFDLDhCQUFjLEVBQUUsU0FBUyxDQUFDOztxREFDZDtBQUcxQjtJQURDLElBQUEsYUFBTSxFQUFDLFNBQVMsQ0FBQzs7c0RBS2pCIn0=
+//# sourceMappingURL=session.service.interface.js.map

package/package.json

@@ -1,8 +1,17 @@
 {
   "name": "@cicctencent/midwayjs-base",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "description": "基础框架，服务",
+  "type": "module",
   "main": "dist/index.js",
+  "module": "dist/index.js",
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
+    }
+  },
   "typings": "index.d.ts",
   "publishConfig": {
     "access": "public"
@@ -26,8 +35,11 @@
   "devDependencies": {
     "@jest/globals": "^30.0.5",
     "@midwayjs/mock": "^3.20.11",
+    "@types/ip": "^1.1.3",
     "@types/jest": "^30.0.0",
+    "@types/jsonwebtoken": "^9.0.10",
     "@types/koa": "^3.0.0",
+    "@types/lodash": "^4.17.23",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^24.3.0",
     "cross-env": "^10.0.0",