wowok_agent 1.3.47 → 1.3.49

package/src/call/base.ts

@@ -34,36 +34,41 @@ export interface TypeNamedObjectWithPermission extends NamedObjectWithPermission
 /// object address or namedNew for creating a new object
 export type ObjectTypedMain = string |  TypeNamedObjectWithPermission ;
 export type ObjectMain = string | NamedObjectWithPermission ;
+export type ObjectPermissionMain = string | Namedbject;
 export type ObjectParam = string | NamedObjectWithDescription;
 
-export const GetObjectExisted = (object: ObjectMain | ObjectTypedMain | ObjectParam | undefined) : string | undefined => {
+export const GetObjectExisted = (object: ObjectMain | ObjectTypedMain | ObjectParam | ObjectPermissionMain | undefined) : string | undefined => {
     return (typeof object === 'string' ) ? object : undefined;
 }
 
-export const GetObjectMain = (object: ObjectMain | ObjectTypedMain | undefined) : NamedObjectWithPermission | TypeNamedObjectWithPermission | undefined => {
-    return (typeof object === 'object' && object !== null && 'type_parameter' in object) ? 
-        (object as TypeNamedObjectWithPermission) : 
-        (typeof object === 'object' && object !== null && 'permission' in object) ? 
-            (object as NamedObjectWithPermission) : undefined;
+export const GetObjectMain = (object: ObjectMain | ObjectTypedMain | ObjectPermissionMain | undefined) : NamedObjectWithPermission | TypeNamedObjectWithPermission | Namedbject | undefined => {
+   if (typeof object === 'object' && object !== null && 'type_parameter' in object) {
+       return (object as TypeNamedObjectWithPermission);
+   } else if (typeof object === 'object' && object !== null && 'permission' in object) {
+       return (object as NamedObjectWithPermission);
+   } else if (typeof object === 'object') {
+       return (object as Namedbject);
+   }
 }
 
 export const GetObjectParam = (object: ObjectParam | undefined) : NamedObjectWithDescription | undefined => {
     return (typeof object === 'object' && object!== null && 'description' in object)? (object as NamedObjectWithDescription) : undefined;
 }
 
+export type ObjectsOp = {op:'set' | 'add' | 'remove' ; objects:string[]} | {op:'removeall'};
+
 // address from local Account or local Mark.
-export type AccountOrMark_Address = {account?: string} | {name_or_address: string};
+export type AccountOrMark_Address = {account_name?: string} | {mark_name: string};
 
 export const GetAccountOrMark_Address = async (entity?: AccountOrMark_Address) : Promise<string | undefined> => {
-    if (typeof((entity as any)?.name_or_address) === 'string') {
-        return await LocalMark.Instance().get_address((entity as any).name_or_address);
+    if (typeof((entity as any)?.mark_name) === 'string') {
+        return await LocalMark.Instance().get_address((entity as any).mark_name);
     } else {
-        const acc = await Account.Instance().get((entity as any)?.account);
-        return acc?.address;
+        return (await Account.Instance().get((entity as any)?.account_name))?.address;
     }
 }
 
-export const GetManyAccountOrMark_Address = async (entities: AccountOrMark_Address[]) : Promise<(string | undefined)[]> => {
+export const GetManyAccountOrMark_Address = async (entities: AccountOrMark_Address[]) : Promise<string[]> => {
     const res = [];
     for (let i = 0; i < entities.length; ++i) {
         const addr = await GetAccountOrMark_Address(entities[i]);
@@ -72,14 +77,14 @@ export const GetManyAccountOrMark_Address = async (entities: AccountOrMark_Addre
     return res;
 }
 
-export interface WithdrawParam {
+export interface PayParam {
     index: bigint | string | number,
     remark: string,
     for_object?: string,
     for_guard?: string,
 }
 
-export const SetWithdrawFee = async (param: WithdrawParam, treasury?:TreasuryObject) : Promise<WithdrawFee> => {
+export const SetWithdrawFee = async (param: PayParam, treasury?:TreasuryObject) : Promise<WithdrawFee> => {
     if (!treasury) {
         ERROR(Errors.InvalidParam, 'WithdrawFee: treasury_address invalid');
     }
@@ -123,6 +128,7 @@ export class CallBase {
     content: ObjectBase | undefined = undefined;
 
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {};
+    protected async prepare() {};
     constructor () {}
     // return WitnessFill to resolve filling witness, and than 'call_with_witness' to complete the call; 
     // return ResponseData when the call has completed; 
@@ -137,6 +143,7 @@ export class CallBase {
                 if (query) {
                     const txb = new TransactionBlock();
                     const passport = new Passport(txb, query!);   
+                    await this.prepare();
                     await this.operate(txb, passport?.get_object(), account)
                     passport.destroy();
                     
@@ -153,10 +160,7 @@ export class CallBase {
         var guards : string[] = [];
 
         if (permIndex.length > 0 || checkOwner) {
-            const addr = await Account.Instance().get(account);
-            if (!addr) ERROR(Errors.InvalidParam, 'check_permission_and_call: account invalid');
-
-            const p = await query_permission({object_address_or_name:permission, entity_address_or_name:addr.address});
+            const p = await query_permission({permission_object:permission, address:{account_name:account}});
             if (checkOwner && !p.owner) ERROR(Errors.noPermission, 'owner');
             if (checkAdmin && !p.admin) ERROR(Errors.noPermission, 'admin');
 
@@ -207,18 +211,12 @@ export class CallBase {
 
         // onchain mark
         if (!this.resouceObject) {
-            const addr = await Account.Instance().get(account);
-
-            if (addr) {
-                const r = await query_personal({address:addr.address}); //@ use cache
-                if (!r?.mark_object) {
-                    this.resouceObject = Entity.From(txb).create_resource2(); // new 
-                    Resource.From(txb, this.resouceObject).add(object, tags, named_new?.name);
-                } else {
-                    Resource.From(txb, r.mark_object).add(object, tags, named_new?.name);
-                }
+            const r = await query_personal({address:{account_name:account}}); 
+            if (!r?.mark_object) {
+                this.resouceObject = Entity.From(txb).create_resource2(); // new 
+                Resource.From(txb, this.resouceObject).add(object, tags, named_new?.name);
             } else {
-                ERROR(Errors.InvalidParam, 'account - ' + account)
+                Resource.From(txb, r.mark_object).add(object, tags, named_new?.name);
             }
         } else {
             Resource.From(txb, this.resouceObject).add(object, tags, named_new?.name);

package/src/call/call.ts

@@ -20,32 +20,32 @@ export interface CallDemandObject {
     data: CallDemand_Data;
     account?: string | null;
     witness?: GuardInfo_forCall | null;
-    no_cache?: boolean;
+    //no_cache?: boolean;
 }
 
 export interface CallServiceObject {
     data: CallService_Data;
     account?: string | null;
     witness?: GuardInfo_forCall | null;
-    no_cache?: boolean;
+    //no_cache?: boolean;
 }
 export interface CallMachineObject {
     data: CallMachine_Data;
     account?: string | null;
     witness?: GuardInfo_forCall | null;
-    no_cache?: boolean; // true: no cache to query the machine, false: use cache if exist
+    //no_cache?: boolean; // true: no cache to query the machine, false: use cache if exist
 }
 export interface CallTreasuryObject {
     data: CallTreasury_Data;
     account?: string | null;
     witness?: GuardInfo_forCall | null;
-    no_cache?: boolean;
+    //no_cache?: boolean;
 }
 export interface CallArbitrationObject {
     data: CallArbitration_Data;
     account?: string | null;
     witness?: GuardInfo_forCall | null;
-    no_cache?: boolean;
+    //no_cache?: boolean;
 }
 export interface CallGuardObject {
     data: CallGuard_Data;
@@ -55,7 +55,7 @@ export interface CallRepositoryObject {
     data: CallRepository_Data;
     account?: string | null;
     witness?: GuardInfo_forCall | null;
-    no_cache?: boolean;
+    //no_cache?: boolean;
 }
 export interface CallPersonalObject {
     data: CallPersonal_Data;

package/src/call/demand.ts

@@ -1,9 +1,11 @@
 import { TransactionBlock, IsValidArgType, Service, PassportObject, Errors, ERROR, Permission, PermissionIndex, 
-    PermissionIndexType, Demand, } from 'wowok';
+    PermissionIndexType, Demand,
+    PermissionObject, } from 'wowok';
 import { ObjectDemand, query_objects } from '../query/objects.js';
 import { CallBase, CallResult, GetObjectExisted, GetObjectMain, GetObjectParam, ObjectTypedMain, TypeNamedObjectWithPermission } from "./base.js";
 import { Account } from '../local/account.js';
 import { LocalMark } from '../local/local.js';
+import { off } from 'process';
 
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallDemand_Data {
@@ -30,24 +32,30 @@ export class CallDemand extends CallBase {
         super();
         this.data = data;
     }
+
+    protected async prepare(): Promise<void> {
+        if (!this.object_address) {
+            this.object_address = (await LocalMark.Instance().get_address(GetObjectExisted(this.data.object)));
+            if (this.object_address) {
+                await this.update_content('Demand', this.object_address);
+                if (!this.content) ERROR(Errors.InvalidParam, 'CallDemand_Data.data.object:' + this.object_address);
+                this.permission_address = (this.content as ObjectDemand).permission;
+                this.type_parameter = Demand.parseObjectType(this.content.type_raw);
+            } else {
+                const n = GetObjectMain(this.data.object) as TypeNamedObjectWithPermission;
+                if (!IsValidArgType(n?.type_parameter)) {
+                    ERROR(Errors.IsValidArgType, 'CallDemand_Data.data.object.type_parameter');
+                }          
+                this.permission_address = (await LocalMark.Instance().get_address(GetObjectExisted(n?.permission)));
+                this.type_parameter = n.type_parameter;
+            }             
+        }
+    }
     async call(account?:string) : Promise<CallResult> {
         var checkOwner = false; const guards : string[] = [];
         const perms : PermissionIndexType[] = []; 
-        this.object_address = (await LocalMark.Instance().get_address(GetObjectExisted(this.data.object)));
-        if (this.object_address) {
-            await this.update_content('Demand', this.object_address);
-            if (!this.content) ERROR(Errors.InvalidParam, 'CallDemand_Data.data.object:' + this.object_address);
-            this.permission_address = (this.content as ObjectDemand).permission;
-            this.type_parameter = Demand.parseObjectType(this.content.type_raw);
-        } else {
-            const n = GetObjectMain(this.data.object) as TypeNamedObjectWithPermission;
-            if (!n?.type_parameter || !IsValidArgType(n.type_parameter)) {
-                ERROR(Errors.IsValidArgType, 'CallDemand_Data.data.object.type_parameter');
-            }          
-            this.permission_address = (await LocalMark.Instance().get_address(GetObjectExisted(n?.permission)));
-            this.type_parameter = n.type_parameter;
-        } 
 
+        await this.prepare();
         if (this.permission_address) {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.demand)
@@ -72,98 +80,98 @@ export class CallDemand extends CallBase {
                     if ((this.content as ObjectDemand)?.guard?.object) {
                         guards.push((this.content as ObjectDemand).guard?.object!);
                     }
-                } /*else {
-                    const guard = await LocalMark.Instance().get_address(this.data?.guard?.address);
-                    if (guard) {
-                        guards.push(guard)
-                    }
-                }*/
+                } 
             }
             return await this.check_permission_and_call(this.permission_address, perms, guards, checkOwner, undefined, account)
         }
         return await this.exec(account);
     }
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {
-        let obj : Demand | undefined ; let permission: any;
+        let obj : Demand | undefined ; let perm: Permission | undefined;
+        let permission : PermissionObject | undefined;
 
         if (this.object_address) {
-            obj = Demand.From(txb, this.type_parameter!, this.permission_address!, this.object_address)
+            obj = Demand.From(txb, this.type_parameter!, this.permission_address!, this.object_address);
+            permission = this.permission_address;
         } else {
             const n = GetObjectMain(this.data.object) as TypeNamedObjectWithPermission;
-            if (!this.permission_address) {
-                permission = Permission.New(txb, GetObjectParam(n?.permission)?.description ?? '');
+            permission = await LocalMark.Instance().get_address(GetObjectExisted(n?.permission));
+            if (!permission) {
+                perm = Permission.New(txb, GetObjectParam(n?.permission)?.description ?? '');
+                permission =  perm.get_object();
             }
             
             if (this.data.time_expire !== undefined) {
                 obj = Demand.New(txb, this.type_parameter!, this.data.time_expire?.op === 'duration' ? true : false, 
                     this.data.time_expire?.op === 'duration' ? this.data.time_expire.minutes : this.data.time_expire?.time,
-                    permission ? permission.get_object(): this.permission_address, this.data?.description??'', permission?undefined:passport)
+                    permission, this.data?.description??'', perm?undefined:passport)
             } else {
                 obj = Demand.New(txb, this.type_parameter!, true, 30*24*60, // 30days default
-                    permission ? permission.get_object(): this.permission_address, this.data?.description??'', permission?undefined:passport)       
+                    permission, this.data?.description??'', perm?undefined:passport)       
             }
         }
 
-        if (obj) {
-            const pst = permission?undefined:passport;
-            if (this.data?.present !== undefined) {
-                if ((this.content as ObjectDemand)?.guard?.service_id_in_guard !== undefined && (this.content as ObjectDemand)?.guard?.service_id_in_guard !== null) {
-                    obj?.present((this.content as ObjectDemand)!.guard!.service_id_in_guard!, undefined, this.data.present.recommend_words, pst);
-                } else {
-                    const service_address = await LocalMark.Instance().get_address(this.data.present.service);
-                    if (!service_address) ERROR(Errors.InvalidParam, 'CallDemand_Data.data.present.service');
-                    const r = await query_objects({objects:[service_address]});
-                    if (r?.objects?.length !== 1 || r?.objects[0]?.type !== 'Service') {
-                        ERROR(Errors.InvalidParam, 'CallDemand_Data.data.present.service: ' + service_address);
-                    }
-                    const service_type = Service.parseOrderObjectType(r.objects[0].type_raw);
-                    if (!service_type) {
-                        ERROR(Errors.InvalidParam, 'CallDemand_Data.data.present.service: ' + service_address);
-                    }
+        if (!obj)   ERROR(Errors.InvalidParam, 'CallDemand_Data.data.object');
+        if (!permission)   ERROR(Errors.InvalidParam, 'CallDemand_Data.data.object.permission');
 
-                    obj?.present(service_address, service_type, this.data.present.recommend_words, pst);
+        const pst = perm?undefined:passport;
+        if (this.data?.present !== undefined) {
+            if ((this.content as ObjectDemand)?.guard?.service_id_in_guard !== undefined && (this.content as ObjectDemand)?.guard?.service_id_in_guard !== null) {
+                obj?.present((this.content as ObjectDemand)!.guard!.service_id_in_guard!, undefined, this.data.present.recommend_words, pst);
+            } else {
+                const service_address = await LocalMark.Instance().get_address(this.data.present.service);
+                if (!service_address) ERROR(Errors.InvalidParam, 'CallDemand_Data.data.present.service');
+                const r = await query_objects({objects:[service_address]});
+                if (r?.objects?.length !== 1 || r?.objects[0]?.type !== 'Service') {
+                    ERROR(Errors.InvalidParam, 'CallDemand_Data.data.present.service: ' + service_address);
+                }
+                const service_type = Service.parseOrderObjectType(r.objects[0].type_raw);
+                if (!service_type) {
+                    ERROR(Errors.InvalidParam, 'CallDemand_Data.data.present.service: ' + service_address);
                 }
-            }
 
-            if (this.data?.description !== undefined && this.object_address) {
-                obj?.set_description(this.data.description, pst);
+                obj?.present(service_address, service_type, this.data.present.recommend_words, pst);
             }
-            if (this.data?.time_expire !== undefined && this.object_address) {
-                obj?.expand_time(this.data.time_expire.op === 'duration' ? true : false, 
-                    this.data.time_expire.op === 'duration' ? this.data.time_expire.minutes : this.data.time_expire.time, pst)
-            }
-            if (this.data?.bounty !== undefined) {
-                if (this.data.bounty.op === 'add') {
-                    const bounty = await LocalMark.Instance().get_address((this.data.bounty.object as any)?.address)
-                    if (bounty) {
-                        obj.deposit(bounty)
-                    } else if ((this.data.bounty.object as any)?.balance !== undefined){
-                        const r = await Account.Instance().get_coin_object(txb, (this.data.bounty.object as any)?.balance, account, this.type_parameter);
-                        if (r) obj.deposit(r)
-                    }
-                } else if (this.data.bounty.op === 'reward') {
-                    const service = await localStorage.Instance().get_address(this.data.bounty.service);
-                    if (!service) ERROR(Errors.InvalidParam, 'CallDemand_Data.data.bounty.service');
-                    obj?.yes(service, pst);
-                } else if (this.data.bounty.op === 'refund') {
-                    obj?.refund(pst);
-                } 
-            }
-            
-            if (this.data?.guard !== undefined) {
-                const guard = await LocalMark.Instance().get_address(this.data?.guard.address);
-                if (!guard) { 
-                    ERROR(Errors.InvalidParam, 'CallDemand_Data.data.guard.address')
+        }
+
+        if (this.data?.description !== undefined && this.object_address) {
+            obj?.set_description(this.data.description, pst);
+        }
+        if (this.data?.time_expire !== undefined && this.object_address) {
+            obj?.expand_time(this.data.time_expire.op === 'duration' ? true : false, 
+                this.data.time_expire.op === 'duration' ? this.data.time_expire.minutes : this.data.time_expire.time, pst)
+        }
+        if (this.data?.bounty !== undefined) {
+            if (this.data.bounty.op === 'add') {
+                const bounty = await LocalMark.Instance().get_address((this.data.bounty.object as any)?.address)
+                if (bounty) {
+                    obj.deposit(bounty)
+                } else if ((this.data.bounty.object as any)?.balance !== undefined){
+                    const r = await Account.Instance().get_coin_object(txb, (this.data.bounty.object as any)?.balance, account, this.type_parameter);
+                    if (r) obj.deposit(r)
                 }
-                obj?.set_guard(guard, this.data.guard?.service_id_in_guard ?? undefined, pst);
-            }
-            if (permission) {
-                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('Demand', txb, obj.launch(), GetObjectMain(this.data?.object), account);
+            } else if (this.data.bounty.op === 'reward') {
+                const service = await localStorage.Instance().get_address(this.data.bounty.service);
+                if (!service) ERROR(Errors.InvalidParam, 'CallDemand_Data.data.bounty.service');
+                obj?.yes(service, pst);
+            } else if (this.data.bounty.op === 'refund') {
+                obj?.refund(pst);
+            } 
+        }
+        
+        if (this.data?.guard !== undefined) {
+            const guard = await LocalMark.Instance().get_address(this.data?.guard.address);
+            if (!guard) { 
+                ERROR(Errors.InvalidParam, 'CallDemand_Data.data.guard.address')
             }
+            obj?.set_guard(guard, this.data.guard?.service_id_in_guard ?? undefined, pst);
+        }
+        if (perm) {
+            const n = GetObjectMain(this.data.object) as TypeNamedObjectWithPermission;
+            await this.new_with_mark('Permission', txb, perm.launch(), GetObjectParam(n?.permission), account);
+        }
+        if (!this.data.object) {
+            await this.new_with_mark('Demand', txb, obj.launch(), GetObjectMain(this.data?.object), account);
         }
     }
 }