@lcap/nasl 2.22.0-beta.5 → 3.0.0-beta.1

package/src/server/naslStdlibMap.ts

@@ -10,6 +10,7 @@ if (globalThis.process) { // For TS build
         'nasl.ui.ts': fs.readFileSync(require.resolve('../../sandbox/stdlib/nasl.ui.ts'), 'utf8'),
         'nasl.browser.ts': fs.readFileSync(require.resolve('../../sandbox/stdlib/nasl.browser.ts'), 'utf8'),
         'nasl.auth.ts': fs.readFileSync(require.resolve('../../sandbox/stdlib/nasl.auth.ts'), 'utf8'),
+        'nasl.http.ts': fs.readFileSync(require.resolve('../../sandbox/stdlib/nasl.http.ts'), 'utf8'),
         'nasl.configuration.ts': fs.readFileSync(require.resolve('../../sandbox/stdlib/nasl.configuration.ts'), 'utf8'),
         'nasl.langUtil.ts': fs.readFileSync(require.resolve('../../sandbox/stdlib/nasl.langUtil.ts'), 'utf8'),
         'nasl.annotation.ts': fs.readFileSync(require.resolve('../../sandbox/stdlib/nasl.annotation.ts'), 'utf8'),
@@ -31,6 +32,7 @@ if (globalThis.window) { // For TS build
         'nasl.ui.ts': require('!!raw-loader!../../sandbox/stdlib/nasl.ui.ts').default,
         'nasl.browser.ts': require('!!raw-loader!../../sandbox/stdlib/nasl.browser.ts').default,
         'nasl.auth.ts': require('!!raw-loader!../../sandbox/stdlib/nasl.auth.ts').default,
+        'nasl.http.ts': require('!!raw-loader!../../sandbox/stdlib/nasl.http.ts').default,
         'nasl.configuration.ts': require('!!raw-loader!../../sandbox/stdlib/nasl.configuration.ts').default,
         'nasl.langUtil.ts': require('!!raw-loader!../../sandbox/stdlib/nasl.langUtil.ts').default,
         'nasl.annotation.ts': require('!!raw-loader!../../sandbox/stdlib/nasl.annotation.ts').default,

package/src/server/translator.ts

@@ -53,11 +53,15 @@ import {
 } from '../concepts';
 import { SourceMapItem } from '../translator';
 import { Diagnostic } from '../manager/diagnostic';
+import { sortTsString } from '../utils/sortTsString';
+import { getNodeByNodeCallee } from '@nasl/automate/engine/utils';
 export interface MinRange {
     node: BaseNode;
     item: SourceMapItem;
 }
 
+const mapAstString = new Map();
+
 function transformType(tsType: string): string {
     if (tsType === 'string' || tsType === 'String')
         return '字符串';
@@ -171,6 +175,14 @@ function transformIdentifier(identifier: string): string {
 export function outOriginalvalue(value: string) {
     return value;
 }
+const TS_RULES_TYPE_INCONSISTENCY: Array<RegExp> = [
+    /This condition will always return '(.+?)' since the types '(.+?)' and '(.+?)' have no overlap/,
+    /Property '(.+?)' is missing in type '(.+?)' but required in type '(.+?)'/,
+    /Argument of type '(.+?)' is not assignable to parameter of type '(.+?)'/,
+    /Type '(.+?)' is not assignable to type '(.+?)'/,
+    /Type '(.+?)' does not satisfy the constraint '(.+?)'/,
+    /Type '(.+?)' is missing the following properties from type '(.+?)'/,
+];
 
 const TS_RULES: Array<{
     re: RegExp;
@@ -317,7 +329,7 @@ const TS_RULES: Array<{
     },
     {
         re: /'(.+?)' has no exported member(?: named)? '(.+?)'/,
-        result: '找不到$1 $2。',
+        result: '找不到接口$1 $2。',
         transforms: [transformNamespace, transformType],
     },
     {
@@ -474,6 +486,10 @@ export function translateDiagnosticMessage(message: string) {
 export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diagnostic) {
     const text = tsErrorDetail?.originalDiagnostic?.text;
     let node = minRange?.node;
+    const logicAncestor = node.getAncestor('Logic') || {} as any;
+    const { parentNode = { concept: '' } } = logicAncestor;
+    const isFELogic = ['BindEvent', 'View'].includes(parentNode.concept);
+
     // 有一些节点报错信息不向外暴露,缺失一些原生标签等等的展示
     if (node instanceof View || node instanceof ViewElement) {
         if (text.startsWith(`'nasl.ui' has no exported member named `)) {
@@ -569,6 +585,20 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
             tsErrorDetail.message = '自动推导不出类型！newList中有未知类型';
         }
     }
+
+    // 针对前端逻辑，有可能原因是找接口被增加鉴权方式导致
+    if (/Property '(.+?)' does not exist on type 'typeof (.+?)'/.exec(text) && isFELogic) {
+        // 如果存在 则 目标 Interface 更新为了 鉴权相关的，需要给出对应提示
+        const app = node.rootNode;
+        const modulePathList = (node as CallInterface)?.calleeNamespace?.split('.') || [];
+        modulePathList?.pop();
+        const targetInterface = getNodeByNodeCallee(app, (node as CallInterface).calleeKey);
+        console.log(targetInterface);
+        // const hasInterface = targetModule?.interfaces?.findIndex?.((item: Interface) => item.name === (node as CallInterface).calleeName) > -1;
+        if (targetInterface) {
+            tsErrorDetail.message = `${(node as CallInterface)?.calleeName}接口有鉴权，不支持在前端调用`;
+        }
+    }
     if (node instanceof Argument || node instanceof Anchor) {
         // if (/Type '(.+?)' is not assignable to type '(.+?)'./.exec(text)) {
         // }
@@ -747,6 +777,9 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
             return;
         }
     }
+    if (checkAStructure_(text)) {
+        return null;
+    }
     for (const rule of POST_RULES) {
         if (rule.re.test(tsErrorDetail.message)) {
             tsErrorDetail.message = tsErrorDetail.message.replace(rule.re, (value, index, oldStr) => {
@@ -774,3 +807,36 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
         ...tsErrorDetail,
     };
 }
+
+export function checkAStructure_(errorText: string): any {
+    const index = TS_RULES_TYPE_INCONSISTENCY.findIndex((item) => item.exec(errorText));
+    if (index !== -1) {
+        const rule = TS_RULES_TYPE_INCONSISTENCY[index];
+        const cap = rule.exec(errorText);
+        if (rule === TS_RULES_TYPE_INCONSISTENCY[0] || rule === TS_RULES_TYPE_INCONSISTENCY[1]) {
+            cap.splice(1, 1);
+        }
+        if (((cap[1].startsWith('{') && cap[1].endsWith('}')) || (cap[1].startsWith('{') && cap[1].endsWith('...')))
+            && ((cap[2].startsWith('{') && cap[2].endsWith('}')) || (cap[2].startsWith('{') && cap[2].endsWith('...')))
+            && (cap[1].includes('__name: "AStructure_') && cap[2].includes('__name: "AStructure_'))) {
+            const x = sortTsString(transformType(cap[1]));
+            const y = sortTsString(transformType(cap[2]));
+            if (x === y) {
+                return true;
+            } else if (mapAstString.get(x) === y || mapAstString.get(y) === x) {
+                return true;
+            } else {
+                const regex = /Type '"AStructure_(.*)' is not assignable to type '"AStructure_(.*)'/;
+                const nameError = regex.exec(errorText);
+                const length1 = x.match(/:/g) ? x.match(/:/g).length : -1;
+                const length2 = y.match(/:/g) ? y.match(/:/g).length : -2;
+                if (nameError && length1 === length2) {
+                    mapAstString.set(x, y);
+                    mapAstString.set(y, x);
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}

package/src/service/defaultErrorMessage.json

@@ -52,6 +52,7 @@
     "^az09-.$": "以小写字母、数字、'-'或'.'组成",
     "^azAZ09$": "以字母或数字组成",
     "^azAZ09-$": "以字母、数字或'-'组成",
+    "^az09-_$": "以小写字母、数字、'-'或'_'组成",
     "^azAZ09_$": "以字母、数字或'_'组成",
     "^azAZ09-_$": "以字母、数字、'-'或'_'组成",
     "without--": "不能连续出现中划线",

package/src/service/storage/api.js

@@ -21,7 +21,13 @@ export default {
         url: {
             method: 'post',
             path: '/proxy/nasl-storage/api/storage/saveFrontendNasl',
-        },        
+        },
+    },
+    breakpoint: {
+        url: {
+            method: 'get',
+            path: '/proxy/nasl-storage/api/breakpoint',
+        },
     },
     // 获取存储类型列表
     databaseTypes: {

package/src/service/storage/init.ts

@@ -1,4 +1,5 @@
 import { App, LogicItem, Logic, Module, View, ViewElement, Argument, SelectMembers } from '../../concepts';
+import { addBreakpointNodesFromApp } from '../../breakpoint';
 import { getConceptConstructor } from '../../decorators';
 import { config } from '../../config';
 import Vue from 'vue';
@@ -13,6 +14,7 @@ import * as jsoner from './jsoner';
 export const batchQuery = storageService.batchQuery;
 export const batchAction = storageService.batchAction;
 export const batchInstruct = storageService.batchInstruct;
+export const breakpoint = storageService.breakpoint;
 
 let tabTimestamp: string;
 export const databaseTypes = storageService.databaseTypes;
@@ -177,7 +179,7 @@ async function doAction(app: any, actionItem: any) {
                 const emitTarget = event?.originEvent?.target;
                 const _path: string = event.originEvent.path;
                 const _root = _path.split('.')?.[1] || '';
-                if (['dataSources', 'processes', 'logics', 'enums', 'structures', 'interfaces', 'interfaceDependencies', 'configuration', 'dependencies'].some((item) => _root.startsWith(item))) {
+                if (['backend', 'overriddenLogics', 'dataSources', 'processes', 'logics', 'enums', 'structures', 'interfaces', 'interfaceDependencies', 'configuration', 'dependencies', 'authLogics', 'authLogicsForCallInterface'].some((item) => _root.startsWith(item))) {
                     hasBackEnd = true;
                 }
                 if (emitTarget.concept === 'Logic') {
@@ -202,21 +204,22 @@ async function doAction(app: any, actionItem: any) {
                     const isDelete = event?.originEvent?.action === 'delete';
                     const isUpdateAuth = event?.originEvent?.action === 'update' && event?.originEvent?.object && 'auth' in event?.originEvent?.object;
                     if (isDelete || isUpdateAuth) {
-                        const app = emitTarget.app;
-                        const diffArr: string[] = [];
-                        emitTarget.logics.forEach((logic: Logic) => {
-                            if (logic.body.length > 2) {
-                                logic.body.forEach((it: LogicItem) => {
-                                    itemloop(it, app, diffArr);
-                                });
-                            }
-                        });
-                        const result = diffArr.filter((item) => item.startsWith('app') || item.startsWith('extensions'));
-                        if (result.length) {
-                            hasBackEnd = true;
-                        }
-                        emitTarget.children.forEach((item: View | ViewElement) => loopEle(item, isDelete));
-                        emitTarget.elements.forEach((item: View | ViewElement) => loopEle(item, isDelete));
+                        hasBackEnd = true;
+                        // const app = emitTarget.app;
+                        // const diffArr: string[] = [];
+                        // emitTarget.logics.forEach((logic: Logic) => {
+                        //     if (logic.body.length > 2) {
+                        //         logic.body.forEach((it: LogicItem) => {
+                        //             itemloop(it, app, diffArr);
+                        //         });
+                        //     }
+                        // });
+                        // const result = diffArr.filter((item) => item.startsWith('app') || item.startsWith('extensions'));
+                        // if (result.length) {
+                        //     hasBackEnd = true;
+                        // }
+                        // emitTarget.children.forEach((item: View | ViewElement) => loopEle(item, isDelete));
+                        // emitTarget.elements.forEach((item: View | ViewElement) => loopEle(item, isDelete));
                     }
                     hasFrontEnd = true;
                 }
@@ -612,6 +615,11 @@ export function handleApp(app: any) {
     });
 }
 
+type BreakpointItem = any | {
+    path: string,
+    breakpointStatus: null | 'ENABLED' | 'DISABLED',
+};
+
 /**
  * 加载 app
  * @param appId 如果是从文件读，就不需要传
@@ -621,34 +629,57 @@ export async function loadApp(appId?: string) {
     let app: App;
     if (config.storage.protocol === 'http') {
         console.time('batchQuery');
-        // 请求
-        const res = await storageService.batchQuery({
-            body: [
-                {
-                    path: 'app',
-                    // excludes: ['views'],
+        const promises = [
+            storageService.batchQuery({
+                body: [
+                    {
+                        path: 'app',
+                        // excludes: ['views'],
+                    },
+                ],
+                headers: {
+                    appId,
+                    checkTabOpenTime: 'true',
+                    // 其他封装在 storageService 里了
                 },
-            ],
-            headers: {
-                appId,
-                checkTabOpenTime: 'true',
-                // 其他封装在 storageService 里了
-            },
-            config: {
-                shortResponse: false,
-            },
-        });
+                config: {
+                    shortResponse: false,
+                },
+            }),
+            storageService.breakpoint({
+                body: { appId },
+            }),
+        ];
+
+        const [batchQueryRes, breakpointRes] = await Promise.all(promises);
+
+        // 请求
         console.timeEnd('batchQuery');
 
-        tabTimestamp = res?.headers?.tabtimestamp;
-        const data = res?.data?.result;
+        tabTimestamp = batchQueryRes?.headers?.tabtimestamp;
+        const data = batchQueryRes?.data?.result;
 
         console.time('new App');
         app = new App(Object.assign(data?.[0], { id: appId }));
+
+        breakpointRes?.forEach((item: BreakpointItem = {}) => {
+            const { path, breakpointStatus } = item;
+
+            if (breakpointStatus) {
+                const node = app.findNodeByPath(path);
+
+                if (node) {
+                    node.breakpoint = breakpointStatus;
+                }
+            }
+        });
         console.timeEnd('new App');
+
         if (!app.id) {
             app.id = appId;
         }
+
+        addBreakpointNodesFromApp(app);
     } else if (config.storage.protocol === 'mock') {
         app = new App({
             id: appId,
@@ -681,7 +712,7 @@ export async function loadApp(appId?: string) {
 }
 
 // 在app上挂载所有的数据库类型
-async function mountDatabaseTypes(app: App) {
+export async function mountDatabaseTypes(app: App) {
     if (!app.__databaseTypeMap) {
         app.__databaseTypeMap = {};
     }

package/src/service/storage/service.ts

@@ -49,8 +49,8 @@ export default {
     },
     saveFrontendNasl({ body }: { body: any }) {
         const appData = (window as any).appData;
-        
-        return service.saveFrontendNasl({ 
+
+        return service.saveFrontendNasl({
             body,
             headers: {
                 appId: appData?.appId,
@@ -59,8 +59,24 @@ export default {
          });
     },
     databaseTypes({ query }: { query: any }) {
+        const appData = (window as any).appData;
+
         return service.databaseTypes({
+            headers: {
+                appId: appData?.appId,
+            },
             query,
         });
     },
+    breakpoint({ body }: { body: any }) {
+        const appData = (window as any).appData;
+
+        return service.breakpoint({
+            body,
+            headers: {
+                appId: appData?.appId,
+                skipVersionCheck: true,
+            },
+        });
+    },
 };

package/src/utils/sortTsString.ts

@@ -0,0 +1,32 @@
+const babel = require('@babel/core');
+const generate = require('@babel/generator').default;
+const traverse = require('@babel/traverse').default;
+const t = require('@babel/types');
+
+export function sortTsString(tsString: string): string {
+    const str = `type a = ${tsString}`;
+    const ast = babel.parseSync(str, {
+        filename: 'result.ts',
+        presets: [require('@babel/preset-typescript')],
+    });
+    const visitor = {
+        TSTypeLiteral(path: any) {
+            path.node.members.sort((a: any, b: any) => {
+                if (a.type === 'TSPropertySignature' && b.type === 'TSPropertySignature') {
+                    return a.key.name.localeCompare(b.key.name);
+                }
+                return 0;
+            });
+        },
+        ArrayExpression(path: any) {
+            path.node.elements.sort((a: any, b: any) => {
+                if (a.type === 'ObjectExpression' && b.type === 'ObjectExpression') {
+                    return t.isIdentifier(a.properties[0].key) && t.isIdentifier(b.properties[0].key) ? a.properties[0].key.name.localeCompare(b.properties[0].key.name) : 0;
+                }
+                return 0;
+            });
+        },
+    };
+    traverse(ast, visitor);
+    return generate(ast).code;
+}

package/src/utils/traverse.ts

@@ -129,9 +129,9 @@ function handleNext<T extends INode>(func: (next: INodeInfo<T>) => any, current:
 }
 
 function checkCircular<T>(next: INodeInfo<T>) {
-    if (next.stack.length > 100 || next.key > 10000 || next.index > 10000)
+    if (next.stack.length > 100 || Number(next.key) > 10000 || next.index > 10000)
         console.error(next);
-    if (next.stack.length > 110 || next.key > 10010 || next.index > 10010)
+    if (next.stack.length > 110 || Number(next.key) > 10010 || next.index > 10010)
         throw new Error('Circular traverse!');
     return next.stack.includes(next.node);
 }