wowok_agent 1.2.45 → 1.3.47

package/src/call/permission.ts

@@ -1,21 +1,42 @@
-import { Account } from "../local/account.js";
 import { LocalMark } from "../local/local.js";
-import { CallBase, CallResult, Namedbject } from "./base.js";
-import { PassportObject, IsValidAddress, Errors, ERROR, Permission, Permission_Entity, Permission_Index, BizPermission,
-    PermissionIndexType, TransactionBlock,
-    Permission_Index_Entity
+import { AccountOrMark_Address, CallBase, CallResult, GetAccountOrMark_Address, GetManyAccountOrMark_Address, 
+    GetObjectExisted, GetObjectMain, ObjectMain } from "./base.js";
+import { PassportObject, Permission,  BizPermission,
+    PermissionIndexType, TransactionBlock, Permission_Entity as Wowok_Permission_Entity, 
+    Permission_Index as Wowok_Permission_Index, Permission_Index_Entity as Wowok_Permission_Index_Entity, 
 } from 'wowok';
 
+
+
+export interface Entity_Permission {
+    index: PermissionIndexType;
+    guard?: string;
+}
+
+export interface Permission_Entity {
+    entity: AccountOrMark_Address;
+    permissions:Entity_Permission[];
+}
+
+export interface Permission_Index_Entity {
+    entity: AccountOrMark_Address;
+    guard?: string;
+}
+
+export interface Permission_Index {
+    index: PermissionIndexType;
+    entities: Permission_Index_Entity[];
+}
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallPermission_Data {
-    object?: {address:string} | {namedNew?: Namedbject}; // undefined or {named_new...} for creating a new object
+    object?: ObjectMain;
     description?: string;
-    admin?: {op:'add' | 'remove' | 'set', addresses:string[]} | {op:'removeall'};
     biz_permission?: {op:'add'; data: BizPermission[]} | {op:'remove'; permissions: PermissionIndexType[]};
     permission?: {op:'add entity'; entities:Permission_Entity[]} | {op:'add permission'; permissions:Permission_Index[]} 
-        | {op:'remove entity'; addresses:string[]} | {op:'remove permission'; address:string; index:PermissionIndexType[]} 
-        | {op:'transfer permission', from_address: string; to_address: string};
-    builder?: string;
+        | {op:'remove entity'; entities:AccountOrMark_Address[]} | {op:'remove permission'; entity:AccountOrMark_Address; index:PermissionIndexType[]} 
+        | {op:'transfer permission', from_entity: AccountOrMark_Address; to_entity: AccountOrMark_Address};
+    admin?: {op:'add' | 'remove' | 'set', entities:AccountOrMark_Address[]} | {op:'removeall'};
+    builder?: AccountOrMark_Address;
 }
 export class CallPermission extends CallBase {
     data: CallPermission_Data;
@@ -27,7 +48,7 @@ export class CallPermission extends CallBase {
 
     async call(account?:string) : Promise<CallResult>   {
         var checkOwner = false; var checkAdmin = false;
-        this.object_address = await LocalMark.Instance().get_address((this.data?.object as any)?.address);
+        this.object_address = await LocalMark.Instance().get_address(GetObjectExisted(this.data?.object));
 
         if (this.object_address) {
             if (this.data?.builder !== undefined || this.data?.admin !== undefined) {
@@ -53,26 +74,9 @@ export class CallPermission extends CallBase {
         }
 
         if (obj) {
-            if (this.data?.description !== undefined && this.data.object) {
+            if (this.data?.description !== undefined && this.data?.object) {
                 obj?.set_description(this.data.description)
             }
-            if (this.data?.admin !== undefined) {
-                switch(this.data.admin?.op) {
-                    case 'add':
-                    case 'set': 
-                        if (this.data.admin?.op === 'set') obj?.remove_admin([], true);
-                        var addrs = await LocalMark.Instance().get_many_address2(this.data.admin.addresses);
-                        obj?.add_admin(addrs);
-                        break;
-                    case 'remove':
-                        var addrs = await LocalMark.Instance().get_many_address2(this.data.admin.addresses);
-                        obj?.remove_admin(this.data.admin.addresses);
-                        break;
-                    case 'removeall':
-                        obj?.remove_admin([], true);
-                        break;
-                }
-            }
             if (this.data?.biz_permission !== undefined) { // High priority operate
                 switch(this.data.biz_permission.op) {
                     case 'add':
@@ -90,51 +94,70 @@ export class CallPermission extends CallBase {
             if (this.data?.permission !== undefined) {
                 switch (this.data.permission.op) {
                     case 'add entity':
-                        var add = [];
+                        var add_entity:Wowok_Permission_Entity[] = [];
                         for (let i = 0; i < this.data.permission.entities.length; ++i) {
                             const v = this.data.permission.entities[i];
-                            const addr = await LocalMark.Instance().get_address(v.address);
+                            const addr = await GetAccountOrMark_Address(v.entity);
                             if (addr) {
-                                v.address = addr;
-                                add.push(v);
+                                add_entity.push({address:addr, permissions:v.permissions});
                             }
                         }
-                        obj?.add_entity(add);
+                        obj?.add_entity(add_entity);
                         break;
                     case 'add permission':
+                        var add_permission: Wowok_Permission_Index[] = [];
                         for (let i = 0; i < this.data.permission.permissions.length; ++i) {
                             const v = this.data.permission.permissions[i];
-                            const e:Permission_Index_Entity[] = [];
+                            const e:Wowok_Permission_Index_Entity[] = [];
                             for (let j = 0; j < v.entities.length; ++j) {
-                                const addr = await LocalMark.Instance().get_address(v.entities[j].address);
-                                const guard = (typeof(v.entities[j].guard) === 'string') ?  await LocalMark.Instance().get_address(v.entities[j].guard as string) : undefined;
+                                const addr = await GetAccountOrMark_Address(v.entities[j].entity);
+                                const guard = await LocalMark.Instance().get_address(v.entities[j].guard as string) ;
                                 if (addr) {
                                     e.push({address:addr, guard:guard})
                                 }
                             }
-                            v.entities = e;
+                            add_permission.push({index:v.index, entities:e});
                         }
-                        obj?.add_entity3(this.data.permission.permissions);
+                        obj?.add_entity3(add_permission);
                         break;
                     case 'remove entity':
-                        obj?.remove_entity(await LocalMark.Instance().get_many_address2(this.data.permission.addresses));
+                        const entities:string[] = (await GetManyAccountOrMark_Address(this.data.permission.entities)).filter((v): v is string => v!== undefined);
+                        obj?.remove_entity(entities);
                         break;
                     case 'remove permission':
-                        const addr = await LocalMark.Instance().get_address(this.data.permission.address);
+                        const addr = await GetAccountOrMark_Address(this.data.permission.entity);
                         if (addr) obj?.remove_index(addr, this.data.permission.index);
                         break;
                     case 'transfer permission':
-                        const [from, to] = await LocalMark.Instance().get_many_address([this.data.permission.from_address, this.data.permission.to_address]);
+                        const from = await GetAccountOrMark_Address(this.data.permission.from_entity);
+                        const to = await GetAccountOrMark_Address(this.data.permission.to_entity);
                         if (from && to)  obj?.transfer_permission(from, to);
                         break;
                 }
             }
+            if (this.data?.admin !== undefined) {
+                switch(this.data.admin?.op) {
+                    case 'add':
+                    case 'set': 
+                        if (this.data.admin?.op === 'set') obj?.remove_admin([], true);
+                        const add = await GetManyAccountOrMark_Address(this.data.admin.entities);
+                        obj?.add_admin(add.filter((v): v is string => v!== undefined));
+                        break;
+                    case 'remove':
+                        const remove = await GetManyAccountOrMark_Address(this.data.admin.entities);
+                        obj?.remove_admin(remove.filter((v): v is string => typeof(v) === 'string'));
+                        break;
+                    case 'removeall':
+                        obj?.remove_admin([], true);
+                        break;
+                }
+            }
             if (this.data?.builder !== undefined ) {
-                const b = await Account.Instance().get(this.data.builder);
-                if (b) obj?.change_owner(b.address);
+                const b = await GetAccountOrMark_Address(this.data.builder);
+                if (b) obj?.change_owner(b);
             }
             if (!this.object_address) {
-                await this.new_with_mark('Permission', txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+                await this.new_with_mark('Permission', txb, obj.launch(), GetObjectMain(this.data?.object), account);
             }
         }
     }

package/src/call/personal.ts

@@ -1,5 +1,5 @@
-import { TransactionBlock, PassportObject, IsValidAddress, Errors, ERROR, Entity, Entity_Info, Resource} from 'wowok';
-import { CallBase, CallResult, Namedbject } from "./base.js";
+import { TransactionBlock, PassportObject, Errors, ERROR, Entity, Entity_Info, Resource} from 'wowok';
+import { AccountOrMark_Address, CallBase, CallResult, GetAccountOrMark_Address } from "./base.js";
 import { LocalMark } from '../local/local.js';
 import { query_personal } from '../query/objects.js';
 import { Account } from '../local/account.js';
@@ -7,11 +7,11 @@ import { Account } from '../local/account.js';
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallPersonal_Data {
     information?: Entity_Info;
-    mark?: {op:'add'; data:{address:string; name?:string; tags?:string[]}[]}
-        | {op:'remove'; data:{address:string; tags?:string[]}[]}
-        | {op:'removeall'; addresses:string[]}
-        | {op:'transfer'; address: string}
-        | {op:'replace'; address: string}
+    mark?: {op:'add'; data:{entity:AccountOrMark_Address; name?:string; tags?:string[]}[]}
+        | {op:'remove'; data:{entity:AccountOrMark_Address; tags?:string[]}[]}
+        | {op:'removeall'; entities:AccountOrMark_Address[]}
+        | {op:'transfer'; to: AccountOrMark_Address}
+        | {op:'replace'; mark_object: string}
         | {op:'destroy'}
 }
 
@@ -54,13 +54,12 @@ export class CallPersonal extends CallBase {
         if (obj && obj?.get_object()) {
             switch(this.data.mark.op) {
                 case 'add':
-                    const add = [];
+                    const add  = [];
                     for (let i = 0; i < this.data.mark.data.length; ++i) {
                         const v = this.data.mark.data[i];
-                        const addr = await LocalMark.Instance().get_address(v.address);
+                        const addr = await GetAccountOrMark_Address(v.entity);
                         if (addr) {
-                            v.address =  addr;
-                            add.push(v)
+                            add.push({address:addr, tags:v.tags, name:v.name})
                         }
                     }
 
@@ -72,10 +71,9 @@ export class CallPersonal extends CallBase {
                     const remove = [];
                     for (let i = 0; i < this.data.mark.data.length; ++i) {
                         const v = this.data.mark.data[i];
-                        const addr = await LocalMark.Instance().get_address(v.address);
+                        const addr = await GetAccountOrMark_Address(v.entity);
                         if (addr) {
-                            v.address =  addr;
-                            remove.push(v)
+                            remove.push({address:addr, tags:v.tags})
                         }
                     }
                     remove.forEach(v => {
@@ -83,22 +81,22 @@ export class CallPersonal extends CallBase {
                     })                        
                     break;
                 case 'removeall':
-                    for (let i = 0; i < this.data.mark.addresses.length; ++i) {
-                        const v = this.data.mark.addresses[i];
-                        const addr = await LocalMark.Instance().get_address(v);
+                    for (let i = 0; i < this.data.mark.entities.length; ++i) {
+                        const v = this.data.mark.entities[i];
+                        const addr = await GetAccountOrMark_Address(v);
                         if (addr) {
-                            obj?.removeall(v)
+                            obj?.removeall(addr)
                         }
                     }                 
                     break;         
             }
 
             if (this.data?.mark?.op === 'transfer' && obj) {
-                const addr = await LocalMark.Instance().get_address(this.data.mark.address);
+                const addr = await GetAccountOrMark_Address(this.data.mark.to);
                 if (addr) entity.transfer_resource(obj, addr);
             }
             if (this.data?.mark?.op === 'replace') {
-                const addr = await LocalMark.Instance().get_address(this.data.mark.address);
+                const addr = await LocalMark.Instance().get_address(this.data.mark.mark_object);
                 if (addr) entity.use_resource(Resource.From(txb, addr));
             }
 

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);
             }
         }
     };