wowok_agent 0.1.5 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wowok_agent",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Create, collaborate, and transact on your own terms with the AI-driven web3 collaboration protocol.",
   "main": "./src/index.ts",
   "types": "./src/index.ts",

package/src/call/arbitration.ts

@@ -100,7 +100,7 @@ export class CallArbitration extends CallBase {
 
             return await this.check_permission_and_call(this.data.permission, perms, guards, checkOwner, undefined, account)
         }
-        return this.exec(account);
+        return await this.exec(account);
     }
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {
         let obj : Arbitration | undefined ; let permission: any; let withdraw_treasury:any;

package/src/call/base.ts

@@ -120,7 +120,7 @@ export class CallBase {
             
             return {guard:[...guards], witness:p!.future_fills()};
         } else { // no passport needed
-            return this.exec()
+            return await this.exec()
         }
     }
     protected async exec (account?:string) : Promise<CallResponse> {

package/src/call/demand.ts

@@ -8,7 +8,6 @@ import { Account } from '../account';
 export interface CallDemand_Data {
     object?: string; // undefined for creating a new object
     permission?: string; 
-    permission_new?: string;
     type_parameter?: string;
     guard?: {address:string; service_id_in_guard?:number};
     description?: string;
@@ -36,9 +35,6 @@ export class CallDemand extends CallBase {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.demand)
             }
-            if (this.data?.permission_new !== undefined) {
-                checkOwner = true;
-            }
             if (this.data?.description !== undefined && this.data.object) {
                 perms.push(PermissionIndex.demand_description)
             }
@@ -75,7 +71,7 @@ export class CallDemand extends CallBase {
             }
             return await this.check_permission_and_call(this.data.permission, perms, guards, checkOwner, undefined, account)
         }
-        return this.exec(account);
+        return await this.exec(account);
     }
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {
         let obj : Demand | undefined ; let permission: any;
@@ -131,9 +127,6 @@ export class CallDemand extends CallBase {
             if (this.data?.guard !== undefined) {
                 obj?.set_guard(this.data.guard.address, this.data.guard?.service_id_in_guard ?? undefined, passport)
             }
-            if (this.data?.permission_new !== undefined ) {
-                obj?.change_permission(this.data.permission_new);
-            }
             if (permission) {
                 permission.launch();
             }

package/src/call/{permission.ts → entity_permission.ts}

@@ -4,19 +4,19 @@ import { PassportObject, IsValidAddress, Errors, ERROR, Permission, Permission_E
     PermissionIndexType, WitnessFill
 } from 'wowok';
 
-export interface CallPermission_Data {
+export interface CallEntityPermission_Data {
     object?: string; // undefined for creating a new object
     builder?: string;
     admin?: {op:'add' | 'remove' | 'set', admins:string[]};
     description?: string;
-    entity?: {op:'add entity'; entities:Permission_Entity[]} | {op:'add permission'; permissions:Permission_Index[]} 
+    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};
     biz_permission?: {op:'add'; data: UserDefinedIndex[]} | {op:'remove'; permissions: PermissionIndexType[]};
 }
-export class CallPermission extends CallBase {
-    data: CallPermission_Data;
-    constructor(data:CallPermission_Data) {
+export class CallEntityPermission extends CallBase {
+    data: CallEntityPermission_Data;
+    constructor(data:CallEntityPermission_Data) {
         super();
         this.data = data;
     }
@@ -27,7 +27,7 @@ export class CallPermission extends CallBase {
             if (this.data?.builder !== undefined || this.data?.admin !== undefined) {
                 checkOwner = true;
             }
-            if (this.data?.entity !== undefined || this.data?.biz_permission !== undefined) {
+            if (this.data?.permission !== undefined || this.data?.biz_permission !== undefined) {
                 checkAdmin = true;
             }
             if (this.data?.description !== undefined) {
@@ -35,7 +35,7 @@ export class CallPermission extends CallBase {
             }
             return await this.check_permission_and_call(this.data.object, [], [], checkOwner, checkAdmin, account)
         }
-        return this.exec(account)
+        return await this.exec(account)
     }
     protected async operate (txb:TransactionBlock, passport?:PassportObject) {
         let obj : Permission | undefined ; 
@@ -62,42 +62,43 @@ export class CallPermission extends CallBase {
                         break
                 }
             }
+            if (this.data?.biz_permission !== undefined) { // High priority operate
+                switch(this.data.biz_permission.op) {
+                    case 'add':
+                        this.data.biz_permission.data.forEach(v => {
+                            obj?.add_userdefine(v.index, v.name);
+                        })
+                        break;
+                    case 'remove':
+                        this.data.biz_permission.permissions.forEach(v => {
+                            obj?.remove_userdefine(v);
+                        })
+                        break;
+                }
+            }
             if (this.data?.description !== undefined && this.data.object) {
                 obj?.set_description(this.data.description)
             }
-            if (this.data?.entity !== undefined) {
-                switch (this.data.entity.op) {
+            if (this.data?.permission !== undefined) {
+                switch (this.data.permission.op) {
                     case 'add entity':
-                        obj?.add_entity(this.data.entity.entities);
+                        obj?.add_entity(this.data.permission.entities);
                         break;
                     case 'add permission':
-                        obj?.add_entity3(this.data.entity.permissions);
+                        obj?.add_entity3(this.data.permission.permissions);
                         break;
                     case 'remove entity':
-                        obj?.remove_entity(this.data.entity.addresses);
+                        obj?.remove_entity(this.data.permission.addresses);
                         break;
                     case 'remove permission':
-                        obj?.remove_index(this.data.entity.address, this.data.entity.index);
+                        obj?.remove_index(this.data.permission.address, this.data.permission.index);
                         break;
                     case 'transfer permission':
-                        obj?.transfer_permission(this.data.entity.from_address, this.data.entity.to_address);
-                        break;
-                }
-            }
-            if (this.data?.biz_permission !== undefined) {
-                switch(this.data.biz_permission.op) {
-                    case 'add':
-                        this.data.biz_permission.data.forEach(v => {
-                            obj?.add_userdefine(v.index, v.name);
-                        })
-                        break;
-                    case 'remove':
-                        this.data.biz_permission.permissions.forEach(v => {
-                            obj?.remove_userdefine(v);
-                        })
+                        obj?.transfer_permission(this.data.permission.from_address, this.data.permission.to_address);
                         break;
                 }
             }
+
             if (this.data?.builder !== undefined ) {
                 obj?.change_owner(this.data.builder);
             }

package/src/call/machine.ts

@@ -7,7 +7,6 @@ import { Account } from '../account';
 export interface CallMachine_Data {
     object?: string; // undefined for creating a new object
     permission?: string; 
-    permission_new?: string;
     bPaused?: boolean;
     bPublished?: boolean;
     consensus_repository?: {op:'set' | 'add' | 'remove' ; repositories:string[]} | {op:'removeall'};
@@ -41,9 +40,6 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
             if (!this.data?.object) {
                 perms.push(PermissionIndex.machine)
             }
-            if (this.data?.permission_new !== undefined) {
-                checkOwner = true;
-            }
             if (this.data?.description !== undefined && this.data.object) {
                 perms.push(PermissionIndex.machine_description)
             }
@@ -100,7 +96,7 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
 
             return await this.check_permission_and_call(this.data.permission, perms, guards, checkOwner, undefined, account)
         }
-        return this.exec(account);
+        return await this.exec(account);
     }
 
     protected async operate(txb:TransactionBlock, passport?:PassportObject) {
@@ -202,9 +198,6 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
             if (this.data?.progress_next !== undefined) {
                 Progress.From(txb, obj?.get_object(), permission??this.data?.permission, this.data?.progress_next.progress).next(this.data.progress_next.data, this.data.progress_next.deliverable, passport)
             }
-            if (this.data?.permission_new !== undefined ) {
-                obj?.change_permission(this.data.permission_new);
-            }
             if (permission) {
                 permission.launch();
             }

package/src/call/object_permission.ts

@@ -0,0 +1,60 @@
+import { CallBase, CallResult } from "./base";
+import { TransactionBlock, CallResponse, Protocol, Demand, DemandObject, Machine, Service, Treasury, Arbitration, Repository} from 'wowok';
+import { PassportObject, IsValidAddress, Errors, ERROR, Permission, Permission_Entity, Permission_Index, UserDefinedIndex,
+    PermissionIndexType, WitnessFill
+} from 'wowok';
+import { ObjectArbitration, ObjectDemand, ObjectMachine, ObjectRepository, ObjectService, ObjectTreasury, query_objects } from "../objects";
+
+export interface CallObjectPermission_Data {
+    objects: string[];
+    new_permission: string;
+}
+
+export class CallObjectPermission extends CallBase {
+    data: CallObjectPermission_Data;
+    constructor(data:CallObjectPermission_Data) {
+        super();
+        this.data = data;
+    }
+
+    async call(account?:string) : Promise<CallResult>   {
+        if (!IsValidAddress(this.data.new_permission)) {
+            ERROR(Errors.InvalidParam, 'CallObjectPermission_Data.new_permission' + this.data.new_permission)
+        }
+
+        if (this.data?.objects.length > 0) {
+            return await this.exec(account)
+        }
+    }
+    protected async operate (txb:TransactionBlock, passport?:PassportObject) {
+        const r = await query_objects({objects:this.data.objects, showContent:true});
+        r.objects?.forEach(v => {
+            switch(v.type) {
+            case 'Demand':
+                const demand = v as ObjectDemand;
+                Demand.From(txb, Demand.parseObjectType(demand.type_raw), demand.permission, demand.object).change_permission(this.data.new_permission);
+                break;
+            case 'Machine':
+                const machine = v as ObjectMachine;
+                Machine.From(txb, machine.permission, machine.object).change_permission(this.data.new_permission);
+                break;
+            case 'Service':
+                const service = v as ObjectService;
+                Service.From(txb, Service.parseObjectType(service.type_raw), service.permission, service.object).change_permission(this.data.new_permission);
+                break;
+            case 'Treasury':
+                const treasury = v as ObjectTreasury;
+                Treasury.From(txb, Treasury.parseObjectType(treasury.type_raw), treasury.permission, treasury.object).change_permission(this.data.new_permission);
+                break;
+            case 'Arbitration':
+                const arbitraion = v as ObjectArbitration;
+                Arbitration.From(txb, Arbitration.parseObjectType(arbitraion.type_raw), arbitraion.permission, arbitraion.object).change_permission(this.data.new_permission);
+                break;
+            case 'Repository':
+                const repository = v as ObjectRepository;
+                Repository.From(txb, repository.permission, repository.object).change_permission(this.data.new_permission);
+                break;
+            }
+        })
+    }
+}

package/src/call/personal.ts

@@ -11,7 +11,7 @@ export interface CallPersonal_Data {
         | {op:'clear group'; group_name:string | GroupName}
         | {op:'add address'; data:{address:string; group_name:(string | GroupName)[]}} 
         | {op:'remove address'; data:{address:string; group_name:(string | GroupName)[]}};
-    tag?: {op:'add'; data:{address:string; nick_name:string; tags:string[]}}
+    tag?: {op:'add'; data:{address:string; nick_name?:string; tags?:string[]}}
         | {op:'remove'; address:string};
     close?: boolean; // close a personal resource
 }
@@ -23,7 +23,7 @@ export class CallPersonal extends CallBase {
         this.data = data;
     }
     async call(account?:string) : Promise<CallResult> {
-        return this.exec(account)
+        return await this.exec(account)
     }
     protected async operate (txb:TransactionBlock, passport?:PassportObject) {
         let obj : Resource | undefined ; let entity: Entity = Entity.From(txb);

package/src/call/repository.ts

@@ -8,7 +8,6 @@ import { CallBase, CallResult} from "./base";
 export interface CallRepository_Data {
     object?: string; // undefined for creating a new object
     permission?: string; 
-    permission_new?: string; // change permission 
     description?: string;
     mode?: Repository_Policy_Mode; // default: 'Relax' (POLICY_MODE_FREE) 
     reference?: {op:'set' | 'add' | 'remove' ; addresses:string[]} | {op:'removeall'};
@@ -30,9 +29,6 @@ export class CallRepository extends CallBase {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.repository)
             }
-            if (this.data?.permission_new !== undefined) {
-                checkOwner = true;
-            }
             if (this.data?.description !== undefined && this.data?.object) {
                 perms.push(PermissionIndex.repository_description)
             }
@@ -47,7 +43,7 @@ export class CallRepository extends CallBase {
             }
             return await this.check_permission_and_call(this.data.permission, perms, [], checkOwner, undefined, account)
         }
-        return this.exec(account);
+        return await this.exec(account);
     }
 
     protected async operate(txb:TransactionBlock, passport?:PassportObject) {
@@ -124,9 +120,6 @@ export class CallRepository extends CallBase {
                         break;
                 }
             }
-            if (this.data?.permission_new !== undefined ) {
-                obj?.change_permission(this.data.permission_new);
-            }
             if (permission) {
                 permission.launch();
             }

package/src/call/service.ts

@@ -11,7 +11,6 @@ export interface CallService_Data {
     object?: string; // undefined for creating a new object
     permission?: string; 
     type_parameter?: string;
-    permission_new?: string;
     bPaused?: boolean;
     bPublished?: boolean;
     description?: string;
@@ -57,9 +56,6 @@ export class CallService extends CallBase {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.service)
             }
-            if (this.data?.permission_new !== undefined) {
-                checkOwner = true;
-            }
             if (this.data?.description !== undefined && this.data.object) {
                 perms.push(PermissionIndex.service_description)
             }
@@ -145,7 +141,7 @@ export class CallService extends CallBase {
 
             return await this.check_permission_and_call(this.data.permission, perms, guards, checkOwner, undefined, account)
         }
-        return this.exec(account);
+        return await this.exec(account);
     }
     protected async operate (txb:TransactionBlock, passport?:PassportObject, account?:string) {
         let obj : Service | undefined ; let permission: any;  let payee: any;
@@ -328,9 +324,6 @@ export class CallService extends CallBase {
             if (this.data?.order_withdrawl !== undefined && passport) { //@ need withdrawal passport
                 obj?.withdraw(this.data.order_withdrawl.order, this.data.order_withdrawl.data, passport)
             }
-            if (this.data?.permission_new !== undefined) {
-                obj?.change_permission(this.data.permission_new);
-            }
             if (permission) {
                 permission.launch();
             }

package/src/call/treasury.ts

@@ -10,7 +10,6 @@ export interface CallTreasury_Data {
     object?: string; // undefined for creating a new object
     permission?: string; 
     type_parameter?: string;
-    permission_new?: string;
     description?: string;
     withdraw_mode?: Treasury_WithdrawMode;
     withdraw_guard?: {op:'add' | 'set'; data:{guard:string, amount:string}[]} | {op:'remove', guards:string[]} | {op:'removeall'};
@@ -38,9 +37,6 @@ export class CallTreasury extends CallBase {
             if (!this.data?.object) {
                 perms.push(PermissionIndex.treasury)
             }
-            if (this.data?.permission_new !== undefined) {
-                checkOwner = true;
-            }
             if (this.data?.description !== undefined && this.data.object) {
                 perms.push(PermissionIndex.treasury_descritption)
             }
@@ -101,7 +97,7 @@ export class CallTreasury extends CallBase {
 
             return await this.check_permission_and_call(this.data.permission, perms, guards, checkOwner, undefined, account)
         }
-        return this.exec(account);
+        return await this.exec(account);
     }
     protected async operate (txb:TransactionBlock, passport?:PassportObject, account?:string) {
         let obj : Treasury | undefined ; let permission: any; 
@@ -159,9 +155,6 @@ export class CallTreasury extends CallBase {
                     })
                 }
             }
-            if (this.data?.permission_new !== undefined) {
-                obj?.change_permission(this.data.permission_new);
-            }
             if (permission) {
                 permission.launch();
             }

package/src/call.ts

@@ -8,19 +8,20 @@
 import { CallArbitration, CallArbitration_Data } from "./call/arbitration";
 import { CallDemand, CallDemand_Data } from "./call/demand";
 import { CallMachine, CallMachine_Data } from "./call/machine";
-import { CallPermission, CallPermission_Data } from "./call/permission";
+import { CallEntityPermission, CallEntityPermission_Data } from "./call/entity_permission";
 import { CallPersonal, CallPersonal_Data } from "./call/personal";
 import { CallRepository, CallRepository_Data } from "./call/repository";
 import { CallService, CallService_Data } from "./call/service";
 import { CallTreasury, CallTreasury_Data } from "./call/treasury";
 import { CallBase, CallResult, CallWithWitnessParam } from "./call/base";
 import { CallGuard, CallGuard_Data } from "./call/guard";
+import { CallObjectPermission, CallObjectPermission_Data } from "./call/object_permission";
 
  
 export interface CallObjectData {
-    type: 'Demand' | 'Service' | 'Machine' | 'Treasury' | 'Arbitration' | 'Guard' | 'Repository' | 'Personal' | 'Permission';
-    data: CallDemand_Data | CallMachine_Data | CallArbitration_Data | CallPermission_Data | CallPermission_Data
-    | CallTreasury_Data | CallService_Data | CallPermission_Data | CallRepository_Data;
+    type: 'Demand' | 'Service' | 'Machine' | 'Treasury' | 'Arbitration' | 'Guard' | 'Repository' | 'Personal' | 'EntityPermission' | 'ObjectPermission';
+    data: CallDemand_Data | CallMachine_Data | CallArbitration_Data | CallEntityPermission_Data | CallObjectPermission_Data
+    | CallTreasury_Data | CallService_Data  | CallRepository_Data;
     account?: string;
     witness?: CallWithWitnessParam;
 }
@@ -64,7 +65,9 @@ function call_object_new (call: CallObjectData) : CallBase | undefined {
             return new CallRepository(call.data as CallRepository_Data);
         case 'Personal':
             return new CallPersonal(call.data as CallPersonal_Data);
-        case 'Permission':
-            return new CallPermission(call.data as CallPermission_Data);
+        case 'EntityPermission':
+            return new CallEntityPermission(call.data as CallEntityPermission_Data);
+        case 'ObjectPermission':
+            return new CallObjectPermission(call.data as CallObjectPermission_Data);
     }
 }

package/src/index.ts

@@ -3,10 +3,10 @@ export * from './permission'
 export * from './events'
 export * from './cache'
 export * from './call/base'
-export * from './call/permission'
+export * from './call/entity_permission'
 export * from './call/arbitration'
 export * from './call/treasury'
-export * from './call/permission'
+export * from './call/entity_permission'
 export * from './call/demand'
 export * from './call/machine'
 export * from './call/repository'

package/src/objects.ts

@@ -6,7 +6,7 @@
 import { Protocol, Machine_Node, Machine, Treasury_WithdrawMode, Treasury_Operation,
     Repository_Type, Repository_Policy_Mode, Repository_Policy, Service_Discount_Type, Service_Sale,
     Progress, History, ERROR, Errors, IsValidAddress, Bcs,
-    Entity_Info, 
+    Entity_Info, Tags
  } from 'wowok';
 import {WowokCache, OBJECT_KEY, CacheExpire, CacheName, CachedData} from './cache'
 
@@ -15,7 +15,7 @@ export interface ObjectBase {
     type?: string | 'Demand' | 'Progress' | 'Service' | 'Machine' | 'Order' | 'Treasury' | 'Arbitration' | 'Arb' | 'Payment' | 'Guard' |
         'Entity' | 'Permission' | 'Mark' | 'Repository' | 'TableItem_ProgressHistory' | 'TableItem_PermissionEntity' | 
         'TableItem_DemandPresenter' | 'TableItem_MachineNode' | 'TableItem_ServiceSale' | 'TableItem_TreasuryHistory' | 'TableItem_ArbVote' |
-        'TableItem_RepositoryData' | 'TableItem_MarkGroup';
+        'TableItem_RepositoryData' | 'TableItem_MarkGroup' | 'TableItem_MarkTag';
     type_raw?: string;
     owner?: any;
     version?: string;
@@ -226,20 +226,17 @@ export interface ObjectEntity extends ObjectBase {
     lastActive_digest?: string; 
 }
 
-export interface ObjectMark_Tag {
-    object: string;
-    nick_name: string;
-    tags: string[];
-}
-
 export interface ObjectMark extends ObjectBase {
     group_count: number;
-    tags: ObjectMark_Tag[];
+    tag_count: number;
 }
 
 export interface TableItem_MarkGroup extends ObjectBase {
     group_name: string;
-    objects: string[];
+    address: string[];
+}
+
+export interface TableItem_MarkTag extends ObjectBase, Tags {
 }
 
 export enum CacheType {
@@ -571,9 +568,7 @@ export function data2object(data?:any) : ObjectBase {
             return {
                 object:id, type:type, type_raw:type_raw, owner:owner, version:version,
                 group_count:parseInt(content?.marks?.fields?.size),
-                tags:content?.tags?.map((v:any) => {
-                    return {object:v?.fields?.object, nick_name:v?.fields?.nick, tags:v?.fields?.tags}
-                })
+                tag_count:parseInt(content?.tags?.fields?.size)
             } as ObjectMark;   
         }
     } 
@@ -639,9 +634,13 @@ export function data2object(data?:any) : ObjectBase {
                 } as ObjectEntity;
             } else if (end.includes('::resource::Addresses>')) {
                 return {
-                    object:id, type:'Entity', type_raw:type_raw, owner:owner, version:version,
-                    group_name:content?.name, objects:content?.value?.fields?.addresses
+                    object:id, type:'TableItem_MarkGroup', type_raw:type_raw, owner:owner, version:version,
+                    group_name:content?.name, address:content?.value?.fields?.addresses
                 } as TableItem_MarkGroup;
+            } else if (end.includes('::resource::Tags>')) {
+                return {object:id, type:'TableItem_MarkTag', type_raw:type_raw, owner:owner, version:version,
+                    address:content?.name, nick:content?.value?.fields?.nick, tags:content?.value?.fields?.tags
+                } as TableItem_MarkTag;
             }
         }
     }