feat: merge main

Author: alichengyue

.gitignore

@@ -1,6 +1,7 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 __pycache__/
 *.pyc
+**/*.pyc
 # dependencies
 node_modules/
 

client/.env.example

@@ -1,2 +1,2 @@
 SELF_PATH=/client/
-NEXT_PUBLIC_API_URL=http://localhost:3000/api
+NEXT_PUBLIC_API_DOMAIN=http://localhost:8000

client/app/hooks/useFingerprint.ts

@@ -0,0 +1,10 @@
+import useSWR from 'swr';
+import FingerprintJS from '@fingerprintjs/fingerprintjs'
+
+export function useFingerprint() {
+  return useSWR(['client.fingerprint'], async () => {
+    const fpPromise = FingerprintJS.load();
+    const fp = await fpPromise;
+    return fp.get();
+  }, { suspense: false })
+}

client/app/hooks/useUser.ts

@@ -1,14 +1,18 @@
+'use client';
+
 import {
   getUserInfo
 } from '@/app/services/UserController';
 import { useQuery } from '@tanstack/react-query';
-
-
+import { useFingerprint } from './useFingerprint';
 
 function useUser() {
+  const { data } = useFingerprint();
+
   return useQuery({
-    queryKey: [`user.userinfo`],
-    queryFn: async () => getUserInfo(),
+    queryKey: [`user.userinfo`, data?.visitorId],
+    queryFn: async () => getUserInfo({ clientId: data?.visitorId }),
+    enabled: !!data?.visitorId,
     retry: false,
   });
 }

client/app/layout.tsx

@@ -3,8 +3,10 @@ import './globals.css';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { NextUIProvider } from '@nextui-org/react';
 import { Navbar } from '@/components/Navbar';
+import { Assistant } from 'petercat-lui';
 
 const queryClient = new QueryClient();
+const ASSISTANT_API_HOST = process.env.NEXT_PUBLIC_ASSISTANT_API_HOST;
 
 export default function RootLayout({
   children,

client/app/page.tsx

@@ -2,18 +2,14 @@
 import { Tables } from '@/types/database.types';
 import React from 'react';
 import { isEmpty, map } from 'lodash';
-import { Spinner } from '@nextui-org/react';
 import BotCard from '@/components/BotCard';
 import AddBotCard from '@/components/AddBotCard';
 
 import { useBotList } from '@/app/hooks/useBot';
 import FullPageSkeleton from '@/components/FullPageSkeleton';
-import { Assistant } from 'petercat-lui';
 
 declare type Bot = Tables<'bots'>;
 
-const ASSISTANT_API_HOST = process.env.NEXT_PUBLIC_ASSISTANT_API_HOST;
-
 export default function Home() {
   const { data: bots, isLoading, error } = useBotList();
   if (isLoading) {
@@ -25,8 +21,6 @@ export default function Home() {
 
   return (
     <div>
-      <Assistant host={ASSISTANT_API_HOST} />
-
       <div className="container mx-auto max-w-[1024px]">
         <div className="mt-8">
 

client/app/services/UserController.ts

@@ -1,10 +1,8 @@
 import axios from 'axios';
 
-
 //  Get the public bot profile by id
-export async function getUserInfo() {
-  
+export async function getUserInfo({ clientId }: { clientId?: string }) {
   const apiDomain = process.env.NEXT_PUBLIC_API_DOMAIN;
-  const response = await axios.get(`${apiDomain}/api/auth/userinfo`);
+  const response = await axios.get(`${apiDomain}/api/auth/userinfo?clientId=${clientId}`);
   return response.data.data;
 }

client/components/User.tsx

@@ -1,17 +1,19 @@
+'use client';
+
 import { Avatar, Button, Link } from '@nextui-org/react';
-// import useUser from '../app/hooks/useUser';
+import useUser from '../app/hooks/useUser';
 
 export default function Profile() {
-  // const { data: user } = useUser();
+  const { data: user, status } = useUser();
   const apiDomain = process.env.NEXT_PUBLIC_API_DOMAIN;
-  
-  // if (!user) {
+
+  if (!user || status !== "success") {
     return (
       <Button as={Link} color="primary" href={`${apiDomain}/api/auth/login`} variant="flat">
         Login
       </Button>
     );
-  // }
+  }
 
-  // return (<Avatar size="sm" src={user.picture!} alt={user.name!} />);
+  return (<Avatar size="sm" src={user.picture!} alt={user.name!} />);
 }

client/package.json

@@ -16,6 +16,7 @@
   },
   "dependencies": {
     "@auth0/nextjs-auth0": "^3.3.0",
+    "@fingerprintjs/fingerprintjs": "^4.3.0",
     "@next/bundle-analyzer": "^13.4.19",
     "@nextui-org/react": "^2.2.9",
     "@supabase/supabase-js": "^2.32.0",
@@ -28,7 +29,6 @@
     "axios": "^1.6.7",
     "concurrently": "^8.2.2",
     "dayjs": "^1.11.10",
-    "petercat-lui": "^0.0.4",
     "eslint": "8.46.0",
     "eslint-config-next": "13.4.12",
     "framer-motion": "^10.16.15",
@@ -38,6 +38,7 @@
     "lodash": "^4.17.21",
     "next": "14.0.1",
     "openai": "^4.24.7",
+    "petercat-lui": "^0.0.8",
     "postcss": "8.4.27",
     "react": "18.2.0",
     "react-dom": "18.2.0",