@lcap/nasl 3.7.0-alpha.1 → 3.7.0-beta.1

package/src/server/naslServer.ts

@@ -90,13 +90,13 @@ import {
   asserts,
   BusinessComponent,
   CallEvent,
-  InterfaceParam,
+  Paginate,
 } from '../concepts';
 
 import * as utils from '../utils';
 import * as jsoner from '../service/storage/jsoner';
 
-import formatUiTs from './createUiTs';
+import formatUiTs, { createEleLogins } from './createUiTs';
 import axios from '../service/storage';
 
 import { lsp2tspNumber, SourceMap, SourceMapItem, isSameRange } from '../translator';
@@ -111,6 +111,7 @@ import { EventEmitter } from '../common/EventEmitter';
 import { traverse, FileNode } from '../utils';
 import { withQueueExecute } from '../decorators';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
+import { isConnection, isConnector } from '../concepts/utils/asserts';
 
 const EmbeddedTSFileLineMap: { [name: string]: number } = {
   Entity: 3,
@@ -149,6 +150,22 @@ let timer: number | null = null; //超时器用于收集导入接口相关
 // naslStdlib文件缓存；作为全局变量给多实例用复用
 const __naslStdlibFileCacheMap: Map<tsProtocol.OpenRequestArgs['file'], tsProtocol.OpenRequestArgs> = new Map();
 
+/**
+ * 业务组件先特殊处理一下
+ * 获取业务组件的位置信息
+ */
+function getBusinessComponentPos(fileNode: BaseNode) {
+  if (fileNode.concept === 'BusinessComponent') {
+    const sourceMap = fileNode?.sourceMap?.get(fileNode);
+    if (sourceMap) {
+      const { start } = sourceMap;
+      return {
+        ...start,
+      }
+    }
+  }
+}
+
 // 联合类型切割取出类型
 export function getDisplayString2Type(displayString: string) {
   const targetString = displayString.match(/value:\s(\S+)\)/)?.[1];
@@ -206,6 +223,8 @@ const timeZoneArgumentIndexMap = new Map<string, number>([
   ['GetSpecificDaysOfWeek', 3]
 ])
 
+const allComponent: any = {}
+
 @sentryMonitorNaslServer
 class NaslServer {
   /** naslStdlib文件缓存 */
@@ -352,20 +371,47 @@ class NaslServer {
     this.worker.terminate();
   }
 
-  async createUiTs(allComponent: any) {
+  async createUiTs(components: any, optinos: { tsCode: string, baseComponnets: Record<string, any> }) {
+    const { tsCode, baseComponnets } = optinos;
+    // console.log('baseComponnets', baseComponnets);
+
+    Object.assign(allComponent, components)
     const { code, elementsLogic } = await formatUiTs(allComponent);
-    // 放入生產的uits文件
+
     await this.addFile(
       {
         file: 'nasl.ui.definition.ts',
+        // eslint-disable-next-line import/no-webpack-loader-syntax, global-require, import/extensions
+        fileContent: require('!!raw-loader!../../sandbox/stdlib/nasl.ui.definition.ts').default,
+      },
+      { cache: true }
+    )
+
+    // 放入生產的uits文件
+    await this.addFile(
+      {
+        file: 'nasl.ui.extra.ts',
         fileContent: code,
       },
       { cache: true }
     );
+
+    // 添加基础组件的方法到elementsLogic
+    Object.assign(elementsLogic, createEleLogins(baseComponnets));
+
+    // 基础组件
+    await this.addFile(
+      {
+        file: 'nasl.ui.component.ts',
+        fileContent: tsCode,
+      },
+      { cache: true }
+    )
+
     Object.keys(naslStdlibMap).forEach(async (libFileName: string) => {
       await this.addFile(
         {
-          file: `/${  libFileName}`,
+          file: `/${libFileName}`,
           fileContent: naslStdlibMap[libFileName],
         },
         { cache: true }
@@ -617,7 +663,7 @@ class NaslServer {
     }
     /// #if process.env.NODE_ENV === 'development'
     // 首次尝试请求
-    await axios.post('/api/App/debugEmbedded?id=' + app.id, openFiles[0]).catch(() => (this.openDebugEmbedded = false));
+    await axios.post(`/api/App/debugEmbedded?id=${  app.id}`, openFiles[0]).catch(() => (this.openDebugEmbedded = false));
     if (this.openDebugEmbedded && globalThis.window) {
       // For TS build
       try {
@@ -762,6 +808,9 @@ class NaslServer {
       const flag = displayString.includes('<') && displayString.includes('>');
       const types = /<([^()]+)>/g.exec(displayString);
       let typeStr = types && types[1];
+      // 从 {entity1:Entity1(defaultDS);},unknown,unknown,unknown 取出{entity1:Entity1(defaultDS);}
+      typeStr = typeStr?.split(',')[0];
+
       if (flag) {
         // 自定义结构的展示
         if (typeStr.includes('__name: "AStructure_')) {
@@ -1574,10 +1623,12 @@ class NaslServer {
    * 是否符合 触发器规则
    * 规则：
    * 1. 入参仅有一个，且必须为string类型
+   * 2. 不允许有返回值
    */
   isTriggerRule(fileNode: BaseNode): boolean {
     const { sourceMap } = fileNode;
     let paramsLength = 0;
+    let returnLength = 0;
     let flag = true;
     sourceMap.forEach((_, k) => {
       if (k instanceof Param) {
@@ -1589,8 +1640,11 @@ class NaslServer {
           flag = false;
         }
       }
+      if (k instanceof Return)  {
+        returnLength ++;
+      }
     });
-    return paramsLength === 1 && flag;
+    return paramsLength === 1 && flag && returnLength === 0;
   }
 
   /**
@@ -1717,7 +1771,7 @@ class NaslServer {
             const isDuplicate = yield* self._isDuplicateCoreType(typeAnnotation)
             if (isDuplicate) {
                 const diagnostic = {
-                  node: node,
+                  node,
                   severity: 'error',
                   message: `变量 ${node.name} 类型定义包含相同的数据类型`,
                 };
@@ -2082,56 +2136,12 @@ class NaslServer {
     }
     else if (fileNode instanceof Logic || fileNode instanceof OverriddenLogic) {
       const { isRefedByTrigger, fRefName } = yield this.isRefedByTriggerAndReturnFirstRef(fileNode);
-      if (fileNode instanceof Logic && fileNode?.exportInterface) {
-        let isSame = true;
-        const itf = (fileNode.exportInterface as Interface);
-        const { params: logicParams, returns: logicReturns } = fileNode;
-        const { params: itfParams, returns: itfReturns } = itf;
-        if (logicParams?.length !== itfParams?.length || logicReturns?.length !== itfReturns?.length) {
-          isSame = false;
-        }
-        if (isSame && logicParams?.length === itfParams?.length) {
-          const logicParamMap = logicParams?.reduce<Record<string, TypeAnnotation>>((acc, param) => {
-            acc[param.name] = param.typeAnnotation
-            return acc
-          }, {})
-          itfParams.forEach((param: InterfaceParam) => {
-            const logicParam = logicParamMap?.[param.name]
-            if (!logicParam) {
-              isSame = false;
-              return;
-            } else if (!logicParam.isSame(param.typeAnnotation)) {
-              isSame = false;
-              return;
-            }
-          });
-        }
-        if (isSame && logicReturns?.length === itfReturns?.length && logicReturns?.length > 0) {
-          if (logicReturns[0].name !== itfReturns[0].name) {
-            isSame = false;
-          } else if (!logicReturns[0]?.typeAnnotation.isSame(itfReturns[0]?.typeAnnotation)) {
-            isSame = false;
-          }
-        }
-        if (!isSame) {
-          const diagnostic = {
-            node: fileNode,
-            severity: 'error',
-            message: `逻辑已变更，请确认请求类型无误后重新导出${'${event}'}`,
-            events: [{
-              key: 'exportInterface',
-              label: '接口配置',
-              params: fileNode,
-            }]
-          };
-          diagnostics.push(diagnostic);
-        }
-      }
+
       if (isRefedByTrigger && !this.isTriggerRule(fileNode)) {
         const diagnostic = {
           node: fileNode,
           severity: 'error',
-          message: `${fileNode.name} 已被Kafka消息订阅配置 ${fRefName} 引用，该逻辑入参只有一个入参，且入参类型为string，否则会导致无法接收Kafka消息`,
+          message: `${fileNode.name} 已被Kafka消息订阅配置 ${fRefName} 引用：该逻辑入参只有一个入参，入参类型为string；且不允许存在返回值。否则会导致无法接收Kafka消息`,
         };
         diagnostics.push(diagnostic);
       }
@@ -2199,7 +2209,7 @@ class NaslServer {
             const isDuplicate = yield* self._isDuplicateCoreType(typeAnnotation)
             if (isDuplicate) {
               const diagnostic = {
-                node: node,
+                node,
                 severity: 'error',
                 message: `${nodeTypeName} ${node.name} 类型定义包含相同的数据类型`,
               };
@@ -2215,7 +2225,7 @@ class NaslServer {
             const isDuplicate = yield* self._isDuplicateCoreType(typeAnnotation)
             if (isDuplicate) {
               const diagnostic = {
-                node: node,
+                node,
                 severity: 'error',
                 message: `输入参数 ${node.name} 类型定义包含相同的数据类型`,
               };
@@ -2291,7 +2301,7 @@ class NaslServer {
             if (new Decimal(maxVal).lessThan(minVal)) {
               const errorMsg = '最小值不得大于最大值';
               const diag: any = {
-                node: node,
+                node,
                 severity: 'warning',
                 message: errorMsg,
               };
@@ -2353,6 +2363,7 @@ class NaslServer {
 
     return flag
   }
+
   checkNodeError(node: BaseNode, diagnostics: Diagnostic[]): any {
     if (!node) return;
     // 如果节点是match的看看节点里是不是有重复的
@@ -2491,12 +2502,21 @@ class NaslServer {
         const diagnostic = {
           node,
           severity: 'error',
-          message: `ForEac1：循环列表：参数类型不匹配！结束值自动推导失败。`,
+          message: `ForEach：循环列表：参数类型不匹配！结束值自动推导失败。`,
         };
         node.tsErrorDetail = diagnostic;
         diagnostics.push(diagnostic);
       }
     }
+    if ((node instanceof OqlQueryComponent || node instanceof SqlQueryComponent) && node.parentNode instanceof Paginate && node.parentKey === 'list' && (node as any).codeSourceMap && (node as any).codeSourceMap.containsLimit) {
+        const diagnostic = {
+          node,
+          severity: 'error',
+          message: `SQL 查询已包含分页，请去除 SQL 查询中的 LIMIT 语句。`,
+        };
+        node.tsErrorDetail = diagnostic;
+        diagnostics.push(diagnostic);
+    }
     /**
      * 如果节点是内置函数
      * 穷举在线上的情况，不在线上就void报错， callinterface 因为原来有报错，所以就忽略掉
@@ -2753,11 +2773,9 @@ class NaslServer {
               // 找到的内容的开始位置， 要大于申明内容开始的位置，要不就不包含在内了
               if (diagnostic.start.offset - item.start.character <= diagnostic.start.offset - minRange.item.start.character) {
                 minRange = { node, item };
-              } else {
-                if (diagnostic.start.offset < lsp2tspNumber(minRange.item.start.character)) {
+              } else if (diagnostic.start.offset < lsp2tspNumber(minRange.item.start.character)) {
                   minRange = { node, item };
                 }
-              }
             } else if (item.end.line - item.start.line <= minRange.item.end.line - minRange.item.start.line) {
               // 行都一致 ，比较列
               if (minRange.item.start.line === item.start.line && minRange.item.end.line === item.end.line) {
@@ -2974,7 +2992,7 @@ class NaslServer {
 
     if (node instanceof Return) {
       // 过滤一下最后出去的值
-      refsList = refsList.filter((item) => !item.lineText.includes('return '));
+      refsList = refsList.filter((item) => !item.lineText.includes(`return ${node.name};`));
     }
 
     // 如果是参数, 就需要把logic的引用 都查找出来就需要把他的父级的引用全部查找出来
@@ -4138,6 +4156,7 @@ class NaslServer {
           'QueryFieldExpression',
           'QueryGroupByExpression',
           'Param',
+          'Paginate',
           'BackendVariable',
           'CallAuthInterface',
         ].includes(node.concept)
@@ -4177,7 +4196,7 @@ class NaslServer {
           const lastLen = codeArr?.[codeArr.length - 1]?.length;
           // MemberExpression取最后一位当做类型
           const indexOf = code.length - lastLen;
-          fileDetail.offset = fileDetail.offset + indexOf;
+          fileDetail.offset += indexOf;
         }
       } else if (node.concept === 'Match') {
         const code = getCode(item);
@@ -4431,8 +4450,12 @@ class NaslServer {
           (matchExpression instanceof Identifier || matchExpression instanceof MemberExpression)
         ) {
           const { currentSource, fileNode } = matchExpression?.getCurrentSource();
+          const currentCode = this.getNodeCode(fileNode, currentSource);
+
           fileNode.sourceMap.forEach((item, itemNode) => {
-            if (itemNode.concept === matchExpression.concept && isSameRange(item, currentSource)) {
+            const itemCode = this.getNodeCode(fileNode, item);
+
+            if (itemNode.concept === matchExpression.concept && itemCode === currentCode) {
               const jsonNode = jsoner.queryNodeByPath(json, itemNode.getNodePath(false));
               jsonNode.typeAnnotation = matchExpression.__TypeAnnotation;
             }
@@ -4596,6 +4619,29 @@ class NaslServer {
     const result = await this._getTypeStrFull(args);
     return result;
   }
+  /**
+   * 满足一些条件，不去查找依赖去check
+   * @param fileNode 当前删除节点的文件级别节点
+   * @param targetNode 当前操作的节点
+   */
+  noFileRefCheck(fileNode: BaseNode, targetNode: BaseNode, action: string) {
+    // true 标示不check， false标示要check
+    // 页面下的内容大部分都不用check，其余节点都check
+    let flag = false;
+    if (fileNode instanceof View) {
+      // 页面下大部分节点都不用去check
+      flag = true;
+      if (targetNode instanceof Param && targetNode.parentNode instanceof View) {
+        // 如果变换的是参数而且是页面参数，就去check别的
+        flag = false;
+      } else if (targetNode === fileNode && action !== 'update') {
+        // 如果是页面本身在修改，但是不是更新自身属性（比如添加删除页面）
+        flag = false;
+      }
+    }
+    console.log(flag, 111)
+    return flag;
+  }
 
   /**
    * 处理删除节点
@@ -4610,11 +4656,13 @@ class NaslServer {
      * 删除节点中的一个内容,删除了以后，就查一下引用的地方一起查一下异常
      */
     let outputFiles: any = [];
+    // 先特殊处理业务组件
+    const pos = getBusinessComponentPos(fileNode);
     // 删除之前先查一下内容的依赖
     const newRefs = await this.references({
       file: result.filePath,
-      line: EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
-      offset: EmbeddedTSFileOffsetMap[fileNode.concept] ?? 6,
+      line: pos?.line ?? EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
+      offset: pos?.offset ?? EmbeddedTSFileOffsetMap[fileNode.concept] ?? 6,
     });
     // 如果是要删除的内容，就是当前的file节点，要关闭当前文件，就把内容置为空
     if (fileNode === targetNode) {
@@ -4634,6 +4682,10 @@ class NaslServer {
     // 更新文件之后
     await this.updateFiles({ outputFiles });
 
+    if (this.noFileRefCheck(fileNode, targetNode, 'delete')) {
+      this.filesToCheck.add(result.filePath);
+      return;
+    };
     newRefs.refs.forEach((ref) => this.filesToCheck.add(ref.file));
   }
 
@@ -4649,12 +4701,18 @@ class NaslServer {
     const outputFiles = [{ file: result.filePath, fileContent: result.code }];
     // 创建和更新都用update，内部会做判断
     await this.updateFiles({ outputFiles });
+    // 先特殊处理业务组件
+    const pos = getBusinessComponentPos(fileNode);
 
+    if (this.noFileRefCheck(fileNode, targetNode, action)) {
+      this.filesToCheck.add(result.filePath);
+      return;
+    }
     // 查一下新函数名的依赖
     const newRefs = await this.references({
       file: result.filePath,
-      line: EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
-      offset: EmbeddedTSFileOffsetMap[fileNode.concept] ?? 6,
+      line: pos?.line ?? EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
+      offset: pos?.offset ?? EmbeddedTSFileOffsetMap[fileNode.concept] ?? 6,
     });
 
     const files = new Set();
@@ -4699,12 +4757,13 @@ class NaslServer {
 
       // 修改名字新的添加进去，旧的置为空
       outputFiles.unshift({ file: oldFilePath, fileContent: '' });
-
+      // 先特殊处理业务组件
+      const pos = getBusinessComponentPos(fileNode);
       // 查一下旧文件名的依赖
       const oldRefs = await this.references({
         file: oldFilePath,
-        line: EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
-        offset: EmbeddedTSFileOffsetMap[fileNode.concept] ?? 6,
+        line: pos?.line ?? EmbeddedTSFileLineMap[fileNode.concept] ?? 2,
+        offset: pos?.offset ?? EmbeddedTSFileOffsetMap[fileNode.concept] ?? 6,
       });
       oldRefs.refs.forEach((ref) => this.filesToCheck.add(ref.file));
       this.filesToCheck.delete(oldFilePath);
@@ -4889,12 +4948,12 @@ class NaslServer {
     if (Object.keys(object || {}).length === 1 && Object.keys(oldObject).length === 1) {
       if (object.i18nKey && !oldObject.i18nKey) {
         return;
-      } else if (object.i18nInfo && !oldObject.i18nInfo) {
+      } if (object.i18nInfo && !oldObject.i18nInfo) {
         return;
-      } else if (!object.i18nKey && oldObject.i18nKey) {
+      } if (!object.i18nKey && oldObject.i18nKey) {
         // 撤销重做 也跳过更新
         return;
-      } else if (!object.i18nInfo && oldObject.i18nInfo) {
+      } if (!object.i18nInfo && oldObject.i18nInfo) {
         // 撤销重做 也跳过更新
         return;
       }
@@ -5001,6 +5060,9 @@ class NaslServer {
    */
   static getPropertyNames(fileNode: Connection|Connector) {
     const names: string[] = [];
+    if (!isConnection(fileNode) && !isConnector(fileNode)) {
+      return names;
+    }
     // TODO 如果不存在对应的 Connector 时，应该提示错误
     if (fileNode) {
       fileNode.properties.forEach((property) => {

package/src/server/translator.ts

@@ -52,6 +52,7 @@ import {
   NewList,
   NewComposite,
   ValidationRule,
+  Paginate,
 } from '../concepts';
 import { SourceMapItem } from '../translator';
 import { Diagnostic } from '../manager/diagnostic';
@@ -324,11 +325,11 @@ const TS_RULES: Array<{
     re: /Unreachable code detected\./,
     result: '逻辑中有未使用的。',
   },
-  {
-    re: /Property '__slice' does not exist on type '(.+?)'/,
-    result: 'ForEach：循环列表：参数类型不匹配！所需类型：数组、集合等，提供类型：$1',
-    transforms: [transformType],
-  },
+  // {
+  //   re: /Property '__slice' does not exist on type '(.+?)'/,
+  //   result: 'ForEach：循环列表：参数类型不匹配！所需类型：数组、集合等，提供类型：$1',
+  //   transforms: [transformType],
+  // },
   {
     re: /Property '(.+?)' does not exist on type 'typeof (.+?)'/,
     result: '找不到$2 $1。',
@@ -457,6 +458,11 @@ Object.keys(NAMESPACE_CONCEPT_MAP).forEach((key) => {
 });
 
 export function translateDiagnosticMessage(message: string) {
+  // 业务组件先处理
+  const businessComponent = /Namespace 'app.frontendTypes.(.+?).businessComponents' has no exported member '(.+?)'./.exec(message);
+  if (businessComponent?.[1] && businessComponent?.[2]) {
+    return `找不到${businessComponent?.[1]}端下的业务组件${businessComponent?.[2]}`;
+  }
   for (const rule of TS_RULES) {
     const cap = rule.re.exec(message);
     if (cap) {
@@ -488,6 +494,8 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
       return null;
     } else if (text.startsWith(`Function expression, which lacks return-type annotation, implicitly has an 'any[]' return type.`)) {
       return null;
+    } else if (/Property 'businessComponents' does not exist on type 'typeof (pc|h5)'./.exec(text)) {
+      return null;
     }
   }
   // 处理bindevent参数没传递的报错
@@ -593,6 +601,16 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
       }
     }
   }
+  if (/Property '__slice' does not exist on type '(.+?)'/.exec(text)) {
+    const cap = /Property '__slice' does not exist on type '(.+?)'/.exec(text)
+    if (cap) {
+      if (node instanceof ForEachStatement) {
+        tsErrorDetail.message = `ForEach：循环列表：参数类型不匹配！所需类型：数组、集合等，提供类型：$1`.replace(/\$(\d+)/g, (m, index) => transformType(cap[index]));
+      } else if (node instanceof Paginate) {
+        tsErrorDetail.message = `分页：分页对象类型不匹配！所需类型：数组、集合等，提供类型：$1`.replace(/\$(\d+)/g, (m, index) => transformType(cap[index]));
+      }
+    }
+  }
   if (node instanceof Argument || node instanceof Anchor) {
     // if (/Type '(.+?)' is not assignable to type '(.+?)'./.exec(text)) {
     // }

package/src/service/storage/init.ts

@@ -381,7 +381,7 @@ const handleAIPoint = (app: any, actionItem: any) => {
   if (actionMsg.includes('自然语言生成代码') && !action) {
     aiExecuted += 1;
     // eslint-disable-next-line prefer-destructuring
-    sessionPath = actionMsg.match(/:(.*)/)[1];
+    sessionPath = actionMsg?.match(/:(.*)/)?.[1];
   }
 }
 
@@ -421,7 +421,7 @@ async function doAction(app: any, actionItem: any) {
   let hasBackEnd = false;
   const actionList: any[] = [];
   const allRiskList: any[] = [];
-  const { list, actionMsg, action } = actionItem || {};
+  const { list, actionMsg, action, extra} = actionItem || {};
   handleAIPoint(app, actionItem);
   const itemloop = (_i: LogicItem, app: any, diffArr: string[]) => {
     const _l = getStatement(_i, app, diffArr);
@@ -559,17 +559,19 @@ async function doAction(app: any, actionItem: any) {
           }
           hasFrontEnd = true;
         }
-          if (emitTarget.concept === 'ViewElement') {
-            if ("authDescription" in (event?.originEvent?.object || {})) {
+        if (emitTarget.concept === 'ViewElement') {
+          if(event?.originEvent?.action === 'update' || event?.originEvent?.action === 'delete'){
+            if ('authDescription' in (event?.originEvent?.object ?? {})) {
               hasBackEnd = true;
-            } ;
+            }
+          }
           if (event?.originEvent?.object?.name) {
             const bindDirective = (emitTarget as ViewElement).bindDirectives.find(
               (item: BindDirective) => item.name === 'auth'
             )
             if (bindDirective) {
               hasBackEnd = true;
-        }
+            }
           }
           if (event?.originEvent?.action === 'delete') {
             const bindDirective = (emitTarget as ViewElement)?.bindDirectives?.find(
@@ -683,6 +685,7 @@ async function doAction(app: any, actionItem: any) {
     }
     app._historyList.push({
       actionMsg,
+      extra: extra,
       list: list.map((item: any) => item?.originEvent),
     });
     app._historyIndex = app._historyList.length;
@@ -822,7 +825,7 @@ class TaskQueue {
     }));
     await storageService.saveFrontendNasl({
       body: {
-        nasl: app?.toJSON(),
+        nasl: app?.toJSON?.(),
         failedQueue,
         queue,
         errorInfo: options.errorInfo,
@@ -831,7 +834,7 @@ class TaskQueue {
       console.log('备份 nasl 失败：', err);
     });
     this.clear();
-    app.emit('refresh');
+    app?.emit?.('refresh');
   }
 
   recover(app: App) {
@@ -1000,6 +1003,7 @@ export interface ProxyApp extends App {
   _noTimer: NodeJS.Timeout;
   _actionMsg: string;
   _action: string;
+  _extra?: any;
   naslServer: NaslServer;
 }
 
@@ -1048,6 +1052,7 @@ export function handleApp(app: ProxyApp) {
     if (!proxyApp._isCollectingCount) {
       proxyApp._actionMsg = event?.actionMsg;
       proxyApp._action = event?.action;
+      proxyApp._extra = event?.extra;
     }
     proxyApp._isCollectingCount++;
   });
@@ -1066,6 +1071,7 @@ export function handleApp(app: ProxyApp) {
       const collectingList = proxyApp._collectingList;
       const actionMsg = proxyApp._actionMsg;
       const action = proxyApp._action;
+      const extra = proxyApp._extra;
       proxyApp._collectingList = [];
       proxyApp._actionMsg = '';
       proxyApp._action = '';
@@ -1079,6 +1085,7 @@ export function handleApp(app: ProxyApp) {
           list: collectingList,
           actionMsg,
           action,
+          extra
         });
       }
     } else if (proxyApp._isCollectingCount < 0) {