@lcap/nasl 4.4.0-beta.1 → 4.4.0-beta.3

package/out/server/naslServer.js

@@ -505,7 +505,6 @@ class NaslServer {
              */
             creatorDevMode: false,
         };
-        this.uiTsInitedResolve = null;
         // 检查共享数据是否有更新
         this._latestVersionsOfSharedApp = [];
         this.firstScreenEndWork = undefined;
@@ -601,7 +600,6 @@ class NaslServer {
         this.getProxyNode = (nd) => {
             return this.getProxyApp()?.findNodeByPath(nd.nodePath);
         };
-        // 初始化 uiTsInited Promise 并保存 resolve 函数
         this.uiTsInited = new Promise((resolve) => {
             this.uiTsInitedResolve = resolve;
         });
@@ -630,28 +628,16 @@ class NaslServer {
         }
     }
     synthesisFlagsFromUrl() {
-        if (utils.isBrowser) {
-            function isOQLCheckEnabled() {
-                if (/[?&]oql-check=false/.test(location.search)) {
-                    return false;
-                }
-                else if (/[?&]oql-check=true/.test(location.search)) {
-                    return true;
-                }
-                else {
-                    // 测试环境默认打开。
-                    return /lcap\.codewave-test\.163yun\.com/.test(location.host);
-                }
-            }
-            function isCreatorDevModeEnabled() {
-                return !!/[?&]creator-dev-mode=true/.test(location.search);
-            }
-            return {
-                tssEnabled: !isOQLCheckEnabled(),
-                creatorDevMode: isCreatorDevModeEnabled(),
-            };
+        if (!utils.isBrowser) {
+            return undefined;
         }
-        return undefined;
+        const urlParams = new URLSearchParams(location.search);
+        const tssEnabled = urlParams.get('oql-check') === 'false';
+        const creatorDevMode = urlParams.get('creator-dev-mode') === 'true';
+        return {
+            tssEnabled,
+            creatorDevMode,
+        };
     }
     async launch(opt) {
         const flags = opt.flags ?? this.synthesisFlagsFromUrl();
@@ -697,7 +683,9 @@ class NaslServer {
         this.diagnosticManager = new diagnostic_1.DiagnosticManager();
         this.handlePublishDiagnostics =
             async ({ data }) => {
-                console.timeEnd('wait-tss');
+                if (this.isFirstScreen) {
+                    console.timeEnd('wait-tss');
+                }
                 console.time('ls-typecheck');
                 if (!data || data.event !== 'publishDiagnostics') {
                     return;
@@ -717,6 +705,7 @@ class NaslServer {
                     }
                     console.time("等待uiTsInited");
                     (await this.uiTsInited)?.();
+                    this.uiTsInited = undefined;
                     console.timeEnd("等待uiTsInited");
                     // 已经和 NASL 节点配对的诊断信息
                     const isProfileMode = this.flags.profileMode;
@@ -910,9 +899,18 @@ class NaslServer {
         }
     }
     async createUiTs(components, options) {
+        let triggerUiTsLoadFinished = this.uiTsInitedResolve;
+        if (!this.uiTsInited) {
+            this.uiTsInited = new Promise((resolve) => {
+                triggerUiTsLoadFinished = resolve;
+                this.uiTsInitedResolve = triggerUiTsLoadFinished;
+            });
+        }
         // save resources so that it could be reused when importing any templates
         // without ui ts data, renaming will be wrong, theoretically
-        if (this.isFirstScreen) {
+        if (this.isFirstScreen
+            || !this.createUiTsArg1Copy?.basicUITsCode
+            || (options?.basicUITsCode && this.createUiTsArg1Copy?.basicUITsCode != options?.basicUITsCode)) {
             this.createUiTsArg0Copy = components;
             this.createUiTsArg1Copy = options;
         }
@@ -954,8 +952,10 @@ class NaslServer {
             await this.addFile(extensionComponentFile, { cache: true });
         }
         this._debugPutFilesInAnonymousApp([extensionComponentFile]);
-        this.uiTsInitedResolve(() => {
-            (0, nasl_language_server_core_1.parseTsFnToNaslQNameRefMaps)(this.semEnv.refMgr, naslUiComponentTsFile.fileContent);
+        triggerUiTsLoadFinished(() => {
+            if (naslUiComponentTsFile.fileContent) {
+                (0, nasl_language_server_core_1.parseTsFnToNaslQNameRefMaps)(this.semEnv.refMgr, naslUiComponentTsFile.fileContent);
+            }
             if (extensionComponentFile.fileContent) {
                 (0, nasl_language_server_core_1.parseTsFnToNaslQNameRefMaps)(this.semEnv.refMgr, extensionComponentFile.fileContent);
             }