@lcap/nasl 0.3.9 → 0.3.10-beta.oom3

package/src/types/data/systemTypes.ts

@@ -23,6 +23,7 @@ export const systemTypeList = [
     { kind: 'systemType', text: 'UploadEvent', value: '#/systemTypes/UploadEvent' },
     { kind: 'systemType', text: 'UploadErrorEvent', value: '#/systemTypes/UploadErrorEvent' },
     { kind: 'systemType', text: 'SortEvent', value: '#/systemTypes/SortEvent' },
+    { kind: 'systemType', text: 'PoiInfo', value: '#/systemTypes/PoiInfo' },
 ];
 
 export const systemTypeMap: { [name: string]: ObjectSchema } = {
@@ -1512,4 +1513,50 @@ export const systemTypeMap: { [name: string]: ObjectSchema } = {
             },
         ],
     },
+    '#/systemTypes/PoiInfo': {
+        name: 'PoiInfo',
+        type: 'object',
+        propertyList: [
+            {
+                typeKey: '#/basicTypes/String',
+                type: 'string',
+                format: '',
+                name: 'source',
+                description: '信息来源',
+                isLeaf: true,
+            },
+            {
+                typeKey: '#/basicTypes/String',
+                type: 'string',
+                format: '',
+                name: 'id',
+                description: 'POI点的id',
+                isLeaf: true,
+            },
+            {
+                typeKey: '#/basicTypes/String',
+                type: 'string',
+                format: '',
+                name: 'name',
+                description: '名称',
+                isLeaf: true,
+            },
+            {
+                typeKey: '#/basicTypes/String',
+                type: 'string',
+                format: '',
+                name: 'location',
+                description: '经纬度',
+                isLeaf: true,
+            },
+            {
+                typeKey: '#/basicTypes/String',
+                type: 'string',
+                format: '',
+                name: 'address',
+                description: '地址',
+                isLeaf: true,
+            },
+        ],
+    },
 };

package/src/types/enum.ts

@@ -0,0 +1,6 @@
+export enum BusinessCode {
+    ElementExist = 402002,
+    ElementNotExist = 402004,
+    ParentElementNotExist = 402006,
+    HasReferenced = 402005,
+}

package/src/types/generator/hotReload.ts

@@ -1,11 +1,21 @@
 import webFileService from '../../service/webFile';
 
+let saveLastModifiedEnabled = true;
+export function enableSaveLastModified() {
+    saveLastModifiedEnabled = true;
+}
+export function disableSaveLastModified() {
+    saveLastModifiedEnabled = false;
+}
+
 /**
  * 生成上次修改的缓存
  * @param serviceId
  * @param path
  */
 export function saveLastModified(serviceId: string, path?: string) {
+    if(!saveLastModifiedEnabled) return;
+
     return webFileService.saveFile({
         body: {
             serviceId,

package/src/types/index.ts

@@ -22,7 +22,7 @@ export { Interface } from './data/Interface';
 export { Category } from './data/GlobalLogicNode';
 export { Logic } from './logic/Logic';
 export { LogicItem, LogicNode, ExpressionNode, evaluate } from './logic/LogicItem';
-export { BaseVariable, updateVariablesChildrenSchema, updateAllVariablesChildrenSchema } from './logic/BaseVariable';
+export { BaseVariable, updateVariablesChildrenSchema, updateAllVariablesChildrenSchema, variablesMap } from './logic/BaseVariable';
 export { Param } from './logic/Param';
 export { Variable } from './logic/Variable';
 export { Return } from './logic/Return';
@@ -57,6 +57,7 @@ export { default as login } from './login';
 export * as utils from './utils';
 export * as genBlock from './data/genBlock';
 export * as generator from './generator';
+export { Permission } from './permission/Permission';
 
 /**
  * 层级枚举
@@ -75,6 +76,7 @@ export enum LEVEL_ENUM {
 
     logic = 'logic',
     param = 'param',
+    timer = 'timer',
     variable = 'variable',
     return = 'return',
     interface = 'interface',
@@ -104,6 +106,7 @@ export enum LEVEL_ENUM {
     processComponent = 'processComponent',
     processParam = 'processParam',
     processReturn = 'processReturn',
+    processTimer = 'processTimer',
     processProperty = 'processProperty',
     processComponentReturn = 'processComponentReturn',
     processComponentVariable = 'processComponentVariable',
@@ -121,6 +124,7 @@ export const LEVEL_NAME_MAP = {
 
     logic: '逻辑',
     param: '输入参数',
+    timer: '定时任务',
     variable: '局部变量',
     return: '输出参数',
     interface: '接口',

package/src/types/logic/Logic.ts

@@ -5,6 +5,30 @@ import View from '../page/View';
 import { ExpressionNode, LogicItem, LogicNode } from './LogicItem';
 import { convert2SchemaType } from '../data/dataTypeUtils';
 import { isPlainObject, throttle } from 'lodash';
+import { refreshInterfaces, refreshView, refreshPages } from '../cache';
+import { BusinessCode } from '../enum';
+
+export function catchFn(logic: Logic) {
+    return async (err: any) => {
+        const code = err?.code;
+        if([BusinessCode.ElementExist, BusinessCode.ElementNotExist].includes(code)) {
+            if(logic.interface) {
+                await refreshInterfaces();
+            } else if(logic.view) {
+                await refreshView(logic.view);
+            }
+        } else if(code === BusinessCode.ParentElementNotExist) {  // 父节点不存在。视图添加逻辑，发现视图不存在
+            if(logic.view) {
+                await refreshPages();
+            }
+        } else
+            config.defaultApp?.emit('saved', err);
+
+        config.defaultApp?.history.load();
+
+        throw err;
+    }
+}
 
 /**
  * 逻辑类
@@ -123,6 +147,19 @@ export class Logic extends Vertex {
     /**
      * @param source 需要合并的部分参数
      */
+    /**
+     * 逻辑配置的cron表达式
+     */
+    @immutable()
+    public cron: string = undefined;
+    /**
+     * 定时类型，当前只能是cronTrigger
+     */
+    @immutable()
+    public triggerType: string = undefined;
+    /**
+     * 定时任务
+     */
     constructor(source?: Partial<Logic>) {
         super();
         source && this.assign(source);
@@ -152,7 +189,7 @@ export class Logic extends Vertex {
                 operationDesc: actionOptions?.actionDesc || `添加逻辑"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this));
         this.deepPick(result, ['id']);
         this.pick(result, ['playgroundId']);
         this.assign({ body: result.body.map((logicNode) => LogicNode.from(logicNode, this, null)) });
@@ -180,9 +217,8 @@ export class Logic extends Vertex {
      */
     @action('删除逻辑')
     async delete(none?: void, actionOptions?: ActionOptions) {
-        config.defaultApp?.emit('saving');
-
         if (this.id) {
+            config.defaultApp?.emit('saving');
             const body = this.toPlainJSON();
             if (this.view) {
                 body.moduleId = this.view.id;
@@ -191,19 +227,15 @@ export class Logic extends Vertex {
                 body.moduleId = this.interface.service.id;
                 body.moduleType = 'microService';
             }
-            try {
-                await logicService.delete({
-                    headers: {
-                        appId: config.defaultApp?.id,
-                        operationAction: actionOptions?.actionName || 'Logic.delete',
-                        operationDesc: actionOptions?.actionDesc || `删除逻辑"${this.name}"`,
-                    },
-                    body,
-                });
-            } catch (err) {
-                await config.defaultApp?.history.load();
-                throw err;
-            }
+
+            await logicService.delete({
+                headers: {
+                    appId: config.defaultApp?.id,
+                    operationAction: actionOptions?.actionName || 'Logic.delete',
+                    operationDesc: actionOptions?.actionDesc || `删除逻辑"${this.name}"`,
+                },
+                body,
+            }).catch(catchFn(this));
 
             if (this.view) {
                 const { logics } = this.view.$def;
@@ -249,7 +281,7 @@ export class Logic extends Vertex {
                 operationDesc: actionOptions?.actionDesc || `修改逻辑"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this));
 
         await then?.();
         await config.defaultApp?.history.load();
@@ -305,17 +337,16 @@ export class Logic extends Vertex {
             return this.contentPromise;
 
         return this.contentPromise = (async () => {
-            try {
-                const result = await logicService.loadDetail({
-                    query: {
-                        moduleId: this.moduleId,
-                        moduleType: this.moduleType,
-                        id: this.id,
-                    },
-                });
-                const newLogic = Logic.from(result, this.interface || this.view || this.processComponent, this);
-                this.assign(newLogic);
-            } catch (err) {}
+            const result = await logicService.loadDetail({
+                query: {
+                    moduleId: this.moduleId,
+                    moduleType: this.moduleType,
+                    id: this.id,
+                },
+                config: { noErrorTip: true },
+            }).catch(catchFn(this));
+            const newLogic = Logic.from(result, this.interface || this.view || this.processComponent, this);
+            this.assign(newLogic);
             return this;
         })().finally(() => this.contentPromise = undefined);
     }
@@ -437,6 +468,56 @@ export class Logic extends Vertex {
 
         return logic;
     }
+    /**
+     * 更新定时任务
+     */
+    @action('更新定时任务')
+    async updateTimer(cron: string) {
+        this.assign({ cron });
+        this.triggerType = 'cronTrigger';
+        await this.update(undefined, {
+            actionDesc: `设置定时任务"为"${cron}"`,
+        });
+
+        if (this.view) {
+            this.view.page.service.emit('pageTreeChange');
+            this.emit('change');
+        }
+        return this;
+    }
+    /**
+     * 验证表达式正确与否
+     */
+    async validateTimer() {
+        const body = this.toPlainJSON();
+        const result = await logicService.validateTimer({
+            body,
+            config: {
+                noErrorTip: true,
+            },
+        });
+        return result;
+    }
+    /**
+     * 输出最近十次运行结果
+     */
+    async testTimer() {
+        const body = this.toPlainJSON();
+        const result = await logicService.testTimer({
+            body,
+        });
+        return result;
+    }
+    /**
+     * 更新接口缓存
+     */
+    async updateCronCache() {
+        const body = this.toPlainJSON();
+        const result = await logicService.updateCronCache({
+            body,
+        });
+        return result;
+    }
 }
 
 export default Logic;

package/src/types/logic/LogicItem.ts

@@ -1,11 +1,12 @@
-import { immutable, excludedInJSON, circular, action } from '../decorators';
-import { config, history, typeCheck, utils, Vertex, Service, LEVEL_ENUM, Interface, Param, Return, Variable, Logic, View, Schema, ActionOptions, ACTION_MODE } from '..';
+import { immutable, excludedInJSON, action } from '../decorators';
+import { config, typeCheck, utils, Vertex, LEVEL_ENUM, Logic, Schema, ActionOptions, ACTION_MODE } from '..';
 import { logicService } from '../../service/logic';
-import { assert } from 'console';
 import { traverse } from '../utils';
 import { vertexsMap } from '../cacheData';
 import { getSchemaOfExpressionNode } from './tools';
 import Structure from '../data/Structure';
+import { refreshLogic } from '../cache';
+import { BusinessCode } from '../enum';
 
 export enum LOGIC_TYPE {
     // LogicNode
@@ -56,6 +57,18 @@ export enum LOGIC_TYPE {
     QueryAggregateExpression = 'QueryAggregateExpression',
 }
 
+const atomicList = [
+    LOGIC_TYPE.Identifier,
+    LOGIC_TYPE.NumericLiteral,
+    LOGIC_TYPE.BooleanLiteral,
+    LOGIC_TYPE.StringLiteral,
+    LOGIC_TYPE.NullLiteral,
+    LOGIC_TYPE.UnaryExpression,
+    LOGIC_TYPE.MemberExpression,
+    LOGIC_TYPE.Unparsed,
+    LOGIC_TYPE.BuiltInFunction,
+];
+
 export function evaluate(node: LogicNode | ExpressionNode, finalCode = true): string {
     if (!node)
         return '';
@@ -76,11 +89,11 @@ export function evaluate(node: LogicNode | ExpressionNode, finalCode = true): st
 
     if (node.type === 'BinaryExpression') {
         let left: string = evaluate(<LogicNode>node.left, finalCode);
-        if (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression)
+        if (!atomicList.includes((node.left as any)?.type) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
             left = `(${left})`;
 
         let right: string = evaluate(<LogicNode>node.right, finalCode);
-        if (!finalCode && node.right?.type === LOGIC_TYPE.MemberExpression)
+        if (!atomicList.includes((node.right as any)?.type) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
             right = `(${right})`;
 
         return `${left} ${node.operator} ${right}`;
@@ -88,13 +101,11 @@ export function evaluate(node: LogicNode | ExpressionNode, finalCode = true): st
 
     if (node.type === 'LogicalExpression') {
         let left: string = evaluate(<LogicNode>node.left, finalCode);
-        if (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression)
+        if (!atomicList.includes((node.left as any)?.type) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
             left = `(${left})`;
-
         let right: string = evaluate(<LogicNode>node.right, finalCode);
-        if (!finalCode && node.right?.type === LOGIC_TYPE.MemberExpression)
+        if (!atomicList.includes((node.right as any)?.type) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
             right = `(${right})`;
-
         return `${left} ${node.operator} ${right}`;
     }
 
@@ -209,6 +220,18 @@ export const logicItemArrayKeyOfLogicItem: string[] = ['body', 'consequent', 'al
     'groupBy', 'orderBy', 'selectElementList', 'joinPartList', 'onExpressionList', 'where', 'having',
 ];
 
+export function catchFn(logic: Logic) {
+    return async (err: any) => {
+        if (err.code !== BusinessCode.HasReferenced) // 节点被引用，不用刷新数据
+            await refreshLogic(logic);
+        else
+            config.defaultApp?.emit('saved', err);
+
+        config.defaultApp?.history.load();
+        throw err;
+    };
+}
+
 /**
  * 逻辑项类
  */
@@ -432,7 +455,7 @@ export class LogicItem extends Vertex {
                     operationIgnore: actionOptions?.actionIgnore,
                 },
                 body,
-            });
+            }).catch(catchFn(this.logic));
             this.deepPick(result, ['id', 'parentId', 'parentAttr', 'joinPartRef', 'structureRef']);
         }
 
@@ -548,7 +571,7 @@ export class LogicItem extends Vertex {
                         offsetY,
                     },
                 },
-            });
+            }).catch(catchFn(this.logic));
         }
 
         if (!(this.parentId === parentId && this.parentId === this.logic.playgroundId && this.parentAttr === parentAttr)) {
@@ -612,6 +635,8 @@ export class LogicItem extends Vertex {
      * @param targetId
      */
     static async paste(logicItems: LogicItem[] | LogicItem, targetType: 'logic' | 'html' | 'processComponent', targetId: string) {
+        config.defaultApp?.emit('saving');
+
         if (!Array.isArray(logicItems))
             logicItems = [logicItems];
 
@@ -630,7 +655,7 @@ export class LogicItem extends Vertex {
                 operationAction: 'LogicItem.paste',
                 operationDesc: `粘贴逻辑项"${logicItems[0].label || logicItems[0].type}"`,
             },
-        });
+        }).catch(catchFn(vertexsMap.get(targetId) as Logic));
 
         LogicItem.redoPaste(res);
     }
@@ -778,21 +803,16 @@ export class LogicItem extends Vertex {
                 delete body.index;
                 ///
 
-                try {
-                    await logicService.removeItem({
-                        headers: {
-                            appId: config.defaultApp?.id,
-                            serviceId: this.logic?.interface?.serviceId,
-                            operationAction: 'LogicItem.delete',
-                            operationDesc: `删除逻辑项"${this.label || this.type}"`,
-
-                        },
-                        body,
-                    });
-                } catch (err) {
-                    await config.defaultApp?.history.load();
-                    throw err;
-                }
+                await logicService.removeItem({
+                    headers: {
+                        appId: config.defaultApp?.id,
+                        serviceId: this.logic?.interface?.serviceId,
+                        operationAction: 'LogicItem.delete',
+                        operationDesc: `删除逻辑项"${this.label || this.type}"`,
+
+                    },
+                    body,
+                }).catch(catchFn(this.logic));
             }
         }
 
@@ -883,7 +903,7 @@ export class LogicItem extends Vertex {
                     operationIgnore: actionOptions?.actionIgnore,
                 },
                 body,
-            });
+            }).catch(catchFn(this.logic));
             // this.deepPick(result, ['id', 'parentId', 'parentAttr']);
 
             // 合并params里的id

package/src/types/logic/Param.ts

@@ -4,6 +4,29 @@ import { paramService } from '../../service/logic';
 import { convert2RefType, convert2SchemaType } from '../data/dataTypeUtils';
 import { getBasicTypeDefaultValue } from '../data/basicTypes';
 import { schemaService } from '../../service/common';
+import { refreshLogic, refreshInterfaces, refreshView } from '../cache';
+import { BusinessCode } from '../enum';
+
+export function catchFn(logic: Logic) {
+    return async (err: any) => {
+        const code = err?.code;
+        // 节点已存在； 节点不存在
+        if([BusinessCode.ElementExist, BusinessCode.ElementNotExist].includes(code)) {
+            await refreshLogic(logic);
+        } else if(code === BusinessCode.ParentElementNotExist) {  // 父节点不存在，即逻辑不存在
+            if(logic.interface) {
+                await refreshInterfaces();
+            } else if(logic.view) {
+                await refreshView(logic.view);
+            }
+        } else
+            config.defaultApp?.emit('saved', err);
+       
+        config.defaultApp?.history.load();
+
+        throw err;
+    }
+}
 
 /**
  * 逻辑输入参数
@@ -60,7 +83,7 @@ export class Param extends BaseVariable {
                 operationDesc: actionOptions?.actionDesc || `添加逻辑"${this.logic.name}"输入参数"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this.logic));
         // convert2RefType(result.schema);
         this.deepPick(result, ['id']);
         this.assign({ code: this.genCode() });
@@ -85,7 +108,6 @@ export class Param extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         if (this.id) {
-            try {
                 await paramService.delete({
                     headers: {
                         appId: config.defaultApp?.id,
@@ -96,11 +118,7 @@ export class Param extends BaseVariable {
                         loValId: this.id,
                         logicId: this.logic.id,
                     },
-                });
-            } catch(err) {
-                await config.defaultApp?.history.load();
-                throw err;
-            }
+                }).catch(catchFn(this.logic));
         }
 
         const index = this.logic.params.indexOf(this);
@@ -133,7 +151,7 @@ export class Param extends BaseVariable {
                 operationDesc: actionOptions?.actionDesc || `修改逻辑输入参数"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this.logic));
         this.schema.id = result.schema.id;
         // convert2RefType(result.schema);
         // this.plainAssign(result);

package/src/types/logic/Return.ts

@@ -4,7 +4,7 @@ import { paramService } from '../../service/logic';
 import { convert2RefType, convert2SchemaType } from '../data/dataTypeUtils';
 import { getBasicTypeDefaultValue } from '../data/basicTypes';
 import { schemaService } from '../../service/common';
-
+import { catchFn } from './Param';
 /**
  * 逻辑输出参数
  */
@@ -50,7 +50,7 @@ export class Return extends BaseVariable {
                 operationDesc: actionOptions?.actionDesc || `添加逻辑"${this.logic.name}"输出参数"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this.logic));
         // convert2RefType(result.schema);
         this.deepPick(result, ['id']);
         this.assign({ code: this.genCode() });
@@ -75,7 +75,6 @@ export class Return extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         if (this.id) {
-            try {
                 await paramService.delete({
                     headers: {
                         appId: config.defaultApp?.id,
@@ -86,11 +85,7 @@ export class Return extends BaseVariable {
                         loValId: this.id,
                         logicId: this.logic.id,
                     },
-                });
-            } catch(err) {
-                await config.defaultApp?.history.load();
-                throw err;
-            }
+                }).catch(catchFn(this.logic));
         }
 
         const index = this.logic.returns.indexOf(this);
@@ -123,7 +118,7 @@ export class Return extends BaseVariable {
                 operationDesc: actionOptions?.actionDesc || `修改逻辑输出参数"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this.logic));
         this.schema.id = result.schema.id;
         // convert2RefType(result.schema);
         // this.plainAssign(result);

package/src/types/logic/Variable.ts

@@ -4,6 +4,7 @@ import { paramService } from '../../service/logic';
 import { convert2RefType, convert2SchemaType } from '../data/dataTypeUtils';
 import { getBasicTypeDefaultValue } from '../data/basicTypes';
 import { schemaService } from '../../service/common';
+import { catchFn } from './Param';
 
 /**
  * 逻辑局部变量
@@ -49,7 +50,7 @@ export class Variable extends BaseVariable {
                 operationDesc: actionOptions?.actionDesc || `添加逻辑"${this.logic.name}"局部变量"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this.logic));
         // convert2RefType(result.schema);
         this.deepPick(result, ['id']);
         this.assign({ code: this.genCode() });
@@ -73,7 +74,6 @@ export class Variable extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         if (this.id) {
-            try {
                 await paramService.delete({
                     headers: {
                         appId: config.defaultApp?.id,
@@ -84,11 +84,7 @@ export class Variable extends BaseVariable {
                         loValId: this.id,
                         logicId: this.logic.id,
                     },
-                });
-            } catch(err) {
-                await config.defaultApp?.history.load();
-                throw err;
-            }
+                }).catch(catchFn(this.logic));
         }
 
         const index = this.logic.variables.indexOf(this);
@@ -120,7 +116,7 @@ export class Variable extends BaseVariable {
                 operationDesc: actionOptions?.actionDesc || `修改逻辑局部变量"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this.logic));
         this.schema.id = result.schema.id;
         // convert2RefType(result.schema);
         // this.plainAssign(result);

package/src/types/logic/translator.js

@@ -1,4 +1,3 @@
-import generate from '@babel/generator';
 import { Vertex } from '..';
 
 function switchCase2If(cases) {
@@ -597,9 +596,6 @@ export default function (source) {
             script += `${generateNode(node, index)}${newLine()}`;
         });
 
-        // console.info("JSON generate:", JSON.stringify(logic.body));
-        // console.log(generate({ type: 'Program', body: logic.body }).code);
-
         return `methods['${logic.name}'] = async function (${logic.params.map((param) => param.name).join(', ')}) {
             ${logic.params.length ? logic.params.map((param) => `${param.name} = ${param.name} !== undefined ? ${param.name} : this.$genInitFromSchema(${JSON.stringify(param.schema)}, ${JSON.stringify(param.defaultValue)});`).join('\n') + '' : ''}
             ${logic.variables.length ? logic.variables.map((variable) => `let ${variable.name} = this.$genInitFromSchema(${JSON.stringify(variable.schema)}, ${JSON.stringify(variable.defaultValue)});`).join('\n') + '' : ''}