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

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({

package/src/service/storage/service.ts

@@ -4,7 +4,7 @@ import api from './api';
 const service = createService(api);
 
 export default {
-    batchQuery({ body, headers }: { body: Array<any>, headers: Record<string, string> }) {
+    batchQuery({ body, headers, config }: { body: Array<any>, headers: Record<string, string>, config?: object }) {
         const appData = (window as any).appData;
 
         return service.batchQuery({
@@ -15,6 +15,7 @@ export default {
                 'request-versionChangedTime': appData?.versionChangedTime || '',
                 operateArea: appData?.branchStatus === 'merging' ? 'merge_conflict' : '',
             }, headers),
+            config,
         });
     },
     batchAction({ body, headers }: { body: Array<any>, headers: Record<string, string> }) {
@@ -30,4 +31,31 @@ export default {
             }, headers),
         });
     },
+    batchInstruct({ body, headers }: { body: Array<any>, headers: Record<string, string> }) {
+        const appData = (window as any).appData;
+
+        return service.batchInstruct({
+            body,
+            headers: Object.assign({
+                appId: appData?.appId,
+                'request-appBaseVersion': (window as any).appData?.baseVersion || '',
+                'request-versionChangedTime': (window as any).appData?.versionChangedTime || '',
+                operateArea: (window as any).appData?.branchStatus === 'merging' ? 'merge_conflict' : '',
+            }, headers),
+            config: {
+                timeout: 1000 * 60,
+            },
+        });
+    },
+    saveFrontendNasl({ body }: { body: any }) {
+        const appData = (window as any).appData;
+        
+        return service.saveFrontendNasl({ 
+            body,
+            headers: {
+                appId: appData?.appId,
+                skipVersionCheck: true,
+            },
+         });
+    }
 };

package/src/templator/genCreateBlock.ts

@@ -49,7 +49,7 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                         const selectNameGroup = selectNameGroupMap.get(key);
                         formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
                     } else

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -53,7 +53,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                         const selectNameGroup = selectNameGroupMap.get(key);
                         formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
                     } else
@@ -152,7 +152,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                         const selectNameGroup = selectNameGroupMap.get(key);
                         formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.load}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
                     } else

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -47,7 +47,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                         const selectNameGroup = selectNameGroupMap.get(key);
                         formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
                     } else
@@ -148,8 +148,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                             text-field="${lowerEntityName}.${displayedProperty.name}"
                             value-field="${lowerEntityName}.${relationProperty.name}"
                             :data-source="${selectNameGroup.viewLogicLoad}"
-                            :pageable="true"
-                            :remote-paging="true"
+                            :pagination="true"
                             ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}
                             v-model="${vModel}">
                         </u-select>

package/src/templator/genEditTableBlock.ts

@@ -49,7 +49,7 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
                     formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
                             :autofocus="true" :opened="true" append-to="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" :value.sync="${valueExpression}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" :value.sync="${valueExpression}">
                         </u-select>
                     `;
                 } else
@@ -111,7 +111,7 @@ export function genEditTableTemplate(entity: Entity, nameGroup: NameGroup, selec
 
     return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
-        :pageable="true" :remote-paging="true" :show-sizer="true" :default-column-width="300" editable>
+        :pagination="true" :show-sizer="true" :default-column-width="300" editable>
     <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template><template #cell="current"></template></u-table-view-column>
 
     ${properties.map((property) => genEditTableColumnTemplate(entity, property, nameGroup, selectNameGroupMap) + '\n').join('')}

package/src/templator/genSelectBlock.ts

@@ -16,7 +16,7 @@ import {
 export function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup) {
     return `<u-select clearable placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
     text-field="${nameGroup.lowerEntity}.${property.name}"
-    value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true">
+    value-field="${nameGroup.lowerEntity}.id" :pagination="true">
 </u-select>`;
 }
 

package/src/templator/genTableBlock.ts

@@ -63,7 +63,7 @@ export function genTableTemplate(entity: Entity, nameGroup: NameGroup, modifyabl
 
     return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
-        :pageable="true" :remote-paging="true" :show-sizer="true">
+        :pagination="true" :show-sizer="true">
     <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template><template #cell="current"></template></u-table-view-column>
 
     ${properties.map((property) => genTableColumnTemplate(property, currentName) + '\n').join('')}
@@ -258,7 +258,7 @@ export function genTableColumnBlock(property: EntityProperty, oldNode: ViewEleme
 
     return `
 <template>
-    <u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" :pageable="true" :remote-paging="true" :show-sizer="true" data-schema="${nameGroup.structure}">
+    <u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" :pagination="true" :show-sizer="true" data-schema="${nameGroup.structure}">
         ${properties.map((property) => genTableColumnTemplate(property) + '\n').join('')}
     </u-table-view>
 </template>

package/src/templator/genUpdateBlock.ts

@@ -49,7 +49,7 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                         const selectNameGroup = selectNameGroupMap.get(key);
                         formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
-                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
                     } else