wowok_agent 1.2.44 → 1.3.47

package/src/call/repository.ts

@@ -1,16 +1,15 @@
-import { TransactionBlock, PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex, 
+import { TransactionBlock, PassportObject, Errors, ERROR, Permission, PermissionIndex, 
     PermissionIndexType, Repository, Repository_Policy, Repository_Policy_Data, Repository_Policy_Data2, 
-    Repository_Policy_Data_Remove, Repository_Policy_Mode, 
+    Repository_Policy_Data_Remove, Repository_Policy_Mode, Repository_Value, 
 } from 'wowok';
-import { CallBase, CallResult, Namedbject} from "./base.js";
+import { CallBase, CallResult, GetObjectExisted, GetObjectMain, GetObjectParam, ObjectMain, TypeNamedObjectWithPermission} from "./base.js";
 import { LocalMark } from '../local/local.js';
 import { ObjectRepository } from '../query/objects.js';
 
 
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallRepository_Data {
-    object?: {address:string} | {namedNew?: Namedbject}; // undefined or {named_new...} for creating a new object
-    permission?: {address:string} | {namedNew?: Namedbject, description?:string}; 
+    object?: ObjectMain;
     description?: string;
     reference?: {op:'set' | 'add' | 'remove' ; addresses:string[]} | {op:'removeall'};
     mode?: Repository_Policy_Mode; // default: 'Relax' (POLICY_MODE_FREE) 
@@ -19,6 +18,9 @@ export interface CallRepository_Data {
 }
 export class CallRepository extends CallBase {
     data: CallRepository_Data;
+    object_address: string | undefined = undefined;
+    permission_address: string | undefined = undefined;
+
     constructor(data:CallRepository_Data) {
         super();
         this.data = data;
@@ -27,28 +29,24 @@ export class CallRepository extends CallBase {
     async call(account?:string) : Promise<CallResult>   {
         var checkOwner = false;
         const perms : PermissionIndexType[] = []; 
-        var [permission_address, object_address] = 
-            await LocalMark.Instance().get_many_address(
-                [(this.data?.permission as any)?.address, 
-                (this.data?.object as any)?.address]);
-
-        if (object_address) {
-            if (!permission_address) {
-                await this.update_content(object_address, 'Repository');
-                if (this.content) {
-                    permission_address = (this.content as ObjectRepository).permission;     
-                }
-            } 
-        } 
+        this.object_address = (await LocalMark.Instance().get(GetObjectExisted(this.data?.object)))?.address;
+        if (this.object_address) {
+            await this.update_content('Repository', this.object_address);
+            if (!this.content) ERROR(Errors.InvalidParam, 'CallRepository_Data.data.object:' + this.object_address);
+            this.permission_address = (this.content as ObjectRepository).permission;
+        } else {
+            const n = GetObjectMain(this.data?.object) as TypeNamedObjectWithPermission; 
+            this.permission_address = (await LocalMark.Instance().get_address(GetObjectExisted(n?.permission)));
+        }
 
-        if (permission_address) {
+        if (this.permission_address) {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.repository)
             }
-            if (this.data?.description !== undefined && object_address) {
+            if (this.data?.description !== undefined && this.object_address) {
                 perms.push(PermissionIndex.repository_description)
             }
-            if (this.data?.mode !== undefined && object_address) {
+            if (this.data?.mode !== undefined && this.object_address) {
                 perms.push(PermissionIndex.repository_mode)
             }
             if (this.data?.reference !== undefined) {
@@ -57,37 +55,28 @@ export class CallRepository extends CallBase {
             if (this.data?.policy !== undefined) {
                 perms.push(PermissionIndex.repository_policies)
             }
-            return await this.check_permission_and_call(permission_address, perms, [], checkOwner, undefined, account)
+            return await this.check_permission_and_call(this.permission_address, perms, [], checkOwner, undefined, account)
         }
         return await this.exec(account);
     }
 
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {
         let obj : Repository | undefined ; let permission: any;
-        var [permission_address, object_address] = this?.content ? 
-            [(this.content as ObjectRepository).permission, this.content.object] : 
-            await LocalMark.Instance().get_many_address(
-                [(this.data?.permission as any)?.address, 
-                (this.data?.object as any)?.address]);
-
-        if (!object_address) {
-            if (!permission_address) {
-                const d = (this.data?.permission as any)?.description ?? '';
-                permission = Permission.New(txb, d);
-            }
-            
-            obj = Repository.New(txb, permission ? permission.get_object() : permission_address, this.data?.description??'', this.data?.mode, permission?undefined:passport)
+        if (this.object_address) {
+            obj = Repository.From(txb, this.permission_address!, this.object_address);
         } else {
-            if (permission_address) {
-                obj = Repository.From(txb, permission_address, object_address)
-            } else {
-                ERROR(Errors.InvalidParam, 'CallRepository_Data.data.permission')
+            const n = GetObjectMain(this.data?.object) as TypeNamedObjectWithPermission;
+            if (!this.permission_address) {
+                permission = Permission.New(txb, GetObjectParam(n?.permission)?.description ?? '');
             }
+
+            obj = Repository.New(txb, permission ? permission.get_object() : this.permission_address, this.data?.description??'', 
+                this.data.mode, permission?undefined:passport);
         }
 
         if (obj) {
             const pst = permission?undefined:passport;
-            if (this.data?.description !== undefined && object_address) {
+            if (this.data?.description !== undefined && this.object_address) {
                 obj?.set_description(this.data.description, pst);
             }
             if (this.data?.reference !== undefined) {
@@ -105,7 +94,7 @@ export class CallRepository extends CallBase {
                         break;
                 }
             }
-            if (this.data?.mode !== undefined && object_address) { //@ priority??
+            if (this.data?.mode !== undefined && this.object_address) { //@ priority??
                 obj?.set_policy_mode(this.data.mode, pst)
             }
             if (this.data?.policy !== undefined) {
@@ -134,22 +123,40 @@ export class CallRepository extends CallBase {
                 switch(this.data.data.op) {
                     case 'add':
                         if ((this.data.data?.data as any)?.key !== undefined) {
-                            obj?.add_data(this.data.data.data as Repository_Policy_Data);
+                            const d = (this.data.data.data as Repository_Policy_Data).data;
+                            const add: Repository_Value[] = [];
+                            for (let i=0; i<d.length; ++i) {
+                                const addr = await LocalMark.Instance().get_address(d[i].address);
+                                if (addr) {
+                                    add.push({address:addr, bcsBytes:d[i].bcsBytes});
+                                }
+                            }
+                            obj?.add_data({key:(this.data.data.data as Repository_Policy_Data).key, data:add, value_type:(this.data.data.data as Repository_Policy_Data).value_type});
                         } else if ((this.data.data?.data as any)?.address !== undefined) {
-                            obj?.add_data2(this.data.data.data as Repository_Policy_Data2);
+                            const d = this.data.data.data as Repository_Policy_Data2;
+                            const addr = await LocalMark.Instance().get_address(d.address);
+                            if (addr) {
+                                obj?.add_data2({address:addr, data:d.data, value_type:d.value_type})
+                            }
                         }
                         break;
                     case 'remove':
-                        this.data.data.data.forEach(v => obj?.remove(v.address, v.key));
+                        for (let i=0; i<this.data.data.data.length; ++i) {
+                            const addr = await LocalMark.Instance().get_address(this.data.data.data[i].address);
+                            if (addr) {
+                                obj?.remove(addr, this.data.data.data[i].key);
+                            }
+                        }
                         break;
                 }
             }
 
             if (permission) {
-                await this.new_with_mark('Permission', txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
+                const n = GetObjectMain(this.data?.object) as TypeNamedObjectWithPermission;
+                await this.new_with_mark('Permission', txb, permission.launch(), GetObjectParam(n?.permission), account);
             }
-            if (!this.data.object) {
-                await this.new_with_mark('Repository', txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+            if (!this.object_address) {
+                await this.new_with_mark('Repository', txb, obj.launch(), GetObjectMain(this.data?.object), account);
             }
         }
     };