@cicctencent/midwayjs-base 1.0.44 → 1.0.46

package/dist/config/config.default.js

@@ -123,6 +123,19 @@ exports.default = (appInfo) => {
             manager: ['admin'],
             appId: appInfo.appId,
             url: process.env.BASE_SERVER_URL || '',
+            servant: process.env.BASE_SERVICE_SERVANT || '',
+            local: process.env.BASE_SERVICE_LOCAL_PORT
+                ? {
+                    host: process.env.BASE_SERVICE_LOCAL_HOST || '127.0.0.1',
+                    port: process.env.BASE_SERVICE_LOCAL_PORT,
+                }
+                : null,
+            serverProtocol: 'http://'
+        },
+        tars: {
+            client: process.env.TARS_CLIENT_LOCATOR
+                ? { locator: process.env.TARS_CLIENT_LOCATOR }
+                : null,
         },
         session: {
             timeout: Number(process.env.SESSION_TIMEOUT) || 20 * 60 * 1000,

package/dist/guard/auth.d.ts

@@ -7,6 +7,11 @@ export declare class AuthGuard implements IGuard<Context> {
     ssoOption: any;
     authOption: {
         ignores?: string | Array<RegExp | string>;
+        loginUrl?: string;
+        redirectParam?: string;
+        appIdParam?: string;
+        authCodeParam?: string | false;
+        cleanParams?: string[];
     };
     apiOption: any;
     koa: any;

package/dist/guard/auth.js

@@ -61,13 +61,17 @@ let AuthGuard = class AuthGuard {
         let errRes = null;
         let session = null;
         try {
-            const authCode = context.URL.searchParams.get('auth_code');
-            if (authCode) {
+            const authCodeParam = this.authOption?.authCodeParam === false
+                ? false
+                : this.authOption?.authCodeParam || 'auth_code';
+            const authCode = authCodeParam ? context.URL.searchParams.get(authCodeParam) : null;
+            if (authCode && authCodeParam) {
                 session = await this.sessionService.loginByCode(authCode);
                 if (session) {
                     (0, utils_1.setAuthToken)(context, session.id);
                 }
-                context.URL.searchParams.delete('auth_code');
+                if (authCodeParam)
+                    context.URL.searchParams.delete(authCodeParam);
                 context.URL.hostname = context.detect?.HOSTNAME || context.hostname;
                 context.redirect(context.URL.toString());
                 return;
@@ -124,17 +128,24 @@ let AuthGuard = class AuthGuard {
             throw new error_code_1.BizError(error.ret, error.msg);
         }
         else {
-            const loginUrl = `${this.ssoOption?.baseUrl || this.koa?.globalPrefix || ''}/login`;
-            if (!/\/login\/?(\?|$|#)/.test(context.URL.pathname)) {
-                const URL = context.URL;
-                if (context.detect?.HOSTNAME && URL.hostname !== context.detect.HOSTNAME) {
-                    URL.hostname = context.detect.HOSTNAME;
+            const loginUrl = this.authOption?.loginUrl || `${this.ssoOption?.baseUrl || this.koa?.globalPrefix || ''}/login`;
+            const loginPath = new URL(loginUrl, `${context.protocol}://${context.host}`).pathname;
+            if (context.URL.pathname !== loginPath) {
+                const currentUrl = context.URL;
+                if (context.detect?.HOSTNAME && currentUrl.hostname !== context.detect.HOSTNAME) {
+                    currentUrl.hostname = context.detect.HOSTNAME;
                 }
-                URL.searchParams.delete('jv_auth_code');
-                URL.searchParams.delete('token');
-                URL.searchParams.delete('auth_code');
-                const redirectUrl = URL.toString();
-                context.redirect(`${loginUrl}?url=${encodeURIComponent(redirectUrl)}&appid=${this.ssoOption?.appId || 0}`);
+                for (const param of this.authOption?.cleanParams || ['jv_auth_code', 'token', 'auth_code']) {
+                    currentUrl.searchParams.delete(param);
+                }
+                const redirectParam = this.authOption?.redirectParam || 'url';
+                const appIdParam = this.authOption?.appIdParam === undefined ? 'appid' : this.authOption.appIdParam;
+                const targetUrl = new URL(loginUrl, `${context.protocol}://${context.host}`);
+                targetUrl.searchParams.set(redirectParam, currentUrl.toString());
+                if (appIdParam) {
+                    targetUrl.searchParams.set(appIdParam, String(this.ssoOption?.appId || 0));
+                }
+                context.redirect(targetUrl.toString());
             }
             else {
                 context.redirect(loginUrl);

package/dist/index.d.ts

@@ -3,6 +3,8 @@ export { BaseConfiguration as Configuration } from './configuration';
 export * as utils from './lib/utils';
 export * as jwt from './lib/jwt';
 export * as decorators from './lib/decorator';
+export { default as tarsRegistry } from './lib/tarsRegistry';
+export { resolveTarsEndpoint, requestTarsServer, requestWithTars, requestWithTarsApi, type TarsConfig, type RequestWithTarsOption, } from './lib/request';
 export * from '@fefeding/common/dist/models/base/enumType';
 export { BaseORM as BaseEntity } from '@fefeding/common/dist/models/base/baseORM';
 export * from './constants/error-code';

package/dist/index.js

@@ -35,14 +35,24 @@ var __importStar = (this && this.__importStar) || (function () {
 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);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseEntity = exports.decorators = exports.jwt = exports.utils = exports.Configuration = exports.koa = void 0;
+exports.BaseEntity = exports.requestWithTarsApi = exports.requestWithTars = exports.requestTarsServer = exports.resolveTarsEndpoint = exports.tarsRegistry = exports.decorators = exports.jwt = exports.utils = exports.Configuration = exports.koa = void 0;
 exports.koa = __importStar(require("@midwayjs/koa"));
 var configuration_1 = require("./configuration");
 Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.BaseConfiguration; } });
 exports.utils = __importStar(require("./lib/utils"));
 exports.jwt = __importStar(require("./lib/jwt"));
 exports.decorators = __importStar(require("./lib/decorator"));
+var tarsRegistry_1 = require("./lib/tarsRegistry");
+Object.defineProperty(exports, "tarsRegistry", { enumerable: true, get: function () { return __importDefault(tarsRegistry_1).default; } });
+var request_1 = require("./lib/request");
+Object.defineProperty(exports, "resolveTarsEndpoint", { enumerable: true, get: function () { return request_1.resolveTarsEndpoint; } });
+Object.defineProperty(exports, "requestTarsServer", { enumerable: true, get: function () { return request_1.requestTarsServer; } });
+Object.defineProperty(exports, "requestWithTars", { enumerable: true, get: function () { return request_1.requestWithTars; } });
+Object.defineProperty(exports, "requestWithTarsApi", { enumerable: true, get: function () { return request_1.requestWithTarsApi; } });
 __exportStar(require("@fefeding/common/dist/models/base/enumType"), exports);
 var baseORM_1 = require("@fefeding/common/dist/models/base/baseORM");
 Object.defineProperty(exports, "BaseEntity", { enumerable: true, get: function () { return baseORM_1.BaseORM; } });

package/dist/lib/request.d.ts

@@ -1,2 +1,22 @@
 import { requestApi, requestServer } from '@fefeding/common/dist/utils/axios';
+import type { AxiosRequestConfig, AxiosResponse } from 'axios';
+import type request from '@fefeding/common/dist/models/base/request';
 export { requestApi, requestServer };
+export interface TarsConfig {
+    servant?: string;
+    client?: {
+        locator: string;
+    };
+    local?: {
+        host?: string;
+        port?: string | number;
+    };
+    serverProtocol?: string;
+}
+export declare function resolveTarsEndpoint(tarsConfig: TarsConfig): Promise<string>;
+export declare function requestTarsServer<T extends any>(req: request | string, tarsConfig: TarsConfig, option?: AxiosRequestConfig): Promise<AxiosResponse<any, T>>;
+export interface RequestWithTarsOption extends AxiosRequestConfig {
+    tarsConfig?: TarsConfig;
+}
+export declare function requestWithTars<T extends any>(req: request | string, option?: RequestWithTarsOption): Promise<AxiosResponse<any, T>>;
+export declare function requestWithTarsApi<T extends any>(req: request | string, option?: RequestWithTarsOption): Promise<T>;

package/dist/lib/request.js

@@ -1,7 +1,65 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requestServer = exports.requestApi = void 0;
+exports.resolveTarsEndpoint = resolveTarsEndpoint;
+exports.requestTarsServer = requestTarsServer;
+exports.requestWithTars = requestWithTars;
+exports.requestWithTarsApi = requestWithTarsApi;
 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; } });
+const tarsRegistry_1 = __importDefault(require("./tarsRegistry"));
+async function resolveTarsEndpoint(tarsConfig) {
+    const { servant, client } = tarsConfig;
+    let host = '';
+    let port = '';
+    if (tarsConfig.local && tarsConfig.local.port) {
+        host = tarsConfig.local.host || '127.0.0.1';
+        port = String(tarsConfig.local.port);
+    }
+    else if (servant && client) {
+        const point = await tarsRegistry_1.default.getConnectPoint({ objName: servant }, client);
+        if (point) {
+            host = point.host;
+            port = String(point.port);
+        }
+        else {
+            throw { ret: -1001, msg: 'tars查询可用IP端口失败' };
+        }
+    }
+    else {
+        return '';
+    }
+    const protocol = tarsConfig.serverProtocol || 'http://';
+    return `${protocol}${host}:${port}`;
+}
+async function requestTarsServer(req, tarsConfig, option) {
+    const baseURL = await resolveTarsEndpoint(tarsConfig);
+    const res = await (0, axios_1.requestServer)(req, {
+        ...option,
+        baseURL,
+    });
+    return res;
+}
+async function requestWithTars(req, option) {
+    const { tarsConfig, ...axiosOption } = option || {};
+    if (tarsConfig &&
+        ((tarsConfig.servant && tarsConfig.client) || tarsConfig.local?.port)) {
+        const baseURL = await resolveTarsEndpoint(tarsConfig);
+        const res = await (0, axios_1.requestServer)(req, {
+            ...axiosOption,
+            baseURL,
+        });
+        return res;
+    }
+    const res = await (0, axios_1.requestServer)(req, axiosOption);
+    return res;
+}
+async function requestWithTarsApi(req, option) {
+    const res = await requestWithTars(req, option);
+    return res?.data || null;
+}
 //# sourceMappingURL=request.js.map

package/dist/lib/tarsRegistry.d.ts

@@ -0,0 +1,26 @@
+export interface TarsEndPoint {
+    host: string;
+    port: string | number;
+}
+export interface TarsRegistryOptions {
+    objName?: string;
+    setName?: string;
+}
+export interface TarsClientConfig {
+    locator: string;
+}
+interface CachedPoints {
+    setName: string;
+    objName: string;
+    time: number;
+    endPoints: TarsEndPoint[];
+}
+declare function createClient(config: TarsClientConfig): any;
+declare function getEndPoints(options: TarsRegistryOptions, config: TarsClientConfig): Promise<CachedPoints | undefined>;
+declare function getConnectPoint(options: TarsRegistryOptions, config: TarsClientConfig): Promise<TarsEndPoint | null>;
+declare const _default: {
+    createClient: typeof createClient;
+    getEndPoints: typeof getEndPoints;
+    getConnectPoint: typeof getConnectPoint;
+};
+export default _default;

package/dist/lib/tarsRegistry.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+let Registry = null;
+try {
+    Registry = require('@tars/registry');
+}
+catch (e) {
+}
+const clients = {};
+function createClient(config) {
+    if (!Registry) {
+        throw new Error('@tars/registry 未安装，请先安装该依赖：npm install @tars/registry');
+    }
+    if (clients[config.locator])
+        return clients[config.locator];
+    const registry = Registry.New();
+    registry.setLocator(config.locator);
+    return (clients[config.locator] = registry);
+}
+async function getEndPoints(options, config) {
+    const setName = options.setName || '';
+    const objName = options.objName || '';
+    const registry = createClient(config);
+    const cacheKey = `${objName}/${setName}`;
+    const cache = registry.__end_points || (registry.__end_points = {});
+    const points = cache[cacheKey];
+    if (points && points.time > Date.now() - 10000) {
+        return points;
+    }
+    try {
+        const result = {
+            setName,
+            objName,
+            time: Date.now(),
+            endPoints: [],
+        };
+        if (setName) {
+            const obj = await registry.findObjectByIdInSameSet(objName, setName);
+            result.endPoints = obj.response.arguments.activeEp.value || [];
+        }
+        else {
+            const obj = await registry.findObjectByIdInSameGroup(objName);
+            result.endPoints = obj.response.arguments.activeEp.value || [];
+        }
+        if (result.endPoints && result.endPoints.length) {
+            cache[cacheKey] = result;
+        }
+        else {
+            return points;
+        }
+        return result;
+    }
+    catch (e) {
+        console.log('[tarsRegistry] getEndPoints error:', e);
+        return points;
+    }
+}
+async function getConnectPoint(options, config) {
+    const points = await getEndPoints(options, config);
+    if (points && points.endPoints && points.endPoints.length) {
+        if (points.endPoints.length === 1)
+            return points.endPoints[0];
+        const index = Math.floor(points.endPoints.length * Math.random());
+        return points.endPoints[index] || points.endPoints[0];
+    }
+    return null;
+}
+exports.default = {
+    createClient,
+    getEndPoints,
+    getConnectPoint,
+};
+//# sourceMappingURL=tarsRegistry.js.map

package/dist/types/base.service.d.ts

@@ -2,6 +2,8 @@ import { Application, Context } from '@midwayjs/koa';
 import type { AxiosRequestConfig, AxiosResponse } from 'axios';
 import request from '@fefeding/common/dist/models/base/request';
 import response from '@fefeding/common/dist/models/base/response';
+import { type TarsConfig, type RequestWithTarsOption } from '../lib/request';
+export type { TarsConfig };
 export declare abstract class BaseService {
     protected app: Application;
     ctx: Context;
@@ -9,13 +11,23 @@ export declare abstract class BaseService {
         manager?: Array<string>;
         appId: number;
         url: string;
+        servant?: string;
+        local?: {
+            host?: string;
+            port?: string | number;
+        } | null;
     };
     apiOption: {
         key: string;
     };
+    tarsOption: {
+        client?: {
+            locator: string;
+        } | undefined;
+    };
     checkManager(account?: string): Promise<boolean | "" | undefined>;
     requestBaseApi<T extends response>(req: request | string, option?: AxiosRequestConfig): Promise<T>;
-    requestBaseServer<T extends any>(req: request | string, option?: AxiosRequestConfig & {
+    requestBaseServer<T extends any>(req: request | string, option?: RequestWithTarsOption & {
         accessKey?: string;
     }): Promise<AxiosResponse<any, T>>;
 }

package/dist/types/base.service.js

@@ -29,6 +29,13 @@ class BaseService {
             method: 'POST',
             baseURL: this.baseServiceOption?.url || '',
             accessKey: this.apiOption?.key || '',
+            tarsConfig: this.baseServiceOption?.servant
+                ? {
+                    servant: this.baseServiceOption.servant,
+                    client: this.tarsOption?.client,
+                    local: this.baseServiceOption?.local || undefined,
+                }
+                : undefined,
             ...option,
         };
         const headers = option.headers || {};
@@ -46,7 +53,7 @@ class BaseService {
                 '').toString();
         headers['x-client-ip'] = ip;
         option.headers = headers;
-        const res = await (0, request_1.requestServer)(req, option);
+        const res = (await (0, request_1.requestWithTars)(req, option));
         return res;
     }
 }
@@ -67,4 +74,8 @@ __decorate([
     (0, core_1.Config)('apiOption'),
     __metadata("design:type", Object)
 ], BaseService.prototype, "apiOption", void 0);
+__decorate([
+    (0, core_1.Config)('tars'),
+    __metadata("design:type", Object)
+], BaseService.prototype, "tarsOption", void 0);
 //# sourceMappingURL=base.service.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cicctencent/midwayjs-base",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "description": "基础框架，服务",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -32,7 +32,7 @@
     "@types/koa": "^3.0.3",
     "@types/lodash": "^4.17.24",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^24.13.0",
+    "@types/node": "^24.13.2",
     "cross-env": "^10.1.0",
     "jest": "^30.4.2",
     "mwts": "^1.3.0",
@@ -56,15 +56,19 @@
     "@midwayjs/static-file": "^3.20.24",
     "@midwayjs/typeorm": "^3.20.24",
     "@midwayjs/view-nunjucks": "^3.20.24",
-    "axios": "^1.17.0",
+    "axios": "^1.18.1",
+    "browserslist": "^0.2.3",
     "dayjs": "^1.11.21",
     "dotenv": "^17.4.2",
     "ip": "^2.0.1",
     "jsonwebtoken": "^9.0.3",
     "lodash": "^4.18.1",
-    "mysql2": "^3.22.4",
+    "mysql2": "^3.22.5",
     "reflect-metadata": "^0.2.2",
     "typeorm": "^0.3.30",
     "uuid": "^13.0.2"
+  },
+  "optionalDependencies": {
+    "@tars/registry": "^0.2.3"
   }
 }