@lcap/nasl 2.20.1-beta.1 → 2.20.1-beta.3

package/src/concepts/NewComposite__.ts

@@ -3,6 +3,7 @@ import { ElementToVueOptions } from './ViewElement__';
 import MemberExpression from './MemberExpression__';
 import StructureProperty from './StructureProperty__';
 import App from './App__';
+import { genHash } from '../generator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -1215,7 +1216,7 @@ export class NewComposite extends LogicItem {
                 }
             });
             code += 'return {\n';
-            code += `__name: "AStructure_${this.typeAnnotation.hash}" as const,\n`;
+            code += `__name: "AStructure_${genHash(JSON.stringify(this))}" as const,\n`;
             this.properties.forEach((property) => {
                 code += `${property.name},\n`;
             });
@@ -1266,7 +1267,7 @@ export class NewComposite extends LogicItem {
             }
         });
         code += '\nreturn {\n';
-        code += `__name: "AStructure_${this.typeAnnotation.hash}" as const,\n`;
+        code += `__name: "AStructure_${genHash(JSON.stringify(this))}" as const,\n`;
         this.properties.forEach((property) => {
             code += `${property.name},\n`;
         });
@@ -1279,9 +1280,23 @@ export class NewComposite extends LogicItem {
         return code;
     }
 
+    __addIdentifier() {
+        this.app.emit('collect:start', {
+            actionMsg: '添加匿名数据结构属性',
+        });
+        const node = this.addIdentifier({ name: this.getIdentifierUniqueName('property1') });
+        const struct = StructureProperty.from({
+            name: node.name,
+            typeAnnotation: null,
+        });
+        this.typeAnnotation.addStructureProperty(struct);
+        this.app.emit('collect:end');
+    }
+
     __deleteIdentifier(property: Identifier) {
         const index = this.properties.findIndex((p) => p === property);
         const newLines: AssignmentLine[] = [];
+        const newProperties = this.typeAnnotation.properties.filter((item) => item.name !== property.name);
         this.assignmentLines.forEach((line) => {
             const { leftIndex } = line;
             if (leftIndex[1] < index) {
@@ -1295,6 +1310,9 @@ export class NewComposite extends LogicItem {
             actionMsg: '删除匿名数据结属性',
         });
         this.setAssignmentLines(newLines);
+        this.typeAnnotation.update({
+            properties: newProperties,
+        });
         property.delete();
         this.app.emit('collect:end');
     }

package/src/concepts/OqlQueryComponent__.ts

@@ -339,6 +339,8 @@ export class OqlQueryComponent extends LogicItem {
                 },
             }).then((res: any) => {
                 this.codeSourceMap = res || { typescript: '', lexicalErrorCode: 1001 };
+            }).catch(() => {
+                this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };
             });
         } else {
             this.codeSourceMap = { typescript: '', lexicalErrorCode: 1001 };

package/src/concepts/Param__.ts

@@ -302,7 +302,7 @@ export class Param extends BaseNode {
                   parsedValue = tryJSONParse(defaultValue) ?? defaultValue;
               }
           }
-          code += `${this.name} || (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', this.$route.query.${this.name}) : ${JSON.stringify(this.defaultValue)})`;
+          code += `${this.name} !== undefined ? ${this.name} : (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', this.$route.query.${this.name}) : ${JSON.stringify(this.defaultValue)})`;
 
           if (needGenInitFromSchema) {
               code += `)`;

package/src/concepts/ViewElement__.ts

@@ -1079,7 +1079,7 @@ export class ViewElement extends BaseNode {
     }
 
 
-    
+
 
     /**
     * 删除元素绑定属性
@@ -1348,6 +1348,10 @@ export class ViewElement extends BaseNode {
         return `${this.view.path}/${this.name}`;
     }
 
+    get auth() {
+        return this.bindDirectives.find((directive) => directive.name === 'auth');
+    }
+
     getViewElementUniqueName(name = 'viewElement1') {
         return this.view?.getViewElementUniqueName(name);
     }
@@ -2141,6 +2145,10 @@ export class ViewElement extends BaseNode {
                 }
             });
         }
+        // 部分组件增加 key 唯一标识，防止 vue 判断重复节点，导致渲染异常
+        if (this.name && ['u-table-view', 'u-list-view', 'u-grid-view', 'u-list-components', 'u-form', 'u-select'].includes(this.tag)) {
+            this.name && parts.push(`key="${this.name}"`);
+        }
 
         let partsLength = 0;
         let partsString = '';

package/src/concepts/View__.ts

@@ -2021,12 +2021,15 @@ export class View extends BaseNode {
         this.elements.forEach((item) => {
             utils.traverse((current) => {
                 const { node } = current as any;
-                // 处理三种情况
-                if (
-                    ['BindAttribute', 'BindDirective', 'BindStyle'].includes(node.concept)
-                    && node.needReplaceWithIdentifier
-                ) {
-                    bindExpressions.push(node);
+                //// 处理三种情况
+                //if (
+                //    ['BindAttribute', 'BindDirective', 'BindStyle'].includes(node.concept)
+                //    && node.needReplaceWithIdentifier
+                //) {
+                //    bindExpressions.push(node);
+                //}
+                if (node.concept === 'Match') {
+                    bindExpressions.push(node as Match);
                 }
             }, {
                 node: item,
@@ -2237,8 +2240,8 @@ export class View extends BaseNode {
         return code;
     }
 
-    getViewCallLogics():string[] {
-        const callbackLogics :string[] = [];
+    getViewCallLogics(): string[] {
+        const callbackLogics: string[] = [];
         this.traverseChildren((el) => {
             if (el instanceof Identifier && el.namespace?.endsWith('logics')) {
                 callbackLogics.push(el.namespace + '.' + el.name);

package/src/generator/genReleaseBody.ts

@@ -1,6 +1,6 @@
 import { App, Assignment, BatchAssignment, CallFunction, CallInterface, CallLogic, ForEachStatement, IfStatement, Logic, LogicItem, Match, MatchCase, MemberExpression, Role, SwitchCase, SwitchStatement, View, ViewElement, WhileStatement, StringInterpolation, Frontend, ExternalDestination, NewComposite, SelectMembers, NewList } from '../concepts';
 import { genFrontendBundleFiles } from './genBundleFiles';
-import { genPermissionData } from './permission';
+import { genPermissionData, genLogicAuthFlag } from './permission';
 import * as utils from '../utils';
 
 export async function genReleaseBody(app: App, {
@@ -47,6 +47,7 @@ export async function genReleaseBody(app: App, {
     const body = {
         ...authReport, // 如果发布需要上报权限，导出源码不需要
         logicPageResourceDtoList,
+        logicAuthFlag: genLogicAuthFlag(app),
         noAuthApiPathList: getAuthApiPathList(app, frontends),
         reportIdList: findAllReportIdList(app, frontends),
         appId: app.id,

package/src/generator/permission.ts

@@ -102,13 +102,11 @@ function findResourcesOfUI(view: View | ViewElement) {
                 path: node.authPath,
                 type: 'page',
             });
-        else if (node instanceof ViewElement) {
-            const hasAuth = node.bindDirectives.find((directive) => directive.name === 'auth');
-            if (hasAuth)
-                res.push({
-                    path: node.authPath,
-                    type: 'component',
-                });
+        else if (node instanceof ViewElement && node.auth) {
+            res.push({
+                path: node.authPath,
+                type: 'component',
+            });
         }
         node = node.parentNode;
     }
@@ -275,3 +273,15 @@ export async function genPermissionData(app: App) {
     // console.timeEnd('xxx');
     return logicPageResourceDtoList;
 }
+
+export function genLogicAuthFlag(app: App) {
+    let flag = false;
+    app.traverseChildren((node) => {
+        if(flag) return;
+
+        if((node instanceof View || node instanceof ViewElement) && node.auth)
+            flag = true;
+    });
+
+    return flag;
+}

package/src/index.ts

@@ -1,6 +1,6 @@
 export { EventEmitter, EventPayload, BaseNode } from './common';
 export * from './concepts';
-export { genBundleFiles, genFrontendBundleFiles, genMetaData, genReleaseBody, genPermissionData } from './generator';
+export { genBundleFiles, genFrontendBundleFiles, genMetaData, genReleaseBody, genPermissionData, genLogicAuthFlag } from './generator';
 export * from './translator';
 // export { default as diagnosticManager } from './manager/diagnostic';
 export { default as server, NaslServer } from './server';

package/src/server/getMemberIdentifier.ts

@@ -150,8 +150,11 @@ function getCurrentLogic(node: BaseNode,
         expanded: boolean;
         icon: string;
     }[]) {
-    // 只有data-source可以
-    if (node instanceof Identifier && node.parentNode instanceof BindAttribute && (node.parentNode.name === 'data-source' || node.parentNode.name === 'check-file')) {
+    // 只有data-source check-file可以
+    if (
+        (node instanceof BindAttribute && (node.name === 'data-source' || node.name === 'check-file'))
+        || (node instanceof Identifier && node.parentNode instanceof BindAttribute && (node.parentNode.name === 'data-source' || node.parentNode.name === 'check-file'))
+    ) {
         const view = node.view;
         const viewLogics = view.logics;
         const logicVariable = viewLogics.map((item) => {

package/src/server/naslServer.ts

@@ -214,6 +214,9 @@ export class NaslServer {
                 if (data && data.event === 'publishDiagnostics') {
                     const records = await this._resolveDiagnosticRecords(data.records);
                     this.diagnosticManager.pushAll(records);
+                    try {
+                        invokeCommand('naslServer:nodeChange');
+                    } catch (e) { console.log('no "naslServer:nodeChange" event received'); }
                 }
             },
         });
@@ -1679,8 +1682,8 @@ export class NaslServer {
                 const diagnostic = {
                     node,
                     severity: 'error',
-                    message: '匹配分支：表达式不能为空',
-                    titleTip: '表达式不能为空',
+                    message: '匹配分支：返回内容不能为空',
+                    titleTip: '返回内容不能为空',
                 };
                 node.tsErrorDetail = diagnostic;
                 diagnostics.push(diagnostic);
@@ -1792,11 +1795,16 @@ export class NaslServer {
                         'nasl.collection.Map<nasl.core.String, nasl.core.String>',
                         'nasl.collection.Map<nasl.core.String, nasl.core.Text>',
                         'nasl.collection.Map<nasl.core.String, nasl.core.Email>',
+                    ];
+                    const excludeList2 = [
                         'nasl.collection.List<>',
+                        'nasl.collection.List<T>',
                     ];
                     // 先特殊处理等 类型合并后就可以去掉了
                     if (excludeList.includes(leftType.sortedTypeKey) && excludeList.includes(rightType.sortedTypeKey)) {
                         return null;
+                    } else if (excludeList2.includes(leftType.sortedTypeKey) || excludeList2.includes(rightType.sortedTypeKey)) {
+                        return null;
                     }
                     const diagnostic = {
                         node: node.right,
@@ -3056,7 +3064,11 @@ export class NaslServer {
                 }
             } else if (node.concept === 'Match') {
                 // 去查return 后面的返回值，变成函数调用
-                fileDetail.line = item.range.end.line - 1;
+                if (item.code?.endsWith(';\n')) {
+                    fileDetail.line = item.range.end.line - 1;
+                } else {
+                    fileDetail.line = item.range.end.line;
+                }
                 const indexOf = item.code.indexOf('return __MatchExpressionFuntion');
                 let newCode = item.code.substring(0, indexOf);
                 newCode = newCode.substring(newCode.lastIndexOf('\n'), indexOf);
@@ -3108,8 +3120,8 @@ export class NaslServer {
                 // 直接从最后一项的返回值取，有就有没有就没有
                 if (node.body?.length) {
                     const last = node.body[node.body.length - 1];
-                    if (last.__TypeAnnotation) {
-                        types.set(node, last.__TypeAnnotation);
+                    if (types.get(last)) {
+                        types.set(node, types.get(last));
                     }
                 }
             }

package/src/service/creator/add.configs.js

@@ -22,6 +22,9 @@ function httpCode(response, params, requestInfo) {
 }
 
 function shortResponse(response, params, requestInfo) {
+    if(params === false)
+        return response;
+
     if (response.data && response.data.result !== undefined) {
         return response.data.result;
     } else {

package/src/service/creator/errHandles.js

@@ -32,6 +32,12 @@ export default {
             return;
         }
 
+        // 检测到当前应用已在新 tab 页打开
+        if(err.code === 500502) {
+            eventBus.emit('multiTabOpened');
+            return;
+        }
+
         if (versionStatus[err.code])
             eventBus.emit('updateVersionStatus', {
                 status: versionStatus[err.code],

package/src/service/creator/index.js

@@ -48,6 +48,9 @@ const requester = function (requestInfo) {
         withCredentials: !baseURL,
     };
 
+    if(config.timeout)
+        requestOptions.timeout = config.timeout;
+        
     if (aslConfig.debugRequestAll || (aslConfig.debugRequest && requestOptions.method !== 'GET')) {
         console.debug('[Request Debug]', requestOptions);
     }

package/src/service/storage/api.js

@@ -11,4 +11,16 @@ export default {
             path: '/proxy/nasl-storage/api/storage/batchAction',
         },
     },
+    batchInstruct: {
+        url: {
+            method: 'post',
+            path: '/proxy/nasl-storage/api/storage/batchInstruct',
+        },
+    },
+    saveFrontendNasl: {
+        url: {
+            method: 'post',
+            path: '/proxy/nasl-storage/api/storage/saveFrontendNasl',
+        },        
+    },
 };

package/src/service/storage/init.ts

@@ -3,6 +3,7 @@ import { getConceptConstructor } from '../../decorators';
 import { config } from '../../config';
 import Vue from 'vue';
 import storageService from './service';
+import { v4 as uuidv4 } from 'uuid';
 /// #if !process.env.NODE_ENV || process.env.BUILD_TARGET === 'node'
 import * as fs from 'fs-extra';
 import * as jsoner from './jsoner';
@@ -10,6 +11,9 @@ import * as jsoner from './jsoner';
 
 export const batchQuery = storageService.batchQuery;
 export const batchAction = storageService.batchAction;
+export const batchInstruct = storageService.batchInstruct;
+
+let tabTimestamp: string;
 
 function getLogic(key: string, app: any, diffLogicList: string[]) {
     if (!diffLogicList.includes(key)) {
@@ -123,7 +127,6 @@ function getMiniAppChange(target: any, obj: any, action: string) {
  *  执行更新
  */
 async function doAction(app: any, actionItem: any) {
-    app.emit('saving');
     let hasFrontEnd = false;
     let hasBackEnd = false;
     const actionList: any[] = [];
@@ -265,9 +268,186 @@ async function doAction(app: any, actionItem: any) {
         }
     } catch (error) {
         console.log(error);
+        taskQueue.refreshNasl(app, {
+            errorInfo: {
+                message: error?.message,
+                stack: error?.stack,
+            },
+        });
+        return;
+    }
+
+    const instructList = [{
+        uuid: uuidv4().replace(/-/g, ''),
+        actions: actionList,
+    }];
+    saveNasl({app, hasFrontEnd, hasBackEnd, instructList });
+    
+    if (!app._historying) {
+        if (app._historyIndex !== app._historyList.length) {
+            app._historyList = app._historyList.splice(0, app._historyIndex);
+        }
+        app._historyList.push({
+            actionMsg,
+            list: list.map((item: any) => item.originEvent),
+        });
+        app._historyIndex = app._historyList.length;
+    } else {
+        const actionMap = {
+            undo: '已撤销操作：',
+            redo: '已重做操作：',
+        };
+        let msg = actionMap[action as 'undo' | 'redo'];
+        msg += actionMsg;
+        Vue.prototype.$toast.info(msg);
+        app._historying = false;
+    }
+}
+
+type Instruct = {
+    uuid: string,
+    actions: any[],
+};
+type TaskOption = { 
+    app: any, 
+    hasFrontEnd: boolean, 
+    hasBackEnd: boolean, 
+    instructList: Instruct[],
+};
+enum TaskQueueStatus {
+    ExceedMaxTaskCount,
+    Retrying,
+};
+type RefreshNaslOptions = {
+    errorInfo: {
+        message?: string,
+        stack?: string,
+    }
+};
+
+class TaskQueue {
+    queue: TaskOption[] = []
+    lastQueue: TaskOption[] = []
+    running: Boolean = false
+    maxTaskCount: number = 10
+    status?: TaskQueueStatus = undefined
+
+    addTask(task: TaskOption) {
+        this.queue.push(task);
+
+        if(this.queue.length >= this.maxTaskCount) {
+            this.status = TaskQueueStatus.ExceedMaxTaskCount;
+            task.app.emit('ExceedMaxTaskCount');
+        }
+            
+        this.run();
+    }
+
+    clear() {
+        this.queue = [];
+        this.lastQueue = [];
+        this.status = undefined;
+        this.running = false;
+    }
+
+    async run(queue = this.queue) {
+        if(this.running) return;
+        if(queue.length === 0) return;
+
+        const app = queue[0].app;
+        let hasFrontEnd = false;
+        let hasBackEnd = false;
+        let instructList: Instruct[] = [];
+
+        for(const task of queue) {
+            if(task.hasFrontEnd) hasFrontEnd = true;
+            if(task.hasBackEnd) hasBackEnd = true;
+            instructList = instructList.concat(task.instructList);
+        }
+
+        if(queue === this.queue) {
+            this.lastQueue = [...queue];
+            this.queue = [];
+        }
+
+        this.running = true;
+        const error = await _saveNasl({
+            app, hasFrontEnd, hasBackEnd, instructList,
+        });
+
+        // code: 401650, 检测到当前应用拉取操作已被强制结束, 用户确认后再刷新
+        // code: 500502  msg: "该应用已在新tab 页打开，请刷新!"      不重试或刷新
+        if(!error)
+            this.recover(app);
+        else if (![401650, 500502].includes(error.code)) { 
+            // 连接失败，或超时，或后端持久化异常
+            if((error.message === 'Network Error' || error.message?.includes('timeout') || error.code === 500500)
+                && this.status !== TaskQueueStatus.Retrying) {
+                this.running = false;
+                this.retry();
+            } else 
+                this.refreshNasl(app);
+
+            return;
+        }
+
+        this.running = false;
+
+        this.run();
+    }
+
+    retry() {
+        if(this.lastQueue.length === 0) return;
+
+        const app = this.lastQueue[0].app;
+        this.status = TaskQueueStatus.Retrying;
+        app.emit('Retrying');
+        this.run(this.lastQueue);
+    }
+
+    async refreshNasl(app: App, options: RefreshNaslOptions = { errorInfo: {} }) {
+        const failedQueue = this.lastQueue.map(({ hasFrontEnd, hasBackEnd, instructList }) => ({
+            hasFrontEnd, hasBackEnd, instructList,
+        }));
+        const queue = this.queue.map(({ hasFrontEnd, hasBackEnd, instructList }) => ({
+            hasFrontEnd, hasBackEnd, instructList,
+        }));
+        await storageService.saveFrontendNasl({
+            body: {
+                nasl: app.toJSON(),
+                failedQueue,
+                queue,
+                errorInfo: options.errorInfo,
+            },
+        }).catch((err: any) => {
+            console.log('备份 nasl 失败：', err);
+        });
+        this.clear();
         app.emit('refresh');
     }
 
+    recover(app: App) {
+        switch(this.status) {
+            case TaskQueueStatus.ExceedMaxTaskCount:
+                app.emit('BelowMaxTaskCount');
+                this.status = undefined;
+                break;
+            case TaskQueueStatus.Retrying:
+                app.emit('SuccessRetry');
+                this.status = undefined;
+                break;
+        }        
+    }
+}
+
+export const taskQueue = new TaskQueue();
+async function saveNasl(options: TaskOption) {
+    taskQueue.addTask(options);
+}
+
+async function _saveNasl(options: TaskOption) {
+    const { app, hasFrontEnd, hasBackEnd, instructList } = options;
+    app.emit('saving');
     let ChangedNASLType = '';
     if (hasFrontEnd && hasBackEnd) {
         ChangedNASLType = 'both';
@@ -279,50 +459,35 @@ async function doAction(app: any, actionItem: any) {
     let err;
     if (config.storage.protocol === 'http') {
         try {
-            await storageService.batchAction({
-                body: actionList,
+            await storageService.batchInstruct({
+                body: instructList,
                 headers: {
                     appId: app.id,
                     ChangedNASLType,
+                    tabTimestamp,
                     // 其他封装在 storageService 里了
                 },
             });
         } catch (error) {
             err = error;
-
-            // 401650, 检测到当前应用拉取操作已被强制结束, 用户确认后再刷新
-            if (error?.code !== 401650)
-                app.emit('refresh');
         }
     } else if (config.storage.protocol === 'mock') {
         // Do nothing
     } else {
         const json = await fs.readJSON(config.storage.basePath);
+        
+        let actionList: any[] = [];
+        for(const { actions } of instructList) {
+            actionList = actionList.concat(actions);
+        }
+
         jsoner.batchAction(json, actionList);
         await fs.writeJSON(config.storage.basePath, json, {
             spaces: 4,
         });
     }
     app.emit('saved', err);
-    if (!app._historying) {
-        if (app._historyIndex !== app._historyList.length) {
-            app._historyList = app._historyList.splice(0, app._historyIndex);
-        }
-        app._historyList.push({
-            actionMsg,
-            list: list.map((item: any) => item.originEvent),
-        });
-        app._historyIndex = app._historyList.length;
-    } else {
-        const actionMap = {
-            undo: '已撤销操作：',
-            redo: '已重做操作：',
-        };
-        let msg = actionMap[action as 'undo' | 'redo'] || '';
-        msg += actionMsg;
-        Vue.prototype.$toast.info(msg);
-        app._historying = false;
-    }
+    return err;
 }
 
 export function handleApp(app: any) {
@@ -354,7 +519,11 @@ export function handleApp(app: any) {
         if (!app._noTimer) {
             app._timer = setTimeout(() => {
                 console.error('收集超时，请及时排查原因');
-                app.emit('refresh');
+                taskQueue.refreshNasl(app, {
+                    errorInfo: {
+                        message: '收集超时，请及时排查原因',
+                    }
+                });
             }, 2500);
         }
         if (!app._isCollectingCount) {
@@ -443,7 +612,7 @@ export async function loadApp(appId?: string) {
     let app: App;
     if (config.storage.protocol === 'http') {
         // 请求
-        const data = await storageService.batchQuery({
+        const res = await storageService.batchQuery({
             body: [
                 {
                     path: 'app',
@@ -452,22 +621,16 @@ export async function loadApp(appId?: string) {
             ],
             headers: {
                 appId,
+                checkTabOpenTime: 'true',
                 // 其他封装在 storageService 里了
             },
+            config: {
+                shortResponse: false,
+            },
         });
-        // const data = res?.data?.result;
-        // // mock数据，需要删除
-        // data[0].frontends = [];
-        // data?.[0].frontends.push({
-        //     id: '111',
-        //     concept: 'Frontend',
-        //     name: 'pcFrontend1',
-        //     title: 'pc端',
-        //     type: 'pc',
-        //     views: data?.[0].views,
-        //     variables: data?.[0].frontendVariables,
-        //     componentDependencies: data?.[0].componentDependencies,
-        // });
+        
+        tabTimestamp = res?.headers?.tabtimestamp;
+        const data = res?.data?.result;
         app = new App(Object.assign(data?.[0], { id: appId }));
     } else if (config.storage.protocol === 'mock') {
         app = new App({