@lcap/nasl 0.3.10-beta → 0.3.10-beta.10

package/src/service/logic/logic.js

@@ -19,6 +19,12 @@ export default {
             method: 'post',
         },
     },
+    callLogicUpdate: {
+        url: {
+            path: '/proxy/graph/api/v1/graph/logic/callLogicUpdate',
+            method: 'post',
+        },
+    },
     delete: {
         url: {
             path: '/proxy/graph/api/v1/graph/logic/delete',

package/src/types/app/App.ts

@@ -1,8 +1,6 @@
-const { io } = require('socket.io-client');
 import { excludedInJSON, immutable } from '../decorators';
-import { LEVEL_ENUM, Vertex, Service, WebService, MicroService, SERVICE_TYPE, utils, History, updateGenericTypeList, BreakPoint, BreakpointMeta, Debugger } from '..';
+import { LEVEL_ENUM, Vertex, Service, WebService, MicroService, SERVICE_TYPE, utils, History, updateGenericTypeList, vertexsMap, Entity, Structure, Enum, dataTypesMap, BaseVariable, variablesMap, updateDataTypeList } from '..';
 import appService from '../../service/app';
-import { createSocketClient, breakpointService } from '../../service/debugger/debugger';
 
 interface AppLoadAllOptions {
     asyncLoadServicesDetail?: boolean,
@@ -114,10 +112,6 @@ export class App extends Vertex {
      */
     @immutable()
     public readonly firstMicroService: MicroService = undefined;
-
-    @immutable()
-    @excludedInJSON()
-    public debuggerClient: Debugger = null;
     /**
      * 历史记录
      * 用于处理撤销重做
@@ -133,8 +127,6 @@ export class App extends Vertex {
         source && this.assign(source);
 
         this.history = new History({ app: this });
-        this.debuggerClient = new Debugger();
-        this.debuggerClient.app = this;
     }
     /**
      * 加载详情并同步 envList 信息
@@ -167,24 +159,6 @@ export class App extends Vertex {
         this.assign(result);
         return this;
     }
-
-    async loadBreakPoints() {
-        const breakpointsMeta = await breakpointService.getAllBreakPoints({
-            query: {
-                appId: this.id,
-            },
-        });
-        breakpointsMeta.forEach(async (bp: BreakpointMeta) => {
-            const bpInstance = await BreakPoint.from(bp);
-            if (bpInstance)
-                this.debuggerClient.breakPoints.push(bpInstance);
-        });
-    }
-
-    async bootDebugger() {
-        await this.debuggerClient.boot();
-    }
-
     /**
      * 加载 App 下的所有服务
      */
@@ -270,8 +244,8 @@ export class App extends Vertex {
         asyncLoadServicesDetail: false,
         asyncLoadViewsDetail: false,
     }) {
+        await this.load();  // 请求其它接口前，需要先查询到 app 上的 baseVersion 
         await Promise.all([
-            this.load(),
             this.loadServices(),
             updateGenericTypeList(),
         ]);
@@ -288,6 +262,41 @@ export class App extends Vertex {
     from(source: any) {
         return new App(source);
     }
+    /**
+     * 清理内存，避免内存泄漏
+     */
+    clear() {
+        function traverse(obj: any, callback: (obj: any) => void, ws = new WeakSet()) {
+            if (typeof obj !== 'object' || obj === null)
+                return;
+            if (ws.has(obj))
+                return;
+
+            ws.add(obj);
+
+            if (Array.isArray(obj))
+                obj.forEach((item) => {
+                    traverse(item, callback, ws);
+                });
+            else {
+                callback(obj);
+                Object.values(obj).forEach((item) => {
+                    traverse(item, callback, ws);
+                });
+            }
+        }
+
+        traverse(this, (obj: any) => {
+            vertexsMap.delete(obj?.id);
+
+            if (obj instanceof Entity || obj instanceof Structure || obj instanceof Enum)
+                delete dataTypesMap[obj.schemaRef];
+
+            if (obj instanceof BaseVariable)
+                variablesMap.delete(obj.id);
+        });
+        updateDataTypeList();
+    }
 }
 
 export default App;

package/src/types/app/History.ts

@@ -294,8 +294,9 @@ export class History {
                     appId: this.app.id,
                 },
             });
-            this.undoCount = result.undoNumber;
-            this.redoCount = result.redoNumber;
+            const { undoNumber, redoNumber } = result || {};
+            this.undoCount = undoNumber;
+            this.redoCount = redoNumber;
         } catch (e) { }
     }
     async undo() {

package/src/types/app/Service.ts

@@ -1,5 +1,5 @@
 import { immutable, circular, action, excludedInJSON } from '../decorators';
-import { Logic, config, LEVEL_ENUM, Vertex, App, Page, DataNode, GlobalLogicNode, Schema, Entity, EntityProperty, Structure, Enum, EnumItem, Interface, dataTypesMap, generator, vertexsMap, Process, EntityIndex } from '..';
+import { Logic, config, LEVEL_ENUM, Vertex, App, Page, DataNode, GlobalLogicNode, Schema, Entity, EntityProperty, Structure, Enum, EnumItem, Interface, dataTypesMap, generator, vertexsMap, Process, EntityIndex, utils } from '..';
 import appService from '../../service/app';
 import pageService from '../../service/page';
 import webFileService from '../../service/webFile';
@@ -231,6 +231,7 @@ export class WebService extends Service {
         template: { name: string, version: string },
         ui: { name: string, version: string },
         componentDependencies: { [name: string]: string },
+        templateConfig: { builtInTemplate: boolean },
         themeVariables: { [name: string]: string },
     } = undefined;
     /**
@@ -385,6 +386,10 @@ ${Object.keys(themeVariables).map((key) => `    ${key}: ${themeVariables[key]};`
     }
 
     async loadPages(enableCache = true) {
+        const isGONGHANG = utils.getGlobalEnv() === 'gonghang';
+        if (isGONGHANG) {
+            enableCache = false;
+        }
         this.pages.forEach((page) => {
             page.destroy();
         });
@@ -760,14 +765,14 @@ export class MicroService extends Service {
                 microServiceId: this.id,
             },
         });
-        entities.forEach((item, index) => {
+        entities.forEach((item) => {
             const tempEntity = <Entity>vertexsMap.get(item.id);
             if (tempEntity) {
                 tempEntity.assign({ lastVersionDef: item.lastVersionDef });
             }
             const lastVersionRef = item.lastVersionDef && item.lastVersionDef.properties || {};
             const propertyList = tempEntity.propertyList as Array<EntityProperty>;
-            propertyList.forEach((property, index) => {
+            propertyList.forEach((property) => {
                 property = <EntityProperty>vertexsMap.get(property.id);
                 if (property && lastVersionRef[property.name]) {
                     property.assign({ lastVersion: convert2RefType(lastVersionRef[property.name]) });
@@ -779,6 +784,10 @@ export class MicroService extends Service {
      * 加载服务所有的接口列表
      */
     async loadInterfaces(enableCache = true) {
+        const isGONGHANG = utils.getGlobalEnv() === 'gonghang';
+        if (isGONGHANG) {
+            enableCache = false;
+        }
         const logicMap = new Map();
         // 旧接口列表中，可能存在已经被删掉的接口，需要从 vertexsMap 中删除
         this.interfaces.forEach((it) => {
@@ -797,14 +806,14 @@ export class MicroService extends Service {
         });
 
         interfaces = interfaces.map((item) => {
-            if(logicMap.has(item.id)) {
+            if (logicMap.has(item.id)) {
                 item.logic = logicMap.get(item.id);
                 logicMap.delete(item.id);
             }
             return Interface.from(item, this);
         });
         // 清理掉已不存在的逻辑
-        for(const logic of logicMap.values()) {
+        for (const logic of logicMap.values()) {
             logic.destroy();
         }
 

package/src/types/cacheData.ts

@@ -4,20 +4,20 @@ export const vertexsMap: Map<string, Vertex> = new Map();
 export const entitiesMap: Map<string, Entity> = new Map();
 
 export function genFinalCode(code: string, finalCode = true) {
-    if(!finalCode)
+    if (!finalCode)
         return code;
 
-    if(typeof code !== 'string')
+    if (typeof code !== 'string')
         return code;
     // ID_ENUMVALUE_只需要返回ENUM的item的value值
-    if(code.includes('ID_ENUMVALUE_')){
+    if (code.includes('ID_ENUMVALUE_')) {
         code = code.replace(/ID_([\w-]+).ID_ENUMVALUE_([\w-]+)/g, (m) => {
             const id = m.split('.').pop().replace('ID_ENUMVALUE_', '');
             const param = vertexsMap.get(id);
-            return  param && `'${(param as any).value}'` || `'${id}'`;
+            return param && `'${(param as any).value}'` || `'${id}'`;
         });
     }
-    if(code.includes('ID_ENUM_LIST_')){
+    if (code.includes('ID_ENUM_LIST_')) {
         code = code.replace(/ID_ENUM_LIST_([\w-]+)/g, (m, id) => {
             const param = vertexsMap.get(id);
             return `$utils.EnumList('${param && param.name}')`;
@@ -27,7 +27,7 @@ export function genFinalCode(code: string, finalCode = true) {
     return code.replace(/ID_([\w-]+)/g, (m, id) => {
         const param = vertexsMap.get(id);
         return (param as any)?.name
-            || (param as any)?.asName 
+            || (param as any)?.asName
             || id;
     });
-}
+}

package/src/types/data/Entity.ts

@@ -28,6 +28,7 @@ export const systemProperty: { [name: string]: any, } = {
         format: 'long',
         editable: false,
         required: true,
+        propertyGenRule: 'platform',
         display: {
             inTable: false,
             inFilter: false,
@@ -172,6 +173,12 @@ export class Entity extends Vertex implements ObjectSchema {
     @circular()
     @immutable()
     public readonly dataNode: DataNode = undefined;
+
+    /**
+     * 数据来源名称,平台生成 默认ide
+     */
+    @immutable()
+    public readonly entityGenSource: string = undefined;
     /**
      * 周边存在的名称
      */

package/src/types/data/EntityProperty.ts

@@ -44,6 +44,11 @@ export class EntityProperty extends Vertex implements Schema {
      */
     @immutable()
     public readonly description: string = undefined;
+    /**
+     * 字段生成规则
+     */
+    @immutable()
+    public readonly propertyGenRule: string = undefined;
     /**
      *  type
      */
@@ -401,6 +406,13 @@ export class EntityProperty extends Vertex implements Schema {
             actionDesc: `设置实体属性规则`,
         });
     }
+    @action('设置实体生成规则')
+    async setPropertyGenRule(propertyGenRule: string) {
+        this.assign({ propertyGenRule });
+        await this.update(undefined, {
+            actionDesc: `设置实体生成规则`,
+        });
+    }
     /**
      * 设置实体属性的默认值
      */

package/src/types/data/dataTypes.ts

@@ -47,7 +47,7 @@ export function properties2PropertyList(definition: any) {
 
 export async function updateGenericTypeList() {
     const datatypes = await getGenericList();
-    dataTypeList[2].children = datatypes.genericTypeList.concat(dataTypeList[2].children);
+    dataTypeList[2].children = datatypes.genericTypeList.concat(systemTypeList);
     Object.assign(dataTypesMap, datatypes.genericTypemap);
 }