feat: add setup page

package.json

@@ -56,6 +56,7 @@
     "@radix-ui/react-scroll-area": "^1.1.0",
     "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-switch": "^1.1.0",
+    "@resreq/timer": "^1.1.5",
     "@tailwindcss/typography": "^0.5.15",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.1",
@@ -90,8 +91,8 @@
     "@eslint-react/eslint-plugin": "^1.14.1",
     "@eslint/js": "^9.10.0",
     "@types/eslint": "^9.6.1",
-    "@types/eslint__js": "^8.42.3",
     "@types/eslint-plugin-tailwindcss": "^3.17.0",
+    "@types/eslint__js": "^8.42.3",
     "@types/node": "^22.5.5",
     "@types/react": "^18.3.7",
     "@types/react-dom": "^18.3.0",

pnpm-lock.yaml

@@ -44,6 +44,9 @@ importers:
       '@radix-ui/react-switch':
         specifier: ^1.1.0
         version: 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.7)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+      '@resreq/timer':
+        specifier: ^1.1.5
+        version: 1.1.5
       '@tailwindcss/typography':
         specifier: ^0.5.15
         version: 0.5.15(tailwindcss@3.4.12)
@@ -1643,6 +1646,12 @@ packages:
   '@radix-ui/rect@1.1.0':
     resolution: {integrity: sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==}
 
+  '@resreq/event-hub@1.6.0':
+    resolution: {integrity: sha512-SEzPuAc2bQdMV9cKrBIjW3EvntpU8NcBxdgdEo9yLKAeRfvdM4oM/sG8pFPRZOpYwOytaJqWGqwjc+RSRFFTvQ==}
+
+  '@resreq/timer@1.1.5':
+    resolution: {integrity: sha512-QZrY3+1nbDd3e15muzFGRxJAaKYYJ9xC5+E/cm/B3cEXQbD8pjy/lilsMOaOpvligpUE1jXxiSZzuvH334fq5w==}
+
   '@rollup/pluginutils@5.1.0':
     resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==}
     engines: {node: '>=14.0.0'}
@@ -7710,6 +7719,12 @@ snapshots:
 
   '@radix-ui/rect@1.1.0': {}
 
+  '@resreq/event-hub@1.6.0': {}
+
+  '@resreq/timer@1.1.5':
+    dependencies:
+      '@resreq/event-hub': 1.6.0
+
   '@rollup/pluginutils@5.1.0(rollup@4.21.3)':
     dependencies:
       '@types/estree': 1.0.5

src/app/content/App.tsx

@@ -3,25 +3,28 @@ import Footer from '@/app/content/views/Footer'
 import Main from '@/app/content/views/Main'
 import AppButton from '@/app/content/views/AppButton'
 import AppContainer from '@/app/content/views/AppContainer'
-import { useRemeshDomain, useRemeshSend } from 'remesh-react'
+import { useRemeshDomain, useRemeshQuery, useRemeshSend } from 'remesh-react'
 import RoomDomain from '@/domain/Room'
 import { stringToHex } from '@/utils'
 import { Toaster } from '@/components/ui/Sonner'
+import UserInfoDomain from '@/domain/UserInfo'
+import Setup from '@/app/content/views/Setup'
 
 const hostRoomId = stringToHex(document.location.host)
 
 export default function App() {
   const send = useRemeshSend()
   const roomDomain = useRemeshDomain(RoomDomain())
-
+  const userInfoDomain = useRemeshDomain(UserInfoDomain())
   send(roomDomain.command.JoinRoomCommand(hostRoomId))
-
+  const isLogin = useRemeshQuery(userInfoDomain.query.IsLoginQuery())
   return (
     <>
       <AppContainer>
         <Header />
         <Main />
         <Footer />
+        {!isLogin && <Setup />}
       </AppContainer>
       <AppButton></AppButton>
       <Toaster richColors offset="104px" position="top-center"></Toaster>

src/app/content/components/EmojiButton.tsx

@@ -34,7 +34,7 @@ const EmojiButton: FC<EmojiButtonProps> = ({ onSelect }) => {
           <SmileIcon size={20} />
         </Button>
       </PopoverTrigger>
-      <PopoverContent className="z-top w-72 px-0" onCloseAutoFocus={handleCloseAutoFocus}>
+      <PopoverContent className="z-infinity w-72 px-0" onCloseAutoFocus={handleCloseAutoFocus}>
         <ScrollArea className="size-72 px-3">
           {emojiGroups.map((group, index) => {
             return (

src/app/content/components/MessageItem.tsx

@@ -30,7 +30,7 @@ const MessageItem: FC<MessageItemProps> = (props) => {
         <AvatarFallback>{props.data.username.at(0)}</AvatarFallback>
       </Avatar>
       <div className="overflow-hidden">
-        <div className="grid grid-cols-[auto_1fr] items-baseline gap-x-2 leading-none">
+        <div className="grid grid-cols-[1fr_auto] items-baseline gap-x-2 leading-none">
           <div className="text-sm font-medium text-slate-600">{props.data.username}</div>
           <FormatDate className="text-xs text-slate-400" date={props.data.date}></FormatDate>
         </div>

src/app/content/index.tsx

@@ -14,7 +14,7 @@ import { createElement } from '@/utils'
 
 export default defineContentScript({
   cssInjectionMode: 'ui',
-  matches: ['*://*.example.com/*', '*://*.google.com/*', '*://*.v2ex.com/*'],
+  matches: ['*://*.example.com/*', '*://*.v2ex.com/*'],
   async main(ctx) {
     const store = Remesh.store({
       externs: [IndexDBStorageImpl, BrowserSyncStorageImpl, PeerRoomImpl],

src/app/content/views/AppButton/index.tsx

@@ -27,15 +27,11 @@ const AppButton: FC<AppButtonProps> = ({ children }) => {
 
   /**
    * Waiting for PR merge
-   * https://github.com/streamich/react-use/pull/2528
+   * @see https://github.com/streamich/react-use/pull/2528
    */
-  useClickAway(
+  useClickAway(menuRef, () => {
-    menuRef,
-    () => {
     setOpen(false)
-    },
+  }, ['click'])
-    ['click']
-  )
 
   const handleToggleMenu = (e: MouseEvent<HTMLButtonElement>) => {
     e.preventDefault()
@@ -55,7 +51,7 @@ const AppButton: FC<AppButtonProps> = ({ children }) => {
   }
 
   return (
-    <div ref={menuRef} className="fixed bottom-5 right-5 z-top grid select-none justify-center gap-y-3">
+    <div ref={menuRef} className="fixed bottom-5 right-5 z-infinity grid select-none justify-center gap-y-3">
       {/* <div className="grid gap-y-3" inert={!open && ''}> */}
       <div className="pointer-events-none grid gap-y-3">
         <Button

src/app/content/views/AppContainer/index.tsx

@@ -8,7 +8,7 @@ export interface AppContainerProps {
 const AppContainer: FC<AppContainerProps> = ({ children }) => {
   const { size, ref } = useResizable({
     initSize: Math.max(375, window.innerWidth / 5),
-    maxSize: Math.min(750, window.innerWidth / 3),
+    maxSize: Math.max(750, window.innerWidth / 3),
     minSize: Math.max(375, window.innerWidth / 5),
     direction: 'left'
   })
@@ -18,12 +18,12 @@ const AppContainer: FC<AppContainerProps> = ({ children }) => {
       style={{
         width: `${size}px`
       }}
-      className="fixed bottom-10 right-10 top-5 z-top box-border grid min-h-[375px] grid-flow-col grid-rows-[auto_1fr_auto] rounded-xl bg-slate-50  font-sans shadow-2xl"
+      className="fixed bottom-10 right-10 top-5 z-infinity box-border grid min-h-[750px] grid-flow-col grid-rows-[auto_1fr_auto] rounded-xl bg-slate-50  font-sans shadow-2xl"
     >
       {children}
       <div
         ref={ref}
-        className="absolute inset-y-3 -left-0.5 z-20 w-1 cursor-ew-resize rounded-sm bg-slate-100 opacity-0 shadow transition-opacity duration-200 ease-in hover:opacity-100"
+        className="absolute inset-y-3 -left-0.5 z-20 w-1 cursor-ew-resize rounded-xl bg-slate-100 opacity-0 shadow transition-opacity duration-200 ease-in hover:opacity-100"
       ></div>
     </div>
   )

src/app/content/views/Header/index.tsx

@@ -11,9 +11,6 @@ const Header: FC = () => {
   const siteInfo = getSiteInfo()
   const roomDomain = useRemeshDomain(RoomDomain())
   const peerList = useRemeshQuery(roomDomain.query.PeerListQuery())
-  // const peerList = ['1', '2', '3']
-  console.log('peerList', peerList)
-  console.log(111)
 
   return (
     <div className="z-10 grid h-12 grid-flow-col items-center justify-between gap-x-4 rounded-t-xl bg-white px-4 backdrop-blur-lg">

src/app/content/views/Main/index.tsx

@@ -1,4 +1,4 @@
-import { useEffect, type FC, useRef } from 'react'
+import { type FC } from 'react'
 import { useRemeshDomain, useRemeshQuery, useRemeshSend } from 'remesh-react'
 
 import MessageList from '../../components/MessageList'

src/app/content/views/Setup/index.tsx

@@ -0,0 +1,108 @@
+import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/Avatar'
+import { Button } from '@/components/ui/Button'
+import { MAX_AVATAR_SIZE } from '@/constants/config'
+import MessageListDomain, { Message } from '@/domain/MessageList'
+import UserInfoDomain, { UserInfo } from '@/domain/UserInfo'
+import { checkSystemDarkMode, generateRandomAvatar, generateRandomName } from '@/utils'
+import { UserIcon } from 'lucide-react'
+import { nanoid } from 'nanoid'
+import { FC, useEffect, useState } from 'react'
+import { useRemeshDomain, useRemeshSend } from 'remesh-react'
+import Timer from '@resreq/Timer'
+import ExampleImage from '@/assets/images/example.jpg'
+
+const mockTextList = [
+  `你問我支持不支持，我說我支持`,
+  `我就明確告訴你，你們啊，我感覺你們新聞界還要學習一個，你們非常熟悉西方的那一套`,
+  `你們畢竟還 too young`,
+  `明白我的意思吧？`,
+  `我告訴你們我是身經百戰了，見得多了`,
+  `西方的那個國家我沒去過？`,
+  `媒體他們...你們要知道美國的華萊士，比你們不知道高到哪裏去了，我跟他談笑風生`,
+  `其實媒體呀，還是要提高自己的知識水平，識得唔識得呀？`,
+  `你們有一個好，全世界跑到什么地方，你們比其他的西方記者跑得還快`,
+  `但是呢問來問去的問題呀`,
+  `都 too simple sometimes naive`,
+  `懂了沒啊，識得唔識得呀？`,
+  `我很抱歉，我今天是作爲一個長者給你們講`,
+  `我不是新聞工作者，但是我見得太多了`,
+  `我有這個必要好告訴你們一點人生的經驗`,
+  `![too young too simple sometimes naive](${ExampleImage})`
+]
+
+const generateUserInfo = async (): Promise<UserInfo> => {
+  return {
+    id: nanoid(),
+    name: generateRandomName(),
+    avatar: await generateRandomAvatar(MAX_AVATAR_SIZE),
+    createTime: Date.now(),
+    themeMode: checkSystemDarkMode() ? 'dark' : 'system'
+  }
+}
+
+const generateMessage = async (): Promise<Message> => {
+  const userAvatar = await generateRandomAvatar(MAX_AVATAR_SIZE)
+  const username = generateRandomName()
+  const userId = nanoid()
+  return {
+    id: nanoid(),
+    body: mockTextList.shift()!,
+    date: Date.now(),
+    userId,
+    username,
+    userAvatar,
+    likeUsers: mockTextList.length ? [] : [{ userId, username, userAvatar }],
+    hateUsers: []
+  }
+}
+
+const Setup: FC = () => {
+  const send = useRemeshSend()
+  const userInfoDomain = useRemeshDomain(UserInfoDomain())
+  const messageListDomain = useRemeshDomain(MessageListDomain())
+
+  const [userInfo, setUserInfo] = useState<UserInfo>()
+  const handleSetup = () => {
+    send(userInfoDomain.command.UpdateUserInfoCommand(userInfo!))
+    send(messageListDomain.command.ClearListCommand())
+  }
+
+  const refreshUserInfo = async () => setUserInfo(await generateUserInfo())
+  const createMessage = async () => {
+    const message = await generateMessage()
+    send(messageListDomain.command.CreateItemCommand(message))
+  }
+
+  useEffect(() => {
+    send(messageListDomain.command.ClearListCommand())
+    const userInfoTimer = new Timer(refreshUserInfo, { delay: 2000, immediate: true })
+    const messageTimer = new Timer(createMessage, { delay: 2000, immediate: true, limit: mockTextList.length })
+
+    userInfoTimer.start()
+    messageTimer.start()
+    return () => {
+      userInfoTimer.stop()
+      messageTimer.stop()
+    }
+  }, [])
+  return (
+    <div className="absolute inset-0 z-50 flex  rounded-xl bg-black/10 shadow-2xl  backdrop-blur-sm">
+      <div className="m-auto flex flex-col items-center justify-center gap-y-8 pb-40 drop-shadow-lg">
+        <Avatar className="size-24 cursor-pointer border-4 border-white ">
+          <AvatarImage src={userInfo?.avatar} alt="avatar" />
+          <AvatarFallback>
+            <UserIcon size={30} className="text-slate-400" />
+          </AvatarFallback>
+        </Avatar>
+        <div className="text-2xl font-bold text-primary">@{userInfo?.name}</div>
+        <Button className="rounded-full" size="lg" onClick={handleSetup}>
+          Start chatting
+        </Button>
+      </div>
+    </div>
+  )
+}
+
+Setup.displayName = 'Setup'
+
+export default Setup

src/app/options/components/AvatarSelect.tsx

@@ -31,7 +31,7 @@ const AvatarSelect = React.forwardRef<HTMLInputElement, AvatarSelectProps>(
            * In chrome storage.sync, each key-value pair supports a maximum storage of 8kb
            * and all key-value pairs support a maximum storage of 100kb.
            */
-          const blob = await compressImage(file, compressSize)
+          const blob = await compressImage({ input: file, targetSize: compressSize })
           const reader = new FileReader()
           reader.onload = (e) => {
             const base64 = e.target?.result as string

src/app/options/components/ProfileForm.tsx

@@ -10,15 +10,11 @@ import { Button } from '@/components/ui/Button'
 import { Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/Form'
 import { Input } from '@/components/ui/Input'
 import UserInfoDomain, { type UserInfo } from '@/domain/UserInfo'
-import { checkSystemDarkMode, compressImage } from '@/utils'
+import { checkSystemDarkMode, generateRandomAvatar } from '@/utils'
 import { RadioGroup, RadioGroupItem } from '@/components/ui/RadioGroup'
 import { Label } from '@/components/ui/Label'
 import { RefreshCcwIcon } from 'lucide-react'
-import generateUglyAvatar from '@/lib/uglyAvatar'
+import { MAX_AVATAR_SIZE } from '@/constants/config'
-
-// In chrome storage.sync, each key-value pair supports a maximum storage of 8kb
-// Image is encoded as base64, and the size is increased by about 33%.
-const COMPRESS_SIZE = 8 * 1024 * (1 - 0.33)
 
 const defaultUserInfo: UserInfo = {
   id: nanoid(),
@@ -82,32 +78,9 @@ const ProfileForm = () => {
     toast.error(error.message)
   }
 
-  const handleRandomAvatar = async () => {
+  const handleRefreshAvatar = async () => {
-    const svgBlob = generateUglyAvatar()
+    const avatarBase64 = await generateRandomAvatar(MAX_AVATAR_SIZE)
-
+    form.setValue('avatar', avatarBase64)
-    // compressImage can't directly compress svg, need to convert to jpeg first
-    const jpegBlob = await new Promise<Blob>((resolve, reject) => {
-      const image = new Image()
-      image.onload = async () => {
-        const canvas = new OffscreenCanvas(image.width, image.height)
-        const ctx = canvas.getContext('2d')
-        ctx?.drawImage(image, 0, 0)
-        const blob = await canvas.convertToBlob({ type: 'image/jpeg' })
-        resolve(blob)
-      }
-      image.onerror = () => reject(new Error('Failed to load SVG'))
-      image.src = URL.createObjectURL(svgBlob)
-    })
-    const miniAvatarBlob = await compressImage(jpegBlob, COMPRESS_SIZE)
-    const miniAvatarBase64 = await new Promise<string>((resolve, reject) => {
-      const reader = new FileReader()
-      reader.onload = (e) => resolve(e.target?.result as string)
-      reader.onerror = () => reject(new Error('Failed to convert Blob to Base64'))
-      reader.readAsDataURL(miniAvatarBlob)
-    })
-    console.log('kb', miniAvatarBase64.length / 1024)
-
-    form.setValue('avatar', miniAvatarBase64)
   }
 
   return (
@@ -121,7 +94,7 @@ const ProfileForm = () => {
               <FormControl>
                 <div className="grid justify-items-center gap-y-2">
                   <AvatarSelect
-                    compressSize={COMPRESS_SIZE}
+                    compressSize={MAX_AVATAR_SIZE}
                     onError={handleError}
                     onWarning={handleWarning}
                     className="shadow-lg"
@@ -131,7 +104,7 @@ const ProfileForm = () => {
                     type="button"
                     size="xs"
                     className="mx-auto flex items-center gap-x-2"
-                    onClick={handleRandomAvatar}
+                    onClick={handleRefreshAvatar}
                   >
                     <RefreshCcwIcon size={14} />
                     Ugly Avatar

src/assets/react.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>

src/components/ui/Markdown.tsx

@@ -10,9 +10,40 @@ export interface MarkdownProps {
   className?: string
 }
 
+const safeProtocol = /^(https?|ircs?|mailto|xmpp|data)$/i
+
+/**
+ * https://github.com/remarkjs/react-markdown/blob/baad6c53764e34c4ead41e2eaba176acfc87538a/lib/index.js#L293
+ */
+const urlTransform = (value: string) => {
+  // Same as:
+  // <https://github.com/micromark/micromark/blob/929275e/packages/micromark-util-sanitize-uri/dev/index.js#L34>
+  // But without the `encode` part.
+  const colon = value.indexOf(':')
+  const questionMark = value.indexOf('?')
+  const numberSign = value.indexOf('#')
+  const slash = value.indexOf('/')
+
+  if (
+    // If there is no protocol, it’s relative.
+    colon < 0 ||
+    // If the first colon is after a `?`, `#`, or `/`, it’s not a protocol.
+    (slash > -1 && colon > slash) ||
+    (questionMark > -1 && colon > questionMark) ||
+    (numberSign > -1 && colon > numberSign) ||
+    // It is a protocol, it should be allowed.
+    safeProtocol.test(value.slice(0, colon))
+  ) {
+    return value
+  }
+
+  return ''
+}
+
 const Markdown: FC<MarkdownProps> = ({ children = '', className }) => {
   return (
     <ReactMarkdown
+      urlTransform={urlTransform}
       components={{
         h1: ({ className, ...props }) => (
           <h1 className={cn('my-2 mt-0 font-semibold text-2xl', className)} {...props} />
@@ -60,6 +91,12 @@ const Markdown: FC<MarkdownProps> = ({ children = '', className }) => {
           )
         },
         pre: ({ className, ...props }) => <pre className={cn('my-2', className)} {...props} />,
+        /**
+         * TODO: Code highlight
+         * @see https://github.com/remarkjs/react-markdown/issues/680
+         * @see https://shiki.style/guide/install#usage
+         *
+         */
         code: ({ className, ...props }) => (
           <ScrollArea>
             <code className={cn('text-sm', className)} {...props}></code>

src/constants/config.ts

@@ -1,5 +1,7 @@
 // https://www.webfx.com/tools/emoji-cheat-sheet/
 
+import { Message } from '@/domain/MessageList'
+
 export const EMOJI_LIST = [
   '😀',
   '😃',
@@ -186,3 +188,10 @@ export const BREAKPOINTS = {
 export const MESSAGE_MAX_LENGTH = 500 as const
 
 export const STORAGE_NAME = 'WEB_CHAT' as const
+
+/**
+ * In chrome storage.sync, each key-value pair supports a maximum storage of 8kb
+ * Image is encoded as base64, and the size is increased by about 33%.
+ * 8kb * (1 - 0.33) = 5488 bytes
+ */
+export const MAX_AVATAR_SIZE = 5488 as const

src/domain/Room.ts

@@ -48,14 +48,13 @@ const RoomDomain = Remesh.domain({
     const PeerListQuery = domain.query({
       name: 'Room.PeerListQuery',
       impl: ({ get }) => {
-        console.log('PeerListQuery')
         return get(PeerListState())
       }
     })
 
     const JoinRoomCommand = domain.command({
       name: 'RoomJoinRoomCommand',
-      impl: ({ get }, roomId: string) => {
+      impl: (_, roomId: string) => {
         peerRoom.joinRoom(roomId)
         return [JoinRoomEvent(peerRoom.selfId)]
       }
@@ -63,7 +62,7 @@ const RoomDomain = Remesh.domain({
 
     const LeaveRoomCommand = domain.command({
       name: 'RoomLeaveRoomCommand',
-      impl: ({ get }) => {
+      impl: (_) => {
         peerRoom.leaveRoom()
         return [LeaveRoomEvent(peerRoom.selfId)]
       }
@@ -162,16 +161,9 @@ const RoomDomain = Remesh.domain({
       impl: ({ get }, action: { type: 'create' | 'delete'; peerId: string }) => {
         const peerList = get(PeerListState())
         if (action.type === 'create') {
-          console.log('create', [...new Set(peerList).add(action.peerId)])
-
           return [PeerListState().new([...new Set(peerList).add(action.peerId)])]
         }
         if (action.type === 'delete') {
-          console.log(
-            'delete',
-            peerList.filter((peerId) => peerId == action.peerId)
-          )
-
           return [PeerListState().new(peerList.filter((peerId) => peerId == action.peerId))]
         }
         return null

src/domain/UserInfo.ts

@@ -1,9 +1,6 @@
 import { Remesh } from 'remesh'
-import { nanoid } from 'nanoid'
 import { BrowserSyncStorageExtern } from '@/domain/externs/Storage'
 import StorageEffect from '@/domain/modules/StorageEffect'
-import generateUglyAvatar from '@/lib/uglyAvatar'
-import generateRandomName from '@/utils/generateRandomName'
 
 export interface UserInfo {
   id: string

src/utils/compressImage.ts

@@ -1,60 +1,80 @@
+export type ImageType = 'image/jpeg' | 'image/png' | 'image/webp'
+
+export interface Options {
+  input: Blob
+  targetSize: number
+  toleranceSize?: number
+  outputType?: ImageType
+}
+
 const compress = async (
   imageBitmap: ImageBitmap,
   targetSize: number,
   low: number,
   high: number,
-  bestBlob: Blob,
+  toleranceSize: number,
-  threshold: number
+  outputType: ImageType
 ): Promise<Blob> => {
-  // Calculate the middle value of quality
+  // Calculate the middle quality value
   const mid = (low + high) / 2
 
   // Calculate the width and height after scaling
-  const width = imageBitmap.width * mid
+  const width = Math.round(imageBitmap.width * mid)
-  const height = imageBitmap.height * mid
+  const height = Math.round(imageBitmap.height * mid)
 
   const offscreenCanvas = new OffscreenCanvas(width, height)
   const offscreenContext = offscreenCanvas.getContext('2d')!
 
-  offscreenContext.drawImage(imageBitmap, 0, 0, width, height)
+  // Draw the scaled image
+  offscreenContext.drawImage(imageBitmap, 0, 0, imageBitmap.width, imageBitmap.height, 0, 0, width, height)
 
-  const outputBlob = await offscreenCanvas.convertToBlob({ type: 'image/jpeg', quality: mid })
+  const outputBlob = await offscreenCanvas.convertToBlob({ type: outputType, quality: mid })
 
-  // Calculate the current size based on the current quality
   const currentSize = outputBlob.size
 
-  // If the current size is close to the target size, update the bestBlob
+  // Adjust the logic based on the positive or negative value of toleranceSize
-  if (currentSize <= targetSize && Math.abs(currentSize - targetSize) < Math.abs(bestBlob.size - targetSize)) {
+  if (toleranceSize < 0) {
-    bestBlob = outputBlob
+    // Negative value: allow results smaller than the target value
+    if (currentSize <= targetSize && currentSize >= targetSize + toleranceSize) {
+      return outputBlob
     }
-
-  // If the current size is between -1024 ~ 0, return the result
-  if ((currentSize - targetSize <= 0 && currentSize - targetSize >= -threshold) || high - low < 0.01) {
-    return bestBlob
-  }
-
-  // Adjust the range for recursion based on the current quality and size
-  if (currentSize > targetSize) {
-    return await compress(imageBitmap, targetSize, low, mid, bestBlob, threshold)
   } else {
-    return await compress(imageBitmap, targetSize, mid, high, bestBlob, threshold)
+    // Positive value: allow results larger than the target value
+    if (currentSize >= targetSize && currentSize <= targetSize + toleranceSize) {
+      return outputBlob
+    }
+  }
+
+  // Use relative error
+  if ((high - low) / high < 0.01) {
+    return outputBlob
+  }
+
+  if (currentSize > targetSize) {
+    return await compress(imageBitmap, targetSize, low, mid, toleranceSize, outputType)
+  } else {
+    return await compress(imageBitmap, targetSize, mid, high, toleranceSize, outputType)
   }
 }
 
-const compressImage = async (inputBlob: Blob, targetSize: number, threshold: number = 1024) => {
+const compressImage = async (options: Options) => {
-  // If the original size already meets the target size, return the original Blob
+  const { input, targetSize, toleranceSize = -1024 } = options
-  if (inputBlob.size <= targetSize) {
+  if (!['image/jpeg', 'image/png', 'image/webp'].includes(input.type)) {
-    return inputBlob
+    throw new Error('Invalid input type, only support image/jpeg, image/png, image/webp')
   }
 
-  // Initialize the range of quality
+  if (input.size <= targetSize) {
+    return input
+  }
+
+  const outputType = options.outputType || (input.type as ImageType)
+  const imageBitmap = await createImageBitmap(input)
+
+  // Initialize quality range
   const low = 0
   const high = 1
 
-  const imageBitmap = await createImageBitmap(inputBlob)
+  return await compress(imageBitmap, targetSize, low, high, toleranceSize, outputType)
-
-  // Call the recursive function
-  return await compress(imageBitmap, targetSize, low, high, inputBlob, threshold)
 }
 
 export default compressImage

src/utils/generateRandomAvatar.ts

@@ -0,0 +1,30 @@
+import generateUglyAvatar from '@/lib/uglyAvatar'
+import compressImage from './compressImage'
+
+const generateRandomAvatar = async (idealSize: number) => {
+  const svgBlob = generateUglyAvatar()
+
+  // compressImage can't directly compress svg, need to convert to jpeg first
+  const jpegBlob = await new Promise<Blob>((resolve, reject) => {
+    const image = new Image()
+    image.onload = async () => {
+      const canvas = new OffscreenCanvas(image.width, image.height)
+      const ctx = canvas.getContext('2d')
+      ctx?.drawImage(image, 0, 0)
+      const blob = await canvas.convertToBlob({ type: 'image/jpeg' })
+      resolve(blob)
+    }
+    image.onerror = () => reject(new Error('Failed to load SVG'))
+    image.src = URL.createObjectURL(svgBlob)
+  })
+  const miniAvatarBlob = await compressImage({ input: jpegBlob, targetSize: idealSize })
+  const miniAvatarBase64 = await new Promise<string>((resolve, reject) => {
+    const reader = new FileReader()
+    reader.onload = (e) => resolve(e.target?.result as string)
+    reader.onerror = () => reject(new Error('Failed to convert Blob to Base64'))
+    reader.readAsDataURL(miniAvatarBlob)
+  })
+  return miniAvatarBase64
+}
+
+export default generateRandomAvatar

src/utils/generateRandomName.ts

@@ -43,7 +43,8 @@ const generateRandomName = (): string => {
     'Bella',
     'Charlie',
     'Daisy',
-    'Ella'
+    'Ella',
+    'JinPing'
   ]
 
   const lastNames = [
@@ -90,7 +91,8 @@ const generateRandomName = (): string => {
     'Lin',
     'Lu',
     'Zheng',
-    'Huang'
+    'Huang',
+    'Xi'
   ]
 
   const randomFirstName = firstNames[Math.floor(Math.random() * firstNames.length)]

src/utils/index.ts

@@ -10,3 +10,5 @@ export { default as stringToHex } from './stringToHex'
 export { default as debounce } from './debounce'
 export { default as throttle } from './throttle'
 export { chunk, desert, upsert } from './array'
+export { default as generateRandomAvatar } from './generateRandomAvatar'
+export { default as generateRandomName } from './generateRandomName'

tailwind.config.ts

@@ -12,7 +12,7 @@ export default {
     },
     extend: {
       zIndex: {
-        top: '2147483647'
+        infinity: 'calc(infinity)'
       },
       colors: {
         border: 'hsl(var(--border))',
@@ -52,8 +52,8 @@ export default {
       minWidth: {
         screen: '100vw'
       },
-      maxWidth: {
+      backdropBlur: {
-        layer: 'revert-layer'
+        xs: '2px'
       },
       borderRadius: {
         lg: 'var(--radius)',