修正 mobile view 下 chat-input 位置問題

.gitignore

@@ -50,3 +50,4 @@ yarn.lock
 # pmpm
 pnpm-lock.yaml
 /.idea
+/*.exe

app/api/auth/route.ts

@@ -13,7 +13,7 @@ export async function POST(request: NextRequest) {
       const channel = await authSpeedyAgencyMember(mobile);
 
       if (channel) {
-        console.log(`auth req: ${sessionId}`);
+        // console.log(`auth req: ${sessionId}`);
 
         return await ResponseWithSession(NextResponse.json({
           status: true,

app/api/utils/common.ts

@@ -3,7 +3,6 @@ import { ChatClient } from 'dify-client'
 import { v4 } from 'uuid'
 import { API_KEY, API_URL, APP_ID } from '@/config'
 import { encrypt, decrypt } from '@/utils/tools'
-import crypto from "crypto";
 
 const userPrefix = `user_${APP_ID}:`
 
@@ -28,14 +27,18 @@ export const ResponseWithSession = async (resp:NextResponse, sessionId: string,
   return resp;
 }
 
-export const getSession = (request: NextRequest, sessionID: string) => {
+export async function getSession(request: NextRequest, sessionID: string): Promise<Record<string, string>|any> {
   const cookies = request.cookies;
   const k = cookies.get(sessionID)
   const raw = k?.value || '';
   if (raw) {
-    return decrypt(raw);
+    try {
+      return await decrypt(raw);
+    } catch (error: any) {
+      console.error(error);
+    }
   }
-  return {};
+  return null;
 }
 
 export const client = new ChatClient(API_KEY, API_URL || undefined)

app/components/chat/index.tsx

@@ -166,7 +166,7 @@ const Chat: FC<IChatProps> = ({
       </div>
       {
         !isHideSendInput && (
-          <div className={cn(!feedbackDisabled && '!left-3.5 !right-3.5', 'absolute z-10 bottom-0 left-0 right-0')}>
+          <div className={cn(!feedbackDisabled && '!left-3.5 !right-3.5', 'absolute z-10 bottom-0 left-0 right-0 chat-input')}>
             <div className='p-[5.5px] max-h-[150px] bg-white border-[1.5px] border-gray-200 rounded-xl overflow-y-auto'>
               {
                 visionConfig?.enabled && (

app/components/index.tsx

@@ -576,7 +576,7 @@ const Main: FC = ({params}: any) => {
     return <Loading type='app' />
 
   return (
-    <div className='bg-gray-100'>
+    <div className='bg-gray-100 main-wrapper'>
       <Header
         title={APP_INFO.title}
         isMobile={isMobile}
@@ -597,7 +597,7 @@ const Main: FC = ({params}: any) => {
           </div>
         )}
         {/* main */}
-        <div className='flex-grow flex-col flex h-[calc(100vh_-_3rem)] overflow-y-auto'>
+        <div className='flex-grow flex-col flex h-[calc(100vh_-_3rem)] overflow-y-auto chat-wrapper'>
           <ConfigSence
             conversationName={conversationName}
             hasSetInputs={hasSetInputs}
@@ -612,7 +612,7 @@ const Main: FC = ({params}: any) => {
 
           {
             hasSetInputs && (
-              <div className='relative grow h-[200px] pc:w-[794px] max-w-full mobile:w-full pb-[66px] mx-auto mb-3.5 overflow-hidden'>
+              <div className='relative grow pc:w-[794px] max-w-full mobile:w-full pb-[66px] mx-auto mb-3.5 overflow-hidden'>
                 <div className='h-full overflow-y-auto' ref={chatListDomRef}>
                   <Chat
                     chatList={chatList}

app/styles/globals.css

@@ -146,3 +146,27 @@ html,
 .font-sans {
     font-family: Helvetica, Arial, Helvetica Neue, MHeiHK-Medium, PingFang HK, SourceHanSansTWHK-Light, Microsoft JhengHei, sans-serif;
 }
+
+@media (max-width: 768px) {
+    .main-wrapper {
+        display: flex;
+        flex-direction: column;
+        justify-content: flex-start;
+        height: 100%;
+    }
+    .main-wrapper > .overflow-hidden {
+        flex: 1;
+    }
+    .chat-wrapper {
+        flex-direction: column;
+        justify-content: space-between;
+        height: 100% !important;
+    }
+    .chat-wrapper > .relative {
+        flex: 1;
+    }
+    .chat-wrapper .chat-input {
+        position: fixed;
+        bottom: 1em;
+    }
+}

middleware.ts

@@ -1,6 +1,5 @@
 import { NextResponse } from 'next/server'
 import type { NextRequest } from 'next/server'
-import { createSessionStore, userSession } from '@/utils/tools'
 import { getInfo, setSession, getSession } from '@/app/api/utils/common'
 import { ENABLE_AUTH } from '@/config'
 
@@ -25,11 +24,11 @@ export async function middleware(request: NextRequest) {
         });
     }
 
-    console.log(`middleware: ${sessionId}`);
+    // console.log(`middleware: ${sessionId}`);
 
     if (ENABLE_AUTH) {
         const session = await getSession(request, sessionId);
-        console.log(`middleware: ${JSON.stringify(session)}`);
+        // console.log(`middleware: ${JSON.stringify(session)}`);
 
         if (session?.channel) {
             return NextResponse.next({

utils/tools.ts

@@ -15,15 +15,13 @@ export const encrypt = async (value: Record<string, string>) => {
   const pwHash = await subtle.digest('SHA-256', pwUtf8);
 
   const iv = getRandomValues(new Uint8Array(12));
-  console.log(iv.toString());
   const alg = { name: 'AES-GCM', iv: iv };
   const key = await subtle.importKey('raw', pwHash, alg, false, ['encrypt']);
 
   const encData = await subtle.encrypt(alg, key, ptUtf8);
 
   const encryptedDataArray = new Uint8Array(encData);
   const encryptedData = [...iv].map(b => ('00' + b.toString(16)).slice(-2)).join('') + Array.from(encryptedDataArray, byte => String.fromCharCode(byte)).join('');
-  console.log([...iv].map(b => ('00' + b.toString(16)).slice(-2)).join(''));
   return btoa(encryptedData);
 }
 
@@ -32,6 +30,7 @@ export const decrypt = async (encryptedData: string): Promise<Record<string, str
   const ctBytes = new Uint8Array(ctStr.split('').map(c => c.charCodeAt(0)));
 
   // Parse hexadecimal (base 16) iv and ciphertext from ctBytes array
+
   const iv = ctBytes.slice(0, 24).reduce<number[]>((result, v, i) => {
     if (i % 2 === 0) {
       result.push(parseInt(ctStr.substr(i, 2), 16));