ntk-cms-api 20.25.43 → 20.25.45

package/fesm2022/ntk-cms-api.mjs

@@ -1148,6 +1148,7 @@ class ApiServerBase {
         this.keyBaseVer = 'Ver';
         this.accessLoad = false;
         this.cachApiResult = [];
+        this.cachApiInRunResult = [];
         this.childConstructor();
         this.headers = new Map();
     }
@@ -1162,15 +1163,28 @@ class ApiServerBase {
     }
     cashApiIsValid(serviceNameKay, cashApiSeconds = 0) {
         if (cashApiSeconds > 0) {
+            while (this.cachApiInRunResult[serviceNameKay]?.getTime() >
+                new Date().getTime() - 10000) {
+                /*        this.delay(1000).;*/
+            }
             if (!this.cachApiResult[serviceNameKay])
                 return false;
             if (!this.cachApiResult[serviceNameKay].isSuccess)
                 return false;
-            if (this.cachApiResult[serviceNameKay].dateResult && (new Date().getTime() - this.cachApiResult[serviceNameKay].dateResult) < cashApiSeconds)
+            if (this.cachApiResult[serviceNameKay].dateResult &&
+                new Date().getTime() - this.cachApiResult[serviceNameKay].dateResult <
+                    cashApiSeconds)
                 return true;
+            this.cachApiInRunResult[serviceNameKay] = new Date();
         }
         return false;
     }
+    cashApiVlaueSet(serviceNameKay, ret) {
+        this.cachApiResult[serviceNameKay] = ret;
+        this.cachApiResult[serviceNameKay].dateResult = new Date();
+        this.cachApiInRunResult[serviceNameKay] = undefined;
+        delete this.cachApiInRunResult[serviceNameKay];
+    }
     childConstructor() {
         // test
     }
@@ -1561,8 +1575,7 @@ class ApiCmsServerBase extends ApiServerBase {
             .pipe(retry(this.configApiRetry), map((ret) => {
             //! optimaze call api
             if (cashApiSeconds > 0) {
-                this.cachApiResult[serviceNameKay] = ret;
-                this.cachApiResult[serviceNameKay].dateResult = new Date();
+                this.cashApiVlaueSet(serviceNameKay, ret);
             }
             //! optimaze call api
             return ret;
@@ -1982,8 +1995,7 @@ class CoreEnumService extends ApiServerBase {
             .pipe(map((ret) => {
             //! optimaze call api
             if (cashApiSeconds > 0) {
-                this.cachApiResult[serviceNameKay] = ret;
-                this.cachApiResult[serviceNameKay].dateResult = new Date();
+                this.cashApiVlaueSet(serviceNameKay, ret);
             }
             //! optimaze call api
             return ret;
@@ -1996,14 +2008,15 @@ class CoreEnumService extends ApiServerBase {
             return of(this.cachApiResult[serviceNameKay]);
         //! optimaze call api
         return this.http
-            .get(this.getBaseUrl() + this.getModuleControllerUrl() + '/RecordAdminStatusEnum', {
+            .get(this.getBaseUrl() +
+            this.getModuleControllerUrl() +
+            '/RecordAdminStatusEnum', {
             headers: this.getHeaders(),
         })
             .pipe(map((ret) => {
             //! optimaze call api
             if (cashApiSeconds > 0) {
-                this.cachApiResult[serviceNameKay] = ret;
-                this.cachApiResult[serviceNameKay].dateResult = new Date();
+                this.cashApiVlaueSet(serviceNameKay, ret);
             }
             //! optimaze call api
             return ret;