@lcap/nasl 3.7.0-beta.4 → 3.7.0-beta.6

package/src/natural/prompt/analyzeFormatOutput.ts

@@ -6,7 +6,7 @@ export const analyzeFormatOutput = () => {
       "plan": ["plans"],
       "text": "question",
       "executable": boolean,
-      "moduleIndexList": [index],
+      "requiredIndexes": [index],
       "needQueryRepository": boolean
   }
 }

package/src/natural/prompt/analyzeTasks.ts

@@ -7,9 +7,9 @@ export const analyzeTasks = () => {
 - text: 如果你认为需求不够明确时，可以继续询问用户需求的细节，不可为空
 - executable
   - 类型为 boolean, 如果你认为需求比较明确并且 plan 可执行, 返回 true, 否则返回 false
-- moduleIndexList
+- requiredIndexes
   - 类型为 Array, 你需要根据用户的执行计划，从 Context Definition 中整理出执行需要用到的模块或者方法，返回对应的索引
-  - 用于下一步的具体实施，需要尽可能详细的返回所有和执行计划相关的模块或方法索引。例如："moduleIndexList": ['1','6-3','8-1-1-0']。
+  - 用于下一步的具体实施，需要尽可能详细的返回所有和执行计划相关的模块或方法索引。例如："requiredIndexes": ['1','6-3','8-1-1-0']。
 - needQueryRepository
   - 类型为 boolean, 如果你认为需求相关的上下文信息不足，需要另外查询知识库时, 返回 true, 否则返回 false
 `;

package/src/natural/transformTSCode.ts

@@ -687,11 +687,36 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
         pushElseIf(node, switchStatement);
         return switchStatement;
       }
-      return new naslTypes.IfStatement({
+      let consequentIndex: number;
+      let alternateIndex: number;
+      const naslNode = new naslTypes.IfStatement({
         test: transformLogicNode(node.test),
-        consequent: !node.consequent ? [] : (node.consequent as babelTypes.BlockStatement).body.map((item) => transformLogicNode(item)).filter((item) => !!item),
-        alternate: !node.alternate ? [] : (node.alternate as babelTypes.BlockStatement).body.map((item) => transformLogicNode(item)).filter((item) => !!item),
-      });
+        consequent: !node.consequent ? [] : (node.consequent as babelTypes.BlockStatement).body.map((item: any, index: number) => {
+          if (item?.type === 'ReturnStatement') {
+            item.ends = true;
+            if (item?.argument) {
+              consequentIndex = index;
+            }
+          }
+          return transformLogicNode(item);
+        }).filter((item) => !!item),
+        alternate: !node.alternate ? [] : (node.alternate as babelTypes.BlockStatement).body.map((item: any, index: number) => {
+          if (item?.type === 'ReturnStatement') {
+            item.ends = true;
+            if (item?.argument) {
+              alternateIndex = index;
+            }
+          }
+          return transformLogicNode(item);
+        }).filter((item) => !!item),
+      }) as any;
+      if (consequentIndex !== undefined) {
+        naslNode?.consequent?.splice(consequentIndex + 1, 0, new naslTypes.End());
+      }
+      if (alternateIndex !== undefined) {
+        naslNode?.alternate?.splice(alternateIndex + 1, 0, new naslTypes.End());
+      }
+      return naslNode;
     } else if (node.type === 'WhileStatement') {
       return new naslTypes.WhileStatement({
         test: transformLogicNode(node.test),
@@ -883,6 +908,9 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           right: transformLogicNode(node.argument),
         });
       }
+      if ((node as any)?.ends) {
+        return new naslTypes.End();
+      }
     } else if (node.type === 'EmptyStatement') {
       return node.leadingComments && new naslTypes.Comment({
         value: String(node.leadingComments[0].value),

package/src/server/extendBaseNode.ts

@@ -30,7 +30,7 @@ import { EventPayload, invokeCommand, registerCommand } from '../common';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 
 import { extendSentryMonitorNaslNode } from '../sentry';
-import { ca } from 'date-fns/locale';
+import { isAuthLogicForCallInterface, isParam } from '../concepts/utils/asserts';
 
 interface SetNameNode extends BaseNode {
   setName(name: string): any;
@@ -114,6 +114,23 @@ BaseNode.prototype.nodeFindRefNodes = function nodeFindRefNodes() {
   }
 };
 
+/**
+ * AuthLogicForCallInterface 通过当前节点，查找被引用的节点
+ * 以下面代码为例由于相关文件TS代码翻译的特殊性，
+ * 导致在查找引用的时候是以类型参数为准，而不是实际参数
+ * 此种行为会导致函数体内的参数无法查找到引用
+ * ({par, pa, api}:{    par:     nasl.core.String,     pa:     nasl.core.String, api?: ApiReturn})
+ * 为此需要重新查找一次引用
+ */
+async function extensionRefForAuthLogicForCallInterfaceParams(refsList: any[], node: BaseNode, naslServer: NaslServer) {
+  const target = refsList[0];
+  const newRefs = await naslServer.references({
+    file: refsList[0].file,
+    line: target.start.line,
+    offset: target.start.offset,
+  })
+  return [...newRefs.refs];
+}
 BaseNode.prototype.changeName = async function changeName(newValue: string, updateAll: boolean = false) {
   try {
     /**
@@ -121,7 +138,13 @@ BaseNode.prototype.changeName = async function changeName(newValue: string, upda
      */
     const app = this.getAncestor('App');
     const naslServer = (app as any).naslServer as NaslServer;
-    const refsList = await naslServer._isHaveRef(this);
+    let refsList = await naslServer._isHaveRef(this);
+    // 鉴权方式 参数修改需要协同变更相关参数
+    // 但由于鉴权返回实现TS的特殊性，在查询节点的时候，只会查询类型参数的引用，导致引用查找缺失
+    // 因此需要手动更新一下
+    if (isParam(this) && isAuthLogicForCallInterface(this.parentNode)) {
+      refsList = await extensionRefForAuthLogicForCallInterfaceParams(refsList, this, naslServer);
+    }
     // 是不是有引用有的话，就返回
     /**
      * @param this 当前重命名的节点
@@ -185,8 +208,16 @@ BaseNode.prototype.changeName = async function changeName(newValue: string, upda
             } else {
               if (_this.concept === 'AuthLogicForCallInterface' && itemNode.concept === 'CallAuthInterface') {
                 const { calleewholeKey } = itemNode;
-                const targetItf: AuthInterface = getNodeByNodeCallee(App, calleewholeKey);
-                targetItf.setAuthLogic(newValue);
+                let targetItf: AuthInterface;
+                const connector = itemNode.getAncestor('Connector') as Connector;
+                if (connector) {
+                  targetItf = connector.interfaces?.find((itf: Interface | AuthInterface) => {
+                    return calleewholeKey.endsWith(itf.name);
+                  }) as AuthInterface;
+                } else {
+                  targetItf = getNodeByNodeCallee(App, calleewholeKey)
+                }
+                targetItf?.setAuthLogic?.(newValue);
                 // 需要触发更新，否则对应的ts文件不会更新会导致鉴权方式找不到报错
                 itemNode.update({});
               } else {

package/src/server/formatTsUtils.ts

@@ -231,7 +231,7 @@ function createType2Annotation(type: string, parentPrefix?: string): TypeAnnotat
   }
   return typeAnnotation;
 }
-export function getPlatformType(type: string): string {
+export function getPlatformType(type: string, node?: types.SyntaxNode): string {
   let tsType = '';
 
   if (type?.includes(': ')) {
@@ -241,7 +241,7 @@ export function getPlatformType(type: string): string {
     tsType = type;
   }
   tsType = tsType.replaceAll(' ', '');
-  const namespacePrefix = ['app', 'extensions', 'apis', 'components', 'nasl'];
+  const namespacePrefix = ['app', 'extensions', 'apis', 'components', 'nasl', 'connector'];
   if (tsType === 'String') {
     return 'nasl.core.String';
   } else if (tsType === 'Boolean') {
@@ -253,6 +253,9 @@ export function getPlatformType(type: string): string {
     const first = strTypes[0];
     // 如果不是这几个前缀就加一个namespace
     if (!namespacePrefix.includes(first)) {
+      if (node && (node as any)?.connector) {
+        return `${(node as any)?.connector?.getNamespacePrefix || ''}${tsType}`;
+      };
       return 'app.' + tsType;
     }
   }
@@ -623,7 +626,7 @@ export function formatVariableData(data: unknown | variableItem[], node: types.S
               }
             }
           }
-          typeKey = getPlatformType(currentType);
+          typeKey = getPlatformType(currentType, node);
           item.typeAnnotation = displayString2TypeAnnotation(typeKey);
         }
       } else if (item instanceof StructureProperty || item instanceof EntityProperty) {

package/src/server/getConnector.ts

@@ -1,7 +1,7 @@
-import CallConnector from '../concepts/CallConnector__';
-import { App } from '..';
-import Connector from '../concepts/Connector__';
-import Connection from '../concepts/Connection__';
+import type CallConnector from '../concepts/CallConnector__';
+import type { App } from '..';
+import type Connector from '../concepts/Connector__';
+import type Connection from '../concepts/Connection__';
 
 export function getConnections(node: CallConnector) {
     const app = node?.rootNode as App;
@@ -91,11 +91,11 @@ function notifyTsWorkToUpdateConnections(app: App, connector: Connector) {
 }
 
 export function publishConnector(app: App, connector: Connector) {
-    const dependenciesNames = app.dependencies.map((dep) => dep.name);
+    const dependenciesNames = app.connectorDependencies.map((dep) => dep.name);
     // 已经存在，直接更新
     if (dependenciesNames.includes(connector.name)) {
-        const connectorIndex = app.dependencies.findIndex((dep) => dep.name === connector.name);
-        const oldConnector = app.dependencies[connectorIndex] as Connector;
+        const connectorIndex = app.connectorDependencies.findIndex((dep) => dep.name === connector.name);
+        const oldConnector = app.connectorDependencies[connectorIndex] as Connector;
         app.removeConnector(oldConnector);
         // 由于 CallInterface 会在setTimeout 中处理删除Interface
         // 为了防止误删已经增加的。需要同样做一个延迟操作

package/src/server/getLogics.ts

@@ -147,7 +147,7 @@ function getElementsMethods(likeComponent: View | BusinessComponent, parentNodeN
       }
       const viewElement = new Namespace({
         title: toHump(item.name),
-        logics: eleLogis.filter(e => e).map((item: Logic) => Logic.from(item.toJSON())),
+        logics: eleLogis.filter(e => e?.toJSON).map((item: Logic) => Logic.from(item.toJSON())),
         path,
         originConcept: 'ViewElement',
       });
@@ -185,8 +185,12 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
         pItem.originConcept = 'Process';
         return pItem;
       });
-      const dependencies = app.dependencies; //.filter((d) => d.enable);
-      const extensions = app.dependencies
+      // 连接器 相关迁移到了 conenctorDependencies 下，因此这边需要扩展
+      const dependencies = [
+        ...app.dependencies,
+        ...(app.connectorDependencies || [])
+      ]; //.filter((d) => d.enable);
+      const extensions = [...app.dependencies, ...(app.connectorDependencies || [])]
         .map((dep) => moduleToLogicNamesapce(dep, app.overriddenLogics))
         .filter((item) => item.logics && item.logics.length);
       const dependEntityNs: Namespace[] = [];
@@ -310,10 +314,14 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
                       'getIsMiniApp',
                       'navigateToUserInfo',
                       'getWeChatHeadImg',
+                      'getWeChatLocation',
                       'getWeChatNickName',
                       'getWeChatPhone',
                       'getWeChatOpenid',
                       'navigateToUserPhone',
+                      'navigateToScanCode',
+                      'getWeChatScanCode',
+                      'navigateToLocation'
                     ].includes(item.name)
                 ),
             expanded: false,
@@ -398,7 +406,7 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
             title: '微信',
             logics: getStdlibNamespace()
               .findChild('browser')
-              .logics.filter((item) => ['navigateToUserInfo', 'getWeChatHeadImg', 'getWeChatNickName', 'getWeChatOpenid', 'navigateToUserPhone', 'getWeChatPhone'].includes(item.name)),
+              .logics.filter((item) => ['navigateToUserInfo', 'getWeChatHeadImg', 'getWeChatNickName', 'getWeChatOpenid', 'navigateToUserPhone', 'getWeChatPhone','navigateToScanCode','getWeChatScanCode','navigateToLocation','getWeChatLocation'].includes(item.name)),
             expanded: false,
           })
         );
@@ -469,8 +477,15 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
       result.push(systemTree);
     }
     return result;
-  } else if (node?.concept === 'Identifier') {
-    const extensions = app.dependencies
+  }
+  if (node?.concept === 'Identifier') {
+    // 之前 连接器 Connector 相关也存在与 app.dependencies 下，
+    // 现在迁移到 app.connectorDependencies 下，
+    // 为保证上下游逻辑与之前保持一致，这边做相应的扩展
+    const extensions = [
+      ...app.dependencies,
+      ...(app.connectorDependencies || [])
+    ]
       .map((dep) => moduleToLogicNamesapce(dep, app.overriddenLogics))
       .filter((item) => item.logics && item.logics.length);
     const tree = new Namespace({

package/src/server/naslServer.ts

@@ -92,6 +92,8 @@ import {
   BusinessComponent,
   CallEvent,
   Paginate,
+  MsgTriggerLauncher,
+  ConnectorTrigger,
   FrontendType,
   InterfaceParam,
 } from '../concepts';
@@ -113,7 +115,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';
+import { isConnection, isConnector, isMsgTriggerEvent } from '../concepts/utils/asserts';
 
 const EmbeddedTSFileLineMap: { [name: string]: number } = {
   Entity: 3,
@@ -295,10 +297,17 @@ class NaslServer {
     // worker = new Worker(path.join(__dirname, '../../../src/static/ts-worker.js'));
     /// #endif
     /// #if process.env.BUILD_TARGET !== 'node'
-    if (globalThis.window)
-      // For TS build
-      /* !!!如果改动这里需要看下关联的对应文件：webpack/ts-worker/loader.js */
-      this.worker = new Worker('/ts-worker.js');
+    if (globalThis.window){
+      const source = require('!!raw-loader!../../../../public/ts-worker/1.0.0.js').default;
+      const createWorker = (code = '') => {
+        const content = [code];
+        const bold = new Blob(content);
+        const url = URL.createObjectURL(bold);
+        const worker = new Worker(url);
+        return worker;
+      };
+      this.worker = createWorker(source);
+    }
     /// #endif
 
     this.http = opt.http;
@@ -319,7 +328,7 @@ class NaslServer {
       getSender: () => this.worker as any,
       handleMessage: async ({ data }: any) => {
         if (data && data.event === 'publishDiagnostics') {
-          const records = await this._resolveDiagnosticRecords(data.records);
+          const records = await this._resolveDiagnosticRecords(data.records, data.versions);
           await this.diagnosticManager.pushAll(records);
           try {
             // 结束诊断和标注
@@ -575,7 +584,7 @@ class NaslServer {
 
     if (module instanceof Connector) {
       yield* getTsFiles(triggerLaunchers, 'triggerLauncher');
-      yield* getTsFiles(authLogicsForCallInterface, 'authLogicForCallInterface');
+      // yield* getTsFiles(authLogicsForCallInterface, 'authLogicForCallInterface');
       yield* getTsFiles(concat(namespaces, 'logics'), 'namespaces_logic');
     }
 
@@ -607,6 +616,11 @@ class NaslServer {
       fileContent: result.code,
     }));
 
+    // 全量生成TS文件，因此清空版本记录
+    files.forEach((f)=>{
+      this.diagnosticManager.deleteVersionByFilePath(f.file);
+    });
+
     await this.writeFiles(files);
     this._debugInFileStorage(app, files);
     // 修改名称回调
@@ -624,6 +638,7 @@ class NaslServer {
       const otherModules = [
         ...app.integration?.connectors ?? [],
         ...app.dependencies ?? [],
+        ...app.connectorDependencies ?? [],
         ...app.interfaceDependencies ?? [],
       ];
 
@@ -703,17 +718,17 @@ class NaslServer {
 
     /// #if process.env.NODE_ENV === 'development'
     // 首次尝试请求
-    await this.http.post(url, openFiles[0]).catch(() => (this.openDebugEmbedded = false));
+    await this.http.post(`/proxy/nasl-storage/api/App/debugEmbedded?id=${  app.id}`, openFiles[0]).catch(() => (this.openDebugEmbedded = false));
     if (this.openDebugEmbedded && globalThis.window) {
       // For TS build
       try {
         let canDebug = true;
-        await this.http.post(url, openFiles[0]).catch(() => (canDebug = false));
+        await this.http.post(`/proxy/nasl-storage/api/App/debugEmbedded?id=${  app.id}`, openFiles[0]).catch(() => (canDebug = false));
 
         if (canDebug) {
           await Promise.all(
             openFiles.map(async (file) => {
-              const res = await this.http.post(url, file);
+              const res = await this.http.post(`/proxy/nasl-storage/api/App/debugEmbedded?id=${  app.id}`, file);
               return res.data;
             })
           );
@@ -1012,13 +1027,11 @@ class NaslServer {
   }
 
   getDiagnosticRecordsAndPushAll(fileNames?: Array<string>) {
-    // invokeCommand('naslServer:startWork');
-    // TODO:
-    // const versions = fileNames?.map((x) => {
-    //   return this.diagnosticManager.incrementVersionByFilePath(x);
-    // });
-    // return this.messager.requestCommand('getDiagnosticRecords', fileNames, versions);
-    return this.messager.requestCommand('getDiagnosticRecords', fileNames);
+    invokeCommand('naslServer:startWork');
+    const versions = fileNames?.map((x) => {
+      return this.diagnosticManager.incrementVersionByFilePath(x);
+    });
+    return this.messager.requestCommand('getDiagnosticRecords', fileNames, versions);
   }
 
   /**
@@ -1029,7 +1042,18 @@ class NaslServer {
     node.tsErrorDetail = tsErrorDetail;
   }
 
-  private *_resolveDiagnosticRecordsWithGenerator(records: Array<DiagnosticRecord>) {
+  private *_resolveDiagnosticRecordsWithGenerator(records: Array<DiagnosticRecord>, versions: number[] | undefined) {
+    // 这个操作几乎没有性能开销，在主线程完成即可
+    // 保证每个文件的record的版本正确，防止竞态
+    // 若版本不符合，则忽略此record
+    records = records.filter((x, index) => {
+      const requestVersion = versions?.[index] ?? 0;
+      if (!x.filePath) {
+        return true;
+      }
+      return this.diagnosticManager.getVersionByFilePath(x.filePath) === requestVersion;
+    });
+
     // 热更新类型标注
     if (records.length) {
       yield* this._incrementalAnnotationJSONWithGenerator(records);
@@ -1234,8 +1258,8 @@ class NaslServer {
    * @returns 过滤或者转换后的诊断结果
    */
   @withQueueExecute('diagnostic')
-  private _resolveDiagnosticRecords(records: Array<DiagnosticRecord>) {
-    return utils.timeSlicingWithGenerator(this._resolveDiagnosticRecordsWithGenerator(records));
+  private _resolveDiagnosticRecords(records: Array<DiagnosticRecord>, versions: number[] | undefined) {
+    return utils.timeSlicingWithGenerator(this._resolveDiagnosticRecordsWithGenerator(records, versions));
   }
 
   /**
@@ -1619,20 +1643,19 @@ class NaslServer {
   /** 是否被 触发器依赖, 如果存在，返回第一个触发器对应的名称 */
   isRefedByTriggerAndReturnFirstRef(fileNode: BaseNode): Promise<{
     isRefedByTrigger: boolean;
-    fRefName: string;
+    fRefNames: string[];
   }> {
     return this._isHaveRef(fileNode).then((refs) => {
       const basePath = TriggerLauncher.getEmbeddedFileBasePath(fileNode.rootNode as App);
       let flag = false;
-      let fRefName = '';
+      let fRefNames = [];
       try {
         for (const ref of refs) {
           const { file } = ref;
           if (file.startsWith(basePath)) {
             flag = true;
             // file: /embedded/tttta/triggerLaunchers/订阅配置_asd.ts
-            fRefName = file.split(basePath)[1].split('.')[0];
-            break;
+            fRefNames.push(file.split(basePath)[1].split('.')[0]);
           }
         }
       } catch (error) {
@@ -1640,7 +1663,7 @@ class NaslServer {
       }
       return {
         isRefedByTrigger: flag,
-        fRefName,
+        fRefNames,
       };
     });
     // const refs = await this._isHaveRef(fileNode);
@@ -1669,29 +1692,29 @@ class NaslServer {
   /**
    * 是否符合 触发器规则
    * 规则：
-   * 1. 入参仅有一个，且必须为string类型
-   * 2. 不允许有返回值
    */
-  isTriggerRule(fileNode: BaseNode): boolean {
-    const { sourceMap } = fileNode;
-    let paramsLength = 0;
-    let returnLength = 0;
+  isTriggerRule(fileNode: Logic, fRefNames: string[]) {
+    const app = fileNode.rootNode as App;
+    const targetLaunchers = app.triggerLaunchers?.filter((triggerLauncher) => fRefNames.includes(triggerLauncher.name));
     let flag = true;
-    sourceMap.forEach((_, k) => {
-      if (k instanceof Param) {
-        paramsLength++;
-        const typeAnnotation = k.typeAnnotation || k.__TypeAnnotation;
-        const { typeKind, typeName, typeNamespace } = typeAnnotation || {};
-        const isString = typeKind === 'primitive' && typeName === 'String' && typeNamespace === 'nasl.core';
-        if (!isString) {
+    let errorFRefNames: string[] = [];
+    targetLaunchers?.forEach((triggerLauncher: MsgTriggerLauncher) => {
+      const targetMsgTrigger = triggerLauncher?.connection?.connector?.triggers?.find((trigger: ConnectorTrigger) => isMsgTriggerEvent(trigger.triggerEvent));
+      if (targetMsgTrigger) {
+        const callBackLogic = targetMsgTrigger.triggerEvent.callBackLogic as unknown as TypeAnnotation;
+        const { returnType, typeArguments } = callBackLogic;
+        const sameInReturn = utils.isSameInType(returnType, fileNode.returns?.map((re) => re.typeAnnotation));
+        const sameInParams = utils.isSameInType(typeArguments, fileNode.params?.map((param) => param.typeAnnotation));
+        if (!sameInReturn || !sameInParams) {
           flag = false;
+          errorFRefNames.push(triggerLauncher.name);
         }
       }
-      if (k instanceof Return)  {
-        returnLength ++;
-      }
-    });
-    return paramsLength === 1 && flag && returnLength === 0;
+    })
+    return {
+      isTriggerRule: flag,
+      errorFRefNames,
+    };
   }
 
   /**
@@ -2182,8 +2205,8 @@ class NaslServer {
       }
     }
     else if (fileNode instanceof Logic || fileNode instanceof OverriddenLogic) {
-      const { isRefedByTrigger, fRefName } = yield this.isRefedByTriggerAndReturnFirstRef(fileNode);
-      if (fileNode instanceof Logic && fileNode?.exportInterface) {
+      const { isRefedByTrigger, fRefNames } = yield this.isRefedByTriggerAndReturnFirstRef(fileNode);
+      if (fileNode instanceof Logic && fileNode?.exportInterface && fileNode.calleewholeKey.startsWith('app.logics')) {
         let isSame = true;
         const itf = (fileNode.exportInterface as Interface);
         const { params: logicParams, returns: logicReturns } = fileNode;
@@ -2210,7 +2233,7 @@ class NaslServer {
         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)) {
+          } else if (!(logicReturns[0]?.typeAnnotation ?? logicReturns[0]?.__TypeAnnotation)?.isSame?.(itfReturns[0]?.typeAnnotation)) {
             isSame = false;
           }
         }
@@ -2228,13 +2251,16 @@ class NaslServer {
           diagnostics.push(diagnostic);
         }
       }
-      if (isRefedByTrigger && !this.isTriggerRule(fileNode)) {
-        const diagnostic = {
-          node: fileNode,
-          severity: 'error',
-          message: `${fileNode.name} 已被Kafka消息订阅配置 ${fRefName} 引用：该逻辑入参只有一个入参，入参类型为string；且不允许存在返回值。否则会导致无法接收Kafka消息`,
-        };
-        diagnostics.push(diagnostic);
+      if (isRefedByTrigger) {
+        const { isTriggerRule, errorFRefNames } = this.isTriggerRule(fileNode as Logic, fRefNames);
+        if (!isTriggerRule) {
+          const diagnostic = {
+            node: fileNode,
+            severity: 'error',
+            message: `${fileNode.name} 已被消息订阅配置 ${errorFRefNames.join(',')} 引用，但出入参数类型不匹配，或数量不一致`,
+          };
+          diagnostics.push(diagnostic);
+        }
       }
 
       yield* utils.wrapIteratorToGenerator(fileNode.sourceMap.entries(), function* wrapIterator([node, value]) {
@@ -2780,8 +2806,14 @@ class NaslServer {
    * @returns 处理后的结果
    */
   private *_resolveDiagnosticWithGenerator(diagnostic: tsProtocol.DiagnosticWithFileName, fileNode: FileNode, record: DiagnosticRecord) {
+    // 连接器只校验编辑态的连接器
+    if (fileNode?.getAncestor('Connector') && !fileNode.getAncestor('Integration')) {
+      return;
+    }
+
     // 拓展模块中的翻译先过滤掉，因为有错用户也不能修改
-    if (((fileNode as any).module || (fileNode as any).connector) && !(fileNode instanceof ConfigProperty)) {
+    // module属性下也可以拿到 connector，所以要过滤掉
+    if (((fileNode as any).module && (fileNode as any).module.concept !== 'Connector') && !(fileNode instanceof ConfigProperty)) {
       return;
     }
     if (fileNode.concept === 'OverriddenLogic' && diagnostic.text === `'__LogicEmpty' is declared but its value is never read.`) {
@@ -2974,11 +3006,11 @@ class NaslServer {
           refsList = [...refsList, ...newRefs.refs];
         }
       }
-      // 根据 moduleName 中是否存在 dependencies 来判断是否为稳定态的Connector
-      const isStable = moduleName.includes(`/embedded/${appName}/dependencies`);
+      // 根据 moduleName 中是否存在 connectorDependencies 来判断是否为稳定态的Connector
+      const isStable = moduleName.includes(`/embedded/${appName}/connectorDependencies`);
       // 根据 item 的 file 去重
       refsList = refsList.filter((item, index, arr) => {
-        const tempStable = item.file.includes(`/embedded/${appName}/dependencies`); // 约定
+        const tempStable = item.file.includes(`/embedded/${appName}/connectorDependencies`); // 约定
         const isGlobalLogic = item.file.includes(`/embedded/${appName}/logics`); // 约定
         // 关于 isGlobalLogic 单独判断的说明：
         // 全局逻辑与Connector 有直接关联的只有两种情况
@@ -4422,6 +4454,7 @@ class NaslServer {
     if (this.changeStackList?.length) {
       throw new Error(`当前还有${this.changeStackList.length}个文件还在执行更新操作`);
     }
+    this.logger.time('全量标注');
     const nodes: QuickInfoNodes = [];
     this.file2NodeMap.forEach((fileNode, filePath) => {
       // 先不排除view，传递给后端的时候，去除views下的标注
@@ -4435,12 +4468,16 @@ class NaslServer {
         });
       }
     });
-    this.logger.time('全量标注');
     const typesMap = await this.getQuickInfoNodesTypeMap(nodes, true);
-    this.logger.timeEnd('全量标注');
 
     const json = app.toJSON();
-    this.logger.info(json)
+
+    this.logger.timeEnd('全量标注');
+
+    // 测试环境打印数据
+    if (utils.isTestBrowser) {
+      this.logger.info('全量标注数据', json);
+    }
 
     if (releaseFlag) {
       // 全量标注后对json进行一些修改，为了服务端翻译处理
@@ -4771,7 +4808,10 @@ class NaslServer {
    * @param result toTs生成的内容
    */
   async handleDelete(fileNode: BaseNode, targetNode: BaseNode, result: utils.EmbeddedTSFileResult) {
-    const filePath = (fileNode as FileNode).getEmbeddedFilePath();
+    const filePath = (fileNode as FileNode)?.getEmbeddedFilePath();
+    if (!filePath) {
+      return;
+    }
     // 如果要删除，而且当前要删Logic就直接删除并且清除错误
     /**
      * 删除节点中的一个内容,删除了以后，就查一下引用的地方一起查一下异常
@@ -5076,9 +5116,7 @@ class NaslServer {
   }
 
   async receiveHandleChange($event: EventPayload) {
-    if (!this.performance) {
-      invokeCommand('naslServer:startWork');
-    }
+    invokeCommand('naslServer:startWork');
 
     this.logger.time('语言服务变更');
     this.singleFileChangeIng = true;
@@ -5132,6 +5170,10 @@ class NaslServer {
     }
 
     const fileTsPath = fileNode.getEmbeddedFilePath();
+
+    // 递增ts文件版本号
+    this.diagnosticManager.incrementVersionByFilePath(fileTsPath);
+
     const result = await utils.timeSlicingWithGenerator(fileNode.toEmbeddedTSFile());
 
     if (process.env.NODE_ENV === 'development') {
@@ -5189,6 +5231,7 @@ class NaslServer {
             if (process.env.NODE_ENV === 'development') {
               console.info('校验以下文件', Array.from(this.filesToCheck));
             }
+
             await this.getDiagnosticRecordsAndPushAll(Array.from(this.filesToCheck));
             this.filesToCheck.clear();
           }

package/src/service/storage/init.ts

@@ -481,7 +481,7 @@ async function doAction(app: any, actionItem: any) {
         const _path: string = event.originEvent.path;
         const _root = _path.split('.')?.[1] || '';
         const breakabled = isBreakpointEvent(event);
-        if (['backend', 'overriddenLogics', 'dataSources', 'processes', 'roles', 'logics', 'enums', 'structures', 'interfaces', 'interfaceDependencies', 'configuration', 'dependencies', 'authLogics', 'authLogicsForCallInterface', 'triggerLaunchers', 'connections'].some((item) => _root.startsWith(item))) {
+        if (['backend', 'overriddenLogics', 'dataSources', 'processes', 'roles', 'logics', 'enums', 'structures', 'interfaces', 'interfaceDependencies', 'configuration', 'dependencies', 'authLogics', 'authLogicsForCallInterface', 'triggerLaunchers', 'connections', 'connectorDependencies'].some((item) => _root.startsWith(item))) {
           if (!breakabled) {
             hasBackEnd = true;
           }