web-dc-api 0.0.51 → 0.0.52

package/lib/implements/keyvalue/client.ts

@@ -6,6 +6,7 @@ import { base58btc } from "multiformats/bases/base58";
 import { toString as uint8ArrayToString } from "uint8arrays/to-string";
 import { Errors } from "../../common/error";
 import { DCContext } from "../../../lib/interfaces/DCContext";
+import { Direction } from "../../common/define";
 
 export class KeyValueClient {
   client: Client;
@@ -303,6 +304,7 @@ export class KeyValueClient {
     indexKey:string,
     indexValue:string,
     seekKey:string, 
+    direction: Direction = Direction.Forward,
     offset: number,
     limit: number,
     vaccount?: string
@@ -314,6 +316,7 @@ export class KeyValueClient {
     message.indexKey = new TextEncoder().encode(indexKey);
     message.indexValue = new TextEncoder().encode(indexValue);
     message.seekKey = new TextEncoder().encode(seekKey);
+     message.direction = direction;
     message.offset = offset;
     message.limit = limit;
     if(vaccount){

package/lib/implements/keyvalue/manager.ts

@@ -113,6 +113,7 @@ export class KeyValueDB {
     indexValue: string,
     limit: number = 1000,
     seekKey: string = "",
+    direction: Direction = Direction.Forward,
     offset: number = 0,
     vaccount: string = ""
   ): Promise<[string | null, Error | null]> {
@@ -123,6 +124,7 @@ export class KeyValueDB {
       indexKey,
       indexValue,
       seekKey,
+      direction,
       offset,
       limit,
       vaccount
@@ -427,15 +429,15 @@ export class KeyValueManager {
           break;
         }
         for (let i = 0; i < resList.length; i++) {
-          originAuthList.push(resList[i]);
-          const content = resList[i].comment;
+          originAuthList.push(resList[i]!);
+          const content = resList[i]!.comment;
           const parts = content.split(":");
           if (parts.length < 2) {
             continue;
           }
-          const authPubkey = parts[0];
-          const permission = parseInt(parts[1]);
-          const remark = content.substring(parts[0].length + 2);
+          const authPubkey = parts[0]!;
+          const permission = parseInt(parts[1]!);
+          const remark = content.substring(parts[0]!.length + 2);
           authList.push({
             pubkey: authPubkey,
             permission: permission,
@@ -445,8 +447,8 @@ export class KeyValueManager {
         if (resList.length < 1000) {
           break;
         }
-        seekKey = `${resList[resList.length - 1].blockheight}/${
-          resList[resList.length - 1].commentCid
+        seekKey = `${resList[resList.length - 1]!.blockheight}/${
+          resList[resList.length - 1]!.commentCid
         }`;
       }
     } catch (error: any) {
@@ -670,6 +672,7 @@ export class KeyValueManager {
     indexKey: string,
     indexValue: string,
     seekKey: string,
+    direction: Direction = Direction.Forward,
     offset: number,
     limit: number,
     vaccount?: string
@@ -712,6 +715,7 @@ export class KeyValueManager {
         indexKey,
         indexValue,
         seekKey,
+        direction,
         offset,
         limit,
         vaccount

package/lib/interfaces/keyvalue-interface.ts

@@ -1,3 +1,4 @@
+import { Direction } from "../common/define";
 import { ThemePermission } from "../common/constants";
 import { ThemeAuthInfo, ThemeComment } from "../common/types/types";
 import { KeyValueStoreType, KeyValueDB } from "../implements/keyvalue/manager";
@@ -93,6 +94,7 @@ export interface IKeyValueOperations {
    * @param key 键名
    * @param limit 返回结果数量限制
    * @param seekKey 查询起始键,用于分页查询
+   * @param direction 查询方向
    * @param offset 结果偏移量
    * @param vaccount 可选的虚拟账户
    * @returns [值列表生成的json字符串, 错误信息]
@@ -102,6 +104,7 @@ export interface IKeyValueOperations {
     key: string,
     limit: number,
     seekKey:string, 
+    direction: Direction,
     offset: number,
     vaccount?: string
   ): Promise<[string | null, Error | null]>;
@@ -129,6 +132,7 @@ export interface IKeyValueOperations {
    * @param indexValue 索引值
    * @param seekKey 查询起始键
    * @param offset 结果偏移量
+   * @param direction 查询方向 (Forward/Backward)
    * @param limit 返回结果数量限制
    * @param vaccount 可选的虚拟账户
    * @returns [JSON格式查询结果, 错误信息]
@@ -140,6 +144,7 @@ export interface IKeyValueOperations {
     limit: number,
     seekKey: string,
     offset: number,
+    direction: Direction,
     vaccount?: string
   ): Promise<[string | null, Error | null]>;
 }

package/lib/modules/keyvalue-module.ts

@@ -7,6 +7,7 @@ import { DCModule, CoreModuleName } from "../common/module-system";
 import { KeyValueManager, KeyValueStoreType, KeyValueDB } from "../implements/keyvalue/manager";
 import { createLogger } from "../util/logger";
 import { ThemeAuthInfo, ThemeComment } from "../common/types/types";
+import { Direction } from "../common/define";
 const logger = createLogger('KeyValueModule');
 const indexkey_dckv = "indexkey_dckv"; //索引键名，keyvalue设置过程中key本身的索引键
 /**
@@ -203,6 +204,7 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
     key: string,
     limit: number,
     seekKey:string, 
+    direction: Direction = Direction.Forward,
     offset: number,
     vaccount?: string
   ): Promise<[string | null, Error | null]> {
@@ -212,7 +214,7 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
     }
     
     try {
-      const res = await kvdb.getWithIndex(indexkey_dckv, key, limit,seekKey, offset,  vaccount);
+      const res = await kvdb.getWithIndex(indexkey_dckv, key, limit,seekKey,direction, offset,  vaccount);
       return res;
     } catch (error) {
       logger.error(`getValues失败:`, error);
@@ -247,6 +249,7 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
     limit: number,
     seekKey:string, 
     offset: number,
+    direction: Direction = Direction.Forward,
     vaccount?: string
   ): Promise<[string | null, Error | null]> {
     const err = this.assertInitialized();
@@ -254,7 +257,7 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
       return [null, err];
     }
     try {
-      const res = await kvdb.getWithIndex(indexKey, indexValue, limit,seekKey, offset,  vaccount);
+      const res = await kvdb.getWithIndex(indexKey, indexValue, limit,seekKey, direction,offset,  vaccount);
     return res;
     } catch (error) {
       logger.error(`getWithIndex失败:`, error);

package/package.json

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