midway-fatcms 0.0.1-beta.40 → 0.0.1-beta.41

package/dist/libs/crud-pro/models/Transaction.d.ts

@@ -3,6 +3,7 @@ declare class Transaction {
     private transactionMySQL;
     private transactionPostgres;
     private transactionSqlServer;
+    private isReleased;
     private getTxObj;
     /**
      * 获取链接对象

package/dist/libs/crud-pro/models/Transaction.js

@@ -10,6 +10,7 @@ class Transaction {
         this.transactionMySQL = new TransactionMySQL_1.TransactionMySQL();
         this.transactionPostgres = new TransactionPostgres_1.TransactionPostgres();
         this.transactionSqlServer = new TransactionSqlServer_1.TransactionSqlServer();
+        this.isReleased = false;
     }
     getTxObj(pool) {
         if (pool.dbType === keys_1.SqlDbType.postgres) {
@@ -28,6 +29,11 @@ class Transaction {
      * @param pool
      */
     async getTxConnection(pool) {
+        if (this.isReleased) {
+            const msg = '[Transaction] getTxConnection error, the txObject is isReleased, please check your code . DB request must be await';
+            console.error(msg);
+            throw new Error(msg);
+        }
         const txObj = this.getTxObj(pool);
         return txObj.getTxConnection(pool);
     }
@@ -62,6 +68,7 @@ class Transaction {
         await this.transactionMySQL.releaseTx();
         await this.transactionPostgres.releaseTx();
         await this.transactionSqlServer.releaseTx();
+        this.isReleased = true;
     }
 }
 exports.Transaction = Transaction;

package/dist/libs/utils/base64.d.ts

@@ -0,0 +1,9 @@
+declare function toBase64(obj: any): string;
+/**
+* 将经 toBase64 函数序列化的 Base64 字符串还原为 JS 对象
+* @param base64Str - 经 toBase64 处理后的 Base64 字符串
+* @returns 还原后的 JS 对象
+* @throws 当 Base64 格式无效或 JSON 解析失败时抛出含具体原因的错误
+*/
+declare function fromBase64(base64Str: string): any;
+export { toBase64, fromBase64 };

package/dist/libs/utils/base64.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fromBase64 = exports.toBase64 = void 0;
+function toBase64(obj) {
+    const jsonString = JSON.stringify(obj);
+    return Buffer.from(jsonString, 'utf8').toString('base64');
+}
+exports.toBase64 = toBase64;
+/**
+* 将经 toBase64 函数序列化的 Base64 字符串还原为 JS 对象
+* @param base64Str - 经 toBase64 处理后的 Base64 字符串
+* @returns 还原后的 JS 对象
+* @throws 当 Base64 格式无效或 JSON 解析失败时抛出含具体原因的错误
+*/
+function fromBase64(base64Str) {
+    // 校验输入是否为字符串
+    if (typeof base64Str !== 'string') {
+        throw new Error('input must Base64 string');
+    }
+    try {
+        // 1. 反向步骤1：将 Base64 字符串解码为 UTF-8 格式的 JSON 字符串
+        // 对应原函数的 Buffer.from(jsonString, 'utf8') 反向操作
+        const jsonString = Buffer.from(base64Str, 'base64').toString('utf8');
+        // 2. 反向步骤2：将 JSON 字符串解析为 JS 对象
+        // 对应原函数的 JSON.stringify(obj) 反向操作
+        const restoredObj = JSON.parse(jsonString);
+        return restoredObj;
+    }
+    catch (error) {
+        // 分类处理不同错误类型，提供明确提示
+        if (error instanceof TypeError && error.message.includes('invalid base64')) {
+            throw new Error('还原失败：输入不是有效的 Base64 字符串');
+        }
+        else if (error instanceof SyntaxError && error.message.includes('JSON')) {
+            throw new Error('还原失败：解码后的内容不是有效的 JSON 格式');
+        }
+        else {
+            throw new Error(`还原失败：未知错误 - ${error.message}`);
+        }
+    }
+}
+exports.fromBase64 = fromBase64;

package/dist/service/WorkbenchService.js

@@ -136,7 +136,7 @@ let WorkbenchService = class WorkbenchService extends BaseService_1.BaseService
         }
         // 只有一个workbench的场景。对于后台系统。不需要配置域名的场景。
         const fatcmsTargetWorkbenchCode = this.fatcmsTargetWorkbenchCode;
-        if (typeof fatcmsTargetWorkbenchCode === "string" && fatcmsTargetWorkbenchCode.length > 3) {
+        if (typeof fatcmsTargetWorkbenchCode === 'string' && fatcmsTargetWorkbenchCode.length > 3) {
             return await this.getWorkbenchInfoByCode(fatcmsTargetWorkbenchCode);
         }
         //正式环境： 根据域名获取站点配置
@@ -146,7 +146,7 @@ let WorkbenchService = class WorkbenchService extends BaseService_1.BaseService
             return workbenchInfo;
         }
         // 最后兜底
-        return await this.getWorkbenchInfoByHost("*");
+        return await this.getWorkbenchInfoByHost('*');
     }
     /**
      * 获取当前请求的域名

package/dist/service/asyncTask/AsyncTaskRunnerService.js

@@ -155,7 +155,7 @@ let AsyncTaskRunnerService = class AsyncTaskRunnerService extends BaseService_1.
             return Promise.resolve();
         }
         const timeoutTime = moment().subtract(24, 'hours').format("YYYY-MM-DD HH:mm:ss.SSS");
-        this.curdProService.executeCrudByCfg({
+        await this.curdProService.executeCrudByCfg({
             condition: {
                 task_status: AsyncTaskModel_1.SysAsyncTaskStatus.RUNNING,
                 updated_at: {
@@ -247,7 +247,7 @@ let AsyncTaskRunnerService = class AsyncTaskRunnerService extends BaseService_1.
             sqlDbType: SystemDbType,
         });
         // 开始执行。
-        exports.ASYNC_TASK_RUNNER.executeTaskList(taskList).then(() => {
+        await exports.ASYNC_TASK_RUNNER.executeTaskList(taskList).then(() => {
             console.log('[AsyncTaskRunnerService] ASYNC_TASK_RUNNER finished taskIds ==> ' + JSON.stringify(taskIds));
         });
     }

package/dist/service/proxyapi/ProxyApiService.d.ts

@@ -57,4 +57,5 @@ export declare class ProxyApiService extends ApiBaseService {
      */
     private selectTargetByBalanceStrategy;
     private setRequestHeaders;
+    private buildUserContextHeader;
 }

package/dist/service/proxyapi/ProxyApiService.js

@@ -22,10 +22,7 @@ const fatcms_request_1 = require("../../libs/utils/fatcms-request");
 const ProxyApiUtils_1 = require("./ProxyApiUtils");
 const ProxyApiLoadService_1 = require("./ProxyApiLoadService");
 const ApiBaseService_1 = require("../base/ApiBaseService");
-function toBase64(obj) {
-    const jsonString = JSON.stringify(obj);
-    return Buffer.from(jsonString, 'utf8').toString('base64');
-}
+const base64_1 = require("../../libs/utils/base64");
 /**
  * 接口代理
  */
@@ -231,20 +228,40 @@ let ProxyApiService = class ProxyApiService extends ApiBaseService_1.ApiBaseServ
     }
     setRequestHeaders(headers, proxyApiEntity) {
         const ctx = this.ctx;
+        // 转发IP
         if (proxyApiEntity.pass_real_ip) {
             headers['x-real-ip'] = ctx.headers['x-real-ip'];
             headers['x-forwarded-for'] = ctx.headers['x-forwarded-for'];
         }
+        // 转发用户上下文
+        const userContextHeader = this.buildUserContextHeader(proxyApiEntity);
+        if (userContextHeader) {
+            headers['x-fatcms-usercontext'] = userContextHeader;
+        }
+        else {
+            delete headers['x-fatcms-usercontext']; // 只有自己构建的才能被转发。前面传过来的，不要转发。
+        }
+        if (proxyApiEntity.change_host && proxyApiEntity.change_host.length > 0) {
+            headers.host = proxyApiEntity.change_host;
+        }
+        if (proxyApiEntity.change_origin && proxyApiEntity.change_origin.length > 0) {
+            headers.origin = proxyApiEntity.change_origin;
+        }
+    }
+    buildUserContextHeader(proxyApiEntity) {
+        var _a, _b;
         // 传递整个用户上下文
         if (proxyApiEntity.user_context === SystemEntities_1.ProxyUserContextEnum.SESSION_INFO) {
             const isLogin = this.ctx.userSession.isLogin();
             const sessionInfo = this.ctx.userSession.getSessionInfo();
-            headers['x-fatcms-usercontext'] = toBase64({ ...sessionInfo, isLogin });
+            const workbenchCode = (_a = this.ctx.workbenchInfo) === null || _a === void 0 ? void 0 : _a.workbench_code;
+            return (0, base64_1.toBase64)({ ...sessionInfo, isLogin, workbenchCode });
         }
         // 只传递用户基本信息
         if (proxyApiEntity.user_context === SystemEntities_1.ProxyUserContextEnum.BASIC_INFO) {
             const isLogin = this.ctx.userSession.isLogin();
             const sessionInfo = this.ctx.userSession.getSessionInfo();
+            const workbenchCode = (_b = this.ctx.workbenchInfo) === null || _b === void 0 ? void 0 : _b.workbench_code;
             const userBasicInfo = { isLogin };
             if (sessionInfo && isLogin) {
                 userBasicInfo.loginName = sessionInfo.loginName;
@@ -253,14 +270,10 @@ let ProxyApiService = class ProxyApiService extends ApiBaseService_1.ApiBaseServ
                 userBasicInfo.workbenchCode = sessionInfo.workbenchCode;
                 userBasicInfo.accountType = sessionInfo.accountType;
             }
-            headers['x-fatcms-usercontext'] = toBase64(userBasicInfo);
-        }
-        if (proxyApiEntity.change_host && proxyApiEntity.change_host.length > 0) {
-            headers.host = proxyApiEntity.change_host;
-        }
-        if (proxyApiEntity.change_origin && proxyApiEntity.change_origin.length > 0) {
-            headers.origin = proxyApiEntity.change_origin;
+            userBasicInfo.workbenchCode = workbenchCode;
+            return (0, base64_1.toBase64)(userBasicInfo);
         }
+        return null;
     }
 };
 __decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-fatcms",
-  "version": "0.0.1-beta.40",
+  "version": "0.0.1-beta.41",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -12,6 +12,9 @@
     "lint:fix": "mwts fix"
   },
   "keywords": [],
+  "engines": {
+    "node": ">10"
+  },
   "author": "",
   "files": [
     "dist/**/*.txt",