web-dc-api 0.0.40 → 0.0.41

package/lib/index.ts

@@ -1,10 +1,22 @@
 // index.ts
 // 导出主要类和功能
 // 在您库的入口文件开头添加
+
+declare global {
+  interface PromiseConstructor {
+    withResolvers<T = any>(): {
+      promise: Promise<T>;
+      resolve: (value: T | PromiseLike<T>) => void;
+      reject: (reason?: any) => void;
+    };
+  }
+}
+
 if (typeof Promise !== 'undefined' && !Promise.withResolvers) {
-  Promise.withResolvers = function() {
-    let resolve, reject;
-    const promise = new Promise((res, rej) => {
+  Promise.withResolvers = function<T = any>() {
+    let resolve!: (value: T | PromiseLike<T>) => void;
+    let reject!: (reason?: any) => void;
+    const promise = new Promise<T>((res, rej) => {
       resolve = res;
       reject = rej;
     });

package/lib/interfaces/file-interface.ts

@@ -26,7 +26,7 @@ export interface IFileOperations {
    * 获取缓存统计信息
    * @returns 包含缓存总数和键列表的统计对象
    */
-  getCacheStats(): { total: number; keys: string[] };
+  getCacheStats(): [{ total: number, keys: string[] } | null, Error | null];
 
   /**
    * 获取文件内容

package/lib/interfaces/util-interface.ts

@@ -1,4 +1,4 @@
-import { IAppInfo } from 'lib/common/types/types';
+import { IAppInfo } from '../../lib/common/types/types';
 import { SymmetricKey, Key as ThreadKey } from '../implements/threaddb/common/key';
 
 

package/lib/modules/aiproxy-module.ts

@@ -11,7 +11,7 @@ import { AIProxyUserPermission } from "../common/constants";
 const logger = createLogger('KeyValueModule');
 
 import { IAICallConfig } from "../common/types/types";
-import { IAIProxyOperations } from "lib/interfaces/aiproxy-interface";
+import { IAIProxyOperations } from "../../lib/interfaces/aiproxy-interface";
 
 
 /**
@@ -61,16 +61,24 @@ export class AIProxyModule implements DCModule ,IAIProxyOperations{
     appId: string,
     configTheme: string, 
   ): Promise<[number | null, Error | null]> {
-    this.assertInitialized();
-    return this.aiProxyManager.createProxyConfig(appId, configTheme);
+    try {
+      this.assertInitialized();
+      return this.aiProxyManager.createProxyConfig(appId, configTheme);
+    } catch (error) {
+      return Promise.resolve([null, error as Error]);
+    }
   }
 
   async deleteProxyConfig(
     appId: string,
     configTheme: string, 
   ): Promise<[number | null, Error | null]> {
-    this.assertInitialized();
-    return this.aiProxyManager.deleteProxyConfig(appId, configTheme);
+    try {
+      this.assertInitialized();
+      return this.aiProxyManager.deleteProxyConfig(appId, configTheme);
+    } catch (error) {
+      return Promise.resolve([null, error as Error]);
+    }
   }
   
 
@@ -84,8 +92,12 @@ configAIProxy(
     serviceConfig?: AIProxyConfig,
     vaccount?: string
   ): Promise<[boolean | null, Error | null]> {
-    this.assertInitialized();
-    return this.aiProxyManager.configAIProxy(appId, configAuthor, configTheme, serviceName, serviceConfig, vaccount);
+    try {
+      this.assertInitialized();
+      return this.aiProxyManager.configAIProxy(appId, configAuthor, configTheme, serviceName, serviceConfig, vaccount);
+    } catch (error) {
+      return Promise.resolve([null, error as Error]);
+    }
 }
   
 
@@ -99,8 +111,13 @@ permission: AIProxyUserPermission,
 authConfig: ProxyCallConfig,
 vaccount?: string
 ): Promise<[number | null, Error | null]> {
-    this.assertInitialized();
-    return this.aiProxyManager.configAuth(appId, configAuthor, configTheme, authPubkey, permission, authConfig, vaccount);
+    try {
+      this.assertInitialized();
+      return this.aiProxyManager.configAuth(appId, configAuthor, configTheme, authPubkey, permission, authConfig, vaccount);
+
+    } catch (error) {
+      return Promise.resolve([null, error as Error]);
+    }
 }
 
 
@@ -111,8 +128,12 @@ vaccount?: string
     configTheme: string,
     vaccount?: string
   ): Promise<[UserProxyCallConfig[] | null,AIProxyConfig[] | null, Error | null]> {
-    this.assertInitialized();
-    return this.aiProxyManager.GetAIProxyConfig(appId, themeAuthor, configTheme, vaccount);
+    try {
+      this.assertInitialized();
+      return this.aiProxyManager.GetAIProxyConfig(appId, themeAuthor, configTheme, vaccount);
+    } catch (error) {
+      return Promise.resolve([null, null, error as Error]);
+    }
   }
 
 
@@ -121,8 +142,12 @@ async GetUserOwnAIProxyAuth(
     themeAuthor: string,
     configTheme: string,
     ): Promise<[authConfig: ProxyCallConfig | null, error: Error | null]> {
-    this.assertInitialized();
-    return this.aiProxyManager.GetUserOwnAIProxyAuth(appId, themeAuthor, configTheme);
+    try {
+      this.assertInitialized();
+      return this.aiProxyManager.GetUserOwnAIProxyAuth(appId, themeAuthor, configTheme);
+    } catch (error) {
+      return Promise.resolve([null, error as Error]);
+    }
 }
 
 
@@ -202,8 +227,8 @@ async GetUserOwnAIProxyAuth(
   ): Promise<Error | null> {
     try{
       this.assertInitialized();
-    this.aiCallConfig = callConfig
-    return null
+      this.aiCallConfig = callConfig
+      return null
     } catch (error) {
       logger.error("设置AI调用配置失败:", error);
       return error as Error;

package/lib/modules/auth-module.ts

@@ -75,13 +75,13 @@ export class AuthModule implements DCModule, IAuthOperations {
    * @returns 是否登录成功
    */
   async accountLoginWithWalletCall(): Promise<Account | null> {
-    this.assertInitialized();
-
-    if (!this.context.connectedDc?.client) {
-      throw new Error("dcClient is null");
-    }
 
     try {
+      this.assertInitialized();
+
+      if (!this.context.connectedDc?.client) {
+        throw new Error("dcClient is null");
+      }
       const data = await this.walletManager.openConnect();
       const publicKey = new Ed25519PubKey(data.appAccount);
       this.context.publicKey = publicKey;
@@ -471,9 +471,9 @@ export class AuthModule implements DCModule, IAuthOperations {
    * @param connectInfo 连接信息
    */
   private async getTokenWithDCConnectInfo(connectInfo: any): Promise<void> {
-    this.assertInitialized();
 
     try {
+      this.assertInitialized();
       // 判断 client 是否为空
       if (!connectInfo.client) {
         return;

package/lib/modules/database-module.ts

@@ -148,6 +148,54 @@ export class DatabaseModule implements DCModule, IDatabaseOperations {
       return [null, error instanceof Error ? error : new Error(String(error))];
     }
   }
+
+  async loadVerno(threadId : string): Promise<number> {
+    try {
+       this.assertInitialized();
+    await this.initDBManager();
+    
+    if (!this.context.dbManager) {
+      throw new Error("数据库管理器未初始化");
+    }
+     const tID = ThreadID.fromString(threadId);
+    const db = await this.context.dbManager.getDB(tID);
+    
+    if (!db) {
+      logger.error(`数据库信息为空`);
+      return 0; // 返回默认版本号
+    }
+    const verno = await db.loadVerno();
+    return verno;
+    } catch (error) {
+      logger.error(`加载数据库版本号失败:`, error);
+      return 0;
+    }
+  }
+
+    async saveVerno(threadId: string, verno: number): Promise<number> {
+      try {
+         this.assertInitialized();
+         await this.initDBManager();
+      
+      if (!this.context.dbManager) {
+        throw new Error("数据库管理器未初始化");
+      }
+      const tID = ThreadID.fromString(threadId);
+      const db = await this.context.dbManager.getDB(tID);
+      
+      if (!db) {
+        logger.error(`数据库信息为空`);
+        return -1; // 
+      }
+      await db.saveVerno(verno);
+        return 0;
+      } catch (error) {
+        logger.error(`加载数据库版本号失败:`, error);
+        return -1;
+      }
+    }
+
+
   
   /**
    * 从DC同步数据库
@@ -204,9 +252,9 @@ export class DatabaseModule implements DCModule, IDatabaseOperations {
    * @param threadid 数据库ID
    * @returns 错误信息或null
    */
-  async refreshDBFromDC(threadid: string,  ): Promise<Error | null> {  
-      
-    try {  
+  async refreshDBFromDC(threadid: string, verno?: number): Promise<Error | null> {
+
+    try {
       this.assertInitialized();
     await this.initDBManager();
     

package/lib/modules/file-module.ts

@@ -85,9 +85,9 @@ export class FileModule implements DCModule, IFileOperations {
    * 获取可寻址文件流
    */
   async getSeekableFileStream(ipfsPath: string, decryptKey: string): Promise<SeekableFileStream> {
-    this.assertInitialized();
     
     try {
+      this.assertInitialized();
       // 先查看缓存
       const cachedStream = this.fileCacheManager.getCachedFileStream(ipfsPath, decryptKey);
       if (cachedStream) {
@@ -114,8 +114,8 @@ export class FileModule implements DCModule, IFileOperations {
    * 清理文件缓存
    */
   clearFileCache(pathname?: string): void {
-    this.assertInitialized();
     try {
+      this.assertInitialized();
       this.fileCacheManager.clearFileCache(pathname);
     } catch (error) {
       logger.error(`清理文件缓存失败`, error);
@@ -125,17 +125,22 @@ export class FileModule implements DCModule, IFileOperations {
   /**
    * 获取缓存统计信息
    */
-  getCacheStats(): { total: number, keys: string[] } {
-    this.assertInitialized();
-    return this.fileCacheManager.getCacheStats();
+  getCacheStats(): [{ total: number, keys: string[] } | null, Error | null] {
+    try {
+      this.assertInitialized();
+      const stats = this.fileCacheManager.getCacheStats();
+      return [stats, null];
+    } catch (error) {
+      return [null, error as Error];
+    }
   }
   
   /**
    * 获取文件内容
    */
   async getFile(cid: string, decryptKey: string): Promise<[Uint8Array | null, Error | null]> {
-    this.assertInitialized();
     try {
+      this.assertInitialized();
       const fileContent = await this.fileManager.getFileFromDc(cid, decryptKey);
       return [fileContent, null];
     } catch (error) {
@@ -151,8 +156,8 @@ export class FileModule implements DCModule, IFileOperations {
     cid: string,
     decryptKey: string
   ): Promise<ReadableStream<Uint8Array> | null> {
-    this.assertInitialized();
     try {
+      this.assertInitialized();
       const fileStream = await this.fileManager.createSeekableFileStream(
         cid,
         decryptKey

package/package.json

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