@lcap/nasl 2.19.0-beta.1 → 2.19.0-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)) {
@@ -75,6 +79,9 @@ function getStatement(state: any, app: any, diffLogicList: string[]) {
         case 'CallInterface':
             logicItems = state.arguments?.map((item: Argument) => item.expression);
             break;
+        case 'ExternalDestination':
+            logicItems = [state.anchor, state.link];
+            break;
         case 'BatchAssignment':
             logicItems = [state.left?.expression, ...state.left?.members, ...state.rights.map((item: SelectMembers) => [item?.expression, ...item?.members]).flat(1)];
             break;
@@ -114,7 +121,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[] = [];
@@ -252,9 +258,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';
@@ -266,50 +449,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) {
@@ -341,7 +509,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) {
@@ -430,7 +602,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',
@@ -439,10 +611,16 @@ export async function loadApp(appId?: string) {
             ],
             headers: {
                 appId,
+                checkTabOpenTime: 'true',
                 // 其他封装在 storageService 里了
             },
+            config: {
+                shortResponse: false,
+            },
         });
-        // const data = res?.data?.result;
+        
+        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/genGetBlock.ts

@@ -14,7 +14,7 @@ export function genGetTemplate(entity: Entity, nameGroup: NameGroup) {
             .map((property) => {
                 const valueExpression = `${nameGroup.viewVariableEntity}.${property.name}`;
                 let formItem = `            <u-info-list-item><template #label><u-text text="${property.label || property.name}"></u-text></template>`;
-                formItem += `<u-text :text="'${valueExpression}'"></u-text>`;
+                formItem += `<u-text :text="${valueExpression}"></u-text>`;
                 formItem += `            </u-info-list-item>\n`;
                 return formItem;
             })

package/src/templator/genListViewBlock.ts

@@ -35,6 +35,12 @@ export function genH5ListViewTemplate(property: EntityProperty, nameGroup: NameG
             <template #title>{{ ${valueExpression} }}</template>
         </van-cell>
     </template>
+    <template #prev>
+        上一页
+    </template>
+    <template #next>
+        下一页
+    </template>
 </van-list-view>`;
 }
 

package/ts-worker/lib/tsserver.js

@@ -171847,6 +171847,9 @@ var ts;
             ProjectService.prototype.doEnsureDefaultProjectForFile = function (fileName) {
                 this.ensureProjectStructuresUptoDate();
                 var scriptInfo = this.getScriptInfoForNormalizedPath(fileName);
+                if (!scriptInfo) {
+                    console.log(fileName);
+                }
                 return scriptInfo ? scriptInfo.getDefaultProject() : (this.logErrorForScriptInfoNotFound(fileName), server.Errors.ThrowNoProject());
             };
             ProjectService.prototype.getScriptInfoEnsuringProjectsUptoDate = function (uncheckedFileName) {
@@ -176745,7 +176748,7 @@ var ts;
                     if (left) {
                         typeInfo.typeNamespace = analyzeTypeNameSpace(left);
                     }
-                } else if(Array.isArray(types)) {
+                } else if (Array.isArray(types)) {
                     typeInfo.typeName = 'Union';
                 } else {
                     typeInfo.typeKind = 'anonymousStructure';
@@ -176897,7 +176900,10 @@ var ts;
                             }
                         }
                     }
-                } else if (flags === 2048 /* SymbolFlags.TypeLiteral */) {
+                } else if ([
+                    2048/* SymbolFlags.TypeLiteral */,
+                    4096 /* SymbolFlags.ObjectLiteral */
+                ].includes(flags)) {
                     if (objectFlags & 16 /* ObjectFlags.Anonymous */) {
                         const typeNode = typeChecker.typeToTypeNode(type, enclosingDeclaration, toNodeBuilderFlags(typeFlags) | 70221824 /* NodeBuilderFlags.IgnoreErrors */ | 0);
                         const { members } = typeNode || {};
@@ -176981,6 +176987,8 @@ var ts;
                     206, /* SyntaxKind.PropertyAccessExpression */
                     208, /* SyntaxKind.CallExpression */
                     209, /* SyntaxKind.NewExpression */
+                    212, /* SyntaxKind.ParenthesizedExpression */
+                    213, /* SyntaxKind.FunctionExpression */
                 ].includes(node.kind)) {
                     const result = ts.isCallLikeExpression(node);
                     if (result) {

package/ts-worker/package.json

@@ -1,4 +1,5 @@
 {
+    "version": "1.0.0",
     "scripts": {
         "file-server": "node server/file-server",
         "dev": "webpack serve",

package/ts-worker/webpack.config.js

@@ -1,5 +1,7 @@
 const path = require('path');
+const pkg = require('./package.json');
 // const HtmlWebpackPlugin = require('html-webpack-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
 
 module.exports = {
     //mode: 'development',
@@ -8,8 +10,8 @@ module.exports = {
         bundle: './src/index.js',
     },
     output: {
-        path: path.resolve(__dirname, '../../../src/static/'),
-        filename: 'ts-worker.js',
+        path: path.resolve(__dirname, '../../../src/static/ts-worker'),
+        filename: `${pkg.version}.js`,
     },
     target: 'webworker',
     resolve: {
@@ -104,4 +106,11 @@ module.exports = {
             },
         },
     },
+    optimization: {
+        minimizer: [
+            new TerserPlugin({
+                extractComments: false,
+            }),
+        ],
+    },
 };