@lcap/nasl 4.1.0-rc.9 → 4.2.0-beta.2

package/out/service/storage/api.d.ts

@@ -14,7 +14,7 @@ declare namespace _default {
         }
         export { url_1 as url };
     }
-    namespace batchAction {
+    namespace newIncrQuery {
         export namespace url_2 {
             let method_2: string;
             export { method_2 as method };
@@ -23,7 +23,7 @@ declare namespace _default {
         }
         export { url_2 as url };
     }
-    namespace batchInstruct {
+    namespace batchAction {
         export namespace url_3 {
             let method_3: string;
             export { method_3 as method };
@@ -32,7 +32,7 @@ declare namespace _default {
         }
         export { url_3 as url };
     }
-    namespace cleanUselessUnit {
+    namespace batchInstruct {
         export namespace url_4 {
             let method_4: string;
             export { method_4 as method };
@@ -41,7 +41,7 @@ declare namespace _default {
         }
         export { url_4 as url };
     }
-    namespace saveFrontendNasl {
+    namespace cleanUselessUnit {
         export namespace url_5 {
             let method_5: string;
             export { method_5 as method };
@@ -50,7 +50,7 @@ declare namespace _default {
         }
         export { url_5 as url };
     }
-    namespace breakpoint {
+    namespace saveFrontendNasl {
         export namespace url_6 {
             let method_6: string;
             export { method_6 as method };
@@ -59,7 +59,7 @@ declare namespace _default {
         }
         export { url_6 as url };
     }
-    namespace databaseTypes {
+    namespace breakpoint {
         export namespace url_7 {
             let method_7: string;
             export { method_7 as method };
@@ -68,7 +68,7 @@ declare namespace _default {
         }
         export { url_7 as url };
     }
-    namespace aiCoachActionRecord {
+    namespace databaseTypes {
         export namespace url_8 {
             let method_8: string;
             export { method_8 as method };
@@ -77,6 +77,15 @@ declare namespace _default {
         }
         export { url_8 as url };
     }
+    namespace aiCoachActionRecord {
+        export namespace url_9 {
+            let method_9: string;
+            export { method_9 as method };
+            let path_9: string;
+            export { path_9 as path };
+        }
+        export { url_9 as url };
+    }
 }
 export default _default;
 //# sourceMappingURL=api.d.ts.map

package/out/service/storage/api.js

@@ -13,6 +13,12 @@ exports.default = {
             path: '/proxy/nasl-storage/api/storage/incrQuery',
         },
     },
+    newIncrQuery: {
+        url: {
+            method: 'post',
+            path: '/proxy/nasl-storage/api/storage/new/incrQuery',
+        },
+    },
     batchAction: {
         url: {
             method: 'post',

package/out/service/storage/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/service/storage/api.js"],"names":[],"mappings":";;AAAA,kBAAe;IACX,UAAU,EAAE;QACR,GAAG,EAAE;YACD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,4CAA4C;SACrD;KACJ;IACD,SAAS,EAAE;QACP,GAAG,EAAE;YACD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,2CAA2C;SACpD;KACJ;IACD,WAAW,EAAE;QACT,GAAG,EAAE;YACD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,6CAA6C;SACtD;KACJ;IACD,aAAa,EAAE;QACX,GAAG,EAAE;YACD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,+CAA+C;SACxD;KACJ;IACD,gBAAgB,EAAE;QACd,GAAG,EAAE;YACD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,oDAAoD;SAC7D;KACJ;IACD,gBAAgB,EAAE;QACd,GAAG,EAAE;YACD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,kDAAkD;SAC3D;KACJ;IACD,UAAU,EAAE;QACR,GAAG,EAAE;YACD,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,oCAAoC;SAC7C;KACJ;IACD,WAAW;IACX,aAAa,EAAE;QACX,GAAG,EAAE;YACD,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,wBAAwB;SACjC;KACJ;IACD,wCAAwC;IACxC,mBAAmB,EAAE;QACnB,GAAG,EAAE;YACH,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,+CAA+C;SACtD;KACF;CACJ,CAAC"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/service/storage/api.js"],"names":[],"mappings":";;AAAA,kBAAe;IACX,UAAU,EAAE;QACR,GAAG,EAAE;YACD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,4CAA4C;SACrD;KACJ;IACD,SAAS,EAAE;QACP,GAAG,EAAE;YACD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,2CAA2C;SACpD;KACJ;IACD,YAAY,EAAE;QACV,GAAG,EAAE;YACD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,+CAA+C;SACxD;KACJ;IACD,WAAW,EAAE;QACT,GAAG,EAAE;YACD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,6CAA6C;SACtD;KACJ;IACD,aAAa,EAAE;QACX,GAAG,EAAE;YACD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,+CAA+C;SACxD;KACJ;IACD,gBAAgB,EAAE;QACd,GAAG,EAAE;YACD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,oDAAoD;SAC7D;KACJ;IACD,gBAAgB,EAAE;QACd,GAAG,EAAE;YACD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,kDAAkD;SAC3D;KACJ;IACD,UAAU,EAAE;QACR,GAAG,EAAE;YACD,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,oCAAoC;SAC7C;KACJ;IACD,WAAW;IACX,aAAa,EAAE;QACX,GAAG,EAAE;YACD,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,wBAAwB;SACjC;KACJ;IACD,wCAAwC;IACxC,mBAAmB,EAAE;QACnB,GAAG,EAAE;YACH,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,+CAA+C;SACtD;KACF;CACJ,CAAC"}

package/out/service/storage/cache/index.d.ts

@@ -1,22 +1,10 @@
-import { BatchInstructResult } from '@lcap/nasl-types';
-import { App } from '@lcap/nasl-concepts';
-import { Instruct } from '../types';
-import { Operation } from '../operation';
-export declare function update({ res, err, instructList, operationList, app }: {
-    res: BatchInstructResult;
-    err: any;
-    instructList: Instruct[];
-    operationList: Operation[];
-    app: App;
-}): Promise<void>;
-export declare function canUseNaslCache(globalChangedTime: number): Promise<any>;
 /**
  * 取出缓存
  *
  * @description 只是取出缓存，并不校验缓存的有效性
  */
-export declare function getNaslCacheWithoutCheck(allData: any[], incrNasls: any[], appTree: {
+export declare function updateCheckNaslCache(allData: any[], incrNasls: any[]): Promise<any[]>;
+export declare function getAppTree(allData: any[], appTree: {
     [key: string]: string;
-}): Promise<any>;
-export declare function updateNaslCache(data: any, globalChangedTime: number): Promise<void>;
+}): any;
 //# sourceMappingURL=index.d.ts.map

package/out/service/storage/cache/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/service/storage/cache/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EACH,GAAG,EACJ,MAAM,qBAAqB,CAAC;AAE/B,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEpC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAqEzC,wBAAsB,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE;IACzE,GAAG,EAAE,mBAAmB,CAAC;IACzB,GAAG,EAAE,GAAG,CAAC;IACT,YAAY,EAAE,QAAQ,EAAE,CAAC;IACzB,aAAa,EAAE,SAAS,EAAE,CAAC;IAC3B,GAAG,EAAE,GAAG,CAAC;CACZ,iBAwMA;AAED,wBAAsB,eAAe,CAAC,iBAAiB,EAAE,MAAM,gBAa9D;AAmBD;;;;GAIG;AACH,wBAAsB,wBAAwB,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAC,gBAoDhH;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,iBAAiB,EAAE,MAAM,iBAsBzE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/service/storage/cache/index.ts"],"names":[],"mappings":"AAsBA;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,kBAsC1E;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAC,OAmB1E"}

package/out/service/storage/cache/index.js

@@ -1,281 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateNaslCache = exports.getNaslCacheWithoutCheck = exports.canUseNaslCache = exports.update = void 0;
+exports.getAppTree = exports.updateCheckNaslCache = void 0;
 const split_1 = require("./split");
-const lodash_1 = require("lodash");
 const nasl_utils_1 = require("@lcap/nasl-utils");
-const service_1 = require("@lcap/nasl-concepts/service");
 /** 禁用模式 */
 const disabled = nasl_utils_1.isNode || nasl_utils_1.isAutoTestEnv;
-const globalChangedKey = 'appGlobalChanged';
-function getNodes(node, onlyCurrent) {
-    if (!node) {
-        return [];
-    }
-    let newNode = node;
-    if (newNode?.__v_raw) {
-        newNode = newNode.__v_raw;
-    }
-    let newNodeJSON;
-    if (onlyCurrent) {
-        // 如果只需要自己的， 内部所有的文件级别节点 都不去遍历了， 其余的节点还是要的
-        function check(node) {
-            if (node?.concept && (0, service_1.checkNodeIsFileModule)(node)) {
-                return false;
-            }
-            return true;
-        }
-        newNodeJSON = newNode._toFileJSON(check);
-    }
-    else {
-        newNodeJSON = newNode.toJSON();
-    }
-    const fileNodes = (0, split_1.splitNaslObj)(newNodeJSON);
-    const nodePath = node.nodePath;
-    const nodeName = node.name;
-    const res = fileNodes.map((item, index) => {
-        const newItem = {
-            ...item
-        };
-        newItem.nodePath = item.nodePath.replace(nodeName, nodePath);
-        newItem.parentNodePath = item.parentNodePath ? item.parentNodePath.replace(nodeName, nodePath) : undefined;
-        if (!newItem?.parentKey || !newItem?.parentNodePath) {
-            newItem.parentKey = node.parentKey;
-            newItem.parentNodePath = node.parentNode?.nodePath;
-        }
-        return newItem;
-    });
-    return res;
-}
-function removeLastSegment(path) {
-    // 使用正则表达式匹配最后一个 .segment
-    const newPath = path.replace(/\.[^.]+$/, '');
-    return newPath;
-}
-function getParentKeyAndParentPath(nodePath) {
-    const lastIndex = nodePath.lastIndexOf('.');
-    // 获取parentNodePath
-    const parentNodePath = nodePath.substring(0, lastIndex);
-    // 获取parentKey
-    const namePath = nodePath.substring(lastIndex + 1);
-    const parentKeyMatch = namePath.match(/([^\.\[\]]+)\[/);
-    const parentKey = parentKeyMatch ? parentKeyMatch[1] : null;
-    return {
-        parentKey,
-        parentNodePath,
-    };
-}
-async function update({ res, err, instructList, operationList, app }) {
-    const startTime = Date.now();
-    // 有错误就不更新缓存
-    if (err || !window?.$IndexedDBHelper) {
-        return;
-    }
-    const { globalChangedTime, preGlobalChangedTime } = res;
-    // 需要重新 tojson 的修改
-    const updateNodeSet = new Set();
-    // 需要删除的节点
-    const deleteNodeSet = new Set();
-    // 需要重新生成，并且子节点也需要重新生成
-    const updateChildNodeSet = new Set();
-    // 直接查库， 更新时间就好
-    const getCacheUpdateTimePaths = new Set();
-    // 直接查库， 删除就好
-    const getDeletePaths = [];
-    // 要更新的节点
-    const changeRes = [
-        {
-            nodePath: globalChangedKey,
-            globalChangedTime,
-            forceUpdate: false,
-        }
-    ];
-    instructList.forEach(instructItem => {
-        instructItem.actions.forEach(actionItem => {
-            const { path, action, object } = actionItem;
-            let newPath = path;
-            // 如果是新增，因为这里传入的 是 object 不是 nasl 节点，而且 nodepath 是修改前的，所以不准，需要重新生成
-            if (action === 'create' && object?.name) {
-                const parts = path.split('.');
-                const lastPart = parts.pop();
-                const match = lastPart.match(/\[(\d+)\]/);
-                if (match) {
-                    parts.push(lastPart.replace(/\[\d+\]/, `[name=${object?.name}]`));
-                }
-                else {
-                    parts.push(lastPart);
-                }
-                newPath = parts.join('.');
-            }
-            // delete的时候 有 name 都用的 name
-            if (action === 'delete') {
-                // 删了东西之后，节点肯定是不在了，所以现查一下现在数据库有没有这个 path 的，没有就往上找一层，更新上一层
-                getDeletePaths.push(path);
-            }
-            else if (action === 'create') {
-                // 新增的时候都是有节点的， 所以直接查节点，和更新缓存就好了
-                let node = app.findNodeByPath(newPath);
-                // 个别没有的还是查上一级， 通过上级找到他
-                if (!node?.concept) {
-                    const removeLastNewPath = removeLastSegment(newPath);
-                    node = app.findNodeByPath(removeLastNewPath);
-                }
-                if (node?.concept) {
-                    // 增加有嵌套式的， 需要吧内部的节点都捞出来
-                    const fileNode = (0, service_1.getNodeFileModule)(node);
-                    // 只有新增的节点和nodePath是一样的，顶级节点才去看下一级有什么内容一起加上，否则只更新自己
-                    if (node.concept === fileNode.concept && node.nodePath === fileNode.nodePath) {
-                        updateChildNodeSet.add(fileNode);
-                    }
-                    else {
-                        updateNodeSet.add(fileNode);
-                    }
-                }
-                else {
-                    console.error(path, 3333);
-                }
-            }
-            else {
-                if (Object.keys(object).length === 1 && object.changedTime) {
-                    getCacheUpdateTimePaths.add(path);
-                    return;
-                }
-                const node = app.findNodeByPath(path);
-                if (node?.concept) {
-                    if (node.concept === 'App') {
-                        updateNodeSet.add(node);
-                    }
-                    else {
-                        const fileNode = (0, service_1.getNodeFileModule)(node);
-                        updateNodeSet.add(fileNode);
-                    }
-                }
-                else {
-                    if (object.name) {
-                        function updateLastLogicName(path, newName) {
-                            // 使用正则表达式匹配最后一个 [name=xxx]
-                            const regex = /\[name=[^\]]+\](?!.*\[name=[^\]]+\])/;
-                            // 使用新名字替换最后一个 [name=xxx]
-                            return path.replace(regex, `[name=${newName}]`);
-                        }
-                        const updatedPath = updateLastLogicName(path, object.name);
-                        const updatedNode = app.findNodeByPath(updatedPath);
-                        // 改名下面的子集也需要一起改名
-                        updateChildNodeSet.add(updatedNode);
-                        deleteNodeSet.add(path);
-                    }
-                }
-            }
-        });
-    });
-    const getDeleteNodes = await window?.$IndexedDBHelper.readDataBatch(getDeletePaths);
-    getDeleteNodes.forEach((nodeItem, index) => {
-        const path = getDeletePaths[index];
-        /**
-         *  删除节点的大概情况：
-         *  删除 logic1 这种节点本身，如果查到数据库有就删掉自身就好了，
-         *  删除 view1 这种节点，本身，以及子节点都要删除，(这种可能要把子节点，都找到删除，比如删除一个端，先不处理，当只删除自身， 重新进入时，更新)
-         *  删除 logic1 下的 if语句等， 需要冒泡到 逻辑本身上
-         *  删除 最后一个事件逻辑，可能还会删除 事件，然后冒泡的页面， 所以可能会找不到 node。
-         */
-        if (nodeItem.value) {
-            deleteNodeSet.add(path);
-        }
-        else {
-            const newPath = removeLastSegment(path);
-            const node = app.findNodeByPath(newPath);
-            if (node) {
-                const fileNode = (0, service_1.getNodeFileModule)(node);
-                updateNodeSet.add(fileNode);
-            }
-        }
-    });
-    const getCacheUpdateTimeNodes = await window?.$IndexedDBHelper.readDataBatch([...getCacheUpdateTimePaths]);
-    getCacheUpdateTimeNodes.forEach((nodeItem, index) => {
-        if (nodeItem.value) {
-            const item = nodeItem.value;
-            changeRes.push(item);
-        }
-        else {
-            const keys = getCacheUpdateTimePaths.keys();
-            const path = [...keys][index];
-            const node = app.findNodeByPath(path);
-            if (node) {
-                const fileNode = (0, service_1.getNodeFileModule)(node);
-                updateNodeSet.add(fileNode);
-            }
-        }
-    });
-    console.log('nasl storage data change: updateNodeSet, updateChildNodeSet, deleteNodeSet, changeRes');
-    console.log(updateNodeSet, updateChildNodeSet, deleteNodeSet, changeRes);
-    if (updateNodeSet.size || updateChildNodeSet.size || changeRes.length) {
-        const changeNodes = [];
-        // 需要改自己和子集的
-        updateChildNodeSet.forEach((node) => {
-            changeNodes.push(...getNodes(node));
-        });
-        // 只需要改自己的
-        updateNodeSet.forEach((node) => {
-            changeNodes.push(...getNodes(node, true));
-        });
-        const processedNodes = [];
-        const nodePathMap = new Map();
-        for (const node of [...changeNodes, ...changeRes]) {
-            // 检查是否已存在
-            if (!nodePathMap.get(node.nodePath)) {
-                // 因为tojson 之后的数据，可能被 vue 劫持，所以克隆 nasl 属性
-                if (changeNodes.includes(node)) {
-                    node.nasl = (0, lodash_1.cloneDeep)(node.nasl);
-                }
-                // 更新缓存时间
-                node._changedTime = globalChangedTime;
-                if (node?.nasl?._changedTime) {
-                    node.nasl._changedTime = globalChangedTime;
-                }
-                nodePathMap.set(node.nodePath, true);
-                processedNodes.push(node);
-            }
-        }
-        nasl_utils_1.isDebugMode && console.dir(processedNodes);
-        window?.$IndexedDBHelper.storeDataBatch(processedNodes);
-    }
-    if (deleteNodeSet.size) {
-        window?.$IndexedDBHelper.storeDataRemoveBatch([...deleteNodeSet]);
-    }
-    // 需要看看是不是有别的 tab 或者内容修改，
-    // 把本地存储的上次修改的时间拿出来， 用本次修改的返回的上次修改的时间，比较，如果不一样就要去 getquery
-    // const oldChangeObj = await (window as any)?.$IndexedDBHelper.readData(globalChangedKey);
-    // const newChangeObj = {
-    //     nodePath: globalChangedKey,
-    //     globalChangedTime,
-    //     forceUpdate: oldChangeObj?.forceUpdate || false,
-    // }
-    // if (oldChangeObj?.globalChangedTime !== preGlobalChangedTime) {
-    //     newChangeObj.forceUpdate = true
-    // }
-    // console.log(newChangeObj, 3333, 'newChangeObj')
-    // (window as any)?.$IndexedDBHelper.storeData(newChangeObj);
-    const endTime = Date.now();
-    if (endTime - startTime > 50) {
-        console.log(`更新缓存耗时: ${endTime - startTime}ms`);
-    }
-}
-exports.update = update;
-async function canUseNaslCache(globalChangedTime) {
-    if (disabled) {
-        return;
-    }
-    try {
-        const data = await window?.$IndexedDBHelper.readData(globalChangedKey);
-        // 缓存有缓存时间， 就是可以用缓存
-        return data?.globalChangedTime;
-    }
-    catch (error) {
-        // 读取数据出错时，返回 false
-        return false;
-    }
-}
-exports.canUseNaslCache = canUseNaslCache;
 const getAppTreePaths = (obj, parentPath = '') => {
     let paths = [];
     for (let key in obj) {
@@ -298,10 +27,16 @@ const getAppTreePaths = (obj, parentPath = '') => {
  *
  * @description 只是取出缓存，并不校验缓存的有效性
  */
-async function getNaslCacheWithoutCheck(allData, incrNasls, appTree) {
+async function updateCheckNaslCache(allData, incrNasls) {
+    // 没有更新的长度就return掉
+    if (!incrNasls?.length) {
+        console.dir('检测无更新，使用 Nasl 前端缓存');
+        return allData;
+    }
+    // 有更新，就把更新，替换缓存
     const updateData = [];
     const deleteData = [];
-    incrNasls.forEach((item) => {
+    (incrNasls || []).forEach((item) => {
         const findIndex = allData.findIndex(cacheItem => item.path === cacheItem.nodePath);
         if (item.type === 'delete') {
             allData.splice(findIndex, 1);
@@ -311,7 +46,6 @@ async function getNaslCacheWithoutCheck(allData, incrNasls, appTree) {
             const newItem = {
                 nasl: item.nasl,
                 nodePath: item.path,
-                ...getParentKeyAndParentPath(item.path),
                 _changedTime: item.nasl._changedTime,
             };
             updateData.push(newItem);
@@ -327,6 +61,10 @@ async function getNaslCacheWithoutCheck(allData, incrNasls, appTree) {
     // 需要 await ，存储后，在进行下面的排序 和 合并 nasl ，合并 nasl 会改变对象中的值
     await window?.$IndexedDBHelper.storeDataBatch(updateData);
     window?.$IndexedDBHelper.storeDataRemoveBatch(deleteData);
+    return allData;
+}
+exports.updateCheckNaslCache = updateCheckNaslCache;
+function getAppTree(allData, appTree) {
     // 进行排序
     if (appTree) {
         // 因为 indexdb 拿出来的数据 都是没有顺序的，所以这里要按照 服务端返回的 nasl 的顺序来排列
@@ -344,28 +82,5 @@ async function getNaslCacheWithoutCheck(allData, incrNasls, appTree) {
     const batchQueryRes = (0, split_1.mergeNaslObj)(allData);
     return batchQueryRes;
 }
-exports.getNaslCacheWithoutCheck = getNaslCacheWithoutCheck;
-async function updateNaslCache(data, globalChangedTime) {
-    // 进行前端缓存
-    if (!window?.$IndexedDBHelper) {
-        return;
-    }
-    console.time('拆分nasl');
-    const newFiles = (0, split_1.splitNaslObj)(data);
-    console.timeEnd('拆分nasl');
-    // 请求过之后，全局更新一把
-    const newChangeObj = {
-        nodePath: globalChangedKey,
-        globalChangedTime,
-        forceUpdate: false,
-    };
-    newFiles.unshift(newChangeObj);
-    console.time('存储数据库');
-    // 先清除所有数据库的内容
-    await window?.$IndexedDBHelper.clear();
-    // 更新存储数据库
-    await window?.$IndexedDBHelper.storeDataBatch(newFiles);
-    console.timeEnd('存储数据库');
-}
-exports.updateNaslCache = updateNaslCache;
+exports.getAppTree = getAppTree;
 //# sourceMappingURL=index.js.map

package/out/service/storage/cache/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/service/storage/cache/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/service/storage/cache/index.ts"],"names":[],"mappings":"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"}

package/out/service/storage/cache/split.d.ts

@@ -1,27 +1,6 @@
-import { NASLObject } from '@lcap/nasl-types';
-interface FileModuleData {
-    /** 当前模块数据 */
-    nasl: object;
-    /** 根节点路径 */
-    nodePath: string;
-    /** 若是在数组中，它在上级节点中的下标 */
-    parentIndex?: number;
-    /** 上级节点的 key */
-    parentKey?: string;
-    /** 上级节点的路径 */
-    parentNodePath?: string;
-    /** 当前节点修改的时间 */
-    _changedTime?: string;
-}
-/**
- * 拆分 Nasl 对象
- * @param app
- */
-export declare function splitNaslObj(app: NASLObject.AppObject): FileModuleData[];
 /**
  * 合并 Nasl 对象
  * @param app
  */
 export declare function mergeNaslObj(fileNodes: any[]): any;
-export {};
 //# sourceMappingURL=split.d.ts.map

package/out/service/storage/cache/split.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"split.d.ts","sourceRoot":"","sources":["../../../../src/service/storage/cache/split.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAI9C,UAAU,cAAc;IACtB,aAAa;IACb,IAAI,EAAE,MAAM,CAAC;IACb,YAAY;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,wBAAwB;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,gBAAgB;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,GAAG,EAAE,UAAU,CAAC,SAAS,GAAG,cAAc,EAAE,CAuBxE;AAID;;;GAGG;AAEH,wBAAgB,YAAY,CAAC,SAAS,EAAE,GAAG,EAAE,OA0B5C"}
+{"version":3,"file":"split.d.ts","sourceRoot":"","sources":["../../../../src/service/storage/cache/split.ts"],"names":[],"mappings":"AAiBA;;;GAGG;AAEH,wBAAgB,YAAY,CAAC,SAAS,EAAE,GAAG,EAAE,OAiC5C"}

package/out/service/storage/cache/split.js

@@ -1,36 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeNaslObj = exports.splitNaslObj = void 0;
-const service_1 = require("@lcap/nasl-concepts/service");
+exports.mergeNaslObj = void 0;
 const nasl_concepts_1 = require("@lcap/nasl-concepts");
-/**
- * 拆分 Nasl 对象
- * @param app
- */
-function splitNaslObj(app) {
-    const fileNodes = (0, service_1.getFileModuleNodesByNasl)(app);
-    const map = {};
-    for (const node of fileNodes) {
-        const parentNode = (0, nasl_concepts_1.findNodeObjectByPath)(app, node.parentNodePath || '');
-        map[node.parentNodePath] = parentNode;
-    }
-    for (const node of fileNodes) {
-        if (!node.parentNodePath) {
-            continue;
-        }
-        const nodeObj = node.nasl;
-        const parentNode = map[node.parentNodePath];
-        if (Array.isArray(parentNode[node.parentKey])) {
-            const findIndex = parentNode[node.parentKey].findIndex((item) => item === nodeObj);
-            parentNode[node.parentKey].splice(findIndex, 1);
-        }
-        else {
-            console.log(node, 2222);
-        }
-    }
-    return fileNodes;
+function getParentKeyAndParentPath(nodePath) {
+    const lastIndex = nodePath.lastIndexOf('.');
+    // 获取parentNodePath
+    const parentNodePath = nodePath.substring(0, lastIndex);
+    // 获取parentKey
+    const namePath = nodePath.substring(lastIndex + 1);
+    const parentKeyMatch = namePath.match(/([^\.\[\]]+)\[/);
+    const parentKey = parentKeyMatch ? parentKeyMatch[1] : null;
+    return {
+        parentKey,
+        parentNodePath,
+    };
 }
-exports.splitNaslObj = splitNaslObj;
 /**
  * 合并 Nasl 对象
  * @param app
@@ -42,13 +26,20 @@ function mergeNaslObj(fileNodes) {
         map[node.nodePath] = node.nasl;
     }
     for (const node of fileNodes) {
-        if (!node.parentNodePath) {
+        const { parentNodePath, parentKey } = getParentKeyAndParentPath(node.nodePath);
+        if (!parentNodePath) {
             continue;
         }
-        const parentNode = map[node.parentNodePath] || (0, nasl_concepts_1.findNodeObjectByPath)(app, node.parentNodePath || '');
+        const parentNode = map[parentNodePath] || (0, nasl_concepts_1.findNodeObjectByPath)(app, parentNodePath || '');
         if (parentNode) {
-            if (Array.isArray(parentNode[node.parentKey])) {
-                parentNode[node.parentKey].push(node.nasl);
+            const parentArray = parentNode[parentKey];
+            if (Array.isArray(parentArray)) {
+                // 检查是否已存在相同name的对象
+                const exists = parentArray.some(item => item.name === node.nasl.name);
+                if (exists) {
+                    throw new Error(`名称 '${node.nasl.name}' 已存在，重复添加！`);
+                }
+                parentArray.push(node.nasl);
             }
             else {
                 console.error(node, 888);

package/out/service/storage/cache/split.js.map

@@ -1 +1 @@
-{"version":3,"file":"split.js","sourceRoot":"","sources":["../../../../src/service/storage/cache/split.ts"],"names":[],"mappings":";;;AACA,yDAAuE;AACvE,uDAA2D;AAiB3D;;;GAGG;AACH,SAAgB,YAAY,CAAC,GAAyB;IACpD,MAAM,SAAS,GAAG,IAAA,kCAAwB,EAAC,GAAG,CAAC,CAAC;IAChD,MAAM,GAAG,GAAQ,EAAE,CAAA;IACnB,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,UAAU,GAAG,IAAA,oCAAoB,EAAC,GAAG,EAAE,IAAI,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC;QACxE,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,UAAU,CAAA;IACvC,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,SAAS;QACX,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1B,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAE5C,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;YAC9C,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,KAAK,OAAO,CAAC,CAAA;YACvF,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,CAAA;QACjD,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACzB,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAvBD,oCAuBC;AAID;;;GAGG;AAEH,SAAgB,YAAY,CAAC,SAAgB;IAC3C,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IACnE,MAAM,GAAG,GAAQ,EAAE,CAAA;IAEnB,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,IAAI,CAAA;IAChC,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;YACzB,SAAS;QACX,CAAC;QACD,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,IAAA,oCAAoB,EAAC,GAAG,EAAE,IAAI,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC;QACpG,IAAI,UAAU,EAAE,CAAC;YACf,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;gBAC9C,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC5C,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;YAC1B,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QAC1B,CAAC;IACH,CAAC;IAED,yBAAyB;IACzB,OAAO,GAAG,CAAC;AACb,CAAC;AA1BD,oCA0BC"}
+{"version":3,"file":"split.js","sourceRoot":"","sources":["../../../../src/service/storage/cache/split.ts"],"names":[],"mappings":";;;AAAA,uDAA2D;AAG3D,SAAS,yBAAyB,CAAC,QAAgB;IACjD,MAAM,SAAS,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;IAC3C,mBAAmB;IACnB,MAAM,cAAc,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;IAExD,cAAc;IACd,MAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC;IACnD,MAAM,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5D,OAAO;QACH,SAAS;QACT,cAAc;KACjB,CAAC;AACJ,CAAC;AACD;;;GAGG;AAEH,SAAgB,YAAY,CAAC,SAAgB;IAC3C,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IACnE,MAAM,GAAG,GAAQ,EAAE,CAAA;IAEnB,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,IAAI,CAAA;IAChC,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC7B,MAAM,EAAE,cAAc,EAAE,SAAS,EAAE,GAAG,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC9E,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,SAAS;QACX,CAAC;QACD,MAAM,UAAU,GAAG,GAAG,CAAC,cAAc,CAAC,IAAI,IAAA,oCAAoB,EAAC,GAAG,EAAE,cAAc,IAAI,EAAE,CAAC,CAAC;QAC1F,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,WAAW,GAAG,UAAU,CAAC,SAAS,CAAC,CAAA;YACzC,IAAI,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC/B,mBAAmB;gBACnB,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACtE,IAAI,MAAM,EAAE,CAAC;oBACX,MAAM,IAAI,KAAK,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,CAAC;gBACtD,CAAC;gBACD,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAC7B,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;YAC1B,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QAC1B,CAAC;IACH,CAAC;IAED,yBAAyB;IACzB,OAAO,GAAG,CAAC;AACb,CAAC;AAjCD,oCAiCC"}

package/out/service/storage/init.d.ts

@@ -51,6 +51,15 @@ export interface ProxyApp extends App {
     _historyName?: string;
 }
 export declare function handleApp(app: ProxyApp): void;
+export declare function getNaslIncrQuery(appId: string): Promise<{
+    fullNasl: any;
+    naslAllData?: undefined;
+    appTree?: undefined;
+} | {
+    naslAllData: any[];
+    appTree: any;
+    fullNasl?: undefined;
+}>;
 export declare const setStore: (store: any) => void;
 /**
  * 加载 app