@lobehub/lobehub 2.0.0-next.127 → 2.0.0-next.129

package/packages/database/migrations/meta/_journal.json

@@ -350,6 +350,13 @@
       "when": 1764229953081,
       "tag": "0049_better_auth",
       "breakpoints": true
+    },
+    {
+      "idx": 50,
+      "version": "7",
+      "when": 1764303057060,
+      "tag": "0050_thread_and_user_id",
+      "breakpoints": true
     }
   ],
   "version": "6"

package/packages/database/src/client/db.ts

@@ -207,7 +207,7 @@ export class DatabaseManager {
     return this.db;
   }
 
-  // 初始化数据库
+  // Initialize database
   async initialize(callbacks?: DatabaseLoadingCallbacks): Promise<DrizzleInstance> {
     if (this.initPromise) return this.initPromise;
 
@@ -218,13 +218,13 @@ export class DatabaseManager {
         if (this.dbInstance) return this.dbInstance;
 
         const time = Date.now();
-        // 初始化数据库
+        // Initialize database
         this.callbacks?.onStateChange?.(DatabaseLoadingState.Initializing);
 
-        // 加载依赖
+        // Load dependencies
         const { fsBundle, PGlite, MemoryFS, IdbFs, vector } = await this.loadDependencies();
 
-        // 加载并编译 WASM 模块
+        // Load and compile WASM module
         const wasmModule = await this.loadWasmModule();
 
         const { initPgliteWorker } = await import('./pglite');
@@ -267,10 +267,10 @@ export class DatabaseManager {
         this.callbacks?.onStateChange?.(DatabaseLoadingState.Error);
         const error = e as Error;
 
-        // 查询迁移表数据
+        // Query migration table data
         let migrationsTableData: MigrationTableItem[] = [];
         try {
-          // 尝试查询迁移表
+          // Attempt to query migration table
           const drizzleMigration = new DrizzleMigrationModel(this.db as any);
           migrationsTableData = await drizzleMigration.getMigrationList();
         } catch (queryError) {
@@ -295,7 +295,7 @@ export class DatabaseManager {
     return this.initPromise;
   }
 
-  // 获取数据库实例
+  // Get database instance
   get db(): DrizzleInstance {
     if (!this.dbInstance) {
       throw new Error('Database not initialized. Please call initialize() first.');
@@ -303,7 +303,7 @@ export class DatabaseManager {
     return this.dbInstance;
   }
 
-  // 创建代理对象
+  // Create proxy object
   createProxy(): DrizzleInstance {
     return new Proxy({} as DrizzleInstance, {
       get: (target, prop) => {
@@ -313,7 +313,7 @@ export class DatabaseManager {
   }
 
   async resetDatabase(): Promise<void> {
-    // 1. 关闭现有的 PGlite 连接（如果存在）
+    // 1. Close existing PGlite connection (if exists)
     if (this.dbInstance) {
       try {
         // @ts-ignore
@@ -321,31 +321,31 @@ export class DatabaseManager {
         console.log('PGlite instance closed successfully.');
       } catch (e) {
         console.error('Error closing PGlite instance:', e);
-        // 即使关闭失败，也尝试继续删除，IndexedDB 的 onblocked 或 onerror 会处理后续问题
+        // Even if closing fails, continue with deletion attempt; IndexedDB onblocked or onerror will handle subsequent issues
       }
     }
 
-    // 2. 重置数据库实例和初始化状态
+    // 2. Reset database instance and initialization state
     this.dbInstance = null;
     this.initPromise = null;
-    this.isLocalDBSchemaSynced = false; // 重置同步状态
+    this.isLocalDBSchemaSynced = false; // Reset sync state
 
-    // 3. 删除 IndexedDB 数据库
+    // 3. Delete IndexedDB database
     return new Promise<void>((resolve, reject) => {
-      // 检查 IndexedDB 是否可用
+      // Check if IndexedDB is available
       if (typeof indexedDB === 'undefined') {
         console.warn('IndexedDB is not available, cannot delete database');
-        resolve(); // 在此环境下无法删除，直接解决
+        resolve(); // Cannot delete in this environment, resolve directly
         return;
       }
 
-      const dbName = `/pglite/${DB_NAME}`; // PGlite IdbFs 使用的路径
+      const dbName = `/pglite/${DB_NAME}`; // Path used by PGlite IdbFs
       const request = indexedDB.deleteDatabase(dbName);
 
       request.onsuccess = () => {
         console.log(`✅ Database '${dbName}' reset successfully`);
 
-        // 清除本地存储的模式哈希
+        // Clear locally stored schema hash
         if (typeof localStorage !== 'undefined') {
           localStorage.removeItem(pgliteSchemaHashCache);
         }
@@ -365,7 +365,7 @@ export class DatabaseManager {
       };
 
       request.onblocked = (event) => {
-        // 当其他打开的连接阻止数据库删除时，会触发此事件
+        // This event is triggered when other open connections block database deletion
         console.warn(
           `Deletion of database '${dbName}' is blocked. This usually means other connections (e.g., in other tabs) are still open. Event:`,
           event,
@@ -380,13 +380,13 @@ export class DatabaseManager {
   }
 }
 
-// 导出单例
+// Export singleton
 const dbManager = DatabaseManager.getInstance();
 
-// 保持原有的 clientDB 导出不变
+// Keep original clientDB export unchanged
 export const clientDB = dbManager.createProxy();
 
-// 导出初始化方法，供应用启动时使用
+// Export initialization method for application startup
 export const initializeDB = (callbacks?: DatabaseLoadingCallbacks) =>
   dbManager.initialize(callbacks);
 

package/packages/database/src/core/migrations.json

@@ -223,7 +223,10 @@
     "hash": "9646161fa041354714f823d726af27247bcd6e60fa3be5698c0d69f337a5700b"
   },
   {
-    "sql": ["DROP TABLE \"user_budgets\";", "\nDROP TABLE \"user_subscriptions\";"],
+    "sql": [
+      "DROP TABLE \"user_budgets\";",
+      "\nDROP TABLE \"user_subscriptions\";"
+    ],
     "bps": true,
     "folderMillis": 1729699958471,
     "hash": "7dad43a2a25d1aec82124a4e53f8d82f8505c3073f23606c1dc5d2a4598eacf9"
@@ -295,7 +298,9 @@
     "hash": "845a692ceabbfc3caf252a97d3e19a213bc0c433df2689900135f9cfded2cf49"
   },
   {
-    "sql": ["ALTER TABLE \"messages\" ADD COLUMN \"reasoning\" jsonb;"],
+    "sql": [
+      "ALTER TABLE \"messages\" ADD COLUMN \"reasoning\" jsonb;"
+    ],
     "bps": true,
     "folderMillis": 1737609172353,
     "hash": "2cb36ae4fcdd7b7064767e04bfbb36ae34518ff4bb1b39006f2dd394d1893868"
@@ -510,7 +515,9 @@
     "hash": "a7ccf007fd185ff922823148d1eae6fafe652fc98d2fd2793f84a84f29e93cd1"
   },
   {
-    "sql": ["ALTER TABLE \"ai_providers\" ADD COLUMN \"config\" jsonb;"],
+    "sql": [
+      "ALTER TABLE \"ai_providers\" ADD COLUMN \"config\" jsonb;"
+    ],
     "bps": true,
     "folderMillis": 1749309388370,
     "hash": "39cea379f08ee4cb944875c0b67f7791387b508c2d47958bb4cd501ed1ef33eb"
@@ -628,7 +635,9 @@
     "hash": "1ba9b1f74ea13348da98d6fcdad7867ab4316ed565bf75d84d160c526cdac14b"
   },
   {
-    "sql": ["ALTER TABLE \"agents\" ADD COLUMN IF NOT EXISTS \"virtual\" boolean DEFAULT false;"],
+    "sql": [
+      "ALTER TABLE \"agents\" ADD COLUMN IF NOT EXISTS \"virtual\" boolean DEFAULT false;"
+    ],
     "bps": true,
     "folderMillis": 1759116400580,
     "hash": "433ddae88e785f2db734e49a4c115eee93e60afe389f7919d66e5ba9aa159a37"
@@ -678,13 +687,17 @@
     "hash": "4bdc6505797d7a33b622498c138cfd47f637239f6905e1c484cd01d9d5f21d6b"
   },
   {
-    "sql": ["ALTER TABLE \"user_settings\" ADD COLUMN IF NOT EXISTS \"image\" jsonb;"],
+    "sql": [
+      "ALTER TABLE \"user_settings\" ADD COLUMN IF NOT EXISTS \"image\" jsonb;"
+    ],
     "bps": true,
     "folderMillis": 1760108430562,
     "hash": "ce09b301abb80f6563abc2f526bdd20b4f69bae430f09ba2179b9e3bfec43067"
   },
   {
-    "sql": ["ALTER TABLE \"documents\" ADD COLUMN IF NOT EXISTS \"editor_data\" jsonb;"],
+    "sql": [
+      "ALTER TABLE \"documents\" ADD COLUMN IF NOT EXISTS \"editor_data\" jsonb;"
+    ],
     "bps": true,
     "folderMillis": 1761554153406,
     "hash": "bf2f21293e90e11cf60a784cf3ec219eafa95f7545d7d2f9d1449c0b0949599a"
@@ -764,13 +777,17 @@
     "hash": "923ccbdf46c32be9a981dabd348e6923b4a365444241e9b8cc174bf5b914cbc5"
   },
   {
-    "sql": ["ALTER TABLE \"agents\" ADD COLUMN IF NOT EXISTS \"market_identifier\" text;\n"],
+    "sql": [
+      "ALTER TABLE \"agents\" ADD COLUMN IF NOT EXISTS \"market_identifier\" text;\n"
+    ],
     "bps": true,
     "folderMillis": 1762870034882,
     "hash": "4178aacb4b8892b7fd15d29209bbf9b1d1f9d7c406ba796f27542c0bcd919680"
   },
   {
-    "sql": ["ALTER TABLE \"message_plugins\" ADD COLUMN IF NOT EXISTS \"intervention\" jsonb;\n"],
+    "sql": [
+      "ALTER TABLE \"message_plugins\" ADD COLUMN IF NOT EXISTS \"intervention\" jsonb;\n"
+    ],
     "bps": true,
     "folderMillis": 1762911968658,
     "hash": "552a032cc0e595277232e70b5f9338658585bafe9481ae8346a5f322b673a68b"
@@ -799,7 +816,9 @@
     "hash": "f823b521f4d25e5dc5ab238b372727d2d2d7f0aed27b5eabc8a9608ce4e50568"
   },
   {
-    "sql": ["ALTER TABLE \"agents\" ADD COLUMN IF NOT EXISTS \"editor_data\" jsonb;"],
+    "sql": [
+      "ALTER TABLE \"agents\" ADD COLUMN IF NOT EXISTS \"editor_data\" jsonb;"
+    ],
     "bps": true,
     "folderMillis": 1764215503726,
     "hash": "4188893a9083b3c7baebdbad0dd3f9d9400ede7584ca2394f5c64305dc9ec7b0"
@@ -816,5 +835,27 @@
     "bps": true,
     "folderMillis": 1764229953081,
     "hash": "1532ebceae7b70550bc9c230fb0a65090aaa773bc7b873eefbc2ce2a815997e2"
+  },
+  {
+    "sql": [
+      "ALTER TABLE \"nextauth_accounts\" RENAME COLUMN \"userId\" TO \"user_id\";",
+      "\nALTER TABLE \"nextauth_authenticators\" RENAME COLUMN \"userId\" TO \"user_id\";",
+      "\nALTER TABLE \"nextauth_sessions\" RENAME COLUMN \"userId\" TO \"user_id\";",
+      "\nALTER TABLE \"nextauth_accounts\" DROP CONSTRAINT \"nextauth_accounts_userId_users_id_fk\";\n",
+      "\nALTER TABLE \"nextauth_authenticators\" DROP CONSTRAINT \"nextauth_authenticators_userId_users_id_fk\";\n",
+      "\nALTER TABLE \"nextauth_sessions\" DROP CONSTRAINT \"nextauth_sessions_userId_users_id_fk\";\n",
+      "\nALTER TABLE \"nextauth_authenticators\" DROP CONSTRAINT \"nextauth_authenticators_userId_credentialID_pk\";",
+      "\nALTER TABLE \"threads\" ALTER COLUMN \"status\" DROP DEFAULT;",
+      "\nALTER TABLE \"threads\" ALTER COLUMN \"source_message_id\" DROP NOT NULL;",
+      "\nALTER TABLE \"nextauth_authenticators\" ADD CONSTRAINT \"nextauth_authenticators_user_id_credentialID_pk\" PRIMARY KEY(\"user_id\",\"credentialID\");",
+      "\nALTER TABLE \"threads\" ADD COLUMN \"content\" text;",
+      "\nALTER TABLE \"threads\" ADD COLUMN \"editor_data\" jsonb;",
+      "\nALTER TABLE \"nextauth_accounts\" ADD CONSTRAINT \"nextauth_accounts_user_id_users_id_fk\" FOREIGN KEY (\"user_id\") REFERENCES \"public\".\"users\"(\"id\") ON DELETE cascade ON UPDATE no action;",
+      "\nALTER TABLE \"nextauth_authenticators\" ADD CONSTRAINT \"nextauth_authenticators_user_id_users_id_fk\" FOREIGN KEY (\"user_id\") REFERENCES \"public\".\"users\"(\"id\") ON DELETE cascade ON UPDATE no action;",
+      "\nALTER TABLE \"nextauth_sessions\" ADD CONSTRAINT \"nextauth_sessions_user_id_users_id_fk\" FOREIGN KEY (\"user_id\") REFERENCES \"public\".\"users\"(\"id\") ON DELETE cascade ON UPDATE no action;"
+    ],
+    "bps": true,
+    "folderMillis": 1764303057060,
+    "hash": "edcebee8f59971210c1f8b567d3bd0ffa37da286afeead5bdaaa19eeaa4b89cb"
   }
-]
+]

package/packages/database/src/repositories/dataImporter/deprecated/index.ts

@@ -127,7 +127,7 @@ export class DeprecatedDataImporterRepos {
           // filter out existing session, only insert new ones
           .filter((s) => query.every((q) => q.clientId !== s.id));
 
-        // 只有当需要有新的 session 时，才会插入 agent
+        // Only insert agent when new sessions are needed
         if (shouldInsertSessionAgents.length > 0) {
           const agentMapArray = await trx
             .insert(agents)
@@ -221,14 +221,14 @@ export class DeprecatedDataImporterRepos {
               parentId: null,
               provider: extra?.fromProvider,
               sessionId: sessionId ? sessionIdMap[sessionId] : null,
-              topicId: topicId ? topicIdMap[topicId] : null, // 暂时设为 NULL
+              topicId: topicId ? topicIdMap[topicId] : null, // Temporarily set to NULL
               updatedAt: new Date(updatedAt),
               userId: this.userId,
             }),
           );
 
           console.time('insert messages');
-          const BATCH_SIZE = 100; // 每批次插入的记录数
+          const BATCH_SIZE = 100; // Number of records to insert per batch
 
           for (let i = 0; i < inertValues.length; i += BATCH_SIZE) {
             const batch = inertValues.slice(i, i + BATCH_SIZE);
@@ -257,7 +257,7 @@ export class DeprecatedDataImporterRepos {
           // 3. update parentId for messages
           console.time('execute updates parentId');
           const parentIdUpdates = shouldInsertMessages
-            .filter((msg) => msg.parentId) // 只处理有 parentId 的消息
+            .filter((msg) => msg.parentId) // Only process messages with parentId
             .map((msg) => {
               if (messageIdMap[msg.parentId as string])
                 return sql`WHEN ${messages.clientId} = ${msg.id} THEN ${messageIdMap[msg.parentId as string]} `;
@@ -315,7 +315,7 @@ export class DeprecatedDataImporterRepos {
             );
           }
 
-          // TODO: 未来需要处理 TTS 和图片的插入 （目前存在 file 的部分，不方便处理）
+          // TODO: Need to handle TTS and image insertion in the future (currently difficult to handle due to file-related parts)
         }
 
         messageResult.added = shouldInsertMessages.length;