web-dc-api 0.0.56 → 0.0.57

package/lib/implements/keyvalue/manager.ts

@@ -164,17 +164,14 @@ export class KeyValueDB {
 
 export class KeyValueManager {
   private dc: DcUtil;
-  private connectedDc: DCConnectInfo = {};
   private chainUtil: ChainUtil;
   private context: DCContext;
   constructor(
     dc: DcUtil,
-    connectedDc: DCConnectInfo,
     chainUtil: ChainUtil,
     context: DCContext
   ) {
     this.dc = dc;
-    this.connectedDc = connectedDc;
     this.chainUtil = chainUtil;
     this.context = context;
   }
@@ -290,7 +287,7 @@ export class KeyValueManager {
     const userPubkey = this.context.getPublicKey();
     let userPubkeyStr = userPubkey.string();
 
-    let client = this.connectedDc?.client || null;
+    let client = this.context.AccountBackupDc?.client || null;
     if (!client){
         client = await this.dc.connectToUserDcPeer(this.context.publicKey.raw);
     }
@@ -474,7 +471,7 @@ export class KeyValueManager {
     }
     const userPubkey = this.context.getPublicKey();
     let userPubkeyStr = userPubkey.string();
-    let client = this.connectedDc?.client || null;
+    let client = this.context.AccountBackupDc?.client || null;
     if (!client){
         client = await this.dc.connectToUserDcPeer(this.context.publicKey.raw);
     }
@@ -561,7 +558,7 @@ export class KeyValueManager {
     if (!theme.startsWith("keyvalue_")) {
       theme = "keyvalue_" + theme;
     }
-    let client = this.connectedDc.client || null;
+    let client = this.context.AccountBackupDc.client || null;
     if (themeAuthor != this.context.publicKey.string()) {
       //查询他人主题评论
       const authorPublicKey: Ed25519PubKey =
@@ -620,7 +617,7 @@ export class KeyValueManager {
     if (!theme.startsWith("keyvalue_")) {
       theme = "keyvalue_" + theme;
     }
-    let client = this.connectedDc.client || null;
+    let client = this.context.AccountBackupDc.client || null;
     if (themeAuthor != this.context.publicKey.string()) {
       //查询他人主题评论
       const authorPublicKey: Ed25519PubKey =
@@ -683,7 +680,7 @@ export class KeyValueManager {
     if (!theme.startsWith("keyvalue_")) {
       theme = "keyvalue_" + theme;
     }
-    let client = this.connectedDc.client || null;
+    let client = this.context.AccountBackupDc.client || null;
     if (themeAuthor != this.context.publicKey.string()) {
       //查询他人主题评论
       const authorPublicKey: Ed25519PubKey =

package/lib/implements/message/manager.ts

@@ -25,17 +25,14 @@ export const Errors = {
 };
 
 export class MessageManager {
-  private accountBackupDc: DCConnectInfo = {};
   private context: DCContext;
   private chainUtil: ChainUtil;
   private dc: DcUtil;
   constructor(
-    accountBackupDc: DCConnectInfo,
     dc: DcUtil,
     chainUtil: ChainUtil,
     context: DCContext
   ) {
-    this.accountBackupDc = accountBackupDc;
     this.dc = dc;
     this.chainUtil = chainUtil;
     this.context = context;
@@ -47,7 +44,7 @@ export class MessageManager {
     msg: string
   ): Promise<[number | null, Error | null]> => {
     try {
-      if (!this.accountBackupDc.client) {
+      if (!this.context.AccountBackupDc.client) {
         return [null, Errors.ErrNoAccountPeerConnected];
       }
       const receiverPubkey: Ed25519PubKey = Ed25519PubKey.edPubkeyFromStr(receiver)
@@ -75,7 +72,7 @@ export class MessageManager {
       receiverClient.token = token;
   
       const messageClient = new MessageClient(
-        this.accountBackupDc.client,
+        this.context.AccountBackupDc.client,
         this.context,
         receiverClient,
       );
@@ -93,7 +90,7 @@ export class MessageManager {
     limit: number = 100
   ): Promise<[dcnet.pb.IUserMsg[] | null, Error | null]> => {
     try {
-      if (!this.accountBackupDc.client) {
+      if (!this.context.AccountBackupDc.client) {
         return [null, Errors.ErrNoAccountPeerConnected];
       }
       const publicKey = await this.context.getPublicKey();
@@ -139,7 +136,7 @@ export class MessageManager {
                 maxKey,
                 limit
               );
-              const list = res && res.msgs ? res.msgs : [];
+              const list = res && res["msgs"]? res["msgs"] : [];
               console.log('messageClient.getMsgFromUserBox list', list)
               list.map((item: dcnet.pb.IUserMsg) => {
                 if(item && item.messageId) {

package/lib/interfaces/DCContext.ts

@@ -1,6 +1,6 @@
 
 import { Ed25519PrivKey, Ed25519PubKey } from "../common/dc-key/ed25519";
-import type { DCConnectInfo, APPInfo, AccountInfo } from "../common/types/types";
+import type { DCConnectInfo, APPInfo, AccountInfo, Account } from "../common/types/types";
 import type { HeliaLibp2p } from "helia";
 import { Libp2p } from "@libp2p/interface";
 import { ChainUtil } from "../common/chain";
@@ -30,6 +30,8 @@ export interface DCContext {
   
   // 当前登录的账户信息
   accountInfo: AccountInfo;
+  // 当前登录的用户信息
+  userInfo: Account | null;
 
   // 数据库管理器
   dbManager?: DBManager;

package/lib/modules/aiproxy-module.ts

@@ -33,7 +33,6 @@ export class AIProxyModule implements DCModule ,IAIProxyOperations{
     try {
       this.aiProxyManager = new AIProxyManager(
         context.dcutil,
-        context.AccountBackupDc,
         context.dcNodeClient as any, // Type assertion to bypass service map differences
         context.dcChain,
         context

package/lib/modules/auth-module.ts

@@ -169,6 +169,7 @@ export class AuthModule implements DCModule, IAuthOperations {
   > {
     try {
       const account = await this.accountLoginWithWalletCall(accountInfo);
+      this.context.userInfo = account;
       return [account, null];
     } catch (error) {
       return [null, error as Error];
@@ -239,6 +240,13 @@ export class AuthModule implements DCModule, IAuthOperations {
           const privKey = Ed25519PrivKey.unmarshalString(res[0]);
           console.log("=================获取私钥 success");
         }
+        this.context.userInfo = {
+          nftAccount, // NFT账号
+          appAccount:userPubkey.raw, // 应用专用账号公钥 
+          ethAccount:'', // 以太坊兼容链上账号
+          chainId:'', // 区块链ID
+          chainName:'', // 区块链名称
+        }
         return [mnemonic, null];
       }
       return ["", new Error("accountLogin failed")];

package/lib/modules/cache-module.ts

@@ -4,7 +4,7 @@
 import {  ICacheOperations } from "../interfaces/cache-interface";
 import { DCContext } from "../../lib/interfaces/DCContext";
 import { DCModule, CoreModuleName } from "../common/module-system";
-import { ThemeManager } from "../implements/cache/manager";
+import { CacheManager } from "../implements/cache/manager";
 import { keyExpire } from "../common/define";
 import { createLogger } from "../util/logger";
 
@@ -16,7 +16,7 @@ const logger = createLogger('CacheModule');
  */
 export class CacheModule implements DCModule, ICacheOperations {
   readonly moduleName = CoreModuleName.CACHE;
-  private themeManager!: ThemeManager;
+  private cacheManager!: CacheManager;
   private initialized: boolean = false;
   
   /**
@@ -26,8 +26,7 @@ export class CacheModule implements DCModule, ICacheOperations {
    */
   async initialize(context: DCContext): Promise<boolean> {
     try {
-      this.themeManager = new ThemeManager(
-        context.connectedDc,
+      this.cacheManager = new CacheManager(
         context.dcutil,
         context.dcChain,
         context
@@ -55,7 +54,7 @@ export class CacheModule implements DCModule, ICacheOperations {
   async getCacheValue(key: string): Promise<[string | null, Error | null]>{
     try {
        this.assertInitialized();
-      const res = await this.themeManager.getCacheValue(key);
+      const res = await this.cacheManager.getCacheValue(key);
       if (res[0]) {
         logger.info(`获取缓存键 ${key} 成功`);
         return [res[0], null];
@@ -79,7 +78,7 @@ export class CacheModule implements DCModule, ICacheOperations {
     try {
        this.assertInitialized();
       const expireNumber = expire ? expire : keyExpire; // 默认一天
-      const res = await this.themeManager.setCacheKey(value, expireNumber);
+      const res = await this.cacheManager.setCacheKey(value, expireNumber);
       
       logger.info(`设置缓存值成功，过期时间: ${expireNumber}秒`);
       return res;

package/lib/modules/keyvalue-module.ts

@@ -8,6 +8,7 @@ import { KeyValueManager, KeyValueStoreType, KeyValueDB } from "../implements/ke
 import { createLogger } from "../util/logger";
 import { ThemeAuthInfo, ThemeComment } from "../common/types/types";
 import { Direction } from "../common/define";
+import { ThemePermission } from "../common/constants";
 const logger = createLogger('KeyValueModule');
 const indexkey_dckv = "indexkey_dckv"; //索引键名，keyvalue设置过程中key本身的索引键
 /**
@@ -28,7 +29,6 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
     try {
       this.keyValueManager = new KeyValueManager(
         context.dcutil,
-        context.AccountBackupDc,
         context.dcChain,
         context
       );
@@ -110,7 +110,7 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
    async configAuth(
     kvdb: KeyValueDB,
     authPubkey: string,
-    permission: number,
+    permission: ThemePermission,
     remark: string,
     vaccount?: string
   ): Promise<[number | null, Error | null]> {
@@ -234,7 +234,7 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
     }
 
     try {
-      const res = await kvdb.getBatch(writerPubkey, keys, vaccount);
+      const res = await kvdb.getBatch(keys, writerPubkey, vaccount);
       return res;
     } catch (error) {
       logger.error(`getBatch失败:`, error);

package/lib/modules/message-module.ts

@@ -29,7 +29,6 @@ export class MessageModule implements DCModule, IMessageOperations {
     try {
       this.context = context;
       this.messageManager = new MessageManager(
-        context.AccountBackupDc,
         context.dcutil,
         context.dcChain,
         context

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-dc-api",
-  "version": "0.0.56",
+  "version": "0.0.57",
   "description": "web相关的dcapi",
   "type": "module",
   "browser": "dist/dc.min.js",