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

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 {
             // 结束诊断和标注
@@ -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,7 +2205,7 @@ class NaslServer {
       }
     }
     else if (fileNode instanceof Logic || fileNode instanceof OverriddenLogic) {
-      const { isRefedByTrigger, fRefName } = yield this.isRefedByTriggerAndReturnFirstRef(fileNode);
+      const { isRefedByTrigger, fRefNames } = yield this.isRefedByTriggerAndReturnFirstRef(fileNode);
       if (fileNode instanceof Logic && fileNode?.exportInterface) {
         let isSame = true;
         const itf = (fileNode.exportInterface as Interface);
@@ -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?.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,11 @@ 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 (releaseFlag) {
       // 全量标注后对json进行一些修改，为了服务端翻译处理
@@ -5076,9 +5108,7 @@ class NaslServer {
   }
 
   async receiveHandleChange($event: EventPayload) {
-    if (!this.performance) {
-      invokeCommand('naslServer:startWork');
-    }
+    invokeCommand('naslServer:startWork');
 
     this.logger.time('语言服务变更');
     this.singleFileChangeIng = true;
@@ -5132,6 +5162,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 +5223,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;
           }

package/src/utils/index.ts

@@ -1,6 +1,6 @@
 import { compare } from 'compare-versions';
 import { BaseNode, LogicItem, AnonymousFunction, Param } from '..';
-import type { ForEachStatement, Logic, View } from '..';
+import type { ForEachStatement, Logic, TypeAnnotation, View } from '..';
 import * as types from '../concepts/utils/types';
 import { getConceptPropertyMap } from '../decorators/index';
 import { traverse } from './traverse';
@@ -447,3 +447,38 @@ export function hasParamNameOfAnonymousFunction({
   const paramNames = new Set([...ancestorParamNames.values(), ...anonymousFnNodesParams.values()]);
   return paramNames.has(newName);
 }
+
+/**
+ * 目标类型列表是否和源类型列表一致
+ */
+export function isSameInType(source: TypeAnnotation[], target: TypeAnnotation[]): boolean {
+  if (source?.length !== target?.length) {
+    return false;
+  }
+  let flag = true;
+  source.forEach((item, index) => {
+    let { typeKind: sTypeKind, typeName: sTypeName, typeNamespace: sTypeNamespace } = item || {};
+    let { typeKind: tTypeKind, typeName: tTypeName, typeNamespace: tTypeNamespace } = target[index] || {};
+    // 范型不需要做对比
+    // 范型目前处理为string
+    if (sTypeKind === 'typeParam' || tTypeKind === 'typeParam') {
+      if (sTypeKind === 'typeParam') {
+        sTypeKind = 'primitive';
+        sTypeName = 'String';
+        sTypeNamespace = 'nasl.core';
+      }
+      if (tTypeKind === 'typeParam') {
+        tTypeKind = 'primitive';
+        tTypeName = 'String';
+        tTypeNamespace = 'nasl.core';
+      }
+      if (sTypeKind !== tTypeKind || sTypeName !== tTypeName || sTypeNamespace !== tTypeNamespace) {
+        flag = false;
+      }
+    }
+    if (sTypeKind !== tTypeKind || sTypeName !== tTypeName || sTypeNamespace !== tTypeNamespace) {
+      flag = false;
+    }
+  });
+  return flag;
+}

package/ts-worker/src/index.js

@@ -234,7 +234,7 @@ const context = {
                 console.error(e);
         }
     },
-    publishDiagnostics(remain) {
+    publishDiagnostics(remain, versions) {
         webHost.diagnosticRecords = [];
         for (let i = 0; i < remain; i++) {
           try {
@@ -250,6 +250,7 @@ const context = {
         this.messager.sendData({
           event: 'publishDiagnostics',
           records: webHost.diagnosticRecords,
+          versions
         });
     },
     geterr(files = []) {
@@ -257,7 +258,7 @@ const context = {
         //     count++;
         // }, 10)
     },
-    getDiagnosticRecords(filePaths = this.system.readDirectory('/embedded')) {
+    getDiagnosticRecords(filePaths = this.system.readDirectory('/embedded'), versions = []) {
         this._clearTimeout();
         this.session.executeCommand({
             seq: seq++,
@@ -271,7 +272,7 @@ const context = {
         webHost.diagnosticRecords = [];
         // this._reduceDiagnosticQueue(filePaths.length);
         // return webHost.diagnosticRecords;
-        this.publishDiagnostics(filePaths.length);
+        this.publishDiagnostics(filePaths.length, versions);
         return [];
     },
     fileReferences(filePath) {