@lcap/nasl 3.7.0-beta.4 → 3.7.0-beta.5

package/out/server/getLogics.js

@@ -140,7 +140,7 @@ function getElementsMethods(likeComponent, parentNodeNames) {
             }
             const viewElement = new __1.Namespace({
                 title: toHump(item.name),
-                logics: eleLogis.filter(e => e).map((item) => __1.Logic.from(item.toJSON())),
+                logics: eleLogis.filter(e => e?.toJSON).map((item) => __1.Logic.from(item.toJSON())),
                 path,
                 originConcept: 'ViewElement',
             });
@@ -176,8 +176,12 @@ function getLogicsSync(node, needAllLogic = true) {
                 pItem.originConcept = 'Process';
                 return pItem;
             });
-            const dependencies = app.dependencies; //.filter((d) => d.enable);
-            const extensions = app.dependencies
+            // 连接器 相关迁移到了 conenctorDependencies 下，因此这边需要扩展
+            const dependencies = [
+                ...app.dependencies,
+                ...(app.connectorDependencies || [])
+            ]; //.filter((d) => d.enable);
+            const extensions = [...app.dependencies, ...(app.connectorDependencies || [])]
                 .map((dep) => (0, getExtensionModules_1.moduleToLogicNamesapce)(dep, app.overriddenLogics))
                 .filter((item) => item.logics && item.logics.length);
             const dependEntityNs = [];
@@ -294,10 +298,14 @@ function getLogicsSync(node, needAllLogic = true) {
                                 'getIsMiniApp',
                                 'navigateToUserInfo',
                                 'getWeChatHeadImg',
+                                'getWeChatLocation',
                                 'getWeChatNickName',
                                 'getWeChatPhone',
                                 'getWeChatOpenid',
                                 'navigateToUserPhone',
+                                'navigateToScanCode',
+                                'getWeChatScanCode',
+                                'navigateToLocation'
                             ].includes(item.name)),
                         expanded: false,
                     }),
@@ -370,7 +378,7 @@ function getLogicsSync(node, needAllLogic = true) {
                     title: '微信',
                     logics: (0, __1.getStdlibNamespace)()
                         .findChild('browser')
-                        .logics.filter((item) => ['navigateToUserInfo', 'getWeChatHeadImg', 'getWeChatNickName', 'getWeChatOpenid', 'navigateToUserPhone', 'getWeChatPhone'].includes(item.name)),
+                        .logics.filter((item) => ['navigateToUserInfo', 'getWeChatHeadImg', 'getWeChatNickName', 'getWeChatOpenid', 'navigateToUserPhone', 'getWeChatPhone', 'navigateToScanCode', 'getWeChatScanCode', 'navigateToLocation', 'getWeChatLocation'].includes(item.name)),
                     expanded: false,
                 }));
             }
@@ -437,8 +445,14 @@ function getLogicsSync(node, needAllLogic = true) {
         }
         return result;
     }
-    else if (node?.concept === 'Identifier') {
-        const extensions = app.dependencies
+    if (node?.concept === 'Identifier') {
+        // 之前 连接器 Connector 相关也存在与 app.dependencies 下，
+        // 现在迁移到 app.connectorDependencies 下，
+        // 为保证上下游逻辑与之前保持一致，这边做相应的扩展
+        const extensions = [
+            ...app.dependencies,
+            ...(app.connectorDependencies || [])
+        ]
             .map((dep) => (0, getExtensionModules_1.moduleToLogicNamesapce)(dep, app.overriddenLogics))
             .filter((item) => item.logics && item.logics.length);
         const tree = new __1.Namespace({

package/out/server/getLogics.js.map

@@ -1 +1 @@
-{"version":3,"file":"getLogics.js","sourceRoot":"","sources":["../../src/server/getLogics.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getLogics.js","sourceRoot":"","sources":["../../src/server/getLogics.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0BAkBY;AACZ,qEAAkE;AAClE,+DAA+D;AAC/D,gDAAkC;AAYlC,SAAS,QAAQ,CAAC,IAAgC,EAAE,aAAqB,EAAE,QAAkB;IAC3F,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE;QACtB,GAAG,IAAI;KACR,CAAC,CAAC;IACH,IAAI,aAAa,EAAE;QACjB,QAAQ,CAAC,QAAQ,GAAG,EAAE,CAAC;QACvB,QAAQ,CAAC,MAAM,GAAG,EAAE,CAAC;QACrB,2BAA2B;QAC3B,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC1B,MAAM,aAAa,GAAG,EAAE,CAAC;gBACzB,IAAI,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC;oBAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;qBACjI,IAAI,QAAQ,CAAC,CAAC,EAAE,aAAa,EAAE,aAAa,CAAC,EAAE;oBAClD,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;iBACvC;YACH,CAAC,CAAC,CAAC;SACJ;QACD,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACxB,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;gBAC3D,IAAI,KAAK,EAAE;oBACT,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBACzB;YACH,CAAC,CAAC,CAAC;SACJ;QACD,wBAAwB;QACxB,sCAAsC;QACtC,oCAAoC;QACpC,2DAA2D;QAC3D,sDAAsD;QACtD,YAAY;QACZ,UAAU;QACV,IAAI;QACJ,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YAC9D,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAED,SAAS,MAAM,CAAC,IAAY;IAC1B,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;AACxE,CAAC;AAED,SAAS,yBAAyB,CAAC,MAAe;IAChD,MAAM,YAAY,GAAY,EAAE,CAAC;IACjC,MAAM,UAAU,GAAY,EAAE,CAAC;IAE/B,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACvB,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,GAAG,KAAK,CAAC;QAE5B,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,WAAW,EAAE;YAC1D,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACxB;aAAM;YACL,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC1B;IACH,CAAC,CAAC,CAAC;IACH,OAAO;QACL,YAAY;QACZ,UAAU;KACX,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAc,EAAE,eAA8B;IACxE,IAAI,IAAI,EAAE;QACR,IAAI,IAAI,CAAC,OAAO,KAAK,aAAa,EAAE;YAClC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACjC;QACD,kBAAkB,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;KACtD;AACH,CAAC;AAEM,KAAK,UAAU,SAAS,CAAC,IAAgD,EAAE,eAAwB,IAAI;IAC5G,OAAO,aAAa,CAAC,IAAI,EAAE,YAAY,CAAC,CAAA;AAC1C,CAAC;AAFD,8BAEC;AAED,aAAa;AACb,SAAS,kBAAkB,CAAC,aAAuC,EAAE,eAAyB;IAC5F,oBAAoB;IACpB,MAAM,QAAQ,GAAuB,EAAE,CAAC;IACxC,aAAa,CAAC,eAAe,CAAC,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;IACjF,QAAQ;IACR,MAAM,YAAY,GAAG,aAAa,CAAC,WAAW,CAAC,cAAc,CAAiB,CAAC;IAC/E,UAAU;IACV,MAAM,kBAAkB,GAAG,YAAY,EAAE,kBAAkB,CAAC;IAC5D,QAAQ;IACR,MAAM,GAAG,GAAG,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,YAAY,GAAqB,EAAE,CAAC;IAC1C,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,IAAI,iBAAiB,CAAC;QACtB,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YAC9B,iBAAiB,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC,iBAAiB,EAAE,EAAE;gBAChE,OAAO,MAAM,iBAAiB,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC,GAAG,CAAC;YACtD,CAAC,CAAC,CAAC;SACJ;QACD,IAAI,QAAQ,CAAC;QACb,IAAI,iBAAiB,EAAE;YACrB,QAAQ,GAAG,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;gBACpD,OAAO,KAAK,CAAC,QAAQ,CAAC;YACxB,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC7C,MAAM,UAAU,GAAI,GAAW,CAAC,UAAU,CAAC;YAC3C,MAAM,aAAa,GAAG,UAAU,EAAE,aAAa,CAAC;YAChD,MAAM,iBAAiB,GAAG,OAAO,CAAC;YAClC,QAAQ,GAAG,aAAa,EAAE,CAAC,iBAAiB,CAAC,CAAC;SAC/C;QACD,kBAAkB;QAClB,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,EAAE;YAC9C,IAAI,IAAI,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;YAClD,IAAI,iBAAiB,EAAE;gBACrB,IAAI,GAAG,YAAY,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;aACxC;YACD,MAAM,WAAW,GAAG,IAAI,aAAS,CAAC;gBAChC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;gBACxB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,IAAW,EAAE,EAAE,CAAC,SAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;gBACvF,IAAI;gBACJ,aAAa,EAAE,aAAa;aAC7B,CAAC,CAAC;YACH,WAAW,CAAC,QAAQ,GAAG,KAAK,CAAC;YAC7B,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAChC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAgB,aAAa,CAAC,IAAgD,EAAE,eAAwB,IAAI;IAC1G,MAAM,GAAG,GAAG,IAAI,EAAE,QAAe,CAAC;IAClC,IAAI,IAAI,EAAE,OAAO,KAAK,WAAW,IAAI,IAAI,EAAE,OAAO,KAAK,WAAW,IAAI,IAAI,EAAE,OAAO,KAAK,OAAO,EAAE;QAC/F,MAAM,MAAM,GAAG,EAAE,CAAC;QAElB,IAAI,YAAY,EAAE;YAChB,MAAM,EAAE,GAAgB,EAAE,CAAC;YAC3B,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;gBAClC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;oBACrC,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;wBACtC,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;wBAC5D,EAAE,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;qBAClB;gBACH,CAAC,CAAC,CAAC;aACJ;YACD,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACd,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC9E,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;gBACtB,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC;gBAC9B,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;YACH,MAAM,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACjC,MAAM,KAAK,GAAG,IAAA,+CAAsB,EAAC,CAAC,CAAC,CAAC;gBACxC,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC;gBACvB,KAAK,CAAC,aAAa,GAAG,SAAS,CAAC;gBAChC,OAAO,KAAK,CAAC;YACf,CAAC,CAAC,CAAC;YACH,8CAA8C;YAC9C,MAAM,YAAY,GAAG;gBACnB,GAAG,GAAG,CAAC,YAAY;gBACnB,GAAG,CAAC,GAAG,CAAC,qBAAqB,IAAI,EAAE,CAAC;aACrC,CAAC,CAAC,2BAA2B;YAC9B,MAAM,UAAU,GAAG,CAAC,GAAG,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,GAAG,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC;iBAC3E,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,4CAAsB,EAAC,GAAG,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC;iBAC/D,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACvD,MAAM,cAAc,GAAgB,EAAE,CAAC;YACvC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC3B,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;oBAC7C,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;wBACtC,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;wBAC5D,cAAc,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;qBAC9B;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACH,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC9E,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;gBACtB,IAAI,CAAC,aAAa,GAAG,mBAAmB,CAAC;gBACzC,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,IAAI,aAAS,CAAC;gBACzB,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,GAAG,GAAG,CAAC,YAAY,EAAE,SAAS;gBACpC,KAAK,EAAE,OAAO;gBACd,MAAM,EAAE,yBAAyB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,YAAY;gBAC1D,QAAQ,EAAE;oBACR,GAAG,EAAE;oBACL,GAAG,UAAU;oBACb,GAAG,cAAc;oBACjB,GAAG,EAAE;oBACL,IAAI,aAAS,CAAC;wBACZ,IAAI,EAAE,mBAAmB;wBACzB,KAAK,EAAE,MAAM;wBACb,MAAM,EAAE,yBAAyB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,UAAU;wBACxD,QAAQ,EAAE,KAAK;qBAChB,CAAC;iBACH;aACF,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YACtB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACnB;QAED,MAAM,aAAa,GAAG,IAAA,sBAAkB,GAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;QACvE,MAAM,iBAAiB,GAAG,IAAI,aAAS,CAAC;YACtC,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,MAAM;YACb,QAAQ,EAAE;gBACR,IAAI,aAAS,CAAC;oBACZ,IAAI,EAAE,UAAU;oBAChB,KAAK,EAAE,MAAM;oBACb,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;oBAC/E,QAAQ,EAAE,KAAK;iBAChB,CAAC;gBACF,IAAI,aAAS,CAAC;oBACZ,IAAI,EAAE,UAAU;oBAChB,KAAK,EAAE,MAAM;oBACb,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;oBACjF,QAAQ,EAAE,KAAK;iBAChB,CAAC;gBACF,IAAI,aAAS,CAAC;oBACZ,IAAI,EAAE,UAAU;oBAChB,KAAK,EAAE,MAAM;oBACb,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;oBACtH,QAAQ,EAAE,KAAK;iBAChB,CAAC;gBACF,IAAI,aAAS,CAAC;oBACZ,IAAI,EAAE,UAAU;oBAChB,KAAK,EAAE,MAAM;oBACb,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;oBAC9E,QAAQ,EAAE,KAAK;iBAChB,CAAC;aACH;YACD,QAAQ,EAAE,KAAK;SAChB,CAAC,CAAC;QAEH,QAAQ;QACR,MAAM,aAAa,GAA6B,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAsB,CAAC;QACxH,IAAI,aAAa,EAAE,MAAM,EAAE;YACzB,sCAAsC;YACtC,MAAM,eAAe,GAAkB,EAAE,CAAC;YAC1C,kBAAkB,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;YACrD,oBAAoB;YACpB,MAAM,YAAY,GAAgB,kBAAkB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;YACrF,MAAM,QAAQ,GAAG;gBACf,IAAI,EAAE,MAAM;gBACZ,iBAAiB,EAAE,QAAQ;aAC5B,CAAC;YACF,SAAS;YACT,MAAM,IAAI,GAAG,IAAI,aAAS,CAAC;gBACzB,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,GAAG,aAAa,CAAC,YAAY,EAAE,IAAI,aAAa,CAAC,IAAI,SAAS;gBACpE,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC;gBACtC,MAAM,EAAE,aAAa,CAAC,MAAM;gBAC5B,QAAQ,EAAE,YAAY;aACvB,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;YACtB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClB,MAAM,qBAAqB,GAAG,IAAA,sBAAkB,GAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,sBAAsB,CAAC,CAAC;YACtI,MAAM,oBAAoB,GAAG,IAAA,sBAAkB,GAAE,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,sBAAsB,CAAC,CAAC;YAEnI,MAAM,cAAc,GAAG,CAAC,eAAe,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAC;YAC3E,MAAM,mBAAmB,GAAG,IAAA,sBAAkB,GAAE,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YACzI,MAAM,UAAU,GAAG,IAAA,sBAAkB,GAAE,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAE/H,MAAM,UAAU,GAAG,IAAI,aAAS,CAAC;gBAC/B,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,MAAM;gBACb,QAAQ,EAAE;oBACR,iBAAiB;oBACjB,IAAI,aAAS,CAAC;wBACZ,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,SAAS;wBACf,KAAK,EAAE,KAAK;wBACZ,MAAM,EACJ,IAAI,EAAE,QAAQ,EAAE,IAAI,KAAK,IAAI;4BAC3B,CAAC,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,aAAa,EAAE,aAAa,EAAE,cAAc,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;4BAC5G,CAAC,CAAC,qBAAqB,CAAC,MAAM,CAC5B,CAAC,IAAI,EAAE,EAAE,CACP,CAAC;gCACC,aAAa;gCACb,aAAa;gCACb,cAAc;gCACd,oBAAoB;gCACpB,kBAAkB;gCAClB,mBAAmB;gCACnB,mBAAmB;gCACnB,gBAAgB;gCAChB,iBAAiB;gCACjB,qBAAqB;gCACrB,oBAAoB;gCACpB,mBAAmB;gCACnB,oBAAoB;6BACrB,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CACxB;wBACL,QAAQ,EAAE,KAAK;qBAChB,CAAC;oBACF,IAAI,aAAS,CAAC;wBACZ,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,OAAO;wBACd,MAAM,EAAE,IAAA,sBAAkB,GAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,gBAAgB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBACxK,QAAQ,EAAE,KAAK;qBAChB,CAAC;oBACF,IAAI,aAAS,CAAC;wBACZ,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,eAAe;wBACrB,KAAK,EAAE,MAAM;wBACb,MAAM,EAAE,mBAAmB;wBAC3B,QAAQ,EAAE,KAAK;qBAChB,CAAC;oBACF,IAAI,aAAS,CAAC;wBACZ,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,KAAK;wBACZ,MAAM,EAAE,UAAU;wBAClB,QAAQ,EAAE,KAAK;qBAChB,CAAC;iBACH;gBACD,QAAQ,EAAE,KAAK;aAChB,CAAC,CAAC;YAEH;;;;eAIG;YACH,mBAAmB;YAEnB,SAAS;YACT,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YACpD,IAAI,aAAa,IAAK,aAA2B,CAAC,MAAM,CAAC,MAAM,EAAE;gBAC/D,MAAM,SAAS,GAAI,aAA2B,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;gBACzD,IAAI,SAAS,CAAC,aAAa,EAAE,MAAM,IAAI,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE;oBACzH,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;iBAC1D;gBAED,oBAAoB;gBACpB,IAAI,SAAS,CAAC,aAAa,EAAE,MAAM,EAAE;oBACnC,MAAM,UAAU,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;oBAE9C,IAAI,OAAO,GAAG,KAAK,CAAC;oBAEpB,IAAI,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC,QAAQ,CAAC,UAAU,EAAE,gBAAgB,EAAE,QAAQ,CAAC,EAAE;wBACpF,OAAO,GAAG,IAAI,CAAC;qBAChB;yBAAM,IACL,UAAU,EAAE,gBAAgB,EAAE,QAAQ,KAAK,oBAAoB;wBAC/D,UAAU,EAAE,gBAAgB,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAC5G;wBACA,OAAO,GAAG,IAAI,CAAC;qBAChB;oBAED,IAAI,OAAO,EAAE;wBACX,UAAU,CAAC,QAAQ,CAAC,IAAI,CACtB,IAAI,aAAS,CAAC;4BACZ,IAAI,EAAE,UAAU;4BAChB,IAAI,EAAE,OAAO;4BACb,KAAK,EAAE,MAAM;4BACb,MAAM,EAAE,IAAA,sBAAkB,GAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,MAAM;4BACtD,QAAQ,EAAE,KAAK;yBAChB,CAAC,CACH,CAAC;qBACH;iBACF;aACF;YACD;;eAEG;YAEH,IAAI,IAAI,EAAE,QAAQ,EAAE,IAAI,KAAK,IAAI,EAAE;gBACjC,UAAU,CAAC,QAAQ,CAAC,IAAI,CACtB,IAAI,aAAS,CAAC;oBACZ,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE,IAAI;oBACX,MAAM,EAAE,IAAA,sBAAkB,GAAE;yBACzB,SAAS,CAAC,SAAS,CAAC;yBACpB,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,oBAAoB,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,gBAAgB,EAAC,oBAAoB,EAAC,mBAAmB,EAAC,oBAAoB,EAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC7P,QAAQ,EAAE,KAAK;iBAChB,CAAC,CACH,CAAC;aACH;iBAAM,IAAI,IAAI,EAAE,QAAQ,EAAE,IAAI,KAAK,IAAI,EAAE;gBACxC,UAAU,CAAC,QAAQ,CAAC,IAAI,CACtB,IAAI,aAAS,CAAC;oBACZ,IAAI,EAAE,UAAU;oBAChB,IAAI,EAAE,IAAI;oBACV,KAAK,EAAE,MAAM;oBACb,MAAM,EAAE,IAAA,sBAAkB,GAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,MAAM;oBACnD,QAAQ,EAAE,KAAK;iBAChB,CAAC,CACH,CAAC;aACH;YAED,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAChC,sBAAsB;gBACtB,cAAc;gBACd,IAAI;gBACJ,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAM,IAAI,EAAE,WAAW,CAAC,cAAc,CAAkB,EAAE,IAAI,CAAC,CAAC;gBACnH,IAAI,GAAG,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC1B,UAAU,CAAC,QAAQ,CAAC,IAAI,CACtB,IAAI,aAAS,CAAC;wBACZ,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,cAAc;wBACpB,KAAK,EAAE,IAAI,CAAC,IAAI;wBAChB,MAAM,EAAE,GAAG,CAAC,MAAM;wBAClB,QAAQ,EAAE,KAAK;qBAChB,CAAC,CACH,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM;gBAAE,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAEvD,UAAU,CAAC,QAAQ,GAAG,KAAK,CAAC;YAC5B,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC;YACjE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACzB;aAAM;YACL,gBAAgB;YAChB,MAAM,UAAU,GAAG,IAAI,aAAS,CAAC;gBAC/B,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,MAAM;gBACb,QAAQ,EAAE;oBACR,iBAAiB;oBACjB,IAAI,aAAS,CAAC;wBACZ,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,eAAe;wBACrB,KAAK,EAAE,MAAM;wBACb,MAAM,EAAE,IAAA,sBAAkB,GAAE,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,iBAAiB,CAAC;wBAChH,QAAQ,EAAE,KAAK;qBAChB,CAAC;oBACF,IAAI,aAAS,CAAC;wBACZ,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,OAAO;wBACd,MAAM,EAAE,IAAA,sBAAkB,GAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,gBAAgB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,gBAAgB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBACvK,QAAQ,EAAE,KAAK;qBAChB,CAAC;iBACH;gBACD,QAAQ,EAAE,KAAK;aAChB,CAAC,CAAC;YACH,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM;gBAAE,UAAU,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAEvD,UAAU,CAAC,QAAQ,GAAG,KAAK,CAAC;YAC5B,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC;YACjE,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACzB;QACD,OAAO,MAAM,CAAC;KACf;IACD,IAAI,IAAI,EAAE,OAAO,KAAK,YAAY,EAAE;QAClC,8CAA8C;QAC9C,qCAAqC;QACrC,2BAA2B;QAC3B,MAAM,UAAU,GAAG;YACjB,GAAG,GAAG,CAAC,YAAY;YACnB,GAAG,CAAC,GAAG,CAAC,qBAAqB,IAAI,EAAE,CAAC;SACrC;aACE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAA,4CAAsB,EAAC,GAAG,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC;aAC/D,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvD,MAAM,IAAI,GAAG,IAAI,aAAS,CAAC;YACzB,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,GAAG,GAAG,CAAC,YAAY,EAAE,SAAS;YACpC,KAAK,EAAE,OAAO;YACd,MAAM,EAAE,GAAG,CAAC,MAAM;YAClB,QAAQ,EAAE,CAAC,GAAG,UAAU,CAAC;SAC1B,CAAC,CAAC;QAEH,OAAO,CAAC,IAAI,CAAC,CAAC;KACf;AACH,CAAC;AApVD,sCAoVC;AAED,SAAgB,YAAY,CAAC,QAAc,EAAE,aAAqB,EAAE;IAClE,MAAM,MAAM,GAAS,EAAE,CAAC;IACxB,UAAU,GAAG,UAAU,CAAC,WAAW,EAAE,CAAC;IACtC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QACrC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AATD,oCASC"}

package/out/server/naslServer.d.ts

@@ -197,15 +197,16 @@ declare class NaslServer {
     /** 是否被 触发器依赖, 如果存在，返回第一个触发器对应的名称 */
     isRefedByTriggerAndReturnFirstRef(fileNode: BaseNode): Promise<{
         isRefedByTrigger: boolean;
-        fRefName: string;
+        fRefNames: string[];
     }>;
     /**
      * 是否符合 触发器规则
      * 规则：
-     * 1. 入参仅有一个，且必须为string类型
-     * 2. 不允许有返回值
      */
-    isTriggerRule(fileNode: BaseNode): boolean;
+    isTriggerRule(fileNode: Logic, fRefNames: string[]): {
+        isTriggerRule: boolean;
+        errorFRefNames: string[];
+    };
     /**
      * 额外的诊断
      * @param fileNode 文件级别的节点

package/out/server/naslServer.js

@@ -174,10 +174,17 @@ let NaslServer = NaslServer_1 = class NaslServer {
         // worker = new Worker(path.join(__dirname, '../../../src/static/ts-worker.js'));
         /// #endif
         /// #if process.env.BUILD_TARGET !== 'node'
-        if (globalThis.window)
-            // For TS build
-            /* !!!如果改动这里需要看下关联的对应文件：webpack/ts-worker/loader.js */
-            this.worker = new worker_threads_1.Worker('/ts-worker.js');
+        if (globalThis.window) {
+            const source = require('!!raw-loader!../../../../public/ts-worker/1.0.0.js').default;
+            const createWorker = (code = '') => {
+                const content = [code];
+                const bold = new Blob(content);
+                const url = URL.createObjectURL(bold);
+                const worker = new worker_threads_1.Worker(url);
+                return worker;
+            };
+            this.worker = createWorker(source);
+        }
         /// #endif
         this.http = opt.http;
         this.logger = opt.logger ?? utils.internalLogger;
@@ -195,7 +202,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             getSender: () => this.worker,
             handleMessage: async ({ data }) => {
                 if (data && data.event === 'publishDiagnostics') {
-                    const records = await this._resolveDiagnosticRecords(data.records);
+                    const records = await this._resolveDiagnosticRecords(data.records, data.versions);
                     await this.diagnosticManager.pushAll(records);
                     try {
                         // 结束诊断和标注
@@ -414,6 +421,10 @@ let NaslServer = NaslServer_1 = class NaslServer {
             file: result.filePath,
             fileContent: result.code,
         }));
+        // 全量生成TS文件，因此清空版本记录
+        files.forEach((f) => {
+            this.diagnosticManager.deleteVersionByFilePath(f.file);
+        });
         await this.writeFiles(files);
         this._debugInFileStorage(app, files);
         // 修改名称回调
@@ -430,6 +441,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             const otherModules = [
                 ...app.integration?.connectors ?? [],
                 ...app.dependencies ?? [],
+                ...app.connectorDependencies ?? [],
                 ...app.interfaceDependencies ?? [],
             ];
             for (const item of otherModules) {
@@ -497,15 +509,15 @@ let NaslServer = NaslServer_1 = class NaslServer {
         const url = `/proxy/nasl-storage/api/App/debugEmbedded?id=${app.id}`;
         /// #if process.env.NODE_ENV === 'development'
         // 首次尝试请求
-        await this.http.post(url, openFiles[0]).catch(() => (this.openDebugEmbedded = false));
+        await this.http.post(`/proxy/nasl-storage/api/App/debugEmbedded?id=${app.id}`, openFiles[0]).catch(() => (this.openDebugEmbedded = false));
         if (this.openDebugEmbedded && globalThis.window) {
             // For TS build
             try {
                 let canDebug = true;
-                await this.http.post(url, openFiles[0]).catch(() => (canDebug = false));
+                await this.http.post(`/proxy/nasl-storage/api/App/debugEmbedded?id=${app.id}`, openFiles[0]).catch(() => (canDebug = false));
                 if (canDebug) {
                     await Promise.all(openFiles.map(async (file) => {
-                        const res = await this.http.post(url, file);
+                        const res = await this.http.post(`/proxy/nasl-storage/api/App/debugEmbedded?id=${app.id}`, file);
                         return res.data;
                     }));
                 }
@@ -784,13 +796,11 @@ let NaslServer = NaslServer_1 = class NaslServer {
         return this.messager.requestCommand('getSelectNextCompletion', args);
     }
     getDiagnosticRecordsAndPushAll(fileNames) {
-        // invokeCommand('naslServer:startWork');
-        // TODO:
-        // const versions = fileNames?.map((x) => {
-        //   return this.diagnosticManager.incrementVersionByFilePath(x);
-        // });
-        // return this.messager.requestCommand('getDiagnosticRecords', fileNames, versions);
-        return this.messager.requestCommand('getDiagnosticRecords', fileNames);
+        (0, common_1.invokeCommand)('naslServer:startWork');
+        const versions = fileNames?.map((x) => {
+            return this.diagnosticManager.incrementVersionByFilePath(x);
+        });
+        return this.messager.requestCommand('getDiagnosticRecords', fileNames, versions);
     }
     /**
      * 节点异常是只能挂载单个，如果已经了就不赋值了
@@ -800,7 +810,17 @@ let NaslServer = NaslServer_1 = class NaslServer {
             return;
         node.tsErrorDetail = tsErrorDetail;
     }
-    *_resolveDiagnosticRecordsWithGenerator(records) {
+    *_resolveDiagnosticRecordsWithGenerator(records, versions) {
+        // 这个操作几乎没有性能开销，在主线程完成即可
+        // 保证每个文件的record的版本正确，防止竞态
+        // 若版本不符合，则忽略此record
+        records = records.filter((x, index) => {
+            const requestVersion = versions?.[index] ?? 0;
+            if (!x.filePath) {
+                return true;
+            }
+            return this.diagnosticManager.getVersionByFilePath(x.filePath) === requestVersion;
+        });
         // 热更新类型标注
         if (records.length) {
             yield* this._incrementalAnnotationJSONWithGenerator(records);
@@ -972,8 +992,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
      * @param records 结果
      * @returns 过滤或者转换后的诊断结果
      */
-    _resolveDiagnosticRecords(records) {
-        return utils.timeSlicingWithGenerator(this._resolveDiagnosticRecordsWithGenerator(records));
+    _resolveDiagnosticRecords(records, versions) {
+        return utils.timeSlicingWithGenerator(this._resolveDiagnosticRecordsWithGenerator(records, versions));
     }
     /**
      * 判断是否是Javalogic
@@ -1356,15 +1376,14 @@ let NaslServer = NaslServer_1 = class NaslServer {
         return this._isHaveRef(fileNode).then((refs) => {
             const basePath = concepts_1.TriggerLauncher.getEmbeddedFileBasePath(fileNode.rootNode);
             let flag = false;
-            let fRefName = '';
+            let fRefNames = [];
             try {
                 for (const ref of refs) {
                     const { file } = ref;
                     if (file.startsWith(basePath)) {
                         flag = true;
                         // file: /embedded/tttta/triggerLaunchers/订阅配置_asd.ts
-                        fRefName = file.split(basePath)[1].split('.')[0];
-                        break;
+                        fRefNames.push(file.split(basePath)[1].split('.')[0]);
                     }
                 }
             }
@@ -1373,7 +1392,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             }
             return {
                 isRefedByTrigger: flag,
-                fRefName,
+                fRefNames,
             };
         });
         // const refs = await this._isHaveRef(fileNode);
@@ -1401,29 +1420,29 @@ let NaslServer = NaslServer_1 = class NaslServer {
     /**
      * 是否符合 触发器规则
      * 规则：
-     * 1. 入参仅有一个，且必须为string类型
-     * 2. 不允许有返回值
      */
-    isTriggerRule(fileNode) {
-        const { sourceMap } = fileNode;
-        let paramsLength = 0;
-        let returnLength = 0;
+    isTriggerRule(fileNode, fRefNames) {
+        const app = fileNode.rootNode;
+        const targetLaunchers = app.triggerLaunchers?.filter((triggerLauncher) => fRefNames.includes(triggerLauncher.name));
         let flag = true;
-        sourceMap.forEach((_, k) => {
-            if (k instanceof concepts_1.Param) {
-                paramsLength++;
-                const typeAnnotation = k.typeAnnotation || k.__TypeAnnotation;
-                const { typeKind, typeName, typeNamespace } = typeAnnotation || {};
-                const isString = typeKind === 'primitive' && typeName === 'String' && typeNamespace === 'nasl.core';
-                if (!isString) {
+        let errorFRefNames = [];
+        targetLaunchers?.forEach((triggerLauncher) => {
+            const targetMsgTrigger = triggerLauncher?.connection?.connector?.triggers?.find((trigger) => (0, asserts_1.isMsgTriggerEvent)(trigger.triggerEvent));
+            if (targetMsgTrigger) {
+                const callBackLogic = targetMsgTrigger.triggerEvent.callBackLogic;
+                const { returnType, typeArguments } = callBackLogic;
+                const sameInReturn = utils.isSameInType(returnType, fileNode.returns?.map((re) => re.typeAnnotation));
+                const sameInParams = utils.isSameInType(typeArguments, fileNode.params?.map((param) => param.typeAnnotation));
+                if (!sameInReturn || !sameInParams) {
                     flag = false;
+                    errorFRefNames.push(triggerLauncher.name);
                 }
             }
-            if (k instanceof concepts_1.Return) {
-                returnLength++;
-            }
         });
-        return paramsLength === 1 && flag && returnLength === 0;
+        return {
+            isTriggerRule: flag,
+            errorFRefNames,
+        };
     }
     /**
      * 额外的诊断
@@ -1930,7 +1949,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
             }
         }
         else if (fileNode instanceof concepts_1.Logic || fileNode instanceof concepts_1.OverriddenLogic) {
-            const { isRefedByTrigger, fRefName } = yield this.isRefedByTriggerAndReturnFirstRef(fileNode);
+            const { isRefedByTrigger, fRefNames } = yield this.isRefedByTriggerAndReturnFirstRef(fileNode);
             if (fileNode instanceof concepts_1.Logic && fileNode?.exportInterface) {
                 let isSame = true;
                 const itf = fileNode.exportInterface;
@@ -1960,7 +1979,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     if (logicReturns[0].name !== itfReturns[0].name) {
                         isSame = false;
                     }
-                    else if (!logicReturns[0]?.typeAnnotation.isSame(itfReturns[0]?.typeAnnotation)) {
+                    else if (!logicReturns[0]?.typeAnnotation?.isSame?.(itfReturns[0]?.typeAnnotation)) {
                         isSame = false;
                     }
                 }
@@ -1978,13 +1997,16 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     diagnostics.push(diagnostic);
                 }
             }
-            if (isRefedByTrigger && !this.isTriggerRule(fileNode)) {
-                const diagnostic = {
-                    node: fileNode,
-                    severity: 'error',
-                    message: `${fileNode.name} 已被Kafka消息订阅配置 ${fRefName} 引用：该逻辑入参只有一个入参，入参类型为string；且不允许存在返回值。否则会导致无法接收Kafka消息`,
-                };
-                diagnostics.push(diagnostic);
+            if (isRefedByTrigger) {
+                const { isTriggerRule, errorFRefNames } = this.isTriggerRule(fileNode, fRefNames);
+                if (!isTriggerRule) {
+                    const diagnostic = {
+                        node: fileNode,
+                        severity: 'error',
+                        message: `${fileNode.name} 已被消息订阅配置 ${errorFRefNames.join(',')} 引用，但出入参数类型不匹配，或数量不一致`,
+                    };
+                    diagnostics.push(diagnostic);
+                }
             }
             yield* utils.wrapIteratorToGenerator(fileNode.sourceMap.entries(), function* wrapIterator([node, value]) {
                 if (node instanceof concepts_1.OqlQueryComponent) {
@@ -2527,8 +2549,13 @@ let NaslServer = NaslServer_1 = class NaslServer {
      * @returns 处理后的结果
      */
     *_resolveDiagnosticWithGenerator(diagnostic, fileNode, record) {
+        // 连接器只校验编辑态的连接器
+        if (fileNode?.getAncestor('Connector') && !fileNode.getAncestor('Integration')) {
+            return;
+        }
         // 拓展模块中的翻译先过滤掉，因为有错用户也不能修改
-        if ((fileNode.module || fileNode.connector) && !(fileNode instanceof concepts_1.ConfigProperty)) {
+        // module属性下也可以拿到 connector，所以要过滤掉
+        if ((fileNode.module && fileNode.module.concept !== 'Connector') && !(fileNode instanceof concepts_1.ConfigProperty)) {
             return;
         }
         if (fileNode.concept === 'OverriddenLogic' && diagnostic.text === `'__LogicEmpty' is declared but its value is never read.`) {
@@ -2712,11 +2739,11 @@ let NaslServer = NaslServer_1 = class NaslServer {
                     refsList = [...refsList, ...newRefs.refs];
                 }
             }
-            // 根据 moduleName 中是否存在 dependencies 来判断是否为稳定态的Connector
-            const isStable = moduleName.includes(`/embedded/${appName}/dependencies`);
+            // 根据 moduleName 中是否存在 connectorDependencies 来判断是否为稳定态的Connector
+            const isStable = moduleName.includes(`/embedded/${appName}/connectorDependencies`);
             // 根据 item 的 file 去重
             refsList = refsList.filter((item, index, arr) => {
-                const tempStable = item.file.includes(`/embedded/${appName}/dependencies`); // 约定
+                const tempStable = item.file.includes(`/embedded/${appName}/connectorDependencies`); // 约定
                 const isGlobalLogic = item.file.includes(`/embedded/${appName}/logics`); // 约定
                 // 关于 isGlobalLogic 单独判断的说明：
                 // 全局逻辑与Connector 有直接关联的只有两种情况
@@ -4129,6 +4156,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         if (this.changeStackList?.length) {
             throw new Error(`当前还有${this.changeStackList.length}个文件还在执行更新操作`);
         }
+        this.logger.time('全量标注');
         const nodes = [];
         this.file2NodeMap.forEach((fileNode, filePath) => {
             // 先不排除view，传递给后端的时候，去除views下的标注
@@ -4142,11 +4170,9 @@ let NaslServer = NaslServer_1 = class NaslServer {
                 });
             }
         });
-        this.logger.time('全量标注');
         const typesMap = await this.getQuickInfoNodesTypeMap(nodes, true);
-        this.logger.timeEnd('全量标注');
         const json = app.toJSON();
-        this.logger.info(json);
+        this.logger.timeEnd('全量标注');
         if (releaseFlag) {
             // 全量标注后对json进行一些修改，为了服务端翻译处理
             this.annotationToJson(typesMap, json);
@@ -4741,9 +4767,7 @@ let NaslServer = NaslServer_1 = class NaslServer {
         }
     }
     async receiveHandleChange($event) {
-        if (!this.performance) {
-            (0, common_1.invokeCommand)('naslServer:startWork');
-        }
+        (0, common_1.invokeCommand)('naslServer:startWork');
         this.logger.time('语言服务变更');
         this.singleFileChangeIng = true;
         // 行为
@@ -4795,6 +4819,8 @@ let NaslServer = NaslServer_1 = class NaslServer {
             this.logger.time('重新生成 TS 文件');
         }
         const fileTsPath = fileNode.getEmbeddedFilePath();
+        // 递增ts文件版本号
+        this.diagnosticManager.incrementVersionByFilePath(fileTsPath);
         const result = await utils.timeSlicingWithGenerator(fileNode.toEmbeddedTSFile());
         if (process.env.NODE_ENV === 'development') {
             this.logger.timeEnd('重新生成 TS 文件');