@lobehub/chat 1.36.7 → 1.36.9

package/locales/zh-TW/models.json

@@ -55,6 +55,24 @@
   "Baichuan4-Turbo": {
     "description": "模型能力國內第一，在知識百科、長文本、生成創作等中文任務上超越國外主流模型。還具備行業領先的多模態能力，多項權威評測基準表現優異。"
   },
+  "Doubao-lite-128k": {
+    "description": "Doubao-lite 擁有極致的回應速度，更好的性價比，為客戶不同場景提供更靈活的選擇。支持 128k 上下文窗口的推理和精調。"
+  },
+  "Doubao-lite-32k": {
+    "description": "Doubao-lite 擁有極致的回應速度，更好的性價比，為客戶不同場景提供更靈活的選擇。支持 32k 上下文窗口的推理和精調。"
+  },
+  "Doubao-lite-4k": {
+    "description": "Doubao-lite 擁有極致的回應速度，更好的性價比，為客戶不同場景提供更靈活的選擇。支持 4k 上下文窗口的推理和精調。"
+  },
+  "Doubao-pro-128k": {
+    "description": "效果最好的主力模型，適合處理複雜任務，在參考問答、總結摘要、創作、文本分類、角色扮演等場景都有很好的效果。支持 128k 上下文窗口的推理和精調。"
+  },
+  "Doubao-pro-32k": {
+    "description": "效果最好的主力模型，適合處理複雜任務，在參考問答、總結摘要、創作、文本分類、角色扮演等場景都有很好的效果。支持 32k 上下文窗口的推理和精調。"
+  },
+  "Doubao-pro-4k": {
+    "description": "效果最好的主力模型，適合處理複雜任務，在參考問答、總結摘要、創作、文本分類、角色扮演等場景都有很好的效果。支持 4k 上下文窗口的推理和精調。"
+  },
   "ERNIE-3.5-128K": {
     "description": "百度自研的旗艦級大規模語言模型，覆蓋海量中英文語料，具有強大的通用能力，可滿足絕大部分對話問答、創作生成、插件應用場景要求；支持自動對接百度搜索插件，保障問答信息時效。"
   },
@@ -242,6 +260,21 @@
   "SenseChat-Turbo": {
     "description": "適用於快速問答、模型微調場景"
   },
+  "Skylark2-lite-8k": {
+    "description": "雲雀（Skylark）第二代模型，Skylark2-lite 模型有較高的回應速度，適用於實時性要求高、成本敏感、對模型精度要求不高的場景，上下文窗口長度為 8k。"
+  },
+  "Skylark2-pro-32k": {
+    "description": "雲雀（Skylark）第二代模型，Skylark2-pro 版本有較高的模型精度，適用於較為複雜的文本生成場景，如專業領域文案生成、小說創作、高品質翻譯等，上下文窗口長度為 32k。"
+  },
+  "Skylark2-pro-4k": {
+    "description": "雲雀（Skylark）第二代模型，Skylark2-pro 模型有較高的模型精度，適用於較為複雜的文本生成場景，如專業領域文案生成、小說創作、高品質翻譯等，上下文窗口長度為 4k。"
+  },
+  "Skylark2-pro-character-4k": {
+    "description": "雲雀（Skylark）第二代模型，Skylark2-pro-character 模型具有優秀的角色扮演和聊天能力，擅長根據用戶 prompt 要求扮演不同角色與用戶展開聊天，角色風格突出，對話內容自然流暢，適用於構建聊天機器人、虛擬助手和在線客服等場景，有較高的回應速度。"
+  },
+  "Skylark2-pro-turbo-8k": {
+    "description": "雲雀（Skylark）第二代模型，Skylark2-pro-turbo-8k 推理更快，成本更低，上下文窗口長度為 8k。"
+  },
   "THUDM/chatglm3-6b": {
     "description": "ChatGLM3-6B 是 ChatGLM 系列的開源模型，由智譜 AI 開發。該模型保留了前代模型的優秀特性，如對話流暢和部署門檻低，同時引入了新的特性。它採用了更多樣的訓練數據、更充分的訓練步數和更合理的訓練策略，在 10B 以下的預訓練模型中表現出色。ChatGLM3-6B 支持多輪對話、工具調用、代碼執行和 Agent 任務等複雜場景。除對話模型外，還開源了基礎模型 ChatGLM-6B-Base 和長文本對話模型 ChatGLM3-6B-32K。該模型對學術研究完全開放，在登記後也允許免費商業使用"
   },
@@ -476,6 +509,9 @@
   "cohere-command-r-plus": {
     "description": "Command R+是一個最先進的RAG優化模型，旨在應對企業級工作負載。"
   },
+  "command-light": {
+    "description": ""
+  },
   "command-r": {
     "description": "Command R 是優化用於對話和長上下文任務的 LLM，特別適合動態交互與知識管理。"
   },
@@ -539,6 +575,9 @@
   "gemini-1.5-flash-8b-exp-0924": {
     "description": "Gemini 1.5 Flash 8B 0924 是最新的實驗性模型，在文本和多模態用例中都有顯著的性能提升。"
   },
+  "gemini-1.5-flash-exp-0827": {
+    "description": "Gemini 1.5 Flash 0827 提供了優化後的多模態處理能力，適用多種複雜任務場景。"
+  },
   "gemini-1.5-flash-latest": {
     "description": "Gemini 1.5 Flash 是 Google 最新的多模態 AI 模型，具備快速處理能力，支持文本、圖像和視頻輸入，適用於多種任務的高效擴展。"
   },
@@ -548,6 +587,12 @@
   "gemini-1.5-pro-002": {
     "description": "Gemini 1.5 Pro 002 是最新的生產就緒模型，提供更高品質的輸出，特別在數學、長上下文和視覺任務方面有顯著提升。"
   },
+  "gemini-1.5-pro-exp-0801": {
+    "description": "Gemini 1.5 Pro 0801 提供出色的多模態處理能力，為應用開發帶來更大靈活性。"
+  },
+  "gemini-1.5-pro-exp-0827": {
+    "description": "Gemini 1.5 Pro 0827 結合最新優化技術，帶來更高效的多模態數據處理能力。"
+  },
   "gemini-1.5-pro-latest": {
     "description": "Gemini 1.5 Pro 支持高達 200 萬個 tokens，是中型多模態模型的理想選擇，適用於複雜任務的多方面支持。"
   },
@@ -557,6 +602,9 @@
   "gemini-exp-1121": {
     "description": "Gemini Exp 1121 是 Google 最新的實驗性多模態 AI 模型，具備快速處理能力，支持文本、圖像和視頻輸入，適用於多種任務的高效擴展。"
   },
+  "gemini-exp-1206": {
+    "description": "Gemini Exp 1206 是 Google 最新的實驗性多模態 AI 模型，與歷史版本相比有一定的質量提升。"
+  },
   "gemma-7b-it": {
     "description": "Gemma 7B 適合中小規模任務處理，兼具成本效益。"
   },
@@ -647,6 +695,12 @@
   "gpt-3.5-turbo-instruct": {
     "description": "GPT 3.5 Turbo，適用於各種文本生成和理解任務，Currently points to gpt-3.5-turbo-0125"
   },
+  "gpt-35-turbo": {
+    "description": "GPT 3.5 Turbo，OpenAI 提供的高效模型，適用於聊天和文本生成任務，支持並行函數調用。"
+  },
+  "gpt-35-turbo-16k": {
+    "description": "GPT 3.5 Turbo 16k，高容量文本生成模型，適合複雜任務。"
+  },
   "gpt-4": {
     "description": "GPT-4提供了一個更大的上下文窗口，能夠處理更長的文本輸入，適用於需要廣泛信息整合和數據分析的場景。"
   },
@@ -689,6 +743,9 @@
   "gpt-4o-2024-08-06": {
     "description": "ChatGPT-4o是一款動態模型，實時更新以保持當前最新版本。它結合了強大的語言理解與生成能力，適合於大規模應用場景，包括客戶服務、教育和技術支持。"
   },
+  "gpt-4o-2024-11-20": {
+    "description": "ChatGPT-4o 是一款動態模型，實時更新以保持當前最新版本。它結合了強大的語言理解與生成能力，適合於大規模應用場景，包括客戶服務、教育和技術支持。"
+  },
   "gpt-4o-mini": {
     "description": "GPT-4o mini是OpenAI在GPT-4 Omni之後推出的最新模型，支持圖文輸入並輸出文本。作為他們最先進的小型模型，它比其他近期的前沿模型便宜很多，並且比GPT-3.5 Turbo便宜超過60%。它保持了最先進的智能，同時具有顯著的性價比。GPT-4o mini在MMLU測試中獲得了82%的得分，目前在聊天偏好上排名高於GPT-4。"
   },
@@ -707,6 +764,9 @@
   "hunyuan-functioncall": {
     "description": "混元最新 MOE 架構 FunctionCall 模型，經過高質量的 FunctionCall 數據訓練，上下文窗口達 32K，在多個維度的評測指標上處於領先。"
   },
+  "hunyuan-large": {
+    "description": ""
+  },
   "hunyuan-lite": {
     "description": "升級為 MOE 結構，上下文窗口為 256k，在 NLP、代碼、數學、行業等多項評測集上領先眾多開源模型。"
   },
@@ -787,6 +847,9 @@
   "llama-3.2-90b-vision-preview": {
     "description": "Llama 3.2 旨在處理結合視覺和文本數據的任務。它在圖像描述和視覺問答等任務中表現出色，跨越了語言生成和視覺推理之間的鴻溝。"
   },
+  "llama-3.3-70b-versatile": {
+    "description": "Meta Llama 3.3 多語言大語言模型 (LLM) 是 70B（文本輸入/文本輸出）中的預訓練和指令調整生成模型。Llama 3.3 指令調整的純文本模型針對多語言對話用例進行了優化，並且在常見行業基準上優於許多可用的開源和封閉式聊天模型。"
+  },
   "llama3-70b-8192": {
     "description": "Meta Llama 3 70B 提供無與倫比的複雜性處理能力，為高要求項目量身定制。"
   },
@@ -1094,12 +1157,21 @@
   "qwen-math-turbo-latest": {
     "description": "通義千問數學模型是專門用於數學解題的語言模型。"
   },
+  "qwen-max": {
+    "description": "通義千問千億級別超大規模語言模型，支持中文、英文等不同語言輸入，當前通義千問 2.5 產品版本背後的 API 模型。"
+  },
   "qwen-max-latest": {
     "description": "通義千問千億級別超大規模語言模型，支持中文、英文等不同語言輸入，當前通義千問2.5產品版本背後的API模型。"
   },
+  "qwen-plus": {
+    "description": "通義千問超大規模語言模型增強版，支持中文、英文等不同語言輸入。"
+  },
   "qwen-plus-latest": {
     "description": "通義千問超大規模語言模型增強版，支持中文、英文等不同語言輸入。"
   },
+  "qwen-turbo": {
+    "description": "通義千問超大規模語言模型，支持中文、英文等不同語言輸入。"
+  },
   "qwen-turbo-latest": {
     "description": "通義千問超大規模語言模型，支持中文、英文等不同語言輸入。"
   },
@@ -1136,12 +1208,18 @@
   "qwen2.5-7b-instruct": {
     "description": "通義千問2.5對外開源的7B規模的模型。"
   },
+  "qwen2.5-coder-1.5b-instruct": {
+    "description": "通義千問代碼模型開源版。"
+  },
   "qwen2.5-coder-32b-instruct": {
     "description": "通義千問代碼模型開源版。"
   },
   "qwen2.5-coder-7b-instruct": {
     "description": "通義千問代碼模型開源版。"
   },
+  "qwen2.5-math-1.5b-instruct": {
+    "description": "Qwen-Math 模型具有強大的數學解題能力。"
+  },
   "qwen2.5-math-72b-instruct": {
     "description": "Qwen-Math模型具有強大的數學解題能力。"
   },

package/locales/zh-TW/providers.json

@@ -34,6 +34,9 @@
   "groq": {
     "description": "Groq 的 LPU 推理引擎在最新的獨立大語言模型（LLM）基準測試中表現卓越，以其驚人的速度和效率重新定義了 AI 解決方案的標準。Groq 是一種即時推理速度的代表，在基於雲的部署中展現了良好的性能。"
   },
+  "higress": {
+    "description": ""
+  },
   "huggingface": {
     "description": "HuggingFace Inference API 提供了一種快速且免費的方式，讓您可以探索成千上萬種模型，適用於各種任務。無論您是在為新應用程式進行原型設計，還是在嘗試機器學習的功能，這個 API 都能讓您即時訪問多個領域的高性能模型。"
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.36.7",
+  "version": "1.36.9",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/src/app/(backend)/api/webhooks/clerk/route.ts

@@ -29,13 +29,28 @@ export const POST = async (req: Request): Promise<NextResponse> => {
   switch (type) {
     case 'user.created': {
       pino.info('creating user due to clerk webhook');
-      return userService.createUser(data.id, data);
+      const result = await userService.createUser(data.id, data);
+
+      return NextResponse.json(result, { status: 200 });
     }
+
     case 'user.deleted': {
-      return userService.deleteUser(data.id);
+      if (!data.id) {
+        pino.warn('clerk sent a delete user request, but no user ID was included in the payload');
+        return NextResponse.json({ message: 'ok' }, { status: 200 });
+      }
+
+      pino.info('delete user due to clerk webhook');
+
+      await userService.deleteUser(data.id);
+
+      return NextResponse.json({ message: 'user deleted' }, { status: 200 });
     }
+
     case 'user.updated': {
-      return userService.updateUser(data.id, data);
+      const result = await userService.updateUser(data.id, data);
+
+      return NextResponse.json(result, { status: 200 });
     }
 
     default: {

package/src/config/modelProviders/zhipu.ts

@@ -120,6 +120,20 @@ const ZhiPu: ModelProviderCard = {
       },
       tokens: 128_000,
     },
+    {
+      description: 'GLM-4V-Flash 专注于高效的单一图像理解，适用于快速图像解析的场景，例如实时图像分析或批量图像处理。',
+      displayName: 'GLM-4V-Flash',
+      enabled: true,
+      id: 'glm-4v-flash',
+      pricing: {
+        currency: 'CNY',
+        input: 0,
+        output: 0,
+      },
+      releasedAt: '2024-12-09',
+      tokens: 8192,
+      vision: true,
+    },
     {
       description: 'GLM-4V-Plus 具备对视频内容及多图片的理解能力，适合多模态任务。',
       displayName: 'GLM-4V-Plus',

package/src/database/server/models/__tests__/nextauth.test.ts

@@ -146,6 +146,39 @@ describe('LobeNextAuthDbAdapter', () => {
           await serverDB.query.users.findMany({ where: eq(users.id, anotherUserId) }),
         ).toHaveLength(1);
       });
+
+      it('should create a user if id not exist even email is invalid type', async () => {
+        // In previous version, it will link the account to the existing user if the email is null
+        // issue: https://github.com/lobehub/lobe-chat/issues/4918
+        expect(nextAuthAdapter).toBeDefined();
+        expect(nextAuthAdapter.createUser).toBeDefined();
+
+        const existUserId = 'user-db-1';
+        const existUserName = 'John Doe 1';
+        // @ts-expect-error: createUser is defined
+        await nextAuthAdapter.createUser({
+          ...user,
+          id: existUserId,
+          name: existUserName,
+          email: Object({}), // assign a non-string value
+        });
+
+        const anotherUserId = 'user-db-2';
+        const anotherUserName = 'John Doe 2';
+        // @ts-expect-error: createUser is defined
+        await nextAuthAdapter.createUser({
+          ...user,
+          id: anotherUserId,
+          name: anotherUserName,
+          // @ts-expect-error: try to assign undefined value
+          email: undefined,
+        });
+
+        // Should create a new user if id not exists and email is null
+        expect(
+          await serverDB.query.users.findMany({ where: eq(users.id, anotherUserId) }),
+        ).toHaveLength(1);
+      });
     });
 
     describe('deleteUser', () => {

package/src/libs/next-auth/adapter/index.ts

@@ -53,7 +53,10 @@ export function LobeNextAuthDbAdapter(serverDB: NeonDatabase<typeof schema>): Ad
     async createUser(user): Promise<AdapterUser> {
       const { id, name, email, emailVerified, image, providerAccountId } = user;
       // return the user if it already exists
-      let existingUser = email.trim() ? await UserModel.findByEmail(serverDB, email) : undefined;
+      let existingUser =
+        email && typeof email === 'string' && email.trim()
+          ? await UserModel.findByEmail(serverDB, email)
+          : undefined;
       // If the user is not found by email, try to find by providerAccountId
       if (!existingUser && providerAccountId) {
         existingUser = await UserModel.findById(serverDB, providerAccountId);
@@ -169,7 +172,10 @@ export function LobeNextAuthDbAdapter(serverDB: NeonDatabase<typeof schema>): Ad
     },
 
     async getUserByEmail(email): Promise<AdapterUser | null> {
-      const lobeUser = email.trim() ? await UserModel.findByEmail(serverDB, email) : undefined;
+      const lobeUser =
+        email && typeof email === 'string' && email.trim()
+          ? await UserModel.findByEmail(serverDB, email)
+          : undefined;
       return lobeUser ? mapLobeUserToAdapterUser(lobeUser) : null;
     },
 

package/src/server/services/user/index.test.ts

@@ -0,0 +1,200 @@
+import { UserJSON } from '@clerk/backend';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { UserItem } from '@/database/schemas';
+import { UserModel } from '@/database/server/models/user';
+import { pino } from '@/libs/logger';
+
+import { UserService } from './index';
+
+// Mock dependencies
+vi.mock('@/database/server/models/user', () => {
+  const MockUserModel = vi.fn();
+  // @ts-ignore
+  MockUserModel.findById = vi.fn();
+  // @ts-ignore
+  MockUserModel.createUser = vi.fn();
+  // @ts-ignore
+  MockUserModel.deleteUser = vi.fn();
+
+  // Mock instance methods
+  MockUserModel.prototype.updateUser = vi.fn();
+
+  return { UserModel: MockUserModel };
+});
+
+vi.mock('@/libs/logger', () => ({
+  pino: {
+    info: vi.fn(),
+  },
+}));
+
+let service: UserService;
+const mockUserId = 'test-user-id';
+
+// Mock user data
+const mockUserJSON: UserJSON = {
+  id: mockUserId,
+  email_addresses: [{ id: 'email-1', email_address: 'test@example.com' }],
+  phone_numbers: [{ id: 'phone-1', phone_number: '+1234567890' }],
+  primary_email_address_id: 'email-1',
+  primary_phone_number_id: 'phone-1',
+  image_url: 'https://example.com/avatar.jpg',
+  first_name: 'Test',
+  last_name: 'User',
+  username: 'testuser',
+  created_at: '2023-01-01T00:00:00Z',
+} as unknown as UserJSON;
+
+beforeEach(() => {
+  service = new UserService();
+  vi.clearAllMocks();
+});
+
+describe('UserService', () => {
+  describe('createUser', () => {
+    it('should create a new user when user does not exist', async () => {
+      // Mock user not found
+      vi.mocked(UserModel.findById).mockResolvedValue(null as any);
+
+      await service.createUser(mockUserId, mockUserJSON);
+
+      expect(UserModel.findById).toHaveBeenCalledWith(expect.anything(), mockUserId);
+      expect(UserModel.createUser).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({
+          id: mockUserId,
+          email: 'test@example.com',
+          phone: '+1234567890',
+          firstName: 'Test',
+          lastName: 'User',
+          username: 'testuser',
+          avatar: 'https://example.com/avatar.jpg',
+          clerkCreatedAt: new Date('2023-01-01T00:00:00Z'),
+        }),
+      );
+    });
+
+    it('should not create user if already exists', async () => {
+      // Mock user found
+      vi.mocked(UserModel.findById).mockResolvedValue({ id: mockUserId } as UserItem);
+
+      const result = await service.createUser(mockUserId, mockUserJSON);
+
+      expect(UserModel.findById).toHaveBeenCalledWith(expect.anything(), mockUserId);
+      expect(UserModel.createUser).not.toHaveBeenCalled();
+      expect(result).toEqual({
+        message: 'user not created due to user already existing in the database',
+        success: false,
+      });
+    });
+
+    it('should handle user without primary phone number', async () => {
+      vi.mocked(UserModel.findById).mockResolvedValue(null as any);
+
+      const userWithoutPrimaryPhone = {
+        ...mockUserJSON,
+        primary_phone_number_id: null,
+        phone_numbers: [{ id: 'phone-1', phone_number: '+1234567890' }],
+      } as UserJSON;
+
+      await service.createUser(mockUserId, userWithoutPrimaryPhone);
+
+      expect(UserModel.createUser).toHaveBeenCalledWith(
+        expect.anything(),
+        expect.objectContaining({
+          phone: '+1234567890', // Should use first phone number
+        }),
+      );
+    });
+  });
+
+  describe('deleteUser', () => {
+    it('should delete user', async () => {
+      await service.deleteUser(mockUserId);
+
+      expect(UserModel.deleteUser).toHaveBeenCalledWith(expect.anything(), mockUserId);
+    });
+
+    it('should throw error if deletion fails', async () => {
+      const error = new Error('Deletion failed');
+      vi.mocked(UserModel.deleteUser).mockRejectedValue(error);
+
+      await expect(service.deleteUser(mockUserId)).rejects.toThrow('Deletion failed');
+    });
+  });
+
+  describe('updateUser', () => {
+    it('should update user when user exists', async () => {
+      // Mock user found
+      vi.mocked(UserModel.findById).mockResolvedValue({ id: mockUserId } as UserItem);
+      const mockUpdateUser = vi.mocked(UserModel.prototype.updateUser);
+
+      const result = await service.updateUser(mockUserId, mockUserJSON);
+
+      expect(UserModel.findById).toHaveBeenCalledWith(expect.anything(), mockUserId);
+      expect(pino.info).toHaveBeenCalledWith('updating user due to clerk webhook');
+      expect(mockUpdateUser).toHaveBeenCalledWith(
+        expect.objectContaining({
+          id: mockUserId,
+          email: 'test@example.com',
+          phone: '+1234567890',
+          firstName: 'Test',
+          lastName: 'User',
+          username: 'testuser',
+          avatar: 'https://example.com/avatar.jpg',
+        }),
+      );
+      expect(result).toEqual({
+        message: 'user updated',
+        success: true,
+      });
+    });
+
+    it('should not update user when user does not exist', async () => {
+      // Mock user not found
+      vi.mocked(UserModel.findById).mockResolvedValue(null as any);
+      const mockUpdateUser = vi.mocked(UserModel.prototype.updateUser);
+
+      const result = await service.updateUser(mockUserId, mockUserJSON);
+
+      expect(UserModel.findById).toHaveBeenCalledWith(expect.anything(), mockUserId);
+      expect(mockUpdateUser).not.toHaveBeenCalled();
+      expect(result).toEqual({
+        message: "user not updated due to the user don't existing in the database",
+        success: false,
+      });
+    });
+
+    it('should handle user without primary email and phone', async () => {
+      vi.mocked(UserModel.findById).mockResolvedValue({ id: mockUserId } as UserItem);
+      const mockUpdateUser = vi.mocked(UserModel.prototype.updateUser);
+
+      const userWithoutPrimaryContacts = {
+        ...mockUserJSON,
+        primary_email_address_id: null,
+        primary_phone_number_id: null,
+        email_addresses: [{ id: 'email-1', email_address: 'test@example.com' }],
+        phone_numbers: [{ id: 'phone-1', phone_number: '+1234567890' }],
+      } as UserJSON;
+
+      await service.updateUser(mockUserId, userWithoutPrimaryContacts);
+
+      // Verify that the first email and phone are used when primary is not specified
+      expect(mockUpdateUser).toHaveBeenCalledWith(
+        expect.objectContaining({
+          phone: '+1234567890',
+        }),
+      );
+    });
+
+    it('should handle update failure', async () => {
+      vi.mocked(UserModel.findById).mockResolvedValue({ id: mockUserId } as UserItem);
+      const mockUpdateUser = vi.mocked(UserModel.prototype.updateUser);
+      const error = new Error('Update failed');
+      mockUpdateUser.mockRejectedValue(error);
+
+      await expect(service.updateUser(mockUserId, mockUserJSON)).rejects.toThrow('Update failed');
+    });
+  });
+});

package/src/server/services/user/index.ts

@@ -1,5 +1,4 @@
 import { UserJSON } from '@clerk/backend';
-import { NextResponse } from 'next/server';
 
 import { serverDB } from '@/database/server';
 import { UserModel } from '@/database/server/models/user';
@@ -12,16 +11,18 @@ export class UserService {
 
     // If user already exists, skip creating a new user
     if (res)
-      return NextResponse.json(
-        {
-          message: 'user not created due to user already existing in the database',
-          success: false,
-        },
-        { status: 200 },
-      );
+      return {
+        message: 'user not created due to user already existing in the database',
+        success: false,
+      };
 
     const email = params.email_addresses.find((e) => e.id === params.primary_email_address_id);
-    const phone = params.phone_numbers.find((e) => e.id === params.primary_phone_number_id);
+
+    const phone = params.phone_numbers.find((e, index) => {
+      if (!!params.primary_phone_number_id) return e.id === params.primary_phone_number_id;
+
+      return index === 0;
+    });
 
     /* ↓ cloud slot ↓ */
 
@@ -43,25 +44,14 @@ export class UserService {
 
     /* ↑ cloud slot ↑ */
 
-    return NextResponse.json({ message: 'user created', success: true }, { status: 200 });
+    return { message: 'user created', success: true };
   };
 
-  deleteUser = async (id?: string) => {
-    if (id) {
-      pino.info('delete user due to clerk webhook');
-
-      await UserModel.deleteUser(serverDB, id);
-
-      return NextResponse.json({ message: 'user deleted' }, { status: 200 });
-    } else {
-      pino.warn('clerk sent a delete user request, but no user ID was included in the payload');
-      return NextResponse.json({ message: 'ok' }, { status: 200 });
-    }
+  deleteUser = async (id: string) => {
+    await UserModel.deleteUser(serverDB, id);
   };
 
   updateUser = async (id: string, params: UserJSON) => {
-    pino.info('updating user due to clerk webhook');
-
     const userModel = new UserModel(serverDB, id);
 
     // Check if user already exists
@@ -69,16 +59,18 @@ export class UserService {
 
     // If user not exists, skip update the user
     if (!res)
-      return NextResponse.json(
-        {
-          message: "user not updated due to the user don't existing in the database",
-          success: false,
-        },
-        { status: 200 },
-      );
+      return {
+        message: "user not updated due to the user don't existing in the database",
+        success: false,
+      };
+
+    pino.info('updating user due to clerk webhook');
 
     const email = params.email_addresses.find((e) => e.id === params.primary_email_address_id);
-    const phone = params.phone_numbers.find((e) => e.id === params.primary_phone_number_id);
+    const phone = params.phone_numbers.find((e, index) => {
+      if (params.primary_phone_number_id) return e.id === params.primary_phone_number_id;
+      return index === 0;
+    });
 
     await userModel.updateUser({
       avatar: params.image_url,
@@ -90,6 +82,6 @@ export class UserService {
       username: params.username,
     });
 
-    return NextResponse.json({ message: 'user updated', success: true }, { status: 200 });
+    return { message: 'user updated', success: true };
   };
 }

package/vitest.config.ts

@@ -31,7 +31,7 @@ export default defineConfig({
       '**/dist/**',
       '**/build/**',
       'src/database/server/**/**',
-      'src/server/services/!(discover)/**/**',
+      'src/server/services/dataImporter/**/**',
     ],
     globals: true,
     server: {