wowok_agent 1.1.33 → 1.2.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wowok_agent",
-  "version": "1.1.33",
+  "version": "1.2.37",
   "description": "Create, collaborate, and transact on your own terms with the AI-driven web3 collaboration protocol.",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -53,6 +53,7 @@
     "typescript": "^5.8.2"
   },
   "dependencies": {
-    "wowok": "^1.6.89"
+    "level": "^9.0.0",
+    "wowok": "^1.6.90"
   }
 }

package/src/call/arbitration.ts

@@ -1,9 +1,9 @@
 import { TransactionBlock, IsValidArgType, PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex, 
     PermissionIndexType, Treasury, Arbitration, VotingGuard, WithdrawFee, ArbObject, 
 } from 'wowok';
-import { query_objects, ObjectArbitration, } from '../objects.js';
+import { query_objects, ObjectArbitration, } from '../query/objects.js';
 import { CallBase, CallResult, Namedbject} from "./base.js";
-import { Account } from '../account.js';
+import { Account } from '../local/account.js';
 export interface DisputeData {
     order: string,
     order_token_type: string,
@@ -86,7 +86,7 @@ export class CallArbitration extends CallBase {
                         }
                     } else {
                         if (!obj) {
-                            const r = await query_objects({objects:[object_address], showContent:true});
+                            const r = await query_objects({objects:[object_address]});
                             if (r?.objects && r.objects[0].type === 'Arbitration') {
                                 obj = r.objects[0] as ObjectArbitration;
                             }                                
@@ -180,7 +180,7 @@ export class CallArbitration extends CallBase {
             }
 
             if (arb_new) {
-                await this.new_with_mark(txb, obj?.arb_launch(arb_new), (this.data?.arb_new as any)?.namedNew, account);
+                await this.new_with_mark('Arb', txb, obj?.arb_launch(arb_new), (this.data?.arb_new as any)?.namedNew, account);
             }
             
             if (this.data?.voting_guard !== undefined) {
@@ -207,14 +207,14 @@ export class CallArbitration extends CallBase {
                 obj?.pause(this.data.bPaused, pst);
             }
             if (withdraw_treasury) {
-                await this.new_with_mark(txb, withdraw_treasury.launch(), (this.data?.fee_treasury as any)?.namedNew, account);
+                await this.new_with_mark('Treasury', txb, withdraw_treasury.launch(), (this.data?.fee_treasury as any)?.namedNew, account);
             }
             if (permission) {
-                await this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
+                await this.new_with_mark('Permission', txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
             }
 
             if (!object_address) {
-                await this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+                await this.new_with_mark('Arbitration', txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             } 
         }
     }

package/src/call/base.ts

@@ -1,15 +1,19 @@
 
 
-import { Protocol, Entity, Resource, TxbAddress, array_unique, TagName, ResourceObject, PassportObject, Errors, ERROR, Permission, 
+import { Entity, Resource, TxbAddress, array_unique, TagName, ResourceObject, PassportObject, Errors, ERROR, Permission, 
     PermissionIndexType, GuardParser, Passport, WitnessFill, CallResponse, TransactionBlock
 } from 'wowok';
-import { query_permission } from '../permission.js';
-import { Account } from '../account.js';
-import { ObjectBase, queryTableItem_Personal, raw2type} from '../objects.js';
+import { query_permission } from '../query/permission.js';
+import { Account } from '../local/account.js';
+import { ObjectBase, ObjectBaseType, query_personal, raw2type} from '../query/objects.js';
+import { LocalMark } from '../local/local.js';
 
 export interface Namedbject {
-    name?: string;
+    name?: string; 
     tags?: string[];
+    // true: use address as the name if the name exist; otherwise, use this name and change the original name to its address
+    useAddressIfNameExist?: boolean; 
+    onChain?: boolean; // true: onchain, false: local(default)
 }
 
 export interface AddressMark {
@@ -44,7 +48,9 @@ export function ResponseData(response: CallResponse | undefined) : ResponseData[
 
 export class CallBase {
     // operation implementation for a call
-    resouceObject:ResourceObject | undefined;
+    private resouceObject:ResourceObject | undefined;
+    private traceMarkNew = new Map<ObjectBaseType, Namedbject>();
+
     protected async operate(txb:TransactionBlock, passport?:PassportObject, account?:string) {};
     constructor () {}
     // return WitnessFill to resolve filling witness, and than 'call_with_witness' to complete the call; 
@@ -76,7 +82,7 @@ export class CallBase {
         var guards : string[] = [];
 
         if (permIndex.length > 0 || checkOwner) {
-            const addr = await Account.Instance().get_address(account);
+            const addr = await LocalMark.Instance().get_account(account);
             if (!addr) ERROR(Errors.InvalidParam, 'check_permission_and_call: account invalid');
 
             const p = await query_permission({permission_object:permission, address:addr!});
@@ -120,13 +126,22 @@ export class CallBase {
         return await this.sign_and_commit(txb, account);
     }
 
-    protected async new_with_mark(txb:TransactionBlock, object:TxbAddress, named_new?:Namedbject, account?:string, innerTags:string[]=[TagName.Launch]) {
+    protected async new_with_mark(type:ObjectBaseType, txb:TransactionBlock, object:TxbAddress, named_new?:Namedbject, account?:string, innerTags:string[]=[TagName.Launch]) {
         const tags = named_new?.tags ? array_unique([...named_new.tags, ...innerTags]) : array_unique([...innerTags]);
+        if (!named_new?.onChain) {
+            if (named_new) {
+                named_new.tags = tags; 
+                this.traceMarkNew.set(type, named_new)
+            }
+            return ;
+        } ;
 
+        // onchain mark
         if (!this.resouceObject) {
-            const addr = await Account.Instance().get_address(account);
+            const addr = await LocalMark.Instance().get_account(account);
+
             if (addr) {
-                const r = await queryTableItem_Personal({address:addr}); //@ use cache
+                const r = await query_personal({address:addr}); //@ 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);
@@ -139,21 +154,32 @@ export class CallBase {
         } else {
             Resource.From(txb, this.resouceObject).add(object, tags, named_new?.name);
         }
+    
     }
 
-    protected async sign_and_commit(txb: TransactionBlock, account?: string) : Promise<CallResponse> {
-        const pair = await Account.Instance().get_pair(account, true);
-        if (!pair) ERROR(Errors.Fail, 'account invalid')
-        
+    protected async sign_and_commit(txb: TransactionBlock, address?: string) : Promise<CallResponse> {
         if (this.resouceObject) {
             Resource.From(txb, this.resouceObject).launch(); //@ resource launch, if created.
             this.resouceObject = undefined;
         }
-    
-        return await Protocol.Client().signAndExecuteTransaction({
-            transaction: txb, 
-            signer: pair!,
-            options:{showObjectChanges:true},
-        });
+
+        const r = await Account.Instance().sign_and_commit(txb, address);
+        if (!r) {
+            ERROR(Errors.Fail, 'sign and commit failed');
+        }
+        
+        // save the mark locally, anyway
+        const res = ResponseData(r);
+        res.forEach(v => {
+            if (v.type && v.change === 'created') {
+                const namedNew = this.traceMarkNew.get(v.type);
+                if (namedNew) {
+                    LocalMark.Instance().put(namedNew.name, 
+                        {object:v.object, tags:namedNew?.tags}, 
+                        namedNew?.useAddressIfNameExist);
+                }
+            }
+        })
+        return r
     }
 }

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

@@ -4,17 +4,17 @@
  * Restrictive prioritization, such as setting a deposit first and setting a deposit guard later (only subsequent deposits are affected).
  */
 
-import { CallArbitration, CallArbitration_Data } from "./call/arbitration.js";
-import { CallDemand, CallDemand_Data } from "./call/demand.js";
-import { CallMachine, CallMachine_Data } from "./call/machine.js";
-import { CallPermission, CallPermission_Data } from "./call/permission.js";
-import { CallPersonal, CallPersonal_Data } from "./call/personal.js";
-import { CallRepository, CallRepository_Data } from "./call/repository.js";
-import { CallService, CallService_Data } from "./call/service.js";
-import { CallTreasury, CallTreasury_Data } from "./call/treasury.js";
-import { CallBase, CallResult, GuardInfo_forCall } from "./call/base.js";
-import { CallGuard, CallGuard_Data } from "./call/guard.js";
-import { CallObjectPermission, CallObjectPermission_Data } from "./call/object_permission.js";
+import { CallArbitration, CallArbitration_Data } from "./arbitration.js";
+import { CallDemand, CallDemand_Data } from "./demand.js";
+import { CallMachine, CallMachine_Data } from "./machine.js";
+import { CallPermission, CallPermission_Data } from "./permission.js";
+import { CallPersonal, CallPersonal_Data } from "./personal.js";
+import { CallRepository, CallRepository_Data } from "./repository.js";
+import { CallService, CallService_Data } from "./service.js";
+import { CallTreasury, CallTreasury_Data } from "./treasury.js";
+import { CallBase, CallResult, GuardInfo_forCall } from "./base.js";
+import { CallGuard, CallGuard_Data } from "./guard.js";
+import { CallObjectPermission, CallObjectPermission_Data } from "./object_permission.js";
 
 export interface CallDemandObject {
     data: CallDemand_Data;
@@ -45,7 +45,6 @@ export interface CallArbitrationObject {
 export interface CallGuardObject {
     data: CallGuard_Data;
     account?: string;
-    witness?: GuardInfo_forCall;
 }
 export interface CallRepositoryObject {
     data: CallRepository_Data;
@@ -168,7 +167,7 @@ export const call_repository = async (call:CallRepositoryObject) : Promise<CallR
 }
 export const call_guard = async (call:CallGuardObject) : Promise<CallResult> => {
     const obj = new CallGuard(call.data);
-    return call_object(obj, call.account, call.witness)
+    return call_object(obj, call.account)
 }
 export const call_machine = async (call:CallMachineObject) : Promise<CallResult> => {
     const obj = new CallMachine(call.data);

package/src/call/demand.ts

@@ -1,9 +1,9 @@
 import { TransactionBlock, IsValidArgType, IsValidCoinType, Resource, ResourceObject } from 'wowok';
 import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex, 
     PermissionIndexType, Demand, } from 'wowok';
-import { query_objects, ObjectDemand } from '../objects.js';
+import { query_objects, ObjectDemand } from '../query/objects.js';
 import { CallBase, CallResult, Namedbject } from "./base.js";
-import { Account } from '../account.js';
+import { Account } from '../local/account.js';
 
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallDemand_Data {
@@ -61,7 +61,7 @@ export class CallDemand extends CallBase {
                             guards.push(this.data.guard.address)
                         }
                     } else {
-                        const r = await query_objects({objects:[object_address], showContent:true});
+                        const r = await query_objects({objects:[object_address]});
                         if (r?.objects && r?.objects[0]?.type === 'Demand') {
                             const obj = (r?.objects[0] as ObjectDemand);
                             if (obj?.guard) {
@@ -136,10 +136,10 @@ export class CallDemand extends CallBase {
                 obj?.set_guard(this.data.guard.address, this.data.guard?.service_id_in_guard ?? undefined, pst)
             }
             if (permission) {
-                await this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
+                await this.new_with_mark('Permission', txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
             }
             if (!this.data.object) {
-                await this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+                await this.new_with_mark('Demand', txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             }
         }
     }

package/src/call/guard.ts

@@ -91,7 +91,7 @@ export class CallGuard extends CallBase {
             target:Protocol.Instance().guardFn("create") as FnCallType,
             arguments:[txb.object(obj)]
         });
-        await this.new_with_mark(txb, addr, this.data?.namedNew, account);
+        await this.new_with_mark('Guard', txb, addr, this.data?.namedNew, account);
     }
 }
 

package/src/call/machine.ts

@@ -3,7 +3,7 @@ import { PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIn
     ProgressObject,
 } from 'wowok';
 import { CallBase, CallResult, Namedbject } from "./base.js";
-import { Account } from '../account.js';
+import { Account } from '../local/account.js';
 
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallMachine_Data {
@@ -87,7 +87,7 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
                     guards.push(this.data?.progress_next?.guard)
                 } else if (this.data?.object && IsValidAddress(object_address)) { // fetch guard
                     const guard = await Progress.QueryForwardGuard(this.data?.progress_next.progress, object_address, 
-                        await Account.Instance().get_address() ?? '0xe386bb9e01b3528b75f3751ad8a1e418b207ad979fea364087deef5250a73d3f', 
+                        await Account.Instance().default() ?? '0xe386bb9e01b3528b75f3751ad8a1e418b207ad979fea364087deef5250a73d3f', 
                         this.data.progress_next.operation.next_node_name, this.data.progress_next.operation.forward);
                     if (guard) {
                         guards.push(guard)
@@ -220,7 +220,7 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
             }
             const addr = new_progress?.launch();
             if (addr) {
-                await this.new_with_mark(txb, addr, this.data?.progress_new?.namedNew, account);
+                await this.new_with_mark('Progress', txb, addr, this.data?.progress_new?.namedNew, account);
             }
 
             if (this.data?.progress_next !== undefined) {
@@ -229,14 +229,14 @@ export class CallMachine extends CallBase { //@ todo self-owned node operate
             if (this.data?.bPaused !== undefined) {
                 obj?.pause(this.data.bPaused, pst)
             }
-            if (this.data?.clone_new !== undefined && obj) {
-                await this.new_with_mark(txb, obj?.clone(true, pst) as TxbAddress, (this.data?.clone_new as any)?.namedNew, account);
+            if (this.data?.clone_new !== undefined && object_address) {
+                await this.new_with_mark('Machine', txb, obj?.clone(true, pst) as TxbAddress, (this.data?.clone_new as any)?.namedNew, account);
             }
             if (permission) {
-                await this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
+                await this.new_with_mark('Permission', txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
             }
             if (!object_address) {
-                await this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+                await this.new_with_mark('Machine', txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             }
         }
     }

package/src/call/object_permission.ts

@@ -1,6 +1,6 @@
 import { CallBase, CallResult } from "./base.js";
 import { TransactionBlock, PassportObject, IsValidAddress, Errors, ERROR,  Demand, Machine, Service, Treasury, Arbitration, Repository} from 'wowok';
-import { ObjectArbitration, ObjectDemand, ObjectMachine, ObjectRepository, ObjectService, ObjectTreasury, query_objects } from "../objects.js";
+import { ObjectArbitration, ObjectDemand, ObjectMachine, ObjectRepository, ObjectService, ObjectTreasury, query_objects } from "../query/objects.js";
 
 export interface CallObjectPermission_Data {
     objects: string[];
@@ -24,7 +24,7 @@ export class CallObjectPermission extends CallBase {
         }
     }
     protected async operate (txb:TransactionBlock, passport?:PassportObject) {
-        const r = await query_objects({objects:this.data.objects, showContent:true});
+        const r = await query_objects({objects:this.data.objects});
         r.objects?.forEach(v => {
             switch(v.type) {
             case 'Demand':

package/src/call/permission.ts

@@ -107,7 +107,7 @@ export class CallPermission extends CallBase {
                 obj?.change_owner(this.data.builder);
             }
             if (!object_address) {
-                await this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+                await this.new_with_mark('Permission', txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             }
         }
     }

package/src/call/personal.ts

@@ -71,8 +71,8 @@ export class CallPersonal extends CallBase {
                 entity.use_resource(Resource.From(txb, this.data.mark.address));
             }
 
-            if (!object_address && obj) {
-                await this.new_with_mark(txb, obj.launch(), (this.data?.mark_object as any)?.namedNew, account);
+            if (!object_address) {
+                await this.new_with_mark('PersonalMark', txb, obj.launch(), (this.data?.mark_object as any)?.namedNew, account);
             }
         }
     }

package/src/call/repository.ts

@@ -132,10 +132,10 @@ export class CallRepository extends CallBase {
             }
 
             if (permission) {
-                await this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
+                await this.new_with_mark('Permission', txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
             }
             if (!this.data.object) {
-                await this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+                await this.new_with_mark('Repository', txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             }
         }
     };

package/src/call/service.ts

@@ -2,9 +2,9 @@ import { TransactionBlock, IsValidArgType, TxbAddress, TagName,  PassportObject,
     PermissionIndex, PermissionIndexType,  BuyRequiredEnum, Customer_RequiredInfo, DicountDispatch, Service, Service_Buy, 
     Service_Guard_Percent, Service_Sale, WithdrawPayee, Treasury, OrderResult, 
 } from 'wowok';
-import { query_objects, ObjectService } from '../objects.js';
+import { query_objects, ObjectService } from '../query/objects.js';
 import { CallBase, CallResult, Namedbject } from "./base.js";
-import { Account } from '../account.js';
+import { Account } from '../local/account.js';
 
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallService_Data {
@@ -122,7 +122,7 @@ export class CallService extends CallBase {
                         }
                     } else {
                         if (!obj) {
-                            const r = await query_objects({objects:[object_address], showContent:true});
+                            const r = await query_objects({objects:[object_address]});
                             if (r?.objects && r.objects[0].type === 'Service') {
                                 obj = r.objects[0] as ObjectService;
                             }                        
@@ -351,9 +351,9 @@ export class CallService extends CallBase {
 
             if (order_new && this?.data?.order_new) {
                 const buy = obj.order_launch(order_new);
-                await this.new_with_mark(txb, buy.order, (this.data?.order_new as any)?.namedNewOrder, account, [TagName.Launch, TagName.Order]); 
+                await this.new_with_mark('Order', txb, buy.order, (this.data?.order_new as any)?.namedNewOrder, account, [TagName.Launch, TagName.Order]); 
                 if (buy?.progress) { 
-                    await this.new_with_mark(txb, buy.progress, (this.data?.order_new as any)?.namedNewProgress, account, [TagName.Launch]);                  
+                    await this.new_with_mark('Progress', txb, buy.progress, (this.data?.order_new as any)?.namedNewProgress, account, [TagName.Launch]);                  
                 }
             }
 
@@ -363,17 +363,17 @@ export class CallService extends CallBase {
             if (this.data?.bPaused !== undefined) {
                 obj?.pause(this.data.bPaused, pst)
             }
-            if (this.data?.clone_new !== undefined && obj) {
-                await this.new_with_mark(txb, obj.clone(this.data.clone_new?.token_type_new, true, pst) as TxbAddress, (this.data?.clone_new as any)?.namedNew, account);
+            if (this.data?.clone_new !== undefined && object_address) {
+                await this.new_with_mark('Service', txb, obj.clone(this.data.clone_new?.token_type_new, true, pst) as TxbAddress, (this.data?.clone_new as any)?.namedNew, account);
             }
             if (payee) {
-                await this.new_with_mark(txb, payee.launch(), (this.data?.payee_treasury as any)?.namedNew, account);
+                await this.new_with_mark('Treasury', txb, payee.launch(), (this.data?.payee_treasury as any)?.namedNew, account);
             }
             if (permission) {
-                await this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
+                await this.new_with_mark('Permission', txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
             }
             if (!object_address) {
-                await this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+                await this.new_with_mark('Service', txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             } 
         }
     }

package/src/call/treasury.ts

@@ -1,9 +1,9 @@
 import { TransactionBlock, IsValidArgType, PassportObject, IsValidAddress, Errors, ERROR, Permission, PermissionIndex,
     PermissionIndexType, Treasury, Treasury_WithdrawMode, WithdrawParam, 
 } from 'wowok';
-import { query_objects, ObjectTreasury } from '../objects.js';
+import { query_objects, ObjectTreasury } from '../query/objects.js';
 import { CallBase, CallResult, Namedbject } from "./base.js";
-import { Account } from '../account.js';
+import { Account } from '../local/account.js';
 
 /// The execution priority is determined by the order in which the object attributes are arranged
 export interface CallTreasury_Data {
@@ -64,7 +64,7 @@ export class CallTreasury extends CallBase {
                         }
                     } else {
                         if (!obj) {
-                            const r = await query_objects({objects:[object_address], showContent:true});
+                            const r = await query_objects({objects:[object_address]});
                             if (r?.objects && r.objects[0].type === 'Treasury') {
                                 obj = r.objects[0] as ObjectTreasury;
                             }
@@ -84,7 +84,7 @@ export class CallTreasury extends CallBase {
                     guards.push(this.data.withdraw.withdraw_guard)
                 } else if (this.data.object) {
                     if (!obj) {
-                        const r = await query_objects({objects:[object_address], showContent:true});
+                        const r = await query_objects({objects:[object_address]});
                         if (r?.objects && r.objects[0].type === 'Treasury') {
                             obj = r.objects[0] as ObjectTreasury;
                         }
@@ -165,10 +165,10 @@ export class CallTreasury extends CallBase {
                 obj?.set_withdraw_mode(this.data.withdraw_mode, pst)
             }
             if (permission) {
-                await this.new_with_mark(txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
+                await this.new_with_mark('Permission', txb, permission.launch(), (this.data?.permission as any)?.namedNew, account);
             }
             if (!object_address) {
-                await this.new_with_mark(txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
+                await this.new_with_mark('Treasury', txb, obj.launch(), (this.data?.object as any)?.namedNew, account);
             } 
         }
     }

package/src/common.ts

@@ -0,0 +1,5 @@
+
+
+export const isBrowser = ()  => {
+    return typeof window !== 'undefined' && typeof indexedDB !== 'undefined';
+}

package/src/index.ts

@@ -1,7 +1,6 @@
-export * from './objects.js'
-export * from './permission.js'
-export * from './events.js'
-export * from './cache.js'
+export * from './query/objects.js'
+export * from './query/permission.js'
+export * from './query/events.js'
 export * from './call/base.js'
 export * from './call/permission.js'
 export * from './call/arbitration.js'
@@ -13,6 +12,10 @@ export * from './call/repository.js'
 export * from './call/service.js'
 export * from './call/guard.js'
 export * from './call/personal.js'
-export * from './account.js'
-export * from './call.js'
+export * from './call/call.js'
+export * from './local/account.js'
+export * from './local/cache.js'
+export * from './local/local.js'
+export * from './local/index.js'
+
 export * as WOWOK from 'wowok'