upgrade ws updating messages

Signed-off-by: artembuslaev <[email protected]>
hashgraph · Apr 26, 2023 · 4602dc8 · 4602dc8
1 parent fc27a9b
commit 4602dc8
Show file tree

Hide file tree

Showing 24 changed files with 132 additions and 43 deletions.
diff --git a/api-gateway/src/api/service/websockets.ts b/api-gateway/src/api/service/websockets.ts
@@ -113,7 +113,7 @@ export class WebSocketsService {
                     if (this.checkUserByDid(client, msg)) {
                         this.send(client, {
                             type: 'update-event',
-                            data: msg.uuid
+                            data: msg.blocks
                         });
                     }
                 });

diff --git a/...src/app/modules/policy-engine/policy-viewer/blocks/action-block/action-block.component.ts b/...src/app/modules/policy-engine/policy-viewer/blocks/action-block/action-block.component.ts
@@ -49,8 +49,8 @@ export class ActionBlockComponent implements OnInit {
         }
     }
 
-    onUpdate(id: string): void {
-        if (this.id == id) {
+    onUpdate(blocks: string[]): void {
+        if (Array.isArray(blocks) && blocks.includes(this.id)) {
             this.loadData();
         }
     }

diff --git a/...src/app/modules/policy-engine/policy-viewer/blocks/button-block/button-block.component.ts b/...src/app/modules/policy-engine/policy-viewer/blocks/button-block/button-block.component.ts
@@ -71,8 +71,8 @@ export class ButtonBlockComponent implements OnInit, AfterContentChecked {
         }
     }
 
-    onUpdate(id: string): void {
-        if (this.id == id) {
+    onUpdate(blocks: string[]): void {
+        if (Array.isArray(blocks) && blocks.includes(this.id)) {
             this.loadData();
         }
     }

diff --git a/...p/modules/policy-engine/policy-viewer/blocks/container-block/container-block.component.ts b/...p/modules/policy-engine/policy-viewer/blocks/container-block/container-block.component.ts
@@ -51,8 +51,8 @@ export class ContainerBlockComponent implements OnInit, OnDestroy {
         }
     }
 
-    onUpdate(id: string): void {
-        if (this.id == id) {
+    onUpdate(blocks: string[]): void {
+        if (Array.isArray(blocks) && blocks.includes(this.id)) {
             this.loadData();
         }
     }

diff --git a/...les/policy-engine/policy-viewer/blocks/create-token-block/create-token-block.component.ts b/...les/policy-engine/policy-viewer/blocks/create-token-block/create-token-block.component.ts
@@ -76,8 +76,8 @@ export class CreateTokenBlockComponent implements OnInit {
         }
     }
 
-    onUpdate(id: string): void {
-        if (this.id == id) {
+    onUpdate(blocks: string[]): void {
+        if (Array.isArray(blocks) && blocks.includes(this.id)) {
             this.loadData();
         }
     }

diff --git a/...cy-engine/policy-viewer/blocks/documents-source-block/documents-source-block.component.ts b/...cy-engine/policy-viewer/blocks/documents-source-block/documents-source-block.component.ts
@@ -76,8 +76,8 @@ export class DocumentsSourceBlockComponent implements OnInit {
         }
     }
 
-    onUpdate(id: string): void {
-        if (this.id == id) {
+    onUpdate(blocks: string[]): void {
+        if (Array.isArray(blocks) && blocks.includes(this.id)) {
             this.loadData();
         }
     }

diff --git a/...s/policy-engine/policy-viewer/blocks/filters-addon-block/filters-addon-block.component.ts b/...s/policy-engine/policy-viewer/blocks/filters-addon-block/filters-addon-block.component.ts
@@ -47,8 +47,8 @@ export class FiltersAddonBlockComponent implements OnInit {
         }
     }
 
-    onUpdate(id: string): void {
-        if (this.id == id) {
+    onUpdate(blocks: string[]): void {
+        if (Array.isArray(blocks) && blocks.includes(this.id)) {
             this.loadData();
         }
     }

diff --git a/...s/policy-engine/policy-viewer/blocks/group-manager-block/group-manager-block.component.ts b/...s/policy-engine/policy-viewer/blocks/group-manager-block/group-manager-block.component.ts
@@ -72,8 +72,8 @@ export class GroupManagerBlockComponent implements OnInit {
         }
     }
 
-    onUpdate(id: string): void {
-        if (this.id == id) {
+    onUpdate(blocks: string[]): void {
+        if (Array.isArray(blocks) && blocks.includes(this.id)) {
             this.loadData();
         }
     }

diff --git a/...dules/policy-engine/policy-viewer/blocks/information-block/information-block.component.ts b/...dules/policy-engine/policy-viewer/blocks/information-block/information-block.component.ts
@@ -45,8 +45,8 @@ export class InformationBlockComponent implements OnInit {
         }
     }
 
-    onUpdate(id: string): void {
-        if (this.id == id) {
+    onUpdate(blocks: string[]): void {
+        if (Array.isArray(blocks) && blocks.includes(this.id)) {
             this.loadData();
         }
     }

diff --git a/...modules/policy-engine/policy-viewer/blocks/multi-sign-block/multi-sign-block.component.ts b/...modules/policy-engine/policy-viewer/blocks/multi-sign-block/multi-sign-block.component.ts
@@ -54,8 +54,8 @@ export class MultiSignBlockComponent implements OnInit {
         }
     }
 
-    onUpdate(id: string): void {
-        if (this.id == id) {
+    onUpdate(blocks: string[]): void {
+        if (Array.isArray(blocks) && blocks.includes(this.id)) {
             this.loadData();
         }
     }

diff --git a/...src/app/modules/policy-engine/policy-viewer/blocks/report-block/report-block.component.ts b/...src/app/modules/policy-engine/policy-viewer/blocks/report-block/report-block.component.ts
@@ -81,8 +81,8 @@ export class ReportBlockComponent implements OnInit {
         }
     }
 
-    onUpdate(id: string): void {
-        if (this.id == id) {
+    onUpdate(blocks: string[]): void {
+        if (Array.isArray(blocks) && blocks.includes(this.id)) {
             this.loadData();
         }
     }

diff --git a/...cy-engine/policy-viewer/blocks/request-document-block/request-document-block.component.ts b/...cy-engine/policy-viewer/blocks/request-document-block/request-document-block.component.ts
@@ -84,8 +84,8 @@ export class RequestDocumentBlockComponent implements OnInit {
         }
     }
 
-    onUpdate(id: string): void {
-        if (this.id == id) {
+    onUpdate(blocks: string[]): void {
+        if (Array.isArray(blocks) && blocks.includes(this.id)) {
             this.loadData();
         }
     }

diff --git a/...d/src/app/modules/policy-engine/policy-viewer/blocks/roles-block/roles-block.component.ts b/...d/src/app/modules/policy-engine/policy-viewer/blocks/roles-block/roles-block.component.ts
@@ -69,8 +69,8 @@ export class RolesBlockComponent implements OnInit {
         }
     }
 
-    onUpdate(id: string): void {
-        if (this.id == id) {
+    onUpdate(blocks: string[]): void {
+        if (Array.isArray(blocks) && blocks.includes(this.id)) {
             this.loadData();
         }
     }

diff --git a/...end/src/app/modules/policy-engine/policy-viewer/blocks/step-block/step-block.component.ts b/...end/src/app/modules/policy-engine/policy-viewer/blocks/step-block/step-block.component.ts
@@ -54,8 +54,8 @@ export class StepBlockComponent implements OnInit {
         }
     }
 
-    onUpdate(id: string): void {
-        if (this.id == id) {
+    onUpdate(blocks: string[]): void {
+        if (Array.isArray(blocks) && blocks.includes(this.id)) {
             this.loadData();
         }
     }

diff --git a/...les/policy-engine/policy-viewer/blocks/tags-manager-block/tags-manager-block.component.ts b/...les/policy-engine/policy-viewer/blocks/tags-manager-block/tags-manager-block.component.ts
@@ -69,8 +69,8 @@ export class TagsManagerBlockComponent implements OnInit {
         }
     }
 
-    public onUpdate(id: string): void {
-        if (this.id == id) {
+    public onUpdate(blocks: string[]): void {
+        if (Array.isArray(blocks) && blocks.includes(this.id)) {
             this.loadData();
         }
     }

diff --git a/...ngine/policy-viewer/blocks/token-confirmation-block/token-confirmation-block.component.ts b/...ngine/policy-viewer/blocks/token-confirmation-block/token-confirmation-block.component.ts
@@ -60,8 +60,8 @@ export class TokenConfirmationBlockComponent implements OnInit {
         }
     }
 
-    onUpdate(id: string): void {
-        if (this.id == id) {
+    onUpdate(blocks: string[]): void {
+        if (Array.isArray(blocks) && blocks.includes(this.id)) {
             this.loadData();
         }
     }

diff --git a/guardian-service/src/policy-engine/policy-engine.service.ts b/guardian-service/src/policy-engine/policy-engine.service.ts
@@ -107,13 +107,13 @@ export class PolicyEngineService {
      * @param uuid {string} - id of block
      * @param user {IPolicyUser} - short user object
      */
-    private async stateChangeCb(uuid: string, state: any, user: IPolicyUser) {
+    private async stateChangeCb(blocks: string[], state: any, user: IPolicyUser) {
         if (!user || !user.did) {
             return;
         }
 
         await this.channel.publish('update-block', {
-            uuid,
+            blocks,
             state,
             user
         });

diff --git a/policy-service/src/policy-engine/blocks/documents-source-addon.ts b/policy-service/src/policy-engine/blocks/documents-source-addon.ts
@@ -67,7 +67,7 @@ export class DocumentsSourceAddon {
         this.state = oldState;
 
         const ref = PolicyComponentsUtils.GetBlockRef(this);
-        PolicyComponentsUtils.BlockUpdateFn(ref.parent.uuid, {}, user, ref.tag);
+        PolicyComponentsUtils.BlockUpdateFn(ref.parent, {}, user, ref.tag);
     }
 
     /**

diff --git a/policy-service/src/policy-engine/blocks/documents-source.ts b/policy-service/src/policy-engine/blocks/documents-source.ts
@@ -55,7 +55,7 @@ export class InterfaceDocumentsSource {
         this.state = oldState;
 
         const ref = PolicyComponentsUtils.GetBlockRef(this);
-        PolicyComponentsUtils.BlockUpdateFn(ref.parent.uuid, {}, user, ref.tag);
+        PolicyComponentsUtils.BlockUpdateFn(ref.parent, {}, user, ref.tag);
         PolicyComponentsUtils.ExternalEventFn(new ExternalEvent(ExternalEventType.Set, ref, user, data));
     }
 

diff --git a/policy-service/src/policy-engine/blocks/pagination-addon.ts b/policy-service/src/policy-engine/blocks/pagination-addon.ts
@@ -79,7 +79,7 @@ export class PaginationAddon {
         this.state = oldState;
 
         const ref = PolicyComponentsUtils.GetBlockRef(this);
-        PolicyComponentsUtils.BlockUpdateFn(ref.parent.uuid, {}, user, ref.tag);
+        PolicyComponentsUtils.BlockUpdateFn(ref.parent, {}, user, ref.tag);
 
         PolicyComponentsUtils.ExternalEventFn(new ExternalEvent(ExternalEventType.Set, ref, user, data));
     }

diff --git a/policy-service/src/policy-engine/helpers/decorators/basic-block.ts b/policy-service/src/policy-engine/helpers/decorators/basic-block.ts
@@ -415,7 +415,7 @@ export function BasicBlock<T>(options: Partial<PolicyBlockDecoratorOptions>) {
                     users[user.did] = user;
                 }
                 for (const item of Object.values(users)) {
-                    PolicyComponentsUtils.BlockUpdateFn(this.uuid, state, item, tag);
+                    PolicyComponentsUtils.BlockUpdateFn(this as any, state, item, tag);
                 }
             }
 

diff --git a/policy-service/src/policy-engine/helpers/decorators/data-source-addon.ts b/policy-service/src/policy-engine/helpers/decorators/data-source-addon.ts
@@ -65,7 +65,7 @@ export function DataSourceAddon(options: Partial<PolicyBlockDecoratorOptions>) {
                     }
                 }
 
-                PolicyComponentsUtils.BlockUpdateFn(parentBlock.uuid, {}, args[0], this.tag);
+                PolicyComponentsUtils.BlockUpdateFn(parentBlock, {}, args[0], this.tag);
                 return result;
             }
 

diff --git a/policy-service/src/policy-engine/helpers/decorators/event-block.ts b/policy-service/src/policy-engine/helpers/decorators/event-block.ts
@@ -55,19 +55,19 @@ export function EventBlock(options: Partial<PolicyBlockDecoratorOptions>) {
                     throw new BlockActionError('Block is unavailable', this.blockType, this.uuid);
                 }
                 this._accessMap.set(user?.did, true);
-                PolicyComponentsUtils.BlockUpdateFn(super.parent.uuid, {}, user, super.tag);
+                PolicyComponentsUtils.BlockUpdateFn(super.parent, {}, user, super.tag);
                 let result = {};
                 if (typeof super.getData === 'function') {
                     try {
                         result = await super.setData(...args);
                     } catch (err) {
                         this._accessMap.delete(user?.did);
-                        PolicyComponentsUtils.BlockUpdateFn(super.parent.uuid, {}, user, super.tag);
+                        PolicyComponentsUtils.BlockUpdateFn(super.parent, {}, user, super.tag);
                         throw err;
                     }
                 }
                 this._accessMap.delete(user?.did);
-                PolicyComponentsUtils.BlockUpdateFn(super.parent.uuid, {}, user, super.tag);
+                PolicyComponentsUtils.BlockUpdateFn(super.parent, {}, user, super.tag);
                 return result;
             }
 

diff --git a/policy-service/src/policy-engine/policy-components-utils.ts b/policy-service/src/policy-engine/policy-components-utils.ts
@@ -29,18 +29,107 @@ export type PolicyActionMap = Map<string, Map<PolicyInputEventType, EventCallbac
  * @param type
  * @param args
  */
-export function blockUpdate(type: string, args: any[]) {
+export function blockUpdate(type: string, ...args) {
     new BlockTreeGenerator().sendMessage(PolicyEvents.BLOCK_UPDATE_BROADCAST, { type, args });
 }
 
 /**
  * Policy component utils
  */
 export class PolicyComponentsUtils {
+    /**
+     * Block update timeout
+     */
+    private static _blockUpdateTimeout: any;
+
+    /**
+     * Update block map
+     */
+    private static _updateBlockMap: Map<string, Set<string>> = new Map<string, Set<string>>();
+
     /**
      * Block update function
      */
-    public static BlockUpdateFn: (uuid: string, state: any, user: IPolicyUser, tag?: string) => Promise<void> = async (...args) => { blockUpdate('update', args); };
+    public static BlockUpdateFn = (
+        block: IPolicyBlock,
+        state: any,
+        user: IPolicyUser,
+        tag?: string
+    ) => {
+        let blocks = PolicyComponentsUtils._updateBlockMap.get(user?.did);
+        if (!blocks) {
+            blocks = new Set<string>();
+            PolicyComponentsUtils._updateBlockMap.set(user?.did, blocks);
+        }
+
+        if (!PolicyComponentsUtils._blockUpdateTimeout) {
+            PolicyComponentsUtils._blockUpdateTimeout = setTimeout(() => {
+                blockUpdate('update', Array.from(blocks), state, user, tag);
+                PolicyComponentsUtils._blockUpdateTimeout = null;
+                blocks.clear();
+            }, 3000);
+        }
+
+        if (!PolicyComponentsUtils.isExistToUpdate(block, blocks)) {
+            PolicyComponentsUtils.addBlockToUpdateSet(block, blocks);
+        }
+    };
+    /**
+     * Is block exist to update
+     * @param block Block to update
+     * @param blocksToUpdate Blocks to update
+     * @returns Is exist
+     */
+    private static isExistToUpdate(
+        block: IPolicyBlock,
+        blocksToUpdate: Set<string>
+    ): boolean {
+        return (
+            block?.uuid &&
+            (blocksToUpdate.has(block.uuid) ||
+                PolicyComponentsUtils.isExistToUpdate(
+                    block.parent,
+                    blocksToUpdate
+                ))
+        );
+    }
+    /**
+     * Add block to update set
+     * @param block Block to update
+     * @param blocksToUpdate Blocks to update
+     * @returns Is exist
+     */
+    private static addBlockToUpdateSet(
+        block: IPolicyBlock,
+        blocksToUpdate: Set<string>
+    ): Set<string> {
+        if (!block?.uuid) {
+            return blocksToUpdate;
+        }
+        PolicyComponentsUtils.removeChildrenBlocksFromUpdate(
+            block,
+            blocksToUpdate
+        );
+        return blocksToUpdate.add(block?.uuid);
+    }
+    /**
+     * Remove children blocks from update set
+     * @param children Children blocks
+     * @param blocksToUpdate Blocks to update
+     */
+    private static removeChildrenBlocksFromUpdate(
+        block: IPolicyBlock,
+        blocksToUpdate: Set<string>
+    ) {
+        block?.children?.forEach((child) => {
+            blocksToUpdate.delete(child?.uuid);
+            blocksToUpdate = PolicyComponentsUtils.removeChildrenBlocksFromUpdate(
+                child,
+                blocksToUpdate
+            );
+        });
+        return blocksToUpdate;
+    }
     /**
      * Block error function
      */
-Original file line number
+Diff line change
@@ Expand Up @@
                         }
                     }
-                    PolicyComponentsUtils.BlockUpdateFn(parentBlock.uuid, {}, args[0], this.tag);
+                    PolicyComponentsUtils.BlockUpdateFn(parentBlock, {}, args[0], this.tag);
                     return result;
                 }
@@ Expand Down @@