@lcap/nasl 3.1.0-beta.2 → 3.1.0-beta.4

package/out/server/getInterfaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"getInterfaces.js","sourceRoot":"","sources":["../../src/server/getInterfaces.ts"],"names":[],"mappings":";;;AAAA,0BAA0I;AAK1I,SAAS,QAAQ,CAAC,IAAe,EAAE,aAAqB,EAAE,QAAkB;IACxE,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE;QACpB,GAAG,IAAI;KACV,CAAC,CAAC;IACH,IAAI,aAAa,EAAE;QACf,QAAQ,CAAC,QAAQ,GAAG,EAAE,CAAC;QACvB,QAAQ,CAAC,UAAU,GAAG,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,QAAQ,EAAE;YACf,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACxB,MAAM,aAAa,GAAa,EAAE,CAAC;gBACnC,IAAI,QAAQ,CAAC,CAAC,EAAE,aAAa,EAAE,aAAa,CAAC,EAAE;oBAC3C,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;iBACzC;YACL,CAAC,CAAC,CAAC;SACN;QACD,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC1B,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;gBAC7C,IAAI,KAAK,EAAE;oBACP,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBAC/B;YACL,CAAC,CAAC,CAAC;SACN;QACD,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;KAChB;AACL,CAAC;AACD,SAAgB,aAAa,CAAC,IAA+B,EAAE,UAAmB;IAC9E,MAAM,GAAG,GAAG,IAAI,EAAE,QAAe,CAAC;IAClC,MAAM,WAAW,GAAG,GAAG,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC;IAC1F,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,aAAS,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAC9G,MAAM,IAAI,GAAG,IAAI,aAAS,CAAC;QACvB,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,CAAC,GAAG,UAAU,CAAC;KAC5B,CAAC,CAAC;IACH,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IACrC,MAAM,MAAM,GAAG,QAAQ,CAAC;IACxB,OAAO,MAAM,CAAC;AAClB,CAAC;AAZD,sCAYC"}
+{"version":3,"file":"getInterfaces.js","sourceRoot":"","sources":["../../src/server/getInterfaces.ts"],"names":[],"mappings":";;;AAAA,0BAA0I;AAK1I,SAAS,QAAQ,CAAC,IAAe,EAAE,aAAqB,EAAE,QAAkB;IACxE,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE;QACpB,GAAG,IAAI;KACV,CAAC,CAAC;IACH,IAAI,aAAa,EAAE;QACf,QAAQ,CAAC,QAAQ,GAAG,EAAE,CAAC;QACvB,QAAQ,CAAC,UAAU,GAAG,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,QAAQ,EAAE;YACf,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACxB,MAAM,aAAa,GAAa,EAAE,CAAC;gBACnC,IAAI,QAAQ,CAAC,CAAC,EAAE,aAAa,EAAE,aAAa,CAAC,EAAE;oBAC3C,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;iBACzC;YACL,CAAC,CAAC,CAAC;SACN;QACD,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC1B,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;gBAC7C,IAAI,KAAK,EAAE;oBACP,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBAC/B;YACL,CAAC,CAAC,CAAC;SACN;QACD,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YAChC,OAAO,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;KAChB;AACL,CAAC;AACD,SAAgB,aAAa,CAAC,IAA+B,EAAE,UAAmB;IAC9E,MAAM,GAAG,GAAG,IAAI,EAAE,QAAe,CAAC;IAClC,MAAM,WAAW,GAAG,GAAG,EAAE,qBAAqB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,IAAI,EAAE,CAAC;IACjG,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,aAAS,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAC9G,MAAM,IAAI,GAAG,IAAI,aAAS,CAAC;QACvB,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,CAAC,GAAG,UAAU,CAAC;KAC5B,CAAC,CAAC;IACH,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IACrC,MAAM,MAAM,GAAG,QAAQ,CAAC;IACxB,OAAO,MAAM,CAAC;AAClB,CAAC;AAZD,sCAYC"}

package/out/server/naslServer.d.ts

@@ -2,7 +2,7 @@
 import { Worker } from 'worker_threads';
 import Messager from '../common/Messager';
 import * as tsProtocol from 'typescript/lib/protocol';
-import { Module, BaseNode, App, Structure, Logic, TypeAnnotation, View, Param, Argument, ViewElement, Connector } from '../concepts';
+import { Module, BaseNode, App, Structure, Logic, TypeAnnotation, View, Param, Argument, ViewElement, CallInterface, Connector } from '../concepts';
 import { SourceMap, SourceMapItem } from '../translator';
 import { MinRange } from './translator';
 import { EventPayload } from '../common';
@@ -33,6 +33,7 @@ declare type QuickInfoNodes = Array<{
 }>;
 export declare function getDisplayString2Type(displayString: string): string[];
 declare class NaslServer {
+    naslStdlibFileCacheMap: Map<string, tsProtocol.OpenRequestArgs>;
     messager: Messager;
     worker: Worker;
     /**
@@ -61,7 +62,10 @@ declare class NaslServer {
     /**
  * 初始化之前添加文件
  */
-    addFile(file: tsProtocol.OpenRequestArgs): Promise<unknown>;
+    addFile(file: tsProtocol.OpenRequestArgs, { cache }?: {
+        cache?: boolean;
+    }): Promise<unknown>;
+    cacheFile(options: tsProtocol.OpenRequestArgs): void;
     /**u
  * 只新增文件
  * @param {*} files
@@ -187,6 +191,10 @@ declare class NaslServer {
  */
     _attachDiagnostics(fileNode: BaseNode): Diagnostic[];
     checkNodeError(node: BaseNode, diagnostics: Diagnostic[]): any;
+    /**
+     * 判断当前CallInterface 对应的 Interface 是否含有鉴权方式
+     */
+    hasAuth(node: CallInterface): boolean;
     existStructureFix(semanticDiagnostics: Diagnostic[], node: FileNode, that: any): void;
     /**
  * 单个问题的诊断处理

package/out/server/naslServer.js

@@ -57,6 +57,7 @@ const jsoner = __importStar(require("../service/storage/jsoner"));
 const EventEmitter_1 = require("../common/EventEmitter");
 const utils_1 = require("../utils");
 const decimal_js_1 = require("decimal.js");
+const utils_2 = require("../automate/engine/utils");
 const EmbeddedTSFileLineMap = {
     Entity: 3,
 };
@@ -71,6 +72,7 @@ const SentryMessager = (0, sentry_1.sentryMonitorTSWorkerMessager)(Messager_1.de
 let isChangeInterface = false; //判断是否导入接口
 let actionArr = []; //用于导入接口收集更改的节点
 let timer = null; //超时器用于收集导入接口相关
+const __naslStdlibFileCacheMap = new Map(); // naslStdlib文件缓存
 // 联合类型切割取出类型
 function getDisplayString2Type(displayString) {
     const targetString = displayString.match(/value:\s(\S+)\)/)[1];
@@ -109,6 +111,7 @@ function getDisplayString2Type(displayString) {
 }
 exports.getDisplayString2Type = getDisplayString2Type;
 let NaslServer = class NaslServer {
+    naslStdlibFileCacheMap = __naslStdlibFileCacheMap;
     messager = undefined;
     worker = undefined;
     /**
@@ -225,12 +228,12 @@ let NaslServer = class NaslServer {
         await this.addFile({
             file: 'nasl.ui.definition.ts',
             fileContent: code,
-        });
+        }, { cache: true });
         Object.keys(naslStdlibMap_1.default).forEach(async (libFileName) => {
             await this.addFile({
                 file: '/' + libFileName,
                 fileContent: naslStdlibMap_1.default[libFileName],
-            });
+            }, { cache: true });
         });
         this.elementsLogic = elementsLogic;
         // 全部文件加载完毕开始初始化
@@ -535,9 +538,14 @@ let NaslServer = class NaslServer {
     /**
  * 初始化之前添加文件
  */
-    addFile(file) {
+    addFile(file, { cache = false } = {}) {
+        cache && this.cacheFile(file);
         return this.messager.requestCommand('addFile', file);
     }
+    // 缓存添加过的文件
+    cacheFile(options) {
+        __naslStdlibFileCacheMap.set(options.file, options);
+    }
     /**u
  * 只新增文件
  * @param {*} files
@@ -567,10 +575,15 @@ let NaslServer = class NaslServer {
         /// #if process.env.NODE_ENV === 'development'
         if (globalThis.window) { // For TS build
             try {
-                await Promise.all(openFiles.map(async (file) => {
-                    const res = await storage_1.default.post('/api/App/debugEmbedded?id=' + app.id, file);
-                    return res.data;
-                }));
+                let canDebug = true;
+                await storage_1.default.post('/api/App/debugEmbedded?id=' + app.id, openFiles[0])
+                    .catch(() => canDebug = false);
+                if (canDebug) {
+                    await Promise.all(openFiles.map(async (file) => {
+                        const res = await storage_1.default.post('/api/App/debugEmbedded?id=' + app.id, file);
+                        return res.data;
+                    }));
+                }
             }
             catch (e) {
                 console.error(e);
@@ -1554,6 +1567,20 @@ let NaslServer = class NaslServer {
                         }
                     }
                 }
+                else if (node instanceof concepts_1.CallInterface) {
+                    const isAuthInterface = this.hasAuth(node);
+                    const interfaceName = node.calleewholeKey.slice(node.calleewholeKey.lastIndexOf('.') + 1);
+                    if (isAuthInterface) {
+                        const errorMsg = `${interfaceName} 接口有鉴权方式，不支持在前端调用`;
+                        const diagnostic = {
+                            node,
+                            severity: 'error',
+                            message: errorMsg,
+                        };
+                        diagnostics.push(diagnostic);
+                        node.tsErrorDetail = diagnostic;
+                    }
+                }
                 else {
                     this.checkNodeError(node, diagnostics);
                 }
@@ -2165,6 +2192,13 @@ let NaslServer = class NaslServer {
             }
         }
     }
+    /**
+     * 判断当前CallInterface 对应的 Interface 是否含有鉴权方式
+     */
+    hasAuth(node) {
+        const tInterface = (0, utils_2.getNodeByNodeCallee)(node.rootNode, node.calleewholeKey);
+        return tInterface instanceof concepts_1.AuthInterface;
+    }
     /* 接口导入查找 */
     existStructureFix(semanticDiagnostics, node, that) {
         let module;
@@ -2412,7 +2446,12 @@ let NaslServer = class NaslServer {
                         const minRange = this._findMinRange(refItem, fileNode);
                         if (minRange.node && (minRange.node instanceof concepts_1.QueryFromExpression || minRange.node instanceof concepts_1.QueryJoinExpression)) {
                             const callQueryComponent = minRange.node.getAncestor('CallQueryComponent');
-                            const callQueryComponentTypeAnnotation = callQueryComponent.typeAnnotation;
+                            let callQueryComponentTypeAnnotation;
+                            callQueryComponent.logic.sourceMap.forEach((value, key) => {
+                                if (key.concept === 'TypeAnnotation' && key.parentNode === callQueryComponent) {
+                                    callQueryComponentTypeAnnotation = key;
+                                }
+                            });
                             const { currentSource: qcTypeAnnotationCurrentSource, fileNode } = callQueryComponentTypeAnnotation.getCurrentSource();
                             const { currentSource: logicCurrentSource } = fileNode.getCurrentSource();
                             const aggregateLength = callQueryComponent.select.selectAggregateElements.filter((item) => item.aggregateName && item.asName).length;
@@ -3572,10 +3611,14 @@ let NaslServer = class NaslServer {
                 offset: (0, translator_1.lsp2tspNumber)(item.range.start.character),
             };
             // 位置计算偏移
-            if (node.concept === 'BinaryExpression'
-                || node.concept === 'CallLogic'
-                || node.concept === 'CallFunction'
-                || node.concept === 'CallInterface') {
+            if (node.concept === 'CallLogic' && node.useIife) {
+                fileDetail.line += 2;
+                fileDetail.offset = 8;
+            }
+            else if (node.concept === 'BinaryExpression' ||
+                node.concept === 'CallLogic' ||
+                node.concept === 'CallFunction' ||
+                node.concept === 'CallInterface') {
                 // 如果没有括号 ，括号就在外面，就 -1
                 // 有括号就找到括号的位置 然后 -1
                 let indexOf = 0;