@lcap/nasl 1.0.1 → 2.12.0-beta.1

package/src/server/process2LogicNamespace.ts

@@ -3,8 +3,8 @@ import { genLaunchProcess, genUserTaskLogic } from './getProcesses';
 
 /**
  * 给调用逻辑用
- * @param process 
- * @returns 
+ * @param process
+ * @returns
  */
 export function process2LogicNamespace(process: Process) {
     const children: Array<Namespace> = [];
@@ -18,13 +18,13 @@ export function process2LogicNamespace(process: Process) {
             });
             // 与process 中 toEmbededTS 所设置的 namespace 相关
             const path = `app.processes.${process.name}.elements.${e.name}.logics`;
-            l.getNamespace = function() {
+            l.getNamespace = function () {
                 return path;
-            }
+            };
             const api = `/api/${process.name}/${e.name}/${l.name}`;
-            l.getPath = function() {
+            l.getPath = function () {
                 return api;
-            }
+            };
             children.push(ns);
             ns.path = `app.processes.${process.name}.elements.${e.name}`;
             ns.expanded = true;
@@ -38,12 +38,12 @@ export function process2LogicNamespace(process: Process) {
     });
     ns.path = `app.processes.${process.name}.logics`;
     const api = `/api/${process.name}/${launchLogic.name}`;
-    launchLogic.getNamespace = function() {
+    launchLogic.getNamespace = function () {
         return ns.path;
-    }
-    launchLogic.getPath = function() {
+    };
+    launchLogic.getPath = function () {
         return api;
-    }
+    };
     return ns;
 }
 
@@ -61,8 +61,8 @@ interface processTreeFragment {
 }
 /**
  * 给侧边栏树形用
- * @param process 
- * @returns 
+ * @param process
+ * @returns
  */
 export function processToTreeFragment(process: Process) {
     const fragment: processTreeFragment = {
@@ -71,28 +71,38 @@ export function processToTreeFragment(process: Process) {
         id: process.id,
         logics: [],
         elements: [],
-    }
+    };
     process.elements.forEach((e) => {
         if (e.type === 'UserTask') {
             const l = genUserTaskLogic(e);
-            l.parentKey = 'readonly'
-            l.params.forEach(p => {
+            l.parentKey = 'readonly';
+            l.params.forEach((p) => {
                 p.readonly = true;
-            })
+            });
             l.parentNode = process;
+            // 与process 中 toEmbededTS 所设置的 namespace 相关
+            const path = `app.processes.${process.name}.elements.${e.name}.logics`;
+            l.getNamespace = function () {
+                return path;
+            };
             fragment.elements.push({
                 level: 'processTreeElementFragment',
                 id: e.id,
                 name: e.name,
                 logics: [l],
-            })
+            });
         }
     });
 
     const launchLogic = genLaunchProcess(process);
     launchLogic.parentNode = process;
-    
+
+    const path = `app.processes.${process.name}.logics`;
+    launchLogic.getNamespace = function () {
+        return path;
+    };
+
     fragment.logics.push(launchLogic);
-    launchLogic.parentKey = 'readonly'
+    launchLogic.parentKey = 'readonly';
     return fragment;
 }

package/src/server/translator.ts

@@ -41,6 +41,7 @@ import {
     ForEachStatement,
     CallFunction,
     ProcessOutcome,
+    Function,
 } from '../concepts';
 import { SourceMapItem } from '../translator';
 import { Diagnostic } from '../manager/diagnostic';
@@ -226,6 +227,10 @@ const TS_RULES: Array<{
         re: /No value exists in scope for the shorthand property '__(?:IDENTIFIER|LEFT|RIGHT)__'. Either declare one or provide an initializer./,
         result: '用户任务未关联页面',
     },
+    {
+        re: /No value exists in scope for the shorthand property '__(?:outOfProcess)__'. Either declare one or provide an initializer./,
+        result: '节点未关联到流程图',
+    },
     {
         re: /'(.+?)' is declared but its value is never read/,
         result: "已添加'$1'，但从来没有使用过。",
@@ -355,6 +360,8 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
             return null;
         } else if (text.startsWith(`Namespace 'nasl.ui' has no exported member `)) {
             return null;
+        } else if (text.startsWith(`Function expression, which lacks return-type annotation, implicitly has an 'any[]' return type.`)) {
+            return null;
         }
     }
     // 处理bindevent参数没传递的报错
@@ -363,6 +370,37 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
         if (node instanceof BindEvent) {
             return null;
         }
+
+        if (node instanceof ProcessElement && (node.type === 'UserTask' || node.type === 'AutoTask' || node.type === 'StartNoneEvent')) {
+            const reg = /Expected (.+?) arguments, but got (.+?)./.exec(text);
+            let u = '用户任务';
+            if(node.type === 'AutoTask') {
+                u = '自动任务';
+            }
+            if(reg[2] === '0') {
+                tsErrorDetail.message = `${u}出口顺序流个数不能是0`;
+            } else {
+                tsErrorDetail.message = `${u}出口顺序流个数不能大于1`;
+            }
+           
+            if(node.type === 'StartNoneEvent') {
+                tsErrorDetail.message = `开始节点只能有一个出口顺序流`;
+            }
+        }
+
+        if (node instanceof ProcessElement && (node.type === 'ExclusiveGateway' || node.type === 'ParallelGateway')) {
+            const reg = /Expected (.+?) arguments, but got (.+?)./.exec(text);
+            let u = '排他网关';
+            if(node.type === 'ParallelGateway') {
+                u = '并行网关';
+            }
+            if(reg[2] === '0') {
+                tsErrorDetail.message = `${u}出口顺序流和入口顺序流个数不能等于0`;
+            } else {
+                tsErrorDetail.message = `${u}出口顺序流和入口顺序流个数同时等于1，该${u}没有意义`;
+            }
+            
+        }
     }
 
     // 因为缺少参数时候有可能有特殊情况,因为原本少的多了就会找到 callLogic上,
@@ -401,7 +439,9 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
             // 变量type的报错放到内部
             node = node.parentNode;
             let str = tsErrorDetail.message;
-            str = (node as any).constructor.nodeTitle + '：' + str;
+            if (node) {
+                str = (node as any).constructor.nodeTitle + '：' + str;
+            }
             tsErrorDetail.message = str;
         }
     }
@@ -425,7 +465,7 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
             tsErrorDetail.message = '调用函数：参数不能为空！';
         } else if ((node instanceof Argument && node.parentNode instanceof CallLogic) || node instanceof CallLogic) {
             tsErrorDetail.message = '调用逻辑：参数不能为空！';
-        } else if (node instanceof ProcessOutcome) {
+        } else if (node instanceof ProcessOutcome || node instanceof Function) {
             tsErrorDetail.message = (node as any).constructor.nodeTitle + '：不能为空！';
         } else if (node instanceof Argument || node instanceof TypeAnnotation) {
             let str = tsErrorDetail.message;

package/src/service/creator/errHandles.js

@@ -26,6 +26,12 @@ export default {
         if (config.noErrorTip)
             return;
 
+        // 检测到当前应用拉取操作已被强制结束
+        if(err.code === 401650) {
+            eventBus.emit('forceCancelPull');
+            return;
+        }
+
         if (versionStatus[err.code])
             eventBus.emit('updateVersionStatus', {
                 status: versionStatus[err.code],

package/src/service/storage/init.ts

@@ -26,10 +26,10 @@ function getLogic(key: string, app: any, diffLogicList: string[]) {
             const _path = _pathArr[3];
             const _list = app.dependencies;
             const _module = _list.find((it: Module) => {
-                const name = it.name.replace('-', '_');
+                const name = it.name.replaceAll('-', '_');
                 return name === _name;
             });
-            const logic = _module.logics.find((item: Logic) => item.name === _path);
+            const logic = _module?.logics?.find((item: Logic) => item.name === _path);
             if (logic && logic.body && logic.body.length > 2) {
                 logic.body.map((item: any) => getStatement(item, app, diffLogicList));
             }
@@ -50,7 +50,7 @@ function getStatement(state: any, app: any, diffLogicList: string[]) {
             logicItems = [...state.body, state.each, state.start, state.end];
             break;
         case 'SwitchStatement':
-            logicItems = state.cases.map(getStatement);
+            logicItems = state.cases.map(getStatement).flat(1);
             break;
         case 'SwitchCase':
             logicItems = [state.test, ...state.consequent];
@@ -83,7 +83,7 @@ async function doAction(app: any, actionItem: any) {
         }
         view?.children?.forEach((item) => loopEle(item, checkAuth));
         if (view instanceof ViewElement) {
-            if (view.tag === 'u-uploader') {
+            if (view.tag === 'u-uploader' || view.tag === 'van-uploader') {
                 const bute = view?.bindAttrs.find((item) => item.name === 'url');
                 if (checkAuth) {
                     if (bute?.value.endsWith('/import') && !view.view.parentAuth) {
@@ -97,104 +97,110 @@ async function doAction(app: any, actionItem: any) {
             }
         }
     };
-    if (Array.isArray(list)) {
-        list.forEach((event) => {
-            const emitTarget = event?.originEvent?.target;
-            const _path: string = event.originEvent.path;
-            const _root = _path.split('.')?.[1] || '';
-            if (
-                ['entities', 'processes', 'logics', 'enums', 'structures', 'interfaces', 'interfaceDependencies', 'componentDependencies', 'configuration', 'dependencies'].some((item) =>
-                    _root.startsWith(item))
-            ) {
-                hasBackEnd = true;
-            }
-            const itemloop = (_i: LogicItem, app: any, diffArr: string[]) => {
-                const _l = getStatement(_i, app, diffArr);
-                if (_l.length) {
-                    _l.map((_ii: LogicItem) => itemloop(_ii, app, diffArr));
-                }
-            };
-            if (emitTarget.concept === 'Logic') {
-                const diffArr: string[] = [];
-                if (emitTarget.body.length > 2) {
-                    emitTarget.body.forEach((it: LogicItem) => {
-                        itemloop(it, app, diffArr);
-                    });
-                }
-                const result = diffArr.filter((item) => item.startsWith('app') || item.startsWith('extensions'));
-                if (result.length) {
+    try {
+        if (Array.isArray(list)) {
+            list.forEach((event) => {
+                const emitTarget = event?.originEvent?.target;
+                const _path: string = event.originEvent.path;
+                const _root = _path.split('.')?.[1] || '';
+                if (
+                    ['dataSources', 'processes', 'logics', 'enums', 'structures', 'interfaces', 'interfaceDependencies', 'componentDependencies', 'configuration', 'dependencies'].some((item) =>
+                        _root.startsWith(item))
+                ) {
                     hasBackEnd = true;
                 }
-            }
-            if (emitTarget.view) {
-                hasFrontEnd = true;
-            }
-            if (emitTarget.concept === 'View') {
-                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 itemloop = (_i: LogicItem, app: any, diffArr: string[]) => {
+                    const _l = getStatement(_i, app, diffArr);
+                    if (_l.length) {
+                        _l.map((_ii: LogicItem) => itemloop(_ii, app, diffArr));
+                    }
+                };
+                if (emitTarget.concept === 'Logic') {
                     const diffArr: string[] = [];
-                    emitTarget.logics.forEach((logic: Logic) => {
-                        if (logic.body.length > 2) {
-                            logic.body.forEach((it: LogicItem) => {
-                                itemloop(it, app, diffArr);
-                            });
-                        }
-                    });
+                    if (emitTarget.body.length > 2) {
+                        emitTarget.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;
-            }
-            if (emitTarget.concept === 'ViewElement') {
-                loopEle(emitTarget, true);
-            }
-            if (emitTarget.concept === 'BindAttribute' && emitTarget.name === 'url' && emitTarget.value.endsWith('/import')) {
-                if (!emitTarget.view.parentAuth) {
-                    hasBackEnd = true;
+                if (emitTarget.view) {
+                    hasFrontEnd = true;
                 }
-            }
-            if (emitTarget.concept === 'CallLogic') {
-                const arrlist: string[] = [];
-                getLogic(emitTarget.calleeKey, emitTarget.app, arrlist);
-                const result = arrlist.filter((item) => item.startsWith('app') || item.startsWith('extensions'));
-                // console.log(result, 'CallLogic');
-                if (result.length) {
-                    hasBackEnd = true;
-                }
-            }
-            event.eventList.forEach(({ action, path, object: objItem }: { action: string; path: string; object: any }) => {
-                if (Array.isArray(objItem)) {
-                    if (action === 'update') {
-                        actionList.push({
-                            action,
-                            path,
-                            node: objItem[0],
+                if (emitTarget.concept === 'View') {
+                    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);
+                                });
+                            }
                         });
-                    } else {
-                        objItem.forEach((item, index) => {
+                        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;
+                }
+                if (emitTarget.concept === 'ViewElement') {
+                    loopEle(emitTarget, true);
+                }
+                if (emitTarget.concept === 'BindAttribute' && emitTarget.name === 'url' && emitTarget.value.endsWith('/import')) {
+                    if (!emitTarget.view.parentAuth) {
+                        hasBackEnd = true;
+                    }
+                }
+                if (emitTarget.concept === 'CallLogic') {
+                    const arrlist: string[] = [];
+                    getLogic(emitTarget.calleeKey, emitTarget.app, arrlist);
+                    const result = arrlist.filter((item) => item.startsWith('app') || item.startsWith('extensions'));
+                    // console.log(result, 'CallLogic');
+                    if (result.length) {
+                        hasBackEnd = true;
+                    }
+                }
+                event.eventList.forEach(({ action, path, object: objItem }: { action: string; path: string; object: any }) => {
+                    if (Array.isArray(objItem)) {
+                        if (action === 'update') {
                             actionList.push({
                                 action,
                                 path,
-                                node: item,
+                                node: objItem[0],
+                            });
+                        } else {
+                            objItem.forEach((item, index) => {
+                                actionList.push({
+                                    action,
+                                    path,
+                                    node: item,
+                                });
                             });
+                        }
+                    } else {
+                        actionList.push({
+                            action,
+                            path,
+                            object: objItem,
                         });
                     }
-                } else {
-                    actionList.push({
-                        action,
-                        path,
-                        object: objItem,
-                    });
-                }
+                });
             });
-        });
+        }
+    } catch (error) {
+        console.log(error);
+        app.emit('refresh');
     }
+
     let ChangedNASLType = '';
     if (hasFrontEnd && hasBackEnd) {
         ChangedNASLType = 'both';
@@ -213,11 +219,15 @@ async function doAction(app: any, actionItem: any) {
                     ChangedNASLType,
                     'request-appBaseVersion': (window as any).appData?.baseVersion || '',
                     'request-versionChangedTime': (window as any).appData?.versionChangedTime || '',
+                    operateArea: (window as any).appData?.branchStatus === 'merging' ? 'merge_conflict' : '',
                 },
             });
         } catch (error) {
             err = error;
-            app.emit('refresh');
+
+            // 401650, 检测到当前应用拉取操作已被强制结束, 用户确认后再刷新
+            if (error?.code !== 401650)
+                app.emit('refresh');
         }
     } else if (config.storage.protocol === 'mock') {
         // Do nothing
@@ -250,7 +260,7 @@ async function doAction(app: any, actionItem: any) {
     }
 }
 
-function handleApp(app: any) {
+export function handleApp(app: any) {
     app._isCollectingCount = 0;
     app._collectingList = [];
     app._historyList = [];
@@ -273,7 +283,10 @@ function handleApp(app: any) {
         if (app._timer) {
             clearTimeout(app._timer);
         }
-        if (!event.noTimer) {
+        if (!app._noTimer) {
+            app._noTimer = event.noTimer;
+        }
+        if (!app._noTimer) {
             app._timer = setTimeout(() => {
                 console.error('收集超时，请及时排查原因');
                 app.emit('refresh');
@@ -295,20 +308,24 @@ function handleApp(app: any) {
             if (app._timer) {
                 clearTimeout(app._timer);
             }
-            if (Array.isArray(app._collectingList) && app._collectingList.length) {
+            // 结束收集时，立即将全局收集变量状态重置，防止下次收集数据混乱
+            const collectingList = app._collectingList;
+            const actionMsg = app._actionMsg;
+            const action = app._action;
+            app._collectingList = [];
+            app._actionMsg = '';
+            app._action = '';
+            app._noTimer = undefined;
+            if (Array.isArray(collectingList) && collectingList.length) {
                 embeddedTSEmitter.emit('change', {
-                    value: app._collectingList,
+                    value: collectingList,
                 });
                 await doAction(app, {
-                    list: app._collectingList,
-                    actionMsg: app._actionMsg,
-                    action: app._action,
+                    list: collectingList,
+                    actionMsg,
+                    action,
                 });
             }
-
-            app._collectingList = [];
-            app._actionMsg = '';
-            app._action = '';
         } else if (app._isCollectingCount < 0) {
             app._isCollectingCount = 0;
             throw Error('关闭收集有问题，请排查');
@@ -372,6 +389,7 @@ export async function loadApp(appId?: string) {
                 appId,
                 'request-appBaseVersion': (window as any).appData?.baseVersion || '',
                 'request-versionChangedTime': (window as any).appData?.versionChangedTime || '',
+                operateArea: (window as any).appData?.branchStatus === 'merging' ? 'merge_conflict' : '',
             },
         });
         // const data = res?.data?.result;
@@ -385,7 +403,7 @@ export async function loadApp(appId?: string) {
             scope: 'pc',
             envs: 'dev,online',
             hasAuth: true,
-            entities: [],
+            dataSources: [],
             structures: [],
             enums: [],
             logics: [],