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

package/out/server/naslServer.js

@@ -174,10 +174,17 @@ let NaslServer = NaslServer_1 = 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_threads_1.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_threads_1.Worker(url);
+                return worker;
+            };
+            this.worker = createWorker(source);
+        }
         /// #endif
         this.http = opt.http;
         this.logger = opt.logger ?? utils.internalLogger;
@@ -195,7 +202,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             getSender: () => this.worker,
             handleMessage: async ({ data }) => {
                 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 {
                         // 结束诊断和标注
@@ -388,7 +395,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         yield* getTsFiles(processes, 'process');
         if (module instanceof concepts_1.Connector) {
             yield* getTsFiles(triggerLaunchers, 'triggerLauncher');
-            yield* getTsFiles(authLogicsForCallInterface, 'authLogicForCallInterface');
+            // yield* getTsFiles(authLogicsForCallInterface, 'authLogicForCallInterface');
             yield* getTsFiles(concat(namespaces, 'logics'), 'namespaces_logic');
         }
         if (module instanceof concepts_1.App) {
@@ -414,6 +421,10 @@ let NaslServer = NaslServer_1 = class NaslServer {
             file: result.filePath,
             fileContent: result.code,
         }));
+        // 全量生成TS文件，因此清空版本记录
+        files.forEach((f) => {
+            this.diagnosticManager.deleteVersionByFilePath(f.file);
+        });
         await this.writeFiles(files);
         this._debugInFileStorage(app, files);
         // 修改名称回调
@@ -430,6 +441,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             const otherModules = [
                 ...app.integration?.connectors ?? [],
                 ...app.dependencies ?? [],
+                ...app.connectorDependencies ?? [],
                 ...app.interfaceDependencies ?? [],
             ];
             for (const item of otherModules) {
@@ -497,15 +509,15 @@ let NaslServer = NaslServer_1 = class NaslServer {
         const url = `/proxy/nasl-storage/api/App/debugEmbedded?id=${app.id}`;
         /// #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;
                     }));
                 }
@@ -784,13 +796,11 @@ let NaslServer = NaslServer_1 = class NaslServer {
         return this.messager.requestCommand('getSelectNextCompletion', args);
     }
     getDiagnosticRecordsAndPushAll(fileNames) {
-        // 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);
+        (0, common_1.invokeCommand)('naslServer:startWork');
+        const versions = fileNames?.map((x) => {
+            return this.diagnosticManager.incrementVersionByFilePath(x);
+        });
+        return this.messager.requestCommand('getDiagnosticRecords', fileNames, versions);
     }
     /**
      * 节点异常是只能挂载单个，如果已经了就不赋值了
@@ -800,7 +810,17 @@ let NaslServer = NaslServer_1 = class NaslServer {
             return;
         node.tsErrorDetail = tsErrorDetail;
     }
-    *_resolveDiagnosticRecordsWithGenerator(records) {
+    *_resolveDiagnosticRecordsWithGenerator(records, versions) {
+        // 这个操作几乎没有性能开销，在主线程完成即可
+        // 保证每个文件的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);
@@ -972,8 +992,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
      * @param records 结果
      * @returns 过滤或者转换后的诊断结果
      */
-    _resolveDiagnosticRecords(records) {
-        return utils.timeSlicingWithGenerator(this._resolveDiagnosticRecordsWithGenerator(records));
+    _resolveDiagnosticRecords(records, versions) {
+        return utils.timeSlicingWithGenerator(this._resolveDiagnosticRecordsWithGenerator(records, versions));
     }
     /**
      * 判断是否是Javalogic
@@ -1356,15 +1376,14 @@ let NaslServer = NaslServer_1 = class NaslServer {
         return this._isHaveRef(fileNode).then((refs) => {
             const basePath = concepts_1.TriggerLauncher.getEmbeddedFileBasePath(fileNode.rootNode);
             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]);
                     }
                 }
             }
@@ -1373,7 +1392,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             }
             return {
                 isRefedByTrigger: flag,
-                fRefName,
+                fRefNames,
             };
         });
         // const refs = await this._isHaveRef(fileNode);
@@ -1401,29 +1420,29 @@ let NaslServer = NaslServer_1 = class NaslServer {
     /**
      * 是否符合 触发器规则
      * 规则：
-     * 1. 入参仅有一个，且必须为string类型
-     * 2. 不允许有返回值
      */
-    isTriggerRule(fileNode) {
-        const { sourceMap } = fileNode;
-        let paramsLength = 0;
-        let returnLength = 0;
+    isTriggerRule(fileNode, fRefNames) {
+        const app = fileNode.rootNode;
+        const targetLaunchers = app.triggerLaunchers?.filter((triggerLauncher) => fRefNames.includes(triggerLauncher.name));
         let flag = true;
-        sourceMap.forEach((_, k) => {
-            if (k instanceof concepts_1.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 = [];
+        targetLaunchers?.forEach((triggerLauncher) => {
+            const targetMsgTrigger = triggerLauncher?.connection?.connector?.triggers?.find((trigger) => (0, asserts_1.isMsgTriggerEvent)(trigger.triggerEvent));
+            if (targetMsgTrigger) {
+                const callBackLogic = targetMsgTrigger.triggerEvent.callBackLogic;
+                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 concepts_1.Return) {
-                returnLength++;
-            }
         });
-        return paramsLength === 1 && flag && returnLength === 0;
+        return {
+            isTriggerRule: flag,
+            errorFRefNames,
+        };
     }
     /**
      * 额外的诊断
@@ -1930,8 +1949,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
             }
         }
         else if (fileNode instanceof concepts_1.Logic || fileNode instanceof concepts_1.OverriddenLogic) {
-            const { isRefedByTrigger, fRefName } = yield this.isRefedByTriggerAndReturnFirstRef(fileNode);
-            if (fileNode instanceof concepts_1.Logic && fileNode?.exportInterface) {
+            const { isRefedByTrigger, fRefNames } = yield this.isRefedByTriggerAndReturnFirstRef(fileNode);
+            if (fileNode instanceof concepts_1.Logic && fileNode?.exportInterface && fileNode.calleewholeKey.startsWith('app.logics')) {
                 let isSame = true;
                 const itf = fileNode.exportInterface;
                 const { params: logicParams, returns: logicReturns } = fileNode;
@@ -1960,7 +1979,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     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;
                     }
                 }
@@ -1978,13 +1997,16 @@ let NaslServer = NaslServer_1 = 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, 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]) {
                 if (node instanceof concepts_1.OqlQueryComponent) {
@@ -2527,8 +2549,13 @@ let NaslServer = NaslServer_1 = class NaslServer {
      * @returns 处理后的结果
      */
     *_resolveDiagnosticWithGenerator(diagnostic, fileNode, record) {
+        // 连接器只校验编辑态的连接器
+        if (fileNode?.getAncestor('Connector') && !fileNode.getAncestor('Integration')) {
+            return;
+        }
         // 拓展模块中的翻译先过滤掉，因为有错用户也不能修改
-        if ((fileNode.module || fileNode.connector) && !(fileNode instanceof concepts_1.ConfigProperty)) {
+        // module属性下也可以拿到 connector，所以要过滤掉
+        if ((fileNode.module && fileNode.module.concept !== 'Connector') && !(fileNode instanceof concepts_1.ConfigProperty)) {
             return;
         }
         if (fileNode.concept === 'OverriddenLogic' && diagnostic.text === `'__LogicEmpty' is declared but its value is never read.`) {
@@ -2712,11 +2739,11 @@ let NaslServer = NaslServer_1 = 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 有直接关联的只有两种情况
@@ -4129,6 +4156,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         if (this.changeStackList?.length) {
             throw new Error(`当前还有${this.changeStackList.length}个文件还在执行更新操作`);
         }
+        this.logger.time('全量标注');
         const nodes = [];
         this.file2NodeMap.forEach((fileNode, filePath) => {
             // 先不排除view，传递给后端的时候，去除views下的标注
@@ -4142,11 +4170,13 @@ let NaslServer = NaslServer_1 = 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进行一些修改，为了服务端翻译处理
             this.annotationToJson(typesMap, json);
@@ -4440,7 +4470,10 @@ let NaslServer = NaslServer_1 = class NaslServer {
      * @param result toTs生成的内容
      */
     async handleDelete(fileNode, targetNode, result) {
-        const filePath = fileNode.getEmbeddedFilePath();
+        const filePath = fileNode?.getEmbeddedFilePath();
+        if (!filePath) {
+            return;
+        }
         // 如果要删除，而且当前要删Logic就直接删除并且清除错误
         /**
          * 删除节点中的一个内容,删除了以后，就查一下引用的地方一起查一下异常
@@ -4741,9 +4774,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         }
     }
     async receiveHandleChange($event) {
-        if (!this.performance) {
-            (0, common_1.invokeCommand)('naslServer:startWork');
-        }
+        (0, common_1.invokeCommand)('naslServer:startWork');
         this.logger.time('语言服务变更');
         this.singleFileChangeIng = true;
         // 行为
@@ -4795,6 +4826,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
             this.logger.time('重新生成 TS 文件');
         }
         const fileTsPath = fileNode.getEmbeddedFilePath();
+        // 递增ts文件版本号
+        this.diagnosticManager.incrementVersionByFilePath(fileTsPath);
         const result = await utils.timeSlicingWithGenerator(fileNode.toEmbeddedTSFile());
         if (process.env.NODE_ENV === 'development') {
             this.logger.timeEnd('重新生成 TS 文件');