@lobehub/chat 1.12.17 → 1.12.18

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 1.12.18](https://github.com/lobehub/lobe-chat/compare/v1.12.17...v1.12.18)
+
+<sup>Released on **2024-08-25**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix dayjs error in en-US language.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix dayjs error in en-US language, closes [#3604](https://github.com/lobehub/lobe-chat/issues/3604) ([174f4df](https://github.com/lobehub/lobe-chat/commit/174f4df))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.12.17](https://github.com/lobehub/lobe-chat/compare/v1.12.16...v1.12.17)
 
 <sup>Released on **2024-08-25**</sup>

package/README.md

@@ -273,7 +273,7 @@ Our marketplace is not just a showcase platform but also a collaborative space.
 | [Prompt Engineering Expert](https://chat-preview.lobehub.com/market?agent=ai-prompts-assistant)<br/><sup>By **[cyicz123](https://github.com/cyicz123)** on **2024-08-12**</sup>               | Specializing in prompt optimization and design<br/>`prompt-engineering` `ai-interaction` `writing` `optimization` `consulting`                                                                                                                                                                                                                                                                                                                                                                                                 |
 | [Commit Message Generator](https://chat-preview.lobehub.com/market?agent=commit-assistant)<br/><sup>By **[cyicz123](https://github.com/cyicz123)** on **2024-08-12**</sup>                    | Expert at generating precise Git commit messages<br/>`programming` `git` `commit-message` `code-review`                                                                                                                                                                                                                                                                                                                                                                                                                        |
 
-> 📊 Total agents: [<kbd>**316**</kbd> ](https://github.com/lobehub/lobe-chat-agents)
+> 📊 Total agents: [<kbd>**317**</kbd> ](https://github.com/lobehub/lobe-chat-agents)
 
  <!-- AGENT LIST -->
 

package/README.zh-CN.md

@@ -261,7 +261,7 @@ LobeChat 的插件生态系统是其核心功能的重要扩展，它极大地
 | [提示工程专家](https://chat-preview.lobehub.com/market?agent=ai-prompts-assistant)<br/><sup>By **[cyicz123](https://github.com/cyicz123)** on **2024-08-12**</sup>               | 专精 Prompt 优化与设计<br/>`提示工程` `ai交互` `写作` `优化` `咨询`                                                                                                                                                                                                                   |
 | [提交信息生成器](https://chat-preview.lobehub.com/market?agent=commit-assistant)<br/><sup>By **[cyicz123](https://github.com/cyicz123)** on **2024-08-12**</sup>                 | 擅长生成精准的 Git 提交信息<br/>`编程` `git` `提交信息` `代码审查`                                                                                                                                                                                                                    |
 
-> 📊 Total agents: [<kbd>**316**</kbd> ](https://github.com/lobehub/lobe-chat-agents)
+> 📊 Total agents: [<kbd>**317**</kbd> ](https://github.com/lobehub/lobe-chat-agents)
 
  <!-- AGENT LIST -->
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.12.17",
+  "version": "1.12.18",
   "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/layout/GlobalProvider/Locale.tsx

@@ -37,7 +37,17 @@ const Locale = memo<LocaleLayoutProps>(({ children, defaultLang, antdLocale }) =
         if (!lang) return;
 
         // load default lang
-        const dayJSLocale = await import(`dayjs/locale/${lang!.toLowerCase()}.js`);
+        let dayJSLocale;
+        try {
+          // dayjs locale is using `en` instead of `en-US`
+          // refs: https://github.com/lobehub/lobe-chat/issues/3396
+          const locale = lang!.toLowerCase() === 'en-us' ? 'en' : lang!.toLowerCase();
+
+          dayJSLocale = await import(`dayjs/locale/${locale}.js`);
+        } catch {
+          console.warn(`dayjs locale for ${lang} not found, fallback to en`);
+          dayJSLocale = await import(`dayjs/locale/en.js`);
+        }
 
         dayjs.locale(dayJSLocale.default);
       });

package/src/libs/trpc/index.ts

@@ -8,7 +8,7 @@
  * @link https://trpc.io/docs/v11/procedures
  */
 import { trpc } from './init';
-import { passwordChecker } from './middleware/password';
+import { jwtPayloadChecker } from './middleware/jwtPayload';
 import { userAuth } from './middleware/userAuth';
 
 /**
@@ -27,7 +27,7 @@ export const publicProcedure = trpc.procedure;
 export const authedProcedure = trpc.procedure.use(userAuth);
 
 // procedure that asserts that the user add the password
-export const passwordProcedure = trpc.procedure.use(passwordChecker);
+export const passwordProcedure = trpc.procedure.use(jwtPayloadChecker);
 
 /**
  * Merge multiple routers together

package/src/libs/trpc/middleware/{password.test.ts → jwtPayload.test.ts}

@@ -3,15 +3,14 @@ import { TRPCError } from '@trpc/server';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import * as utils from '@/app/api/middleware/auth/utils';
-import * as appConfig from '@/config/app';
 import { createCallerFactory } from '@/libs/trpc';
 import { trpc } from '@/libs/trpc/init';
 import { AuthContext, createContextInner } from '@/server/context';
 
-import { passwordChecker } from './password';
+import { jwtPayloadChecker } from './jwtPayload';
 
 const appRouter = trpc.router({
-  protectedQuery: trpc.procedure.use(passwordChecker).query(async ({ ctx }) => {
+  protectedQuery: trpc.procedure.use(jwtPayloadChecker).query(async ({ ctx }) => {
     return ctx.jwtPayload;
   }),
 });
@@ -38,23 +37,9 @@ describe('passwordChecker middleware', () => {
     await expect(router.protectedQuery()).rejects.toThrow(new TRPCError({ code: 'UNAUTHORIZED' }));
   });
 
-  it('should throw UNAUTHORIZED error if access code is not correct', async () => {
-    vi.spyOn(appConfig, 'getAppConfig').mockReturnValue({
-      ACCESS_CODES: ['123'],
-    } as any);
-    vi.spyOn(utils, 'getJWTPayload').mockResolvedValue({ accessCode: '456' });
-
-    ctx = await createContextInner({ authorizationHeader: 'Bearer token' });
-    router = createCaller(ctx);
-
-    await expect(router.protectedQuery()).rejects.toThrow(new TRPCError({ code: 'UNAUTHORIZED' }));
-  });
-
   it('should call next with jwtPayload in context if access code is correct', async () => {
     const jwtPayload = { accessCode: '123' };
-    vi.spyOn(appConfig, 'getAppConfig').mockReturnValue({
-      ACCESS_CODES: ['123'],
-    } as any);
+
     vi.spyOn(utils, 'getJWTPayload').mockResolvedValue(jwtPayload);
 
     ctx = await createContextInner({ authorizationHeader: 'Bearer token' });
@@ -67,9 +52,6 @@ describe('passwordChecker middleware', () => {
 
   it('should call next with jwtPayload in context if no access codes are set', async () => {
     const jwtPayload = {};
-    vi.spyOn(appConfig, 'getAppConfig').mockReturnValue({
-      ACCESS_CODES: [],
-    } as any);
     vi.spyOn(utils, 'getJWTPayload').mockResolvedValue(jwtPayload);
 
     ctx = await createContextInner({ authorizationHeader: 'Bearer token' });
@@ -81,7 +63,6 @@ describe('passwordChecker middleware', () => {
   });
   it('should call next with jwtPayload in context if  access codes is undefined', async () => {
     const jwtPayload = {};
-    vi.spyOn(appConfig, 'getAppConfig').mockReturnValue({} as any);
     vi.spyOn(utils, 'getJWTPayload').mockResolvedValue(jwtPayload);
 
     ctx = await createContextInner({ authorizationHeader: 'Bearer token' });

package/src/libs/trpc/middleware/jwtPayload.ts

@@ -0,0 +1,14 @@
+import { TRPCError } from '@trpc/server';
+
+import { getJWTPayload } from '@/app/api/middleware/auth/utils';
+import { trpc } from '@/libs/trpc/init';
+
+export const jwtPayloadChecker = trpc.middleware(async (opts) => {
+  const { ctx } = opts;
+
+  if (!ctx.authorizationHeader) throw new TRPCError({ code: 'UNAUTHORIZED' });
+
+  const jwtPayload = await getJWTPayload(ctx.authorizationHeader);
+
+  return opts.next({ ctx: { jwtPayload } });
+});

package/src/libs/trpc/middleware/password.ts

@@ -1,26 +0,0 @@
-import { TRPCError } from '@trpc/server';
-
-import { getJWTPayload } from '@/app/api/middleware/auth/utils';
-import { getAppConfig } from '@/config/app';
-import { trpc } from '@/libs/trpc/init';
-
-export const passwordChecker = trpc.middleware(async (opts) => {
-  const { ACCESS_CODES } = getAppConfig();
-
-  const { ctx } = opts;
-
-  if (!ctx.authorizationHeader) throw new TRPCError({ code: 'UNAUTHORIZED' });
-
-  const jwtPayload = await getJWTPayload(ctx.authorizationHeader);
-
-  // if there are access codes, check if the user has set correct one
-  if (ACCESS_CODES && ACCESS_CODES.length > 0) {
-    const accessCode = jwtPayload.accessCode;
-
-    if (!accessCode || !ACCESS_CODES.includes(accessCode)) {
-      throw new TRPCError({ code: 'UNAUTHORIZED' });
-    }
-  }
-
-  return opts.next({ ctx: { jwtPayload } });
-});