web-dc-api 0.0.40 → 0.0.42

package/lib/common/define.ts

@@ -1,27 +1,37 @@
-
 // 只考虑浏览器环境
 declare const __IS_PROD__: boolean | undefined;
 
 let isProd = false;
-
 // 打包后用 __IS_PROD__，源码直用时用 window.IS_PROD
-if (typeof __IS_PROD__ !== 'undefined') {
+if (typeof __IS_PROD__ !== "undefined") {
   isProd = __IS_PROD__;
-} else if (typeof window !== 'undefined' && typeof (window as any).IS_PROD !== 'undefined') {
+} else if (
+  typeof window !== "undefined" &&
+  typeof (window as any).IS_PROD !== "undefined"
+) {
   isProd = (window as any).IS_PROD;
 }
+const walletOpenType =
+  typeof globalThis !== "undefined" ? (globalThis as any).walletOpenType : ""; // 用于判断是否是直接打开;
+
+const walletOpenOrgin =
+  typeof globalThis !== "undefined" ? (globalThis as any).walletOpenOrgin : ""; // 用户传入的打开钱包的源;
 
-let _baseUrl = '';
-let _walletOrigin = ''
-if (true) {
-  _baseUrl ='/v0_0_8'
-  _walletOrigin = 'https://wallet.dcnetio.com'
+
+let _baseUrl = "";
+let _walletOrigin = "";
+if (isProd) {
+    _baseUrl = "/v0_0_9";
+    _walletOrigin = "https://wallet.dcnetio.com";
+    if(walletOpenType === "iframe") {
+      _walletOrigin = walletOpenOrgin || "https://wallet.dcnetio.com";
+    }
 } else {
-  _baseUrl = ''
-  _walletOrigin = 'http://localhost:3000'
+    _baseUrl = "";
+    _walletOrigin = "http://localhost:3000";
 }
 export const walletOrigin = _walletOrigin;
-export const  walletUrl = _walletOrigin + _baseUrl; // 钱包地址后面统一改成origin+version
+export const walletUrl = _walletOrigin + _baseUrl; // 钱包地址后面统一改成origin+version
 export const walletWindowName = "walletWindow"; // 窗口名称
 export const dc_protocol = "/dc/thread/0.0.1";
 export const dial_timeout = 1000;
@@ -29,23 +39,23 @@ export const keyExpire = 60 * 60 * 24; // setcachekey 过期时间默认一天
 export const OffChainOpTimes = 2000; // 链下操作次数
 export const OffChainSpaceLimit = 1024 * 1024 * 10; // 评论空间下限10m
 export const OffChainOpTimesLimit = 100; // 链下操作次数下限
-export enum Direction {  
-  Forward = 0,  
-  Reverse = 1  
-}  
+export enum Direction {
+  Forward = 0,
+  Reverse = 1,
+}
 export enum CommentType {
   /** 普通评论 */
   Comment = 0,
-  
+
   /** 赞 */
   Up = 1,
-  
+
   /** 踩 */
   Down = 2,
-  
+
   /** 推荐或转发 */
   Transfer = 3,
-  
+
   /** keyvalue形式的数据 */
-  KeyValue = 4
-}
+  KeyValue = 4,
+}

package/lib/common/module-system.ts

@@ -116,6 +116,7 @@ export class ModuleSystem {
             logger.error(`核心模块 ${moduleName} 初始化失败`);
             return false;
           }
+          logger.info(`核心模块 ${moduleName} 初始化成功`);
         } catch (error) {
           logger.error(`核心模块 ${moduleName} 初始化出错:`, error);
           return false;

package/lib/common/service-worker.ts

@@ -114,8 +114,9 @@ async function handleIpfsRequest(
           return;
         }
       } else {
+        const [fileContent, error] = await fileOps.getFile(ipfsPath, decryptKey);
+       fileData = fileContent;
         // 普通文件请求
-        fileData = (await fileOps.getFile(ipfsPath, decryptKey)) ?? null;
         fileSize = fileData ? fileData.length : 0;
         // 非范围请求的文件读取完成后，清理缓存
         fileOps.clearFileCache(pathname);

package/lib/common/types/types.ts

@@ -123,7 +123,7 @@ export interface AIProxyConfig {
   apiType: number;      // 当type 为0时起作用,表示模型的接口类型,如0:anthropic,1:openai 2:ollama 3:googleai 4:azureopenai
   authorization: string;
   endpoint: string;
-  organization: string; // 组织名称或ID (fixed spelling from 'Orgnization')
+  organization: string; // 组织名称或ID 
   apiVersion: string;   // api版本号
   modelConfig: ModelConfig; // 模型配置
   remark: string;
@@ -191,6 +191,8 @@ export enum AIStreamResponseFlag {
   /** Token数超限，需要继续请求 */
   TOKEN_LIMIT_EXCEEDED = 5,
   TOOLCALL = 6,
+  // 外部退出
+  EXTERNAL_EXIT = 7,
   /** 卡住了 */
   STREAM_HANG = 88,
   /** 其他错误 */
@@ -226,6 +228,10 @@ export enum UploadStatus {
   UPLOADING=2, // 上传中
   ERROR=3,
   ABNORMAL=4,
+  PULLERROR=5,
+  FILESIZEERROR=6, // 文件大小错误
+  FILECOUNTERROR=7, // 文件总数错误
+  NOSPACE=8, // 存储空间不足
 };
 
 export type ConnectReqMessage = {

package/lib/dc.ts

@@ -80,7 +80,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);
 
@@ -205,7 +205,9 @@ export class DC implements DCContext {
           backStep && (await backStep(3));
 
           // 定时维系token
-          this.auth.startDcPeerTokenKeepValidTask();
+          if(this.auth){
+            this.auth.startDcPeerTokenKeepValidTask();
+          }
 
           return true;
         } catch (error) {
@@ -222,6 +224,7 @@ export class DC implements DCContext {
     }
   };
 
+
   setAppInfo(appInfo: APPInfo): void {
     this.appInfo = appInfo;
   }
@@ -241,6 +244,9 @@ export class DC implements DCContext {
     let userInfo: User | null = null;
     try {
       this.assertInitialized();
+      if(!this.auth) {
+        return [null, new Error("用户模块不存在")];
+      }
       const [user, err] = await this.auth.refreshUserInfo();
       if (err) {
         return [null, err];
@@ -269,12 +275,41 @@ export class DC implements DCContext {
             const fid = threadDBInfos[3] || ""; //预加载记录文件ID
             const preCount = threadDBInfos[4] || 0; //预加载记录条数
             //判断本地是否存在数据库
+            if(!this.db) {
+              return [null, new Error("数据库模块不存在")]
+            }
             const [dbinfo, error] = await this.db.getDBInfo(threadid);
             if (dbinfo != null && !error) {
+              //本地数据库存在,检查是否需要表结构升级
+              if (verno) {
+                //获取本地localVersion
+                const localVersion = await this.db.loadVerno(threadid);
+                if (localVersion != verno) {
+                  //版本号不一致，需要升级表结构
+                 const err = await this.db.upgradeCollections(
+                    threadid,
+                    collections
+                  );
+                  if (err) {
+                    console.error("升级表结构失败", err);
+                    return [null, err];
+                  }
+                  // 更新本地版本号
+                  await this.db.saveVerno(threadid, verno);
+                }
+                // 需要升级表结构
+                await this.db.upgradeCollections(
+                  threadid,
+                  collections
+                );
+              }
+
               this.db.refreshDBFromDC(threadid);
               //3秒后将本地数据库同步到DC
               setTimeout(() => {
-                this.db.syncDBToDC(threadid);
+                if(this.db){
+                  this.db.syncDBToDC(threadid);
+                }
               }, 5000);
               this.dbThreadId = dbinfo.id;
               return [dbinfo, null];
@@ -304,6 +339,12 @@ export class DC implements DCContext {
           return [null, error];
         }
       }
+      if(!this.util) {
+        return [null, new Error("util模块不存在")];
+      }
+      if(!this.db) {
+        return [null, new Error("数据库模块不存在")]
+      }
       //数据库不存在，创建应用数据库
       const rk = this.util.createSymmetricKey();
       const sk = this.util.createSymmetricKey();
@@ -333,6 +374,9 @@ export class DC implements DCContext {
           return [null, new Error("设置用户去中心DB失败")];
         }
       }
+      if(!this.db) {
+        return [null, new Error("数据库模块不存在")]
+      }
       const [dbinfo, error] = await this.db.getDBInfo(threadId);
       if (dbinfo != null && !error) {
         this.dbThreadId = dbinfo.id;
@@ -359,6 +403,9 @@ export class DC implements DCContext {
   ): Promise<boolean> {
     // 加到用户信息上
     try {
+      if(!dc.auth) {
+        return false;
+      }
       await dc.auth.setUserDefaultDB(DBthreadid, rk, sk, remark || "");
     } catch (error) {
       console.error("设置用户默认DB失败", error);
@@ -376,19 +423,22 @@ export class DC implements DCContext {
       // 初始化定时器
       let interval = setInterval(async () => {
         intervalNum++;
-        // 获取用户信息，判断空间有效期是否延长
-        const [user, err] = await dc.auth.refreshUserInfo();
-        if (!err && user && user.dbConfig) {
-          // 绑定成功停止定时任务
-          interval ? clearInterval(interval) : "";
-          intervalNum = 0;
-          resolve(true);
-        } else if (intervalNum > 20) {
+          if (intervalNum > 20) {
           // 超时停止定时任务
           interval ? clearInterval(interval) : "";
           intervalNum = 0;
           resolve(false);
         }
+        // 获取用户信息，判断空间有效期是否延长
+        if(dc.auth){
+          const [user, err] = await dc.auth.refreshUserInfo();
+          if (!err && user && user.dbConfig) {
+            // 绑定成功停止定时任务
+            interval ? clearInterval(interval) : "";
+            intervalNum = 0;
+            resolve(true);
+          }
+        }
       }, 1000);
     });
   }
@@ -440,6 +490,9 @@ export class DC implements DCContext {
    * @returns 签名结果
    */
   sign = async (payload: Uint8Array): Promise<Uint8Array> => {
+    if (!this.auth) {
+      return new Uint8Array();
+    }
     const signature = this.auth.signWithWallet(payload);
     return signature;
   };
@@ -513,13 +566,17 @@ export class DC implements DCContext {
    * @param moduleName 模块名称
    * @returns 模块实例
    */
-  getModule<T extends DCModule>(moduleName: string): T {
-    this.assertInitialized();
-    const module = this.moduleSystem.getModule<T>(moduleName);
-    if (!module) {
-      throw new Error(`模块 ${moduleName} 不存在或未注册`);
+  getModule<T extends DCModule>(moduleName: string): T | null {
+    try {
+      this.assertInitialized();
+      const module = this.moduleSystem.getModule<T>(moduleName);
+      if (!module) {
+        throw new Error(`模块 ${moduleName} 不存在或未注册`);
+      }
+      return module;
+    } catch (error) {
+      return null;
     }
-    return module;
   }
 
   /**

package/lib/implements/aiproxy/client.ts

@@ -220,7 +220,7 @@ export class AIProxyClient {
           onStreamResponse(AIStreamResponseFlag.STREAM_HANG, "", "数据流超时：超过30秒未收到响应数据");
         }
       }
-    }, 30000); // 30秒超时
+    }, 60000); // 60秒超时
   };
 
   // 检查是否已经被中止
@@ -244,6 +244,11 @@ export class AIProxyClient {
     
     try {
       const decodedPayload = dcnet.pb.DoAIProxyCallReply.decode(payload);
+      if (decodedPayload.flag == AIStreamResponseFlag.CONNECTION_CLOSED) {
+        isCompleted = true; // 如果不是流式响应，标记为完成
+        clearTimeoutTimer();
+         console.log('*********** CONNECTION_CLOSED ***********222');
+      }
       if (onStreamResponse) {
         onStreamResponse(
           decodedPayload.flag,
@@ -260,22 +265,20 @@ export class AIProxyClient {
   };
 
   const onEndCallback = async () => {
-    if (isAborted || checkAborted()) return;
-    
-    isCompleted = true;
-    clearTimeoutTimer();
-    
+     clearTimeoutTimer();
+    if (isAborted || checkAborted() || isCompleted) return;
+    console.log('*********** onEndCallback ***********1111');
+      isCompleted = true;
     if (onStreamResponse) {
       onStreamResponse(AIStreamResponseFlag.CONNECTION_CLOSED, "", "");
     }
   };
 
   const onErrorCallback = async (error: unknown) => {
-    if (isAborted || checkAborted()) return;
-    
-    isCompleted = true;
-    clearTimeoutTimer();
-    
+    if (isAborted || checkAborted() || isCompleted) return;
+    //不要标记完成,和清理定时器,统一由onEndCallback处理
+   // isCompleted = true; // 
+   // clearTimeoutTimer();
     if (onStreamResponse) {
       onStreamResponse(AIStreamResponseFlag.OTHER_ERROR, "", error instanceof Error ? error.message : String(error));
     }
@@ -289,7 +292,7 @@ export class AIProxyClient {
       isAborted = true;
       clearTimeoutTimer();
       console.log('DoAIProxyCall 调用前已被中止');
-      return AIStreamResponseFlag.STREAM_HANG;
+      return AIStreamResponseFlag.EXTERNAL_EXIT;
     }
     
     abortListener = () => {
@@ -299,7 +302,7 @@ export class AIProxyClient {
       
       // 通知调用者已被中止
       if (onStreamResponse) {
-        onStreamResponse(AIStreamResponseFlag.STREAM_HANG, "", "调用被用户中止");
+        onStreamResponse(AIStreamResponseFlag.EXTERNAL_EXIT, "", "调用被用户中止");
       }
     };
     
@@ -337,7 +340,7 @@ export class AIProxyClient {
     
     // 检查是否是中止导致的错误
     if (context.signal?.aborted) {
-      return AIStreamResponseFlag.STREAM_HANG;
+      return AIStreamResponseFlag.EXTERNAL_EXIT;
     }
     
     throw error;
@@ -349,6 +352,7 @@ export class AIProxyClient {
     if (abortListener && context.signal) {
       context.signal.removeEventListener('abort', abortListener);
     }
+    // 无需关闭 gRPC 客户端连接，因为 Libp2pGrpcClient 没有 close 方法
   }
 }
 }

package/lib/implements/file/client.ts

@@ -83,7 +83,7 @@ export class FileClient {
             resStatus = UploadStatus.UPLOADING;
             break;
           case uploadRespondStatus.PullFail:
-            resStatus = UploadStatus.ERROR;
+            resStatus = UploadStatus.PULLERROR;
             break;
           case uploadRespondStatus.PullSuccess:
             resStatus = UploadStatus.OK;
@@ -95,13 +95,13 @@ export class FileClient {
             resStatus = UploadStatus.ABNORMAL;
             break;
           case uploadRespondStatus.FaultSize:
-            resStatus = UploadStatus.ERROR;
+            resStatus = UploadStatus.FILESIZEERROR;
             break;
           case uploadRespondStatus.FaultCount:
-            resStatus = UploadStatus.ERROR;
+            resStatus = UploadStatus.FILECOUNTERROR;
             break;
           case uploadRespondStatus.NoUserSpace:
-            resStatus = UploadStatus.ERROR;
+            resStatus = UploadStatus.NOSPACE;
             break;
         }
         if(onUpdateTransmitSize ) {
@@ -194,7 +194,7 @@ async storeFolder(
             resStatus = UploadStatus.UPLOADING;
             break;
           case uploadRespondStatus.PullFail:
-            resStatus = UploadStatus.ERROR;
+            resStatus = UploadStatus.PULLERROR;
             break;
           case uploadRespondStatus.PullSuccess:
             resStatus = UploadStatus.OK;
@@ -206,13 +206,13 @@ async storeFolder(
             resStatus = UploadStatus.ABNORMAL;
             break;
           case uploadRespondStatus.FaultSize:
-            resStatus = UploadStatus.ERROR;
+            resStatus = UploadStatus.FILESIZEERROR;
             break;
           case uploadRespondStatus.FaultCount:
-            resStatus = UploadStatus.ERROR;
+            resStatus = UploadStatus.FILECOUNTERROR;
             break;
           case uploadRespondStatus.NoUserSpace:
-            resStatus = UploadStatus.ERROR;
+            resStatus = UploadStatus.NOSPACE;
             break;
         }
         if (updateTransmitCount !== null) {

package/lib/implements/file/manager.ts

@@ -302,7 +302,9 @@ export class FileManager {
       if (resError) {
         return [null, resError];
       }
-      if (resStatus === UploadStatus.ERROR || resStatus === UploadStatus.ABNORMAL) {
+      if (resStatus === UploadStatus.ERROR || resStatus === UploadStatus.ABNORMAL 
+        || resStatus === UploadStatus.NOSPACE || resStatus === UploadStatus.FILECOUNTERROR
+        || resStatus === UploadStatus.FILESIZEERROR || resStatus === UploadStatus.PULLERROR) {
         //上传失败，不需要操作
         return [null, Errors.ErrNoNeedUpload];
       }
@@ -520,7 +522,9 @@ export class FileManager {
         updateTransmitCount(UploadStatus.ERROR, 0, 0);
         return [null, resError];
       }
-      if (resStatus === UploadStatus.ERROR || resStatus === UploadStatus.ABNORMAL) {
+      if (resStatus === UploadStatus.ERROR || resStatus === UploadStatus.ABNORMAL 
+        || resStatus === UploadStatus.NOSPACE || resStatus === UploadStatus.FILECOUNTERROR
+        || resStatus === UploadStatus.FILESIZEERROR || resStatus === UploadStatus.PULLERROR) {
         //上传失败的时候，不需要操作
         return [null, Errors.ErrNoNeedUpload];
       }

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

@@ -129,9 +129,9 @@ export interface MetadataKey {
 
 export interface DumpMetadata {  
   data: {  
-    int64: Record<string, number>;   
-    bool: Record<string, boolean>;  
-    string: Record<string, string>;  
-    bytes: Record<string, Uint8Array>;  
+    int64: Record<string, Record<string, number>>;   
+    bool: Record<string, Record<string, boolean>>;  
+    string: Record<string, Record<string, string>>;  
+    bytes: Record<string, Record<string, Uint8Array>>;  
   };  
 }

package/lib/implements/threaddb/lsstoreds/metadata.ts

@@ -46,10 +46,10 @@ export class DsThreadMetadata implements IThreadMetadata {
     try {  
       const value = await this.ds.get(k)  
       return value
-    } catch (err) {  
-      if (err.code === 'ERR_NOT_FOUND') return null  
-      throw new Error(`Error getting metadata: ${err.message}`)  
-    }  
+    } catch (err:any) {
+      if (err.code === 'ERR_NOT_FOUND') return null
+      throw new Error(`Error getting metadata: ${err.message}`)
+    }
   }  
 
 
@@ -57,7 +57,7 @@ export class DsThreadMetadata implements IThreadMetadata {
     const k = this.keyMeta(t, key)   
     try {  
       await this.ds.put(k, val)  
-    } catch (err) {  
+    } catch (err:any) {  
       throw new Error(`Error setting metadata: ${err.message}`)  
     }  
   }  
@@ -73,7 +73,7 @@ export class DsThreadMetadata implements IThreadMetadata {
       const value = await this.ds.get(k)  
       // For Uint8Array we'll handle it in getBytes method
       return this.decodeValue<T>(value)  
-    } catch (err) {  
+    } catch (err:any) {
       if (err.code === 'ERR_NOT_FOUND') return null  
       throw new Error(`Error getting metadata: ${err.message}`)  
     }  
@@ -84,7 +84,7 @@ export class DsThreadMetadata implements IThreadMetadata {
     const value = this.encodeValue(val)  
     try {  
       await this.ds.put(k, value)  
-    } catch (err) {  
+    } catch (err:any) {  
       throw new Error(`Error setting metadata: ${err.message}`)  
     }  
   }  
@@ -112,13 +112,13 @@ export class DsThreadMetadata implements IThreadMetadata {
           throw new Error(`Bad metabook key: ${entry.key}`)  
         }  
         const [,, ts, key] = kns  
-        const tid = this.parseThreadID(ts)  
-        const mk: MetadataKey = { t: tid, k: key }  
+        const tid = this.parseThreadID(ts!)  
+        const mk: MetadataKey = { t: tid, k: key! }  
 
         const value = await this.decodeAnyValue(entry.value)  
         this.storeDecodedValue(dump, mk, value)  
       }  
-    } catch (err) {  
+    } catch (err:any) {  
       throw new Error(`Error dumping metadata: ${err.message}`)
     } 
     return dump  
@@ -152,7 +152,7 @@ export class DsThreadMetadata implements IThreadMetadata {
       for await (const key of results) {  
         await this.ds.delete(key)
       }  
-    } catch (err) {
+    } catch (err:any) {
         throw new Error(`Error clearing keys: ${err.message}`)
     }  
   }  
@@ -161,7 +161,7 @@ export class DsThreadMetadata implements IThreadMetadata {
     try {  
       const decoder = new TextDecoder()  
       return JSON.parse(decoder.decode(buf)) as T  
-    } catch (err) {  
+    } catch (err:any) {  
       throw new Error(`Value decoding failed: ${err.message}`)  
     }  
   }  
@@ -170,7 +170,7 @@ export class DsThreadMetadata implements IThreadMetadata {
     try {  
       const encoder = new TextEncoder()  
       return encoder.encode(JSON.stringify(val))  
-    } catch (err) {  
+    } catch (err:any) {  
       throw new Error(`Value encoding failed: ${err.message}`)  
     }  
   }  
@@ -178,7 +178,7 @@ export class DsThreadMetadata implements IThreadMetadata {
   private parseThreadID(ts: string): ThreadID {  
     try {  
       return ThreadID.fromString(ts)  
-    } catch (err) {  
+    } catch (err:any) {  
       throw new Error(`Invalid thread ID: ${ts}`)  
     }  
   }  
@@ -190,21 +190,22 @@ export class DsThreadMetadata implements IThreadMetadata {
   ) {  
     switch (typeof value) {  
       case 'boolean':  
-        dump.data.bool[mk.t.toString()] = dump.data.bool[mk.t.toString()] || false;
-        dump.data.bool[mk.t.toString()][mk.k] = value;
+        dump.data.bool[mk.t.toString()] = dump.data.bool[mk.t.toString()] || {};  
+        dump.data.bool[mk.t.toString()]![mk.k] = value;
         break  
       case 'number':  
-        dump.data.int64[mk.t.toString()] = dump.data.int64[mk.t.toString()] || 0;
-        dump.data.int64[mk.t.toString()][mk.k] = value;
+        dump.data.int64[mk.t.toString()] = dump.data.int64[mk.t.toString()] || {};
+        dump.data.int64[mk.t.toString()]![mk.k] = value;
         break  
       case 'string':  
-        dump.data.string[mk.t.toString()] = dump.data.string[mk.t.toString()] || '';
-        dump.data.string[mk.t.toString()][mk.k] = value;
+        dump.data.string[mk.t.toString()] = dump.data.string[mk.t.toString()] || {};
+        dump.data.string[mk.t.toString()]![mk.k] = value;
         break  
       default:  
         if (value instanceof Uint8Array) {  
-          dump.data.bytes[mk.t.toString()] = dump.data.bytes[mk.t.toString()];
-          dump.data.bytes[mk.t.toString()][mk.k] = value;
+         // dump.data.bytes[mk.t.toString()] = dump.data.bytes[mk.t.toString()] || '';
+          dump.data.bytes[mk.t.toString()] = dump.data.bytes[mk.t.toString()] || {};
+          dump.data.bytes[mk.t.toString()]![mk.k] = value;
         } else {  
           throw new Error(`Unsupported value type for key: ${mk.k}`)  
         }  

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

@@ -50,7 +50,6 @@ import {
 import * as buffer from "buffer/";
 import { AsyncMutex } from '../common/AsyncMutex';
 import { DCContext } from '../../../interfaces';
-import { p } from 'lib/common/blowfish/const';
 const { Buffer } = buffer;