web-dc-api 0.0.64 → 0.0.65

package/lib/common/dc-key/keyManager.ts

@@ -348,13 +348,13 @@ export async function ed25519PublicKeyToCryptoKey(
         .replace(pemHeader, '')  
         .replace(pemFooter, '')  
         .replace(/\s+/g, '');  
-      keyData = Uint8Array.from(atob(pemContents), c => c.charCodeAt(0));  
+      keyData = Uint8Array.from(atob(pemContents), c => c.charCodeAt(0)) as any;  
     } else {  
       // 处理 Base64/Hex 等编码的 RAW 格式  
-      keyData = Uint8Array.from(atob(publicKey), c => c.charCodeAt(0));  
+      keyData = Uint8Array.from(atob(publicKey), c => c.charCodeAt(0)) as any;  
     }  
   } else {  
-    keyData = publicKey;  
+    keyData = publicKey as any;  
   }  
 
   // 2. 检测密钥格式  
@@ -396,13 +396,13 @@ export async function ed25519PrivateKeyToCryptoKey(
         .replace(pemHeader, '')  
         .replace(pemFooter, '')  
         .replace(/\s+/g, '');  
-      keyData = Uint8Array.from(atob(pemContents), c => c.charCodeAt(0));  
+      keyData = Uint8Array.from(atob(pemContents), c => c.charCodeAt(0)) as any;  
     } else {  
       // 处理 Base64/Hex 编码的 RAW 格式  
-      keyData = Uint8Array.from(atob(privateKey), c => c.charCodeAt(0));  
+      keyData = Uint8Array.from(atob(privateKey), c => c.charCodeAt(0)) as any;  
     }  
   } else {  
-    keyData = privateKey;  
+    keyData = privateKey as any;  
   }  
 
   // 2. 检测密钥格式  

package/lib/implements/account/manager.ts

@@ -336,7 +336,7 @@ export class AccountManager {
       // 准备签名数据
       const serverPidBytes = new TextEncoder().encode(serverPid.toString());
       const prikeyencryptHash = new Uint8Array(
-        await crypto.subtle.digest("SHA-256", prikeyencrypt)
+        await crypto.subtle.digest("SHA-256", prikeyencrypt as any)
       );
 
       // 区块高度转为小端字节序

package/lib/implements/keyvalue/manager.ts

@@ -16,6 +16,7 @@ import { Client } from "../../common/dcapi";
 import { CommentType, Direction } from "../../common/define";
 import { DCContext } from "../../../lib/interfaces/DCContext";
 import { AnyExtensionField } from "protobufjs";
+import { isArray } from "util";
 
 //定义Key-Value存储的数据类型
 export enum KeyValueStoreType { //存储主题类型 1:鉴权主题(读写都需要鉴权) 2:公共主题(默认所有用户可读,写需要鉴权)
@@ -75,8 +76,31 @@ export class KeyValueDB {
     writerPubkey?: string,
     vaccount?: string
   ): Promise<[string | null, Error | null]> {
-    if (!writerPubkey) {
-      writerPubkey = this.themeAuthor;
+    if (!writerPubkey) {//没有指定写入者,则获取该key的最新值
+      const [values, err] = await this.getWithIndex("dc_timestamp_index", "",1, "", Direction.Reverse, 0,);
+      if (err) {
+        return [null, err];
+      }
+      if (!values) {
+        return [null, null];
+      }
+      const jsonValues = JSON.parse(values);
+      if (!Array.isArray(jsonValues)) {
+        return [values, null];
+      }
+      if (jsonValues.length == 0) {
+        return [null, null];
+      }
+      let keyValue ="";
+      try{  
+        keyValue = JSON.stringify(jsonValues[0]);
+      }catch(err){
+        return [null, err instanceof Error ? err : new Error(String(err))];
+      }
+      if (!keyValue || keyValue.length == 0) {
+        keyValue = jsonValues[0];
+      }
+      return [keyValue, null];
     }
     return this.manager.getValueWithKey(
       this.appId,

package/lib/implements/threaddb/core/core.ts

@@ -46,7 +46,7 @@ export interface INet {
   getThread( id: ThreadID, ...opts: any[]): Promise<ThreadInfo>;  
   getThreadFromPeer( id: ThreadID, peer: PeerId, options: { token?: ThreadToken }): Promise<ThreadInfo>;
   deleteThread( id: ThreadID, ...opts: any[]): Promise<void>;  
-  pullThread( id: ThreadID,timeout: number, ...opts: any[]): Promise<void>;  
+  pullThread( id: ThreadID,timeout: number, options: { token?: ThreadToken | undefined; multiPeersFlag?: boolean | undefined;} ): Promise<void>;  
   getPbLogs( id: ThreadID): Promise<[net_pb.pb.ILog[], IThreadInfo]>;  
 }  
 

package/lib/implements/threaddb/dbmanager.ts

@@ -1308,7 +1308,7 @@ async newDB(
 async refreshDBFromDC(threadId:string): Promise<Error | null> {  
     try {  
         const tId = await this.decodeThreadId(threadId);
-        await this.network.pullThread( tId,600);  
+        await this.network.pullThread( tId,600, { multiPeersFlag: true });  
         return null;  
     } catch (error) {  
         return error as Error;  

package/lib/implements/threaddb/net/net.ts

@@ -571,13 +571,17 @@ export class Network implements Net {
   /**
    * Pull thread updates from peers
    */
-  async pullThread(id: ThreadID): Promise<void> {
+  async pullThread(id: ThreadID, timeout: number, options: { token?: ThreadToken | undefined; multiPeersFlag?: boolean | undefined;}): Promise<void> {
     try {
       let recs: Record<string, PeerRecords> = {};
       const mutex = this.getMutexForThread(id.toString());
       await mutex.acquire();
       try {
-        recs = await this.pullThreadDeal(id);
+        if (options.multiPeersFlag) {
+          recs = await this.pullThreadDeal(id, options.multiPeersFlag );
+        }else{
+          recs = await this.pullThreadDeal(id, false );
+        }
       } finally {
         mutex.release();
       }
@@ -701,7 +705,7 @@ export class Network implements Net {
   /**
    * Pull thread records from peers
    */
-  async pullThreadDeal(tid: ThreadID): Promise<Record<string, PeerRecords>> {
+  async pullThreadDeal(tid: ThreadID,multiPeersFlag: boolean=false): Promise<Record<string, PeerRecords>> {
     try {
       let [offsets, peers] = await this.threadOffsets(tid);
       try {
@@ -725,7 +729,8 @@ export class Network implements Net {
           peers,
           tid,
           offsets,
-          netPullingLimit
+          netPullingLimit,
+          multiPeersFlag
         );
         let continueFlag = false;
         for (const [lidStr, rs] of Object.entries(recs)) {
@@ -1319,7 +1324,8 @@ export class Network implements Net {
     peers: PeerId[], 
     tid: ThreadID, 
     offsets: Record<string, { id?: CID, counter: number }>,
-    limit: number
+    limit: number,
+    multiPeersFlag: boolean = false
   ): Promise<Record<string, PeerRecords>> {
     try {
       // 构建请求
@@ -1343,23 +1349,18 @@ export class Network implements Net {
             }
             const dbClient = new DBClient(client,this.dc,this,this.logstore);
             const records = await dbClient.getRecordsFromPeer( req, serviceKey);
-            
-            // // 更新收集器
-            // Object.entries(records).forEach(([logId, rs]) => {
-            //    recordCollector.updateHeadCounter(logId, rs.counter);
-            //   rs.records.forEach(record => {
-            //     recordCollector.store(logId, record);
-            //   });
-            // });
             for (const [logId, rs] of Object.entries(records)) {
               await recordCollector.batchUpdate(logId, rs);
             }
             clearTimeout(timeout);
-            break;
+            if(!multiPeersFlag){
+               break;
+            }
           } catch (err) {
             continue;
           }
       }
+      
       return recordCollector.list();
     } catch (err) {
       console.error("getRecords error:", err);

package/lib/interfaces/keyvalue-interface.ts

@@ -60,7 +60,7 @@ export interface IKeyValueOperations {
    * @param kvdb: KeyValueDB,
    * @param key 键名
    * @param value 值内容
-   * @param indexs 索引列表，格式为"indexkey1:value$$$indexkey2:value",设置索引后,后续查询可以通过索引快速定位
+   * @param indexs 索引列表，格式为json字符串:[{key:"indexkey1",type:"string",value:"value"},{key:"indexkey2",type:"number", value:12}],设置索引后,后续查询可以通过索引快速定位
    * @param vaccount 可选的虚拟账户
    * @returns [是否设置成功, 错误信息]
    */
@@ -76,7 +76,7 @@ export interface IKeyValueOperations {
    * 获取指定键的值
    * @param kvdb: KeyValueDB,
    * @param key 键名
-   * @param writerPubkey 写入者的公钥,可选,默认为主题作者
+   * @param writerPubkey 写入者的公钥,如果不指定，则获取所有用户写入的该key的最新值
    * @param vaccount 可选的虚拟账户
    * @returns [值内容, 错误信息]
    */
@@ -89,7 +89,7 @@ export interface IKeyValueOperations {
 
 
  /**
-   * 获取指定键的值列表,包括所有用户写入的值,可以用在类似排名这些需要多人数据汇总的场景,key为场景名称,各个用户写入的值为各自在该场景下的内容
+   * 获取指定键的值列表,按key的字典序排序
    * @param kvdb: KeyValueDB,
    * @param key 键名
    * @param limit 返回结果数量限制
@@ -102,10 +102,7 @@ export interface IKeyValueOperations {
   getValues(
     kvdb: KeyValueDB,
     key: string,
-    limit: number,
-    seekKey:string, 
-    direction: Direction,
-    offset: number,
+    options: { limit?: number; seekKey?: string; direction?: Direction; offset?: number } ,
     vaccount?: string
   ): Promise<[string | null, Error | null]>;
 
@@ -130,6 +127,7 @@ export interface IKeyValueOperations {
    * @param kvdb: KeyValueDB,
    * @param indexKey 索引键名
    * @param indexValue 索引值
+   * @param type 索引值类型
    * @param seekKey 查询起始键
    * @param offset 结果偏移量
    * @param direction 查询方向 (Forward/Backward)
@@ -141,10 +139,7 @@ export interface IKeyValueOperations {
     kvdb: KeyValueDB,
     indexKey: string,
     indexValue: string,
-    limit: number,
-    seekKey: string,
-    offset: number,
-    direction: Direction,
+    options: { type?:string; limit?: number; seekKey?: string; direction?: Direction; offset?: number } ,
     vaccount?: string
   ): Promise<[string | null, Error | null]>;
 }

package/lib/modules/keyvalue-module.ts

@@ -9,6 +9,7 @@ import { createLogger } from "../util/logger";
 import { ThemeAuthInfo, ThemeComment } from "../common/types/types";
 import { Direction } from "../common/define";
 import { ThemePermission } from "../common/constants";
+import {padPositiveInt30} from "../util/utils";
 const logger = createLogger('KeyValueModule');
 const indexkey_dckv = "indexkey_dckv"; //索引键名，keyvalue设置过程中key本身的索引键
 /**
@@ -145,12 +146,13 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
     }
   }
   
+
   
   async set(
     kvdb: KeyValueDB,
     key: string,
     value: string,
-    indexs: string, //索引列表,格式为key1:value1$$$key2:value2
+    indexs: string, //索引列表,格式为json字符串:[{key:"indexkey1",type:"string",value:"value"},{key:"indexkey2",type:"number", value:12}],这里统一转换格式为key1:value1$$$key2:value2
     vaccount?: string
   ): Promise<[boolean | null, Error | null]> {
      const err = this.assertInitialized();
@@ -159,7 +161,23 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
     }
     
     try {
-      const res = await kvdb.set(key, value, indexs, vaccount);
+      //进行格式转换
+      let strIndexs = "";
+      const indexArray = JSON.parse(indexs);
+      for (const index of indexArray) {
+        let indexValue = "";
+        if( index.type === "number" ){ //
+          indexValue = padPositiveInt30(index.value);
+        }else{
+          indexValue = index.value;
+        }
+        strIndexs += `${index.key}:${indexValue}$$$`;
+      }
+      //追加时间戳索引，保证每次写入的唯一性
+      const timestamp = Date.now();
+      const timestampStr = padPositiveInt30(timestamp);
+      strIndexs += `dc_timestamp_index:${timestampStr}`;
+      const res = await kvdb.set(key, value, strIndexs, vaccount);
       return res;
     } catch (error) {
       logger.error(`设置set-value失败:`, error);
@@ -190,7 +208,7 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
 
 
    /**
-   * 获取指定键的值列表,包括所有用户写入的值,可以用在类似排名这些需要多人数据汇总的场景,key为场景名称,各个用户写入的值为各自在该场景下的内容
+   * 获取指定键的值列表
    * @param kvdb: KeyValueDB,
    * @param key 键名
    * @param limit 返回结果数量限制
@@ -202,19 +220,19 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
   async getValues(
     kvdb: KeyValueDB,
     key: string,
-    limit: number,
-    seekKey:string, 
-    direction: Direction = Direction.Forward,
-    offset: number,
+    options: { limit?: number; seekKey?: string; direction?: Direction; offset?: number } ,
     vaccount?: string
   ): Promise<[string | null, Error | null]> {
      const err = this.assertInitialized();
     if (err) {
       return [null, err];
     }
-    
+    const limit = options.limit? options.limit: 10;
+    const seekKey = options.seekKey? options.seekKey: "";
+    const direction = options.direction? options.direction: Direction.Forward;
+    const offset = options.offset? options.offset: 0;
     try {
-      const res = await kvdb.getWithIndex(indexkey_dckv, key, limit,seekKey,direction, offset,  vaccount);
+      const res = await kvdb.getWithIndex(indexkey_dckv, key, limit, seekKey, direction, offset, vaccount);
       return res;
     } catch (error) {
       logger.error(`getValues失败:`, error);
@@ -246,18 +264,23 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
     kvdb: KeyValueDB,
     indexKey:string,
     indexValue:string,
-    limit: number,
-    seekKey:string, 
-    offset: number,
-    direction: Direction = Direction.Forward,
+    options: {type?:string; limit?: number; seekKey?: string; direction?: Direction; offset?: number } ,
     vaccount?: string
   ): Promise<[string | null, Error | null]> {
     const err = this.assertInitialized();
     if (err) {
       return [null, err];
     }
+    const limit = options.limit? options.limit: 10;
+    const seekKey = options.seekKey? options.seekKey: "";
+    const direction = options.direction? options.direction: Direction.Forward;
+    const offset = options.offset? options.offset: 0;
+    let indexValueStr = "";
+    if( options.type === "number" ){ //
+      indexValueStr = padPositiveInt30(indexValue);
+    }
     try {
-      const res = await kvdb.getWithIndex(indexKey, indexValue, limit,seekKey, direction,offset,  vaccount);
+      const res = await kvdb.getWithIndex(indexKey, indexValueStr, limit,seekKey, direction,offset,  vaccount);
     return res;
     } catch (error) {
       logger.error(`getWithIndex失败:`, error);

package/lib/util/utils.ts

@@ -13,7 +13,7 @@ const TagBytes = 16;
 
 // SHA-256 哈希计算
 async function sha256(data: Uint8Array): Promise<Uint8Array> {
-  const hashBuffer = await crypto.subtle.digest("SHA-256", data);
+  const hashBuffer = await crypto.subtle.digest("SHA-256", data as any);
   return new Uint8Array(hashBuffer);
 }
 
@@ -232,6 +232,18 @@ function jsonStringify(value: any): string {
   );
 }
 
+
+// 30 位零填充，不做数值运算，避免精度问题
+ function padPositiveInt30(v: string | number): string {
+  let s = String(v).trim();
+  if (!/^\d+$/.test(s)) throw new Error("只接受正整数数字串");
+  // 去掉前导 0（如果要允许 0，把正则改为 /^\d+$/ 并允许 s === '0'）
+  s = s.replace(/^0+/, "") || "0";
+  if (s === "0") return "0".padStart(30, "0"); // 如需排除 0 可去掉这行并在上面报错
+  if (s.length > 30) throw new Error("超过 30 位宽度");
+  return s.padStart(30, "0");
+}
+
 export {
   sha256,
   getRandomBytes,
@@ -252,5 +264,6 @@ export {
   loadKeyPair,
   parseUint32,
   hexToAscii,
-  jsonStringify
+  jsonStringify,
+  padPositiveInt30
 };

package/package.json

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