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

package/out/server/naslServer.js

@@ -54,7 +54,6 @@ const diagnostic_1 = require("../manager/diagnostic");
 const naslStdlibMap_1 = __importDefault(require("./naslStdlibMap"));
 const utils_1 = require("../utils");
 const decorators_1 = require("../decorators");
-const utils_2 = require("../automate/engine/utils");
 const EmbeddedTSFileLineMap = {
     Entity: 3,
 };
@@ -260,7 +259,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         return this.messager.requestCommand('start');
     }
     terminate() {
-        this.worker.terminate();
+        return this.worker.terminate();
     }
     async createUiTs(components, optinos) {
         const { standardUIComponents, // 标准组件（带有ts类型定义文件的组件）
@@ -529,15 +528,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(`/proxy/nasl-storage/api/App/debugEmbedded?id=${app.id}`, openFiles[0]).catch(() => (this.openDebugEmbedded = false));
+        await this.http.post(url, openFiles[0]).catch(() => (this.openDebugEmbedded = false));
         if (this.openDebugEmbedded && globalThis.window) {
             // For TS build
             try {
                 let canDebug = true;
-                await this.http.post(`/proxy/nasl-storage/api/App/debugEmbedded?id=${app.id}`, openFiles[0]).catch(() => (canDebug = false));
+                await this.http.post(url, openFiles[0]).catch(() => (canDebug = false));
                 if (canDebug) {
                     await Promise.all(openFiles.map(async (file) => {
-                        const res = await this.http.post(`/proxy/nasl-storage/api/App/debugEmbedded?id=${app.id}`, file);
+                        const res = await this.http.post(url, file);
                         return res.data;
                     }));
                 }
@@ -548,7 +547,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         }
         /// #endif
         /// #if process.env.BUILD_TARGET === 'node'
-        if (globalThis.process) {
+        if (globalThis.process && process.env.NODE_ENV === 'development') {
             // For TS build
             try {
                 await Promise.all(openFiles.map(async (file) => fs.outputFile(path.join(__dirname, '../debug/apps', app.id, file.file), file.fileContent)));
@@ -2814,7 +2813,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
      * 判断当前CallInterface 对应的 Interface 是否含有鉴权方式
      */
     hasAuth(node) {
-        const tInterface = (0, utils_2.getNodeByNodeCallee)(node.rootNode, node.calleewholeKey);
+        const tInterface = (0, service_1.getNodeByNodeCallee)(node.rootNode, node.calleewholeKey);
         return tInterface instanceof concepts_1.AuthInterface;
     }
     /* 接口导入查找 */
@@ -4596,8 +4595,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         this.logger.time('全量标注');
         const nodes = [];
         this.file2NodeMap.forEach((fileNode, filePath) => {
-            // 先不排除view，传递给后端的时候，去除views下的标注
-            if (!['DataSource', 'Enum', 'Role'].includes(fileNode.concept)) {
+            if (!(0, service_1.isIgnoreAnnotationFileNode)(fileNode)) {
                 fileNode.sourceMap.forEach((item, node) => {
                     nodes.push({
                         filePath,
@@ -4608,26 +4606,49 @@ let NaslServer = NaslServer_1 = class NaslServer {
             }
         });
         const typesMap = await this.getQuickInfoNodesTypeMap(nodes, true);
-        console.time('app toJSON');
+        this.logger.time('app to AnnotatedJSON');
         const jsonMap = new Map();
         const json = app._toJSON((source, instance) => {
             jsonMap.set(instance, source);
             return source;
         });
-        console.timeEnd('app toJSON');
+        this.logger.timeEnd('app to AnnotatedJSON');
         this.logger.timeEnd('全量标注');
         // 测试环境或者是调试模式打印数据
         if (utils.isDebugMode || utils.isTestBrowser) {
             this.logger.info('全量标注数据', json);
         }
         if (releaseFlag) {
-            console.time('annotationToJson');
+            this.logger.time('annotationToJson');
             // 全量标注后对json进行一些修改，为了服务端翻译处理
             this.annotationToJson(typesMap, json, jsonMap);
-            console.timeEnd('annotationToJson');
+            this.logger.timeEnd('annotationToJson');
         }
         return json;
     }
+    /**
+     * 标注指定文件
+     *
+     * @description 会进行 TS 翻译
+     */
+    annotationFiles(fileNodes) {
+        const nodes = [];
+        const files = fileNodes.filter((node) => !(0, service_1.isIgnoreAnnotationFileNode)(node));
+        for (const node of files) {
+            if (!node.sourceMap) {
+                continue;
+            }
+            const filePath = node.getEmbeddedFilePath();
+            node.sourceMap.forEach((item, node) => {
+                nodes.push({
+                    filePath: filePath,
+                    node,
+                    item,
+                });
+            });
+        }
+        return this.getQuickInfoNodesTypeMap(nodes, true);
+    }
     // 增量标注
     *_incrementalAnnotationJSONWithGenerator(records) {
         this.logger.time('增量标注');
@@ -4640,7 +4661,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             }
             record.id = fileNode.id;
             record.node = fileNode;
-            if (['Structure', 'DataSource', 'Entity', 'Enum', 'Role', 'MetadataType'].includes(fileNode.concept) || !fileNode.sourceMap) {
+            if ((0, service_1.isIgnoreAnnotationFileNode)(fileNode)) {
                 return;
             }
             yield* utils.wrapIteratorToGenerator(fileNode.sourceMap.entries(), ([nodeItem, item]) => {
@@ -5203,6 +5224,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 for (let i = 0; i < fileNodeChildren.length; i++) {
                     const fileNodeItem = fileNodeChildren[i];
                     const result = await utils.timeSlicingWithGenerator(fileNodeItem.toEmbeddedTSFile());
+                    // @ts-ignore
                     fileNodeItem.sourceMap = result.sourceMap;
                     if (action === 'create') {
                         await this.handleChange(fileNodeItem, fileNodeItem, result, action);
@@ -5220,6 +5242,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 for (let i = 0; i < fileNodeChildren.length; i++) {
                     const fileNodeItem = fileNodeChildren[i];
                     const result = await utils.timeSlicingWithGenerator(fileNodeItem.toEmbeddedTSFile());
+                    // @ts-ignore
                     fileNodeItem.sourceMap = result.sourceMap;
                     if (action === 'create') {
                         await this.handleChange(fileNodeItem, fileNodeItem, result, action);
@@ -5245,6 +5268,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 for (let i = 0; i < fileNodeChildren.length; i++) {
                     const fileNodeItem = fileNodeChildren[i];
                     const result = await utils.timeSlicingWithGenerator(fileNodeItem.toEmbeddedTSFile());
+                    // @ts-ignore
                     fileNodeItem.sourceMap = result.sourceMap;
                     if (action === 'create') {
                         await this.handleChange(fileNodeItem, fileNodeItem, result, action);
@@ -5381,6 +5405,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 fileContent: result.code,
             },
         ]);
+        // @ts-ignore
         fileNode.sourceMap = result.sourceMap;
         if (action === 'update' || action === 'create') {
             if ($event?.field !== 'name') {