web-dc-api 0.0.7 → 0.0.8

package/lib/common/service-worker.ts

@@ -11,7 +11,7 @@ const logger = createLogger('ServiceWorker');
  * @param fileOps 文件操作对象，用于处理IPFS请求
  * @returns Promise<ServiceWorkerRegistration | null>
  */
-export async function registerServiceWorker(fileOps?: IFileOperations): Promise<ServiceWorkerRegistration | null> {
+export async function registerServiceWorker(fileOps?: IFileOperations, swUrl: string = ''): Promise<ServiceWorkerRegistration | null> {
   if ('serviceWorker' in navigator) {
     try {
       // const registration = await navigator.serviceWorker.register(
@@ -20,7 +20,7 @@ export async function registerServiceWorker(fileOps?: IFileOperations): Promise<
       
       // 路径在函数内部解析，不在模块顶层
       const swPath = typeof window !== 'undefined' 
-      ? (new URL('/sw.js', window.location.origin).href)
+      ? (new URL(swUrl || '/sw.js', window.location.origin).href)
       : '/sw.js';
       
       const registration = await navigator.serviceWorker.register(swPath);

package/lib/dc.ts

@@ -50,6 +50,7 @@ export class DC implements DCContext {
   public grpcServer: DCGrpcServer;
   public appInfo: APPInfo;
   public dbManager: any;
+  public swUrl: string = "";
   
   // 模块系统
   private moduleSystem: ModuleSystem;
@@ -65,11 +66,13 @@ export class DC implements DCContext {
     wssUrl: string;
     backWssUrl: string;
     appInfo?: APPInfo ;
+    swUrl?: string;
     logLevel?: LogLevel;
     names?: string[];
   }) {
     this.blockChainAddr = options.wssUrl;
     this.backChainAddr = options.backWssUrl;
+    this.swUrl = options.swUrl || "";
     this.dcChain = new ChainUtil();
     this.dcutil = new DcUtil(this.dcChain);
     // //todo remove 
@@ -105,7 +108,7 @@ export class DC implements DCContext {
       }
     }else {
       // 注册核心功能模块
-      this.moduleSystem.registerModule(new FileModule());
+      this.moduleSystem.registerModule(new FileModule(this.swUrl || ""));
       this.moduleSystem.registerModule(new AuthModule());
       this.moduleSystem.registerModule(new CommentModule());
       this.moduleSystem.registerModule(new DatabaseModule());

package/lib/interfaces/auth-interface.ts

@@ -1,4 +1,3 @@
-import { Ed25519PrivKey } from "../common/dc-key/ed25519";
 import { DCConnectInfo, NFTBindStatus, User,AccountInfo } from "../common/types/types";
 
 
@@ -29,7 +28,6 @@ export interface IAuthOperations {
    */
   accountLogin(nftAccount: string, password: string, safecode: string): Promise<{
       mnemonic: string;
-      privKey: Ed25519PrivKey;
     }>;
   
   /**

package/lib/interfaces/keyvalue-interface.ts

@@ -87,6 +87,27 @@ export interface IKeyValueOperations {
     vaccount?: string
   ): Promise<[string, Error | null]>;
 
+
+ /**
+   * 获取指定键的值列表,包括所有用户写入的值,可以用在类似排名这些需要多人数据汇总的场景,key为场景名称,各个用户写入的值为各自在该场景下的内容
+   * @param kvdb: KeyValueDB,
+   * @param key 键名
+   * @param limit 返回结果数量限制
+   * @param seekKey 查询起始键,用于分页查询
+   * @param offset 结果偏移量
+   * @param vaccount 可选的虚拟账户
+   * @returns [值列表生成的json字符串, 错误信息]
+   */
+  getValues(
+    kvdb: KeyValueDB,
+    key: string,
+    limit: number,
+    seekKey:string, 
+    offset: number,
+    vaccount?: string
+  ): Promise<[string, Error | null]>;
+
+
   /**
    * 批量获取多个键的值
    * @param kvdb: KeyValueDB,

package/lib/modules/auth-module.ts

@@ -150,7 +150,6 @@ export class AuthModule implements DCModule, IAuthOperations {
     safecode: string
   ): Promise<{
     mnemonic: string;
-    privKey: Ed25519PrivKey;
   }> {
     this.assertInitialized();
 
@@ -163,19 +162,22 @@ export class AuthModule implements DCModule, IAuthOperations {
       password,
       safecode
     );
+    console.log("=================accountLogin success");
 
     if (mnemonic) {
-      const accountManager = new AccountManager(this.context);
-      const res = await accountManager.generateAppAccount(this.context.appInfo?.appId, mnemonic);
-      if (res[0] === null) {
-        throw res[1] || new Error("generateAppAccount error");
+      if(this.context.appInfo?.appId){
+        const accountManager = new AccountManager(this.context);
+        const res = await accountManager.generateAppAccount(this.context.appInfo?.appId, mnemonic);
+        console.log("=================generateAppAccount success");
+        if (res[0] === null) {
+          throw res[1] || new Error("generateAppAccount error");
+        }
+        // 获取私钥
+        const privKey = Ed25519PrivKey.unmarshalString(res[0]);
+        console.log("=================获取私钥 success");
       }
-      // 获取私钥
-      const privKey = Ed25519PrivKey.unmarshalString(res[0]);
-
       return {
         mnemonic,
-        privKey,
       };
     }
     return;

package/lib/modules/file-module.ts

@@ -22,7 +22,12 @@ export class FileModule implements DCModule, IFileOperations {
   private fileCacheManager: FileCacheManager;
   private context: DCContext;
   private initialized: boolean = false;
+  private swUrl: string;
   
+  constructor(url: string) {
+    this.swUrl = url;
+  }
+
   /**
    * 初始化文件模块
    * @param context DC上下文
@@ -43,7 +48,7 @@ export class FileModule implements DCModule, IFileOperations {
       
       // 注册 Service Worker
       try {
-        await registerServiceWorker(this);
+        await registerServiceWorker(this, this.swUrl || '');
         logger.info('Service Worker 已注册');
       } catch (err) {
         logger.warn('Service Worker 注册失败:', err);

package/lib/modules/keyvalue-module.ts

@@ -9,7 +9,7 @@ import { ThemeManager } from "../implements/cache/manager";
 import { createLogger } from "../util/logger";
 import { ThemeAuthInfo, ThemeComment } from "../common/types/types";
 const logger = createLogger('KeyValueModule');
-
+const indexkey_dckv = "indexkey_dckv"; //索引键名，keyvalue设置过程中key本身的索引键
 /**
  * 键值存储模块
  * 提供键值存储功能
@@ -165,7 +165,7 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
       const res = await kvdb.set(key, value, indexs, vaccount);
       return res;
     } catch (error) {
-      logger.error(`设置key-value失败:`, error);
+      logger.error(`设置set-value失败:`, error);
       throw error;
     }
   }
@@ -188,6 +188,35 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
     }
   }
 
+
+   /**
+   * 获取指定键的值列表,包括所有用户写入的值,可以用在类似排名这些需要多人数据汇总的场景,key为场景名称,各个用户写入的值为各自在该场景下的内容
+   * @param kvdb: KeyValueDB,
+   * @param key 键名
+   * @param limit 返回结果数量限制
+   * @param seekKey 查询起始键,用于分页查询
+   * @param offset 结果偏移量
+   * @param vaccount 可选的虚拟账户
+   * @returns [值列表生成的json字符串, 错误信息]
+   */
+  async getValues(
+    kvdb: KeyValueDB,
+    key: string,
+    limit: number,
+    seekKey:string, 
+    offset: number,
+    vaccount?: string
+  ): Promise<[string, Error | null]> {
+    this.assertInitialized();
+    
+    try {
+      const res = await kvdb.getWithIndex(indexkey_dckv, key, limit,seekKey, offset,  vaccount);
+      return res;
+    } catch (error) {
+      logger.error(`getValues失败:`, error);
+      throw error;
+    }
+  }
   
   async getBatch(
     kvdb: KeyValueDB,
@@ -201,7 +230,7 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
       const res = await kvdb.getBatch(writerPubkey, keys, vaccount);
       return res;
     } catch (error) {
-      logger.error(`获取key-value失败:`, error);
+      logger.error(`getBatch失败:`, error);
       throw error;
     }
   }
@@ -221,7 +250,7 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
       const res = await kvdb.getWithIndex(indexKey, indexValue, limit,seekKey, offset,  vaccount);
       return res;
     } catch (error) {
-      logger.error(`获取key-value失败:`, error);
+      logger.error(`getWithIndex失败:`, error);
       throw error;
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-dc-api",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "web相关的dcapi",
   "type": "module",
   "browser": "dist/index.umd.js",