web-dc-api 0.0.83 → 0.0.85

package/lib/common/define.ts

@@ -22,7 +22,7 @@ const walletOpenVersion =
 let _baseUrl = "";
 let _walletOrigin = "";
 if (true) {
-    _baseUrl = "/v0_0_13";
+    _baseUrl = "/v0_0_14";
     _walletOrigin = "https://wallet.dcnetio.com";
     
     if(walletOpenOrgin) {

package/lib/dc.ts

@@ -85,7 +85,7 @@ export class DC implements DCContext {
     this.dcChain = new ChainUtil();
     this.dcutil = new DcUtil(this.dcChain);
     // //todo 发布注释 remove
-     // this.dcutil.defaultPeerId= "12D3KooWEGzh4AcbJrfZMfQb63wncBUpscMEEyiMemSWzEnjVCPf";
+      // this.dcutil.defaultPeerId= "12D3KooWEGzh4AcbJrfZMfQb63wncBUpscMEEyiMemSWzEnjVCPf";
     // //todo remove end
     this.appInfo = options.appInfo || ({} as APPInfo);
     this.accountInfo = {} as AccountInfo;

package/lib/implements/account/manager.ts

@@ -39,10 +39,8 @@ export const Errors = {
 export class AccountManager {
   dc: DcUtil;
   chainUtil: ChainUtil | undefined;
-  connectedDc: DCConnectInfo = {};
   context: DCContext;
   constructor(context: DCContext) {
-    this.connectedDc = context.connectedDc;
     this.dc = context.dcutil;
     this.chainUtil = context.dcChain;
     this.context = context;
@@ -50,7 +48,7 @@ export class AccountManager {
 
   // 获取用户备用节点
   getAccountNodeAddr = async (): Promise<[Multiaddr | null, Error | null]> => {
-    if (!this.connectedDc.client) {
+    if (!this.context.connectedDc.client) {
       console.error("dcClient is null");
       return [null, Errors.ErrNoDcPeerConnected];
     }
@@ -78,7 +76,7 @@ export class AccountManager {
   getUserInfoWithNft = async (
     nftAccount: string
   ): Promise<[User | null, Error | null]> => {
-    if (!this.connectedDc.client) {
+    if (!this.context.connectedDc.client) {
       console.error("dcClient is null");
       return [null, Errors.ErrNoDcPeerConnected];
     }
@@ -94,7 +92,7 @@ export class AccountManager {
   bindAccessPeerToUser = async (
     peerAddr: Multiaddr
   ): Promise<[boolean | null, Error | null]> => {
-    if (!this.connectedDc.client) {
+    if (!this.context.connectedDc.client) {
       console.error("dcClient is null");
       return [false, Errors.ErrNoDcPeerConnected];
     }
@@ -113,7 +111,7 @@ export class AccountManager {
     }
     // 绑定节点
     const blockHeight = await this.chainUtil.getBlockHeight();
-    const accountClient = new AccountClient(this.connectedDc.client);
+    const accountClient = new AccountClient(this.context.connectedDc.client);
     const bindResult = await accountClient.bindAccessPeerToUser(
       this.context,
       blockHeight ? blockHeight : 0,
@@ -137,15 +135,15 @@ export class AccountManager {
     mnemonic: string
   ): Promise<[NFTBindStatus, Error | null]> {
     // 检查节点连接
-    if (!this.connectedDc.client) {
+    if (!this.context.connectedDc.client) {
       return [NFTBindStatus.DcPeerNotConnected, Errors.ErrNoDcPeerConnected];
     }
-    if (!this.connectedDc.nodeAddr) {
+    if (!this.context.connectedDc.nodeAddr) {
       return [NFTBindStatus.DcPeerNotConnected, Errors.ErrNodeAddrIsNull];
     }
 
     try {
-      const connectedPeerIdStr = this.connectedDc.nodeAddr.getPeerId();
+      const connectedPeerIdStr = this.context.connectedDc.nodeAddr.getPeerId();
       if (!connectedPeerIdStr) {
         return [NFTBindStatus.DcPeerNotConnected, Errors.ErrNodeAddrIsNull];
       }
@@ -167,7 +165,7 @@ export class AccountManager {
       }
 
       // 获取客户端
-      const accountClient = new AccountClient(this.connectedDc.client);
+      const accountClient = new AccountClient(this.context.connectedDc.client);
       // 调用账户绑定API
       await accountClient.accountBind(req, mnemonic, this.context);
 
@@ -471,7 +469,7 @@ export class AccountManager {
     if (!appId) {
       return [null, new AccountError("App ID is required")];
     }
-    if (!this.connectedDc.nodeAddr) {
+    if (!this.context.connectedDc.nodeAddr) {
       return [null, new AccountError("No connected node")];
     }
     let subPrivateKey: Ed25519PrivKey;
@@ -494,7 +492,7 @@ export class AccountManager {
         return [null, new AccountError("Failed to get blockchain height")];
       }
       // 获取服务器节点ID
-      const serverPidStr = this.connectedDc.nodeAddr.getPeerId();
+      const serverPidStr = this.context.connectedDc.nodeAddr.getPeerId();
       if (!serverPidStr) {
         return [null, new AccountError("No connected peer ID")];
       }
@@ -529,11 +527,11 @@ export class AccountManager {
       }
 
       // 获取token
-      if (!this.connectedDc.client) {
+      if (!this.context.connectedDc.client) {
         throw [null, Errors.ErrNoAccountPeerConnected];
       }
-      if (this.connectedDc.client.token == "") {
-        const token = await this.connectedDc.client.GetToken(
+      if (this.context.connectedDc.client.token == "") {
+        const token = await this.context.connectedDc.client.GetToken(
           this.context.appInfo.appId || "",
           privateKey.publicKey.string(),
           async (payload: Uint8Array): Promise<Uint8Array> => {
@@ -553,7 +551,7 @@ export class AccountManager {
         signature: signature,
       };
 
-      const client = new AccountClient(this.connectedDc.client);
+      const client = new AccountClient(this.context.connectedDc.client);
       // 添加子公钥
       await client.addSubPubkey(req);
       // Wait for app account creation
@@ -629,10 +627,10 @@ export class AccountManager {
     if(!this.context.publicKey){
       throw Errors.ErrAccountPublicKeyIsNull;
     }
-    if(!this.connectedDc.client){
+    if(!this.context.connectedDc.client){
       throw Errors.ErrNoDcPeerConnected;
     }
-    if(!this.connectedDc.nodeAddr){
+    if(!this.context.connectedDc.nodeAddr){
       throw Errors.ErrNodeAddrIsNull;
     }
     const dbinfo = threadId + "|" + rk + "|" + sk + "|" + remark;
@@ -643,8 +641,8 @@ export class AccountManager {
     if (blockHeight === undefined) {
       throw new AccountError("Failed to get blockchain height");
     }
-    if (this.connectedDc.client.token == "") {
-      const token = await this.connectedDc.client.GetToken(
+    if (this.context.connectedDc.client.token == "") {
+      const token = await this.context.connectedDc.client.GetToken(
         this.context.appInfo.appId || "",
         this.context.publicKey.string(),
         async (payload: Uint8Array): Promise<Uint8Array> => {
@@ -655,8 +653,8 @@ export class AccountManager {
         throw new AccountError("Failed to get token");
       }
     }
-    const accountClient = new AccountClient(this.connectedDc.client);
-    const serverPidStr = this.connectedDc.nodeAddr.getPeerId() || "";
+    const accountClient = new AccountClient(this.context.connectedDc.client);
+    const serverPidStr = this.context.connectedDc.nodeAddr.getPeerId() || "";
     const serverPidBytes = new TextEncoder().encode(serverPidStr);
     // 生成签名数据
     const hvalue = uint32ToLittleEndianBytes(blockHeight);

package/lib/implements/aiproxy/client.ts

@@ -267,7 +267,6 @@ export class AIProxyClient {
   const onEndCallback = async () => {
      clearTimeoutTimer();
     if (isAborted || checkAborted() || isCompleted) return;
-    console.log('*********** onEndCallback ***********1111');
       isCompleted = true;
     if (onStreamResponse) {
       onStreamResponse(AIStreamResponseFlag.CONNECTION_CLOSED, "", "");
@@ -277,8 +276,6 @@ export class AIProxyClient {
   const onErrorCallback = async (error: unknown) => {
     if (isAborted || checkAborted() || isCompleted) return;
     //不要标记完成,和清理定时器,统一由onEndCallback处理
-   // isCompleted = true; // 
-   // clearTimeoutTimer();
     if (onStreamResponse) {
       onStreamResponse(AIStreamResponseFlag.OTHER_ERROR, "", error instanceof Error ? error.message : String(error));
     }

package/lib/implements/keyvalue/manager.ts

@@ -79,7 +79,7 @@ export class KeyValueDB {
     vaccount?: string
   ): Promise<[string | null, Error | null]> {
     if (!writerPubkey) {//没有指定写入者,则获取该key的最新值
-      const [values, err] = await this.getWithIndex("dc_timestamp_index", "",1, "", Direction.Reverse, 0,);
+      const [values, err] = await this.getWithIndex("indexkey_keyself_" + key, "", 1, "", Direction.Reverse, 0, vaccount);
       if (err) {
         return [null, err];
       }

package/lib/modules/keyvalue-module.ts

@@ -9,7 +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";
+import {padPositiveInt20} from "../util/utils";
 const logger = createLogger('KeyValueModule');
 const indexkey_dckv = "indexkey_dckv"; //索引键名，keyvalue设置过程中key本身的索引键
 /**
@@ -167,7 +167,7 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
           for (const index of indexArray) {
             let indexValue = "";
             if( index.type === "number" ){ //
-              indexValue = padPositiveInt30(index.value);
+              indexValue = padPositiveInt20(index.value);
             }else{
               indexValue = index.value;
             }
@@ -179,10 +179,6 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
       } catch (error) {
         logger.error(`设置索引,解析失败:`, error);
       }
-      //追加时间戳索引，保证每次写入的唯一性
-      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) {
@@ -322,7 +318,7 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
     const offset = options.offset? options.offset: 0;
     let indexValueStr = "";
     if( options.type === "number" ){ //
-      indexValueStr = padPositiveInt30(indexValue);
+      indexValueStr = padPositiveInt20(indexValue);
     }
     try {
       const res = await kvdb.getWithIndex(indexKey, indexValueStr, limit,seekKey, direction,offset,  vaccount);
@@ -331,6 +327,45 @@ export class KeyValueModule implements DCModule, IKeyValueOperations {
       return [null, error instanceof Error ? error : new Error(String(error))];
     }
   }
+
+  /**
+   * 按设置时间顺序获取主题的的键值对列表
+   * @param kvdb KeyValueDB实例
+   * @param limit 返回结果数量限制
+   * @param seekKey 查询起始键,用于分页查询
+   * @param direction 查询方向 
+   * @param offset 结果偏移量
+   * @param vaccount 可选的虚拟账户
+   * @returns [值列表数组生成的json字符串, 错误信息] 数组的每个元素的格式:  key:value$$$dckv_extra$$${'dc_timestamp':'%d','dc_opuser':'%s'}
+   */
+  async getWithTimeOrder(
+    kvdb: KeyValueDB,
+    timestamp: 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];
+    }
+    let timestampStr = "";
+    if( timestamp > 0 ){
+      //把毫秒时间转为微妙时间戳字符串,与DC节点存储的时间戳格式一致
+      timestampStr = padPositiveInt20(timestamp * 1000);
+      //前面补0,保证长度为20位
+      timestampStr = timestampStr.padStart(20, "0");
+    }
+    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_timestamp", timestampStr, limit, seekKey, direction, offset, vaccount);
+      return res;
+    } catch (error) {
+      return [null, error instanceof Error ? error : new Error(String(error))];
+    }
+  }
   
 
   /**

package/lib/util/utils.ts

@@ -236,16 +236,16 @@ function jsonStringify(value: any): string {
 
 /**
  * 将非负数字字符串（可带小数）格式化：
- * - 仅对整数部分左侧补零至 30 位
+ * - 仅对整数部分左侧补零至 20 位
  * - 小数部分（若有）原样保留
  * - 不进行数值运算，避免精度问题
  * 例：
- *  - "123"      -> "000000000000000000000000000123"
- *  - "123.45"   -> "000000000000000000000000000123.45"
- *  - "0.5"      -> "000000000000000000000000000000.5"
+ *  - "123"      -> "00000000000000000123"
+ *  - "123.45"   -> "00000000000000000123.45"
+ *  - "0.5"      -> "00000000000000000000.5"
  */
 
-function padPositiveInt30(v: string | number): string {
+function padPositiveInt20(v: string | number): string {
   const s0 = String(v).trim();
   // 仅允许非负数字，支持一处小数点（不允许科学计数法/负号）
   if (!/^\d+(\.\d+)?$/.test(s0)) throw new Error("只接受非负数字（可带小数）");
@@ -258,9 +258,9 @@ function padPositiveInt30(v: string | number): string {
   // 去掉整数部分前导 0
   intPart = intPart.replace(/^0+/, "") || "0";
 
-  if (intPart.length > 30) throw new Error("整数部分超过 30 位宽度");
+  if (intPart.length > 30) throw new Error("整数部分超过 20 位宽度");
 
-  const paddedInt = intPart.padStart(30, "0");
+  const paddedInt = intPart.padStart(20, "0");
   return fracPart ? `${paddedInt}.${fracPart}` : paddedInt;
 }
 
@@ -285,5 +285,5 @@ export {
   parseUint32,
   hexToAscii,
   jsonStringify,
-  padPositiveInt30
+  padPositiveInt20
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-dc-api",
-  "version": "0.0.83",
+  "version": "0.0.85",
   "description": "web相关的dcapi",
   "type": "module",
   "browser": "dist/dc.min.js",
@@ -59,7 +59,7 @@
     "datastore-idb": "^3.0.1",
     "datastore-level": "^11.0.1",
     "google-protobuf": "~3.21.2",
-    "grpc-libp2p-client": "^0.0.18",
+    "grpc-libp2p-client": "^0.0.19",
     "helia": "5.3.0",
     "interface-ipld-format": "^1.0.1",
     "it-to-buffer": "^4.0.7",