midway-fatcms 0.0.16 → 0.0.17

package/src/service/proxyapi/ProxyApiLoadService.ts

@@ -1,20 +1,16 @@
 import { Inject, Provide } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
 import * as _ from 'lodash';
 import { BaseService } from '../base/BaseService';
-import { setRouteTrie, RouteTrie } from './RouteTrie';
+import { RouteTrie } from './RouteTrie';
 import { RouteHandler } from './RouteHandler';
-import { CurdProService } from '../curd/CurdProService';
-import { SystemTables } from '../../models/SystemTables';
-import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
 import { IProxyApiEntity, IUpstreamInfo } from '../../models/SystemEntities';
 import { isEntityOK, parseJsonObject } from '../../libs/utils/functions';
 import { BALANCE_STRATEGY } from './ProxyApiUtils';
 import { WeightedRandom } from './WeightedRandom';
 import { WeightedRoundRobin } from './WeightedRoundRobin';
+import { bizMemCacheStore } from '@/service/base/bizmemcache/BizMemCacheStore';
 import { WorkbenchService } from '../WorkbenchService';
 import { CommonException } from '../../libs/crud-pro/exceptions';
-import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 function toUpstreamInfo(config_content: any): IUpstreamInfo {
   const obj = parseJsonObject(config_content);
@@ -56,55 +52,46 @@ function toUpstreamInfo(config_content: any): IUpstreamInfo {
  */
 @Provide()
 export class ProxyApiLoadService extends BaseService {
-  @Inject()
-  protected ctx: Context;
-
-  @Inject()
-  private curdProService: CurdProService;
 
   @Inject()
   private workbenchService: WorkbenchService;
 
   /**
-   * 创建路由树。刷新路由缓存
-   * 先构建全新的 RouteTrie，完成后原子替换，避免重建期间路由不可用
-   * @param workbench_code
+   * 获取站点路由树；routeTrieMap 为空或缺失时懒重建
    */
-  public async buildRouteTrie(workbench_code: string): Promise<RouteTrie> {
-    const upstreamMap: Record<string, IUpstreamInfo> = await this.buildUpstreamMap();
-    const newRouteTrie = new RouteTrie();
-    const entities = await this.loadProxyApiEntity(workbench_code, upstreamMap);
+  public getRouteTrie(workbench_code: string): RouteTrie {
+    const cacheObj = bizMemCacheStore.getSysProxyApi();
+    if (cacheObj?.routeTrieMap?.[workbench_code]) {
+      return cacheObj.routeTrieMap[workbench_code];
+    }
+    return this.buildRouteTrie(workbench_code);
+  }
+
+  private buildRouteTrie(workbench_code: string): RouteTrie {
+    const upstreamMap = this.buildUpstreamMap();
+    const routeTrie = new RouteTrie();
+    const entities = this.loadProxyApiEntity(workbench_code, upstreamMap);
     for (let i = 0; i < entities.length; i++) {
       const entity = entities[i];
       if (entity.status === 1) {
         const path_prefix2 = '/' + entity.upstream_code + entity.path_prefix;
-        newRouteTrie.addRoute(path_prefix2, new RouteHandler(entity));
+        routeTrie.addRoute(path_prefix2, new RouteHandler(entity));
       }
     }
-    setRouteTrie(workbench_code, newRouteTrie);
-    return newRouteTrie;
+    const cacheObj = bizMemCacheStore.getSysProxyApi();
+    if (cacheObj) {
+      if (!cacheObj.routeTrieMap) {
+        cacheObj.routeTrieMap = {};
+      }
+      cacheObj.routeTrieMap[workbench_code] = routeTrie;
+    }
+    return routeTrie;
   }
 
-  private async buildUpstreamMap() {
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-
-    //       biz_tag={'upstream'}
-    const res = await this.curdProService.executeCrudByCfg(
-      {
-        condition: {
-          biz_tag: 'upstream',
-          deleted_at: 0,
-        },
-      },
-      {
-        sqlTable: SystemTables.sys_configs,
-        sqlDatabase: SystemDbName,
-        sqlDbType: SystemDbType,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
-      }
-    );
+  private buildUpstreamMap(): Record<string, IUpstreamInfo> {
+    const sysConfigList = bizMemCacheStore.getSysConfig()?.sysConfigList || [];
+    const rows = sysConfigList.filter((row) => row.biz_tag === 'upstream');
     const upstreamMap: Record<string, IUpstreamInfo> = {};
-    const rows = res.getResRows() as any[];
     for (let i = 0; i < rows.length; i++) {
       const row = rows[i];
       const { config_code, config_content } = row || {};
@@ -113,37 +100,24 @@ export class ProxyApiLoadService extends BaseService {
     return upstreamMap;
   }
 
-  private async loadProxyApiEntity(workbench_code: string, upstreamMap: Record<string, IUpstreamInfo>): Promise<IProxyApiEntity[]> {
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+  private loadProxyApiEntity(workbench_code: string, upstreamMap: Record<string, IUpstreamInfo>): IProxyApiEntity[] {
+    const rows0 = bizMemCacheStore.getSysProxyApi()?.sysProxyApiList || [];
+    const rows: IProxyApiEntity[] = [];
 
-    const res = await this.curdProService.executeCrudByCfg(
-      {
-        condition: {},
-      },
-      {
-        sqlTable: SystemTables.sys_proxyapi,
-        sqlDatabase: SystemDbName,
-        sqlDbType: SystemDbType,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
-      }
-    );
-
-    const rows0 = res.getResRows() as IProxyApiEntity[];
-
-    const rows = rows0.filter(s => {
+    for (let i = 0; i < rows0.length; i++) {
+      const s = rows0[i];
       if (!isEntityOK(s)) {
-        return false;
+        continue;
       }
       if (!s.workbench_code_array) {
         throw new CommonException('IS_SUPPORT_CURRENT_WORKBENCH', '未配置支持的站点字段');
       }
-      return this.workbenchService.isMatchWorkbenchCode(s.workbench_code_array, workbench_code);
-    });
-
-    for (let i = 0; i < rows.length; i++) {
-      const row = rows[i];
-      const upstream_code = row.upstream_code;
-      this.addUpstreamInfo(row, upstream_code, upstreamMap);
+      if (!this.workbenchService.isMatchWorkbenchCode(s.workbench_code_array, workbench_code)) {
+        continue;
+      }
+      const row = JSON.parse(JSON.stringify(s)) as IProxyApiEntity;
+      this.addUpstreamInfo(row, row.upstream_code, upstreamMap);
+      rows.push(row);
     }
     return rows;
   }
@@ -159,16 +133,4 @@ export class ProxyApiLoadService extends BaseService {
     row.weightedRandom = new WeightedRandom(upstreamInfo.targetList || []);
     row.weightedRoundRobin = new WeightedRoundRobin(upstreamInfo.targetList || []);
   }
-
-  public async refreshRouteTrie(): Promise<any> {
-    const workbenchList = await this.workbenchService.getAllWorkbenchInfoList();
-    for (let i = 0; i < workbenchList.length; i++) {
-      const workbenchInfo = workbenchList[i];
-      try {
-        await this.buildRouteTrie(workbenchInfo.workbench_code);
-      } catch (e) {
-        this.logError('ProxyApiLoadService_runBySchedule', e);
-      }
-    }
-  }
 }

package/src/service/proxyapi/ProxyApiService.ts

@@ -1,7 +1,6 @@
 import { Inject, Provide } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import * as _ from 'lodash';
-import { getRouteTrie } from './RouteTrie';
 import { RouteHandler } from './RouteHandler';
 import { Exceptions } from '@/libs/crud-pro/exceptions';
 import { BizException } from '@/models/devops';
@@ -15,6 +14,7 @@ import { WeightedRoundRobin } from './WeightedRoundRobin';
 import { ProxyApiLoadService } from './ProxyApiLoadService';
 import { API_BASE_TYPE, ApiBaseService } from '../base/ApiBaseService';
 import { toBase64 } from '@/libs/utils/base64';
+import { parseJsonObject } from '@/libs/utils/functions';
 
 /**
  * 接口代理
@@ -36,7 +36,7 @@ export class ProxyApiService extends ApiBaseService {
    * @param upstream_path : 形如/[upstream_code]/[api_path]
    */
   public async handleProxyRequest(current_workbench_code: string, upstream_path: string) {
-    const routeTrie = getRouteTrie(current_workbench_code);
+    const routeTrie = this.proxyApiLoadService.getRouteTrie(current_workbench_code);
     const ss = routeTrie.findLongestMatch(upstream_path);
     if (!ss) {
       throw new BizException('路径没有匹配到', Exceptions.CFG_NOT_FOUND);
@@ -78,19 +78,16 @@ export class ProxyApiService extends ApiBaseService {
     const response_type: ResponseType = 'stream';
 
     try {
-      const headers = {
-        ...ctx.headers,
-        host: targetUrl.host, // 设置正确的 host
-      };
+      const headers = this.buildRequestHeaders(targetUrl.host, proxyApiEntity);
+
+      const requestBody = this.buildRequestBody(ctx.request.body, proxyApiEntity);
 
-      delete headers['content-length'];
 
-      this.setRequestHeaders(headers, proxyApiEntity);
 
       const axiosParams = {
         method: ctx.method,
         url: targetUrl.toString(),
-        data: ctx.request.body,
+        data: requestBody,
         headers: headers,
         responseType: response_type,
         timeout: Number(proxyApiEntity.timeout_ms) || 5 * 60 * 1000,
@@ -242,6 +239,21 @@ export class ProxyApiService extends ApiBaseService {
     return ss ? ss.origin : null;
   }
 
+  private buildRequestHeaders(targetHost: string, proxyApiEntity: IProxyApiEntity): any {
+    const ctx = this.ctx;
+    const headers = {
+      ...ctx.headers,
+      host: targetHost, // 设置正确的 host
+    };
+
+    delete headers['content-length'];
+    
+    this.setRequestHeaders(headers, proxyApiEntity);
+
+    return headers;
+  }
+
+
   private setRequestHeaders(headers: any, proxyApiEntity: IProxyApiEntity) {
     const ctx = this.ctx;
 
@@ -269,6 +281,30 @@ export class ProxyApiService extends ApiBaseService {
     if (proxyApiEntity.change_origin && proxyApiEntity.change_origin.length > 0) {
       headers.origin = proxyApiEntity.change_origin;
     }
+
+    // 强制设置自定义Header
+    const custom_header = parseJsonObject(proxyApiEntity.custom_header);
+    if (custom_header && typeof custom_header === 'object' && Object.keys(custom_header).length > 0) {
+      Object.assign(headers, custom_header);
+    }
+
+  }
+
+
+
+  private buildRequestBody(requestBody: any, proxyApiEntity: IProxyApiEntity): any {
+
+    // 强制设置自定义body
+    const custom_body = parseJsonObject(proxyApiEntity.custom_body);
+    if (custom_body && typeof custom_body === 'object' && Object.keys(custom_body).length > 0) {
+      if (requestBody && typeof requestBody === 'object') {
+        Object.assign(requestBody, custom_body);
+        return requestBody;
+      }
+      return custom_body;
+    }
+
+    return requestBody;
   }
 
   private buildUserContextHeader(proxyApiEntity: IProxyApiEntity): string {

package/src/service/proxyapi/RouteTrie.ts

@@ -63,21 +63,4 @@ class RouteTrie {
   }
 }
 
-const ROUTE_TRIE_MANAGER: Record<string, RouteTrie> = {};
-
-function getRouteTrie(domainCode: string): RouteTrie {
-  if (!ROUTE_TRIE_MANAGER[domainCode]) {
-    ROUTE_TRIE_MANAGER[domainCode] = new RouteTrie();
-  }
-  return ROUTE_TRIE_MANAGER[domainCode];
-}
-
-/**
- * 原子替换指定 domainCode 的 RouteTrie
- * 用于重建路由时先构建新树再整体替换，避免清空后重建期间路由不可用
- */
-function setRouteTrie(domainCode: string, routeTrie: RouteTrie): void {
-  ROUTE_TRIE_MANAGER[domainCode] = routeTrie;
-}
-
-export { RouteTrie, getRouteTrie, setRouteTrie };
+export { RouteTrie };